feat: Introduce Auth and AccessList traits (#2079)

* feat: Introduce Auth and AccessList traits

* add recovery to context interface

Author: rakita

Cargo.lock

@@ -27,6 +27,8 @@ primitives.workspace = true
 database-interface.workspace = true
 state.workspace = true
 specification.workspace = true
+alloy-eip7702 = { workspace = true, features = ["k256"] }
+alloy-eip2930.workspace = true
 
 # mics
 auto_impl.workspace = true
@@ -45,4 +47,3 @@ default = ["std"]
 std = ["serde?/std"]
 serde = ["dep:serde", "primitives/serde", "specification/serde", "state/serde"]
 serde-json = ["serde"]
-

crates/context/interface/Cargo.toml

@@ -1,5 +1,10 @@
+mod alloy_types;
+pub mod eip2930;
+pub mod eip7702;
 pub mod transaction_type;
 
+pub use eip2930::AccessListTrait;
+pub use eip7702::AuthorizationTrait;
 use specification::eip4844::GAS_PER_BLOB;
 pub use transaction_type::TransactionType;
 
@@ -11,9 +16,6 @@ use primitives::{Address, Bytes, TxKind, B256, U256};
 /// Transaction validity error types.
 pub trait TransactionError: Debug + core::error::Error {}
 
-/// (Optional signer, chain id, nonce, address)
-pub type AuthorizationItem = (Option<Address>, U256, u64, Address);
-
 /// Main Transaction trait that abstracts and specifies all transaction currently supported by Ethereum
 ///
 /// Access to any associated type is gaited behind [`tx_type`][Transaction::tx_type] function.
@@ -22,6 +24,9 @@ pub type AuthorizationItem = (Option<Address>, U256, u64, Address);
 /// deprecated by not returning tx_type.
 #[auto_impl(&, Box, Arc, Rc)]
 pub trait Transaction {
+    type AccessList: AccessListTrait;
+    type Authorization: AuthorizationTrait;
+
     /// Returns the transaction type.
     ///
     /// Depending on this field other functions should be called.
@@ -68,20 +73,11 @@ pub trait Transaction {
     /// For Eip1559 it is max_fee_per_gas.
     fn gas_price(&self) -> u128;
 
-    fn access_list(&self) -> Option<impl Iterator<Item = (&Address, &[B256])>>;
-
-    fn access_list_nums(&self) -> Option<(usize, usize)> {
-        self.access_list().map(|al| {
-            let mut accounts_num = 0;
-            let mut storage_num = 0;
-            for (_, storage) in al {
-                accounts_num += 1;
-                storage_num += storage.len();
-            }
+    /// Access list for the transaction.
+    ///
+    /// Introduced in EIP-2930.
+    fn access_list(&self) -> Option<&Self::AccessList>;
 
-            (accounts_num, storage_num)
-        })
-    }
     /// Returns vector of fixed size hash(32 bytes)
     ///
     /// Note : EIP-4844 transaction field.
@@ -114,6 +110,7 @@ pub trait Transaction {
     /// Returns length of the authorization list.
     ///
     /// # Note
+    ///
     /// Transaction is considered invalid if list is empty.
     fn authorization_list_len(&self) -> usize;
 
@@ -123,7 +120,7 @@ pub trait Transaction {
     /// Set EOA account code for one transaction
     ///
     /// [EIP-Set EOA account code for one transaction](https://eips.ethereum.org/EIPS/eip-7702)
-    fn authorization_list(&self) -> impl Iterator<Item = AuthorizationItem>;
+    fn authorization_list(&self) -> impl Iterator<Item = &Self::Authorization>;
 
     /// Returns maximum fee that can be paid for the transaction.
     fn max_fee_per_gas(&self) -> u128 {

crates/context/interface/src/transaction.rs

@@ -0,0 +1,49 @@
+use super::{AccessListTrait, AuthorizationTrait};
+use primitives::{Address, B256, U256};
+
+use alloy_eip2930::AccessList;
+use alloy_eip7702::{RecoveredAuthorization, SignedAuthorization};
+
+impl AccessListTrait for AccessList {
+    fn access_list(&self) -> impl Iterator<Item = (Address, impl Iterator<Item = B256>)> {
+        self.0
+            .iter()
+            .map(|item| (item.address, item.storage_keys.iter().cloned()))
+    }
+}
+
+impl AuthorizationTrait for SignedAuthorization {
+    fn authority(&self) -> Option<Address> {
+        self.recover_authority().ok()
+    }
+
+    fn chain_id(&self) -> U256 {
+        self.chain_id
+    }
+
+    fn nonce(&self) -> u64 {
+        self.nonce
+    }
+
+    fn address(&self) -> Address {
+        self.address
+    }
+}
+
+impl AuthorizationTrait for RecoveredAuthorization {
+    fn authority(&self) -> Option<Address> {
+        self.authority()
+    }
+
+    fn chain_id(&self) -> U256 {
+        self.chain_id
+    }
+
+    fn nonce(&self) -> u64 {
+        self.nonce
+    }
+
+    fn address(&self) -> Address {
+        self.address
+    }
+}

crates/context/interface/src/transaction/alloy_types.rs

@@ -21,15 +21,3 @@ pub trait AccessListTrait {
         (account_num, storage_num)
     }
 }
-
-// TODO : Move to default context
-use specification::eip2930::AccessList;
-
-impl AccessListTrait for AccessList {
-    fn access_list(&self) -> impl Iterator<Item = (Address, impl Iterator<Item = B256>)> {
-        self.0.iter().map(|item| {
-            let slots = item.storage_keys.iter().copied();
-            (item.address, slots)
-        })
-    }
-}

crates/context/interface/src/transaction/common.rs

@@ -1,3 +1,31 @@
-use super::Eip1559Tx;
 use auto_impl::auto_impl;
 use primitives::{Address, U256};
+
+/// Authorization trait.
+#[auto_impl(&, Box, Arc, Rc)]
+pub trait AuthorizationTrait {
+    /// Authority address.
+    ///
+    /// # Note
+    ///
+    /// Authority signature can be invalid, so this method returns None if the authority
+    /// could not be recovered.
+    ///
+    /// Valid signature Parity should be 0 or 1 and
+    /// signature s-value should be less than SECP256K1N_HALF.
+    fn authority(&self) -> Option<Address>;
+
+    /// Returns authorization the chain id.
+    fn chain_id(&self) -> U256;
+
+    /// Returns the nonce.
+    ///
+    /// # Note
+    ///
+    /// If nonce is not same as the nonce of the signer account,
+    /// the authorization is skipped.
+    fn nonce(&self) -> u64;
+
+    /// Returns the address that this account is delegated to.
+    fn address(&self) -> Address;
+}

crates/context/interface/src/transaction/eip1559.rs

@@ -18,6 +18,6 @@ pub use cfg::{Cfg, CfgEnv};
 pub use context::*;
 pub use journal_init::JournalInit;
 pub use journaled_state::*;
-pub use tx::TxEnv;
+pub use tx::{AccessList, SignedAuthorization, TxEnv};
 pub mod setters;
 pub use evm::{Evm, EvmData};

crates/context/interface/src/transaction/access_list.rs crates/context/interface/src/transaction/eip2930.rs

@@ -1,6 +1,5 @@
-use alloy_eip2930::AccessList;
-use alloy_eip7702::SignedAuthorization;
-use context_interface::transaction::AuthorizationItem;
+pub use alloy_eip2930::AccessList;
+pub use alloy_eip7702::SignedAuthorization;
 use context_interface::Transaction;
 use core::fmt::Debug;
 use primitives::{Address, Bytes, TxKind, B256, U256};
@@ -99,6 +98,9 @@ impl Default for TxEnv {
 }
 
 impl Transaction for TxEnv {
+    type AccessList = AccessList;
+    type Authorization = SignedAuthorization;
+
     fn tx_type(&self) -> u8 {
         self.tx_type
     }
@@ -131,13 +133,8 @@ impl Transaction for TxEnv {
         self.chain_id
     }
 
-    fn access_list(&self) -> Option<impl Iterator<Item = (&Address, &[B256])>> {
-        Some(
-            self.access_list
-                .0
-                .iter()
-                .map(|item| (&item.address, item.storage_keys.as_slice())),
-        )
+    fn access_list(&self) -> Option<&Self::AccessList> {
+        Some(&self.access_list)
     }
 
     fn max_fee_per_gas(&self) -> u128 {
@@ -152,15 +149,8 @@ impl Transaction for TxEnv {
         self.authorization_list.len()
     }
 
-    fn authorization_list(&self) -> impl Iterator<Item = AuthorizationItem> {
-        self.authorization_list.iter().map(|item| {
-            (
-                item.recover_authority().ok(),
-                item.chain_id,
-                item.nonce,
-                item.address,
-            )
-        })
+    fn authorization_list(&self) -> impl Iterator<Item = &Self::Authorization> {
+        self.authorization_list.iter()
     }
 
     fn input(&self) -> &Bytes {