Stop using NativeExecutionDispatch

Author: nazar-pc

Cargo.lock

@@ -55,7 +55,6 @@ rand = { version = "0.8.5", features = ["min_const_gen"] }
 rlp = "0.5.2"
 sp-core = { version = "21.0.0", default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sc-cli = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false }
-sc-executor = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false }
 sc-service = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false }
 subspace-test-client = { version = "0.1.0", path = "../../test/subspace-test-client" }
 subspace-test-service = { version = "0.1.0", path = "../../test/subspace-test-service" }

crates/sp-domains-fraud-proof/Cargo.toml

@@ -33,7 +33,7 @@ use subspace_malicious_operator::malicious_domain_instance_starter::DomainInstan
 use subspace_malicious_operator::{Cli, DomainCli};
 use subspace_networking::libp2p::Multiaddr;
 use subspace_proof_of_space::chia::ChiaTable;
-use subspace_runtime::{Block, ExecutorDispatch, RuntimeApi};
+use subspace_runtime::{Block, RuntimeApi};
 use subspace_service::config::{SubspaceConfiguration, SubspaceNetworking};
 use subspace_service::dsn::DsnConfig;
 
@@ -210,18 +210,17 @@ fn main() -> Result<(), Error> {
                 timekeeper_cpu_cores: Default::default(),
             };
 
-            let partial_components = subspace_service::new_partial::<
-                PosTable,
-                RuntimeApi,
-                ExecutorDispatch,
-            >(&consensus_chain_config, &pot_external_entropy)
+            let partial_components = subspace_service::new_partial::<PosTable, RuntimeApi>(
+                &consensus_chain_config,
+                &pot_external_entropy,
+            )
             .map_err(|error| {
                 sc_service::Error::Other(format!("Failed to build a full subspace node: {error:?}"))
             })?;
 
             let keystore = partial_components.keystore_container.keystore();
 
