Add support for EIP-7702

Cargo.toml

@@ -53,9 +53,9 @@ clap = { version = "4.5", features = ["derive", "deprecated"] }
 const-hex = { version = "1.14", default-features = false, features = ["alloc"] }
 derive_more = "1.0"
 environmental = { version = "1.1.4", default-features = false }
-ethereum = { git = "https://github.com/rust-ethereum/ethereum", rev = "bbb544622208ef6e9890a2dbc224248f6dd13318", default-features = false }
+ethereum = { version = "0.18.2", default-features = false }
 ethereum-types = { version = "0.15", default-features = false }
-evm = { git = "https://github.com/rust-ethereum/evm", branch = "v0.x", default-features = false }
+evm = { version = "0.43.2", default-features = false }
 futures = "0.3.31"
 hash-db = { version = "0.16.0", default-features = false }
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }

client/db/src/sql/mod.rs

@@ -517,9 +517,10 @@ where
 		transaction_count += receipts.len();
 		for (transaction_index, receipt) in receipts.iter().enumerate() {
 			let receipt_logs = match receipt {
-				ethereum::ReceiptV3::Legacy(d)
-				| ethereum::ReceiptV3::EIP2930(d)
-				| ethereum::ReceiptV3::EIP1559(d) => &d.logs,
+				ethereum::ReceiptV4::Legacy(d)
+				| ethereum::ReceiptV4::EIP2930(d)
+				| ethereum::ReceiptV4::EIP1559(d)
+				| ethereum::ReceiptV4::EIP7702(d) => &d.logs,
 			};
 			let transaction_index = transaction_index as i32;
 			log_count += receipt_logs.len();

client/mapping-sync/src/sql/mod.rs

@@ -525,7 +525,7 @@ mod test {
 			mix_hash: H256::default(),
 			nonce: ethereum_types::H64::default(),
 		};
-		let ethereum_transactions: Vec<ethereum::TransactionV2> = vec![];
+		let ethereum_transactions: Vec<ethereum::TransactionV3> = vec![];
 		let ethereum_block = ethereum::Block::new(partial_header, ethereum_transactions, vec![]);
 		DigestItem::Consensus(
 			fp_consensus::FRONTIER_ENGINE_ID,
@@ -596,7 +596,7 @@ mod test {
 			let topics_2_4 = H256::repeat_byte(0x06);
 
 			let receipts = Encode::encode(&vec![
-				ethereum::ReceiptV3::EIP1559(ethereum::EIP1559ReceiptData {
+				ethereum::ReceiptV4::EIP1559(ethereum::EIP1559ReceiptData {
 					status_code: 0u8,
 					used_gas: U256::zero(),
 					logs_bloom: ethereum_types::Bloom::zero(),
@@ -606,7 +606,7 @@ mod test {
 						data: vec![],
 					}],
 				}),
-				ethereum::ReceiptV3::EIP1559(ethereum::EIP1559ReceiptData {
+				ethereum::ReceiptV4::EIP1559(ethereum::EIP1559ReceiptData {
 					status_code: 0u8,
 					used_gas: U256::zero(),
 					logs_bloom: ethereum_types::Bloom::zero(),
@@ -829,7 +829,7 @@ mod test {
 			let topics_2_4 = H256::random();
 
 			let receipts = Encode::encode(&vec![
-				ethereum::ReceiptV3::EIP1559(ethereum::EIP1559ReceiptData {
+				ethereum::ReceiptV4::EIP1559(ethereum::EIP1559ReceiptData {
 					status_code: 0u8,
 					used_gas: U256::zero(),
 					logs_bloom: ethereum_types::Bloom::zero(),
@@ -839,7 +839,7 @@ mod test {
 						data: vec![],
 					}],
 				}),
-				ethereum::ReceiptV3::EIP1559(ethereum::EIP1559ReceiptData {
+				ethereum::ReceiptV4::EIP1559(ethereum::EIP1559ReceiptData {
 					status_code: 0u8,
 					used_gas: U256::zero(),
 					logs_bloom: ethereum_types::Bloom::zero(),

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

@@ -38,7 +38,7 @@ mod work;
 
 pub mod pubsub;
 
-use ethereum::TransactionV2 as EthereumTransaction;
+use ethereum::TransactionV3 as EthereumTransaction;
 use ethereum_types::H160;
 
 #[cfg(feature = "txpool")]

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

@@ -21,7 +21,7 @@
 use std::collections::BTreeMap;
 
 use ethereum::{
-	BlockV2 as EthereumBlock, ReceiptV3 as EthereumReceipt, TransactionV2 as EthereumTransaction,
+	BlockV3 as EthereumBlock, ReceiptV4 as EthereumReceipt, TransactionV3 as EthereumTransaction,
 };
 use ethereum_types::{H256, U256};
 use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer};
@@ -126,7 +126,8 @@ impl PubSubResult {
 			let receipt_logs = match receipt {
 				EthereumReceipt::Legacy(d)
 				| EthereumReceipt::EIP2930(d)
-				| EthereumReceipt::EIP1559(d) => d.logs,
+				| EthereumReceipt::EIP1559(d)
+				| EthereumReceipt::EIP7702(d) => d.logs,
 			};
 
 			let transaction_hash: Option<H256> = if !receipt_logs.is_empty() {

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

@@ -16,7 +16,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use ethereum::{AccessListItem, TransactionAction, TransactionV2 as EthereumTransaction};
+use ethereum::{
+	AccessListItem, AuthorizationListItem, TransactionAction, TransactionV3 as EthereumTransaction,
+};
 use ethereum_types::{H160, H256, U256, U64};
 use serde::{ser::SerializeStruct, Serialize, Serializer};
 
@@ -66,6 +68,9 @@ pub struct Transaction {
 	/// Pre-pay to warm storage access.
 	#[serde(skip_serializing_if = "Option::is_none")]
 	pub access_list: Option<Vec<AccessListItem>>,
+	/// EIP-7702 authorization list.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub authorization_list: Option<Vec<AuthorizationListItem>>,
 	/// The parity (0 for even, 1 for odd) of the y-value of the secp256k1 signature.
 	#[serde(skip_serializing_if = "Option::is_none")]
 	pub y_parity: Option<U256>,
@@ -106,6 +111,7 @@ impl BuildFrom for Transaction {
 				creates: None,
 				chain_id: t.signature.chain_id().map(U64::from),
 				access_list: None,
+				authorization_list: None,
 				y_parity: None,
 				v: Some(U256::from(t.signature.v())),
 				r: U256::from_big_endian(t.signature.r().as_bytes()),
@@ -132,10 +138,11 @@ impl BuildFrom for Transaction {
 				creates: None,
 				chain_id: Some(U64::from(t.chain_id)),
 				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_big_endian(t.r.as_bytes()),
-				s: U256::from_big_endian(t.s.as_bytes()),
+				authorization_list: None,
+				y_parity: Some(U256::from(t.signature.odd_y_parity() as u8)),
+				v: Some(U256::from(t.signature.odd_y_parity() as u8)),
+				r: U256::from_big_endian(t.signature.r().as_bytes()),
+				s: U256::from_big_endian(t.signature.s().as_bytes()),
 			},
 			EthereumTransaction::EIP1559(t) => Self {
 				transaction_type: U256::from(2),
@@ -159,10 +166,38 @@ impl BuildFrom for Transaction {
 				creates: None,
 				chain_id: Some(U64::from(t.chain_id)),
 				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_big_endian(t.r.as_bytes()),
-				s: U256::from_big_endian(t.s.as_bytes()),
+				authorization_list: None,
+				y_parity: Some(U256::from(t.signature.odd_y_parity() as u8)),
+				v: Some(U256::from(t.signature.odd_y_parity() as u8)),
+				r: U256::from_big_endian(t.signature.r().as_bytes()),
+				s: U256::from_big_endian(t.signature.s().as_bytes()),
+			},
+			EthereumTransaction::EIP7702(t) => Self {
+				transaction_type: U256::from(4),
+				hash,
+				nonce: t.nonce,
+				block_hash: None,
+				block_number: None,
+				transaction_index: None,
+				from,
+				to: match t.destination {
+					TransactionAction::Call(to) => Some(to),
+					TransactionAction::Create => None,
+				},
+				value: t.value,
+				gas: t.gas_limit,
+				gas_price: Some(t.max_fee_per_gas),
+				max_fee_per_gas: Some(t.max_fee_per_gas),
+				max_priority_fee_per_gas: Some(t.max_priority_fee_per_gas),
+				input: Bytes(t.data.clone()),
+				creates: None,
+				chain_id: Some(U64::from(t.chain_id)),
+				access_list: Some(t.access_list.clone()),
+				authorization_list: Some(t.authorization_list.clone()),
+				y_parity: Some(U256::from(t.signature.odd_y_parity() as u8)),
+				v: Some(U256::from(t.signature.odd_y_parity() as u8)),
+				r: U256::from_big_endian(t.signature.r().as_bytes()),
+				s: U256::from_big_endian(t.signature.s().as_bytes()),
 			},
 		}
 	}