Merge pull request #2652 from ledgerwatch/stable-2021-09-02

Stable 2021 09 02

README.md

@@ -72,7 +72,7 @@ make erigon
 ```
 
 Please note the `--datadir` option that allows you to store Erigon files in a non-default location, in this example,
-in `goerli` subdirectory of the current directory. Name of the directory `--datadir` does not have to match the name if
+in `goerli` subdirectory of the current directory. Name of the directory `--datadir` does not have to match the name of
 the chain in `--chain`.
 
 ### Mining

cmd/erigon/main.go

@@ -1,15 +1,10 @@
 package main
 
 import (
-	"context"
 	"fmt"
 	"os"
 
-	"github.com/ledgerwatch/erigon-lib/kv"
-	"github.com/ledgerwatch/erigon/cmd/utils"
-	"github.com/ledgerwatch/erigon/common"
 	"github.com/ledgerwatch/erigon/common/debug"
-	"github.com/ledgerwatch/erigon/core/rawdb"
 	"github.com/ledgerwatch/erigon/params"
 	erigoncli "github.com/ledgerwatch/erigon/turbo/cli"
 	"github.com/ledgerwatch/erigon/turbo/node"
@@ -32,24 +27,6 @@ func runErigon(cliCtx *cli.Context) {
 	logger.Info("Build info", "git_branch", params.GitBranch, "git_tag", params.GitTag, "git_commit", params.GitCommit)
 	nodeCfg := node.NewNodConfigUrfave(cliCtx)
 	ethCfg := node.NewEthConfigUrfave(cliCtx, nodeCfg)
-	if cliCtx.GlobalIsSet(utils.DataDirFlag.Name) {
-		// Check if we have an already initialized chain and fall back to
-		// that if so. Otherwise we need to generate a new genesis spec.
-		chaindb := utils.MakeChainDatabase(logger, nodeCfg)
-		if err := chaindb.View(context.Background(), func(tx kv.Tx) error {
-			h, err := rawdb.ReadCanonicalHash(tx, 0)
-			if err != nil {
-				panic(err)
-			}
-			if h != (common.Hash{}) {
-				ethCfg.Genesis = nil // fallback to db content
-			}
-			return nil
-		}); err != nil {
-			panic(err)
-		}
-		chaindb.Close()
-	}
 
 	ethNode, err := node.New(nodeCfg, ethCfg, logger)
 	if err != nil {

cmd/hack/hack.go

@@ -1689,7 +1689,7 @@ func readCallTraces(chaindata string, block uint64) error {
 	if err2 != nil {
 		return err2
 	}
-	var acc common.Address = common.HexToAddress("0x511bc4556d823ae99630ae8de28b9b80df90ea2e")
+	var acc = common.HexToAddress("0x511bc4556d823ae99630ae8de28b9b80df90ea2e")
 	for k, v, err = idxCursor.Seek(acc[:]); k != nil && err == nil && bytes.HasPrefix(k, acc[:]); k, v, err = idxCursor.Next() {
 		bm := roaring64.New()
 		_, err = bm.ReadFrom(bytes.NewReader(v))
@@ -1994,9 +1994,9 @@ func scanTxs(chaindata string) error {
 }
 
 func scanReceipts3(chaindata string, block uint64) error {
-	dbdb := mdbx.MustOpen(chaindata)
-	defer dbdb.Close()
-	tx, err := dbdb.BeginRw(context.Background())
+	db := mdbx.MustOpen(chaindata)
+	defer db.Close()
+	tx, err := db.BeginRw(context.Background())
 	if err != nil {
 		return err
 	}
@@ -2255,6 +2255,27 @@ func runBlock(ibs *state.IntraBlockState, txnWriter state.StateWriter, blockWrit
 	return receipts, nil
 }
 
+func devTx(chaindata string) error {
+	db := mdbx.MustOpen(chaindata)
+	defer db.Close()
+	tx, err := db.BeginRo(context.Background())
+	if err != nil {
+		return err
+	}
+	defer tx.Rollback()
+	b, err := rawdb.ReadBlockByNumber(tx, 0)
+	tool.Check(err)
+	cc, err := rawdb.ReadChainConfig(tx, b.Hash())
+	tool.Check(err)
+	txn := types.NewTransaction(1, common.Address{}, uint256.NewInt(100), 100_000, uint256.NewInt(1), []byte{1})
+	signedTx, err := types.SignTx(txn, *types.LatestSigner(cc), core.DevnetSignPrivateKey)
+	tool.Check(err)
+	buf := bytes.NewBuffer(nil)
+	err = signedTx.MarshalBinary(buf)
+	tool.Check(err)
+	fmt.Printf("%x\n", buf.Bytes())
+	return nil
+}
 func main() {
 	flag.Parse()
 
@@ -2414,6 +2435,9 @@ func main() {
 
 	case "scanReceipts3":
 		err = scanReceipts3(*chaindata, uint64(*block))
+
+	case "devTx":
+		err = devTx(*chaindata)
 	}
 
 	if err != nil {

cmd/integration/commands/stages.go

@@ -412,7 +412,11 @@ func stageSenders(db kv.RwDB, ctx context.Context) error {
 	s := stage(sync, tx, nil, stages.Senders)
 	log.Info("Stage", "name", s.ID, "progress", s.BlockNumber)
 
-	cfg := stagedsync.StageSendersCfg(db, chainConfig, tmpdir)
+	pm, err := prune.Get(tx)
+	if err != nil {
+		return err
+	}
+	cfg := stagedsync.StageSendersCfg(db, chainConfig, tmpdir, pm)
 	if unwind > 0 {
 		u := sync.NewUnwindState(stages.Senders, s.BlockNumber-unwind, s.BlockNumber)
 		err = stagedsync.UnwindSendersStage(u, tx, cfg, ctx)
@@ -940,6 +944,7 @@ func newSync(ctx context.Context, db kv.RwDB, miningConfig *params.MiningConfig)
 	cfg := ethconfig.Defaults
 	cfg.Prune = pm
 	cfg.BatchSize = batchSize
+	cfg.TxPool.Disable = true
 	if miningConfig != nil {
 		cfg.Miner = *miningConfig
 	}
@@ -958,7 +963,7 @@ func newSync(ctx context.Context, db kv.RwDB, miningConfig *params.MiningConfig)
 
 	miningSync := stagedsync.New(
 		stagedsync.MiningStages(ctx,
-			stagedsync.StageMiningCreateBlockCfg(db, miner, *chainConfig, engine, txPool, tmpdir),
+			stagedsync.StageMiningCreateBlockCfg(db, miner, *chainConfig, engine, txPool, nil, nil, tmpdir),
 			stagedsync.StageMiningExecCfg(db, miner, events, *chainConfig, engine, &vm.Config{}, tmpdir),
 			stagedsync.StageHashStateCfg(db, tmpdir),
 			stagedsync.StageTrieCfg(db, false, true, tmpdir),

cmd/integration/commands/state_stages.go

@@ -317,6 +317,7 @@ func syncBySmallSteps(db kv.RwDB, miningConfig params.MiningConfig, ctx context.
 						*chainConfig,
 						engine,
 						txPool,
+						nil, nil,
 						tmpDir),
 					quit)
 				if err != nil {