Runtime genesis generation

Cargo.toml

@@ -77,7 +77,7 @@ clap = { version = "4.2.5", features = ["derive"] }
 env_logger = "0.10.0"
 futures = { version = "0.3.30" }
 serde = { version = "1.0.151", default-features = false, features = ["derive", "alloc"] }
-serde_json = "1.0.92"
+serde_json = { version = "1.0.92", default-features = false }
 tokio = { version = "1.24.2", features = ["macros", "sync"] }
 url = "2.2.2"
 jsonrpsee = { version = "0.22.5", features = ["server"] }

bin/collator/Cargo.toml

@@ -33,6 +33,7 @@ sp-api = { workspace = true, features = ["std"] }
 sp-block-builder = { workspace = true, features = ["std"] }
 sp-consensus-aura = { workspace = true, features = ["std"] }
 sp-core = { workspace = true, features = ["std"] }
+sp-genesis-builder = { workspace = true, features = ["std"] }
 sp-inherents = { workspace = true, features = ["std"] }
 sp-io = { workspace = true, features = ["std"] }
 sp-offchain = { workspace = true, features = ["std"] }

bin/collator/src/local/chain_spec.rs

@@ -16,208 +16,27 @@
 // You should have received a copy of the GNU General Public License
 // along with Astar. If not, see <http://www.gnu.org/licenses/>.
 
-//! Chain specifications.
-
-use local_runtime::{
-    wasm_binary_unwrap, AccountId, AuraConfig, AuraId, BalancesConfig,
-    CommunityCouncilMembershipConfig, CommunityTreasuryPalletId, CouncilMembershipConfig,
-    DappStakingConfig, EVMConfig, GrandpaConfig, GrandpaId, InflationConfig, InflationParameters,
-    Precompiles, RuntimeGenesisConfig, Signature, SudoConfig, TechnicalCommitteeMembershipConfig,
-    TierThreshold, TreasuryPalletId, VestingConfig, AST,
-};
+use local_runtime::wasm_binary_unwrap;
 use sc_service::ChainType;
-use sp_core::{crypto::Ss58Codec, sr25519, Pair, Public};
-use sp_runtime::{
-    traits::{AccountIdConversion, IdentifyAccount, Verify},
-    Perbill, Permill,
-};
-
-type AccountPublic = <Signature as Verify>::Signer;
 
-/// Specialized `ChainSpec` for Shiden Network.
+/// Specialized `ChainSpec` for local network.
 pub type ChainSpec = sc_service::GenericChainSpec<local_runtime::RuntimeGenesisConfig>;
 
-/// Helper function to generate a crypto pair from seed
-fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
-    TPublic::Pair::from_string(&format!("//{}", seed), None)
-        .expect("static values are valid; qed")
-        .public()
-}
-
-/// Helper function to generate an account ID from seed
-fn get_account_id_from_seed<TPublic: Public>(seed: &str) -> AccountId
-where
-    AccountPublic: From<<TPublic::Pair as Pair>::Public>,
-{
-    AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()
-}
-
-/// Generate an Aura authority key.
-pub fn authority_keys_from_seed(s: &str) -> (AuraId, GrandpaId) {
-    (get_from_seed::<AuraId>(s), get_from_seed::<GrandpaId>(s))
-}
-
-/// Development config (single validator Alice)
+/// Development config.
 pub fn development_config() -> ChainSpec {
     let mut properties = serde_json::map::Map::new();
     properties.insert("tokenSymbol".into(), "LOC".into());
     properties.insert("tokenDecimals".into(), 18.into());
+
     ChainSpec::builder(wasm_binary_unwrap(), None)
         .with_name("Development")
         .with_id("dev")
         .with_chain_type(ChainType::Development)
         .with_properties(properties)
-        .with_genesis_config(testnet_genesis(
-            vec![authority_keys_from_seed("Alice")],
-            get_account_id_from_seed::<sr25519::Public>("Alice"),
-            vec![
-                get_account_id_from_seed::<sr25519::Public>("Alice"),
-                get_account_id_from_seed::<sr25519::Public>("Bob"),
-                get_account_id_from_seed::<sr25519::Public>("Dave"),
-                get_account_id_from_seed::<sr25519::Public>("Charlie"),
-                get_account_id_from_seed::<sr25519::Public>("Eve"),
-                get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-                TreasuryPalletId::get().into_account_truncating(),
-                CommunityTreasuryPalletId::get().into_account_truncating(),
-                // Arrakis.TEST account in MetaMask
-                // Import known test account with private key
-                // 0x01ab6e801c06e59ca97a14fc0a1978b27fa366fc87450e0b65459dd3515b7391
-                // H160 address: 0xaaafB3972B05630fCceE866eC69CdADd9baC2771
-                AccountId::from_ss58check("5FQedkNQcF2fJPwkB6Z1ZcMgGti4vcJQNs6x85YPv3VhjBBT")
-                    .unwrap(),
-            ],
-        ))
+        .with_genesis_config(local_runtime::genesis_config::default_config())
         .build()
 }
 
