Merge pull request #827 from opentensor/feat/polkadot-sdk-v1.16.0

Feat/polkadot sdk v1.16.0

Author: unconst

Cargo.lock

@@ -5,7 +5,7 @@ pub mod finney;
 pub mod localnet;
 pub mod testnet;
 
-use node_subtensor_runtime::{AccountId, Block, RuntimeGenesisConfig, Signature, WASM_BINARY};
+use node_subtensor_runtime::{AccountId, Block, Signature, WASM_BINARY};
 use sc_chain_spec_derive::ChainSpecExtension;
 use sc_service::ChainType;
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
@@ -32,7 +32,7 @@ pub struct Extensions {
 }
 
 /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
-pub type ChainSpec = sc_service::GenericChainSpec<RuntimeGenesisConfig, Extensions>;
+pub type ChainSpec = sc_service::GenericChainSpec<Extensions>;
 
 /// Generate a crypto pair from seed.
 pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {

Cargo.toml

@@ -12,12 +12,13 @@ pub use frame_benchmarking_cli::{BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFER
 pub use node_subtensor_runtime::EXISTENTIAL_DEPOSIT;
 #[cfg(feature = "runtime-benchmarks")]
 pub use sp_keyring::Sr25519Keyring;
-#[cfg(feature = "runtime-benchmarks")]
-use sp_runtime::traits::HashingFor;
 
 use node_subtensor_runtime::Block;
 use sc_cli::SubstrateCli;
-use sc_service::{Configuration, PartialComponents};
+use sc_service::{
+    config::{ExecutorConfiguration, RpcConfiguration},
+    Configuration, PartialComponents,
+};
 
 impl SubstrateCli for Cli {
     fn impl_name() -> String {
@@ -149,7 +150,9 @@ pub fn run() -> sc_cli::Result<()> {
                             );
                         }
 
-                        cmd.run::<HashingFor<Block>, service::ExecutorDispatch>(config)
+                        cmd.run_with_spec::<sp_runtime::traits::HashingFor<Block>, ()>(Some(
+                            config.chain_spec,
+                        ))
                     }
                     BenchmarkCmd::Block(cmd) => {
                         let PartialComponents { client, .. } = service::new_partial(&config)?;
@@ -210,7 +213,18 @@ pub fn run() -> sc_cli::Result<()> {
             let runner = cli.create_runner(&cli.run)?;
             runner.run_node_until_exit(|config| async move {
                 let config = override_default_heap_pages(config, 60_000);
-                service::new_full(config).map_err(sc_cli::Error::Service)
+                match config.network.network_backend {
+					sc_network::config::NetworkBackendType::Libp2p => service::new_full::<
+						sc_network::NetworkWorker<
+							node_subtensor_runtime::opaque::Block,
+							<node_subtensor_runtime::opaque::Block as sp_runtime::traits::Block>::Hash,
+						>,
+					>(config)
+					.map_err(sc_cli::Error::Service),
+					sc_network::config::NetworkBackendType::Litep2p =>
+						service::new_full::<sc_network::Litep2pNetworkBackend>(config)
+							.map_err(sc_cli::Error::Service),
+				}
             })
         }
     }
@@ -219,7 +233,6 @@ pub fn run() -> sc_cli::Result<()> {
 /// Override default heap pages
 fn override_default_heap_pages(config: Configuration, pages: u64) -> Configuration {
     Configuration {
-        default_heap_pages: Some(pages),
         impl_name: config.impl_name,
         impl_version: config.impl_version,
         role: config.role,
@@ -232,20 +245,7 @@ fn override_default_heap_pages(config: Configuration, pages: u64) -> Configurati
         state_pruning: config.state_pruning,
         blocks_pruning: config.blocks_pruning,
         chain_spec: config.chain_spec,
-        wasm_method: config.wasm_method,
         wasm_runtime_overrides: config.wasm_runtime_overrides,
-        rpc_addr: config.rpc_addr,
-        rpc_max_connections: config.rpc_max_connections,
-        rpc_cors: config.rpc_cors,
-        rpc_methods: config.rpc_methods,
-        rpc_max_request_size: config.rpc_max_request_size,
-        rpc_max_response_size: config.rpc_max_response_size,
-        rpc_id_provider: config.rpc_id_provider,
-        rpc_max_subs_per_conn: config.rpc_max_subs_per_conn,
-        rpc_port: config.rpc_port,
-        rpc_message_buffer_capacity: config.rpc_message_buffer_capacity,
-        rpc_batch_config: config.rpc_batch_config,
-        rpc_rate_limit: config.rpc_rate_limit,
         prometheus_config: config.prometheus_config,
         telemetry_endpoints: config.telemetry_endpoints,
         offchain_worker: config.offchain_worker,
@@ -254,11 +254,30 @@ fn override_default_heap_pages(config: Configuration, pages: u64) -> Configurati
         dev_key_seed: config.dev_key_seed,
         tracing_targets: config.tracing_targets,
         tracing_receiver: config.tracing_receiver,
-        max_runtime_instances: config.max_runtime_instances,
         announce_block: config.announce_block,
         data_path: config.data_path,
         base_path: config.base_path,
-        informant_output_format: config.informant_output_format,
-        runtime_cache_size: config.runtime_cache_size,
+        executor: ExecutorConfiguration {
+            default_heap_pages: Some(pages),
+            wasm_method: config.executor.wasm_method,
+            max_runtime_instances: config.executor.max_runtime_instances,
+            runtime_cache_size: config.executor.runtime_cache_size,
+        },
+        rpc: RpcConfiguration {
+            addr: config.rpc.addr,
+            max_connections: config.rpc.max_connections,
+            cors: config.rpc.cors,
+            methods: config.rpc.methods,
+            max_request_size: config.rpc.max_request_size,
+            max_response_size: config.rpc.max_response_size,
+            id_provider: config.rpc.id_provider,
+            max_subs_per_conn: config.rpc.max_subs_per_conn,
+            port: config.rpc.port,
+            message_buffer_capacity: config.rpc.message_buffer_capacity,
+            batch_config: config.rpc.batch_config,
+            rate_limit: config.rpc.rate_limit,
+            rate_limit_whitelisted_ips: config.rpc.rate_limit_whitelisted_ips,
+            rate_limit_trust_proxy_headers: config.rpc.rate_limit_trust_proxy_headers,
+        },
     }
 }

node/src/chain_spec/mod.rs

@@ -15,8 +15,6 @@ use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 
-pub use sc_rpc_api::DenyUnsafe;
-
 /// Dependencies for GRANDPA
 pub struct GrandpaDeps<B> {
     /// Voting round info.
@@ -37,8 +35,6 @@ pub struct FullDeps<C, P, B> {
     pub client: Arc<C>,
     /// Transaction pool instance.
     pub pool: Arc<P>,
-    /// Whether to deny unsafe calls
-    pub deny_unsafe: DenyUnsafe,
     /// Grandpa block import setup.
     pub grandpa: GrandpaDeps<B>,
     /// Backend used by the node.
@@ -72,15 +68,14 @@ where
     let FullDeps {
         client,
         pool,
-        deny_unsafe,
         grandpa,
         _backend: _,
     } = deps;
 
     // Custom RPC methods for Paratensor
     module.merge(SubtensorCustom::new(client.clone()).into_rpc())?;
 
-    module.merge(System::new(client.clone(), pool.clone(), deny_unsafe).into_rpc())?;
+    module.merge(System::new(client.clone(), pool.clone()).into_rpc())?;
     module.merge(TransactionPayment::new(client).into_rpc())?;
 
     let GrandpaDeps {

node/src/command.rs

@@ -6,9 +6,8 @@ use sc_client_api::{Backend, BlockBackend};
 use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams};
 use sc_consensus_grandpa::SharedVoterState;
 use sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging;
-use sc_executor::sp_wasm_interface::{Function, HostFunctionRegistry, HostFunctions};
-pub use sc_executor::NativeElseWasmExecutor;
-use sc_service::{error::Error as ServiceError, Configuration, TaskManager, WarpSyncParams};
+pub use sc_executor::WasmExecutor;
+use sc_service::{error::Error as ServiceError, Configuration, TaskManager, WarpSyncConfig};
 use sc_telemetry::{Telemetry, TelemetryWorker};
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
@@ -18,42 +17,8 @@ use std::{sync::Arc, time::Duration};
 /// imported and generated.
 const GRANDPA_JUSTIFICATION_PERIOD: u32 = 512;
 
-// Our native executor instance.
-pub struct ExecutorDispatch;
-
-// appeasing the compiler, this is a no-op
-impl HostFunctions for ExecutorDispatch {
-    fn host_functions() -> Vec<&'static dyn Function> {
-        vec![]
-    }
-
-    fn register_static<T>(_registry: &mut T) -> core::result::Result<(), T::Error>
-    where
-        T: HostFunctionRegistry,
-    {
-        Ok(())
-    }
-}
-
-impl sc_executor::NativeExecutionDispatch for ExecutorDispatch {
-    // Always enable runtime benchmark host functions, the genesis state
-    // was built with them so we're stuck with them forever.
-    //
-    // They're just a noop, never actually get used if the runtime was not compiled with
-    // `runtime-benchmarks`.
-    type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
-
-    fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-        node_subtensor_runtime::api::dispatch(method, data)
-    }
-
-    fn native_version() -> sc_executor::NativeVersion {
-        node_subtensor_runtime::native_version()
-    }
-}
-
 pub(crate) type FullClient =
-    sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;
+    sc_service::TFullClient<Block, RuntimeApi, WasmExecutor<sp_io::SubstrateHostFunctions>>;
 type FullBackend = sc_service::TFullBackend<Block>;
 type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;
 
@@ -90,7 +55,7 @@ pub fn new_partial(
         })
         .transpose()?;
 
-    let executor = sc_service::new_native_or_wasm_executor(config);
+    let executor = sc_service::new_wasm_executor::<sp_io::SubstrateHostFunctions>(&config.executor);
 
     let (client, backend, keystore_container, task_manager) =
         sc_service::new_full_parts::<Block, RuntimeApi, _>(
@@ -163,7 +128,11 @@ pub fn new_partial(
 }
 
 // Builds a new service for a full client.
-pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
+pub fn new_full<
+    N: sc_network::NetworkBackend<Block, <Block as sp_runtime::traits::Block>::Hash>,
+>(
+    config: Configuration,
+) -> Result<TaskManager, ServiceError> {
     let sc_service::PartialComponents {
         client,
         backend,
@@ -175,7 +144,12 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
         other: (block_import, grandpa_link, mut telemetry),
     } = new_partial(&config)?;
 
-    let mut net_config = sc_network::config::FullNetworkConfiguration::new(&config.network);
+    let mut net_config = sc_network::config::FullNetworkConfiguration::<
+        Block,
+        <Block as sp_runtime::traits::Block>::Hash,
+        N,
+    >::new(&config.network, config.prometheus_registry().cloned());
+    let metrics = N::register_notification_metrics(config.prometheus_registry());
 
     let grandpa_protocol_name = sc_consensus_grandpa::protocol_standard_name(
         &client
@@ -186,8 +160,13 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
         &config.chain_spec,
     );
 
+    let peer_store_handle = net_config.peer_store_handle();
     let (grandpa_protocol_config, grandpa_notification_service) =
-        sc_consensus_grandpa::grandpa_peers_set_config(grandpa_protocol_name.clone());
+        sc_consensus_grandpa::grandpa_peers_set_config::<_, N>(
+            grandpa_protocol_name.clone(),
+            metrics.clone(),
+            peer_store_handle,
+        );
     net_config.add_notification_protocol(grandpa_protocol_config);
 
     let warp_sync = Arc::new(sc_consensus_grandpa::warp_proof::NetworkProvider::new(
@@ -205,8 +184,9 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
             spawn_handle: task_manager.spawn_handle(),
             import_queue,
             block_announce_validator_builder: None,
-            warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)),
+            warp_sync_config: Some(WarpSyncConfig::WithProvider(warp_sync)),
             block_relay: None,
+            metrics,
         })?;
 
     if config.offchain_worker.enabled {
@@ -221,7 +201,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
                 transaction_pool: Some(OffchainTransactionPoolFactory::new(
                     transaction_pool.clone(),
                 )),
-                network_provider: network.clone(),
+                network_provider: Arc::new(network.clone()),
                 enable_http_requests: true,
                 custom_extensions: |_| vec![],
             })
@@ -239,7 +219,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
     let shared_authority_set = grandpa_link.shared_authority_set().clone();
     let shared_voter_state = SharedVoterState::empty();
 
-    let role = config.role.clone();
+    let role = config.role;
     let force_authoring = config.force_authoring;
     let backoff_authoring_blocks = Some(BackoffAuthoringOnFinalizedHeadLagging {
         unfinalized_slack: 6,
@@ -254,11 +234,10 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
         let pool = transaction_pool.clone();
 
         Box::new(
-            move |deny_unsafe, subscription_executor: sc_rpc::SubscriptionTaskExecutor| {
+            move |subscription_executor: sc_rpc::SubscriptionTaskExecutor| {
                 let deps = crate::rpc::FullDeps {
                     client: client.clone(),
                     pool: pool.clone(),
-                    deny_unsafe,
                     grandpa: crate::rpc::GrandpaDeps {
                         shared_voter_state: shared_voter_state.clone(),
                         shared_authority_set: shared_authority_set.clone(),

node/src/rpc.rs

@@ -1,6 +1,5 @@
 #![allow(non_camel_case_types)]
 
-use super::*;
 use crate as pallet_commitments;
 use frame_support::derive_impl;
 use frame_support::traits::ConstU64;