Bump to polkadot 0.9.37 (#1938)

* bump to 0.9.37

* add CallbackHandle to pallet_assets

* add OnCreate to pallet_evm

* update type

* fix tests

* update runtime migration

* fix ci error

integration-tests/src/kusama_transfer.rs

@@ -72,7 +72,7 @@ fn transfer_to_relay_chain() {
         println!("heiko para account in relaychain:{:?}", para_acc);
         assert_eq!(
             kusama_runtime::Balances::free_balance(&AccountId::from(BOB)),
-            999_896_665_870
+            999_895_428_355
         );
     });
 }

integration-tests/src/polkadot_transfer.rs

@@ -72,7 +72,7 @@ fn transfer_to_relay_chain() {
         println!("parallel para account in relaychain:{:?}", para_acc);
         assert_eq!(
             polkadot_runtime::Balances::free_balance(&AccountId::from(BOB)),
-            99_591_353_032
+            99_578_565_860
         );
     });
 }

node/parallel/src/client.rs

@@ -225,22 +225,25 @@ impl sc_client_api::BlockBackend<Block> for Client {
         }
     }
 
-    fn block(&self, id: &BlockId) -> sp_blockchain::Result<Option<SignedBlock<Block>>> {
+    fn block(
+        &self,
+        hash: <Block as BlockT>::Hash,
+    ) -> sp_blockchain::Result<Option<SignedBlock<Block>>> {
         with_client! {
             self,
             client,
             {
-                client.block(id)
+                client.block(hash)
             }
         }
     }
 
-    fn block_status(&self, id: &BlockId) -> sp_blockchain::Result<BlockStatus> {
+    fn block_status(&self, hash: <Block as BlockT>::Hash) -> sp_blockchain::Result<BlockStatus> {
         with_client! {
             self,
             client,
             {
-                client.block_status(id)
+                client.block_status(hash)
             }
         }
     }
@@ -455,12 +458,12 @@ impl sc_client_api::StorageProvider<Block, crate::service::FullBackend> for Clie
 }
 
 impl sp_blockchain::HeaderBackend<Block> for Client {
-    fn header(&self, id: BlockId) -> sp_blockchain::Result<Option<Header>> {
+    fn header(&self, hash: Hash) -> sp_blockchain::Result<Option<Header>> {
         with_client! {
             self,
             client,
             {
-                client.header(&id)
+                client.header(hash)
             }
         }
     }
@@ -475,12 +478,12 @@ impl sp_blockchain::HeaderBackend<Block> for Client {
         }
     }
 
-    fn status(&self, id: BlockId) -> sp_blockchain::Result<sp_blockchain::BlockStatus> {
+    fn status(&self, hash: Hash) -> sp_blockchain::Result<sp_blockchain::BlockStatus> {
         with_client! {
             self,
             client,
             {
-                client.status(id)
+                client.status(hash)
             }
         }
     }

pallets/amm/src/mock.rs

@@ -155,6 +155,7 @@ impl pallet_assets::Config for Test {
     type Extra = ();
     type WeightInfo = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }

pallets/bridge/src/mock.rs

@@ -134,6 +134,7 @@ impl pallet_assets::Config for Test {
     type Extra = ();
     type WeightInfo = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }

pallets/crowdloans/src/mock.rs

@@ -591,6 +591,7 @@ impl pallet_assets::Config for Test {
     type WeightInfo = ();
     type Extra = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }

pallets/evm-signatures/src/tests.rs

@@ -126,6 +126,7 @@ impl pallet_assets::Config for Runtime {
     type Extra = ();
     type WeightInfo = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }

pallets/farming/src/mock.rs

@@ -125,6 +125,7 @@ impl pallet_assets::Config for Test {
     type Extra = ();
     type WeightInfo = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }

pallets/liquid-staking/src/mock.rs

@@ -629,6 +629,7 @@ impl pallet_assets::Config for Test {
     type WeightInfo = ();
     type Extra = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }

pallets/loans/src/mock.rs

@@ -335,6 +335,7 @@ impl pallet_assets::Config for Test {
     type Extra = ();
     type WeightInfo = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }

pallets/prices/src/mock.rs

@@ -234,6 +234,7 @@ impl pallet_assets::Config for Test {
     type Extra = ();
     type WeightInfo = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }

pallets/router/src/mock.rs

@@ -119,6 +119,7 @@ impl pallet_assets::Config for Runtime {
     type Extra = ();
     type WeightInfo = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }

pallets/stableswap/src/mock.rs

@@ -168,6 +168,7 @@ impl pallet_assets::Config for Test {
     type Extra = ();
     type WeightInfo = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }

pallets/streaming/src/mock.rs

@@ -137,6 +137,7 @@ impl pallet_assets::Config for Test {
     type Extra = ();
     type WeightInfo = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }

pallets/xcm-helper/src/mock.rs

@@ -406,6 +406,7 @@ impl pallet_assets::Config for Test {
     type WeightInfo = ();
     type Extra = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }

precompiles/assets-erc20/src/mock.rs

@@ -222,6 +222,7 @@ impl pallet_evm::Config for Runtime {
     type BlockHashMapping = pallet_evm::SubstrateBlockHashMapping<Self>;
     type FindAuthor = ();
     type WeightPerGas = WeightPerGas;
+    type OnCreate = ();
 }
 
 // These parameters dont matter much as this will only be called by root with the forced arguments
@@ -253,6 +254,7 @@ impl pallet_assets::Config for Runtime {
     type Extra = ();
     type WeightInfo = pallet_assets::weights::SubstrateWeight<Runtime>;
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }

precompiles/balances-erc20/src/mock.rs

@@ -191,6 +191,7 @@ impl pallet_evm::Config for Runtime {
     type BlockHashMapping = pallet_evm::SubstrateBlockHashMapping<Self>;
     type FindAuthor = ();
     type WeightPerGas = WeightPerGas;
+    type OnCreate = ();
 }
 
 // Configure a mock runtime to test the pallet.

precompiles/utils/macro/Cargo.toml

@@ -1,9 +1,8 @@
 [package]
 name = "precompile-utils-macro"
-authors = ["StakeTechnologies", "PureStake"]
-description = ""
-edition = "2018"
-version = "0.1.0"
+authors = { workspace = true }
+edition = "2021"
+version = { workspace = true }
 
 [lib]
 proc-macro = true
@@ -13,8 +12,8 @@ name = "tests"
 path = "tests/tests.rs"
 
 [dependencies]
-num_enum = { version = "0.5.3", default-features = false }
-proc-macro2 = "1.0"
-quote = "1.0"
-sha3 = "0.8"
-syn = { version = "1.0", features = ["extra-traits", "fold", "full", "visit"] }
+num_enum = { workspace = true }
+sha3 = { workspace = true }
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
+syn = { workspace = true, features = ["extra-traits", "fold", "full", "visit"] }

precompiles/utils/macro/src/lib.rs

@@ -43,7 +43,7 @@ impl ::std::fmt::Debug for Bytes {
 pub fn keccak256(input: TokenStream) -> TokenStream {
     let lit_str = parse_macro_input!(input as LitStr);
 
-    let hash = Keccak256::digest(lit_str.value().as_ref());
+    let hash = Keccak256::digest(lit_str.value().as_bytes());
 
     let bytes = Bytes(hash.to_vec());
     let eval_str = format!("{:?}", bytes);
@@ -100,7 +100,7 @@ pub fn generate_function_selector(_: TokenStream, input: TokenStream) -> TokenSt
             Some((_, Expr::Lit(ExprLit { lit, .. }))) => {
                 if let Lit::Str(lit_str) = lit {
                     let selector = u32::from_be_bytes(
-                        Keccak256::digest(lit_str.value().as_ref())[..4]
+                        Keccak256::digest(lit_str.value().as_bytes())[..4]
                             .try_into()
                             .unwrap(),
                     );

precompiles/utils/macro/tests/tests.rs

@@ -24,15 +24,15 @@ pub enum Action {
 fn test_keccak256() {
     assert_eq!(
         &precompile_utils_macro::keccak256!(""),
-        Keccak256::digest(b"").as_ref(),
+        Keccak256::digest(b"").as_slice(),
     );
     assert_eq!(
         &precompile_utils_macro::keccak256!("toto()"),
-        Keccak256::digest(b"toto()").as_ref(),
+        Keccak256::digest(b"toto()").as_slice(),
     );
     assert_ne!(
         &precompile_utils_macro::keccak256!("toto()"),
-        Keccak256::digest(b"tata()").as_ref(),
+        Keccak256::digest(b"tata()").as_slice(),
     );
 }
 

runtime/heiko/src/lib.rs

@@ -497,6 +497,7 @@ impl pallet_assets::Config for Runtime {
     type WeightInfo = weights::pallet_assets::WeightInfo<Runtime>;
     type Extra = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }
@@ -859,6 +860,7 @@ impl pallet_evm::Config for Runtime {
     type BlockGasLimit = BlockGasLimit;
     type FindAuthor = FindAuthorTruncated<Aura>;
     type WeightPerGas = WeightPerGas;
+    type OnCreate = ();
 }
 
 impl pallet_ethereum::Config for Runtime {
@@ -2042,7 +2044,12 @@ pub type Executive = frame_executive::Executive<
     frame_system::ChainContext<Runtime>,
     Runtime,
     AllPalletsWithSystem,
-    (),
+    (
+        pallet_balances::migration::ResetInactive<Runtime>,
+        // We need to apply this migration again, because `ResetInactive` resets the state again.
+        pallet_balances::migration::MigrateToTrackInactive<Runtime, CheckingAccount>,
+        pallet_scheduler::migration::v4::CleanupAgendas<Runtime>,
+    ),
 >;
 
 impl fp_self_contained::SelfContainedCall for RuntimeCall {
@@ -2520,7 +2527,7 @@ impl_runtime_apis! {
 
     #[cfg(feature = "try-runtime")]
     impl frame_try_runtime::TryRuntime<Block> for Runtime {
-        fn on_runtime_upgrade(checks: bool) -> (Weight, Weight) {
+        fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
             log::info!("try-runtime::on_runtime_upgrade.");
             let weight = Executive::try_runtime_upgrade(checks).unwrap();
             (weight, RuntimeBlockWeights::get().max_block)

runtime/kerria/src/lib.rs

@@ -485,6 +485,7 @@ impl pallet_assets::Config for Runtime {
     type WeightInfo = ();
     type Extra = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }
@@ -846,6 +847,7 @@ impl pallet_evm::Config for Runtime {
     type BlockGasLimit = BlockGasLimit;
     type FindAuthor = FindAuthorTruncated<Aura>;
     type WeightPerGas = WeightPerGas;
+    type OnCreate = ();
 }
 
 impl pallet_ethereum::Config for Runtime {
@@ -2499,7 +2501,7 @@ impl_runtime_apis! {
 
     #[cfg(feature = "try-runtime")]
     impl frame_try_runtime::TryRuntime<Block> for Runtime {
-        fn on_runtime_upgrade(checks: bool) -> (Weight, Weight) {
+        fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
             log::info!("try-runtime::on_runtime_upgrade.");
             let weight = Executive::try_runtime_upgrade(checks).unwrap();
             (weight, RuntimeBlockWeights::get().max_block)

runtime/parallel/src/lib.rs

@@ -501,6 +501,7 @@ impl pallet_assets::Config for Runtime {
     type WeightInfo = weights::pallet_assets::WeightInfo<Runtime>;
     type Extra = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }
@@ -862,6 +863,7 @@ impl pallet_evm::Config for Runtime {
     type BlockGasLimit = BlockGasLimit;
     type FindAuthor = FindAuthorTruncated<Aura>;
     type WeightPerGas = WeightPerGas;
+    type OnCreate = ();
 }
 
 impl pallet_ethereum::Config for Runtime {
@@ -2045,7 +2047,12 @@ pub type Executive = frame_executive::Executive<
     frame_system::ChainContext<Runtime>,
     Runtime,
     AllPalletsWithSystem,
-    (),
+    (
+        pallet_balances::migration::ResetInactive<Runtime>,
+        // We need to apply this migration again, because `ResetInactive` resets the state again.
+        pallet_balances::migration::MigrateToTrackInactive<Runtime, CheckingAccount>,
+        pallet_scheduler::migration::v4::CleanupAgendas<Runtime>,
+    ),
 >;
 
 impl fp_self_contained::SelfContainedCall for RuntimeCall {
@@ -2523,7 +2530,7 @@ impl_runtime_apis! {
 
     #[cfg(feature = "try-runtime")]
     impl frame_try_runtime::TryRuntime<Block> for Runtime {
-        fn on_runtime_upgrade(checks: bool) -> (Weight, Weight) {
+        fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
             log::info!("try-runtime::on_runtime_upgrade.");
             let weight = Executive::try_runtime_upgrade(checks).unwrap();
             (weight, RuntimeBlockWeights::get().max_block)

runtime/vanilla/src/lib.rs

@@ -485,6 +485,7 @@ impl pallet_assets::Config for Runtime {
     type WeightInfo = ();
     type Extra = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+    type CallbackHandle = ();
     #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }
@@ -847,6 +848,7 @@ impl pallet_evm::Config for Runtime {
     type BlockGasLimit = BlockGasLimit;
     type FindAuthor = FindAuthorTruncated<Aura>;
     type WeightPerGas = WeightPerGas;
+    type OnCreate = ();
 }
 
 impl pallet_ethereum::Config for Runtime {
@@ -2529,7 +2531,7 @@ impl_runtime_apis! {
 
     #[cfg(feature = "try-runtime")]
     impl frame_try_runtime::TryRuntime<Block> for Runtime {
-        fn on_runtime_upgrade(checks: bool) -> (Weight, Weight) {
+        fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
             log::info!("try-runtime::on_runtime_upgrade.");
             let weight = Executive::try_runtime_upgrade(checks).unwrap();
             (weight, RuntimeBlockWeights::get().max_block)