update substrate to polkadot-v0.9.43

polkadot-evm · Jun 14, 2023 · 18adfe1 · 18adfe1
1 parent 41a90ef
commit 18adfe1
Show file tree

Hide file tree

Showing 20 changed files with 729 additions and 556 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -40,21 +40,22 @@ repository = "https://github.com/paritytech/frontier/"
 
 [workspace.dependencies]
 bn = { package = "substrate-bn", version = "0.6", default-features = false }
+clap = { version = "4.3", features = ["derive", "deprecated"] }
 environmental = { version = "1.1.4", default-features = false }
 ethereum = { version = "0.14.0", default-features = false }
 ethereum-types = { version = "0.14.1", default-features = false }
 evm = { version = "0.39.1", default-features = false }
 hex-literal = { version = "0.3.4" }
 impl-serde = { version = "0.4.0", default-features = false }
 jsonrpsee = "0.16.2"
-kvdb-rocksdb = "0.18.0"
+kvdb-rocksdb = "0.19.0"
 libsecp256k1 = { version = "0.7.1", default-features = false }
 log = { version = "0.4.17", default-features = false }
 parity-db = "0.4.6"
 rlp = { version = "0.5", default-features = false }
 scale-codec = { package = "parity-scale-codec", version = "3.2.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] }
 serde_json = "1.0"
 sqlx = { version = "0.7.0-alpha.3", default-features = false, features = ["macros"] }
 tokio = "1.28.2"

diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
@@ -11,7 +11,7 @@ repository = { workspace = true }
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-clap = { version = "4.1", features = ["derive", "deprecated"] }
+clap = { workspace = true }
 ethereum-types = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }

diff --git a/frame/base-fee/src/lib.rs b/frame/base-fee/src/lib.rs
@@ -59,7 +59,6 @@ pub mod pallet {
 		_marker: PhantomData<T>,
 	}
 
