diff --git a/eth/backend.go b/eth/backend.go index faa43680458793c78d7be5cb43a802fbdb7219cc..7ce61817f6009aa6844e5ecb4fa1f520149783ff 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -631,7 +631,7 @@ func (s *Ethereum) StartMining(ctx context.Context, db kv.RwDB, mining *stagedsy if hh.BaseFee != nil { baseFee = hh.BaseFee.Uint64() } - return s.txPool2.OnNewBlock(tx, nil, txpool2.TxSlots{}, txpool2.TxSlots{}, baseFee, hh.Number.Uint64(), hh.Hash()) + return s.txPool2.OnNewBlock(nil, txpool2.TxSlots{}, txpool2.TxSlots{}, baseFee, hh.Number.Uint64(), hh.Hash()) }); err != nil { return err } diff --git a/eth/stagedsync/default_stages.go b/eth/stagedsync/default_stages.go index 87719322f27ff9cffc7b36e5a9b47fad4f49e637..a3d73f84ea9387b64c2b63f8afeb87a7c4ac0ae7 100644 --- a/eth/stagedsync/default_stages.go +++ b/eth/stagedsync/default_stages.go @@ -254,7 +254,7 @@ func DefaultStages(ctx context.Context, { ID: stages.TxPool, Description: "Update transaction pool", - Disabled: txPool.config.Disable, + Disabled: txPool.config.Disable || txPool.config.V2, Forward: func(firstCycle bool, badBlockUnwind bool, s *StageState, _ Unwinder, tx kv.RwTx) error { return SpawnTxPool(s, tx, txPool, ctx) }, diff --git a/go.mod b/go.mod index b52d50cd0f4c7b320405e166bfc4df21b19f9311..84f7ad0462bd67a2596470a1a6e87ade48ac2adc 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/julienschmidt/httprouter v1.3.0 github.com/kevinburke/go-bindata v3.21.0+incompatible github.com/kylelemons/godebug v1.1.0 // indirect - github.com/ledgerwatch/erigon-lib v0.0.0-20210908053037-c4efc0ea3a6c + github.com/ledgerwatch/erigon-lib v0.0.0-20210908121016-58c19d9219f0 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 458193187315a140ea20abb89d39252ded18ce0d..57a2de97394f0a042ee418122c2e84694c366078 100644 --- a/go.sum +++ b/go.sum @@ -492,8 +492,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= 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-20210908053037-c4efc0ea3a6c h1:/GDDVpBRcYJ+8KwRAfg42oGaB6Sluz1oHVgtJFw4nJ4= -github.com/ledgerwatch/erigon-lib v0.0.0-20210908053037-c4efc0ea3a6c/go.mod h1:q846JoG0oCWU9xTunmQAysfywjyoUzxx/5tHPo/F0t0= +github.com/ledgerwatch/erigon-lib v0.0.0-20210908121016-58c19d9219f0 h1:r0pkqEmLKS2xQEMT2TXQgrh0KSLebao3Erc3CIM2DV0= +github.com/ledgerwatch/erigon-lib v0.0.0-20210908121016-58c19d9219f0/go.mod h1:q846JoG0oCWU9xTunmQAysfywjyoUzxx/5tHPo/F0t0= 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=