-fn testnet_genesis(
-    initial_authorities: Vec<(AuraId, GrandpaId)>,
-    root_key: AccountId,
-    endowed_accounts: Vec<AccountId>,
-) -> serde_json::Value {
-    let accounts: Vec<AccountId> = vec!["Alice", "Bob", "Charlie", "Dave", "Eve"]
-        .iter()
-        .map(|s| get_account_id_from_seed::<sr25519::Public>(s))
-        .collect();
-
-    // This is supposed the be the simplest bytecode to revert without returning any data.
-    // We will pre-deploy it under all of our precompiles to ensure they can be called from
-    // within contracts.
-    // (PUSH1 0x00 PUSH1 0x00 REVERT)
-    let revert_bytecode = vec![0x60, 0x00, 0x60, 0x00, 0xFD];
-    let config = RuntimeGenesisConfig {
-        system: Default::default(),
-        balances: BalancesConfig {
-            balances: endowed_accounts
-                .iter()
-                .cloned()
-                .map(|k| (k, 1_000_000_000 * AST))
-                .collect(),
-        },
-        vesting: VestingConfig { vesting: vec![] },
-        aura: AuraConfig {
-            authorities: initial_authorities.iter().map(|x| (x.0.clone())).collect(),
-        },
-        grandpa: GrandpaConfig {
-            authorities: initial_authorities
-                .iter()
-                .map(|x| (x.1.clone(), 1))
-                .collect(),
-            ..Default::default()
-        },
-        evm: EVMConfig {
-            // We need _some_ code inserted at the precompile address so that
-            // the evm will actually call the address.
-            accounts: Precompiles::used_addresses_h160()
-                .map(|addr| {
-                    (
-                        addr,
-                        fp_evm::GenesisAccount {
-                            nonce: Default::default(),
-                            balance: Default::default(),
-                            storage: Default::default(),
-                            code: revert_bytecode.clone(),
-                        },
-                    )
-                })
-                .collect(),
-            ..Default::default()
-        },
-        ethereum: Default::default(),
-        sudo: SudoConfig {
-            key: Some(root_key),
-        },
-        assets: Default::default(),
-        transaction_payment: Default::default(),
-        dapp_staking: DappStakingConfig {
-            reward_portion: vec![
-                Permill::from_percent(40),
-                Permill::from_percent(30),
-                Permill::from_percent(20),
-                Permill::from_percent(10),
-            ],
-            slot_distribution: vec![
-                Permill::from_percent(10),
-                Permill::from_percent(20),
-                Permill::from_percent(30),
-                Permill::from_percent(40),
-            ],
-            tier_thresholds: vec![
-                TierThreshold::DynamicPercentage {
-                    percentage: Perbill::from_parts(35_700_000), // 3.57%
-                    minimum_required_percentage: Perbill::from_parts(23_800_000), // 2.38%
-                },
-                TierThreshold::DynamicPercentage {
-                    percentage: Perbill::from_parts(8_900_000), // 0.89%
-                    minimum_required_percentage: Perbill::from_parts(6_000_000), // 0.6%
-                },
-                TierThreshold::DynamicPercentage {
-                    percentage: Perbill::from_parts(23_800_000), // 2.38%
-                    minimum_required_percentage: Perbill::from_parts(17_900_000), // 1.79%
-                },
-                TierThreshold::FixedPercentage {
-                    required_percentage: Perbill::from_parts(600_000), // 0.06%
-                },
-            ],
-            slots_per_tier: vec![10, 20, 30, 40],
-            safeguard: Some(false),
-            ..Default::default()
-        },
-        inflation: InflationConfig {
-            params: InflationParameters::default(),
-            ..Default::default()
-        },
-        council_membership: CouncilMembershipConfig {
-            members: accounts
-                .clone()
-                .try_into()
-                .expect("Should support at least 5 members."),
-            phantom: Default::default(),
-        },
-        technical_committee_membership: TechnicalCommitteeMembershipConfig {
-            members: accounts[..3]
-                .to_vec()
-                .try_into()
-                .expect("Should support at least 3 members."),
-            phantom: Default::default(),
-        },
-        community_council_membership: CommunityCouncilMembershipConfig {
-            members: accounts
-                .try_into()
-                .expect("Should support at least 5 members."),
-            phantom: Default::default(),
-        },
-        council: Default::default(),
-        technical_committee: Default::default(),
-        community_council: Default::default(),
-        democracy: Default::default(),
-        treasury: Default::default(),
-        community_treasury: Default::default(),
-    };
-
-    serde_json::to_value(&config).expect("Could not build genesis config.")
-}
-
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;