Update Polkadot-sdk to v1.3.0 (#198)

* update polkadot-sdk to v1.3.0 * fix compilation errors * fix warnings * fix tests compilation
moonbeam-foundation · Nov 28, 2023 · 1bc27b1 · 1bc27b1
1 parent 176cb34
commit 1bc27b1
Show file tree

Hide file tree

Showing 11 changed files with 544 additions and 342 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/client/rpc/src/eth/submit.rs b/client/rpc/src/eth/submit.rs
@@ -27,8 +27,7 @@ use sp_api::{ApiExt, ProvideRuntimeApi};
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
 use sp_blockchain::HeaderBackend;
 use sp_inherents::CreateInherentDataProviders;
-use sp_runtime::{
-	generic::BlockId, traits::Block as BlockT, transaction_validity::TransactionSource,
+use sp_runtime::{traits::Block as BlockT, transaction_validity::TransactionSource,
 };
 // Frontier
 use fc_rpc_core::types::*;
@@ -151,7 +150,7 @@ where
 
 		self.pool
 			.submit_one(
-				&BlockId::Hash(block_hash),
+				block_hash,
 				TransactionSource::Local,
 				extrinsic,
 			)
@@ -178,7 +177,7 @@ where
 
 		self.pool
 			.submit_one(
-				&BlockId::Hash(block_hash),
+				block_hash,
 				TransactionSource::Local,
 				extrinsic,
 			)

diff --git a/frame/dynamic-fee/Cargo.toml b/frame/dynamic-fee/Cargo.toml
@@ -18,7 +18,6 @@ frame-support = { workspace = true }
 frame-system = { workspace = true }
 sp-core = { workspace = true }
 sp-inherents = { workspace = true }
-sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 # Frontier
 fp-dynamic-fee = { workspace = true }
@@ -38,7 +37,6 @@ std = [
 	# Substrate
 	"sp-core/std",
 	"sp-inherents/std",
-	"sp-runtime/std",
 	"sp-std/std",
 	# Substrate
 	"frame-system/std",

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

diff --git a/frame/evm-chain-id/Cargo.toml b/frame/evm-chain-id/Cargo.toml
@@ -16,7 +16,6 @@ scale-info = { workspace = true }
 # Substrate
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-sp-runtime = { workspace = true }
 
 [features]
 default = ["std"]
@@ -26,7 +25,6 @@ std = [
 	# Substrate
 	"frame-support/std",
 	"frame-system/std",
-	"sp-runtime/std",
 ]
 try-runtime = [
 	"frame-support/try-runtime",

diff --git a/frame/evm/precompile/dispatch/src/mock.rs b/frame/evm/precompile/dispatch/src/mock.rs
@@ -98,6 +98,7 @@ impl pallet_balances::Config for Test {
 	type MaxReserves = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_types! {

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

diff --git a/precompiles/tests-external/lib.rs b/precompiles/tests-external/lib.rs
@@ -101,6 +101,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
+	type RuntimeFreezeReason = ();
 }
 
 #[derive(Debug, Clone)]

diff --git a/template/node/src/service.rs b/template/node/src/service.rs
@@ -322,6 +322,7 @@ where
 			import_queue,
 			block_announce_validator_builder: None,
 			warp_sync_params,
+			block_relay: None,
 		})?;
 
 	if config.offchain_worker.enabled {

diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs
@@ -279,6 +279,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_types! {