Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions bin/fuel-core/src/cli/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,8 @@ impl Command {
max_tx_update_subscriptions: tx_number_active_subscriptions,
subscription_ttl,
status_cache_ttl: status_cache_ttl.into(),
// TODO: Where can I get this value?
protocol_public_key: Default::default(),
Comment on lines +717 to +718
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can get it from the chain config like we do during verification of block's fields

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

},
};
Ok(config)
Expand Down
2 changes: 0 additions & 2 deletions crates/fuel-core/src/service/adapters/tx_status_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ use fuel_core_tx_status_manager::ports::P2PPreConfirmationGossipData;

use super::P2PAdapter;

pub mod signature_verification;

#[cfg(feature = "p2p")]
impl fuel_core_tx_status_manager::ports::P2PSubscriptions for P2PAdapter {
type GossipedStatuses = P2PPreConfirmationGossipData;
Expand Down

This file was deleted.

4 changes: 0 additions & 4 deletions crates/fuel-core/src/service/sub_services.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ use crate::{
graphql_api::GraphQLBlockImporter,
import_result_provider::ImportResultProvider,
ready_signal::ReadySignal,
tx_status_manager::signature_verification::PreconfirmationSignatureVerification,
BlockImporterAdapter,
BlockProducerAdapter,
ChainStateInfoProvider,
Expand Down Expand Up @@ -257,11 +256,8 @@ pub fn init_sub_services(
universal_gas_price_provider.clone(),
);

let signature_verification = PreconfirmationSignatureVerification;

let tx_status_manager = fuel_core_tx_status_manager::new_service(
p2p_adapter.clone(),
signature_verification,
config.tx_status_manager.clone(),
);
let tx_status_manager_adapter =
Expand Down
3 changes: 2 additions & 1 deletion crates/services/tx_status_manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ anyhow = { workspace = true }
async-trait = { workspace = true }
derive_more = { workspace = true }
fuel-core-services = { workspace = true }
fuel-core-types = { workspace = true, features = ["std"] }
fuel-core-types = { workspace = true, features = ["std", "serde"] }
futures = { workspace = true }
parking_lot = { workspace = true }
postcard = { workspace = true }
tokio = { workspace = true }
tokio-stream = { workspace = true }
tracing = { workspace = true }
Expand Down
4 changes: 4 additions & 0 deletions crates/services/tx_status_manager/src/config.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use fuel_core_types::fuel_crypto::PublicKey;
use std::time::Duration;

#[derive(Clone, Debug)]
Expand All @@ -8,6 +9,8 @@ pub struct Config {
pub subscription_ttl: Duration,
/// Maximum time to keep the status in the cache of the manager.
pub status_cache_ttl: Duration,
/// Protocol Signing Key, i.e. the block signer's public key
pub protocol_public_key: PublicKey,
}

#[cfg(feature = "test-helpers")]
Expand All @@ -17,6 +20,7 @@ impl Default for Config {
max_tx_update_subscriptions: 1000,
subscription_ttl: Duration::from_secs(60 * 10),
status_cache_ttl: Duration::from_secs(5),
protocol_public_key: PublicKey::default(),
}
}
}
Loading
Loading