|
|
@ -18,7 +18,6 @@ |
|
|
|
package eth |
|
|
|
package eth |
|
|
|
|
|
|
|
|
|
|
|
import ( |
|
|
|
import ( |
|
|
|
"encoding/json" |
|
|
|
|
|
|
|
"fmt" |
|
|
|
"fmt" |
|
|
|
"math/big" |
|
|
|
"math/big" |
|
|
|
"runtime" |
|
|
|
"runtime" |
|
|
@ -42,7 +41,6 @@ import ( |
|
|
|
"github.com/ethereum/go-ethereum/eth/gasprice" |
|
|
|
"github.com/ethereum/go-ethereum/eth/gasprice" |
|
|
|
"github.com/ethereum/go-ethereum/eth/protocols/eth" |
|
|
|
"github.com/ethereum/go-ethereum/eth/protocols/eth" |
|
|
|
"github.com/ethereum/go-ethereum/eth/protocols/snap" |
|
|
|
"github.com/ethereum/go-ethereum/eth/protocols/snap" |
|
|
|
"github.com/ethereum/go-ethereum/eth/tracers" |
|
|
|
|
|
|
|
"github.com/ethereum/go-ethereum/ethdb" |
|
|
|
"github.com/ethereum/go-ethereum/ethdb" |
|
|
|
"github.com/ethereum/go-ethereum/event" |
|
|
|
"github.com/ethereum/go-ethereum/event" |
|
|
|
"github.com/ethereum/go-ethereum/internal/ethapi" |
|
|
|
"github.com/ethereum/go-ethereum/internal/ethapi" |
|
|
@ -197,17 +195,6 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) { |
|
|
|
StateScheme: scheme, |
|
|
|
StateScheme: scheme, |
|
|
|
} |
|
|
|
} |
|
|
|
) |
|
|
|
) |
|
|
|
if config.VMTrace != "" { |
|
|
|
|
|
|
|
var traceConfig json.RawMessage |
|
|
|
|
|
|
|
if config.VMTraceJsonConfig != "" { |
|
|
|
|
|
|
|
traceConfig = json.RawMessage(config.VMTraceJsonConfig) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
t, err := tracers.LiveDirectory.New(config.VMTrace, traceConfig) |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
|
|
|
|
return nil, fmt.Errorf("failed to create tracer %s: %v", config.VMTrace, err) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
vmConfig.Tracer = t |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// Override the chain config with provided settings.
|
|
|
|
// Override the chain config with provided settings.
|
|
|
|
var overrides core.ChainOverrides |
|
|
|
var overrides core.ChainOverrides |
|
|
|
if config.OverrideCancun != nil { |
|
|
|
if config.OverrideCancun != nil { |
|
|
|