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

eth/tracers: various fixes #30540

Merged
merged 7 commits into from
Oct 17, 2024
Merged

eth/tracers: various fixes #30540

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e1efdf2
eth/tracers: add missing licenses
s1na Oct 3, 2024
7c47a44
rename to supplyTracer, un-export hook defs
s1na Oct 3, 2024
6cf0b43
default live config to empty obj
s1na Oct 3, 2024
026bc17
move chainConfig to ctor instead of txStart
s1na Oct 4, 2024
2a6f5b1
minor
s1na Oct 4, 2024
f3e8e9a
don't use _
s1na Oct 9, 2024
cdff643
refactor default config
s1na Oct 11, 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
Prev Previous commit
Next Next commit
default live config to empty obj
  • Loading branch information
@s1na
s1na committed Oct 3, 2024
commit 6cf0b434e062179600861398036cca68a969d8d4
2 changes: 1 addition & 1 deletion cmd/utils/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2186,7 +2186,7 @@ func MakeChain(ctx *cli.Context, stack *node.Node, readonly bool) (*core.BlockCh
}
if ctx.IsSet(VMTraceFlag.Name) {
if name := ctx.String(VMTraceFlag.Name); name != "" {
var config json.RawMessage
config := json.RawMessage("{}")
s1na marked this conversation as resolved.
Show resolved Hide resolved
if ctx.IsSet(VMTraceJsonConfigFlag.Name) {
config = json.RawMessage(ctx.String(VMTraceJsonConfigFlag.Name))
}
Expand Down
2 changes: 1 addition & 1 deletion eth/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
}
)
if config.VMTrace != "" {
var traceConfig json.RawMessage
traceConfig := json.RawMessage("{}")
s1na marked this conversation as resolved.
Show resolved Hide resolved
if config.VMTraceJsonConfig != "" {
traceConfig = json.RawMessage(config.VMTraceJsonConfig)
}
Expand Down
6 changes: 2 additions & 4 deletions eth/tracers/live/supply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,8 @@ type supplyTracerConfig struct {

func newSupplyTracer(cfg json.RawMessage) (*tracing.Hooks, error) {
var config supplyTracerConfig
if cfg != nil {
if err := json.Unmarshal(cfg, &config); err != nil {
return nil, fmt.Errorf("failed to parse config: %v", err)
}
if err := json.Unmarshal(cfg, &config); err != nil {
return nil, fmt.Errorf("failed to parse config: %v", err)
}
if config.Path == "" {
return nil, errors.New("supply tracer output path is required")
Expand Down