Merge remote-tracking branch 'origin/main' into update-substrate-follow-up

# Conflicts:
#	crates/subspace-node/src/chain_spec.rs

Author: nazar-pc

Cargo.lock

@@ -215,6 +215,7 @@ pub(crate) fn do_instantiate_domain<T: Config>(
                 chain_id: evm_chain_id,
             }
         }
+        RuntimeType::AutoId => DomainRuntimeInfo::AutoId,
     };
 
     // burn total issuance on domain from owners account and track the domain balance

crates/pallet-domains/src/domain_registry.rs

@@ -192,6 +192,8 @@ mod pallet {
     #[cfg(not(feature = "std"))]
     use alloc::string::String;
     #[cfg(not(feature = "std"))]
+    use alloc::vec;
+    #[cfg(not(feature = "std"))]
     use alloc::vec::Vec;
     use codec::FullCodec;
     use domain_runtime_primitives::EVMChainId;
@@ -219,7 +221,6 @@ mod pallet {
     use sp_std::boxed::Box;
     use sp_std::collections::btree_set::BTreeSet;
     use sp_std::fmt::Debug;
-    use sp_std::vec;
     use subspace_core_primitives::U256;
     use subspace_runtime_primitives::StorageFee;
 
@@ -1399,16 +1400,16 @@ mod pallet {
 
     #[pallet::genesis_config]
     pub struct GenesisConfig<T: Config> {
-        pub genesis_domain: Option<GenesisDomain<T::AccountId, BalanceOf<T>>>,
         pub permissioned_action_allowed_by:
             Option<sp_domains::PermissionedActionAllowedBy<T::AccountId>>,
+        pub genesis_domains: Vec<GenesisDomain<T::AccountId, BalanceOf<T>>>,
     }
 
     impl<T: Config> Default for GenesisConfig<T> {
         fn default() -> Self {
             GenesisConfig {
-                genesis_domain: None,
                 permissioned_action_allowed_by: None,
+                genesis_domains: vec![],
             }
         }
     }
@@ -1421,46 +1422,58 @@ mod pallet {
             {
                 PermissionedActionAllowedBy::<T>::put(permissioned_action_allowed_by)
             }
-            if let Some(genesis_domain) = self.genesis_domain.as_ref().cloned() {
-                // Register the genesis domain runtime
-                let runtime_id = register_runtime_at_genesis::<T>(
-                    genesis_domain.runtime_name,
-                    genesis_domain.runtime_type,
-                    genesis_domain.runtime_version,
-                    genesis_domain.raw_genesis_storage,
-                    Zero::zero(),
-                )
-                .expect("Genesis runtime registration must always succeed");
-
-                // Instantiate the genesis domain
-                let domain_config = DomainConfig {
-                    domain_name: genesis_domain.domain_name,
-                    runtime_id,
-                    max_block_size: genesis_domain.max_block_size,
-                    max_block_weight: genesis_domain.max_block_weight,
-                    bundle_slot_probability: genesis_domain.bundle_slot_probability,
-                    target_bundles_per_block: genesis_domain.target_bundles_per_block,
-                    operator_allow_list: genesis_domain.operator_allow_list,
-                    initial_balances: genesis_domain.initial_balances,
-                };
-                let domain_owner = genesis_domain.owner_account_id;
-                let domain_id =
-                    do_instantiate_domain::<T>(domain_config, domain_owner.clone(), Zero::zero())
-                        .expect("Genesis domain instantiation must always succeed");
-
-                // Register domain_owner as the genesis operator.
-                let operator_config = OperatorConfig {
-                    signing_key: genesis_domain.signing_key.clone(),
-                    minimum_nominator_stake: genesis_domain.minimum_nominator_stake,
-                    nomination_tax: genesis_domain.nomination_tax,
-                };
-                let operator_stake = T::MinOperatorStake::get();
-                do_register_operator::<T>(domain_owner, domain_id, operator_stake, operator_config)
+
+            self.genesis_domains
+                .clone()
+                .into_iter()
+                .for_each(|genesis_domain| {
+                    // Register the genesis domain runtime
+                    let runtime_id = register_runtime_at_genesis::<T>(
+                        genesis_domain.runtime_name,
+                        genesis_domain.runtime_type,
+                        genesis_domain.runtime_version,
+                        genesis_domain.raw_genesis_storage,
+                        Zero::zero(),
+                    )
+                    .expect("Genesis runtime registration must always succeed");
+
+                    // Instantiate the genesis domain
+                    let domain_config = DomainConfig {
+                        domain_name: genesis_domain.domain_name,
+                        runtime_id,
+                        max_block_size: genesis_domain.max_block_size,
+                        max_block_weight: genesis_domain.max_block_weight,
+                        bundle_slot_probability: genesis_domain.bundle_slot_probability,
+                        target_bundles_per_block: genesis_domain.target_bundles_per_block,
+                        operator_allow_list: genesis_domain.operator_allow_list,
+                        initial_balances: genesis_domain.initial_balances,
+                    };
+                    let domain_owner = genesis_domain.owner_account_id;
+                    let domain_id = do_instantiate_domain::<T>(
+                        domain_config,
+                        domain_owner.clone(),
+                        Zero::zero(),
+                    )
+                    .expect("Genesis domain instantiation must always succeed");
+
+                    // Register domain_owner as the genesis operator.
+                    let operator_config = OperatorConfig {
+                        signing_key: genesis_domain.signing_key.clone(),
+                        minimum_nominator_stake: genesis_domain.minimum_nominator_stake,
+                        nomination_tax: genesis_domain.nomination_tax,
+                    };
+                    let operator_stake = T::MinOperatorStake::get();
+                    do_register_operator::<T>(
+                        domain_owner,
+                        domain_id,
+                        operator_stake,
+                        operator_config,
+                    )
                     .expect("Genesis operator registration must succeed");
 
-                do_finalize_domain_current_epoch::<T>(domain_id)
-                    .expect("Genesis epoch must succeed");
-            }
+                    do_finalize_domain_current_epoch::<T>(domain_id)
+                        .expect("Genesis epoch must succeed");
+                });
         }
     }
 

crates/pallet-domains/src/lib.rs

@@ -15,6 +15,7 @@ use frame_support::PalletError;
 use frame_system::pallet_prelude::*;
 use frame_system::AccountInfo;
 use scale_info::TypeInfo;
+use sp_core::crypto::AccountId32;
 use sp_core::Hasher;
 use sp_domains::storage::{RawGenesis, StorageData, StorageKey};
 use sp_domains::{DomainId, DomainsDigestItem, RuntimeId, RuntimeType};
@@ -56,6 +57,7 @@ pub struct RuntimeObject<Number, Hash> {
 #[derive(TypeInfo, Debug, Encode, Decode, Clone, PartialEq, Eq, Copy)]
 pub enum DomainRuntimeInfo {
     EVM { chain_id: EVMChainId },
+    AutoId,
 }
 
 impl Default for DomainRuntimeInfo {
@@ -123,6 +125,25 @@ impl<Number, Hash> RuntimeObject<Number, Hash> {
                     initial_balances,
                 ));
             }
+            DomainRuntimeInfo::AutoId => {
+                let initial_balances = initial_balances.into_iter().try_fold(
+                    Vec::<(AccountId32, BalanceOf<T>)>::new(),
+                    |mut balances, (account_id, balance)| {
+                        let account_id =
+                            domain_runtime_primitives::AccountIdConverter::try_convert_back(
+                                account_id,
+                            )
+                            .ok_or(Error::InvalidAccountIdType)?;
+
+                        balances.push((account_id, balance));
+                        Ok(balances)
+                    },
+                )?;
+                raw_genesis.set_top_storages(derive_initial_balances_storages::<T, _>(
+                    total_issuance,
+                    initial_balances,
+                ));
+            }
         }
 
         Ok(raw_genesis)

crates/pallet-domains/src/runtime_registry.rs

@@ -20,6 +20,7 @@ frame-benchmarking = { default-features = false, git = "https://github.com/subsp
 sc-client-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "447bbc765020674614e9ac982163f7e11e5b03ea" }
 sc-executor = { git = "https://github.com/subspace/polkadot-sdk", rev = "447bbc765020674614e9ac982163f7e11e5b03ea" }
 sp-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "447bbc765020674614e9ac982163f7e11e5b03ea" }
