Skip to content

Commit

Permalink
update state version to 1 on mandala (#2759)
Browse files Browse the repository at this point in the history
* update state tire version to 1

* use NeverEnsureOrigin
  • Loading branch information
zjb0807 authored May 10, 2024
1 parent eb96173 commit 332b9c6
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 1 deletion.
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ sp-weights = { version = "30.0.0", default-features = false }
xcm = { version = "10.0.0", package = "staging-xcm", default-features = false }
xcm-builder = { version = "10.0.0", package = "staging-xcm-builder", default-features = false }
xcm-executor = { version = "10.0.0", package = "staging-xcm-executor", default-features = false }
pallet-state-trie-migration = { version = "32.0.0", default-features = false }

# polkadot-sdk (client)
cumulus-client-cli = { version = "0.10.0" }
Expand Down
4 changes: 4 additions & 0 deletions runtime/mandala/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ sp-staking = { workspace = true }
sp-std = { workspace = true }
sp-transaction-pool = { workspace = true }
sp-version = { workspace = true }
pallet-state-trie-migration = { workspace = true, optional = true }

# cumulus
cumulus-pallet-aura-ext = { workspace = true }
Expand Down Expand Up @@ -208,6 +209,7 @@ std = [
"sp-transaction-pool/std",
"sp-version/std",
"substrate-wasm-builder",
"pallet-state-trie-migration/std",

"cumulus-pallet-aura-ext/std",
"cumulus-pallet-parachain-system/std",
Expand Down Expand Up @@ -307,6 +309,7 @@ runtime-benchmarks = [
"pallet-utility/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"sp-staking/runtime-benchmarks",
"pallet-state-trie-migration/runtime-benchmarks",

"cumulus-pallet-parachain-system/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
Expand Down Expand Up @@ -380,6 +383,7 @@ try-runtime = [
"pallet-transaction-payment/try-runtime",
"pallet-treasury/try-runtime",
"pallet-utility/try-runtime",
"pallet-state-trie-migration/try-runtime",

"cumulus-pallet-aura-ext/try-runtime",
"cumulus-pallet-parachain-system/try-runtime",
Expand Down
26 changes: 25 additions & 1 deletion runtime/mandala/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
#[cfg(feature = "disable-runtime-api")]
apis: sp_version::create_apis_vec![[]],
transaction_version: 3,
state_version: 0,
state_version: 1,
};

/// The version information used to identify this runtime when compiled
Expand Down Expand Up @@ -1872,6 +1872,28 @@ impl orml_parameters::Config for Runtime {
type WeightInfo = ();
}

parameter_types! {
// The deposit configuration for the singed migration. Specially if you want to allow any signed account to do the migration (see `SignedFilter`, these deposits should be high)
pub MigrationSignedDepositPerItem: Balance = dollar(ACA);
pub MigrationSignedDepositBase: Balance = dollar(ACA);
pub const MigrationMaxKeyLen: u32 = 512;
}

impl pallet_state_trie_migration::Config for Runtime {
// An origin that can control the whole pallet: should be Root, or a part of your council.
type ControlOrigin = EnsureRootOrTwoThirdsTechnicalCommittee;
// specific account for the migration, can trigger the signed migrations.
type SignedFilter = frame_support::traits::NeverEnsureOrigin<AccountId>;
type RuntimeEvent = RuntimeEvent;
type Currency = Balances;
type RuntimeHoldReason = RuntimeHoldReason;
type MaxKeyLen = MigrationMaxKeyLen;
type SignedDepositPerItem = MigrationSignedDepositPerItem;
type SignedDepositBase = MigrationSignedDepositBase;
// Replace this with weight based on your runtime.
type WeightInfo = pallet_state_trie_migration::weights::SubstrateWeight<Runtime>;
}

#[derive(Clone, Encode, Decode, PartialEq, Eq, RuntimeDebug)]
pub struct ConvertEthereumTx;

Expand Down Expand Up @@ -2141,6 +2163,8 @@ construct_runtime!(
// Parachain System, always put it at the end
ParachainSystem: cumulus_pallet_parachain_system = 160,

StateTrieMigration: pallet_state_trie_migration = 254,

// Dev
Sudo: pallet_sudo = 255,
}
Expand Down

0 comments on commit 332b9c6

Please sign in to comment.