Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(api): use overridden chainConfig in standardTraceBlockToFile #871

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

fix(api): use overridden chainConfig in standardTraceBlockToFile #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0964c9b
fix(api): use overrided chainConfig in `standardTraceBlockToFile`
0xmountaintop Jul 1, 2024
f090f83
chore: auto version bump [bot]
Jul 1, 2024
efc7eba
Merge branch 'develop' into haoyu/fix_chaincfg
0xmountaintop Jul 2, 2024
b2349af
chore: auto version bump [bot]
Jul 2, 2024
a75f98e
Merge branch 'develop' into haoyu/fix_chaincfg
0xmountaintop Jul 4, 2024
5d5a70a
chore: auto version bump [bot]
Jul 4, 2024
0f396d2
Merge branch 'develop' into haoyu/fix_chaincfg
0xmountaintop Jul 5, 2024
d46d5d1
chore: auto version bump [bot]
Jul 5, 2024
2666740
Merge branch 'develop' into haoyu/fix_chaincfg
0xmountaintop Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eth/tracers/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ func (api *API) standardTraceBlockToFile(ctx context.Context, block *types.Block
// Execute the transaction and flush any traces to disk
vmenv := vm.NewEVM(vmctx, txContext, statedb, chainConfig, vmConf)
statedb.SetTxContext(tx.Hash(), i)
l1DataFee, err := fees.CalculateL1DataFee(tx, statedb, api.backend.ChainConfig(), block.Number())
l1DataFee, err := fees.CalculateL1DataFee(tx, statedb, chainConfig, block.Number())
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the only override that we might apply is BerlinBlock, is that intended?

Copy link
Member Author

@0xmountaintop 0xmountaintop Jul 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. that's the only one override i find in this file
  2. the override code (L733~734) is from 3-year-ago upstream, not made by us.
  3. in L770, the original code uses chainConfig, but L772 is introduced by use and it's using api.backend.ChainConfig()

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we make it more generic? https://github.com/ethereum/go-ethereum/blob/master/eth/tracers/api.go#L761-L769 Or is that a lot of extra work?

Copy link
Member Author

@0xmountaintop 0xmountaintop Jul 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes on "upstream" branch it's more generic, we can also update here on develop branch. I can update.

if err == nil {
_, err = core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(msg.Gas()), l1DataFee)
}
Expand Down
2 changes: 1 addition & 1 deletion params/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
const (
VersionMajor = 5 // Major version component of the current release
VersionMinor = 5 // Minor version component of the current release
VersionPatch = 4 // Patch version component of the current release
VersionPatch = 5 // Patch version component of the current release
VersionMeta = "mainnet" // Version metadata to append to the version string
)

Expand Down
Loading