wip

Phala-Network · Jun 27, 2023 · 5c28b2a · 5c28b2a
1 parent a08e542
commit 5c28b2a
Show file tree

Hide file tree

Showing 8 changed files with 1,556 additions and 1,214 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.69.0"
+channel = "1.70.0"
 components = [
     "cargo",
     "clippy",

diff --git a/standalone/headers-cache/Cargo.toml b/standalone/headers-cache/Cargo.toml
@@ -14,7 +14,7 @@ chrono = { version = "0.4.22" }
 env_logger = "0.9.0"
 rocket = "0.5.0-rc.3"
 scale = { package = 'parity-scale-codec', version = "3.3" }
-rocksdb = { version = "0.20.1", default-features = false, features = ["snappy", "jemalloc"] } # aligned with kvdb-rocksdb
+rocksdb = { version = "0.21.0", default-features = false, features = ["snappy", "jemalloc"] } # aligned with kvdb-rocksdb
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 phala-rocket-middleware = { path = "../../crates/phala-rocket-middleware" }

diff --git a/standalone/node/src/service.rs b/standalone/node/src/service.rs
@@ -325,7 +325,7 @@ pub struct NewFullBase {
 
 /// Creates a full service from the configuration.
 pub fn new_full_base(
-    mut config: Configuration,
+    config: Configuration,
     disable_hardware_benchmarks: bool,
     with_startup_data: impl FnOnce(
         &sc_consensus_babe::BabeBlockImport<Block, FullClient, FullGrandpaBlockImport>,
@@ -354,6 +354,7 @@ pub fn new_full_base(
 
     let shared_voter_state = rpc_setup;
     let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht;
+    let mut net_config = sc_network::config::FullNetworkConfiguration::new(&config.network);
     let grandpa_protocol_name = grandpa::protocol_standard_name(
         &client
             .block_hash(0)
@@ -362,6 +363,9 @@ pub fn new_full_base(
             .expect("Genesis block exists; qed"),
         &config.chain_spec,
     );
+    net_config.add_notification_protocol(grandpa::grandpa_peers_set_config(
+        grandpa_protocol_name.clone(),
+    ));
 
     config
         .network
@@ -378,6 +382,7 @@ pub fn new_full_base(
     let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) =
         sc_service::build_network(sc_service::BuildNetworkParams {
             config: &config,
+            net_config,
             client: client.clone(),
             transaction_pool: transaction_pool.clone(),
             spawn_handle: task_manager.spawn_handle(),