wip commit before rebase

Author: jwasinger

eth/tracers/api.go

@@ -262,7 +262,7 @@ func (api *API) traceChain(start, end *types.Block, config *TraceConfig, closed
 		log.Warn("invalid trace configuration", "err", err)
 		return nil
 	}
-	env := envFromTraceConfig(api, config.Config)
+	env := envFromTraceConfig(api, config)
 
 	instantiateTracer := func(ctx *Context) (*Tracer, error) {
 		return api.instantiateTracer(config, ctx)
@@ -426,7 +426,7 @@ func (api *API) traceBlockCustomTracer(ctx context.Context, block *types.Block,
 	instantiateTracer := func(ctx *Context) (*Tracer, error) {
 		return api.instantiateTracer(config, ctx)
 	}
-	env := envFromTraceConfig(api, config.Config)
+	env := envFromTraceConfig(api, config)
 	opt, err := traceExecOpt(config)
 	if err != nil {
 		return nil, err
@@ -487,7 +487,7 @@ func (api *API) TraceBadBlock(ctx context.Context, hash common.Hash, config *Tra
 	}
 
 	// TODO: investigate whether the canon field has different treatment when tracing bad blocks
-	env := envFromTraceConfig(api, config.Config)
+	env := envFromTraceConfig(api, config)
 	opt, err := traceExecOpt(config)
 	if err != nil {
 		return nil, err
@@ -593,7 +593,33 @@ type traceEnv struct {
 	chainConfig *params.ChainConfig
 }
 
-func envFromTraceConfig(api *API, config *logger.Config) *traceEnv {
+func envFromStdConfig(api *API, config *StdTraceConfig) *traceEnv {
+	if config == nil {
+		return &traceEnv{
+			canon:       true,
+			chainConfig: api.backend.ChainConfig(),
+		}
+	}
+	return envFromLoggerConfig(api, &config.Config)
+}
+
+func envFromTraceConfig(api *API, config *TraceConfig) *traceEnv {
+	if config == nil {
+		return &traceEnv{
+			canon:       true,
+			chainConfig: api.backend.ChainConfig(),
+		}
+	}
+	return envFromLoggerConfig(api, config.Config)
+}
+
+func envFromLoggerConfig(api *API, config *logger.Config) *traceEnv {
+	if config == nil {
+		return &traceEnv{
+			canon:       true,
+			chainConfig: api.backend.ChainConfig(),
+		}
+	}
 	chainConfig := api.backend.ChainConfig()
 	var canon bool
 	if config.Overrides != nil {
@@ -825,6 +851,12 @@ func (api *API) standardTraceTxToFile(ctx context.Context, block *types.Block, t
 	return dumps, nil
 }
 
+func traceCallExecOpt(config *TraceCallConfig) (*traceExecOptions, error) {
+	if config == nil {
+		return traceExecOpt(nil)
+	}
+	return traceExecOpt(&config.TraceConfig)
+}
 func traceExecOpt(config *TraceConfig) (*traceExecOptions, error) {
 	opt := &traceExecOptions{
 		defaultTraceTimeout,
@@ -872,7 +904,8 @@ func (api *API) standardTraceBlockToFile(ctx context.Context, block *types.Block
 		return nil, errors.New("genesis is not traceable")
 	}
 
-	env := envFromTraceConfig(api, &config.Config)
+	env := envFromStdConfig(api, config)
+
 	var signer = types.MakeSigner(api.backend.ChainConfig(), block.Number(), block.Time())
 	if config != nil && config.TxHash != (common.Hash{}) {
 		idx, ok := indexOf(block, config.TxHash)
@@ -1041,7 +1074,7 @@ func (api *API) TraceCall(ctx context.Context, args ethapi.TransactionArgs, bloc
 	}
 	// try to recompute the state
 
-	opt, err := traceExecOpt(&config.TraceConfig)
+	opt, err := traceCallExecOpt(config)
 	if err != nil {
 		return nil, err
 	}