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

feat: include fee vault address in trace api result (#208)

Browse source 
* include fee vault address in trace api result

* use fee vault instead of coinbase if exists

* retrigger checks

* Update api_blocktrace_test.go

---------

Co-authored-by: maskpp <maskpp266@gmail.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
This commit is contained in:
Nazarii Denha 2023-02-10 08:13:46 +01:00 committed by GitHub
parent 7c3657b61b
commit aae2ea53df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
eth/tracers/api_blocktrace.go
View file

@ -94,9 +94,14 @@ func (api *API) createTraceEnv(ctx context.Context, config *TraceConfig, block *
} }
// get coinbase // get coinbase
coinbase, err := api.backend.Engine().Author(block.Header()) var coinbase common.Address
if err != nil { if api.backend.ChainConfig().FeeVaultAddress != nil {
return nil, err coinbase = *api.backend.ChainConfig().FeeVaultAddress
} else {
coinbase, err = api.backend.Engine().Author(block.Header())
if err != nil {
return nil, err
}
} }
env := &traceEnv{ env := &traceEnv{
@ -127,6 +132,7 @@ func (api *API) createTraceEnv(ctx context.Context, config *TraceConfig, block *
} }
env.Proofs[key] = wrappedProof env.Proofs[key] = wrappedProof
} }
return env, nil return env, nil
} }

13
eth/tracers/api_blocktrace_test.go
View file

@ -180,10 +180,15 @@ func checkStructLogs(t *testing.T, expect []*txTraceResult, actual []*types.Exec
} }
func checkCoinbase(t *testing.T, b *testBackend, wrapper *types.AccountWrapper) { func checkCoinbase(t *testing.T, b *testBackend, wrapper *types.AccountWrapper) {
header, err := b.HeaderByNumber(context.Background(), 1) var coinbase common.Address
assert.NoError(t, err) if b.chainConfig.FeeVaultAddress != nil {
coinbase, err := b.engine.Author(header) coinbase = *b.chainConfig.FeeVaultAddress
assert.NoError(t, err) } else {
header, err := b.HeaderByNumber(context.Background(), 1)
assert.NoError(t, err)
coinbase, err = b.engine.Author(header)
assert.NoError(t, err)
}
assert.Equal(t, true, coinbase.String() == wrapper.Address.String()) assert.Equal(t, true, coinbase.String() == wrapper.Address.String())
} }