forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-25 22:26:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(api): eth_getProof crash (#1159)

Browse source 
* fix(api): eth_getProof crash

* return PoseidonCodeHash for zktrie

* fix
This commit is contained in:
colin 2025-03-26 19:55:02 +08:00 committed by GitHub
parent 2ff8403065
commit 24757865c6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
internal/ethapi/api.go
View file

@ -692,7 +692,6 @@ func (s *PublicBlockChainAPI) GetProof(ctx context.Context, address common.Addre
storageHash = types.EmptyRootHash storageHash = types.EmptyRootHash
} }
keccakCodeHash := state.GetKeccakCodeHash(address) keccakCodeHash := state.GetKeccakCodeHash(address)
poseidonCodeHash := state.GetPoseidonCodeHash(address)
storageProof := make([]StorageResult, len(storageKeys)) storageProof := make([]StorageResult, len(storageKeys))
// if we have a storageTrie, (which means the account exists), we can update the storagehash // if we have a storageTrie, (which means the account exists), we can update the storagehash
@ -701,7 +700,6 @@ func (s *PublicBlockChainAPI) GetProof(ctx context.Context, address common.Addre
} else { } else {
// no storageTrie means the account does not exist, so the codeHash is the hash of an empty bytearray. // no storageTrie means the account does not exist, so the codeHash is the hash of an empty bytearray.
keccakCodeHash = codehash.EmptyKeccakCodeHash keccakCodeHash = codehash.EmptyKeccakCodeHash
poseidonCodeHash = codehash.EmptyPoseidonCodeHash
} }
// create the proof for the storageKeys // create the proof for the storageKeys
@ -723,17 +721,26 @@ func (s *PublicBlockChainAPI) GetProof(ctx context.Context, address common.Addre
return nil, proofErr return nil, proofErr
} }
return &AccountResult{ result := &AccountResult{
Address: address, Address: address,
AccountProof: toHexSlice(accountProof), AccountProof: toHexSlice(accountProof),
Balance: (*hexutil.Big)(state.GetBalance(address)), Balance: (*hexutil.Big)(state.GetBalance(address)),
KeccakCodeHash: keccakCodeHash, KeccakCodeHash: keccakCodeHash,
PoseidonCodeHash: poseidonCodeHash, CodeSize: hexutil.Uint64(state.GetCodeSize(address)),
CodeSize: hexutil.Uint64(state.GetCodeSize(address)), Nonce: hexutil.Uint64(state.GetNonce(address)),
Nonce: hexutil.Uint64(state.GetNonce(address)), StorageHash: storageHash,
StorageHash: storageHash, StorageProof: storageProof,
StorageProof: storageProof, }
}, state.Error()
if state.IsZktrie() {
if storageTrie != nil {
result.PoseidonCodeHash = state.GetPoseidonCodeHash(address)
} else {
result.PoseidonCodeHash = codehash.EmptyPoseidonCodeHash
}
}
return result, state.Error()
} }
// GetHeaderByNumber returns the requested canonical block header. // GetHeaderByNumber returns the requested canonical block header.

2
params/version.go
View file

@ -24,7 +24,7 @@ import (
const ( const (
VersionMajor = 5 // Major version component of the current release VersionMajor = 5 // Major version component of the current release
VersionMinor = 8 // Minor version component of the current release VersionMinor = 8 // Minor version component of the current release
VersionPatch = 32 // Patch version component of the current release VersionPatch = 33 // Patch version component of the current release
VersionMeta = "mainnet" // Version metadata to append to the version string VersionMeta = "mainnet" // Version metadata to append to the version string
) )