changes: Compare incremental Trie Builder for space saveup optimizations

substrate/frame/revive/Cargo.toml

@@ -18,7 +18,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 alloy-consensus = { workspace = true, default-features = false }
-alloy-core = { workspace = true, features = ["sol-types"] }
+alloy-core = { workspace = true, features = ["sol-types", "rlp"] }
+alloy-rlp = { version = "0.3.12", default-features = false }
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
 derive_more = { workspace = true, features = ["from", "try_into"] }
 environmental = { workspace = true }
@@ -63,6 +64,7 @@ sp-version = { workspace = true }
 subxt-signer = { workspace = true, optional = true, features = ["unstable-eth"] }
 
 [dev-dependencies]
+alloy-consensus = { workspace = true, features = ["serde"] }
 array-bytes = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
 pretty_assertions = { workspace = true }

substrate/frame/revive/rpc/src/lib.rs

@@ -163,7 +163,16 @@ impl EthRpcServer for EthRpcServerImpl {
 
 	async fn send_raw_transaction(&self, transaction: Bytes) -> RpcResult<H256> {
 		let hash = H256(keccak_256(&transaction.0));
-		let call = subxt_client::tx().revive().eth_transact(transaction.0);
+
+		let transaction = match TransactionSigned::decode(&transaction.0) {
+			Ok(tx) => tx,
+			Err(err) => {
+				log::debug!(target: LOG_TARGET, "Failed to decode transaction: {err:?}");
+				return Err(EthRpcError::RlpError(err).into());
+			},
+		};
+
+		let call = subxt_client::tx().revive().eth_transact(subxt::utils::Static(transaction));
 		self.client.submit(call).await.map_err(|err| {
 			log::debug!(target: LOG_TARGET, "submit call failed: {err:?}");
 			err

substrate/frame/revive/rpc/src/receipt_extractor.rs

@@ -112,10 +112,10 @@ impl ReceiptExtractor {
 		.inspect_err(
 			|err| log::debug!(target: LOG_TARGET, "TransactionFeePaid not found in events for block {block_number}\n{err:?}")
 		)?;
-		let transaction_hash = H256(keccak_256(&call.payload));
 
-		let signed_tx =
-			TransactionSigned::decode(&call.payload).map_err(|_| ClientError::TxDecodingFailed)?;
+		let signed_tx = call.signed_transaction.0;
+		let transaction_hash = H256(keccak_256(&signed_tx.signed_payload()));
+
 		let from = signed_tx.recover_eth_address().map_err(|_| {
 			log::error!(target: LOG_TARGET, "Failed to recover eth address from signed tx");
 			ClientError::RecoverEthAddressFailed

substrate/frame/revive/rpc/src/subxt_client.rs

@@ -47,6 +47,10 @@ pub use subxt::config::PolkadotConfig as SrcChainConfig;
 		path = "pallet_revive::evm::api::rpc_types_gen::GenericTransaction",
 		with = "::subxt::utils::Static<::pallet_revive::evm::GenericTransaction>"
 	),
+	substitute_type(
+		path = "pallet_revive::evm::api::rpc_types_gen::TransactionSigned",
+		with = "::subxt::utils::Static<::pallet_revive::evm::TransactionSigned>"
+	),
 	substitute_type(
 		path = "pallet_revive::primitives::EthTransactInfo<B>",
 		with = "::subxt::utils::Static<::pallet_revive::EthTransactInfo<B>>"

substrate/frame/revive/src/evm/api/rpc_types.rs

@@ -289,7 +289,7 @@ impl GenericTransaction {
 				input: tx.input.into(),
 				nonce: Some(tx.nonce),
 				value: Some(tx.value),
-				to: tx.to,
+				to: Some(tx.to),
 				gas: Some(tx.gas),
 				gas_price: Some(
 					base_gas_price
@@ -366,7 +366,7 @@ impl GenericTransaction {
 				input: self.input.to_bytes(),
 				nonce: self.nonce.unwrap_or_default(),
 				value: self.value.unwrap_or_default(),
-				to: self.to,
+				to: self.to.unwrap_or_default(),
 				gas: self.gas.unwrap_or_default(),
 				gas_price: self.max_fee_per_gas.unwrap_or_default(),
 				max_fee_per_gas: self.max_fee_per_gas.unwrap_or_default(),
@@ -432,7 +432,7 @@ fn from_unsigned_works_for_7702() {
 		input: Bytes::from(vec![1u8]),
 		nonce: U256::from(1),
 		value: U256::from(1),
-		to: Some(H160::zero()),
+		to: H160::zero(),
 		gas: U256::from(1),
 		gas_price: U256::from(20),
 		max_fee_per_gas: U256::from(20),