forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-10 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(trace): fix storage proof of l1gas price oracle (#376)

Browse source 
* fix storage proof of l1gas price oracle

* Update version.go

* fix(trace): fix

---------

Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
This commit is contained in:
Ho 2023-07-07 10:35:19 +08:00 committed by GitHub
parent 8c5bf3069f
commit 2dcc60a082
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
eth/tracers/api_blocktrace.go
View file

@ -321,7 +321,6 @@ func (api *API) getTxResult(env *traceEnv, state *state.StateDB, index int, bloc
// merge required proof data // merge required proof data
proofAccounts := tracer.UpdatedAccounts() proofAccounts := tracer.UpdatedAccounts()
proofAccounts[vmenv.FeeRecipient()] = struct{}{} proofAccounts[vmenv.FeeRecipient()] = struct{}{}
proofAccounts[rcfg.L1GasPriceOracleAddress] = struct{}{}
for addr := range proofAccounts { for addr := range proofAccounts {
addrStr := addr.String() addrStr := addr.String()
@ -350,12 +349,6 @@ func (api *API) getTxResult(env *traceEnv, state *state.StateDB, index int, bloc
} }
proofStorages := tracer.UpdatedStorages() proofStorages := tracer.UpdatedStorages()
proofStorages[rcfg.L1GasPriceOracleAddress] = vm.Storage(
map[common.Hash]common.Hash{
rcfg.L1BaseFeeSlot: {}, // notice we do not need the right value here
rcfg.OverheadSlot: {},
rcfg.ScalarSlot: {},
})
for addr, keys := range proofStorages { for addr, keys := range proofStorages {
if _, existed := txStorageTrace.StorageProofs[addr.String()]; !existed { if _, existed := txStorageTrace.StorageProofs[addr.String()]; !existed {
txStorageTrace.StorageProofs[addr.String()] = make(map[string][]hexutil.Bytes) txStorageTrace.StorageProofs[addr.String()] = make(map[string][]hexutil.Bytes)
@ -450,32 +443,46 @@ func (api *API) fillBlockTrace(env *traceEnv, block *types.Block) (*types.BlockT
txs[i] = types.NewTransactionData(tx, block.NumberU64(), api.backend.ChainConfig()) txs[i] = types.NewTransactionData(tx, block.NumberU64(), api.backend.ChainConfig())
} }
if _, existed := env.Proofs[rcfg.L2MessageQueueAddress.String()]; !existed { intrinsicStorageProofs := map[common.Address][]common.Hash{
if proof, err := statedb.GetProof(rcfg.L2MessageQueueAddress); err != nil { rcfg.L2MessageQueueAddress: {rcfg.WithdrawTrieRootSlot},
log.Error("Proof for L2MessageQueueAddress not available", "error", err) rcfg.L1GasPriceOracleAddress: {
} else { rcfg.L1BaseFeeSlot,
wrappedProof := make([]hexutil.Bytes, len(proof)) rcfg.OverheadSlot,
for i, bt := range proof { rcfg.ScalarSlot,
wrappedProof[i] = bt },
}
env.Proofs[rcfg.L2MessageQueueAddress.String()] = wrappedProof
}
} }
if _, existed := env.StorageProofs[rcfg.L2MessageQueueAddress.String()]; !existed { for addr, storages := range intrinsicStorageProofs {
env.StorageProofs[rcfg.L2MessageQueueAddress.String()] = make(map[string][]hexutil.Bytes) if _, existed := env.Proofs[addr.String()]; !existed {
} if proof, err := statedb.GetProof(addr); err != nil {
if _, existed := env.StorageProofs[rcfg.L2MessageQueueAddress.String()][rcfg.WithdrawTrieRootSlot.String()]; !existed { log.Error("Proof for intrinstic address not available", "error", err, "address", addr)
if trie, err := statedb.GetStorageTrieForProof(rcfg.L2MessageQueueAddress); err != nil { } else {
log.Error("Storage proof for WithdrawTrieRootSlot not available", "error", err) wrappedProof := make([]hexutil.Bytes, len(proof))
} else if proof, _ := statedb.GetSecureTrieProof(trie, rcfg.WithdrawTrieRootSlot); err != nil { for i, bt := range proof {
log.Error("Get storage proof for WithdrawTrieRootSlot failed", "error", err) wrappedProof[i] = bt
} else { }
wrappedProof := make([]hexutil.Bytes, len(proof)) env.Proofs[addr.String()] = wrappedProof
for i, bt := range proof { }
wrappedProof[i] = bt }
if _, existed := env.StorageProofs[addr.String()]; !existed {
env.StorageProofs[addr.String()] = make(map[string][]hexutil.Bytes)
}
for _, slot := range storages {
if _, existed := env.StorageProofs[addr.String()][slot.String()]; !existed {
if trie, err := statedb.GetStorageTrieForProof(addr); err != nil {
log.Error("Storage proof for intrinstic address not available", "error", err, "address", addr)
} else if proof, _ := statedb.GetSecureTrieProof(trie, slot); err != nil {
log.Error("Get storage proof for intrinstic address failed", "error", err, "address", addr, "slot", slot)
} else {
wrappedProof := make([]hexutil.Bytes, len(proof))
for i, bt := range proof {
wrappedProof[i] = bt
}
env.StorageProofs[addr.String()][slot.String()] = wrappedProof
}
} }
env.StorageProofs[rcfg.L2MessageQueueAddress.String()][rcfg.WithdrawTrieRootSlot.String()] = wrappedProof
} }
} }

2
params/version.go
View file

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