Merge pull request #979 from subspace/core-domain-prototype-refactoring-part-5

Core domain prototype refactoring (part 5)

Author: liuchengxu

Diff for: Cargo.lock

@@ -96,9 +96,9 @@ mod pallet {
 
     #[derive(TypeInfo, Encode, Decode, PalletError, Debug)]
     pub enum BundleError {
-        /// The signer of transaction bundle is unexpected.
+        /// The signer of bundle is unexpected.
         UnexpectedSigner,
-        /// Invalid transaction bundle signature.
+        /// Invalid bundle signature.
         BadSignature,
         /// Invalid vrf proof.
         BadVrfProof,
@@ -196,11 +196,7 @@ mod pallet {
         ) -> DispatchResult {
             ensure_none(origin)?;
 
-            log::debug!(
-                target: "runtime::subspace::executor",
-                "Submitting transaction bundle: {:?}",
-                signed_opaque_bundle
-            );
+            log::trace!(target: "runtime::domains", "Processing bundle: {signed_opaque_bundle:?}");
 
             let domain_id = signed_opaque_bundle.domain_id();
 
@@ -247,11 +243,7 @@ mod pallet {
         pub fn submit_fraud_proof(origin: OriginFor<T>, fraud_proof: FraudProof) -> DispatchResult {
             ensure_none(origin)?;
 
-            log::debug!(
-                target: "runtime::subspace::executor",
-                "Submitting fraud proof: {:?}",
-                fraud_proof
-            );
+            log::trace!(target: "runtime::domains", "Processing fraud proof: {fraud_proof:?}");
 
             // Revert the execution chain.
             let (_, mut to_remove) = ReceiptHead::<T>::get();
@@ -284,11 +276,7 @@ mod pallet {
         ) -> DispatchResult {
             ensure_none(origin)?;
 
-            log::debug!(
-                target: "runtime::subspace::executor",
-                "Submitting bundle equivocation proof: {:?}",
-                bundle_equivocation_proof
-            );
+            log::trace!(target: "runtime::domains", "Processing bundle equivocation proof: {bundle_equivocation_proof:?}");
 
             // TODO: slash the executor accordingly.
 
@@ -305,11 +293,7 @@ mod pallet {
         ) -> DispatchResult {
             ensure_none(origin)?;
 
-            log::debug!(
-                target: "runtime::subspace::executor",
-                "Submitting invalid transaction proof: {:?}",
-                invalid_transaction_proof
-            );
+            log::trace!(target: "runtime::domains", "Processing invalid transaction proof: {invalid_transaction_proof:?}");
 
             // TODO: slash the executor accordingly.
 
@@ -422,9 +406,8 @@ mod pallet {
                 } => {
                     if let Err(e) = Self::validate_bundle(signed_opaque_bundle) {
                         log::error!(
-                            target: "runtime::subspace::executor",
-                            "Invalid signed opaque bundle: {:?}, error: {:?}",
-                            signed_opaque_bundle, e
+                            target: "runtime::domains",
+                            "Bad bundle: {signed_opaque_bundle:?}, error: {e:?}",
                         );
                         if let BundleError::Receipt(_) = e {
                             return InvalidTransactionCode::ExecutionReceipt.into();
@@ -445,9 +428,8 @@ mod pallet {
                 Call::submit_fraud_proof { fraud_proof } => {
                     if let Err(e) = Self::validate_fraud_proof(fraud_proof) {
                         log::error!(
-                            target: "runtime::subspace::executor",
-                            "Invalid fraud proof: {:?}, error: {:?}",
-                            fraud_proof, e
+                            target: "runtime::domains",
+                            "Bad fraud proof: {fraud_proof:?}, error: {e:?}",
                         );
                         return InvalidTransactionCode::FraudProof.into();
                     }
@@ -462,9 +444,8 @@ mod pallet {
                         Self::validate_bundle_equivocation_proof(bundle_equivocation_proof)
                     {
                         log::error!(
-                            target: "runtime::subspace::executor",
-                            "Invalid bundle equivocation proof: {:?}, error: {:?}",
-                            bundle_equivocation_proof, e
+                            target: "runtime::domains",
+                            "Bad bundle equivocation proof: {bundle_equivocation_proof:?}, error: {e:?}",
                         );
                         return InvalidTransactionCode::BundleEquivicationProof.into();
                     }
@@ -481,9 +462,8 @@ mod pallet {
                         Self::validate_invalid_transaction_proof(invalid_transaction_proof)
                     {
                         log::error!(
-                            target: "runtime::subspace::executor",
-                            "Wrong InvalidTransactionProof: {:?}, error: {:?}",
-                            invalid_transaction_proof, e
+                            target: "runtime::domains",
+                            "Bad invalid transaction proof: {invalid_transaction_proof:?}, error: {e:?}",
                         );
                         return InvalidTransactionCode::TrasactionProof.into();
                     }
@@ -833,13 +813,10 @@ where
 
         match SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into()) {
             Ok(()) => {
-                log::info!(target: "runtime::subspace::executor", "Submitted transaction bundle");
+                log::info!(target: "runtime::domains", "Submitted bundle");
             }
             Err(()) => {
-                log::error!(
-                    target: "runtime::subspace::executor",
-                    "Error submitting transaction bundle",
-                );
+                log::error!(target: "runtime::domains", "Error submitting bundle");
             }
         }
     }
@@ -850,10 +827,10 @@ where
 
         match SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into()) {
             Ok(()) => {
-                log::info!(target: "runtime::subspace::executor", "Submitted fraud proof");
+                log::info!(target: "runtime::domains", "Submitted fraud proof");
             }
             Err(()) => {
-                log::error!(target: "runtime::subspace::executor", "Error submitting fraud proof");
+                log::error!(target: "runtime::domains", "Error submitting fraud proof");
             }
         }
     }
@@ -868,16 +845,10 @@ where
 
         match SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into()) {
             Ok(()) => {
-                log::info!(
-                    target: "runtime::subspace::executor",
-                    "Submitted bundle equivocation proof"
-                );
+                log::info!(target: "runtime::domains", "Submitted bundle equivocation proof");
             }
             Err(()) => {
-                log::error!(
-                    target: "runtime::subspace::executor",
-                    "Error submitting bundle equivocation proof",
-                );
+                log::error!(target: "runtime::domains", "Error submitting bundle equivocation proof");
             }
         }
     }
@@ -892,13 +863,10 @@ where
 
         match SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into()) {
             Ok(()) => {
-                log::info!(target: "runtime::subspace::executor", "Submitted invalid transaction proof")
+                log::info!(target: "runtime::domains", "Submitted invalid transaction proof")
             }
             Err(()) => {
-                log::error!(
-                    target: "runtime::subspace::executor",
-                    "Error submitting invalid transaction proof",
-                );
+                log::error!(target: "runtime::domains", "Error submitting invalid transaction proof");
             }
         }
     }

Diff for: crates/pallet-domains/src/lib.rs

@@ -71,7 +71,6 @@ do-not-enforce-cost-of-storage = [
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-benchmarking-cli/runtime-benchmarks",
-	"domain-service/runtime-benchmarks",
 	"subspace-runtime/runtime-benchmarks",
 	"system-domain-runtime/runtime-benchmarks",
 ]

Diff for: crates/subspace-node/Cargo.toml

@@ -39,7 +39,7 @@ pub fn development_config() -> ExecutionChainSpec<GenesisConfig> {
         // Name
         "Development",
         // ID
-        "execution_dev",
+        "system_domain_dev",
         ChainType::Development,
         move || {
             testnet_genesis(
@@ -85,7 +85,7 @@ pub fn local_testnet_config() -> ExecutionChainSpec<GenesisConfig> {
         // Name
         "Local Testnet",
         // ID
-        "execution_local_testnet",
+        "system_domain_local_testnet",
         ChainType::Local,
         move || {
             testnet_genesis(

Diff for: crates/subspace-node/src/secondary_chain/chain_spec.rs

@@ -0,0 +1,21 @@
+# Domain Executor
+
+## Overview
+
+Each executor instance, whether for system domain or core domain, consists of these components:
+
+- `BundleProducer`: Produce a bundle on new slot.
+  - `BundleElectionSolver`: Attempt to solve the bundle election challenge on each each slot in order to be allowed to author a bundle.
+  - `DomainBundleProposer`: Collect the transactions from transaction pool and a range of receipts upon solving the bundle election challenge successfully.
+- `BundleProcessor`: On each imported primary block, the bundle processor extracts the domain-specific bundles from the primary block, compiles the bundles to a list of extrinsics, construct a custom `BlockBuilder` with compiled extrinsics, execute and import the domain block. The receipt of processing the domain block is stored locally and then submitted to the primary chain in some bundle later.
+- domain worker: Run the components `BundleProducer` and `BundleProcessor` on the arrived events(new_slot, import_primary_block).
+- `GossipMessageValidator`: Validate the bundle gossiped from the domain node peers. Currently, this part is inactive and will be re-enabled in the future.
+
+## Modules structure
+
+- `domain_{block_processor,bundle_producer,bundle_proposer,worker}.rs`/`gossip_message_validator`
+  - General executor components, sharing the common logics between system domain and core domain.
+- `system_{block_processor,bundle_producer,bundle_proposer,worker}.rs`/`system_gossip_message_validator`
+  - Executor components specfic to the system domain.
+- `core_{block_processor,bundle_producer,bundle_proposer,worker}.rs`/`core_gossip_message_validator`
+  - Executor components specfic to the core domain.

Diff for: domains/client/domain-executor/README.md

@@ -2,7 +2,7 @@ use crate::domain_block_processor::DomainBlockProcessor;
 use crate::utils::{translate_number_type, DomainBundles};
 use crate::TransactionFor;
 use domain_runtime_primitives::{AccountId, DomainCoreApi};
-use sc_client_api::{AuxStore, BlockBackend};
+use sc_client_api::{AuxStore, BlockBackend, StateBackendFor};
 use sc_consensus::{BlockImport, ForkChoiceStrategy};
 use sp_api::{NumberFor, ProvideRuntimeApi};
 use sp_blockchain::HeaderBackend;
@@ -71,10 +71,7 @@ where
         HeaderBackend<Block> + BlockBackend<Block> + AuxStore + ProvideRuntimeApi<Block> + 'static,
     Client::Api: DomainCoreApi<Block, AccountId>
         + sp_block_builder::BlockBuilder<Block>
-        + sp_api::ApiExt<
-            Block,
-            StateBackend = sc_client_api::backend::StateBackendFor<Backend, Block>,
-        >,
+        + sp_api::ApiExt<Block, StateBackend = StateBackendFor<Backend, Block>>,
     for<'b> &'b Client: BlockImport<
         Block,
         Transaction = sp_api::TransactionFor<Client, Block>,

Diff for: domains/client/domain-executor/src/core_bundle_processor.rs

@@ -22,7 +22,7 @@ use crate::TransactionFor;
 use domain_runtime_primitives::{AccountId, DomainCoreApi};
 use futures::channel::mpsc;
 use futures::{future, FutureExt, Stream, StreamExt, TryFutureExt};
-use sc_client_api::{AuxStore, BlockBackend, ProofProvider};
+use sc_client_api::{AuxStore, BlockBackend, ProofProvider, StateBackendFor};
 use sc_consensus::{BlockImport, ForkChoiceStrategy};
 use sp_api::{BlockT, ProvideRuntimeApi};
 use sp_block_builder::BlockBuilder;
@@ -80,10 +80,7 @@ pub(super) async fn start_worker<
         + 'static,
     Client::Api: DomainCoreApi<Block, AccountId>
         + BlockBuilder<Block>
-        + sp_api::ApiExt<
-            Block,
-            StateBackend = sc_client_api::backend::StateBackendFor<Backend, Block>,
-        >,
+        + sp_api::ApiExt<Block, StateBackend = StateBackendFor<Backend, Block>>,
     for<'b> &'b Client: BlockImport<
         Block,
         Transaction = sp_api::TransactionFor<Client, Block>,

Diff for: domains/client/domain-executor/src/core_domain_worker.rs

@@ -6,7 +6,7 @@ use crate::{active_leaves, EssentialExecutorParams, TransactionFor};
 use domain_runtime_primitives::{AccountId, DomainCoreApi};
 use futures::channel::mpsc;
 use futures::{FutureExt, Stream};
-use sc_client_api::{AuxStore, BlockBackend, ProofProvider};
+use sc_client_api::{AuxStore, BlockBackend, ProofProvider, StateBackendFor};
 use sc_consensus::ForkChoiceStrategy;
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
@@ -20,14 +20,13 @@ use std::sync::Arc;
 use subspace_core_primitives::Blake2b256Hash;
 use system_runtime_primitives::SystemDomainApi;
 
-/// The implementation of the Domain `Executor`.
+/// Core domain executor.
 pub struct Executor<Block, SBlock, PBlock, Client, SClient, PClient, TransactionPool, Backend, E>
 where
     Block: BlockT,
     SBlock: BlockT,
     PBlock: BlockT,
 {
-    // TODO: no longer used in executor, revisit this with ParachainBlockImport together.
     primary_chain_client: Arc<PClient>,
     client: Arc<Client>,
     spawner: Box<dyn SpawnNamed + Send + Sync>,
@@ -71,10 +70,7 @@ where
         + 'static,
     Client::Api: DomainCoreApi<Block, AccountId>
         + sp_block_builder::BlockBuilder<Block>
-        + sp_api::ApiExt<
-            Block,
-            StateBackend = sc_client_api::backend::StateBackendFor<Backend, Block>,
-        >,
+        + sp_api::ApiExt<Block, StateBackend = StateBackendFor<Backend, Block>>,
     for<'b> &'b Client: sc_consensus::BlockImport<
         Block,
         Transaction = sp_api::TransactionFor<Client, Block>,
@@ -163,7 +159,7 @@ where
         );
 
         spawn_essential.spawn_essential_blocking(
-            "executor-worker",
+            "core-executor-worker",
             None,
             crate::core_domain_worker::start_worker(
                 domain_id,

Diff for: domains/client/domain-executor/src/core_executor.rs

@@ -3,7 +3,7 @@ use crate::gossip_message_validator::{GossipMessageError, GossipMessageValidator
 use crate::utils::to_number_primitive;
 use crate::{ExecutionReceiptFor, TransactionFor};
 use domain_client_executor_gossip::{Action, GossipMessageHandler};
-use sc_client_api::{AuxStore, BlockBackend, ProofProvider};
+use sc_client_api::{AuxStore, BlockBackend, ProofProvider, StateBackendFor};
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
 use sp_core::traits::{CodeExecutor, SpawnNamed};
@@ -17,7 +17,7 @@ use std::marker::PhantomData;
 use std::sync::Arc;
 use system_runtime_primitives::SystemDomainApi;
 
-/// The implementation of the Domain `Executor`.
+/// Gossip message validator for core domain.
 pub struct CoreGossipMessageValidator<
     Block,
     SBlock,
@@ -33,7 +33,6 @@ pub struct CoreGossipMessageValidator<
     SBlock: BlockT,
     PBlock: BlockT,
 {
-    // TODO: no longer used in executor, revisit this with ParachainBlockImport together.
     primary_chain_client: Arc<PClient>,
     client: Arc<Client>,
     transaction_pool: Arc<TransactionPool>,
@@ -92,10 +91,7 @@ where
         + ProofProvider<Block>
         + 'static,
     Client::Api: sp_block_builder::BlockBuilder<Block>
-        + sp_api::ApiExt<
-            Block,
-            StateBackend = sc_client_api::backend::StateBackendFor<Backend, Block>,
-        >,
+        + sp_api::ApiExt<Block, StateBackend = StateBackendFor<Backend, Block>>,
     SClient: HeaderBackend<SBlock> + ProvideRuntimeApi<SBlock> + 'static,
     SClient::Api: SystemDomainApi<SBlock, NumberFor<PBlock>, PBlock::Hash>,
     PClient: HeaderBackend<PBlock> + ProvideRuntimeApi<PBlock> + 'static,
@@ -179,10 +175,7 @@ where
         + ProofProvider<Block>
         + 'static,
     Client::Api: sp_block_builder::BlockBuilder<Block>
-        + sp_api::ApiExt<
-            Block,
-            StateBackend = sc_client_api::backend::StateBackendFor<Backend, Block>,
-        >,
+        + sp_api::ApiExt<Block, StateBackend = StateBackendFor<Backend, Block>>,
     SClient: HeaderBackend<SBlock> + ProvideRuntimeApi<SBlock> + 'static,
     SClient::Api: SystemDomainApi<SBlock, NumberFor<PBlock>, PBlock::Hash>,
     PClient: HeaderBackend<PBlock> + ProvideRuntimeApi<PBlock> + 'static,