From a0321e2f3a1e123b6d0f9c7f1cc95999c2fad9b4 Mon Sep 17 00:00:00 2001
From: Alex Sharov <AskAlexSharov@gmail.com>
Date: Mon, 20 Sep 2021 20:16:50 +0700
Subject: [PATCH] Pool: return lost error, fix race of 2 sentries, more
friendly logs (#2707)
---
cmd/txpool/readme.md | 5 ++---
eth/backend.go | 2 +-
go.mod | 2 +-
go.sum | 5 +++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cmd/txpool/readme.md b/cmd/txpool/readme.md
index 68faf014a2..eb1ad1ac3b 100644
--- a/cmd/txpool/readme.md
+++ b/cmd/txpool/readme.md
@@ -41,12 +41,11 @@ Will add this part soon [tbd]
[x] Persistence
[x] Grafana board
[x] Non-mainnet support
-[] DevNet - doesn't send mined block notification on first mined block (because initialCycle = true)
+[x] 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
+[x] 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
diff --git a/eth/backend.go b/eth/backend.go
index ff99614c99..8e5c636d44 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -365,7 +365,7 @@ 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.Second //5 * time.Minute
+ cfg.LogEvery = 1 * time.Minute //5 * time.Minute
cfg.CommitEvery = 1 * time.Minute //5 * time.Minute
//cacheConfig := kvcache.DefaultCoherentCacheConfig
diff --git a/go.mod b/go.mod
index a035bd33a0..cacab011e8 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-20210920034821-ae9197c34bd1
+ github.com/ledgerwatch/erigon-lib v0.0.0-20210920131056-7ee779033d50
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 9aaaa27b30..5fe31f2dfd 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-20210920034821-ae9197c34bd1 h1:9fOCTX4CpzolyEGJZc3mobTYLL+XTXO2fuzyFW1QWTM=
-github.com/ledgerwatch/erigon-lib v0.0.0-20210920034821-ae9197c34bd1/go.mod h1:kZsi9wFAOYIkegoiSj10RXOVc0EmDtUxltnNP1f1ZE0=
+github.com/ledgerwatch/erigon-lib v0.0.0-20210920131056-7ee779033d50 h1:lODepcc+qBxUxK1t7z8cGuA8D+LeBq456T6dBi+928g=
+github.com/ledgerwatch/erigon-lib v0.0.0-20210920131056-7ee779033d50/go.mod h1:darGhVf++67hq/fQQ92zT+1EjE+FDxHd/OU7OKK4uWI=
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=
@@ -809,6 +809,7 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
+golang.org/dl v0.0.0-20210909185531-e2a88a019121/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ=
golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
--
GitLab