From 97458f84681382666dae8d00b2a17a738581c50f Mon Sep 17 00:00:00 2001 From: Dino Pacandi Date: Wed, 28 Aug 2024 13:43:54 +0200 Subject: [PATCH] Changes --- runtime/astar/src/genesis_config.rs | 15 ++------------- runtime/shibuya/src/genesis_config.rs | 15 ++------------- runtime/shiden/src/genesis_config.rs | 15 ++------------- runtime/shiden/src/lib.rs | 2 +- 4 files changed, 7 insertions(+), 40 deletions(-) diff --git a/runtime/astar/src/genesis_config.rs b/runtime/astar/src/genesis_config.rs index ac53af13e..a0aca0e2d 100644 --- a/runtime/astar/src/genesis_config.rs +++ b/runtime/astar/src/genesis_config.rs @@ -19,6 +19,7 @@ use crate::*; use astar_primitives::{evm::EVM_REVERT_CODE, genesis::GenesisAccount}; +/// Get the default genesis config for the Astar runtime. pub fn default_config(para_id: u32) -> serde_json::Value { let alice = GenesisAccount::::from_seed("Alice"); let bob = GenesisAccount::::from_seed("Bob"); @@ -129,19 +130,7 @@ pub fn default_config(para_id: u32) -> serde_json::Value { safeguard: Some(false), ..Default::default() }, - inflation: InflationConfig { - params: InflationParameters { - max_inflation_rate: Perquintill::from_percent(7), - treasury_part: Perquintill::from_percent(5), - collators_part: Perquintill::from_percent(3), - dapps_part: Perquintill::from_percent(20), - base_stakers_part: Perquintill::from_percent(25), - adjustable_stakers_part: Perquintill::from_percent(35), - bonus_part: Perquintill::from_percent(12), - ideal_staking_rate: Perquintill::from_percent(50), - }, - ..Default::default() - }, + inflation: Default::default(), oracle_membership: OracleMembershipConfig { members: vec![alice.account_id(), bob.account_id()] .try_into() diff --git a/runtime/shibuya/src/genesis_config.rs b/runtime/shibuya/src/genesis_config.rs index 954ab8942..241653731 100644 --- a/runtime/shibuya/src/genesis_config.rs +++ b/runtime/shibuya/src/genesis_config.rs @@ -19,6 +19,7 @@ use crate::*; use astar_primitives::{evm::EVM_REVERT_CODE, genesis::GenesisAccount}; +/// Get the default genesis config for the Shibuya runtime. pub fn default_config(para_id: u32) -> serde_json::Value { let alice = GenesisAccount::::from_seed("Alice"); let bob = GenesisAccount::::from_seed("Bob"); @@ -144,19 +145,7 @@ pub fn default_config(para_id: u32) -> serde_json::Value { safeguard: Some(false), ..Default::default() }, - inflation: InflationConfig { - params: InflationParameters { - max_inflation_rate: Perquintill::from_percent(7), - treasury_part: Perquintill::from_percent(5), - collators_part: Perquintill::from_percent(3), - dapps_part: Perquintill::from_percent(20), - base_stakers_part: Perquintill::from_percent(25), - adjustable_stakers_part: Perquintill::from_percent(35), - bonus_part: Perquintill::from_percent(12), - ideal_staking_rate: Perquintill::from_percent(50), - }, - ..Default::default() - }, + inflation: Default::default(), oracle_membership: OracleMembershipConfig { members: vec![alice.account_id(), bob.account_id()] .try_into() diff --git a/runtime/shiden/src/genesis_config.rs b/runtime/shiden/src/genesis_config.rs index 9e3c26754..7bebda182 100644 --- a/runtime/shiden/src/genesis_config.rs +++ b/runtime/shiden/src/genesis_config.rs @@ -19,6 +19,7 @@ use crate::*; use astar_primitives::{evm::EVM_REVERT_CODE, genesis::GenesisAccount}; +/// Get the default genesis config for the Shiden runtime. pub fn default_config(para_id: u32) -> serde_json::Value { // TODO: revisit dApp staking benchmarking logic, something causes the total issuance to saturate, probably need to reduce reward amounts // UPDATE: the issue seems to be with the omni-bencher-tool. For some reason, no issuance is generated for subsequent runs. @@ -129,19 +130,7 @@ pub fn default_config(para_id: u32) -> serde_json::Value { safeguard: Some(false), ..Default::default() }, - inflation: InflationConfig { - params: InflationParameters { - max_inflation_rate: Perquintill::from_percent(7), - treasury_part: Perquintill::from_percent(5), - collators_part: Perquintill::from_percent(3), - dapps_part: Perquintill::from_percent(20), - base_stakers_part: Perquintill::from_percent(25), - adjustable_stakers_part: Perquintill::from_percent(35), - bonus_part: Perquintill::from_percent(12), - ideal_staking_rate: Perquintill::from_percent(50), - }, - ..Default::default() - }, + inflation: Default::default(), oracle_membership: OracleMembershipConfig { members: vec![alice.account_id(), bob.account_id()] .try_into() diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs index 1afa1aecd..e4d5463e0 100644 --- a/runtime/shiden/src/lib.rs +++ b/runtime/shiden/src/lib.rs @@ -26,7 +26,7 @@ use cumulus_primitives_core::AggregateMessageOrigin; use frame_support::{ construct_runtime, dispatch::DispatchClass, - genesis_builder_helper::{build_state, get_preset}, + genesis_builder_helper::build_state, parameter_types, traits::{ fungible::{Balanced, Credit},