Skip to content

feat(eip7928): BAL-aware access tracking for Amsterdam (Glamsterdam) #19

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

Closed
Gabriel-Trintinalia wants to merge 10 commits into from
Closed

feat(eip7928): BAL-aware access tracking for Amsterdam (Glamsterdam) #19

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
957233e
feat(eip7928): BAL-aware access tracking infrastructure
Gabriel-Trintinalia Mar 27, 2026
63cf2c6
Remove debug prints; fix EIP-3651 coinbase cross-tx warm check
Gabriel-Trintinalia Mar 28, 2026
53fcfdf
feat(bal): fix EIP-7928 BAL tracking for 7702 delegation OOG boundaries
Gabriel-Trintinalia Mar 29, 2026
cb63379
style: apply zig fmt
Gabriel-Trintinalia Apr 2, 2026
e75e546
refactor: make Context generic over DB, remove FallbackFns vtable
Gabriel-Trintinalia Apr 3, 2026
f26c76a
perf/refactor: O(1) CREATE storage collision check; simplify Frame.ex…
Gabriel-Trintinalia Apr 3, 2026
b35bd08
refactor: move EIP-7928 BAL tracking from DB to Journal
Gabriel-Trintinalia Apr 3, 2026
67605de
refactor: eliminate comptime DB generics; add phantom access fix
Gabriel-Trintinalia Apr 3, 2026
54ac08f
Revert "refactor: eliminate comptime DB generics; add phantom access …
Gabriel-Trintinalia Apr 3, 2026
fbdf8db
fix: eliminate phantom BAL entries at opcode level
Gabriel-Trintinalia Apr 3, 2026
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
98 changes: 85 additions & 13 deletions src/context/journal.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ pub const JournalEntryFactory = struct {
return JournalEntry{ .CodeChanged = address };
}

