Skip to content

Commit 54140ae

Browse files
manuelmauroclaude
manuelmauro
and
claude
authored
Add support for EIP-7702 (polkadot-evm#1693)
* feat: ✨ add support for EIP-7702 * chore: ⬆️ use temporary fork of ethereum crate * feat: ✨ update to ethereum crate v3 structs * feat: ⬆️ upgrade evm crate * feat: ✨ add EIP-7702 support to RPC * fix: ⬆️ upgrade evm crate * feat: ✨ upgrade evm crate * feat: ✨ add EIP-7702 support to EthDevSigner * test: 🔥 temporarily remove EIP-7702 tests * feat: ⬆️ upgrade ethereum and evm crates * fix: 🐛 properly convert authorization list to evm's data type * fix: 🔥 fix logic * fix: 🐛 fix usage of authorization list throughout the codebase * style: 🎨 fmt * fix: ⬆️ upgrade evm * refactor: 🚨 silence lint error * style: 🎨 fmt * refactor: 🔥 remove unused imports * fix: ⬆️ upgrade config to pectra * fix: 🐛 manage API v6 case in Eth::call * fix: 🐛 manage API v6 case in Eth::estimate_gas * chore: 🔥 remove unused dependencies * test: ✅ add unit tests for EIP-7702 * test: ✅ add integration tests for EIP-7702 * style: 🎨 fmt * refactor: ⬆️ upgrade evm crate * fix: 🐛 propagate std feature to ethereum-ext * refactor: ♻️ use upstream evm crate * refactor: 🔥 remove ethereum-ext temporary dependency * style: 🎨 format TS code * refactor: ♻️ ignore lint warning * feat: ⬆️ upgrade evm/ethereum dependencies * feat: ✨ add validation error for EIP-7702 empty authorization list * style: 🎨 format code * refactor: 🔥 remove unused const * test: 🧪 add failing test for EIP-7702 authoriations * fix: 🐛 fix authorization creation in tests * refactor: ⬆️ use evm release on crates.io * style: 🎨 format code * feat: ✨ record delegation resolution external operation * revert: 🔥 remove old TODOs * fix: 🐛 add missing semicolon * feat: add comprehensive EIP-7702 validation at Substrate level - Add chain ID validation for authorization tuples - Add maximum authorization list size validation (255 items) - Add new error types: InvalidAuthorizationChainId, AuthorizationListTooLarge - Map new validation errors to appropriate EVM pallet errors 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * feat: add documentation for EIP-7702 gas costs and improve error handling - Add documentation about EIP-7702 gas costs in runtime estimation - Add error handling for new validation errors in Ethereum pallet - Add user-friendly error messages for EIP-7702 validation failures in RPC 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * fix: 🐛 add missing case in error conversion * fix: correct authorization signature format in TypeScript tests - Fix EIP-7702 authorization signature creation to use proper spec format - Use magic byte 0x05 and RLP encoding as per EIP-7702 specification - Rust tests already used correct format, only TS tests needed fixing 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * test: add comprehensive EIP-7702 validation tests - Add tests for empty authorization list validation - Add tests for authorization list size limits (max 255 items) - Add tests for chain ID validation (must be 0 or match transaction chain ID) - Add tests for valid authorization list scenarios - Add tests for non-EIP-7702 transaction validation skipping - Add missing InvalidAuthorizationChainId error variant and mapping 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * docs: add comprehensive documentation for EIP-7702 validation functions - Add detailed documentation for with_eip7702_authorization_list function - Document validation rules and responsibilities split between Substrate/EVM levels - Add comprehensive error type documentation with security rationale - Include usage examples and parameter descriptions - Clarify the distinction between Substrate and EVM-level validation 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * revert: 🔥 remove InvalidAuthorizationChainId validation error * docs: 📝 digest docs * style: 🎨 format * fix: 🐛 account for authentication list items in the proof size base cost * refactor: ♻️ return error for unsupported API version * refactor: ♻️ refactor TransactionRequest to TransactionMessage conversion * style: 🎨 format * refactor: ♻️ reduce code duplication * fix: 🐛 fix delegation code length in test * test: ✅ actually check gas consumption in EIP-7702 * fix: 🐛 treat DelegationResolution just as a second AddressCodeRead * refactor: 🎨 use serde rename_all directive * docs: 📝 improve AuthorizationListTooLarge docs * fix: 🐛 add EIP7702 variant to TxType * feat: ⬆️ upgrade ethers.js * test: 🐛 first revision of the integration tests for EIP-7702 * fix: 🐛 second revision of the integration tests for EIP-7702 * fix: 🐛 upgrade evm * fix: 🐛 fix authorization nonce in test * feat: ✨ add EthereumBlockWrapper * refactor: 🔥 remove CurrentBlock v0 to v2 migrations * refactor: ♻️ clippy * refactor: ♻️ refactor EthereumBlockWrapper decoding * revert: ⏪ restore block migration functions * Revert "refactor: ♻️ refactor EthereumBlockWrapper decoding" This reverts commit c0923c7. * Revert "refactor: ♻️ clippy" This reverts commit 6521a03. * Revert "feat: ✨ add EthereumBlockWrapper" This reverts commit 88b8fbc. * feat: ✨ add block v2 to v3 migration methods * fix: 🐛 fix typo in post_migrate_block_v3 * refactor: ♻️ rename size_limit to create_contract_limit * fix: 🐛 account for empty authorization list cost in template * fix: 🐛 the base cost for the authorization list is already accounted for in the encoding * revert: ⏪ block v2 is still a valid block v3 * fix: 🔒 validate authorizations signatures on extrinsic call * fix: 🐛 add ethereum/std to std feature * fix: 🔒 properly validate authorization list --------- Co-authored-by: Claude <noreply@anthropic.com>
1 parent 0d0db7b commit 54140ae

49 files changed

Lines changed: 2399 additions & 333 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Cargo.lock‎

Lines changed: 20 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ clap = { version = "4.5", features = ["derive", "deprecated"] }
5757
const-hex = { version = "1.14", default-features = false, features = ["alloc"] }
5858
derive_more = "1.0"
5959
environmental = { version = "1.1.4", default-features = false }
60-
ethereum = { git = "https://github.com/rust-ethereum/ethereum", rev = "bbb544622208ef6e9890a2dbc224248f6dd13318", default-features = false }
60+
ethereum = { version = "0.18.2", default-features = false }
6161
ethereum-types = { version = "0.15", default-features = false }
62-
evm = { git = "https://github.com/rust-ethereum/evm", branch = "v0.x", default-features = false }
62+
evm = { version = "0.43.2", default-features = false }
6363
futures = "0.3.31"
6464
hash-db = { version = "0.16.0", default-features = false }
6565
hex = { version = "0.4.3", default-features = false, features = ["alloc"] }

‎client/db/src/sql/mod.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -517,9 +517,10 @@ where
517517
transaction_count += receipts.len();
518518
for (transaction_index, receipt) in receipts.iter().enumerate() {
519519
let receipt_logs = match receipt {
520-
ethereum::ReceiptV3::Legacy(d)
521-
| ethereum::ReceiptV3::EIP2930(d)
522-
| ethereum::ReceiptV3::EIP1559(d) => &d.logs,
520+
ethereum::ReceiptV4::Legacy(d)
521+
| ethereum::ReceiptV4::EIP2930(d)
522+
| ethereum::ReceiptV4::EIP1559(d)
523+
| ethereum::ReceiptV4::EIP7702(d) => &d.logs,
523524
};
524525
let transaction_index = transaction_index as i32;
525526
log_count += receipt_logs.len();

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ mod test {
525525
mix_hash: H256::default(),
526526
nonce: ethereum_types::H64::default(),
527527
};
528-
let ethereum_transactions: Vec<ethereum::TransactionV2> = vec![];
528+
let ethereum_transactions: Vec<ethereum::TransactionV3> = vec![];
529529
let ethereum_block = ethereum::Block::new(partial_header, ethereum_transactions, vec![]);
530530
DigestItem::Consensus(
531531
fp_consensus::FRONTIER_ENGINE_ID,
@@ -596,7 +596,7 @@ mod test {
596596
let topics_2_4 = H256::repeat_byte(0x06);
597597

598598
let receipts = Encode::encode(&vec![
599-
ethereum::ReceiptV3::EIP1559(ethereum::EIP1559ReceiptData {
599+
ethereum::ReceiptV4::EIP1559(ethereum::EIP1559ReceiptData {
600600
status_code: 0u8,
601601
used_gas: U256::zero(),
602602
logs_bloom: ethereum_types::Bloom::zero(),
@@ -606,7 +606,7 @@ mod test {
606606
data: vec![],
607607
}],
608608
}),
609-
ethereum::ReceiptV3::EIP1559(ethereum::EIP1559ReceiptData {
609+
ethereum::ReceiptV4::EIP1559(ethereum::EIP1559ReceiptData {
610610
status_code: 0u8,
611611
used_gas: U256::zero(),
612612
logs_bloom: ethereum_types::Bloom::zero(),
@@ -829,7 +829,7 @@ mod test {
829829
let topics_2_4 = H256::random();
830830

831831
let receipts = Encode::encode(&vec![
832-
ethereum::ReceiptV3::EIP1559(ethereum::EIP1559ReceiptData {
832+
ethereum::ReceiptV4::EIP1559(ethereum::EIP1559ReceiptData {
833833
status_code: 0u8,
834834
used_gas: U256::zero(),
835835
logs_bloom: ethereum_types::Bloom::zero(),
@@ -839,7 +839,7 @@ mod test {
839839
data: vec![],
840840
}],
841841
}),
842-
ethereum::ReceiptV3::EIP1559(ethereum::EIP1559ReceiptData {
842+
ethereum::ReceiptV4::EIP1559(ethereum::EIP1559ReceiptData {
843843
status_code: 0u8,
844844
used_gas: U256::zero(),
845845
logs_bloom: ethereum_types::Bloom::zero(),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ mod work;
3838

3939
pub mod pubsub;
4040

41-
use ethereum::TransactionV2 as EthereumTransaction;
41+
use ethereum::TransactionV3 as EthereumTransaction;
4242
use ethereum_types::H160;
4343

4444
#[cfg(feature = "txpool")]

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
use std::collections::BTreeMap;
2222

2323
use ethereum::{
24-
BlockV2 as EthereumBlock, ReceiptV3 as EthereumReceipt, TransactionV2 as EthereumTransaction,
24+
BlockV3 as EthereumBlock, ReceiptV4 as EthereumReceipt, TransactionV3 as EthereumTransaction,
2525
};
2626
use ethereum_types::{H256, U256};
2727
use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer};
@@ -126,7 +126,8 @@ impl PubSubResult {
126126
let receipt_logs = match receipt {
127127
EthereumReceipt::Legacy(d)
128128
| EthereumReceipt::EIP2930(d)
129-
| EthereumReceipt::EIP1559(d) => d.logs,
129+
| EthereumReceipt::EIP1559(d)
130+
| EthereumReceipt::EIP7702(d) => d.logs,
130131
};
131132

132133
let transaction_hash: Option<H256> = if !receipt_logs.is_empty() {

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

Lines changed: 44 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
// You should have received a copy of the GNU General Public License
1717
// along with this program. If not, see <https://www.gnu.org/licenses/>.
1818

19-
use ethereum::{AccessListItem, TransactionAction, TransactionV2 as EthereumTransaction};
19+
use ethereum::{
20+
AccessListItem, AuthorizationListItem, TransactionAction, TransactionV3 as EthereumTransaction,
21+
};
2022
use ethereum_types::{H160, H256, U256, U64};
2123
use serde::{ser::SerializeStruct, Serialize, Serializer};
2224

@@ -66,6 +68,9 @@ pub struct Transaction {
6668
/// Pre-pay to warm storage access.
6769
#[serde(skip_serializing_if = "Option::is_none")]
6870
pub access_list: Option<Vec<AccessListItem>>,
71+
/// EIP-7702 authorization list.
72+
#[serde(skip_serializing_if = "Option::is_none")]
73+
pub authorization_list: Option<Vec<AuthorizationListItem>>,
6974
/// The parity (0 for even, 1 for odd) of the y-value of the secp256k1 signature.
7075
#[serde(skip_serializing_if = "Option::is_none")]
7176
pub y_parity: Option<U256>,
@@ -106,6 +111,7 @@ impl BuildFrom for Transaction {
106111
creates: None,
107112
chain_id: t.signature.chain_id().map(U64::from),
108113
access_list: None,
114+
authorization_list: None,
109115
y_parity: None,
110116
v: Some(U256::from(t.signature.v())),
111117
r: U256::from_big_endian(t.signature.r().as_bytes()),
@@ -132,10 +138,11 @@ impl BuildFrom for Transaction {
132138
creates: None,
133139
chain_id: Some(U64::from(t.chain_id)),
134140
access_list: Some(t.access_list.clone()),
135-
y_parity: Some(U256::from(t.odd_y_parity as u8)),
136-
v: Some(U256::from(t.odd_y_parity as u8)),
137-
r: U256::from_big_endian(t.r.as_bytes()),
138-
s: U256::from_big_endian(t.s.as_bytes()),
141+
authorization_list: None,
142+
y_parity: Some(U256::from(t.signature.odd_y_parity() as u8)),
143+
v: Some(U256::from(t.signature.odd_y_parity() as u8)),
144+
r: U256::from_big_endian(t.signature.r().as_bytes()),
145+
s: U256::from_big_endian(t.signature.s().as_bytes()),
139146
},
140147
EthereumTransaction::EIP1559(t) => Self {
141148
transaction_type: U256::from(2),
@@ -159,10 +166,38 @@ impl BuildFrom for Transaction {
159166
creates: None,
160167
chain_id: Some(U64::from(t.chain_id)),
161168
access_list: Some(t.access_list.clone()),
162-
y_parity: Some(U256::from(t.odd_y_parity as u8)),
163-
v: Some(U256::from(t.odd_y_parity as u8)),
164-
r: U256::from_big_endian(t.r.as_bytes()),
165-
s: U256::from_big_endian(t.s.as_bytes()),
169+
authorization_list: None,
170+
y_parity: Some(U256::from(t.signature.odd_y_parity() as u8)),
171+
v: Some(U256::from(t.signature.odd_y_parity() as u8)),
172+
r: U256::from_big_endian(t.signature.r().as_bytes()),
173+
s: U256::from_big_endian(t.signature.s().as_bytes()),
174+
},
175+
EthereumTransaction::EIP7702(t) => Self {
176+
transaction_type: U256::from(4),
177+
hash,
178+
nonce: t.nonce,
179+
block_hash: None,
180+
block_number: None,
181+
transaction_index: None,
182+
from,
183+
to: match t.destination {
184+
TransactionAction::Call(to) => Some(to),
185+
TransactionAction::Create => None,
186+
},
187+
value: t.value,
188+
gas: t.gas_limit,
189+
gas_price: Some(t.max_fee_per_gas),
190+
max_fee_per_gas: Some(t.max_fee_per_gas),
191+
max_priority_fee_per_gas: Some(t.max_priority_fee_per_gas),
192+
input: Bytes(t.data.clone()),
193+
creates: None,
194+
chain_id: Some(U64::from(t.chain_id)),
195+
access_list: Some(t.access_list.clone()),
196+
authorization_list: Some(t.authorization_list.clone()),
197+
y_parity: Some(U256::from(t.signature.odd_y_parity() as u8)),
198+
v: Some(U256::from(t.signature.odd_y_parity() as u8)),
199+
r: U256::from_big_endian(t.signature.r().as_bytes()),
200+
s: U256::from_big_endian(t.signature.s().as_bytes()),
166201
},
167202
}
168203
}

0 commit comments

Comments
 (0)