forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-31 09:03:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feat(trace): add storage proof about l1fee (baseFee, overhead, scalar) and withdraw root into trace (#314)

Browse source 
* add proof for predeployed storages

* reverse inneeded code

* update for mainbranch merging

* add coinbase storage as trace

* comment for clarify

* Update version.go

---------

Co-authored-by: Péter Garamvölgyi <th307q@gmail.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
This commit is contained in:
Ho 2023-05-18 21:49:09 +08:00 committed by GitHub
parent b8d22a104d
commit 910d4f1a70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
eth/tracers/api_blocktrace.go
View file

@ -290,6 +290,8 @@ func (api *API) getTxResult(env *traceEnv, state *state.StateDB, index int, bloc
// merge required proof data
proofAccounts := tracer.UpdatedAccounts()
proofAccounts[vmenv.FeeRecipient()] = struct{}{}
proofAccounts[rcfg.L1GasPriceOracleAddress] = struct{}{}
for addr := range proofAccounts {
addrStr := addr.String()
@ -314,6 +316,12 @@ func (api *API) getTxResult(env *traceEnv, state *state.StateDB, index int, bloc
}
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 {
env.sMu.Lock()
trie, err := state.GetStorageTrieForProof(addr)
@ -404,6 +412,35 @@ func (api *API) fillBlockTrace(env *traceEnv, block *types.Block) (*types.BlockT
txs[i] = types.NewTransactionData(tx, block.NumberU64(), api.backend.ChainConfig())
}
if _, existed := env.Proofs[rcfg.L2MessageQueueAddress.String()]; !existed {
if proof, err := statedb.GetProof(rcfg.L2MessageQueueAddress); err != nil {
log.Error("Proof for L2MessageQueueAddress not available", "error", err)
} else {
wrappedProof := make([]hexutil.Bytes, len(proof))
for i, bt := range proof {
wrappedProof[i] = bt
}
env.Proofs[rcfg.L2MessageQueueAddress.String()] = wrappedProof
}
}
if _, existed := env.StorageProofs[rcfg.L2MessageQueueAddress.String()]; !existed {
env.StorageProofs[rcfg.L2MessageQueueAddress.String()] = make(map[string][]hexutil.Bytes)
}
if _, existed := env.StorageProofs[rcfg.L2MessageQueueAddress.String()][rcfg.WithdrawTrieRootSlot.String()]; !existed {
if trie, err := statedb.GetStorageTrieForProof(rcfg.L2MessageQueueAddress); err != nil {
log.Error("Storage proof for WithdrawTrieRootSlot not available", "error", err)
} else if proof, _ := statedb.GetSecureTrieProof(trie, rcfg.WithdrawTrieRootSlot); err != nil {
log.Error("Get storage proof for WithdrawTrieRootSlot failed", "error", err)
} else {
wrappedProof := make([]hexutil.Bytes, len(proof))
for i, bt := range proof {
wrappedProof[i] = bt
}
env.StorageProofs[rcfg.L2MessageQueueAddress.String()][rcfg.WithdrawTrieRootSlot.String()] = wrappedProof
}
}
blockTrace := &types.BlockTrace{
ChainID: api.backend.ChainConfig().ChainID.Uint64(),
Version: params.ArchiveVersion(params.CommitHash),

2
params/version.go
View file

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