Skip to content

fix: process nullish code_hash from getProof request #714

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
ncitron merged 1 commit into from
Oct 14, 2025
Merged

fix: process nullish code_hash from getProof request #714

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions revm-utils/src/proof_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use alloy::{
};
use eyre::Result;
use revm::{
primitives::{address, Address, B256, U256},
primitives::{address, Address, B256, KECCAK_EMPTY, U256},
state::{AccountInfo, Bytecode},
Database,
};
Expand Down Expand Up @@ -112,10 +112,19 @@ impl<N: NetworkSpec, E: ExecutionProvider<N>> EvmState<N, E> {

pub fn get_basic(&mut self, address: Address) -> Result<AccountInfo, DatabaseError> {
if let Some(account) = self.accounts.get(&address) {
// Normalize code_hash for REVM compatibility:
// RPC response for getProof method for non-existing (unused) EOAs
// may contain B256::ZERO for code_hash, but REVM expects KECCAK_EMPTY
let code_hash = if account.account.code_hash == B256::ZERO {
KECCAK_EMPTY
} else {
account.account.code_hash
};

Ok(AccountInfo::new(
account.account.balance,
account.account.nonce,
account.account.code_hash,
code_hash,
Bytecode::new_raw(account.code.as_ref().unwrap().clone()),
))
} else {
Expand Down
Loading