Update ER to include SSC transfers to other chains

crates/pallet-domains/src/tests.rs

@@ -453,6 +453,7 @@ pub(crate) fn create_dummy_receipt(
         execution_trace,
         execution_trace_root,
         block_fees: Default::default(),
+        transfers: Default::default(),
     }
 }
 

crates/sp-domains-fraud-proof/src/bundle_equivocation.rs

@@ -191,6 +191,7 @@ mod test {
                     execution_trace: vec![],
                     execution_trace_root: Default::default(),
                     block_fees: Default::default(),
+                    transfers: Default::default(),
                 },
                 estimated_bundle_weight: Default::default(),
                 bundle_extrinsics_root: Default::default(),

crates/sp-domains/src/lib.rs

@@ -433,6 +433,8 @@ pub struct ExecutionReceipt<Number, Hash, DomainNumber, DomainHash, Balance> {
     /// Compute and Domain storage fees are shared across operators and Consensus
     /// storage fees are given to the consensus block author.
     pub block_fees: BlockFees<Balance>,
+    /// List of transfers from this Domain to other chains
+    pub transfers: BTreeMap<ChainId, Balance>,
 }
 
 impl<Number, Hash, DomainNumber, DomainHash, Balance>
@@ -510,6 +512,7 @@ impl<
             execution_trace: sp_std::vec![genesis_state_root],
             execution_trace_root: Default::default(),
             block_fees: Default::default(),
+            transfers: Default::default(),
         }
     }
 
@@ -546,6 +549,7 @@ impl<
             execution_trace,
             execution_trace_root,
             block_fees: Default::default(),
+            transfers: Default::default(),
         }
     }
 }
@@ -947,6 +951,65 @@ impl ExtrinsicDigest {
     }
 }
 
+/// Identifier of a chain.
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Hash,
+    Eq,
+    PartialEq,
+    Ord,
+    PartialOrd,
+    Encode,
+    Decode,
+    TypeInfo,
+    Serialize,
+    Deserialize,
+    MaxEncodedLen,
+)]
+pub enum ChainId {
+    Consensus,
+    Domain(DomainId),
+}
+
+impl ChainId {
+    #[inline]
+    pub fn consensus_chain_id() -> Self {
+        Self::Consensus
+    }
+
+    #[inline]
+    pub fn is_consensus_chain(&self) -> bool {
+        match self {
+            ChainId::Consensus => true,
+            ChainId::Domain(_) => false,
+        }
+    }
+
+    #[inline]
+    pub fn is_domain_chain(&self) -> Option<DomainId> {
+        match self {
+            ChainId::Consensus => None,
+            ChainId::Domain(domain_id) => Some(*domain_id),
+        }
+    }
+}
+
+impl From<u32> for ChainId {
+    #[inline]
+    fn from(x: u32) -> Self {
+        Self::Domain(DomainId::new(x))
+    }
+}
+
+impl From<DomainId> for ChainId {
+    #[inline]
+    fn from(x: DomainId) -> Self {
+        Self::Domain(x)
+    }
+}
+
 pub type ExecutionReceiptFor<DomainHeader, CBlock, Balance> = ExecutionReceipt<
     NumberFor<CBlock>,
     <CBlock as BlockT>::Hash,

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

@@ -27,8 +27,7 @@ use sc_utils::mpsc::tracing_unbounded;
 use serde_json::Value;
 use sp_core::crypto::Ss58AddressFormat;
 use sp_core::traits::SpawnEssentialNamed;
-use sp_domains::DomainId;
-use sp_messenger::messages::ChainId;
+use sp_domains::{ChainId, DomainId};
 use std::collections::HashMap;
 use subspace_malicious_operator::malicious_domain_instance_starter::DomainInstanceStarter;
 use subspace_malicious_operator::{Cli, DomainCli};

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

@@ -21,7 +21,7 @@ use sc_storage_monitor::StorageMonitorService;
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 use sc_utils::mpsc::tracing_unbounded;
 use sp_core::traits::SpawnEssentialNamed;
-use sp_messenger::messages::ChainId;
+use sp_domains::ChainId;
 use std::env;
 use subspace_runtime::{Block, RuntimeApi};
 use tracing::{debug, error, info, info_span, warn};