pub fn storageChanged(address: primitives.Address, key: primitives.StorageKey, old_value: primitives.StorageValue) JournalEntry {
return JournalEntry{ .StorageChanged = .{ .address = address, .key = key, .old_value = old_value } };
pub fn storageChanged(address: primitives.Address, key: primitives.StorageKey, old_value: primitives.StorageValue, old_was_written: bool) JournalEntry {
return JournalEntry{ .StorageChanged = .{ .address = address, .key = key, .old_value = old_value, .old_was_written = old_was_written } };
}

pub fn storageWarmed(address: primitives.Address, key: primitives.StorageKey) JournalEntry {
Expand Down Expand Up @@ -68,7 +68,7 @@ pub const JournalEntry = union(enum) {
BalanceTransfer: struct { from: primitives.Address, to: primitives.Address, balance: primitives.U256 },
NonceChanged: primitives.Address,
CodeChanged: primitives.Address,
StorageChanged: struct { address: primitives.Address, key: primitives.StorageKey, old_value: primitives.StorageValue },
StorageChanged: struct { address: primitives.Address, key: primitives.StorageKey, old_value: primitives.StorageValue, old_was_written: bool },
StorageWarmed: struct { address: primitives.Address, key: primitives.StorageKey },
AccountWarmed: primitives.Address,
TransientStorageChanged: struct { address: primitives.Address, key: primitives.StorageKey, old_value: primitives.StorageValue },
Expand Down Expand Up @@ -143,6 +143,7 @@ pub const JournalEntry = union(enum) {
if (evm_state.getPtr(data.address)) |account| {
if (account.storage.getPtr(data.key)) |slot| {
slot.present_value = data.old_value;
slot.was_written = data.old_was_written;
}
}
},
Expand Down Expand Up @@ -203,7 +204,7 @@ pub const WarmAddresses = struct {
try self.precompiles.appendSlice(alloc_mod.get(), addresses);
}

pub fn setAccessList(self: *WarmAddresses, access_list: std.HashMap(primitives.Address, std.ArrayList(primitives.StorageKey), std.hash_map.default_hash_fn(primitives.Address), std.hash_map.default_eql_fn(primitives.Address))) !void {
pub fn setAccessList(self: *WarmAddresses, access_list: std.AutoHashMap(primitives.Address, std.ArrayList(primitives.StorageKey))) !void {
// Clear existing access list
var iterator = self.access_list.iterator();
while (iterator.next()) |entry| {
Expand All @@ -214,8 +215,8 @@ pub const WarmAddresses = struct {
// Copy new access list
var new_iterator = access_list.iterator();
while (new_iterator.next()) |entry| {
var storage_keys = std.ArrayList(primitives.StorageKey).init(alloc_mod.get());
try storage_keys.appendSlice(entry.value_ptr.items);
var storage_keys = std.ArrayList(primitives.StorageKey){};
try storage_keys.appendSlice(alloc_mod.get(), entry.value_ptr.items);
try self.access_list.put(entry.key_ptr.*, storage_keys);
}
}
Expand Down Expand Up @@ -978,6 +979,25 @@ pub const JournalInner = struct {
}

/// Loads account into memory. If account is already loaded it will be marked as warm.
/// Check whether an address is cold WITHOUT loading it from the database.
/// Used by opcode handlers to pre-check gas costs before committing to a DB load.
pub fn isAddressCold(self: *const JournalInner, address: primitives.Address) bool {
if (self.evm_state.get(address)) |acct| {
if (acct.isColdTransactionId(self.transaction_id)) {
// EIP-3651: coinbase is pre-warmed each tx. If the coinbase was loaded in
// a previous tx (old transaction_id), still treat it as warm for gas purposes.
// Only check the coinbase slot — not precompiles or access-list entries, to
// avoid unintended cross-tx warm promotion for those.
if (self.warm_addresses.coinbase) |cb| {
if (std.mem.eql(u8, &address, &cb)) return false;
}
return true;
}
return false;
}
return self.warm_addresses.isCold(address);
}
Copy link
Copy Markdown

@cursor cursor bot Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isAddressCold ignores precompiles and access-list warmth

High Severity

When an address is in evm_state with an old transaction_id, isAddressCold only special-cases the coinbase address (lines 991-993) and returns cold for everything else. But loadAccountMutOptionalCode uses warm_addresses.isCold(address) which also checks precompiles and access-list entries. This mismatch causes opcode handlers to overcharge gas (COLD instead of WARM) for precompiles and access-list entries loaded in a prior transaction within the same block.

Additional Locations (1)
Fix in Cursor Fix in Web


pub fn loadAccountOptional(self: *JournalInner, db: anytype, address: primitives.Address, load_code: bool, skip_cold_load: bool) !StateLoad(*const state.Account) {
const load = try self.loadAccountMutOptionalCode(db, address, load_code, skip_cold_load);
return StateLoad(*const state.Account).new(load.data.account, load.is_cold);
Expand Down Expand Up @@ -1065,14 +1085,33 @@ pub const JournalInner = struct {
/// # Panics
///
/// Panics if the account is not present in the state.
/// Check whether a storage slot is cold WITHOUT loading it from the database.
pub fn isStorageCold(self: *const JournalInner, address: primitives.Address, key: primitives.StorageKey) bool {
if (self.evm_state.get(address)) |acct| {
if (acct.storage.get(key)) |slot| {
var is_cold = slot.isColdTransactionId(self.transaction_id);
if (is_cold and self.warm_addresses.isStorageWarm(address, key)) {
is_cold = false;
}
return is_cold;
}
}
return !self.warm_addresses.isStorageWarm(address, key);
}

pub fn sload(self: *JournalInner, db: anytype, address: primitives.Address, key: primitives.StorageKey, skip_cold_load: bool) !StateLoad(primitives.StorageValue) {
// assume acc is warm
const account = self.evm_state.getPtr(address).?;
const is_newly_created = account.isCreated();

if (account.storage.getPtr(key)) |slot| {
// Storage slot already loaded
const is_cold = slot.isColdTransactionId(self.transaction_id);
var is_cold = slot.isColdTransactionId(self.transaction_id);
// If the slot is cold by transaction ID but the EIP-2930 access list marks it warm,
// treat it as warm (same effect as eager pre-warming via sload in preExecution).
if (is_cold and self.warm_addresses.isStorageWarm(address, key)) {
is_cold = false;
}
if (skip_cold_load and is_cold) {
return JournalLoadError.ColdLoadSkipped;
}
Expand All @@ -1086,10 +1125,13 @@ pub const JournalInner = struct {
if (skip_cold_load) {
return JournalLoadError.ColdLoadSkipped;
}
const value = if (is_newly_created)
@as(primitives.StorageValue, 0)
else
try db.storage(address, key);
// For newly-created accounts all storage is implicitly zero. Notify
// the fallback (e.g. WitnessDatabase) so it can record the slot for
// EIP-7928 BAL tracking without performing an MPT proof lookup.
const value = if (is_newly_created) blk: {
if (@hasDecl(@TypeOf(db.*), "notifyStorageRead")) db.notifyStorageRead(address, key);
break :blk @as(primitives.StorageValue, 0);
} else try db.storage(address, key);
try account.storage.put(key, state.EvmStorageSlot.new(value, self.transaction_id));
const is_cold = !self.warm_addresses.isStorageWarm(address, key);
if (is_cold) {
Expand Down Expand Up @@ -1121,9 +1163,10 @@ pub const JournalInner = struct {
}, present.is_cold);
}

self.journal.append(alloc_mod.get(), JournalEntryFactory.storageChanged(address, key, present.data)) catch {};
self.journal.append(alloc_mod.get(), JournalEntryFactory.storageChanged(address, key, present.data, slot.was_written)) catch {};
// insert value into present state.
slot.present_value = new_value;
slot.was_written = true;
return StateLoad(SStoreResult).new(SStoreResult{
.original_value = slot.originalValue(),
.present_value = present.data,
Expand Down Expand Up @@ -1246,7 +1289,7 @@ pub fn Journal(comptime DB: type) type {
return self.inner.selfdestruct(self.getDbMut(), address, target);
}

pub fn warmAccessList(self: *@This(), access_list: std.HashMap(primitives.Address, std.ArrayList(primitives.StorageKey), std.hash_map.default_hash_fn(primitives.Address), std.hash_map.default_eql_fn(primitives.Address))) !void {
pub fn warmAccessList(self: *@This(), access_list: std.AutoHashMap(primitives.Address, std.ArrayList(primitives.StorageKey))) !void {
try self.inner.warm_addresses.setAccessList(access_list);
}

Expand Down Expand Up @@ -1366,6 +1409,35 @@ pub fn Journal(comptime DB: type) type {
return self.inner.sstore(self.getDbMut(), address, key, value, skip_cold_load);
}

/// Check whether an address is cold WITHOUT loading it from the database.
pub fn isAddressCold(self: *const @This(), address: primitives.Address) bool {
return self.inner.isAddressCold(address);
}

/// Check whether a storage slot is cold WITHOUT loading it from the database.
pub fn isStorageCold(self: *const @This(), address: primitives.Address, key: primitives.StorageKey) bool {
return self.inner.isStorageCold(address, key);
}

/// Un-record a pending address access in the database fallback.
/// Called when a CALL loaded an address for gas calculation but went OOG.
pub fn untrackAddress(self: *@This(), address: primitives.Address) void {
self.getDbMut().untrackAddress(address);
}

/// Force-add an address to the current-tx access log in the database fallback.
/// Used for EIP-7702 delegation targets that execute but are not in the witness.
pub fn forceTrackAddress(self: *@This(), address: primitives.Address) void {
self.getDbMut().forceTrackAddress(address);
}

/// Check whether an address is already in the EVM state cache (was loaded before
/// this call). Used to avoid un-tracking addresses that were legitimately accessed
/// earlier in the same transaction.
pub fn isAddressLoaded(self: *const @This(), address: primitives.Address) bool {
return self.inner.evm_state.contains(address);
}

pub fn loadAccountInfoSkipColdLoad(self: *@This(), address: primitives.Address, load_code: bool, skip_cold_load: bool) !AccountInfoLoad {
const spec = self.inner.spec;
const account = try self.inner.loadAccountOptional(self.getDbMut(), address, load_code, skip_cold_load);
Expand Down
Loading
Loading
⚡