Upgrade polkadot-sdk to stable2412 (polkadot-evm#1595)

* Upgrade the version of `polkadot-sdk` to `stable2412`

* fix: `Invalid params`: missing field `accessList`

* chore: `Deref` is not necessarily required

* chore: remove unnecessary code that uses the `U256` type.

* remove non-essential trait bounds from `fp-self-contained`

these changes are based on the [suggestions](conr2d@df360d6) from @conr2d.

* chore: using full-qualified name of an enumeration for matching arms is a best practice.

Author: 0xbillw

Cargo.lock

@@ -12,7 +12,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 async-trait = { workspace = true }
-scale-codec = { package = "parity-scale-codec", workspace = true }
+scale-codec = { workspace = true }
 # Substrate
 sp-core = { workspace = true, features = ["default"] }
 sp-runtime = { workspace = true, features = ["default"] }

Cargo.toml

@@ -27,7 +27,7 @@ fp-storage = { workspace = true, features = ["default"] }
 
 [dev-dependencies]
 futures = { workspace = true }
-scale-codec = { package = "parity-scale-codec", workspace = true }
+scale-codec = { workspace = true }
 tempfile = "3.3.0"
 # Substrate
 sc-block-builder = { workspace = true }

client/api/Cargo.toml

@@ -12,13 +12,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 async-trait = { workspace = true }
-ethereum = { workspace = true, features = ["with-codec"], optional = true }
+ethereum = { workspace = true, features = ["with-scale"], optional = true }
 futures = { workspace = true, optional = true }
 kvdb-rocksdb = { workspace = true, optional = true }
 log = { workspace = true }
 parity-db = { workspace = true }
 parking_lot = { workspace = true }
-scale-codec = { package = "parity-scale-codec", workspace = true }
+scale-codec = { workspace = true }
 smallvec = { version = "1.13", optional = true }
 sqlx = { workspace = true, features = ["runtime-tokio-native-tls", "sqlite"], optional = true }
 tokio = { workspace = true, features = ["macros", "sync"], optional = true }

client/cli/Cargo.toml

@@ -33,7 +33,7 @@ fp-rpc = { workspace = true, features = ["default"] }
 [dev-dependencies]
 ethereum = { workspace = true }
 ethereum-types = { workspace = true }
-scale-codec = { package = "parity-scale-codec", workspace = true }
+scale-codec = { workspace = true }
 sqlx = { workspace = true, features = ["runtime-tokio-native-tls", "sqlite"] }
 tempfile = "3.14.0"
 tokio = { workspace = true, features = ["sync"] }

client/db/Cargo.toml

@@ -11,7 +11,7 @@ repository = { workspace = true }
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-ethereum = { workspace = true, features = ["with-codec", "with-serde"] }
+ethereum = { workspace = true, features = ["with-scale", "with-serde"] }
 ethereum-types = { workspace = true }
 jsonrpsee = { workspace = true, features = ["server", "macros"] }
 rlp = { workspace = true }

client/mapping-sync/Cargo.toml

@@ -108,8 +108,8 @@ impl BuildFrom for Transaction {
 				access_list: None,
 				y_parity: None,
 				v: Some(U256::from(t.signature.v())),
-				r: U256::from(t.signature.r().as_bytes()),
-				s: U256::from(t.signature.s().as_bytes()),
+				r: U256::from_big_endian(t.signature.r().as_bytes()),
+				s: U256::from_big_endian(t.signature.s().as_bytes()),
 			},
 			EthereumTransaction::EIP2930(t) => Self {
 				transaction_type: U256::from(1),
@@ -134,8 +134,8 @@ impl BuildFrom for Transaction {
 				access_list: Some(t.access_list.clone()),
 				y_parity: Some(U256::from(t.odd_y_parity as u8)),
 				v: Some(U256::from(t.odd_y_parity as u8)),
-				r: U256::from(t.r.as_bytes()),
-				s: U256::from(t.s.as_bytes()),
+				r: U256::from_big_endian(t.r.as_bytes()),
+				s: U256::from_big_endian(t.s.as_bytes()),
 			},
 			EthereumTransaction::EIP1559(t) => Self {
 				transaction_type: U256::from(2),
@@ -161,8 +161,8 @@ impl BuildFrom for Transaction {
 				access_list: Some(t.access_list.clone()),
 				y_parity: Some(U256::from(t.odd_y_parity as u8)),
 				v: Some(U256::from(t.odd_y_parity as u8)),
-				r: U256::from(t.r.as_bytes()),
-				s: U256::from(t.s.as_bytes()),
+				r: U256::from_big_endian(t.r.as_bytes()),
+				s: U256::from_big_endian(t.s.as_bytes()),
 			},
 		}
 	}

client/rpc-core/Cargo.toml

@@ -53,6 +53,7 @@ pub struct TransactionRequest {
 	pub data: Data,
 
 	/// EIP-2930 access list
+	#[serde(with = "access_list_item_camelcase", default)]
 	pub access_list: Option<Vec<AccessListItem>>,
 	/// Chain ID that this transaction is valid on
 	pub chain_id: Option<U64>,
@@ -62,6 +63,38 @@ pub struct TransactionRequest {
 	pub transaction_type: Option<U256>,
 }
 
+/// Fix broken unit-test due to the `serde(rename_all = "camelCase")` attribute of type [ethereum::AccessListItem] has been deleted.
+/// Refer to this [commit](https://github.com/rust-ethereum/ethereum/commit/b160820620aa9fd30050d5fcb306be4e12d58c8c#diff-2a6a2a5c32456901be5ffa0e2d0354f2d48d96a89e486270ae62808c34b6e96f)
+mod access_list_item_camelcase {
+	use ethereum::AccessListItem;
+	use ethereum_types::{Address, H256};
+	use serde::{Deserialize, Deserializer};
+
+	#[derive(Deserialize)]
+	struct AccessListItemDef {
+		address: Address,
+		#[serde(rename = "storageKeys")]
+		storage_keys: Vec<H256>,
+	}
+
+	pub fn deserialize<'de, D>(deserializer: D) -> Result<Option<Vec<AccessListItem>>, D::Error>
+	where
+		D: Deserializer<'de>,
+	{
+		let access_item_defs_opt: Option<Vec<AccessListItemDef>> =
+			Option::deserialize(deserializer)?;
+		Ok(access_item_defs_opt.map(|access_item_defs| {
+			access_item_defs
+				.into_iter()
+				.map(|access_item_def| AccessListItem {
+					address: access_item_def.address,
+					storage_keys: access_item_def.storage_keys,
+				})
+				.collect()
+		}))
+	}
+}
+
 impl TransactionRequest {
 	// We accept "data" and "input" for backwards-compatibility reasons.
 	// "input" is the newer name and should be preferred by clients.
@@ -235,6 +268,31 @@ mod tests {
 		);
 	}
 
+	#[test]
+	fn test_deserialize_missing_field_access_list() {
+		let data = json!({
+			"from": "0x60be2d1d3665660d22ff9624b7be0551ee1ac91b",
+			"to": "0x13fe2d1d3665660d22ff9624b7be0551ee1ac91b",
+			"gasPrice": "0x10",
+			"maxFeePerGas": "0x20",
+			"maxPriorityFeePerGas": "0x30",
+			"gas": "0x40",
+			"value": "0x50",
+			"input": "0x123abc",
+			"nonce": "0x60",
+			"type": "0x70"
+		});
+
+		let args = serde_json::from_value::<TransactionRequest>(data).unwrap();
+		assert_eq!(
+			args.data,
+			Data {
+				input: Some(Bytes::from(vec![0x12, 0x3a, 0xbc])),
+				data: None,
+			}
+		);
+	}
+
 	#[test]
 	fn test_deserialize_with_only_data() {
 		let data = json!({

client/rpc-core/src/types/transaction.rs

@@ -32,7 +32,7 @@ pub struct TransactionSignature {
 	///
 	/// - For legacy transactions, this is the recovery id.
 	/// - For typed transactions (EIP-2930, EIP-1559, EIP-4844), this is set to the parity
-	/// (0 for even, 1 for odd) of the y-value of the secp256k1 signature.
+	///   (0 for even, 1 for odd) of the y-value of the secp256k1 signature.
 	///
 	/// # Note
 	///

client/rpc-core/src/types/transaction_request.rs

@@ -11,7 +11,7 @@ repository = { workspace = true }
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-ethereum = { workspace = true, features = ["with-codec"] }
+ethereum = { workspace = true, features = ["with-scale"] }
 ethereum-types = { workspace = true }
 evm = { workspace = true }
 futures = { workspace = true }
@@ -22,7 +22,7 @@ log = { workspace = true }
 prometheus = { version = "0.13.4", default-features = false }
 rand = "0.8"
 rlp = { workspace = true }
-scale-codec = { package = "parity-scale-codec", workspace = true }
+scale-codec = { workspace = true }
 schnellru = "0.2.4"
 serde = { workspace = true }
 thiserror = { workspace = true }

client/rpc-v2/types/src/transaction/signature.rs

@@ -147,7 +147,7 @@ where
 					graph
 						.validated_pool()
 						.ready()
-						.map(|in_pool_tx| in_pool_tx.data().clone())
+						.map(|in_pool_tx| in_pool_tx.data().as_ref().clone())
 						.collect::<Vec<<B as BlockT>::Extrinsic>>(),
 				);
 
@@ -157,7 +157,7 @@ where
 						.validated_pool()
 						.futures()
 						.iter()
-						.map(|(_hash, extrinsic)| extrinsic.clone())
+						.map(|(_hash, extrinsic)| extrinsic.as_ref().clone())
 						.collect::<Vec<<B as BlockT>::Extrinsic>>(),
 				);
 

client/rpc/Cargo.toml

@@ -978,8 +978,8 @@ pub fn error_on_execution_failure(reason: &ExitReason, data: &[u8]) -> RpcResult
 			// A minimum size of error function selector (4) + offset (32) + string length (32)
 			// should contain a utf-8 encoded revert reason.
 			if data.len() > MESSAGE_START {
-				let message_len =
-					U256::from(&data[LEN_START..MESSAGE_START]).saturated_into::<usize>();
+				let message_len = U256::from_big_endian(&data[LEN_START..MESSAGE_START])
+					.saturated_into::<usize>();
 				let message_end = MESSAGE_START.saturating_add(message_len);
 
 				if data.len() >= message_end {

client/rpc/src/eth/block.rs

@@ -111,7 +111,7 @@ where
 					.graph
 					.validated_pool()
 					.ready()
-					.map(|in_pool_tx| in_pool_tx.data().clone())
+					.map(|in_pool_tx| in_pool_tx.data().as_ref().clone())
 					.collect();
 				// Use the runtime to match the (here) opaque extrinsics against ethereum transactions.
 				let api = self.client.runtime_api();
@@ -225,7 +225,7 @@ where
 							.graph
 							.validated_pool()
 							.ready()
-							.map(|in_pool_tx| in_pool_tx.data().clone())
+							.map(|in_pool_tx| in_pool_tx.data().as_ref().clone())
 							.collect();
 						// Use the runtime to match the (here) opaque extrinsics against ethereum transactions.
 						let api = self.client.runtime_api();

client/rpc/src/eth/execute.rs

@@ -125,7 +125,7 @@ where
 			.graph
 			.validated_pool()
 			.ready()
-			.map(|in_pool_tx| in_pool_tx.data().clone())
+			.map(|in_pool_tx| in_pool_tx.data().as_ref().clone())
 			.collect::<Vec<<B as BlockT>::Extrinsic>>();
 		log::debug!(target: LOG_TARGET, "Pending runtime API: extrinsic len = {}", extrinsics.len());
 		// Apply the extrinsics from the ready queue to the pending block's state.

client/rpc/src/eth/filter.rs

@@ -81,7 +81,7 @@ where
 					graph
 						.validated_pool()
 						.ready()
-						.map(|in_pool_tx| in_pool_tx.data().clone())
+						.map(|in_pool_tx| in_pool_tx.data().as_ref().clone())
 						.collect::<Vec<<B as BlockT>::Extrinsic>>(),
 				);
 
@@ -91,7 +91,7 @@ where
 						.validated_pool()
 						.futures()
 						.iter()
-						.map(|(_hash, extrinsic)| extrinsic.clone())
+						.map(|(_hash, extrinsic)| extrinsic.as_ref().clone())
 						.collect::<Vec<<B as BlockT>::Extrinsic>>(),
 				);
 

client/rpc/src/eth/pending.rs

@@ -165,7 +165,7 @@ where
 				return future::ready(None);
 			};
 
-			let xts = vec![xt.data().clone()];
+			let xts = vec![xt.data().as_ref().clone()];
 
 			let txs: Option<Vec<EthereumTransaction>> = if api_version > 1 {
 				api.extrinsic_filter(best_block, xts).ok()

client/rpc/src/eth/transaction.rs

@@ -109,7 +109,7 @@ where
 			.graph
 			.validated_pool()
 			.ready()
-			.map(|in_pool_tx| in_pool_tx.data().clone())
+			.map(|in_pool_tx| in_pool_tx.data().as_ref().clone())
 			.collect();
 
 		// Collect extrinsics in the future validated pool.
@@ -118,7 +118,7 @@ where
 			.validated_pool()
 			.futures()
 			.iter()
-			.map(|(_, extrinsic)| extrinsic.clone())
+			.map(|(_, extrinsic)| extrinsic.as_ref().clone())
 			.collect();
 
 		// Use the runtime to match the (here) opaque extrinsics against ethereum transactions.

client/rpc/src/eth_pubsub.rs

@@ -11,9 +11,9 @@ repository = { workspace = true }
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-ethereum = { workspace = true, features = ["with-codec"] }
+ethereum = { workspace = true, features = ["with-scale"] }
 ethereum-types = { workspace = true }
-scale-codec = { package = "parity-scale-codec", workspace = true }
+scale-codec = { workspace = true }
 
 # Substrate
 sc-client-api = { workspace = true }

client/rpc/src/txpool.rs

@@ -123,12 +123,9 @@ where
 	}
 
 	pub fn account_storage(&self, at: B::Hash, address: Address, index: U256) -> Option<H256> {
-		let tmp: &mut [u8; 32] = &mut [0; 32];
-		index.to_big_endian(tmp);
-
 		let mut key: Vec<u8> = storage_prefix_build(PALLET_EVM, EVM_ACCOUNT_STORAGES);
 		key.extend(blake2_128_extend(address.as_bytes()));
-		key.extend(blake2_128_extend(tmp));
+		key.extend(blake2_128_extend(&index.to_big_endian()));
 
 		self.query::<H256>(at, &StorageKey(key))
 	}

client/storage/Cargo.toml

@@ -11,7 +11,7 @@ repository = { workspace = true }
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-scale-codec = { package = "parity-scale-codec", workspace = true }
+scale-codec = { workspace = true }
 scale-info = { workspace = true }
 # Substrate
 frame-support = { workspace = true }

client/storage/src/overrides/mod.rs

@@ -11,7 +11,7 @@ repository = { workspace = true }
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-scale-codec = { package = "parity-scale-codec", workspace = true }
+scale-codec = { workspace = true }
 scale-info = { workspace = true }
 # Substrate
 frame-support = { workspace = true }

frame/base-fee/Cargo.toml

@@ -11,10 +11,10 @@ repository = { workspace = true }
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-ethereum = { workspace = true, features = ["with-codec"] }
+ethereum = { workspace = true, features = ["with-scale"] }
 ethereum-types = { workspace = true }
 evm = { workspace = true, features = ["with-codec"] }
-scale-codec = { package = "parity-scale-codec", workspace = true }
+scale-codec = { workspace = true }
 scale-info = { workspace = true }
 # Substrate
 frame-support = { workspace = true }

frame/dynamic-fee/Cargo.toml

@@ -137,7 +137,10 @@ where
 		len: usize,
 	) -> Option<Result<(), TransactionValidityError>> {
 		if let Call::transact { transaction } = self {
-			if let Err(e) = CheckWeight::<T>::do_pre_dispatch(dispatch_info, len) {
+			if let Err(e) =
+				CheckWeight::<T>::do_validate(dispatch_info, len).and_then(|(_, next_len)| {
+					CheckWeight::<T>::do_prepare(dispatch_info, len, next_len)
+				}) {
 				return Some(Err(e));
 			}
 
@@ -629,8 +632,9 @@ impl<T: Config> Pallet<T> {
 						let data = info.value;
 						let data_len = data.len();
 						if data_len > MESSAGE_START {
-							let message_len = U256::from(&data[LEN_START..MESSAGE_START])
-								.saturated_into::<usize>();
+							let message_len =
+								U256::from_big_endian(&data[LEN_START..MESSAGE_START])
+									.saturated_into::<usize>();
 							let message_end = MESSAGE_START.saturating_add(
 								message_len.min(T::ExtraDataLength::get() as usize),
 							);

frame/ethereum/Cargo.toml

@@ -11,7 +11,7 @@ repository = { workspace = true }
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-scale-codec = { package = "parity-scale-codec", workspace = true }
+scale-codec = { workspace = true }
 scale-info = { workspace = true }
 # Substrate
 frame-support = { workspace = true }

frame/ethereum/src/lib.rs

@@ -18,7 +18,7 @@ hash-db = { workspace = true }
 hex-literal = { workspace = true }
 impl-trait-for-tuples = "0.2.3"
 log = { workspace = true }
-scale-codec = { package = "parity-scale-codec", workspace = true }
+scale-codec = { workspace = true }
 scale-info = { workspace = true }
 # Substrate
 frame-benchmarking = { workspace = true, optional = true }
@@ -43,7 +43,7 @@ default = ["std"]
 std = [
 	"environmental?/std",
 	"evm/std",
-	"evm/with-serde",
+	"evm/serde",
 	"hex/std",
 	"log/std",
 	"scale-codec/std",