crates/subspace-runtime/src/lib.rs

@@ -60,12 +60,12 @@ use sp_core::crypto::{ByteArray, KeyTypeId};
 use sp_core::{OpaqueMetadata, H256};
 use sp_domains::bundle_producer_election::BundleProducerElectionParams;
 use sp_domains::{
-    DomainId, DomainInstanceData, DomainsHoldIdentifier, ExecutionReceiptFor, OpaqueBundle,
-    OperatorId, OperatorPublicKey, StakingHoldIdentifier,
+    ChainId, DomainId, DomainInstanceData, DomainsHoldIdentifier, ExecutionReceiptFor,
+    OpaqueBundle, OperatorId, OperatorPublicKey, StakingHoldIdentifier,
 };
 use sp_domains_fraud_proof::fraud_proof::FraudProof;
 use sp_messenger::endpoint::{Endpoint, EndpointHandler as EndpointHandlerT, EndpointId};
-use sp_messenger::messages::{BlockMessagesWithStorageKey, ChainId, CrossDomainMessage, MessageId};
+use sp_messenger::messages::{BlockMessagesWithStorageKey, CrossDomainMessage, MessageId};
 use sp_messenger_host_functions::{get_storage_key, StorageKeyRequest};
 use sp_mmr_primitives::{EncodableOpaqueLeaf, Proof};
 use sp_runtime::traits::{

domains/client/cross-domain-message-gossip/Cargo.toml

@@ -21,6 +21,7 @@ sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/sub
 sc-utils = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sp-core = { version = "21.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
+sp-domains = { version = "0.1.0", default-features = false, path = "../../../crates/sp-domains" }
 sp-messenger = { version = "0.1.0", default-features = false, path = "../../primitives/messenger" }
 sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 tracing = "0.1.40"

domains/client/cross-domain-message-gossip/src/gossip_worker.rs

@@ -9,7 +9,7 @@ use sc_network_gossip::{
 };
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_core::twox_256;
-use sp_messenger::messages::ChainId;
+use sp_domains::ChainId;
 use sp_runtime::traits::{Block as BlockT, Hash as HashT, Header as HeaderT};
 use std::collections::{BTreeMap, HashSet};
 use std::future::poll_fn;

domains/client/cross-domain-message-gossip/src/message_listener.rs

@@ -3,7 +3,7 @@ use futures::{Stream, StreamExt};
 use sc_network::NetworkPeers;
 use sc_transaction_pool_api::{TransactionPool, TransactionSource};
 use sp_blockchain::HeaderBackend;
-use sp_messenger::messages::ChainId;
+use sp_domains::ChainId;
 use sp_runtime::codec::Decode;
 use sp_runtime::traits::Block as BlockT;
 use std::sync::Arc;

domains/client/domain-operator/src/aux_schema.rs

@@ -254,6 +254,7 @@ mod tests {
             execution_trace: Default::default(),
             execution_trace_root: Default::default(),
             block_fees: Default::default(),
+            transfers: Default::default(),
         }
     }
 

domains/client/domain-operator/src/domain_block_processor.rs

@@ -396,6 +396,8 @@ where
             execution_trace: trace,
             execution_trace_root: sp_core::H256(trace_root),
             block_fees,
+            // TODO: Fetch transfers from the runtime
+            transfers: Default::default(),
         };
 
         Ok(DomainBlockResult {
@@ -973,6 +975,7 @@ mod tests {
             execution_trace: sp_std::vec![],
             execution_trace_root: Default::default(),
             block_fees: Default::default(),
+            transfers: Default::default(),
         }
     }
 

domains/client/relayer/src/lib.rs

@@ -9,9 +9,9 @@ use sc_client_api::{AuxStore, HeaderBackend, ProofProvider, StorageProof};
 use sc_utils::mpsc::TracingUnboundedSender;
 use scale_info::TypeInfo;
 use sp_api::ProvideRuntimeApi;
-use sp_domains::DomainsApi;
+use sp_domains::{ChainId, DomainsApi};
 use sp_messenger::messages::{
-    BlockMessageWithStorageKey, BlockMessagesWithStorageKey, ChainId, ConsensusChainMmrLeafProof,
+    BlockMessageWithStorageKey, BlockMessagesWithStorageKey, ConsensusChainMmrLeafProof,
     CrossDomainMessage, Proof,
 };
 use sp_messenger::{MessengerApi, RelayerApi};

domains/client/relayer/src/worker.rs

@@ -5,8 +5,7 @@ use sc_client_api::{AuxStore, BlockchainEvents, ProofProvider};
 use sc_state_db::PruningMode;
 use sp_api::{ApiError, ProvideRuntimeApi};
 use sp_consensus::SyncOracle;
-use sp_domains::DomainsApi;
-use sp_messenger::messages::ChainId;
+use sp_domains::{ChainId, DomainsApi};
 use sp_messenger::{MessengerApi, RelayerApi};
 use sp_runtime::scale_info::TypeInfo;
 use sp_runtime::traits::{CheckedSub, NumberFor, Zero};

domains/pallets/messenger/src/fees.rs

@@ -3,8 +3,9 @@ use crate::{BalanceOf, Config, Error, Pallet};
 use frame_support::traits::fungible::Mutate;
 use frame_support::traits::tokens::{Fortitude, Precision};
 use frame_support::weights::WeightToFee;
+use sp_domains::ChainId;
 use sp_messenger::endpoint::Endpoint;
-use sp_messenger::messages::{ChainId, ChannelId, FeeModel, MessageId, Nonce};
+use sp_messenger::messages::{ChannelId, FeeModel, MessageId, Nonce};
 use sp_messenger::OnXDMRewards;
 use sp_runtime::traits::CheckedAdd;
 use sp_runtime::DispatchResult;

domains/pallets/messenger/src/lib.rs

@@ -38,9 +38,8 @@ use frame_support::traits::fungible::Inspect;
 pub use pallet::*;
 use scale_info::TypeInfo;
 use sp_core::U256;
-use sp_messenger::messages::{
-    ChainId, ChannelId, CrossDomainMessage, FeeModel, Message, MessageId, Nonce,
-};
+use sp_domains::ChainId;
+use sp_messenger::messages::{ChannelId, CrossDomainMessage, FeeModel, Message, MessageId, Nonce};
 use sp_runtime::traits::{Extrinsic, Hash};
 use sp_runtime::DispatchError;
 
@@ -108,10 +107,11 @@ mod pallet {
     use frame_system::pallet_prelude::*;
     use sp_core::storage::StorageKey;
     use sp_domains::proof_provider_and_verifier::{StorageProofVerifier, VerificationError};
+    use sp_domains::ChainId;
     use sp_messenger::endpoint::{Endpoint, EndpointHandler, EndpointRequest, Sender};
     use sp_messenger::messages::{
-        ChainId, CrossDomainMessage, InitiateChannelParams, Message, MessageId, MessageWeightTag,
-        Payload, ProtocolMessageRequest, RequestResponse, VersionedPayload,
+        CrossDomainMessage, InitiateChannelParams, Message, MessageId, MessageWeightTag, Payload,
+        ProtocolMessageRequest, RequestResponse, VersionedPayload,
     };
     use sp_messenger::{MmrProofVerifier, OnXDMRewards, StorageKeys};
     use sp_mmr_primitives::EncodableOpaqueLeaf;

domains/pallets/messenger/src/messages.rs

@@ -5,10 +5,10 @@ use crate::{
 use codec::{Decode, Encode};
 use frame_support::ensure;
 use scale_info::TypeInfo;
+use sp_domains::ChainId;
 use sp_messenger::messages::{
-    BlockMessageWithStorageKey, BlockMessagesWithStorageKey, ChainId, Message, MessageId,
-    MessageWeightTag, Payload, ProtocolMessageRequest, ProtocolMessageResponse, RequestResponse,
-    VersionedPayload,
+    BlockMessageWithStorageKey, BlockMessagesWithStorageKey, Message, MessageId, MessageWeightTag,
+    Payload, ProtocolMessageRequest, ProtocolMessageResponse, RequestResponse, VersionedPayload,
 };
 use sp_runtime::traits::Get;
 use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};

domains/pallets/messenger/src/mock.rs

@@ -2,8 +2,8 @@ use crate::{ChannelId, Channels, Config, InboxResponses, Nonce, Outbox, StateRoo
 use frame_support::storage::generator::StorageDoubleMap;
 use frame_support::weights::Weight;
 use sp_core::storage::StorageKey;
+use sp_domains::ChainId;
 use sp_messenger::endpoint::{EndpointHandler, EndpointRequest, EndpointResponse};
-use sp_messenger::messages::ChainId;
 use sp_runtime::traits::BlakeTwo256;
 use sp_runtime::DispatchResult;
 use sp_state_machine::backend::Backend;
@@ -27,8 +27,8 @@ macro_rules! impl_runtime {
         use frame_support::parameter_types;
         use pallet_balances::AccountData;
         use sp_core::H256;
+        use sp_domains::ChainId;
         use sp_messenger::endpoint::{Endpoint, EndpointHandler, EndpointId};
-        use sp_messenger::messages::ChainId;
         use sp_runtime::traits::{
             BlakeTwo256, ConstU16, ConstU32, ConstU64, Convert, IdentityLookup,
         };

domains/pallets/messenger/src/tests.rs

@@ -14,9 +14,10 @@ use pallet_transporter::Location;
 use sp_core::storage::StorageKey;
 use sp_core::{Blake2Hasher, H256};
 use sp_domains::proof_provider_and_verifier::{StorageProofVerifier, VerificationError};
+use sp_domains::ChainId;
 use sp_messenger::endpoint::{Endpoint, EndpointPayload, EndpointRequest, Sender};
 use sp_messenger::messages::{
-    ChainId, ConsensusChainMmrLeafProof, CrossDomainMessage, InitiateChannelParams, Payload, Proof,
+    ConsensusChainMmrLeafProof, CrossDomainMessage, InitiateChannelParams, Payload, Proof,
     ProtocolMessageRequest, RequestResponse, VersionedPayload,
 };
 use sp_runtime::traits::{Convert, ValidateUnsigned};

domains/pallets/transporter/Cargo.toml

@@ -8,19 +8,20 @@ homepage = "https://subspace.network"
 repository = "https://github.com/subspace/subspace"
 description = "Subspace node pallet to move funds between domains."
 include = [
-  "/src",
-  "/Cargo.toml",
-  "/README.md",
+    "/src",
+    "/Cargo.toml",
+    "/README.md",
 ]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.5", default-features = false, features = ["derive"] }
-domain-runtime-primitives = { path = "../../primitives/runtime" , default-features = false }
+domain-runtime-primitives = { path = "../../primitives/runtime", default-features = false }
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", optional = true }
 frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 scale-info = { version = "2.7.0", default-features = false, features = ["derive"] }
 sp-core = { version = "21.0.0", default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
+sp-domains = { version = "0.1.0", default-features = false, path = "../../../crates/sp-domains" }
 sp-messenger = { version = "0.1.0", default-features = false, path = "../../primitives/messenger" }
 sp-runtime = { version = "24.0.0", default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sp-std = { version = "8.0.0", default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
@@ -32,22 +33,23 @@ sp-io = { version = "23.0.0", git = "https://github.com/subspace/polkadot-sdk",
 [features]
 default = ["std"]
 std = [
-  "codec/std",
-  "domain-runtime-primitives/std",
-  "frame-benchmarking?/std",
-  "frame-support/std",
-  "frame-system/std",
-  "scale-info/std",
-  "sp-core/std",
-  "sp-messenger/std",
-  "sp-runtime/std",
-  "sp-std/std",
+    "codec/std",
+    "domain-runtime-primitives/std",
+    "frame-benchmarking?/std",
+    "frame-support/std",
+    "frame-system/std",
+    "scale-info/std",
+    "sp-core/std",
+    "sp-domains/std",
+    "sp-messenger/std",
+    "sp-runtime/std",
+    "sp-std/std",
 ]
 try-runtime = ["frame-support/try-runtime"]
 runtime-benchmarks = [
-  "frame-benchmarking",
-  "frame-benchmarking/runtime-benchmarks",
-  "frame-support/runtime-benchmarks",
-  "frame-system/runtime-benchmarks",
-  "sp-messenger/runtime-benchmarks",
+    "frame-benchmarking",
+    "frame-benchmarking/runtime-benchmarks",
+    "frame-support/runtime-benchmarks",
+    "frame-system/runtime-benchmarks",
+    "sp-messenger/runtime-benchmarks",
 ]