fix: correct the migrations

Author: lrazovic

Cargo.lock

@@ -51,7 +51,7 @@ codegen-units = 1
 
 [workspace.dependencies]
 # Build deps
-substrate-wasm-builder = { version = "25.0.0" }
+substrate-wasm-builder = { version = "25.0.1" }
 
 # Internal pallets (with default disabled)
 pallet-dispenser = { path = "pallets/dispenser", default-features = false }
@@ -85,28 +85,28 @@ substrate-fixed = { version = "0.5.9", default-features = false }
 
 # External (without extra features and with default disabled if necessary)
 parity-scale-codec = { version = "3.6.12", default-features = false }
-clap = { version = "4.5.3" }
+clap = { version = "4.5.13" }
 futures = { version = "0.3.31" }
-scale-info = { version = "2.11.3", default-features = false, features = [
+scale-info = { version = "2.11.1", default-features = false, features = [
     "derive",
 ] }
 jsonrpsee = { version = "0.24.3", features = ["server"] }
 hex-literal = "0.4.1"
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
-serde = { version = "1.0.204", default-features = false }
-serde_json = "1.0.120"
-smallvec = "1.13.2"
+serde = { version = "1.0.214", default-features = false }
+serde_json = "1.0.132"
+smallvec = "1.11.0"
 log = { version = "0.4.22", default-features = false }
 itertools = { version = "0.11", default-features = false, features = [
     "use_alloc",
 ] }
-array-bytes = { version = "6.2.3", default-features = false }
+array-bytes = { version = "6.2.2", default-features = false }
 serde-json-core = { version = '0.5.1', default-features = false }
 heapless = { version = "0.8", default-features = false }
-color-print = "0.3.6"
+color-print = "0.3.4"
 k256 = { version = "0.13.4", default-features = false, features = ["ecdsa"] }
 variant_count = "1.1.0"
-parking_lot = "0.12.1"
+parking_lot = { version = "0.12.1", default-features = false }
 
 # Emulations
 xcm-emulator = { version = "0.17.1", default-features = false }
@@ -125,11 +125,10 @@ frame-metadata-hash-extension = { version = "0.7.0", default-features = false }
 sp-api = { version = "35.0.0", default-features = false }
 sp-debug-derive = { version = "14.0.0", default-features = false }
 sp-staking = { version = "37.0.0", default-features = false }
-# sp-runtime v38.0.1 takes out core from runtime_string file and calls "alloc" directly which errors out
 sp-runtime = { version = "40.1.0", default-features = false }
 sp-arithmetic = { version = "26.0.0", default-features = false }
 sp-core = { version = "35.0.0", default-features = false, features = ["serde"] }
-sp-io = { version = "39.0.0", default-features = false }
+sp-io = { version = "39.0.1", default-features = false }
 sp-storage = { version = "22.0.0", default-features = false }
 sp-blockchain = { version = "38.0.0", default-features = false }
 sp-consensus-aura = { version = "0.41.0", default-features = false }
@@ -153,7 +152,7 @@ sp-weights = { version = "31.0.0", default-features = false }
 sp-application-crypto = { version = "39.0.0", default-features = false }
 
 # FRAME
-assets-common = { version = "0.19.0", default-features = false }
+assets-common = { version = "0.19.1", default-features = false }
 pallet-aura = { version = "38.1.0", default-features = false }
 pallet-balances = { version = "40.1.0", default-features = false }
 pallet-assets = { version = "41.1.0", default-features = false }
@@ -168,7 +167,7 @@ pallet-transaction-payment-rpc-runtime-api = { version = "39.0.0", default-featu
 pallet-treasury = { version = "38.1.0", default-features = false }
 pallet-utility = { version = "39.1.0", default-features = false }
 pallet-membership = { version = "39.0.0", default-features = false }
-pallet-multisig = { version = "39.1.0", default-features = false }
+pallet-multisig = { version = "39.1.1", default-features = false }
 pallet-preimage = { version = "39.1.0", default-features = false }
 pallet-grandpa = { version = "39.1.0", default-features = false }
 pallet-transaction-payment-rpc = { version = "42.0.0", default-features = false }
@@ -184,12 +183,12 @@ pallet-collator-selection = { version = "20.1.0", default-features = false }
 polkadot-parachain-primitives = { version = "15.0.0", default-features = false }
 polkadot-runtime-parachains = { version = "18.1.0", default-features = false }
 polkadot-core-primitives = { version = "16.0.0", default-features = false }
-xcm = { version = "15.0.2", package = 'staging-xcm', default-features = false }
-xcm-builder = { version = "18.1.0", package = 'staging-xcm-builder', default-features = false }
+xcm = { version = "15.0.3", package = 'staging-xcm', default-features = false }
+xcm-builder = { version = "18.2.0", package = 'staging-xcm-builder', default-features = false }
 xcm-executor = { version = "18.0.2", package = 'staging-xcm-executor', default-features = false }
 polkadot-runtime-common = { version = "18.1.0", default-features = false }
 polkadot-primitives = { version = "17.1.0", default-features = false }
-xcm-runtime-apis = { version = "0.5.1", default-features = false }
+xcm-runtime-apis = { version = "0.5.2", default-features = false }
 
 # Cumulus (with default disabled)
 cumulus-pallet-aura-ext = { version = "0.18.0", default-features = false }
@@ -229,7 +228,6 @@ sc-executor = { version = "0.41.0" }
 sc-keystore = { version = "34.0.0" }
 sp-consensus = { version = "0.41.0" }
 sp-keyring = { version = "40.0.0" }
-sc-rpc = { version = "43.0.0" }
 sc-service = { version = "0.49.0" }
 sc-sysinfo = { version = "41.0.0" }
 sc-telemetry = { version = "28.0.0" }

Cargo.toml

@@ -93,6 +93,7 @@ default = [ "development-settings", "instant-mode", "std" ]
 instant-mode = [ "polimec-runtime/instant-mode" ]
 std = [
 	"assets-common/std",
+	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-primitives-core/std",
 	"frame-metadata-hash-extension/std",
@@ -146,17 +147,15 @@ std = [
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
-	"rococo-runtime-constants/std",
-	"rococo-runtime/std",
 	"xcm-builder/std",
 	"xcm-executor/std",
 	"xcm-runtime-apis/std",
 	"xcm/std",
-	"cumulus-pallet-parachain-system/std"
 ]
 development-settings = [ "polimec-runtime/development-settings" ]
 runtime-benchmarks = [
 	"assets-common/runtime-benchmarks",
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-primitives-core/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
@@ -178,6 +177,7 @@ runtime-benchmarks = [
 	"pallet-scheduler/runtime-benchmarks",
 	"pallet-skip-feeless-payment/runtime-benchmarks",
 	"pallet-staking/runtime-benchmarks",
+	"pallet-transaction-payment/runtime-benchmarks",
 	"pallet-treasury/runtime-benchmarks",
 	"pallet-vesting/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
@@ -194,7 +194,4 @@ runtime-benchmarks = [
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
 	"xcm-runtime-apis/runtime-benchmarks",
-	"assets-common/runtime-benchmarks",
-	"pallet-transaction-payment/runtime-benchmarks",
-	"cumulus-pallet-parachain-system/runtime-benchmarks"
 ]

integration-tests/Cargo.toml

@@ -32,8 +32,6 @@ use sp_runtime::{bounded_vec, BuildStorage, Perbill};
 pub use xcm;
 use xcm_emulator::{Chain, Parachain};
 
-pub const XCM_V2: u32 = 3;
-pub const XCM_V3: u32 = 2;
 pub const REF_TIME_THRESHOLD: u64 = 33;
 pub const PROOF_SIZE_THRESHOLD: u64 = 33;
 pub const INITIAL_DEPOSIT: u128 = 420_0_000_000_000;

integration-tests/src/constants.rs

@@ -42,7 +42,6 @@ sc-consensus.workspace = true
 sc-offchain.workspace = true
 sc-executor.workspace = true
 sc-network.workspace = true
-sc-rpc.workspace = true
 sc-service.workspace = true
 sc-sysinfo.workspace = true
 sc-telemetry.workspace = true
@@ -96,15 +95,13 @@ runtime-benchmarks = [
 	"polkadot-primitives/runtime-benchmarks",
 	"sc-service/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"polimec-common/runtime-benchmarks"
 ]
 try-runtime = [
 	"pallet-funding/try-runtime",
 	"polimec-common/try-runtime",
 	"polimec-runtime/try-runtime",
 	"polkadot-cli/try-runtime",
 	"sp-runtime/try-runtime",
-	"polimec-common/try-runtime"
 ]
 on-chain-release-build = [ "polimec-runtime/on-chain-release-build" ]
 development-settings = [ "polimec-runtime/development-settings" ]

nodes/parachain/Cargo.toml

@@ -228,7 +228,7 @@ fn start_consensus(
 		relay_chain_slot_duration,
 		proposer,
 		collator_service,
-		authoring_duration: Duration::from_millis(500),
+		authoring_duration: Duration::from_millis(2000),
 		reinitialize: false,
 	};
 

nodes/parachain/src/service.rs

@@ -33,7 +33,6 @@ frame-system.workspace = true
 sp-runtime.workspace = true
 sp-arithmetic.workspace = true
 polimec-common.workspace = true
-parachains-common.workspace = true
 sp-core.workspace = true
 pallet-balances.workspace = true
 xcm.workspace = true
@@ -64,6 +63,8 @@ xcm-executor.workspace = true
 [features]
 default = [ "sp-core/serde", "std" ]
 std = [
+	"cumulus-pallet-parachain-system/std",
+	"cumulus-primitives-core/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
@@ -77,7 +78,6 @@ std = [
 	"pallet-linear-release/std",
 	"pallet-proxy-bonding/std",
 	"pallet-timestamp/std",
-	"parachains-common/std",
 	"parity-scale-codec/std",
 	"polimec-common-test-utils",
 	"polimec-common-test-utils/std",
@@ -94,10 +94,10 @@ std = [
 	"xcm-builder/std",
 	"xcm-executor/std",
 	"xcm/std",
-	"cumulus-pallet-parachain-system/std",
-	"cumulus-primitives-core/std"
 ]
 runtime-benchmarks = [
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
@@ -108,18 +108,16 @@ runtime-benchmarks = [
 	"pallet-linear-release/runtime-benchmarks",
 	"pallet-proxy-bonding/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
-	"parachains-common/runtime-benchmarks",
 	"polimec-common-test-utils",
 	"polimec-common-test-utils?/runtime-benchmarks",
 	"polimec-common/runtime-benchmarks",
 	"polkadot-parachain-primitives/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
-	"cumulus-pallet-parachain-system/runtime-benchmarks",
-	"cumulus-primitives-core/runtime-benchmarks"
 ]
 try-runtime = [
+	"cumulus-pallet-parachain-system/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-assets/try-runtime",
@@ -130,6 +128,5 @@ try-runtime = [
 	"polimec-common-test-utils?/try-runtime",
 	"polimec-common/try-runtime",
 	"sp-runtime/try-runtime",
-	"cumulus-pallet-parachain-system/try-runtime"
 ]
 on-chain-release-build = []

pallets/funding/Cargo.toml

@@ -106,6 +106,7 @@ mod tests {
 		mock::{new_test_ext, TestRuntime as Test},
 		UserMigrations,
 	};
+	use frame_support::weights::RuntimeDbWeight;
 	use polimec_common::migration_types::MigrationOrigin;
 	use v7::{UncheckedMigrationToV7, MAX_PARTICIPATIONS_PER_USER};
 	use xcm::v4::Junction;
@@ -136,13 +137,17 @@ mod tests {
 			let weight = UncheckedMigrationToV7::<Test>::on_runtime_upgrade();
 			assert_eq!(UserMigrations::<Test>::iter().count(), 1);
 
-			for (_, (_, migrations)) in UserMigrations::<Test>::iter() {
-				for (i, migration) in migrations.iter().enumerate() {
-					assert_eq!(migration.info.vesting_time, i as u64 * 2);
-				}
+			let (_, (_, post_migrations)) = UserMigrations::<Test>::iter().next().unwrap();
+			assert_eq!(post_migrations.len() as u32, MAX_PARTICIPATIONS_PER_USER); // Verify count matches test items
+			for (i, migration) in post_migrations.iter().enumerate() {
+				// Original vesting_time was `i`, expected is `i * 2`
+				assert_eq!(migration.info.vesting_time, i as u64 * 2, "Vesting time mismatch at index {}", i);
 			}
-
-			assert!(weight.is_zero());
+			let db_weight: RuntimeDbWeight = <Test as frame_system::Config>::DbWeight::get();
+			// Weight is based on the number of *individual migration entries* processed
+			let expected_weight =
+				db_weight.reads_writes(MAX_PARTICIPATIONS_PER_USER as u64, MAX_PARTICIPATIONS_PER_USER as u64);
+			assert_eq!(weight, expected_weight, "Weight should match items processed");
 		});
 	}
 }

pallets/funding/src/migrations/vesting_info.rs

@@ -135,6 +135,7 @@ mod helper_functions {
 // logic of small functions that extrinsics use to process data or interact with storage
 mod inner_functions {
 	use super::*;
+	use polimec_common::DAYS;
 
 	#[test]
 	fn calculate_vesting_duration() {

pallets/funding/src/tests/misc.rs

@@ -19,7 +19,6 @@ use frame_support::{
 };
 use itertools::Itertools;
 use pallet_balances::AccountData;
-use parachains_common::DAYS;
 use polimec_common::{
 	assets::{
 		AcceptedFundingAsset,