feature: native trace (#19)

Co-authored-by: yzb@example.cn <yzb@example.cn>
BytomDAO · Apr 18, 2022 · 431d51e · 431d51e
1 parent a406dac
commit 431d51e
Show file tree

Hide file tree

Showing 214 changed files with 7,889 additions and 2,051 deletions.
diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-//go:build (darwin && !ios && cgo) || freebsd || (linux && !arm64) || netbsd || solaris
 // +build darwin,!ios,cgo freebsd linux,!arm64 netbsd solaris
 
 package keystore

diff --git a/accounts/keystore/watch_fallback.go b/accounts/keystore/watch_fallback.go
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-//go:build (darwin && !cgo) || ios || (linux && arm64) || windows || (!darwin && !freebsd && !linux && !netbsd && !solaris)
 // +build darwin,!cgo ios linux,arm64 windows !darwin,!freebsd,!linux,!netbsd,!solaris
 
 // This is the fallback implementation of directory watching.

diff --git a/build/ci.go b/build/ci.go
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-//go:build none
 // +build none
 
 /*

diff --git a/build/update-license.go b/build/update-license.go
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-//go:build none
 // +build none
 
 /*

diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go
@@ -46,7 +46,7 @@ func disasmCmd(ctx *cli.Context) error {
  case ctx.GlobalIsSet(InputFlag.Name):
  in = ctx.GlobalString(InputFlag.Name)
  default:
- return errors.New("Missing filename or --input value")
+ return errors.New("missing filename or --input value")
  }
 
  code := strings.TrimSpace(in)

diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go
@@ -82,7 +82,7 @@ type stEnvMarshaling struct {
 // Apply applies a set of transactions to a pre-state
 func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
  txs types.Transactions, miningReward int64,
- getTracerFn func(txIndex int, txHash common.Hash) (tracer vm.Tracer, err error)) (*state.StateDB, *ExecutionResult, error) {
+ getTracerFn func(txIndex int, txHash common.Hash) (tracer vm.EVMLogger, err error)) (*state.StateDB, *ExecutionResult, error) {
 
  // Capture errors for BLOCKHASH operation, if we haven't been supplied the
  // required blockhashes
@@ -223,7 +223,9 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
  statedb.AddBalance(pre.Env.Coinbase, minerReward)
  }
  // Commit block
- root, _, err := statedb.Commit(chainConfig.IsEIP158(vmContext.BlockNumber))
+ statedb.Finalise(chainConfig.IsEIP158(vmContext.BlockNumber))
+ statedb.AccountsIntermediateRoot()
+ root, _, err := statedb.Commit(nil)
  if err != nil {
  fmt.Fprintf(os.Stderr, "Could not commit state: %v", err)
  return nil, nil, NewError(ErrorEVM, fmt.Errorf("could not commit state: %v", err))
@@ -252,7 +254,9 @@ func MakePreState(db ethdb.Database, accounts core.GenesisAlloc) *state.StateDB
  }
  }
  // Commit and re-open to start with a clean state.
- root, _, _ := statedb.Commit(false)
+ statedb.Finalise(false)
+ statedb.AccountsIntermediateRoot()
+ root, _, _ := statedb.Commit(nil)
  statedb, _ = state.New(root, sdb, nil)
  return statedb
 }

diff --git a/cmd/evm/internal/t8ntool/flags.go b/cmd/evm/internal/t8ntool/flags.go
@@ -30,15 +30,15 @@ var (
  Name: "trace",
  Usage: "Output full trace logs to files <txhash>.jsonl",
  }
- TraceDisableMemoryFlag = cli.BoolFlag{
+ TraceDisableMemoryFlag = cli.BoolTFlag{
  Name: "trace.nomemory",
  Usage: "Disable full memory dump in traces",
  }
  TraceDisableStackFlag = cli.BoolFlag{
  Name: "trace.nostack",
  Usage: "Disable stack output in traces",
  }
- TraceDisableReturnDataFlag = cli.BoolFlag{
+ TraceDisableReturnDataFlag = cli.BoolTFlag{
  Name: "trace.noreturndata",
  Usage: "Disable return data output in traces",
  }

diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go
@@ -81,10 +81,10 @@ func Main(ctx *cli.Context) error {
 
  var (
  err error
- tracer vm.Tracer
+ tracer vm.EVMLogger
  baseDir = ""
  )
- var getTracer func(txIndex int, txHash common.Hash) (vm.Tracer, error)
+ var getTracer func(txIndex int, txHash common.Hash) (vm.EVMLogger, error)
 
  // If user specified a basedir, make sure it exists
  if ctx.IsSet(OutputBasedir.Name) {
@@ -99,10 +99,10 @@ func Main(ctx *cli.Context) error {
  if ctx.Bool(TraceFlag.Name) {
  // Configure the EVM logger
  logConfig := &vm.LogConfig{
- DisableStack:  ctx.Bool(TraceDisableStackFlag.Name),
- DisableMemory: ctx.Bool(TraceDisableMemoryFlag.Name),
- DisableReturnData: ctx.Bool(TraceDisableReturnDataFlag.Name),
- Debug:  true,
+ DisableStack: ctx.Bool(TraceDisableStackFlag.Name),
+ EnableMemory: !ctx.Bool(TraceDisableMemoryFlag.Name),
+ EnableReturnData: !ctx.Bool(TraceDisableReturnDataFlag.Name),
+ Debug: true,
  }
  var prevFile *os.File
  // This one closes the last file
@@ -111,7 +111,7 @@ func Main(ctx *cli.Context) error {
  prevFile.Close()
  }
  }()
- getTracer = func(txIndex int, txHash common.Hash) (vm.Tracer, error) {
+ getTracer = func(txIndex int, txHash common.Hash) (vm.EVMLogger, error) {
  if prevFile != nil {
  prevFile.Close()
  }
@@ -123,7 +123,7 @@ func Main(ctx *cli.Context) error {
  return vm.NewJSONLogger(logConfig, traceFile), nil
  }
  } else {
- getTracer = func(txIndex int, txHash common.Hash) (tracer vm.Tracer, err error) {
+ getTracer = func(txIndex int, txHash common.Hash) (tracer vm.EVMLogger, err error) {
  return nil, nil
  }
  }

diff --git a/cmd/evm/main.go b/cmd/evm/main.go
@@ -113,7 +113,7 @@ var (
  Name: "receiver",
  Usage: "The transaction receiver (execution context)",
  }
- DisableMemoryFlag = cli.BoolFlag{
+ DisableMemoryFlag = cli.BoolTFlag{
  Name: "nomemory",
  Usage: "disable memory output",
  }
@@ -125,9 +125,9 @@ var (
  Name: "nostorage",
  Usage: "disable storage output",
  }
- DisableReturnDataFlag = cli.BoolFlag{
+ DisableReturnDataFlag = cli.BoolTFlag{
  Name: "noreturndata",
- Usage: "disable return data output",
+ Usage: "enable return data output",
  }
  EVMInterpreterFlag = cli.StringFlag{
  Name: "vm.evm",

diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go
@@ -108,15 +108,15 @@ func runCmd(ctx *cli.Context) error {
  glogger.Verbosity(log.Lvl(ctx.GlobalInt(VerbosityFlag.Name)))
  log.Root().SetHandler(glogger)
  logconfig := &vm.LogConfig{
- DisableMemory: ctx.GlobalBool(DisableMemoryFlag.Name),
- DisableStack:  ctx.GlobalBool(DisableStackFlag.Name),
- DisableStorage:  ctx.GlobalBool(DisableStorageFlag.Name),
- DisableReturnData: ctx.GlobalBool(DisableReturnDataFlag.Name),
- Debug:  ctx.GlobalBool(DebugFlag.Name),
+ EnableMemory: !ctx.GlobalBool(DisableMemoryFlag.Name),
+ DisableStack: ctx.GlobalBool(DisableStackFlag.Name),
+ DisableStorage: ctx.GlobalBool(DisableStorageFlag.Name),
+ EnableReturnData: !ctx.GlobalBool(DisableReturnDataFlag.Name),
+ Debug: ctx.GlobalBool(DebugFlag.Name),
  }
 
  var (
- tracer vm.Tracer
+ tracer vm.EVMLogger
  debugLogger *vm.StructLogger
  statedb *state.StateDB
  chainConfig *params.ChainConfig
@@ -268,7 +268,9 @@ func runCmd(ctx *cli.Context) error {
  output, leftOverGas, stats, err := timedExec(bench, execFunc)
 
  if ctx.GlobalBool(DumpFlag.Name) {
- statedb.Commit(true)
+ statedb.Finalise(true)
+ statedb.AccountsIntermediateRoot()
+ statedb.Commit(nil)
  statedb.IntermediateRoot(true)
  fmt.Println(string(statedb.Dump(false, false, true)))
  }

diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go
@@ -59,13 +59,13 @@ func stateTestCmd(ctx *cli.Context) error {
 
  // Configure the EVM logger
  config := &vm.LogConfig{
- DisableMemory: ctx.GlobalBool(DisableMemoryFlag.Name),
- DisableStack:  ctx.GlobalBool(DisableStackFlag.Name),
- DisableStorage:  ctx.GlobalBool(DisableStorageFlag.Name),
- DisableReturnData: ctx.GlobalBool(DisableReturnDataFlag.Name),
+ EnableMemory: !ctx.GlobalBool(DisableMemoryFlag.Name),
+ DisableStack: ctx.GlobalBool(DisableStackFlag.Name),
+ DisableStorage: ctx.GlobalBool(DisableStorageFlag.Name),
+ EnableReturnData: !ctx.GlobalBool(DisableReturnDataFlag.Name),
  }
  var (
- tracer vm.Tracer
+ tracer vm.EVMLogger
  debugger *vm.StructLogger
  )
  switch {
@@ -101,7 +101,8 @@ func stateTestCmd(ctx *cli.Context) error {
  _, state, err := test.Run(st, cfg, false)
  // print state root for evmlab tracing
  if ctx.GlobalBool(MachineFlag.Name) && state != nil {
- fmt.Fprintf(os.Stderr, "{\"stateRoot\": \"%x\"}\n", state.IntermediateRoot(false))
+ root := state.IntermediateRoot(false)
+ fmt.Fprintf(os.Stderr, "{\"stateRoot\": \"%x\"}\n", root)
  }
  if err != nil {
  // Test failed, mark as so and dump any state to aid debugging

diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
@@ -458,7 +458,7 @@ func importPreimages(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, false)
+ db := utils.MakeChainDatabase(ctx, stack, false, false)
  start := time.Now()
 
  if err := utils.ImportPreimages(db, ctx.Args().First()); err != nil {
@@ -477,7 +477,7 @@ func exportPreimages(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  start := time.Now()
 
  if err := utils.ExportPreimages(db, ctx.Args().First()); err != nil {
@@ -491,7 +491,7 @@ func dump(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  for _, arg := range ctx.Args() {
  var header *types.Header
  if hashish(arg) {

diff --git a/cmd/geth/dbcmd.go b/cmd/geth/dbcmd.go
@@ -62,6 +62,7 @@ Remove blockchain and state databases`,
  dbPutCmd,
  dbGetSlotsCmd,
  dbDumpFreezerIndex,
+ ancientInspectCmd,
  },
  }
  dbInspectCmd = cli.Command{
@@ -195,6 +196,16 @@ WARNING: This is a low-level operation which may cause database corruption!`,
  },
  Description: "This command displays information about the freezer index.",
  }
+ ancientInspectCmd = cli.Command{
+ Action: utils.MigrateFlags(ancientInspect),
+ Name: "inspect-reserved-oldest-blocks",
+ Flags: []cli.Flag{
+ utils.DataDirFlag,
+ },
+ Usage: "Inspect the ancientStore information",
+ Description: `This commands will read current offset from kvdb, which is the current offset and starting BlockNumber
+of ancientStore, will also displays the reserved number of blocks in ancientStore `,
+ }
 )
 
 func removeDB(ctx *cli.Context) error {
@@ -282,12 +293,21 @@ func inspect(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
 
  return rawdb.InspectDatabase(db, prefix, start)
 }
 
+func ancientInspect(ctx *cli.Context) error {
+ stack, _ := makeConfigNode(ctx)
+ defer stack.Close()
+
+ db := utils.MakeChainDatabase(ctx, stack, true, true)
+ defer db.Close()
+ return rawdb.AncientInspect(db)
+}
+
 func showLeveldbStats(db ethdb.Stater) {
  if stats, err := db.Stat("leveldb.stats"); err != nil {
  log.Warn("Failed to read database stats", "error", err)
@@ -305,7 +325,7 @@ func dbStats(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
 
  showLeveldbStats(db)
@@ -316,7 +336,7 @@ func dbCompact(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, false)
+ db := utils.MakeChainDatabase(ctx, stack, false, false)
  defer db.Close()
 
  log.Info("Stats before compaction")
@@ -340,7 +360,7 @@ func dbGet(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
 
  key, err := hexutil.Decode(ctx.Args().Get(0))
@@ -365,7 +385,7 @@ func dbDelete(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, false)
+ db := utils.MakeChainDatabase(ctx, stack, false, false)
  defer db.Close()
 
  key, err := hexutil.Decode(ctx.Args().Get(0))
@@ -392,7 +412,7 @@ func dbPut(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, false)
+ db := utils.MakeChainDatabase(ctx, stack, false, false)
  defer db.Close()
 
  var (
@@ -426,7 +446,7 @@ func dbDumpTrie(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
  var (
  root []byte

diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -39,6 +39,11 @@ import (
  "github.com/ethereum/go-ethereum/log"
  "github.com/ethereum/go-ethereum/metrics"
  "github.com/ethereum/go-ethereum/node"
+
+ // Force-load the tracer engines to trigger registration
+ _ "github.com/ethereum/go-ethereum/eth/tracers/js"
+ _ "github.com/ethereum/go-ethereum/eth/tracers/native"
+
  "gopkg.in/urfave/cli.v1"
 )
 
@@ -67,6 +72,7 @@ var (
  utils.DirectBroadcastFlag,
  utils.DisableSnapProtocolFlag,
  utils.DiffSyncFlag,
+ utils.PipeCommitFlag,
  utils.RangeLimitFlag,
  utils.USBFlag,
  utils.SmartCardDaemonPathFlag,
@@ -90,6 +96,7 @@ var (
  utils.TxPoolAccountQueueFlag,
  utils.TxPoolGlobalQueueFlag,
  utils.TxPoolLifetimeFlag,
+ utils.TxPoolReannounceTimeFlag,
  utils.SyncModeFlag,
  utils.ExitWhenSyncedFlag,
  utils.GCModeFlag,
@@ -159,6 +166,8 @@ var (
  utils.MinerNotifyFullFlag,
  configFileFlag,
  utils.CatalystFlag,
+ utils.BlockAmountReserved,
+ utils.CheckSnapshotWithMPT,
  }
 
  rpcFlags = []cli.Flag{