Skip to content

Commit 805d54d

Browse files
authored
Rococo AH: undeploy trie migration (#4414)
The state-trie migration is completed on Rococo Asset-Hub as double-checked [here](#4174 (comment)). Undeploying now. --------- Signed-off-by: Oliver Tale-Yazdi <[email protected]>
1 parent 0fcbd4e commit 805d54d

File tree

4 files changed

+10
-48
lines changed

4 files changed

+10
-48
lines changed

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ pallet-nfts = { path = "../../../../../substrate/frame/nfts", default-features =
3737
pallet-nfts-runtime-api = { path = "../../../../../substrate/frame/nfts/runtime-api", default-features = false }
3838
pallet-proxy = { path = "../../../../../substrate/frame/proxy", default-features = false }
3939
pallet-session = { path = "../../../../../substrate/frame/session", default-features = false }
40-
pallet-state-trie-migration = { path = "../../../../../substrate/frame/state-trie-migration", default-features = false }
4140
pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false }
4241
pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false }
4342
pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false }
@@ -124,7 +123,6 @@ runtime-benchmarks = [
124123
"pallet-nft-fractionalization/runtime-benchmarks",
125124
"pallet-nfts/runtime-benchmarks",
126125
"pallet-proxy/runtime-benchmarks",
127-
"pallet-state-trie-migration/runtime-benchmarks",
128126
"pallet-timestamp/runtime-benchmarks",
129127
"pallet-uniques/runtime-benchmarks",
130128
"pallet-utility/runtime-benchmarks",
@@ -163,7 +161,6 @@ try-runtime = [
163161
"pallet-nfts/try-runtime",
164162
"pallet-proxy/try-runtime",
165163
"pallet-session/try-runtime",
166-
"pallet-state-trie-migration/try-runtime",
167164
"pallet-timestamp/try-runtime",
168165
"pallet-transaction-payment/try-runtime",
169166
"pallet-uniques/try-runtime",
@@ -213,7 +210,6 @@ std = [
213210
"pallet-nfts/std",
214211
"pallet-proxy/std",
215212
"pallet-session/std",
216-
"pallet-state-trie-migration/std",
217213
"pallet-timestamp/std",
218214
"pallet-transaction-payment-rpc-runtime-api/std",
219215
"pallet-transaction-payment/std",

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -945,8 +945,6 @@ construct_runtime!(
945945
PoolAssets: pallet_assets::<Instance3> = 55,
946946
AssetConversion: pallet_asset_conversion = 56,
947947

948-
StateTrieMigration: pallet_state_trie_migration = 70,
949-
950948
// TODO: the pallet instance should be removed once all pools have migrated
951949
// to the new account IDs.
952950
AssetConversionMigration: pallet_asset_conversion_ops = 200,
@@ -1785,47 +1783,6 @@ cumulus_pallet_parachain_system::register_validate_block! {
17851783
BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
17861784
}
17871785

1788-
parameter_types! {
1789-
// 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)
1790-
pub const MigrationSignedDepositPerItem: Balance = CENTS;
1791-
pub const MigrationSignedDepositBase: Balance = 2_000 * CENTS;
1792-
pub const MigrationMaxKeyLen: u32 = 512;
1793-
}
1794-
1795-
impl pallet_state_trie_migration::Config for Runtime {
1796-
type RuntimeEvent = RuntimeEvent;
1797-
type Currency = Balances;
1798-
type RuntimeHoldReason = RuntimeHoldReason;
1799-
type SignedDepositPerItem = MigrationSignedDepositPerItem;
1800-
type SignedDepositBase = MigrationSignedDepositBase;
1801-
// An origin that can control the whole pallet: should be Root, or a part of your council.
1802-
type ControlOrigin = frame_system::EnsureSignedBy<RootMigController, AccountId>;
1803-
// specific account for the migration, can trigger the signed migrations.
1804-
type SignedFilter = frame_system::EnsureSignedBy<MigController, AccountId>;
1805-
1806-
// Replace this with weight based on your runtime.
1807-
type WeightInfo = pallet_state_trie_migration::weights::SubstrateWeight<Runtime>;
1808-
1809-
type MaxKeyLen = MigrationMaxKeyLen;
1810-
}
1811-
1812-
frame_support::ord_parameter_types! {
1813-
pub const MigController: AccountId = AccountId::from(hex_literal::hex!("8458ed39dc4b6f6c7255f7bc42be50c2967db126357c999d44e12ca7ac80dc52"));
1814-
pub const RootMigController: AccountId = AccountId::from(hex_literal::hex!("8458ed39dc4b6f6c7255f7bc42be50c2967db126357c999d44e12ca7ac80dc52"));
1815-
}
1816-
1817-
#[test]
1818-
fn ensure_key_ss58() {
1819-
use frame_support::traits::SortedMembers;
1820-
use sp_core::crypto::Ss58Codec;
1821-
let acc =
1822-
AccountId::from_ss58check("5F4EbSkZz18X36xhbsjvDNs6NuZ82HyYtq5UiJ1h9SBHJXZD").unwrap();
1823-
assert_eq!(acc, MigController::sorted_members()[0]);
1824-
let acc =
1825-
AccountId::from_ss58check("5F4EbSkZz18X36xhbsjvDNs6NuZ82HyYtq5UiJ1h9SBHJXZD").unwrap();
1826-
assert_eq!(acc, RootMigController::sorted_members()[0]);
1827-
}
1828-
18291786
#[cfg(test)]
18301787
mod tests {
18311788
use super::*;

prdoc/pr_4414.prdoc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
title: "Rococo Asset Hub: undeploy state-trie migration"
2+
3+
doc:
4+
- audience: Runtime Dev
5+
description: |
6+
The state-trie migration on the Rococo Asset Hub is completed and is now removed.
7+
8+
crates:
9+
- name: asset-hub-rococo-runtime
10+
bump: major

0 commit comments

Comments
 (0)