+sp-auto-id = { version = "0.1.0", path = "../../domains/primitives/auto-id" }
 sp-blockchain = { git = "https://github.com/subspace/polkadot-sdk", rev = "447bbc765020674614e9ac982163f7e11e5b03ea" }
 sp-core = { git = "https://github.com/subspace/polkadot-sdk", rev = "447bbc765020674614e9ac982163f7e11e5b03ea" }
 sp-domains = { version = "0.1.0", path = "../sp-domains" }

crates/sc-domains/Cargo.toml

@@ -33,6 +33,7 @@ use std::sync::Arc;
 /// Host functions required for Subspace domain
 #[cfg(not(feature = "runtime-benchmarks"))]
 pub type HostFunctions = (
+    sp_auto_id::auto_id_runtime_interface::HostFunctions,
     sp_io::SubstrateHostFunctions,
     sp_messenger_host_functions::HostFunctions,
     sp_subspace_mmr::DomainHostFunctions,
@@ -41,6 +42,7 @@ pub type HostFunctions = (
 /// Host functions required for Subspace domain
 #[cfg(feature = "runtime-benchmarks")]
 pub type HostFunctions = (
+    sp_auto_id::auto_id_runtime_interface::HostFunctions,
     sp_io::SubstrateHostFunctions,
     sp_messenger_host_functions::HostFunctions,
     sp_subspace_mmr::DomainHostFunctions,
@@ -96,6 +98,10 @@ where
             ),
         )));
 