-            let consensus_chain_node = subspace_service::new_full::<PosTable, _, _>(
+            let consensus_chain_node = subspace_service::new_full::<PosTable, _>(
                 consensus_chain_config,
                 partial_components,
                 true,

crates/subspace-malicious-operator/src/bin/subspace-malicious-operator.rs

@@ -6,7 +6,7 @@ use domain_eth_service::provider::EthProvider;
 use domain_eth_service::DefaultEthConfig;
 use domain_runtime_primitives::opaque::Block as DomainBlock;
 use domain_service::{FullBackend, FullClient};
-use evm_domain_runtime::{AccountId as AccountId20, ExecutorDispatch as EVMDomainExecutorDispatch};
+use evm_domain_runtime::AccountId as AccountId20;
 use futures::StreamExt;
 use sc_cli::CliConfiguration;
 use sc_consensus_subspace::block_import::BlockImportingNotification;
@@ -20,7 +20,7 @@ use sp_domains::{DomainInstanceData, RuntimeType};
 use sp_keystore::KeystorePtr;
 use std::path::PathBuf;
 use std::sync::Arc;
-use subspace_runtime::{ExecutorDispatch as CExecutorDispatch, RuntimeApi as CRuntimeApi};
+use subspace_runtime::RuntimeApi as CRuntimeApi;
 use subspace_runtime_primitives::opaque::Block as CBlock;
 use subspace_service::FullClient as CFullClient;
 
@@ -30,7 +30,7 @@ pub struct DomainInstanceStarter<CNetwork> {
     pub domain_cli: DomainCli,
     pub base_path: PathBuf,
     pub tokio_handle: tokio::runtime::Handle,
-    pub consensus_client: Arc<CFullClient<CRuntimeApi, CExecutorDispatch>>,
+    pub consensus_client: Arc<CFullClient<CRuntimeApi>>,
     pub consensus_keystore: KeystorePtr,
     pub consensus_offchain_tx_pool_factory: OffchainTransactionPoolFactory<CBlock>,
     pub block_importing_notification_stream:
@@ -130,11 +130,7 @@ where
                     EthProvider::<
                         evm_domain_runtime::TransactionConverter,
                         DefaultEthConfig<
-                            FullClient<
-                                DomainBlock,
-                                evm_domain_runtime::RuntimeApi,
-                                EVMDomainExecutorDispatch,
-                            >,
+                            FullClient<DomainBlock, evm_domain_runtime::RuntimeApi>,
                             FullBackend<DomainBlock>,
                         >,
                     >::new(Some(&evm_base_path), domain_cli.additional_args());
@@ -164,7 +160,6 @@ where
                     _,
                     _,
                     evm_domain_runtime::RuntimeApi,
-                    EVMDomainExecutorDispatch,
                     AccountId20,
                     _,
                     _,

crates/subspace-malicious-operator/src/malicious_domain_instance_starter.rs

@@ -44,7 +44,6 @@ sc-cli = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-s
 sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sc-consensus-subspace = { version = "0.1.0", path = "../sc-consensus-subspace" }
-sc-executor = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sc-informant = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sc-keystore = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
@@ -62,11 +61,9 @@ sp-core = { version = "21.0.0", git = "https://github.com/subspace/polkadot-sdk"
 sp-domains = { version = "0.1.0", path = "../sp-domains" }
 sp-domain-digests = { version = "0.1.0", path = "../../domains/primitives/digests" }
 sp-domains-fraud-proof = { version = "0.1.0", path = "../sp-domains-fraud-proof" }
-sp-io = { version = "23.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sp-keystore = { version = "0.27.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sp-messenger = { version = "0.1.0", path = "../../domains/primitives/messenger" }
 sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
-sp-wasm-interface = { version = "14.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives" }
 subspace-networking = { version = "0.1.0", path = "../subspace-networking" }
 subspace-proof-of-space = { version = "0.1.0", path = "../subspace-proof-of-space" }
@@ -89,8 +86,10 @@ do-not-enforce-cost-of-storage = [
     "subspace-runtime/do-not-enforce-cost-of-storage"
 ]
 runtime-benchmarks = [
+    "domain-service/runtime-benchmarks",
+    "evm-domain-runtime/runtime-benchmarks",
     "frame-benchmarking/runtime-benchmarks",
     "frame-benchmarking-cli/runtime-benchmarks",
     "subspace-runtime/runtime-benchmarks",
-    "evm-domain-runtime/runtime-benchmarks",
+    "subspace-service/runtime-benchmarks",
 ]

crates/subspace-node/Cargo.toml

@@ -23,7 +23,7 @@ use sc_utils::mpsc::tracing_unbounded;
 use sp_core::traits::SpawnEssentialNamed;
 use sp_messenger::messages::ChainId;
 use std::env;
-use subspace_runtime::{Block, ExecutorDispatch, RuntimeApi};
+use subspace_runtime::{Block, RuntimeApi};
 use tracing::{debug, error, info, info_span, warn};
 
 /// Options for running a node
@@ -117,18 +117,17 @@ pub async fn run(run_options: RunOptions) -> Result<(), Error> {
             let span = info_span!("Consensus");
             let _enter = span.enter();
 
-            let partial_components = subspace_service::new_partial::<
-                PosTable,
-                RuntimeApi,
-                ExecutorDispatch,
-            >(&subspace_configuration, &pot_external_entropy)
+            let partial_components = subspace_service::new_partial::<PosTable, RuntimeApi>(
+                &subspace_configuration,
+                &pot_external_entropy,
+            )
             .map_err(|error| {
                 sc_service::Error::Other(format!(
                     "Failed to build a full subspace node 1: {error:?}"
                 ))
             })?;
 
-            let full_node_fut = subspace_service::new_full::<PosTable, _, _>(
+            let full_node_fut = subspace_service::new_full::<PosTable, _>(
                 subspace_configuration,
                 partial_components,
                 true,

crates/subspace-node/src/commands/run.rs

@@ -11,8 +11,7 @@ use domain_service::config::{
 };
 use domain_service::{FullBackend, FullClient};
 use evm_domain_runtime::{
-    AccountId as AccountId20, ExecutorDispatch as EVMDomainExecutorDispatch,
-    RuntimeGenesisConfig as EvmRuntimeGenesisConfig,
+    AccountId as AccountId20, RuntimeGenesisConfig as EvmRuntimeGenesisConfig,
 };
 use futures::StreamExt;
 use sc_chain_spec::{ChainType, Properties};
@@ -35,7 +34,7 @@ use sp_domains::{DomainId, DomainInstanceData, OperatorId, RuntimeType};
 use std::collections::HashMap;
 use std::net::SocketAddr;
 use std::sync::Arc;
-use subspace_runtime::{ExecutorDispatch as CExecutorDispatch, RuntimeApi as CRuntimeApi};
+use subspace_runtime::RuntimeApi as CRuntimeApi;
 use subspace_runtime_primitives::opaque::Block as CBlock;
 use subspace_service::FullClient as CFullClient;
 use tracing::warn;
@@ -367,7 +366,7 @@ pub(super) fn create_domain_configuration(
 }
 
 pub(super) struct DomainStartOptions<CNetwork> {
-    pub(super) consensus_client: Arc<CFullClient<CRuntimeApi, CExecutorDispatch>>,
+    pub(super) consensus_client: Arc<CFullClient<CRuntimeApi>>,
     pub(super) consensus_offchain_tx_pool_factory: OffchainTransactionPoolFactory<CBlock>,
     pub(super) consensus_network: Arc<CNetwork>,
     pub(super) block_importing_notification_stream:
@@ -455,11 +454,7 @@ where
             let eth_provider = EthProvider::<
                 evm_domain_runtime::TransactionConverter,
                 DefaultEthConfig<
-                    FullClient<
-                        DomainBlock,
-                        evm_domain_runtime::RuntimeApi,
-                        EVMDomainExecutorDispatch,
-                    >,
+                    FullClient<DomainBlock, evm_domain_runtime::RuntimeApi>,
                     FullBackend<DomainBlock>,
                 >,
             >::new(
@@ -491,7 +486,6 @@ where
                 _,
                 _,
                 evm_domain_runtime::RuntimeApi,
-                EVMDomainExecutorDispatch,
                 AccountId20,
                 _,
                 _,