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

Rename block override field names

Browse source
This commit is contained in:
Sina Mahmoodi 2023-09-04 12:28:56 +02:00
parent d4e332e268
commit b0e78695f5
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
internal/ethapi/api.go
View file

@ -999,13 +999,13 @@ func (diff *StateOverride) ApplyMulticall(state *state.StateDB, precompiles vm.P
// BlockOverrides is a set of header fields to override. // BlockOverrides is a set of header fields to override.
type BlockOverrides struct { type BlockOverrides struct {
Number *hexutil.Big Number *hexutil.Big
Difficulty *hexutil.Big // No-op if we're simulating post-merge calls. Difficulty *hexutil.Big // No-op if we're simulating post-merge calls.
Time *hexutil.Uint64 Time *hexutil.Uint64
GasLimit *hexutil.Uint64 GasLimit *hexutil.Uint64
Coinbase *common.Address FeeRecipient *common.Address
Random *common.Hash PrevRandao *common.Hash
BaseFee *hexutil.Big BaseFeePerGas *hexutil.Big
} }
// Apply overrides the given header fields into the given block context. // Apply overrides the given header fields into the given block context.
@ -1025,14 +1025,14 @@ func (diff *BlockOverrides) Apply(blockCtx *vm.BlockContext) {
if diff.GasLimit != nil { if diff.GasLimit != nil {
blockCtx.GasLimit = uint64(*diff.GasLimit) blockCtx.GasLimit = uint64(*diff.GasLimit)
} }
if diff.Coinbase != nil { if diff.FeeRecipient != nil {
blockCtx.Coinbase = *diff.Coinbase blockCtx.Coinbase = *diff.FeeRecipient
} }
if diff.Random != nil { if diff.PrevRandao != nil {
blockCtx.Random = diff.Random blockCtx.Random = diff.PrevRandao
} }
if diff.BaseFee != nil { if diff.BaseFeePerGas != nil {
blockCtx.BaseFee = diff.BaseFee.ToInt() blockCtx.BaseFee = diff.BaseFeePerGas.ToInt()
} }
} }

4
internal/ethapi/api_test.go
View file

@ -848,8 +848,8 @@ func TestMulticallV1(t *testing.T) {
tag: latest, tag: latest,
blocks: []CallBatch{{ blocks: []CallBatch{{
BlockOverrides: &BlockOverrides{ BlockOverrides: &BlockOverrides{
Number: (*hexutil.Big)(big.NewInt(11)), Number: (*hexutil.Big)(big.NewInt(11)),
Coinbase: &cac, FeeRecipient: &cac,
}, },
Calls: []TransactionArgs{ Calls: []TransactionArgs{
{ {