-	#[cfg(feature = "std")]
 	impl<T: Config> GenesisConfig<T> {
 		pub fn new(base_fee_per_gas: U256, elasticity: Permill) -> Self {
 			Self {
@@ -70,7 +69,6 @@ pub mod pallet {
 		}
 	}
 
-	#[cfg(feature = "std")]
 	impl<T: Config> Default for GenesisConfig<T> {
 		fn default() -> Self {
 			Self {

diff --git a/frame/dynamic-fee/src/lib.rs b/frame/dynamic-fee/src/lib.rs
@@ -85,7 +85,7 @@ pub mod pallet {
 	}
 
 	#[pallet::genesis_config]
-	#[cfg_attr(feature = "std", derive(Default))]
+	#[derive(Default)]
 	pub struct GenesisConfig {
 		pub min_gas_price: U256,
 	}

diff --git a/frame/evm/src/lib.rs b/frame/evm/src/lib.rs
@@ -86,13 +86,12 @@ use sp_runtime::{
 	traits::{BadOrigin, Saturating, UniqueSaturatedInto, Zero},
 	AccountId32, DispatchErrorWithPostInfo,
 };
-use sp_std::{cmp::min, vec::Vec};
+use sp_std::{cmp::min, collections::btree_map::BTreeMap, vec::Vec};
 
 pub use evm::{
 	Config as EvmConfig, Context, ExitError, ExitFatal, ExitReason, ExitRevert, ExitSucceed,
 };
 use fp_account::AccountId20;
-#[cfg(feature = "std")]
 use fp_evm::GenesisAccount;
 pub use fp_evm::{
 	Account, CallInfo, CreateInfo, ExecutionInfo, FeeCalculator, InvalidEvmTransactionError,
@@ -478,9 +477,9 @@ pub mod pallet {
 	}
 
 	#[pallet::genesis_config]
-	#[cfg_attr(feature = "std", derive(Default))]
+	#[derive(Default)]
 	pub struct GenesisConfig {
-		pub accounts: std::collections::BTreeMap<H160, GenesisAccount>,
+		pub accounts: BTreeMap<H160, GenesisAccount>,
 	}
 
 	#[pallet::genesis_build]

diff --git a/primitives/account/Cargo.toml b/primitives/account/Cargo.toml
@@ -33,10 +33,17 @@ std = [
 	"log/std",
 	"scale-codec/std",
 	"scale-info/std",
-	"serde",
+	"serde/std",
 	# Substrate
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
+serde = [
+	"dep:serde",
+	"impl-serde",
+	"scale-info/serde",
+	"sp-core/serde",
+	"sp-runtime/serde",
+]
diff --git a/primitives/account/src/lib.rs b/primitives/account/src/lib.rs
@@ -20,7 +20,7 @@
 use scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 // Substrate
-use sp_core::{ecdsa, H160, H256};
+use sp_core::{ecdsa, RuntimeDebug, H160, H256};
 use sp_io::hashing::keccak_256;
 
 /// A fully Ethereum-compatible `AccountId`.
@@ -30,7 +30,7 @@ use sp_io::hashing::keccak_256;
 #[derive(Encode, Decode, MaxEncodedLen, TypeInfo)]
 pub struct AccountId20(pub [u8; 20]);
 
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
 impl_serde::impl_fixed_hash_serde!(AccountId20, 20);
 
 #[cfg(feature = "std")]
@@ -113,8 +113,8 @@ impl From<ecdsa::Public> for AccountId20 {
 	}
 }
 
-#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Eq, PartialEq, Clone, Encode, Decode, sp_core::RuntimeDebug, TypeInfo)]
+#[derive(Eq, PartialEq, Clone, RuntimeDebug, Encode, Decode, TypeInfo)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct EthereumSignature(ecdsa::Signature);
 
 impl sp_runtime::traits::Verify for EthereumSignature {

diff --git a/primitives/evm/Cargo.toml b/primitives/evm/Cargo.toml
@@ -26,11 +26,17 @@ default = ["std"]
 std = [
 	"evm/std",
 	"evm/with-serde",
-	"serde",
+	"serde/std",
 	"scale-codec/std",
 	# Substrate
 	"frame-support/std",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
+serde = [
+	"dep:serde",
+	"scale-info/serde",
+	"sp-core/serde",
+	"sp-runtime/serde",
+]
diff --git a/primitives/evm/src/lib.rs b/primitives/evm/src/lib.rs
@@ -24,11 +24,11 @@ mod validation;
 use frame_support::weights::{constants::WEIGHT_REF_TIME_PER_MILLIS, Weight};
 use scale_codec::{Decode, Encode};
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
-use sp_core::{H160, U256};
+use sp_core::{H160, H256, U256};
 use sp_runtime::Perbill;
-use sp_std::vec::Vec;
+use sp_std::{collections::btree_map::BTreeMap, vec::Vec};
 
 pub use evm::{
 	backend::{Basic as Account, Log},
@@ -48,8 +48,8 @@ pub use self::{
 	},
 };
 
-#[derive(Clone, Eq, PartialEq, Default, Encode, Decode)]
-#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
+#[derive(Clone, Eq, PartialEq, Default, Debug, Encode, Decode)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 /// External input from the transaction.
 pub struct Vicinity {
 	/// Current transaction gas price.
@@ -58,8 +58,8 @@ pub struct Vicinity {
 	pub origin: H160,
 }
 
-#[derive(Clone, Eq, PartialEq, Encode, Decode, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
+#[derive(Clone, Eq, PartialEq, Debug, Encode, Decode, TypeInfo)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct ExecutionInfo<T> {
 	pub exit_reason: ExitReason,
 	pub value: T,
@@ -70,23 +70,23 @@ pub struct ExecutionInfo<T> {
 pub type CallInfo = ExecutionInfo<Vec<u8>>;
 pub type CreateInfo = ExecutionInfo<H160>;
 
-#[derive(Clone, Eq, PartialEq, Encode, Decode)]
-#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
+#[derive(Clone, Eq, PartialEq, Debug, Encode, Decode)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum CallOrCreateInfo {
 	Call(CallInfo),
 	Create(CreateInfo),
 }
 
 /// Account definition used for genesis block construction.
-#[cfg(feature = "std")]
-#[derive(Clone, Eq, PartialEq, Encode, Decode, Debug, Serialize, Deserialize)]
+#[derive(Clone, Eq, PartialEq, Debug, Encode, Decode)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct GenesisAccount {
 	/// Account nonce.
 	pub nonce: U256,
 	/// Account balance.
 	pub balance: U256,
 	/// Full account storage.
-	pub storage: std::collections::BTreeMap<sp_core::H256, sp_core::H256>,
+	pub storage: BTreeMap<H256, H256>,
 	/// Account code.
 	pub code: Vec<u8>,
 }

diff --git a/primitives/self-contained/Cargo.toml b/primitives/self-contained/Cargo.toml
@@ -23,11 +23,16 @@ default = ["std"]
 std = [
 	"scale-codec/std",
 	"scale-info/std",
-	"serde",
+	"serde/std",
 	# Substrate
 	"frame-support/std",
 	"sp-runtime/std",
 ]
+serde = [
+	"dep:serde",
+	"scale-info/serde",
+	"sp-runtime/serde",
+]
 try-runtime = [
 	"sp-runtime/try-runtime",
 ]
diff --git a/primitives/self-contained/src/unchecked_extrinsic.rs b/primitives/self-contained/src/unchecked_extrinsic.rs
@@ -180,7 +180,7 @@ where
 	}
 }
 
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
 impl<Address: Encode, Signature: Encode, Call: Encode, Extra: SignedExtension> serde::Serialize
 	for UncheckedExtrinsic<Address, Call, Signature, Extra>
 {
@@ -192,7 +192,7 @@ impl<Address: Encode, Signature: Encode, Call: Encode, Extra: SignedExtension> s
 	}
 }
 
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
 impl<'a, Address: Decode, Signature: Decode, Call: Decode, Extra: SignedExtension>
 	serde::Deserialize<'a> for UncheckedExtrinsic<Address, Call, Signature, Extra>
 {

diff --git a/primitives/storage/Cargo.toml b/primitives/storage/Cargo.toml
@@ -18,5 +18,8 @@ serde = { workspace = true, optional = true }
 default = ["std"]
 std = [
 	"scale-codec/std",
-	"serde",
+	"serde/std",
+]
+serde = [
+	"dep:serde",
 ]
diff --git a/template/node/Cargo.toml b/template/node/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 async-trait = "0.1"
-clap = { version = "4.1", features = ["derive", "deprecated"] }
+clap = { workspace = true }
 futures = "0.3.25"
 hex-literal = { workspace = true }
 jsonrpsee = { workspace = true, features = ["server", "macros"] }

diff --git a/template/node/src/chain_spec.rs b/template/node/src/chain_spec.rs
@@ -13,7 +13,7 @@ use sp_runtime::traits::{IdentifyAccount, Verify};
 use sp_state_machine::BasicExternalities;
 // Frontier
 use frontier_template_runtime::{
-	AccountId, EnableManualSeal, GenesisConfig, SS58Prefix, Signature, WASM_BINARY,
+	AccountId, Balance, EnableManualSeal, GenesisConfig, SS58Prefix, Signature, WASM_BINARY,
 };
 
 // The URL for the telemetry server.
@@ -77,6 +77,8 @@ fn properties() -> Properties {
 	properties
 }
 
+const UNITS: Balance = 1_000_000_000_000_000_000;
+
 pub fn development_config(enable_manual_seal: Option<bool>) -> DevChainSpec {
 	let wasm_binary = WASM_BINARY.expect("WASM not available");
 
@@ -161,6 +163,7 @@ pub fn local_testnet_config() -> ChainSpec {
 		None,
 		// Protocol ID
 		None,
+		// Fork ID
 		None,
 		// Properties
 		None,
@@ -195,11 +198,10 @@ fn testnet_genesis(
 
 		// Monetary
 		balances: BalancesConfig {
-			// Configure endowed accounts with initial balance of 1 << 60.
 			balances: endowed_accounts
 				.iter()
 				.cloned()
-				.map(|k| (k, 1 << 60))
+				.map(|k| (k, 1_000_000 * UNITS))
 				.collect(),
 		},
 		transaction_payment: Default::default(),

diff --git a/template/node/src/eth.rs b/template/node/src/eth.rs
@@ -10,7 +10,7 @@ use futures::{future, prelude::*};
 use sc_client_api::{BlockchainEvents, StateBackendFor};
 use sc_executor::NativeExecutionDispatch;
 use sc_network_sync::SyncingService;
-use sc_service::{error::Error as ServiceError, BasePath, Configuration, TaskManager};
+use sc_service::{error::Error as ServiceError, Configuration, TaskManager};
 use sp_api::ConstructRuntimeApi;
 use sp_runtime::traits::BlakeTwo256;
 // Frontier
@@ -26,14 +26,7 @@ use crate::client::{FullBackend, FullClient};
 pub type FrontierBackend = fc_db::Backend<Block>;
 
 pub fn db_config_dir(config: &Configuration) -> PathBuf {
-	let application = &config.impl_name;
-	config
-		.base_path
-		.as_ref()
-		.map(|base_path| base_path.config_dir(config.chain_spec.id()))
-		.unwrap_or_else(|| {
-			BasePath::from_project("", "", application).config_dir(config.chain_spec.id())
-		})
+	config.base_path.config_dir(config.chain_spec.id())
 }
 
 /// Avalailable frontier backend types.

diff --git a/template/node/src/service.rs b/template/node/src/service.rs
@@ -309,6 +309,7 @@ where
 		fee_history_cache_limit,
 	} = new_frontier_partial(&eth_config)?;
 
+	let mut net_config = sc_network::config::FullNetworkConfiguration::new(&config.network);
 	let grandpa_protocol_name = sc_consensus_grandpa::protocol_standard_name(
 		&client.block_hash(0)?.expect("Genesis block exists; qed"),
 		&config.chain_spec,
@@ -317,12 +318,9 @@ where
 	let warp_sync_params = if sealing.is_some() {
 		None
 	} else {
-		config
-			.network
-			.extra_sets
-			.push(sc_consensus_grandpa::grandpa_peers_set_config(
-				grandpa_protocol_name.clone(),
-			));
+		net_config.add_notification_protocol(sc_consensus_grandpa::grandpa_peers_set_config(
+			grandpa_protocol_name.clone(),
+		));
 		let warp_sync: Arc<dyn sc_network::config::WarpSyncProvider<Block>> =
 			Arc::new(sc_consensus_grandpa::warp_proof::NetworkProvider::new(
 				backend.clone(),
@@ -335,6 +333,7 @@ where
 	let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
+			net_config,
 			client: client.clone(),
 			transaction_pool: transaction_pool.clone(),
 			spawn_handle: task_manager.spawn_handle(),

diff --git a/template/runtime/Cargo.toml b/template/runtime/Cargo.toml
@@ -87,7 +87,7 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"frame-system-rpc-runtime-api/std",
-	"frame-system-benchmarking/std",
+	"frame-system-benchmarking?/std",
 	"pallet-aura/std",
 	"pallet-balances/std",
 	"pallet-grandpa/std",
@@ -118,6 +118,7 @@ runtime-benchmarks = [
 	"pallet-balances/runtime-benchmarks",
 	"pallet-grandpa/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
+	"pallet-sudo/runtime-benchmarks",
 	"pallet-ethereum/runtime-benchmarks",
 	"pallet-evm/runtime-benchmarks",
 	"pallet-hotfix-sufficients/runtime-benchmarks",