+        exts.register(sp_auto_id::host_functions::HostFunctionExtension::new(
+            Arc::new(sp_auto_id::host_functions::HostFunctionsImpl),
+        ));
+
         exts
     }
 }

crates/sc-domains/src/lib.rs

@@ -833,6 +833,7 @@ pub struct GenesisDomain<AccountId: Ord, Balance> {
 pub enum RuntimeType {
     #[default]
     Evm,
+    AutoId,
 }
 
 /// Type representing the runtime ID.

crates/sc-subspace-chain-specs/res/chain-spec-raw-devnet.json

@@ -19,6 +19,7 @@ include = [
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+auto-id-domain-runtime = { version = "0.1.0", path = "../../domains/runtime/auto-id" }
 clap = { version = "4.5.4", features = ["derive"] }
 cross-domain-message-gossip = { version = "0.1.0", path = "../../domains/client/cross-domain-message-gossip" }
 domain-client-message-relayer = { version = "0.1.0", path = "../../domains/client/relayer" }

crates/sp-domains/src/lib.rs

@@ -258,7 +258,7 @@ fn subspace_genesis_config(
             permissioned_action_allowed_by: Some(
                 genesis_domain_params.permissioned_action_allowed_by,
             ),
-            genesis_domain: Some(sp_domains::GenesisDomain {
+            genesis_domains: vec![sp_domains::GenesisDomain {
                 runtime_name: "evm".to_owned(),
                 runtime_type: RuntimeType::Evm,
                 runtime_version: evm_domain_runtime::VERSION,
@@ -276,7 +276,7 @@ fn subspace_genesis_config(
                 nomination_tax: Percent::from_percent(5),
                 minimum_nominator_stake: 100 * SSC,
                 initial_balances: genesis_domain_params.initial_balances,
-            }),
+            }],
         },
     }
 }