Upgrade to polkadot v1.3.0 (#12)

* update to polkadot v1.3.0 * fix formatting * fix compilation for ring dep * fix build errors * fix feature runtime-benchmarks * remove unused dependencies
Moonsong-Labs · Nov 23, 2023 · 97011f3 · 97011f3
1 parent 4304fdb
commit 97011f3
Show file tree

Hide file tree

Showing 9 changed files with 834 additions and 810 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/pallets/author-inherent/Cargo.toml b/pallets/author-inherent/Cargo.toml
@@ -49,4 +49,4 @@ runtime-benchmarks = [
 	"nimbus-primitives/runtime-benchmarks",
 ]
 
-try-runtime = [ "frame-support/try-runtime", "nimbus-primitives/try-runtime" ]
+try-runtime = [ "frame-support/try-runtime", "nimbus-primitives/try-runtime" ]
diff --git a/pallets/author-mapping/src/mock.rs b/pallets/author-mapping/src/mock.rs
@@ -115,6 +115,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_types! {

diff --git a/pallets/migrations/src/mock.rs b/pallets/migrations/src/mock.rs
@@ -98,6 +98,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_types! {

diff --git a/pallets/randomness/src/mock.rs b/pallets/randomness/src/mock.rs
@@ -93,6 +93,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_types! {

diff --git a/template/node/src/service.rs b/template/node/src/service.rs
@@ -300,6 +300,7 @@ where
 			})),
 			warp_sync_params: None,
 			net_config,
+			block_relay: None,
 		})?;
 
 	let rpc_extensions_builder = {
@@ -499,6 +500,7 @@ pub fn start_instant_seal_node(config: Configuration) -> Result<TaskManager, sc_
 			block_announce_validator_builder: None,
 			warp_sync_params: None,
 			net_config,
+			block_relay: None,
 		})?;
 
 	if config.offchain_worker.enabled {

diff --git a/template/runtime/Cargo.toml b/template/runtime/Cargo.toml
@@ -141,6 +141,7 @@ runtime-benchmarks = [
 	"pallet-xcm/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"staging-xcm-builder/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
 ]
 
 try-runtime = [

diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs
@@ -63,6 +63,9 @@ use staging_xcm_builder::{
 };
 use staging_xcm_executor::{Config, XcmExecutor};
 
+use cumulus_primitives_core::ParaId;
+use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
+
 mod pallet_account_set;
 
 /// Import the template pallet.
@@ -364,6 +367,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
@@ -573,7 +577,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type ControllerOrigin = EnsureRoot<AccountId>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
 	type WeightInfo = ();
-	type PriceForSiblingDelivery = ();
+	type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;
 }
 
 impl cumulus_pallet_dmp_queue::Config for Runtime {