Feat: Polkadot v1.2. to v1.4 upgrade

node/client/src/lib.rs

@@ -3,7 +3,8 @@ use std::sync::Arc;
 use node_primitives::Nonce;
 pub use node_primitives::{AccountId, Balance, Block, BlockNumber, Hash, Header, Signature};
 use sc_client_api::{
-	AuxStore, Backend as BackendT, BlockchainEvents, KeysIter, PairsIter, UsageProvider,
+	AuxStore, Backend as BackendT, BlockchainEvents, KeysIter, MerkleValue, PairsIter,
+	UsageProvider,
 };
 pub use sc_executor::NativeElseWasmExecutor;
 use sp_api::{CallApiAt, NumberFor, ProvideRuntimeApi};
@@ -373,6 +374,35 @@ impl sc_client_api::StorageProvider<Block, crate::FullBackend> for Client {
 			}
 		}
 	}
+
+	fn closest_merkle_value(
+		&self,
+		hash: <Block as BlockT>::Hash,
+		key: &StorageKey,
+	) -> sp_blockchain::Result<Option<MerkleValue<<Block as BlockT>::Hash>>> {
+		with_client! {
+			self,
+			client,
+			{
+				client.closest_merkle_value(hash, key)
+			}
+		}
+	}
+
+	fn child_closest_merkle_value(
+		&self,
+		hash: <Block as BlockT>::Hash,
+		child_info: &ChildInfo,
+		key: &StorageKey,
+	) -> sp_blockchain::Result<Option<MerkleValue<<Block as BlockT>::Hash>>> {
+		with_client! {
+			self,
+			client,
+			{
+				client.child_closest_merkle_value(hash, child_info, key)
+			}
+		}
+	}
 }
 
 impl sp_blockchain::HeaderBackend<Block> for Client {

node/service/src/chain_spec.rs

@@ -98,7 +98,6 @@ fn cere_dev_session_keys(
 /// Helper function to create Cere Dev `RuntimeGenesisConfig` for testing
 #[cfg(feature = "cere-dev-native")]
 pub fn cere_dev_genesis(
-	wasm_binary: &[u8],
 	initial_authorities: Vec<(
 		AccountId,
 		AccountId,
@@ -161,11 +160,8 @@ pub fn cere_dev_genesis(
 	const STASH: Balance = ENDOWMENT / 1000;
 
 	cere_dev::RuntimeGenesisConfig {
-		system: cere_dev::SystemConfig {
-			// Add Wasm runtime to storage.
-			code: wasm_binary.to_vec(),
-			..Default::default()
-		},
+		//TODO: check
+		system: cere_dev::SystemConfig::default(),
 		balances: cere_dev::BalancesConfig {
 			// Configure endowed accounts with initial balance of 1 << 60.
 			balances: endowed_accounts.iter().cloned().map(|x| (x, ENDOWMENT)).collect(),
@@ -237,9 +233,8 @@ pub fn cere_dev_native_chain_spec_properties() -> serde_json::map::Map<String, s
 
 /// Helper function to create Cere `RuntimeGenesisConfig` for testing
 #[cfg(feature = "cere-dev-native")]
-fn cere_dev_config_genesis(wasm_binary: &[u8]) -> cere_dev::RuntimeGenesisConfig {
+fn cere_dev_config_genesis() -> cere_dev::RuntimeGenesisConfig {
 	cere_dev_genesis(
-		wasm_binary,
 		// Initial authorities
 		vec![authority_keys_from_seed("Alice")],
 		// Initial nominators
@@ -260,24 +255,28 @@ fn cere_dev_config_genesis(wasm_binary: &[u8]) -> cere_dev::RuntimeGenesisConfig
 pub fn cere_dev_development_config() -> Result<CereDevChainSpec, String> {
 	let wasm_binary = cere_dev::WASM_BINARY.ok_or("Cere Dev development wasm not available")?;
 
+	#[allow(deprecated)]
 	Ok(CereDevChainSpec::from_genesis(
 		"Development",
 		"cere_dev",
 		ChainType::Development,
-		move || cere_dev_config_genesis(wasm_binary),
+		cere_dev_config_genesis,
 		vec![],
 		None,
 		Some(DEFAULT_PROTOCOL_ID),
 		None,
 		Some(cere_dev_native_chain_spec_properties()),
 		Default::default(),
+		wasm_binary,
 	))
+
+	//TODO: Migrate to builder
+	// Ok(CereDevChainSpec::builder(wasm_binary, Extensions::default()).build())
 }
 
 #[cfg(feature = "cere-dev-native")]
-fn cere_dev_local_testnet_genesis(wasm_binary: &[u8]) -> cere_dev::RuntimeGenesisConfig {
+fn cere_dev_local_testnet_genesis() -> cere_dev::RuntimeGenesisConfig {
 	cere_dev_genesis(
-		wasm_binary,
 		// Initial authorities
 		vec![authority_keys_from_seed("Alice"), authority_keys_from_seed("Bob")],
 		// Initial nominators
@@ -298,18 +297,23 @@ fn cere_dev_local_testnet_genesis(wasm_binary: &[u8]) -> cere_dev::RuntimeGenesi
 pub fn cere_dev_local_testnet_config() -> Result<CereDevChainSpec, String> {
 	let wasm_binary = cere_dev::WASM_BINARY.ok_or("Cere Dev development wasm not available")?;
 
+	#[allow(deprecated)]
 	Ok(CereDevChainSpec::from_genesis(
 		"Local Testnet",
 		"cere_dev_local_testnet",
 		ChainType::Local,
-		move || cere_dev_local_testnet_genesis(wasm_binary),
+		cere_dev_local_testnet_genesis,
 		vec![],
 		None,
 		Some(DEFAULT_PROTOCOL_ID),
 		None,
 		None,
 		Default::default(),
+		wasm_binary,
 	))
+
+	//TODO: Migrate to builder
+	// Ok(CereDevChainSpec::builder(wasm_binary, Extensions::default()).build())
 }
 
 pub fn cere_mainnet_config() -> Result<CereChainSpec, String> {

node/service/src/lib.rs

@@ -397,6 +397,7 @@ where
 			import_queue,
 			block_announce_validator_builder: None,
 			warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)),
+			block_relay: None,
 		})?;
 
 	if config.offchain_worker.enabled {

pallets/chainbridge/src/mock.rs

@@ -66,6 +66,7 @@ impl pallet_balances::Config for Test {
 	type MaxReserves = ();
 	type ReserveIdentifier = ();
 	type FreezeIdentifier = ();
+	type RuntimeFreezeReason = ();
 	type MaxFreezes = ();
 	type MaxHolds = ();
 	type RuntimeHoldReason = ();

pallets/ddc-clusters-gov/src/mock.rs

@@ -132,8 +132,9 @@ impl pallet_balances::Config for Test {
 	type AccountStore = System;
 	type WeightInfo = ();
 	type FreezeIdentifier = ();
+	type RuntimeFreezeReason = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
+	type MaxHolds = ConstU32<1>;
 	type RuntimeHoldReason = RuntimeHoldReason;
 }
 
@@ -148,8 +149,7 @@ impl pallet_preimage::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type ManagerOrigin = EnsureRoot<AccountId>;
-	type BaseDeposit = PreimageBaseDeposit;
-	type ByteDeposit = PreimageByteDeposit;
+	type Consideration = ();
 }
 
 parameter_types! {
@@ -248,6 +248,7 @@ impl pallet_contracts::Config for Test {
 	type Debug = ();
 	type Environment = ();
 	type Migrations = ();
+	type Xcm = ();
 }
 
 impl pallet_insecure_randomness_collective_flip::Config for Test {}

pallets/ddc-clusters/src/mock.rs

@@ -101,6 +101,7 @@ impl contracts::Config for Test {
 	type Debug = ();
 	type Environment = ();
 	type Migrations = ();
+	type Xcm = ();
 }
 
 use frame_system::offchain::{
@@ -178,6 +179,7 @@ impl pallet_balances::Config for Test {
 	type AccountStore = System;
 	type WeightInfo = ();
 	type FreezeIdentifier = ();
+	type RuntimeFreezeReason = ();
 	type MaxFreezes = ();
 	type MaxHolds = ConstU32<1>;
 	type RuntimeHoldReason = RuntimeHoldReason;

pallets/ddc-customers/src/mock.rs

@@ -79,6 +79,7 @@ impl pallet_balances::Config for Test {
 	type AccountStore = System;
 	type WeightInfo = ();
 	type FreezeIdentifier = ();
+	type RuntimeFreezeReason = ();
 	type MaxFreezes = ();
 	type MaxHolds = ();
 	type RuntimeHoldReason = ();

pallets/ddc-nodes/src/mock.rs

@@ -78,6 +78,7 @@ impl pallet_balances::Config for Test {
 	type AccountStore = System;
 	type WeightInfo = ();
 	type FreezeIdentifier = ();
+	type RuntimeFreezeReason = ();
 	type MaxFreezes = ();
 	type MaxHolds = ();
 	type RuntimeHoldReason = ();

pallets/ddc-payouts/src/mock.rs

@@ -15,7 +15,7 @@ use ddc_primitives::{
 use frame_election_provider_support::SortedListProvider;
 use frame_support::{
 	construct_runtime, parameter_types,
-	traits::{ConstU32, ConstU64, Everything, Randomness},
+	traits::{ConstU32, ConstU64, Everything, ExistenceRequirement, Randomness},
 	weights::constants::RocksDbWeight,
 	PalletId,
 };
@@ -110,6 +110,7 @@ impl pallet_balances::Config for Test {
 	type AccountStore = System;
 	type WeightInfo = ();
 	type FreezeIdentifier = ();
+	type RuntimeFreezeReason = ();
 	type MaxFreezes = ();
 	type MaxHolds = ();
 	type RuntimeHoldReason = ();

pallets/ddc-payouts/src/tests.rs

@@ -3474,9 +3474,10 @@ fn send_rewarding_providers_batch_100_nodes_small_usage_works() {
 
 			let expected_charge = calculate_charge_for_month(cluster_id, user_usage.clone());
 			Balances::transfer(
-				RuntimeOrigin::signed(bank),
-				user_id,
+				&bank,
+				&user_id,
 				(expected_charge * 2).max(Balances::minimum_balance()),
+				ExistenceRequirement::KeepAlive,
 			)
 			.unwrap();
 			total_charge += expected_charge;
@@ -3747,9 +3748,10 @@ fn send_rewarding_providers_batch_100_nodes_large_usage_works() {
 
 			let expected_charge = calculate_charge_for_month(cluster_id, user_usage.clone());
 			Balances::transfer(
-				RuntimeOrigin::signed(bank),
-				user_id,
+				&bank,
+				&user_id,
 				(expected_charge * 2).max(Balances::minimum_balance()),
+				ExistenceRequirement::KeepAlive,
 			)
 			.unwrap();
 			total_charge += expected_charge;
@@ -4020,9 +4022,10 @@ fn send_rewarding_providers_batch_100_nodes_small_large_usage_works() {
 
 			let expected_charge = calculate_charge_for_month(cluster_id, user_usage.clone());
 			Balances::transfer(
-				RuntimeOrigin::signed(bank),
-				user_id,
+				&bank,
+				&user_id,
 				(expected_charge * 2).max(Balances::minimum_balance()),
+				ExistenceRequirement::KeepAlive,
 			)
 			.unwrap();
 			total_charge += expected_charge;
@@ -4252,9 +4255,10 @@ fn send_rewarding_providers_batch_100_nodes_random_usage_works() {
 
 			let expected_charge = calculate_charge_for_month(cluster_id, user_usage.clone());
 			Balances::transfer(
-				RuntimeOrigin::signed(bank),
-				user_id,
+				&bank,
+				&user_id,
 				(expected_charge * 2).max(Balances::minimum_balance()),
+				ExistenceRequirement::KeepAlive,
 			)
 			.unwrap();
 			total_charge += expected_charge;

pallets/ddc-staking/src/mock.rs

@@ -101,8 +101,9 @@ impl pallet_balances::Config for Test {
 	type AccountStore = System;
 	type WeightInfo = ();
 	type FreezeIdentifier = ();
+	type RuntimeFreezeReason = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
+	type MaxHolds = ConstU32<1>;
 	type RuntimeHoldReason = RuntimeHoldReason;
 }
 
@@ -156,6 +157,7 @@ impl pallet_contracts::Config for Test {
 	type Debug = ();
 	type Environment = ();
 	type Migrations = ();
+	type Xcm = ();
 }
 
 impl pallet_insecure_randomness_collective_flip::Config for Test {}

pallets/erc721/src/mock.rs

@@ -65,6 +65,7 @@ impl pallet_balances::Config for Test {
 	type MaxReserves = ();
 	type ReserveIdentifier = ();
 	type FreezeIdentifier = ();
+	type RuntimeFreezeReason = ();
 	type MaxFreezes = ();
 	type MaxHolds = ();
 	type RuntimeHoldReason = ();