Skip to content

Implement EIP-2935 #2495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
canepat merged 5 commits into from
Nov 19, 2024
Merged

Implement EIP-2935 #2495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc8ade3
Implement EIP-2935
bzawisto Nov 7, 2024
778ee47
Merge branch 'master' into 2121-implement-eip-2935-serve-historical-b…
bzawisto Nov 8, 2024
c7c1490
Merge branch 'master' into 2121-implement-eip-2935-serve-historical-b…
bzawisto Nov 13, 2024
cb762f1
Merge branch 'master' into 2121-implement-eip-2935-serve-historical-b…
bzawisto Nov 19, 2024
636c35a
Review feedback
bzawisto Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions silkworm/core/protocol/merge_rule_set.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,26 @@ void MergeRuleSet::initialize(EVM& evm) {
return;
}

if (evm.revision() < EVMC_CANCUN) {
return;
if (evm.revision() >= EVMC_CANCUN) {
// EIP-4788: Beacon block root in the EVM
SILKWORM_ASSERT(header.parent_beacon_block_root);
Transaction system_txn{};
system_txn.type = TransactionType::kSystem;
system_txn.to = kBeaconRootsAddress;
system_txn.data = Bytes{ByteView{*header.parent_beacon_block_root}};
system_txn.set_sender(kSystemAddress);
evm.execute(system_txn, kSystemCallGasLimit);
}

// EIP-4788: Beacon block root in the EVM
SILKWORM_ASSERT(header.parent_beacon_block_root);
Transaction system_txn{};
system_txn.type = TransactionType::kSystem;
system_txn.to = kBeaconRootsAddress;
system_txn.data = Bytes{ByteView{*header.parent_beacon_block_root}};
system_txn.set_sender(kSystemAddress);
evm.execute(system_txn, kSystemCallGasLimit);
if (evm.revision() >= EVMC_PRAGUE) {
// EIP-2935: Serve historical block hashes from state
Transaction system_txn{};
system_txn.type = TransactionType::kSystem;
system_txn.to = kHistoryStorageAddress;
system_txn.data = Bytes{ByteView{header.parent_hash}};
system_txn.set_sender(kSystemAddress);
evm.execute(system_txn, kSystemCallGasLimit);
}
}

void MergeRuleSet::finalize(IntraBlockState& state, const Block& block) {
Expand Down
3 changes: 3 additions & 0 deletions silkworm/core/protocol/param.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ inline constexpr uint64_t kSystemCallGasLimit{30'000'000};
inline constexpr evmc::address kSystemAddress{0xfffffffffffffffffffffffffffffffffffffffe_address};
inline constexpr evmc::address kBeaconRootsAddress{0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02_address};

// EIP-2935: Serve historical block hashes from state
inline constexpr evmc::address kHistoryStorageAddress{0x0aae40965e6800cd9b1f4b05ff21581047e3f91e_address};

// Used in Bor
inline constexpr size_t kExtraSealSize{65};

Expand Down
Loading