From 8d9e058eb727b853845625db759006125a326b3f Mon Sep 17 00:00:00 2001
From: Alex Sharov <AskAlexSharov@gmail.com>
Date: Sat, 18 Sep 2021 20:58:23 +0700
Subject: [PATCH] Pool: chain config, non-mainnet (#2702)
---
cmd/hack/hack.go | 2 +-
cmd/rpcdaemon/commands/send_transaction.go | 31 +++++++++++++++++++++-
cmd/txpool/readme.md | 20 +++++++++++++-
consensus/ethash/consensus.go | 2 ++
eth/backend.go | 16 +++++++----
eth/stagedsync/stage_mining_finish.go | 17 ++++++------
go.mod | 2 +-
go.sum | 4 +--
params/config.go | 15 +++++++++--
9 files changed, 88 insertions(+), 21 deletions(-)
diff --git a/cmd/hack/hack.go b/cmd/hack/hack.go
index 91bc7e0058..c55e31f531 100644
--- a/cmd/hack/hack.go
+++ b/cmd/hack/hack.go
@@ -2267,7 +2267,7 @@ func devTx(chaindata string) error {
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})
+ txn := types.NewTransaction(2, 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)
diff --git a/cmd/rpcdaemon/commands/send_transaction.go b/cmd/rpcdaemon/commands/send_transaction.go
index a94940ca2d..b2f631766c 100644
--- a/cmd/rpcdaemon/commands/send_transaction.go
+++ b/cmd/rpcdaemon/commands/send_transaction.go
@@ -10,7 +10,9 @@ import (
"github.com/ledgerwatch/erigon-lib/gointerfaces/txpool"
"github.com/ledgerwatch/erigon/common"
"github.com/ledgerwatch/erigon/common/hexutil"
+ "github.com/ledgerwatch/erigon/core/rawdb"
"github.com/ledgerwatch/erigon/core/types"
+ "github.com/ledgerwatch/erigon/crypto"
"github.com/ledgerwatch/erigon/eth/ethconfig"
"github.com/ledgerwatch/erigon/params"
"github.com/ledgerwatch/erigon/rlp"
@@ -42,7 +44,34 @@ func (api *APIImpl) SendRawTransaction(ctx context.Context, encodedTx hexutil.By
return hash, fmt.Errorf("%s: %s", txpool.ImportResult_name[int32(res.Imported[0])], res.Errors[0])
}
- log.Info("Submitted transaction", "hash", txn.Hash().Hex(), "nonce", txn.GetNonce(), "recipient", txn.GetTo(), "value", txn.GetValue())
+ tx, err := api.db.BeginRo(ctx)
+ if err != nil {
+ return common.Hash{}, err
+ }
+ defer tx.Rollback()
+
+ // Print a log with full txn details for manual investigations and interventions
+ blockNum := rawdb.ReadCurrentBlockNumber(tx)
+ if blockNum == nil {
+ return common.Hash{}, err
+ }
+ cc, err := api.chainConfig(tx)
+ if err != nil {
+ return common.Hash{}, err
+ }
+ signer := types.MakeSigner(cc, *blockNum)
+ from, err := txn.Sender(*signer)
+ if err != nil {
+ return common.Hash{}, err
+ }
+
+ if txn.GetTo() == nil {
+ addr := crypto.CreateAddress(from, txn.GetNonce())
+ log.Info("Submitted contract creation", "hash", txn.Hash().Hex(), "from", from, "nonce", txn.GetNonce(), "contract", addr.Hex(), "value", txn.GetValue())
+ } else {
+ log.Info("Submitted transaction", "hash", txn.Hash().Hex(), "from", from, "nonce", txn.GetNonce(), "recipient", txn.GetTo(), "value", txn.GetValue())
+ }
+
return txn.Hash(), nil
}
diff --git a/cmd/txpool/readme.md b/cmd/txpool/readme.md
index 80e67c1faf..68faf014a2 100644
--- a/cmd/txpool/readme.md
+++ b/cmd/txpool/readme.md
@@ -1,4 +1,4 @@
-# TxPool
+# TxPool v2
Design docs: https://github.com/ledgerwatch/erigon/wiki/Transaction-Pool-Design
@@ -34,3 +34,21 @@ To change address/port of Erigon or Sentry:
## Increase pool limits
Will add this part soon [tbd]
+
+## ToDo list
+
+[x] Remote-mode support - with coherent state cache
+[x] Persistence
+[x] Grafana board
+[x] Non-mainnet support
+[] DevNet - doesn't send mined block notification on first mined block (because initialCycle = true)
+[] Add cli options to manage pool limits
+[] Add way for simple introspection - where is tx and why
+[] DiscardReasons - user must understand clearly why tx were rejected
+[] Hard-forks support (now rules are parsed ones on txPool start)
+[] Cache advanced eviction
+[] Add pool to docker-compose
+[] Add pool (db table) - where store recently mined txs - for faster unwind/reorg.
+[] Save history of local transactions - with 1 day expiration
+[] Miner - recheck if miner has all EIP-1559 patches
+[] Miner - to work on state cache
diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go
index 2029d73045..eafc3220c2 100644
--- a/consensus/ethash/consensus.go
+++ b/consensus/ethash/consensus.go
@@ -345,6 +345,8 @@ func (ethash *Ethash) CalcDifficulty(chain consensus.ChainHeaderReader, time, pa
func CalcDifficulty(config *params.ChainConfig, time, parentTime uint64, parentDifficulty *big.Int, parentNumber uint64, parentUncleHash common.Hash) *big.Int {
next := parentNumber + 1
switch {
+ case config.IsCatalyst(next):
+ return big.NewInt(1)
case config.IsLondon(next):
return calcDifficultyEip3554(time, parentTime, parentDifficulty, parentNumber, parentUncleHash)
case config.IsMuirGlacier(next):
diff --git a/eth/backend.go b/eth/backend.go
index f8b0b57116..b990df03ef 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -365,17 +365,17 @@ func New(stack *node.Node, config *ethconfig.Config, logger log.Logger) (*Ethere
if config.TxPool.V2 {
cfg := txpool2.DefaultConfig
cfg.DBDir = path.Join(stack.Config().DataDir, "txpool")
- cfg.LogEvery = 2 * time.Minute //5 * time.Minute
+ cfg.LogEvery = 2 * time.Second //5 * time.Minute
cfg.CommitEvery = 1 * time.Minute //5 * time.Minute
- cacheConfig := kvcache.DefaultCoherentCacheConfig
- cacheConfig.MetricsLabel = "txpool"
+ //cacheConfig := kvcache.DefaultCoherentCacheConfig
+ //cacheConfig.MetricsLabel = "txpool"
stateDiffClient := direct.NewStateDiffClientDirect(kvRPC)
backend.newTxs2 = make(chan txpool2.Hashes, 1024)
//defer close(newTxs)
backend.txPool2DB, backend.txPool2, backend.txPool2Fetch, backend.txPool2Send, backend.txPool2GrpcServer, err = txpooluitl.AllComponents(
- ctx, cfg, kvcache.New(cacheConfig), backend.newTxs2, backend.chainDB, backend.sentries, stateDiffClient,
+ ctx, cfg, kvcache.NewDummy(), backend.newTxs2, backend.chainDB, backend.sentries, stateDiffClient,
)
if err != nil {
return nil, err
@@ -669,7 +669,7 @@ func (s *Ethereum) StartMining(ctx context.Context, db kv.RwDB, mining *stagedsy
if s.chainConfig.ChainID.Uint64() > 10 {
go func() {
- skipCycleEvery := time.NewTicker(2 * time.Second)
+ skipCycleEvery := time.NewTicker(3 * time.Second)
defer skipCycleEvery.Stop()
for range skipCycleEvery.C {
select {
@@ -684,14 +684,20 @@ func (s *Ethereum) StartMining(ctx context.Context, db kv.RwDB, mining *stagedsy
defer debug.LogPanic()
defer close(s.waitForMiningStop)
+ mineEvery := time.NewTicker(3 * time.Second)
+ defer mineEvery.Stop()
+
var works bool
var hasWork bool
errc := make(chan error, 1)
for {
+ mineEvery.Reset(3 * time.Second)
select {
case <-s.notifyMiningAboutNewTxs:
hasWork = true
+ case <-mineEvery.C:
+ hasWork = true
case err := <-errc:
works = false
hasWork = false
diff --git a/eth/stagedsync/stage_mining_finish.go b/eth/stagedsync/stage_mining_finish.go
index a24b8136d4..2e293d3486 100644
--- a/eth/stagedsync/stage_mining_finish.go
+++ b/eth/stagedsync/stage_mining_finish.go
@@ -36,7 +36,6 @@ func StageMiningFinishCfg(
func SpawnMiningFinishStage(s *StageState, tx kv.RwTx, cfg MiningFinishCfg, quit <-chan struct{}) error {
logPrefix := s.LogPrefix()
- log.Info(fmt.Sprintf("[%s] start", logPrefix))
current := cfg.miningState.MiningBlock
// Short circuit when receiving duplicate result caused by resubmitting.
@@ -63,13 +62,15 @@ func SpawnMiningFinishStage(s *StageState, tx kv.RwTx, cfg MiningFinishCfg, quit
cfg.miningState.PendingResultCh <- block
- log.Info(fmt.Sprintf("[%s] block ready for seal", logPrefix),
- "blocn_num", block.NumberU64(),
- "transactions", block.Transactions().Len(),
- "gas_used", block.GasUsed(),
- "gas_limit", block.GasLimit(),
- "difficulty", block.Difficulty(),
- )
+ if block.Transactions().Len() > 0 {
+ log.Info(fmt.Sprintf("[%s] block ready for seal", logPrefix),
+ "blocn_num", block.NumberU64(),
+ "transactions", block.Transactions().Len(),
+ "gas_used", block.GasUsed(),
+ "gas_limit", block.GasLimit(),
+ "difficulty", block.Difficulty(),
+ )
+ }
chain := ChainReader{Cfg: cfg.chainConfig, Db: tx}
if err := cfg.engine.Seal(chain, block, cfg.miningState.MiningResultCh, cfg.sealCancel); err != nil {
diff --git a/go.mod b/go.mod
index e80bad4d85..060da76615 100644
--- a/go.mod
+++ b/go.mod
@@ -36,7 +36,7 @@ require (
github.com/json-iterator/go v1.1.11
github.com/julienschmidt/httprouter v1.3.0
github.com/kevinburke/go-bindata v3.21.0+incompatible
- github.com/ledgerwatch/erigon-lib v0.0.0-20210917022838-527036f986bb
+ github.com/ledgerwatch/erigon-lib v0.0.0-20210918130108-95f4ac34fd13
github.com/ledgerwatch/log/v3 v3.3.0
github.com/ledgerwatch/secp256k1 v0.0.0-20210626115225-cd5cd00ed72d
github.com/logrusorgru/aurora/v3 v3.0.0
diff --git a/go.sum b/go.sum
index ecefe2f02a..f029bbc07b 100644
--- a/go.sum
+++ b/go.sum
@@ -492,8 +492,8 @@ github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758 h1:0D5M2HQSGD3P
github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
-github.com/ledgerwatch/erigon-lib v0.0.0-20210917022838-527036f986bb h1:RS3uSN0lx90yRRfihFRCSS7KH6LdXrVDC5E+MMTXVq4=
-github.com/ledgerwatch/erigon-lib v0.0.0-20210917022838-527036f986bb/go.mod h1:kZsi9wFAOYIkegoiSj10RXOVc0EmDtUxltnNP1f1ZE0=
+github.com/ledgerwatch/erigon-lib v0.0.0-20210918130108-95f4ac34fd13 h1:Pgs2rcuUTLmEIuFAiKSKN16cz36CWLfnGLqOntvi+Hs=
+github.com/ledgerwatch/erigon-lib v0.0.0-20210918130108-95f4ac34fd13/go.mod h1:kZsi9wFAOYIkegoiSj10RXOVc0EmDtUxltnNP1f1ZE0=
github.com/ledgerwatch/log/v3 v3.3.0 h1:k8N/3NQLILr8CKCMyza261vLFKU7VA+nMNNb0wVyQSc=
github.com/ledgerwatch/log/v3 v3.3.0/go.mod h1:J58eOHHrIYHxl7LKkRsb/0YibKwtLfauUryl5SLRGm0=
github.com/ledgerwatch/secp256k1 v0.0.0-20210626115225-cd5cd00ed72d h1:/IKMrJdfRsoYNc36PXqP4xMH3vhW/8IQyBKGQbKZUno=
diff --git a/params/config.go b/params/config.go
index ed150601ab..97e16c0cf7 100644
--- a/params/config.go
+++ b/params/config.go
@@ -221,7 +221,8 @@ var (
MuirGlacierBlock: nil,
BerlinBlock: big.NewInt(21050600),
//LondonBlock: big.NewInt(21050600),
- Aura: &AuRaConfig{},
+ CatalystBlock: nil,
+ Aura: &AuRaConfig{},
}
// AllEthashProtocolChanges contains every protocol change (EIPs) introduced
@@ -245,6 +246,7 @@ var (
MuirGlacierBlock: big.NewInt(0),
BerlinBlock: big.NewInt(0),
LondonBlock: nil,
+ CatalystBlock: nil,
Ethash: new(EthashConfig),
Clique: nil,
}
@@ -270,6 +272,7 @@ var (
MuirGlacierBlock: big.NewInt(0),
BerlinBlock: big.NewInt(0),
LondonBlock: nil,
+ CatalystBlock: nil,
Ethash: nil,
Clique: &CliqueConfig{Period: 0, Epoch: 30000},
}
@@ -292,6 +295,7 @@ var (
MuirGlacierBlock: big.NewInt(0),
BerlinBlock: big.NewInt(0),
LondonBlock: nil,
+ CatalystBlock: nil,
Ethash: new(EthashConfig),
Clique: nil,
}
@@ -327,6 +331,7 @@ type ChainConfig struct {
MuirGlacierBlock *big.Int `json:"muirGlacierBlock,omitempty"` // Eip-2384 (bomb delay) switch block (nil = no fork, 0 = already activated)
BerlinBlock *big.Int `json:"berlinBlock,omitempty"` // Berlin switch block (nil = no fork, 0 = already on berlin)
LondonBlock *big.Int `json:"londonBlock,omitempty"` // London switch block (nil = no fork, 0 = already on london)
+ CatalystBlock *big.Int `json:"catalystBlock,omitempty"` // Catalyst switch block (nil = no fork, 0 = already on catalyst)
// Various consensus engines
Ethash *EthashConfig `json:"ethash,omitempty"`
@@ -476,6 +481,11 @@ func (c *ChainConfig) IsLondon(num uint64) bool {
return isForked(c.LondonBlock, num)
}
+// IsCatalyst returns whether num is either equal to the Merge fork block or greater.
+func (c *ChainConfig) IsCatalyst(num uint64) bool {
+ return isForked(c.CatalystBlock, num)
+}
+
// CheckCompatible checks whether scheduled fork transitions have been imported
// with a mismatching chain configuration.
func (c *ChainConfig) CheckCompatible(newcfg *ChainConfig, height uint64) *ConfigCompatError {
@@ -655,7 +665,7 @@ type Rules struct {
ChainID *big.Int
IsHomestead, IsEIP150, IsEIP155, IsEIP158 bool
IsByzantium, IsConstantinople, IsPetersburg, IsIstanbul bool
- IsBerlin, IsLondon bool
+ IsBerlin, IsLondon, IsCatalyst bool
}
// Rules ensures c's ChainID is not nil.
@@ -676,5 +686,6 @@ func (c *ChainConfig) Rules(num uint64) Rules {
IsIstanbul: c.IsIstanbul(num),
IsBerlin: c.IsBerlin(num),
IsLondon: c.IsLondon(num),
+ IsCatalyst: c.IsCatalyst(num),
}
}
--
GitLab