Update substrate to 4ea2ac8 (paritytech#743)

Signed-off-by: koushiro <[email protected]>
boolnetwork · Jul 18, 2022 · cb041f1 · cb041f1
1 parent 9981a1f
commit cb041f1
Show file tree

Hide file tree

Showing 9 changed files with 412 additions and 276 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/rpc-core/Cargo.toml b/client/rpc-core/Cargo.toml
@@ -18,5 +18,5 @@ serde_json = "1.0"
 
 # Parity
 ethereum-types = "0.13.1"
-jsonrpsee = { version = "0.13.0", features = ["server", "macros"] }
+jsonrpsee = { version = "0.14.0", features = ["server", "macros"] }
 rlp = "0.5"
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
@@ -24,7 +24,7 @@ tokio = { version = "1.19", features = ["sync"] }
 # Parity
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 ethereum-types = "0.13.1"
-jsonrpsee = { version = "0.13.0", features = ["server", "macros"] }
+jsonrpsee = { version = "0.14.0", features = ["server", "macros"] }
 libsecp256k1 = "0.7"
 rlp = "0.5"
 

diff --git a/frame/ethereum/src/lib.rs b/frame/ethereum/src/lib.rs
@@ -40,7 +40,7 @@ use fp_storage::{EthereumStorageSchema, PALLET_ETHEREUM_SCHEMA};
 #[cfg(feature = "try-runtime")]
 use frame_support::traits::OnRuntimeUpgradeHelpersExt;
 use frame_support::{
-	codec::{Decode, Encode},
+	codec::{Decode, Encode, MaxEncodedLen},
 	dispatch::DispatchResultWithPostInfo,
 	scale_info::TypeInfo,
 	traits::{EnsureOrigin, Get, PalletInfoAccess},
@@ -64,7 +64,7 @@ pub use ethereum::{
 };
 pub use fp_rpc::TransactionStatus;
 
-#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
+#[derive(PartialEq, Eq, Clone, RuntimeDebug, Encode, Decode, MaxEncodedLen, TypeInfo)]
 pub enum RawOrigin {
 	EthereumTransaction(H160),
 }

diff --git a/frame/evm/src/lib.rs b/frame/evm/src/lib.rs
@@ -657,6 +657,7 @@ impl<T: Config> Pallet<T> {
 		}
 
 		<AccountCodes<T>>::remove(address);
+		#[allow(deprecated)]
 		let _ = <AccountStorages<T>>::remove_prefix(address, None);
 	}
 

diff --git a/frame/evm/src/runner/stack.rs b/frame/evm/src/runner/stack.rs
@@ -650,6 +650,7 @@ where
 	}
 
 	fn reset_storage(&mut self, address: H160) {
+		#[allow(deprecated)]
 		let _ = <AccountStorages<T>>::remove_prefix(address, None);
 	}
 

diff --git a/template/node/Cargo.toml b/template/node/Cargo.toml
@@ -19,7 +19,7 @@ log = "0.4.17"
 
 # Parity
 codec = { package = "parity-scale-codec", version = "3.1", features = ["derive"] }
-jsonrpsee = { version = "0.13.0", features = ["server", "macros"] }
+jsonrpsee = { version = "0.14.0", features = ["server", "macros"] }
 
 # Substrate
 sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }

diff --git a/template/node/src/chain_spec.rs b/template/node/src/chain_spec.rs
@@ -1,7 +1,4 @@
-use frontier_template_runtime::{
-	AccountId, AuraConfig, BalancesConfig, EVMConfig, EthereumConfig, GenesisConfig, GrandpaConfig,
-	Signature, SudoConfig, SystemConfig, WASM_BINARY,
-};
+use frontier_template_runtime::{AccountId, GenesisConfig, Signature, WASM_BINARY};
 use sc_service::ChainType;
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 use sp_core::{sr25519, Pair, Public, H160, U256};
@@ -136,6 +133,9 @@ fn testnet_genesis(
 	endowed_accounts: Vec<AccountId>,
 	_enable_println: bool,
 ) -> GenesisConfig {
+	use frontier_template_runtime::{
+		AuraConfig, BalancesConfig, EVMConfig, GrandpaConfig, SudoConfig, SystemConfig,
+	};
 	GenesisConfig {
 		system: SystemConfig {
 			// Add Wasm runtime to storage.
@@ -149,6 +149,7 @@ fn testnet_genesis(
 				.map(|k| (k, 1 << 60))
 				.collect(),
 		},
+		transaction_payment: Default::default(),
 		aura: AuraConfig {
 			authorities: initial_authorities.iter().map(|x| (x.0.clone())).collect(),
 		},
@@ -196,7 +197,7 @@ fn testnet_genesis(
 				map
 			},
 		},
-		ethereum: EthereumConfig {},
+		ethereum: Default::default(),
 		dynamic_fee: Default::default(),
 		base_fee: Default::default(),
 	}

diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs
@@ -284,6 +284,7 @@ parameter_types! {
 }
 
 impl pallet_transaction_payment::Config for Runtime {
+	type Event = Event;
 	type OnChargeTransaction = CurrencyAdapter<Balances, ()>;
 	type OperationalFeeMultiplier = ConstU8<5>;
 	type WeightToFee = IdentityFee<Balance>;
@@ -394,18 +395,18 @@ construct_runtime!(
 		NodeBlock = opaque::Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
-		Aura: pallet_aura::{Pallet, Config<T>},
-		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event},
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
-		Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
-		Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Config, Origin},
-		EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>},
-		DynamicFee: pallet_dynamic_fee::{Pallet, Call, Storage, Config, Inherent},
-		BaseFee: pallet_base_fee::{Pallet, Call, Storage, Config<T>, Event},
-		HotfixSufficients: pallet_hotfix_sufficients::{Pallet, Call},
+		System: frame_system,
+		Timestamp: pallet_timestamp,
+		Aura: pallet_aura,
+		Grandpa: pallet_grandpa,
+		Balances: pallet_balances,
+		TransactionPayment: pallet_transaction_payment,
+		Sudo: pallet_sudo,
+		Ethereum: pallet_ethereum,
+		EVM: pallet_evm,
+		DynamicFee: pallet_dynamic_fee,
+		BaseFee: pallet_base_fee,
+		HotfixSufficients: pallet_hotfix_sufficients,
 	}
 );
-Original file line number
+Diff line change
@@ Expand Up / @@ -657,6 +657,7 @@ impl<T: Config> Pallet<T> { @@
     		}
     		<AccountCodes<T>>::remove(address);
+    		#[allow(deprecated)]
     		let _ = <AccountStorages<T>>::remove_prefix(address, None);
     	}
@@ Expand Down @@