2015-07-07 00:54:22 +00:00
|
|
|
// Copyright 2015 The go-ethereum Authors
|
2015-07-22 16:48:40 +00:00
|
|
|
// This file is part of the go-ethereum library.
|
2015-07-07 00:54:22 +00:00
|
|
|
//
|
2015-07-23 16:35:11 +00:00
|
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
2015-07-07 00:54:22 +00:00
|
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
|
|
// (at your option) any later version.
|
|
|
|
//
|
2015-07-22 16:48:40 +00:00
|
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
2015-07-07 00:54:22 +00:00
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2015-07-22 16:48:40 +00:00
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2015-07-07 00:54:22 +00:00
|
|
|
// GNU Lesser General Public License for more details.
|
|
|
|
//
|
|
|
|
// You should have received a copy of the GNU Lesser General Public License
|
2015-07-22 16:48:40 +00:00
|
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
2015-07-07 00:54:22 +00:00
|
|
|
|
2015-02-04 13:52:59 +00:00
|
|
|
package miner
|
|
|
|
|
|
|
|
import (
|
2023-03-17 01:24:50 +00:00
|
|
|
"context"
|
2018-08-28 13:48:20 +00:00
|
|
|
"errors"
|
2022-01-24 07:19:52 +00:00
|
|
|
"fmt"
|
2015-02-04 13:52:59 +00:00
|
|
|
"math/big"
|
2015-02-15 15:16:27 +00:00
|
|
|
"sync"
|
2015-03-26 16:45:03 +00:00
|
|
|
"sync/atomic"
|
2015-06-15 09:33:08 +00:00
|
|
|
"time"
|
2015-02-04 13:52:59 +00:00
|
|
|
|
2022-11-14 14:16:52 +00:00
|
|
|
mapset "github.com/deckarep/golang-set/v2"
|
2015-03-18 12:00:01 +00:00
|
|
|
"github.com/ethereum/go-ethereum/common"
|
2017-04-04 22:16:29 +00:00
|
|
|
"github.com/ethereum/go-ethereum/consensus"
|
|
|
|
"github.com/ethereum/go-ethereum/consensus/misc"
|
2015-02-04 13:52:59 +00:00
|
|
|
"github.com/ethereum/go-ethereum/core"
|
2015-03-23 17:27:05 +00:00
|
|
|
"github.com/ethereum/go-ethereum/core/state"
|
2015-02-04 13:52:59 +00:00
|
|
|
"github.com/ethereum/go-ethereum/core/types"
|
optimism: historical Bedrock geth rollup changes
This commit squashes the op-geth fork history into a more maintainable
diff for rebasing upon upstream geth.
reference-optimistic-geth changes (origins of op-geth in early Bedrock
development stage):
- Deposit TX Type
- Enable deposit tx in EVM/tx pool
- Change deposit nonce to not be the max nonce
- Extend PayloadAttributesV1 with a Transactions field
- Force deposits at the start of each L2 block
- Fix height check
- noTxPool flag, reproduce block in verifier mode without tx pool interference
- Fix RPC json marshalling (ref op-geth PR 4)
- Deposit txs block height check in block body validation (ref op-geth PR 5)
- core: do not try to reinject deposit txs into tx-pool (ref-op-geth PR 6)
- deposit source hash field instead of L2 block height and tx index combination
- Include invalid deposits, rewind state, but always persist mint (#10)
- Provide gas to Call/Create in deposit transactions (#12)
- Add docker builds (ref-op-geth PR 16, 17)
- Don't panic on deposit transaction signature values or chain ID (ref-op-geth PR 18)
- core: Add version to DepositTx (ref-op-geth PR 19)
- Enable Geth build/lint/test in CircleCI (ref-op-geth PR 23)
- core: Include guaranteed gas in the gas pool (ref-op-geth PR 21)
- core: handle base fee, l1 availability fee, tx fee (ref-op-geth PR 27)
- fix: deposit tx hash
- fix l1 fee cache, rpc, tracing and tx pool
- core: remove deposit-tx sub-type (a.k.a. deposit version byte)
- eth/catalyst: allow engine user to reorg own chain
- miner: restore ability to reorg deep as block builder
- params: print Optimism consensus type in banner
- core/types: remove unused protected() method, see upstream PR 23376
- core: do not mutate original balance value in tx pool l1 cost adjustment
- core: subtract deposit gas from pool, so other txs do not use the same gas. And fail tx processing if deposits reach gas limit
- core/types: deposits do not tip, avoid basefee subtraction
- Unmeter the L1 Attributes Transaction
- miner: handle force tx errors as critical, clean up diff
- ci: Switch branch
- eth,miner: return STATUS_INVALID when failing to process forced transactions in request (ref-op-geth PR 40)
- verifier: forward tx to sequencer based on flag
- txpool: add flag to disable tx gossip (ref-op-geth PR 42)
- Add op-geth version in addition to geth version (ref-op-geth PR 43)
- ci: CircleCI improvements (ref-op-geth PR 44)
- Rename to op-geth
- Build latest tag on optimism branch
op-geth changes:
- Expose cache config in simulated backend (#2)
- Add EIP-1559 parameters
- eth/catalyst: update payload id computation (#1)
- make eip1559 configurable (#4)
- post-merge network should not log warnings about missing transition information (#5)
- Make the simulator more configurable (#6)
- fix OPB-6 - IsDepositTx check instead of artificial nonce value check (#7)
- Simulated backend - enable proof of stake consensus type and fix performance issue (#8)
- accounts: simulated backend consensus engine option and immediate tx indexing
- consensus/beacon: recognize all blocks as reached TTD with 0 TTD in chain config
- Add --rollup.historicalhttp CLI flag and fix backend iface
- Flags and interfaces for historical RPC requests (#12)
- Redirect historical RPC requests (#13)
- Use the pre-existing ethereum.NotFound error (#18)
- Add historical endpoint to TraceBlockByNumber and TraceBlockByHash (#19)
- Add historical endpoint to TraceTransaction (#20)
- Add historical endpoint to TraceCall (#21)
- optimism: fee params from info txi, update l1 cost func GPO params read (#15)
- add hardcoded addresses for fee payouts (#23)
- dynamic gas limit via engine API (#22)
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: Joshua Gutow <jgutow@oplabs.co>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: Maurelian <maurelian@protonmail.ch>
2022-03-10 20:13:11 +00:00
|
|
|
"github.com/ethereum/go-ethereum/eth/tracers"
|
2015-02-04 13:52:59 +00:00
|
|
|
"github.com/ethereum/go-ethereum/event"
|
2017-02-22 12:10:07 +00:00
|
|
|
"github.com/ethereum/go-ethereum/log"
|
2016-07-08 10:00:37 +00:00
|
|
|
"github.com/ethereum/go-ethereum/params"
|
2020-08-21 12:10:40 +00:00
|
|
|
"github.com/ethereum/go-ethereum/trie"
|
2015-02-04 13:52:59 +00:00
|
|
|
)
|
|
|
|
|
2015-07-11 18:45:59 +00:00
|
|
|
const (
|
2018-08-14 15:34:33 +00:00
|
|
|
// resultQueueSize is the size of channel listening to sealing result.
|
|
|
|
resultQueueSize = 10
|
2018-08-16 11:14:33 +00:00
|
|
|
|
2018-05-18 08:45:52 +00:00
|
|
|
// txChanSize is the size of channel listening to NewTxsEvent.
|
2017-08-18 10:58:36 +00:00
|
|
|
// The number is referenced from the size of tx pool.
|
|
|
|
txChanSize = 4096
|
2018-08-16 11:14:33 +00:00
|
|
|
|
2017-08-18 10:58:36 +00:00
|
|
|
// chainHeadChanSize is the size of channel listening to ChainHeadEvent.
|
|
|
|
chainHeadChanSize = 10
|
2018-08-16 11:14:33 +00:00
|
|
|
|
2017-08-18 10:58:36 +00:00
|
|
|
// chainSideChanSize is the size of channel listening to ChainSideEvent.
|
|
|
|
chainSideChanSize = 10
|
2018-08-16 11:14:33 +00:00
|
|
|
|
2018-08-21 19:56:54 +00:00
|
|
|
// resubmitAdjustChanSize is the size of resubmitting interval adjustment channel.
|
|
|
|
resubmitAdjustChanSize = 10
|
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// sealingLogAtDepth is the number of confirmations before logging successful sealing.
|
|
|
|
sealingLogAtDepth = 7
|
2018-08-16 11:14:33 +00:00
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// minRecommitInterval is the minimal time interval to recreate the sealing block with
|
2018-08-21 19:56:54 +00:00
|
|
|
// any newly arrived transactions.
|
2023-06-09 10:49:19 +00:00
|
|
|
minRecommitInterval = 100 * time.Millisecond
|
2018-08-21 19:56:54 +00:00
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// maxRecommitInterval is the maximum time interval to recreate the sealing block with
|
2018-08-16 11:14:33 +00:00
|
|
|
// any newly arrived transactions.
|
2018-08-21 19:56:54 +00:00
|
|
|
maxRecommitInterval = 15 * time.Second
|
|
|
|
|
|
|
|
// intervalAdjustRatio is the impact a single interval adjustment has on sealing work
|
|
|
|
// resubmitting interval.
|
|
|
|
intervalAdjustRatio = 0.1
|
|
|
|
|
|
|
|
// intervalAdjustBias is applied during the new resubmit interval calculation in favor of
|
|
|
|
// increasing upper limit or decreasing lower limit so that the limit can be reachable.
|
|
|
|
intervalAdjustBias = 200 * 1000.0 * 1000.0
|
2018-08-23 13:02:57 +00:00
|
|
|
|
2018-08-28 13:59:05 +00:00
|
|
|
// staleThreshold is the maximum depth of the acceptable stale block.
|
2018-08-23 13:02:57 +00:00
|
|
|
staleThreshold = 7
|
2015-07-11 18:45:59 +00:00
|
|
|
)
|
2015-05-11 19:47:34 +00:00
|
|
|
|
2022-05-06 09:19:30 +00:00
|
|
|
var (
|
|
|
|
errBlockInterruptedByNewHead = errors.New("new head arrived while building block")
|
|
|
|
errBlockInterruptedByRecommit = errors.New("recommit interrupt while building block")
|
2022-10-03 12:10:00 +00:00
|
|
|
errBlockInterruptedByTimeout = errors.New("timeout while building block")
|
2022-05-06 09:19:30 +00:00
|
|
|
)
|
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// environment is the worker's current environment and holds all
|
|
|
|
// information of the sealing block generation.
|
2018-08-16 11:14:33 +00:00
|
|
|
type environment struct {
|
2016-11-02 12:44:13 +00:00
|
|
|
signer types.Signer
|
|
|
|
|
2022-11-14 14:16:52 +00:00
|
|
|
state *state.StateDB // apply state changes here
|
|
|
|
ancestors mapset.Set[common.Hash] // ancestor set (used for checking uncle parent validity)
|
|
|
|
family mapset.Set[common.Hash] // family set (used for checking uncle invalidity)
|
|
|
|
tcount int // tx count in cycle
|
|
|
|
gasPool *core.GasPool // available gas used to pack transactions
|
2022-01-24 07:19:52 +00:00
|
|
|
coinbase common.Address
|
2015-02-04 13:52:59 +00:00
|
|
|
|
2015-06-16 10:41:50 +00:00
|
|
|
header *types.Header
|
|
|
|
txs []*types.Transaction
|
|
|
|
receipts []*types.Receipt
|
2022-01-24 07:19:52 +00:00
|
|
|
uncles map[common.Hash]*types.Header
|
|
|
|
}
|
|
|
|
|
|
|
|
// copy creates a deep copy of environment.
|
|
|
|
func (env *environment) copy() *environment {
|
|
|
|
cpy := &environment{
|
|
|
|
signer: env.signer,
|
|
|
|
state: env.state.Copy(),
|
|
|
|
ancestors: env.ancestors.Clone(),
|
|
|
|
family: env.family.Clone(),
|
|
|
|
tcount: env.tcount,
|
|
|
|
coinbase: env.coinbase,
|
|
|
|
header: types.CopyHeader(env.header),
|
|
|
|
receipts: copyReceipts(env.receipts),
|
|
|
|
}
|
|
|
|
if env.gasPool != nil {
|
|
|
|
gasPool := *env.gasPool
|
|
|
|
cpy.gasPool = &gasPool
|
|
|
|
}
|
|
|
|
// The content of txs and uncles are immutable, unnecessary
|
|
|
|
// to do the expensive deep copy for them.
|
|
|
|
cpy.txs = make([]*types.Transaction, len(env.txs))
|
|
|
|
copy(cpy.txs, env.txs)
|
|
|
|
cpy.uncles = make(map[common.Hash]*types.Header)
|
|
|
|
for hash, uncle := range env.uncles {
|
|
|
|
cpy.uncles[hash] = uncle
|
|
|
|
}
|
|
|
|
return cpy
|
|
|
|
}
|
|
|
|
|
|
|
|
// unclelist returns the contained uncles as the list format.
|
|
|
|
func (env *environment) unclelist() []*types.Header {
|
|
|
|
var uncles []*types.Header
|
|
|
|
for _, uncle := range env.uncles {
|
|
|
|
uncles = append(uncles, uncle)
|
|
|
|
}
|
|
|
|
return uncles
|
|
|
|
}
|
|
|
|
|
|
|
|
// discard terminates the background prefetcher go-routine. It should
|
|
|
|
// always be called for all created environment instances otherwise
|
|
|
|
// the go-routine leak can happen.
|
|
|
|
func (env *environment) discard() {
|
|
|
|
if env.state == nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
env.state.StopPrefetcher()
|
2018-08-14 15:34:33 +00:00
|
|
|
}
|
2015-07-11 18:45:59 +00:00
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// task contains all information for consensus engine sealing and result submitting.
|
|
|
|
type task struct {
|
|
|
|
receipts []*types.Receipt
|
|
|
|
state *state.StateDB
|
|
|
|
block *types.Block
|
|
|
|
createdAt time.Time
|
|
|
|
}
|
|
|
|
|
2018-08-16 11:14:33 +00:00
|
|
|
const (
|
|
|
|
commitInterruptNone int32 = iota
|
|
|
|
commitInterruptNewHead
|
|
|
|
commitInterruptResubmit
|
2022-10-03 12:10:00 +00:00
|
|
|
commitInterruptTimeout
|
2018-08-16 11:14:33 +00:00
|
|
|
)
|
|
|
|
|
2018-08-21 19:56:54 +00:00
|
|
|
// newWorkReq represents a request for new sealing work submitting with relative interrupt notifier.
|
2018-08-16 11:14:33 +00:00
|
|
|
type newWorkReq struct {
|
2023-03-31 06:32:47 +00:00
|
|
|
interrupt *atomic.Int32
|
2018-08-16 11:14:33 +00:00
|
|
|
noempty bool
|
2018-08-29 14:31:59 +00:00
|
|
|
timestamp int64
|
2018-08-16 11:14:33 +00:00
|
|
|
}
|
|
|
|
|
2022-11-02 09:32:20 +00:00
|
|
|
// newPayloadResult represents a result struct corresponds to payload generation.
|
|
|
|
type newPayloadResult struct {
|
|
|
|
err error
|
|
|
|
block *types.Block
|
|
|
|
fees *big.Int
|
|
|
|
}
|
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// getWorkReq represents a request for getting a new sealing work with provided parameters.
|
|
|
|
type getWorkReq struct {
|
|
|
|
params *generateParams
|
2022-11-02 09:32:20 +00:00
|
|
|
result chan *newPayloadResult // non-blocking channel
|
2022-01-24 07:19:52 +00:00
|
|
|
}
|
|
|
|
|
2018-08-21 19:56:54 +00:00
|
|
|
// intervalAdjust represents a resubmitting interval adjustment.
|
|
|
|
type intervalAdjust struct {
|
|
|
|
ratio float64
|
|
|
|
inc bool
|
|
|
|
}
|
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// worker is the main object which takes care of submitting new work to consensus engine
|
|
|
|
// and gathering the sealing result.
|
2015-02-04 13:52:59 +00:00
|
|
|
type worker struct {
|
2019-04-23 07:08:51 +00:00
|
|
|
config *Config
|
|
|
|
chainConfig *params.ChainConfig
|
|
|
|
engine consensus.Engine
|
|
|
|
eth Backend
|
|
|
|
chain *core.BlockChain
|
2018-08-29 09:21:12 +00:00
|
|
|
|
2019-12-10 11:39:14 +00:00
|
|
|
// Feeds
|
|
|
|
pendingLogsFeed event.Feed
|
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// Subscriptions
|
2017-08-18 10:58:36 +00:00
|
|
|
mux *event.TypeMux
|
2018-05-18 08:45:52 +00:00
|
|
|
txsCh chan core.NewTxsEvent
|
2018-05-10 07:04:45 +00:00
|
|
|
txsSub event.Subscription
|
2017-08-18 10:58:36 +00:00
|
|
|
chainHeadCh chan core.ChainHeadEvent
|
|
|
|
chainHeadSub event.Subscription
|
|
|
|
chainSideCh chan core.ChainSideEvent
|
|
|
|
chainSideSub event.Subscription
|
2016-03-29 01:08:16 +00:00
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// Channels
|
2018-08-21 19:56:54 +00:00
|
|
|
newWorkCh chan *newWorkReq
|
2022-01-24 07:19:52 +00:00
|
|
|
getWorkCh chan *getWorkReq
|
2018-08-21 19:56:54 +00:00
|
|
|
taskCh chan *task
|
2018-08-28 13:59:05 +00:00
|
|
|
resultCh chan *types.Block
|
2018-08-21 19:56:54 +00:00
|
|
|
startCh chan struct{}
|
|
|
|
exitCh chan struct{}
|
|
|
|
resubmitIntervalCh chan time.Duration
|
|
|
|
resubmitAdjustCh chan *intervalAdjust
|
2015-02-04 13:52:59 +00:00
|
|
|
|
2021-10-08 16:36:58 +00:00
|
|
|
wg sync.WaitGroup
|
|
|
|
|
2018-09-20 21:11:55 +00:00
|
|
|
current *environment // An environment for current running cycle.
|
|
|
|
localUncles map[common.Hash]*types.Block // A set of side blocks generated locally as the possible uncle blocks.
|
|
|
|
remoteUncles map[common.Hash]*types.Block // A set of side blocks as the possible uncle blocks.
|
|
|
|
unconfirmed *unconfirmedBlocks // A set of locally mined blocks pending canonicalness confirmations.
|
2015-04-05 16:57:03 +00:00
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
mu sync.RWMutex // The lock used to protect the coinbase and extra fields
|
2015-03-18 12:00:01 +00:00
|
|
|
coinbase common.Address
|
2015-04-05 16:57:03 +00:00
|
|
|
extra []byte
|
2015-02-04 13:52:59 +00:00
|
|
|
|
2018-08-23 13:02:57 +00:00
|
|
|
pendingMu sync.RWMutex
|
|
|
|
pendingTasks map[common.Hash]*task
|
|
|
|
|
2021-07-08 06:57:51 +00:00
|
|
|
snapshotMu sync.RWMutex // The lock used to protect the snapshots below
|
2021-06-28 14:16:32 +00:00
|
|
|
snapshotBlock *types.Block
|
|
|
|
snapshotReceipts types.Receipts
|
|
|
|
snapshotState *state.StateDB
|
2018-04-16 07:56:20 +00:00
|
|
|
|
2015-04-22 08:58:43 +00:00
|
|
|
// atomic status counters
|
2023-03-31 06:32:47 +00:00
|
|
|
running atomic.Bool // The indicator whether the consensus engine is running or not.
|
|
|
|
newTxs atomic.Int32 // New arrival transaction count since last sealing work submitting.
|
2018-08-14 15:34:33 +00:00
|
|
|
|
2020-05-12 10:11:34 +00:00
|
|
|
// noempty is the flag used to control whether the feature of pre-seal empty
|
|
|
|
// block is enabled. The default value is false(pre-seal is enabled by default).
|
|
|
|
// But in some special scenario the consensus engine will seal blocks instantaneously,
|
|
|
|
// in this case this feature will add all empty blocks into canonical chain
|
|
|
|
// non-stop and no real transaction will be included.
|
2023-03-31 06:32:47 +00:00
|
|
|
noempty atomic.Bool
|
2020-05-12 10:11:34 +00:00
|
|
|
|
2022-10-03 12:10:00 +00:00
|
|
|
// newpayloadTimeout is the maximum timeout allowance for creating payload.
|
|
|
|
// The default value is 2 seconds but node operator can set it to arbitrary
|
|
|
|
// large value. A large timeout allowance may cause Geth to fail creating
|
|
|
|
// a non-empty payload within the specified time and eventually miss the slot
|
|
|
|
// in case there are some computation expensive transactions in txpool.
|
|
|
|
newpayloadTimeout time.Duration
|
|
|
|
|
2022-11-02 09:32:20 +00:00
|
|
|
// recommit is the time interval to re-create sealing work or to re-build
|
|
|
|
// payload in proof-of-stake stage.
|
|
|
|
recommit time.Duration
|
|
|
|
|
2018-09-20 21:11:55 +00:00
|
|
|
// External functions
|
all: core rework for the merge transition (#23761)
* all: work for eth1/2 transtition
* consensus/beacon, eth: change beacon difficulty to 0
* eth: updates
* all: add terminalBlockDifficulty config, fix rebasing issues
* eth: implemented merge interop spec
* internal/ethapi: update to v1.0.0.alpha.2
This commit updates the code to the new spec, moving payloadId into
it's own object. It also fixes an issue with finalizing an empty blockhash.
It also properly sets the basefee
* all: sync polishes, other fixes + refactors
* core, eth: correct semantics for LeavePoW, EnterPoS
* core: fixed rebasing artifacts
* core: light: performance improvements
* core: use keyed field (f)
* core: eth: fix compilation issues + tests
* eth/catalyst: dbetter error codes
* all: move Merger to consensus/, remove reliance on it in bc
* all: renamed EnterPoS and LeavePoW to ReachTDD and FinalizePoS
* core: make mergelogs a function
* core: use InsertChain instead of InsertBlock
* les: drop merger from lightchain object
* consensus: add merger
* core: recoverAncestors in catalyst mode
* core: fix nitpick
* all: removed merger from beacon, use TTD, nitpicks
* consensus: eth: add docstring, removed unnecessary code duplication
* consensus/beacon: better comment
* all: easy to fix nitpicks by karalabe
* consensus/beacon: verify known headers to be sure
* core: comments
* core: eth: don't drop peers who advertise blocks, nitpicks
* core: never add beacon blocks to the future queue
* core: fixed nitpicks
* consensus/beacon: simplify IsTTDReached check
* consensus/beacon: correct IsTTDReached check
Co-authored-by: rjl493456442 <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
2021-11-26 11:23:02 +00:00
|
|
|
isLocalBlock func(header *types.Header) bool // Function used to determine whether the specified block is mined by local miner.
|
2018-09-20 21:11:55 +00:00
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// Test hooks
|
2018-08-21 19:56:54 +00:00
|
|
|
newTaskHook func(*task) // Method to call upon receiving a new sealing task.
|
|
|
|
skipSealHook func(*task) bool // Method to decide whether skipping the sealing.
|
|
|
|
fullTaskHook func() // Method to call before pushing the full sealing task.
|
|
|
|
resubmitHook func(time.Duration, time.Duration) // Method to call upon updating resubmitting interval.
|
2015-02-04 13:52:59 +00:00
|
|
|
}
|
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
func newWorker(config *Config, chainConfig *params.ChainConfig, engine consensus.Engine, eth Backend, mux *event.TypeMux, isLocalBlock func(header *types.Header) bool, init bool) *worker {
|
2015-04-07 10:32:55 +00:00
|
|
|
worker := &worker{
|
2018-08-21 19:56:54 +00:00
|
|
|
config: config,
|
2019-04-23 07:08:51 +00:00
|
|
|
chainConfig: chainConfig,
|
2018-08-21 19:56:54 +00:00
|
|
|
engine: engine,
|
|
|
|
eth: eth,
|
|
|
|
chain: eth.BlockChain(),
|
2023-01-20 16:26:01 +00:00
|
|
|
mux: mux,
|
2018-09-20 21:11:55 +00:00
|
|
|
isLocalBlock: isLocalBlock,
|
|
|
|
localUncles: make(map[common.Hash]*types.Block),
|
|
|
|
remoteUncles: make(map[common.Hash]*types.Block),
|
2022-01-24 07:19:52 +00:00
|
|
|
unconfirmed: newUnconfirmedBlocks(eth.BlockChain(), sealingLogAtDepth),
|
2023-01-20 16:26:01 +00:00
|
|
|
coinbase: config.Etherbase,
|
|
|
|
extra: config.ExtraData,
|
2018-08-23 13:02:57 +00:00
|
|
|
pendingTasks: make(map[common.Hash]*task),
|
2018-08-21 19:56:54 +00:00
|
|
|
txsCh: make(chan core.NewTxsEvent, txChanSize),
|
|
|
|
chainHeadCh: make(chan core.ChainHeadEvent, chainHeadChanSize),
|
|
|
|
chainSideCh: make(chan core.ChainSideEvent, chainSideChanSize),
|
|
|
|
newWorkCh: make(chan *newWorkReq),
|
2022-01-24 07:19:52 +00:00
|
|
|
getWorkCh: make(chan *getWorkReq),
|
2018-08-21 19:56:54 +00:00
|
|
|
taskCh: make(chan *task),
|
2018-08-28 13:59:05 +00:00
|
|
|
resultCh: make(chan *types.Block, resultQueueSize),
|
2018-08-21 19:56:54 +00:00
|
|
|
startCh: make(chan struct{}, 1),
|
2023-01-20 16:26:01 +00:00
|
|
|
exitCh: make(chan struct{}),
|
2018-08-21 19:56:54 +00:00
|
|
|
resubmitIntervalCh: make(chan time.Duration),
|
|
|
|
resubmitAdjustCh: make(chan *intervalAdjust, resubmitAdjustChanSize),
|
2015-02-09 15:20:34 +00:00
|
|
|
}
|
2018-05-18 08:45:52 +00:00
|
|
|
// Subscribe NewTxsEvent for tx pool
|
|
|
|
worker.txsSub = eth.TxPool().SubscribeNewTxsEvent(worker.txsCh)
|
2017-08-18 10:58:36 +00:00
|
|
|
// Subscribe events for blockchain
|
|
|
|
worker.chainHeadSub = eth.BlockChain().SubscribeChainHeadEvent(worker.chainHeadCh)
|
|
|
|
worker.chainSideSub = eth.BlockChain().SubscribeChainSideEvent(worker.chainSideCh)
|
2015-04-07 10:32:55 +00:00
|
|
|
|
2018-08-21 19:56:54 +00:00
|
|
|
// Sanitize recommit interval if the user-specified one is too short.
|
2019-04-23 07:08:51 +00:00
|
|
|
recommit := worker.config.Recommit
|
2018-08-21 19:56:54 +00:00
|
|
|
if recommit < minRecommitInterval {
|
|
|
|
log.Warn("Sanitizing miner recommit interval", "provided", recommit, "updated", minRecommitInterval)
|
|
|
|
recommit = minRecommitInterval
|
|
|
|
}
|
2022-11-02 09:32:20 +00:00
|
|
|
worker.recommit = recommit
|
|
|
|
|
2022-10-03 12:10:00 +00:00
|
|
|
// Sanitize the timeout config for creating payload.
|
|
|
|
newpayloadTimeout := worker.config.NewPayloadTimeout
|
|
|
|
if newpayloadTimeout == 0 {
|
|
|
|
log.Warn("Sanitizing new payload timeout to default", "provided", newpayloadTimeout, "updated", DefaultConfig.NewPayloadTimeout)
|
|
|
|
newpayloadTimeout = DefaultConfig.NewPayloadTimeout
|
|
|
|
}
|
|
|
|
if newpayloadTimeout < time.Millisecond*100 {
|
|
|
|
log.Warn("Low payload timeout may cause high amount of non-full blocks", "provided", newpayloadTimeout, "default", DefaultConfig.NewPayloadTimeout)
|
|
|
|
}
|
|
|
|
worker.newpayloadTimeout = newpayloadTimeout
|
2018-08-21 19:56:54 +00:00
|
|
|
|
2021-10-08 16:36:58 +00:00
|
|
|
worker.wg.Add(4)
|
2018-08-14 15:34:33 +00:00
|
|
|
go worker.mainLoop()
|
2018-08-21 19:56:54 +00:00
|
|
|
go worker.newWorkLoop(recommit)
|
2018-08-14 15:34:33 +00:00
|
|
|
go worker.resultLoop()
|
|
|
|
go worker.taskLoop()
|
2015-04-07 10:32:55 +00:00
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// Submit first work to initialize pending state.
|
2019-11-20 10:36:41 +00:00
|
|
|
if init {
|
|
|
|
worker.startCh <- struct{}{}
|
|
|
|
}
|
2015-04-07 10:32:55 +00:00
|
|
|
return worker
|
2015-02-09 15:20:34 +00:00
|
|
|
}
|
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// setEtherbase sets the etherbase used to initialize the block coinbase field.
|
|
|
|
func (w *worker) setEtherbase(addr common.Address) {
|
|
|
|
w.mu.Lock()
|
|
|
|
defer w.mu.Unlock()
|
|
|
|
w.coinbase = addr
|
2015-07-07 08:58:47 +00:00
|
|
|
}
|
|
|
|
|
2023-01-20 16:26:01 +00:00
|
|
|
// etherbase retrieves the configured etherbase address.
|
|
|
|
func (w *worker) etherbase() common.Address {
|
|
|
|
w.mu.RLock()
|
|
|
|
defer w.mu.RUnlock()
|
|
|
|
return w.coinbase
|
|
|
|
}
|
|
|
|
|
2021-07-06 08:35:39 +00:00
|
|
|
func (w *worker) setGasCeil(ceil uint64) {
|
|
|
|
w.mu.Lock()
|
|
|
|
defer w.mu.Unlock()
|
|
|
|
w.config.GasCeil = ceil
|
|
|
|
}
|
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// setExtra sets the content used to initialize the block extra field.
|
|
|
|
func (w *worker) setExtra(extra []byte) {
|
|
|
|
w.mu.Lock()
|
|
|
|
defer w.mu.Unlock()
|
|
|
|
w.extra = extra
|
2016-12-13 12:03:18 +00:00
|
|
|
}
|
|
|
|
|
2018-08-21 19:56:54 +00:00
|
|
|
// setRecommitInterval updates the interval for miner sealing work recommitting.
|
|
|
|
func (w *worker) setRecommitInterval(interval time.Duration) {
|
2022-01-24 07:19:52 +00:00
|
|
|
select {
|
|
|
|
case w.resubmitIntervalCh <- interval:
|
|
|
|
case <-w.exitCh:
|
|
|
|
}
|
2018-08-21 19:56:54 +00:00
|
|
|
}
|
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// disablePreseal disables pre-sealing feature
|
2020-05-12 10:11:34 +00:00
|
|
|
func (w *worker) disablePreseal() {
|
2023-03-31 06:32:47 +00:00
|
|
|
w.noempty.Store(true)
|
2020-05-12 10:11:34 +00:00
|
|
|
}
|
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// enablePreseal enables pre-sealing feature
|
2020-05-12 10:11:34 +00:00
|
|
|
func (w *worker) enablePreseal() {
|
2023-03-31 06:32:47 +00:00
|
|
|
w.noempty.Store(false)
|
2020-05-12 10:11:34 +00:00
|
|
|
}
|
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// pending returns the pending state and corresponding block.
|
|
|
|
func (w *worker) pending() (*types.Block, *state.StateDB) {
|
2023-04-10 16:30:03 +00:00
|
|
|
if w.chainConfig.Optimism != nil && !w.config.RollupComputePendingBlock {
|
|
|
|
return nil, nil // when not computing the pending block, there is never a pending state
|
|
|
|
}
|
2018-08-03 08:33:37 +00:00
|
|
|
// return a snapshot to avoid contention on currentMu mutex
|
2018-08-14 15:34:33 +00:00
|
|
|
w.snapshotMu.RLock()
|
|
|
|
defer w.snapshotMu.RUnlock()
|
|
|
|
if w.snapshotState == nil {
|
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
return w.snapshotBlock, w.snapshotState.Copy()
|
2018-04-16 07:56:20 +00:00
|
|
|
}
|
2016-11-30 09:48:48 +00:00
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// pendingBlock returns pending block.
|
|
|
|
func (w *worker) pendingBlock() *types.Block {
|
2023-04-10 16:30:03 +00:00
|
|
|
if w.chainConfig.Optimism != nil && !w.config.RollupComputePendingBlock {
|
|
|
|
// For compatibility when not computing a pending block, we serve the latest block as "pending"
|
|
|
|
headHeader := w.eth.BlockChain().CurrentHeader()
|
|
|
|
headBlock := w.eth.BlockChain().GetBlock(headHeader.Hash(), headHeader.Number.Uint64())
|
|
|
|
return headBlock
|
|
|
|
}
|
2018-08-03 08:33:37 +00:00
|
|
|
// return a snapshot to avoid contention on currentMu mutex
|
2018-08-14 15:34:33 +00:00
|
|
|
w.snapshotMu.RLock()
|
|
|
|
defer w.snapshotMu.RUnlock()
|
|
|
|
return w.snapshotBlock
|
2016-11-30 09:48:48 +00:00
|
|
|
}
|
|
|
|
|
2021-06-28 14:16:32 +00:00
|
|
|
// pendingBlockAndReceipts returns pending block and corresponding receipts.
|
|
|
|
func (w *worker) pendingBlockAndReceipts() (*types.Block, types.Receipts) {
|
2023-04-10 16:30:03 +00:00
|
|
|
if w.chainConfig.Optimism != nil && !w.config.RollupComputePendingBlock {
|
|
|
|
return nil, nil // when not computing the pending block, there are no pending receipts, and thus no pending logs
|
|
|
|
}
|
2021-06-28 14:16:32 +00:00
|
|
|
// return a snapshot to avoid contention on currentMu mutex
|
|
|
|
w.snapshotMu.RLock()
|
|
|
|
defer w.snapshotMu.RUnlock()
|
|
|
|
return w.snapshotBlock, w.snapshotReceipts
|
|
|
|
}
|
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// start sets the running status as 1 and triggers new work submitting.
|
|
|
|
func (w *worker) start() {
|
2023-03-31 06:32:47 +00:00
|
|
|
w.running.Store(true)
|
2018-08-16 11:14:33 +00:00
|
|
|
w.startCh <- struct{}{}
|
2015-02-09 15:20:34 +00:00
|
|
|
}
|
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// stop sets the running status as 0.
|
|
|
|
func (w *worker) stop() {
|
2023-03-31 06:32:47 +00:00
|
|
|
w.running.Store(false)
|
2015-02-09 15:20:34 +00:00
|
|
|
}
|
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// isRunning returns an indicator whether worker is running or not.
|
|
|
|
func (w *worker) isRunning() bool {
|
2023-03-31 06:32:47 +00:00
|
|
|
return w.running.Load()
|
2018-08-03 08:33:37 +00:00
|
|
|
}
|
|
|
|
|
2018-08-28 13:59:05 +00:00
|
|
|
// close terminates all background threads maintained by the worker.
|
2018-08-14 15:34:33 +00:00
|
|
|
// Note the worker does not support being closed multiple times.
|
|
|
|
func (w *worker) close() {
|
2023-03-31 06:32:47 +00:00
|
|
|
w.running.Store(false)
|
2018-08-14 15:34:33 +00:00
|
|
|
close(w.exitCh)
|
2021-10-08 16:36:58 +00:00
|
|
|
w.wg.Wait()
|
2015-02-04 13:52:59 +00:00
|
|
|
}
|
|
|
|
|
2020-07-28 16:16:49 +00:00
|
|
|
// recalcRecommit recalculates the resubmitting interval upon feedback.
|
|
|
|
func recalcRecommit(minRecommit, prev time.Duration, target float64, inc bool) time.Duration {
|
|
|
|
var (
|
|
|
|
prevF = float64(prev.Nanoseconds())
|
|
|
|
next float64
|
|
|
|
)
|
|
|
|
if inc {
|
|
|
|
next = prevF*(1-intervalAdjustRatio) + intervalAdjustRatio*(target+intervalAdjustBias)
|
|
|
|
max := float64(maxRecommitInterval.Nanoseconds())
|
|
|
|
if next > max {
|
|
|
|
next = max
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
next = prevF*(1-intervalAdjustRatio) + intervalAdjustRatio*(target-intervalAdjustBias)
|
|
|
|
min := float64(minRecommit.Nanoseconds())
|
|
|
|
if next < min {
|
|
|
|
next = min
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return time.Duration(int64(next))
|
|
|
|
}
|
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// newWorkLoop is a standalone goroutine to submit new sealing work upon received events.
|
2018-08-21 19:56:54 +00:00
|
|
|
func (w *worker) newWorkLoop(recommit time.Duration) {
|
2021-10-08 16:36:58 +00:00
|
|
|
defer w.wg.Done()
|
2023-04-10 16:30:03 +00:00
|
|
|
if w.chainConfig.Optimism != nil && !w.config.RollupComputePendingBlock {
|
|
|
|
for { // do not update the pending-block, instead drain work without doing it, to keep producers from blocking.
|
|
|
|
select {
|
|
|
|
case <-w.startCh:
|
|
|
|
case <-w.chainHeadCh:
|
|
|
|
case <-w.resubmitIntervalCh:
|
|
|
|
case <-w.resubmitAdjustCh:
|
|
|
|
case <-w.exitCh:
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-21 19:56:54 +00:00
|
|
|
var (
|
2023-03-31 06:32:47 +00:00
|
|
|
interrupt *atomic.Int32
|
2018-08-21 19:56:54 +00:00
|
|
|
minRecommit = recommit // minimal resubmit interval specified by user.
|
2022-01-24 07:19:52 +00:00
|
|
|
timestamp int64 // timestamp for each round of sealing.
|
2018-08-21 19:56:54 +00:00
|
|
|
)
|
2018-08-16 11:14:33 +00:00
|
|
|
|
|
|
|
timer := time.NewTimer(0)
|
2020-04-02 08:40:38 +00:00
|
|
|
defer timer.Stop()
|
2018-08-16 11:14:33 +00:00
|
|
|
<-timer.C // discard the initial tick
|
|
|
|
|
2018-08-21 19:56:54 +00:00
|
|
|
// commit aborts in-flight transaction execution with given signal and resubmits a new one.
|
|
|
|
commit := func(noempty bool, s int32) {
|
2018-08-16 11:14:33 +00:00
|
|
|
if interrupt != nil {
|
2023-03-31 06:32:47 +00:00
|
|
|
interrupt.Store(s)
|
2018-08-16 11:14:33 +00:00
|
|
|
}
|
2023-03-31 06:32:47 +00:00
|
|
|
interrupt = new(atomic.Int32)
|
miner, test: fix potential goroutine leak (#21989)
In miner/worker.go, there are two goroutine using channel w.newWorkCh: newWorkerLoop() sends to this channel, and mainLoop() receives from this channel. Only the receive operation is in a select.
However, w.exitCh may be closed by another goroutine. This is fine for the receive since receive is in select, but if the send operation is blocking, then it will block forever. This commit puts the send in a select, so it won't block even if w.exitCh is closed.
Similarly, there are two goroutines using channel errc: the parent that runs the test receives from it, and the child created at line 573 sends to it. If the parent goroutine exits too early by calling t.Fatalf() at line 614, then the child goroutine will be blocked at line 574 forever. This commit adds 1 buffer to errc. Now send will not block, and receive is not influenced because receive still needs to wait for the send.
2020-12-11 09:29:42 +00:00
|
|
|
select {
|
|
|
|
case w.newWorkCh <- &newWorkReq{interrupt: interrupt, noempty: noempty, timestamp: timestamp}:
|
|
|
|
case <-w.exitCh:
|
|
|
|
return
|
|
|
|
}
|
2018-08-21 19:56:54 +00:00
|
|
|
timer.Reset(recommit)
|
2023-03-31 06:32:47 +00:00
|
|
|
w.newTxs.Store(0)
|
2018-08-21 19:56:54 +00:00
|
|
|
}
|
2018-08-23 13:02:57 +00:00
|
|
|
// clearPending cleans the stale pending tasks.
|
|
|
|
clearPending := func(number uint64) {
|
|
|
|
w.pendingMu.Lock()
|
|
|
|
for h, t := range w.pendingTasks {
|
|
|
|
if t.block.NumberU64()+staleThreshold <= number {
|
|
|
|
delete(w.pendingTasks, h)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
w.pendingMu.Unlock()
|
|
|
|
}
|
2018-08-16 11:14:33 +00:00
|
|
|
|
|
|
|
for {
|
|
|
|
select {
|
|
|
|
case <-w.startCh:
|
2023-03-02 06:29:15 +00:00
|
|
|
clearPending(w.chain.CurrentBlock().Number.Uint64())
|
2018-08-29 14:31:59 +00:00
|
|
|
timestamp = time.Now().Unix()
|
2018-08-21 19:56:54 +00:00
|
|
|
commit(false, commitInterruptNewHead)
|
2018-08-16 11:14:33 +00:00
|
|
|
|
2018-08-23 13:02:57 +00:00
|
|
|
case head := <-w.chainHeadCh:
|
|
|
|
clearPending(head.Block.NumberU64())
|
2018-08-29 14:31:59 +00:00
|
|
|
timestamp = time.Now().Unix()
|
2018-08-21 19:56:54 +00:00
|
|
|
commit(false, commitInterruptNewHead)
|
2018-08-16 11:14:33 +00:00
|
|
|
|
|
|
|
case <-timer.C:
|
2022-01-24 07:19:52 +00:00
|
|
|
// If sealing is running resubmit a new work cycle periodically to pull in
|
2018-08-16 11:14:33 +00:00
|
|
|
// higher priced transactions. Disable this overhead for pending blocks.
|
2019-04-23 07:08:51 +00:00
|
|
|
if w.isRunning() && (w.chainConfig.Clique == nil || w.chainConfig.Clique.Period > 0) {
|
2018-08-21 19:56:54 +00:00
|
|
|
// Short circuit if no new transaction arrives.
|
2023-03-31 06:32:47 +00:00
|
|
|
if w.newTxs.Load() == 0 {
|
2018-08-21 19:56:54 +00:00
|
|
|
timer.Reset(recommit)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
commit(true, commitInterruptResubmit)
|
|
|
|
}
|
|
|
|
|
|
|
|
case interval := <-w.resubmitIntervalCh:
|
|
|
|
// Adjust resubmit interval explicitly by user.
|
|
|
|
if interval < minRecommitInterval {
|
|
|
|
log.Warn("Sanitizing miner recommit interval", "provided", interval, "updated", minRecommitInterval)
|
|
|
|
interval = minRecommitInterval
|
|
|
|
}
|
|
|
|
log.Info("Miner recommit interval update", "from", minRecommit, "to", interval)
|
|
|
|
minRecommit, recommit = interval, interval
|
|
|
|
|
|
|
|
if w.resubmitHook != nil {
|
|
|
|
w.resubmitHook(minRecommit, recommit)
|
|
|
|
}
|
|
|
|
|
|
|
|
case adjust := <-w.resubmitAdjustCh:
|
|
|
|
// Adjust resubmit interval by feedback.
|
|
|
|
if adjust.inc {
|
|
|
|
before := recommit
|
2020-07-28 16:16:49 +00:00
|
|
|
target := float64(recommit.Nanoseconds()) / adjust.ratio
|
|
|
|
recommit = recalcRecommit(minRecommit, recommit, target, true)
|
2018-08-21 19:56:54 +00:00
|
|
|
log.Trace("Increase miner recommit interval", "from", before, "to", recommit)
|
|
|
|
} else {
|
|
|
|
before := recommit
|
2020-07-28 16:16:49 +00:00
|
|
|
recommit = recalcRecommit(minRecommit, recommit, float64(minRecommit.Nanoseconds()), false)
|
2018-08-21 19:56:54 +00:00
|
|
|
log.Trace("Decrease miner recommit interval", "from", before, "to", recommit)
|
|
|
|
}
|
|
|
|
|
|
|
|
if w.resubmitHook != nil {
|
|
|
|
w.resubmitHook(minRecommit, recommit)
|
2018-08-16 11:14:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
case <-w.exitCh:
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// mainLoop is responsible for generating and submitting sealing work based on
|
|
|
|
// the received event. It can support two modes: automatically generate task and
|
|
|
|
// submit it or return task according to given parameters for various proposes.
|
2018-08-14 15:34:33 +00:00
|
|
|
func (w *worker) mainLoop() {
|
2021-10-08 16:36:58 +00:00
|
|
|
defer w.wg.Done()
|
2018-08-14 15:34:33 +00:00
|
|
|
defer w.txsSub.Unsubscribe()
|
|
|
|
defer w.chainHeadSub.Unsubscribe()
|
|
|
|
defer w.chainSideSub.Unsubscribe()
|
2021-10-08 18:12:52 +00:00
|
|
|
defer func() {
|
2022-01-24 07:19:52 +00:00
|
|
|
if w.current != nil {
|
|
|
|
w.current.discard()
|
2021-10-08 18:12:52 +00:00
|
|
|
}
|
|
|
|
}()
|
2017-08-18 10:58:36 +00:00
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
cleanTicker := time.NewTicker(time.Second * 10)
|
|
|
|
defer cleanTicker.Stop()
|
|
|
|
|
2017-08-18 10:58:36 +00:00
|
|
|
for {
|
|
|
|
select {
|
2018-08-16 11:14:33 +00:00
|
|
|
case req := <-w.newWorkCh:
|
2022-01-24 07:19:52 +00:00
|
|
|
w.commitWork(req.interrupt, req.noempty, req.timestamp)
|
|
|
|
|
|
|
|
case req := <-w.getWorkCh:
|
2022-11-02 09:32:20 +00:00
|
|
|
block, fees, err := w.generateWork(req.params)
|
|
|
|
req.result <- &newPayloadResult{
|
|
|
|
err: err,
|
|
|
|
block: block,
|
|
|
|
fees: fees,
|
2022-01-24 07:19:52 +00:00
|
|
|
}
|
2018-08-14 15:34:33 +00:00
|
|
|
case ev := <-w.chainSideCh:
|
2018-09-20 21:11:55 +00:00
|
|
|
// Short circuit for duplicate side blocks
|
|
|
|
if _, exist := w.localUncles[ev.Block.Hash()]; exist {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if _, exist := w.remoteUncles[ev.Block.Hash()]; exist {
|
2018-08-15 11:09:17 +00:00
|
|
|
continue
|
|
|
|
}
|
2018-09-20 21:11:55 +00:00
|
|
|
// Add side block to possible uncle block set depending on the author.
|
all: core rework for the merge transition (#23761)
* all: work for eth1/2 transtition
* consensus/beacon, eth: change beacon difficulty to 0
* eth: updates
* all: add terminalBlockDifficulty config, fix rebasing issues
* eth: implemented merge interop spec
* internal/ethapi: update to v1.0.0.alpha.2
This commit updates the code to the new spec, moving payloadId into
it's own object. It also fixes an issue with finalizing an empty blockhash.
It also properly sets the basefee
* all: sync polishes, other fixes + refactors
* core, eth: correct semantics for LeavePoW, EnterPoS
* core: fixed rebasing artifacts
* core: light: performance improvements
* core: use keyed field (f)
* core: eth: fix compilation issues + tests
* eth/catalyst: dbetter error codes
* all: move Merger to consensus/, remove reliance on it in bc
* all: renamed EnterPoS and LeavePoW to ReachTDD and FinalizePoS
* core: make mergelogs a function
* core: use InsertChain instead of InsertBlock
* les: drop merger from lightchain object
* consensus: add merger
* core: recoverAncestors in catalyst mode
* core: fix nitpick
* all: removed merger from beacon, use TTD, nitpicks
* consensus: eth: add docstring, removed unnecessary code duplication
* consensus/beacon: better comment
* all: easy to fix nitpicks by karalabe
* consensus/beacon: verify known headers to be sure
* core: comments
* core: eth: don't drop peers who advertise blocks, nitpicks
* core: never add beacon blocks to the future queue
* core: fixed nitpicks
* consensus/beacon: simplify IsTTDReached check
* consensus/beacon: correct IsTTDReached check
Co-authored-by: rjl493456442 <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
2021-11-26 11:23:02 +00:00
|
|
|
if w.isLocalBlock != nil && w.isLocalBlock(ev.Block.Header()) {
|
2018-09-20 21:11:55 +00:00
|
|
|
w.localUncles[ev.Block.Hash()] = ev.Block
|
|
|
|
} else {
|
|
|
|
w.remoteUncles[ev.Block.Hash()] = ev.Block
|
|
|
|
}
|
2022-01-24 07:19:52 +00:00
|
|
|
// If our sealing block contains less than 2 uncle blocks,
|
|
|
|
// add the new uncle block if valid and regenerate a new
|
|
|
|
// sealing block for higher profit.
|
|
|
|
if w.isRunning() && w.current != nil && len(w.current.uncles) < 2 {
|
2018-08-15 11:09:17 +00:00
|
|
|
start := time.Now()
|
|
|
|
if err := w.commitUncle(w.current, ev.Block.Header()); err == nil {
|
2022-01-24 07:19:52 +00:00
|
|
|
w.commit(w.current.copy(), nil, true, start)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
case <-cleanTicker.C:
|
|
|
|
chainHead := w.chain.CurrentBlock()
|
|
|
|
for hash, uncle := range w.localUncles {
|
2023-03-02 06:29:15 +00:00
|
|
|
if uncle.NumberU64()+staleThreshold <= chainHead.Number.Uint64() {
|
2022-01-24 07:19:52 +00:00
|
|
|
delete(w.localUncles, hash)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for hash, uncle := range w.remoteUncles {
|
2023-03-02 06:29:15 +00:00
|
|
|
if uncle.NumberU64()+staleThreshold <= chainHead.Number.Uint64() {
|
2022-01-24 07:19:52 +00:00
|
|
|
delete(w.remoteUncles, hash)
|
2018-08-15 11:09:17 +00:00
|
|
|
}
|
|
|
|
}
|
2018-08-14 15:34:33 +00:00
|
|
|
|
|
|
|
case ev := <-w.txsCh:
|
2023-04-10 16:30:03 +00:00
|
|
|
if w.chainConfig.Optimism != nil && !w.config.RollupComputePendingBlock {
|
|
|
|
continue // don't update the pending-block snapshot if we are not computing the pending block
|
|
|
|
}
|
2022-01-24 07:19:52 +00:00
|
|
|
// Apply transactions to the pending state if we're not sealing
|
2018-05-10 07:04:45 +00:00
|
|
|
//
|
|
|
|
// Note all transactions received may not be continuous with transactions
|
2022-01-24 07:19:52 +00:00
|
|
|
// already included in the current sealing block. These transactions will
|
2018-05-10 07:04:45 +00:00
|
|
|
// be automatically eliminated.
|
2018-08-14 15:34:33 +00:00
|
|
|
if !w.isRunning() && w.current != nil {
|
2019-06-19 11:09:28 +00:00
|
|
|
// If block is already full, abort
|
|
|
|
if gp := w.current.gasPool; gp != nil && gp.Gas() < params.TxGas {
|
|
|
|
continue
|
|
|
|
}
|
2018-05-10 07:04:45 +00:00
|
|
|
txs := make(map[common.Address]types.Transactions)
|
|
|
|
for _, tx := range ev.Txs {
|
2018-08-14 15:34:33 +00:00
|
|
|
acc, _ := types.Sender(w.current.signer, tx)
|
2018-05-10 07:04:45 +00:00
|
|
|
txs[acc] = append(txs[acc], tx)
|
|
|
|
}
|
2021-05-21 07:59:26 +00:00
|
|
|
txset := types.NewTransactionsByPriceAndNonce(w.current.signer, txs, w.current.header.BaseFee)
|
2019-06-19 11:09:28 +00:00
|
|
|
tcount := w.current.tcount
|
2022-01-24 07:19:52 +00:00
|
|
|
w.commitTransactions(w.current, txset, nil)
|
|
|
|
|
|
|
|
// Only update the snapshot if any new transactions were added
|
2019-06-19 11:09:28 +00:00
|
|
|
// to the pending block
|
|
|
|
if tcount != w.current.tcount {
|
2022-01-24 07:19:52 +00:00
|
|
|
w.updateSnapshot(w.current)
|
2019-06-19 11:09:28 +00:00
|
|
|
}
|
2017-10-24 10:40:42 +00:00
|
|
|
} else {
|
2020-05-12 10:11:34 +00:00
|
|
|
// Special case, if the consensus engine is 0 period clique(dev mode),
|
2022-01-24 07:19:52 +00:00
|
|
|
// submit sealing work here since all empty submission will be rejected
|
2020-05-12 10:11:34 +00:00
|
|
|
// by clique. Of course the advance sealing(empty submission) is disabled.
|
2019-04-23 07:08:51 +00:00
|
|
|
if w.chainConfig.Clique != nil && w.chainConfig.Clique.Period == 0 {
|
2022-01-24 07:19:52 +00:00
|
|
|
w.commitWork(nil, true, time.Now().Unix())
|
2017-10-24 10:40:42 +00:00
|
|
|
}
|
2015-02-04 13:52:59 +00:00
|
|
|
}
|
2023-03-31 06:32:47 +00:00
|
|
|
w.newTxs.Add(int32(len(ev.Txs)))
|
2017-08-18 10:58:36 +00:00
|
|
|
|
|
|
|
// System stopped
|
2018-08-14 15:34:33 +00:00
|
|
|
case <-w.exitCh:
|
2017-08-18 10:58:36 +00:00
|
|
|
return
|
2018-08-14 15:34:33 +00:00
|
|
|
case <-w.txsSub.Err():
|
2017-08-18 10:58:36 +00:00
|
|
|
return
|
2018-08-14 15:34:33 +00:00
|
|
|
case <-w.chainHeadSub.Err():
|
|
|
|
return
|
|
|
|
case <-w.chainSideSub.Err():
|
2017-08-18 10:58:36 +00:00
|
|
|
return
|
2015-02-04 13:52:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// taskLoop is a standalone goroutine to fetch sealing task from the generator and
|
|
|
|
// push them to consensus engine.
|
|
|
|
func (w *worker) taskLoop() {
|
2021-10-08 16:36:58 +00:00
|
|
|
defer w.wg.Done()
|
2018-08-21 19:56:54 +00:00
|
|
|
var (
|
|
|
|
stopCh chan struct{}
|
|
|
|
prev common.Hash
|
|
|
|
)
|
2018-08-14 15:34:33 +00:00
|
|
|
|
|
|
|
// interrupt aborts the in-flight sealing task.
|
|
|
|
interrupt := func() {
|
|
|
|
if stopCh != nil {
|
|
|
|
close(stopCh)
|
|
|
|
stopCh = nil
|
|
|
|
}
|
|
|
|
}
|
2015-02-09 15:20:34 +00:00
|
|
|
for {
|
2018-08-14 15:34:33 +00:00
|
|
|
select {
|
|
|
|
case task := <-w.taskCh:
|
|
|
|
if w.newTaskHook != nil {
|
|
|
|
w.newTaskHook(task)
|
|
|
|
}
|
2018-08-21 19:56:54 +00:00
|
|
|
// Reject duplicate sealing work due to resubmitting.
|
2018-08-23 13:02:57 +00:00
|
|
|
sealHash := w.engine.SealHash(task.block.Header())
|
|
|
|
if sealHash == prev {
|
2018-08-21 19:56:54 +00:00
|
|
|
continue
|
|
|
|
}
|
2018-08-28 13:59:05 +00:00
|
|
|
// Interrupt previous sealing operation
|
2018-08-14 15:34:33 +00:00
|
|
|
interrupt()
|
2018-08-28 13:59:05 +00:00
|
|
|
stopCh, prev = make(chan struct{}), sealHash
|
|
|
|
|
|
|
|
if w.skipSealHook != nil && w.skipSealHook(task) {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
w.pendingMu.Lock()
|
2020-07-28 16:16:49 +00:00
|
|
|
w.pendingTasks[sealHash] = task
|
2018-08-28 13:59:05 +00:00
|
|
|
w.pendingMu.Unlock()
|
|
|
|
|
|
|
|
if err := w.engine.Seal(w.chain, task.block, w.resultCh, stopCh); err != nil {
|
|
|
|
log.Warn("Block sealing failed", "err", err)
|
2021-11-05 15:17:13 +00:00
|
|
|
w.pendingMu.Lock()
|
|
|
|
delete(w.pendingTasks, sealHash)
|
|
|
|
w.pendingMu.Unlock()
|
2018-08-28 13:59:05 +00:00
|
|
|
}
|
2018-08-14 15:34:33 +00:00
|
|
|
case <-w.exitCh:
|
|
|
|
interrupt()
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-03-26 16:45:03 +00:00
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// resultLoop is a standalone goroutine to handle sealing result submitting
|
|
|
|
// and flush relative data to the database.
|
|
|
|
func (w *worker) resultLoop() {
|
2021-10-08 16:36:58 +00:00
|
|
|
defer w.wg.Done()
|
2018-08-14 15:34:33 +00:00
|
|
|
for {
|
|
|
|
select {
|
2018-08-28 13:59:05 +00:00
|
|
|
case block := <-w.resultCh:
|
2018-08-21 19:56:54 +00:00
|
|
|
// Short circuit when receiving empty result.
|
2018-08-28 13:59:05 +00:00
|
|
|
if block == nil {
|
2015-03-26 16:45:03 +00:00
|
|
|
continue
|
|
|
|
}
|
2018-08-21 19:56:54 +00:00
|
|
|
// Short circuit when receiving duplicate result caused by resubmitting.
|
|
|
|
if w.chain.HasBlock(block.Hash(), block.NumberU64()) {
|
|
|
|
continue
|
|
|
|
}
|
2018-08-28 13:59:05 +00:00
|
|
|
var (
|
|
|
|
sealhash = w.engine.SealHash(block.Header())
|
|
|
|
hash = block.Hash()
|
|
|
|
)
|
|
|
|
w.pendingMu.RLock()
|
|
|
|
task, exist := w.pendingTasks[sealhash]
|
|
|
|
w.pendingMu.RUnlock()
|
|
|
|
if !exist {
|
|
|
|
log.Error("Block found but no relative pending task", "number", block.Number(), "sealhash", sealhash, "hash", hash)
|
|
|
|
continue
|
2015-07-03 09:24:42 +00:00
|
|
|
}
|
2018-08-28 13:59:05 +00:00
|
|
|
// Different block could share same sealhash, deep copy here to prevent write-write conflict.
|
|
|
|
var (
|
|
|
|
receipts = make([]*types.Receipt, len(task.receipts))
|
|
|
|
logs []*types.Log
|
|
|
|
)
|
2021-11-01 06:50:29 +00:00
|
|
|
for i, taskReceipt := range task.receipts {
|
|
|
|
receipt := new(types.Receipt)
|
|
|
|
receipts[i] = receipt
|
|
|
|
*receipt = *taskReceipt
|
|
|
|
|
2019-03-27 12:39:25 +00:00
|
|
|
// add block location fields
|
|
|
|
receipt.BlockHash = hash
|
|
|
|
receipt.BlockNumber = block.Number()
|
|
|
|
receipt.TransactionIndex = uint(i)
|
|
|
|
|
2018-08-28 13:59:05 +00:00
|
|
|
// Update the block hash in all logs since it is now available and not when the
|
|
|
|
// receipt/log of individual transactions were created.
|
2021-11-01 06:50:29 +00:00
|
|
|
receipt.Logs = make([]*types.Log, len(taskReceipt.Logs))
|
|
|
|
for i, taskLog := range taskReceipt.Logs {
|
|
|
|
log := new(types.Log)
|
|
|
|
receipt.Logs[i] = log
|
|
|
|
*log = *taskLog
|
2018-08-28 13:59:05 +00:00
|
|
|
log.BlockHash = hash
|
|
|
|
}
|
|
|
|
logs = append(logs, receipt.Logs...)
|
2017-09-11 10:13:05 +00:00
|
|
|
}
|
2018-08-14 15:34:33 +00:00
|
|
|
// Commit block and state to database.
|
all: core rework for the merge transition (#23761)
* all: work for eth1/2 transtition
* consensus/beacon, eth: change beacon difficulty to 0
* eth: updates
* all: add terminalBlockDifficulty config, fix rebasing issues
* eth: implemented merge interop spec
* internal/ethapi: update to v1.0.0.alpha.2
This commit updates the code to the new spec, moving payloadId into
it's own object. It also fixes an issue with finalizing an empty blockhash.
It also properly sets the basefee
* all: sync polishes, other fixes + refactors
* core, eth: correct semantics for LeavePoW, EnterPoS
* core: fixed rebasing artifacts
* core: light: performance improvements
* core: use keyed field (f)
* core: eth: fix compilation issues + tests
* eth/catalyst: dbetter error codes
* all: move Merger to consensus/, remove reliance on it in bc
* all: renamed EnterPoS and LeavePoW to ReachTDD and FinalizePoS
* core: make mergelogs a function
* core: use InsertChain instead of InsertBlock
* les: drop merger from lightchain object
* consensus: add merger
* core: recoverAncestors in catalyst mode
* core: fix nitpick
* all: removed merger from beacon, use TTD, nitpicks
* consensus: eth: add docstring, removed unnecessary code duplication
* consensus/beacon: better comment
* all: easy to fix nitpicks by karalabe
* consensus/beacon: verify known headers to be sure
* core: comments
* core: eth: don't drop peers who advertise blocks, nitpicks
* core: never add beacon blocks to the future queue
* core: fixed nitpicks
* consensus/beacon: simplify IsTTDReached check
* consensus/beacon: correct IsTTDReached check
Co-authored-by: rjl493456442 <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
2021-11-26 11:23:02 +00:00
|
|
|
_, err := w.chain.WriteBlockAndSetHead(block, receipts, logs, task.state, true)
|
2017-09-11 10:13:05 +00:00
|
|
|
if err != nil {
|
|
|
|
log.Error("Failed writing block to chain", "err", err)
|
|
|
|
continue
|
|
|
|
}
|
2018-08-28 13:59:05 +00:00
|
|
|
log.Info("Successfully sealed new block", "number", block.Number(), "sealhash", sealhash, "hash", hash,
|
|
|
|
"elapsed", common.PrettyDuration(time.Since(task.createdAt)))
|
|
|
|
|
2017-09-11 10:13:05 +00:00
|
|
|
// Broadcast the block and announce chain insertion event
|
2018-08-14 15:34:33 +00:00
|
|
|
w.mux.Post(core.NewMinedBlockEvent{Block: block})
|
2018-08-28 13:59:05 +00:00
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// Insert the block into the set of pending ones to resultLoop for confirmations
|
|
|
|
w.unconfirmed.Insert(block.NumberU64(), block.Hash())
|
2015-02-09 15:20:34 +00:00
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
case <-w.exitCh:
|
|
|
|
return
|
|
|
|
}
|
2015-02-04 13:52:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// makeEnv creates a new environment for the sealing block.
|
2023-03-02 06:29:15 +00:00
|
|
|
func (w *worker) makeEnv(parent *types.Header, header *types.Header, coinbase common.Address) (*environment, error) {
|
2021-01-08 13:01:49 +00:00
|
|
|
// Retrieve the parent state to execute on top and start a prefetcher for
|
2022-01-24 07:19:52 +00:00
|
|
|
// the miner to speed block sealing up a bit.
|
2023-03-02 06:29:15 +00:00
|
|
|
state, err := w.chain.StateAt(parent.Root)
|
optimism: historical Bedrock geth rollup changes
This commit squashes the op-geth fork history into a more maintainable
diff for rebasing upon upstream geth.
reference-optimistic-geth changes (origins of op-geth in early Bedrock
development stage):
- Deposit TX Type
- Enable deposit tx in EVM/tx pool
- Change deposit nonce to not be the max nonce
- Extend PayloadAttributesV1 with a Transactions field
- Force deposits at the start of each L2 block
- Fix height check
- noTxPool flag, reproduce block in verifier mode without tx pool interference
- Fix RPC json marshalling (ref op-geth PR 4)
- Deposit txs block height check in block body validation (ref op-geth PR 5)
- core: do not try to reinject deposit txs into tx-pool (ref-op-geth PR 6)
- deposit source hash field instead of L2 block height and tx index combination
- Include invalid deposits, rewind state, but always persist mint (#10)
- Provide gas to Call/Create in deposit transactions (#12)
- Add docker builds (ref-op-geth PR 16, 17)
- Don't panic on deposit transaction signature values or chain ID (ref-op-geth PR 18)
- core: Add version to DepositTx (ref-op-geth PR 19)
- Enable Geth build/lint/test in CircleCI (ref-op-geth PR 23)
- core: Include guaranteed gas in the gas pool (ref-op-geth PR 21)
- core: handle base fee, l1 availability fee, tx fee (ref-op-geth PR 27)
- fix: deposit tx hash
- fix l1 fee cache, rpc, tracing and tx pool
- core: remove deposit-tx sub-type (a.k.a. deposit version byte)
- eth/catalyst: allow engine user to reorg own chain
- miner: restore ability to reorg deep as block builder
- params: print Optimism consensus type in banner
- core/types: remove unused protected() method, see upstream PR 23376
- core: do not mutate original balance value in tx pool l1 cost adjustment
- core: subtract deposit gas from pool, so other txs do not use the same gas. And fail tx processing if deposits reach gas limit
- core/types: deposits do not tip, avoid basefee subtraction
- Unmeter the L1 Attributes Transaction
- miner: handle force tx errors as critical, clean up diff
- ci: Switch branch
- eth,miner: return STATUS_INVALID when failing to process forced transactions in request (ref-op-geth PR 40)
- verifier: forward tx to sequencer based on flag
- txpool: add flag to disable tx gossip (ref-op-geth PR 42)
- Add op-geth version in addition to geth version (ref-op-geth PR 43)
- ci: CircleCI improvements (ref-op-geth PR 44)
- Rename to op-geth
- Build latest tag on optimism branch
op-geth changes:
- Expose cache config in simulated backend (#2)
- Add EIP-1559 parameters
- eth/catalyst: update payload id computation (#1)
- make eip1559 configurable (#4)
- post-merge network should not log warnings about missing transition information (#5)
- Make the simulator more configurable (#6)
- fix OPB-6 - IsDepositTx check instead of artificial nonce value check (#7)
- Simulated backend - enable proof of stake consensus type and fix performance issue (#8)
- accounts: simulated backend consensus engine option and immediate tx indexing
- consensus/beacon: recognize all blocks as reached TTD with 0 TTD in chain config
- Add --rollup.historicalhttp CLI flag and fix backend iface
- Flags and interfaces for historical RPC requests (#12)
- Redirect historical RPC requests (#13)
- Use the pre-existing ethereum.NotFound error (#18)
- Add historical endpoint to TraceBlockByNumber and TraceBlockByHash (#19)
- Add historical endpoint to TraceTransaction (#20)
- Add historical endpoint to TraceCall (#21)
- optimism: fee params from info txi, update l1 cost func GPO params read (#15)
- add hardcoded addresses for fee payouts (#23)
- dynamic gas limit via engine API (#22)
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: Joshua Gutow <jgutow@oplabs.co>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: Maurelian <maurelian@protonmail.ch>
2022-03-10 20:13:11 +00:00
|
|
|
if err != nil && w.chainConfig.Optimism != nil { // Allow the miner to reorg its own chain arbitrarily deep
|
|
|
|
if historicalBackend, ok := w.eth.(BackendWithHistoricalState); ok {
|
|
|
|
var release tracers.StateReleaseFunc
|
2023-03-17 01:24:50 +00:00
|
|
|
parentBlock := w.eth.BlockChain().GetBlockByHash(parent.Hash())
|
|
|
|
state, release, err = historicalBackend.StateAtBlock(context.Background(), parentBlock, ^uint64(0), nil, false, false)
|
optimism: historical Bedrock geth rollup changes
This commit squashes the op-geth fork history into a more maintainable
diff for rebasing upon upstream geth.
reference-optimistic-geth changes (origins of op-geth in early Bedrock
development stage):
- Deposit TX Type
- Enable deposit tx in EVM/tx pool
- Change deposit nonce to not be the max nonce
- Extend PayloadAttributesV1 with a Transactions field
- Force deposits at the start of each L2 block
- Fix height check
- noTxPool flag, reproduce block in verifier mode without tx pool interference
- Fix RPC json marshalling (ref op-geth PR 4)
- Deposit txs block height check in block body validation (ref op-geth PR 5)
- core: do not try to reinject deposit txs into tx-pool (ref-op-geth PR 6)
- deposit source hash field instead of L2 block height and tx index combination
- Include invalid deposits, rewind state, but always persist mint (#10)
- Provide gas to Call/Create in deposit transactions (#12)
- Add docker builds (ref-op-geth PR 16, 17)
- Don't panic on deposit transaction signature values or chain ID (ref-op-geth PR 18)
- core: Add version to DepositTx (ref-op-geth PR 19)
- Enable Geth build/lint/test in CircleCI (ref-op-geth PR 23)
- core: Include guaranteed gas in the gas pool (ref-op-geth PR 21)
- core: handle base fee, l1 availability fee, tx fee (ref-op-geth PR 27)
- fix: deposit tx hash
- fix l1 fee cache, rpc, tracing and tx pool
- core: remove deposit-tx sub-type (a.k.a. deposit version byte)
- eth/catalyst: allow engine user to reorg own chain
- miner: restore ability to reorg deep as block builder
- params: print Optimism consensus type in banner
- core/types: remove unused protected() method, see upstream PR 23376
- core: do not mutate original balance value in tx pool l1 cost adjustment
- core: subtract deposit gas from pool, so other txs do not use the same gas. And fail tx processing if deposits reach gas limit
- core/types: deposits do not tip, avoid basefee subtraction
- Unmeter the L1 Attributes Transaction
- miner: handle force tx errors as critical, clean up diff
- ci: Switch branch
- eth,miner: return STATUS_INVALID when failing to process forced transactions in request (ref-op-geth PR 40)
- verifier: forward tx to sequencer based on flag
- txpool: add flag to disable tx gossip (ref-op-geth PR 42)
- Add op-geth version in addition to geth version (ref-op-geth PR 43)
- ci: CircleCI improvements (ref-op-geth PR 44)
- Rename to op-geth
- Build latest tag on optimism branch
op-geth changes:
- Expose cache config in simulated backend (#2)
- Add EIP-1559 parameters
- eth/catalyst: update payload id computation (#1)
- make eip1559 configurable (#4)
- post-merge network should not log warnings about missing transition information (#5)
- Make the simulator more configurable (#6)
- fix OPB-6 - IsDepositTx check instead of artificial nonce value check (#7)
- Simulated backend - enable proof of stake consensus type and fix performance issue (#8)
- accounts: simulated backend consensus engine option and immediate tx indexing
- consensus/beacon: recognize all blocks as reached TTD with 0 TTD in chain config
- Add --rollup.historicalhttp CLI flag and fix backend iface
- Flags and interfaces for historical RPC requests (#12)
- Redirect historical RPC requests (#13)
- Use the pre-existing ethereum.NotFound error (#18)
- Add historical endpoint to TraceBlockByNumber and TraceBlockByHash (#19)
- Add historical endpoint to TraceTransaction (#20)
- Add historical endpoint to TraceCall (#21)
- optimism: fee params from info txi, update l1 cost func GPO params read (#15)
- add hardcoded addresses for fee payouts (#23)
- dynamic gas limit via engine API (#22)
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: Joshua Gutow <jgutow@oplabs.co>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: Maurelian <maurelian@protonmail.ch>
2022-03-10 20:13:11 +00:00
|
|
|
state = state.Copy()
|
|
|
|
release()
|
|
|
|
}
|
|
|
|
}
|
2022-01-24 07:19:52 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
2015-10-06 14:35:55 +00:00
|
|
|
}
|
2021-01-08 13:01:49 +00:00
|
|
|
state.StartPrefetcher("miner")
|
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// Note the passed coinbase may be different with header.Coinbase.
|
2018-08-16 11:14:33 +00:00
|
|
|
env := &environment{
|
2021-02-25 14:26:57 +00:00
|
|
|
signer: types.MakeSigner(w.chainConfig, header.Number),
|
2015-06-16 10:41:50 +00:00
|
|
|
state: state,
|
2022-01-24 07:19:52 +00:00
|
|
|
coinbase: coinbase,
|
2022-11-14 14:16:52 +00:00
|
|
|
ancestors: mapset.NewSet[common.Hash](),
|
|
|
|
family: mapset.NewSet[common.Hash](),
|
2015-06-16 10:41:50 +00:00
|
|
|
header: header,
|
2022-01-24 07:19:52 +00:00
|
|
|
uncles: make(map[common.Hash]*types.Header),
|
2015-04-04 11:27:17 +00:00
|
|
|
}
|
2015-05-18 14:31:26 +00:00
|
|
|
// when 08 is processed ancestors contain 07 (quick block)
|
2018-08-14 15:34:33 +00:00
|
|
|
for _, ancestor := range w.chain.GetBlocksFromHash(parent.Hash(), 7) {
|
2015-05-14 00:46:23 +00:00
|
|
|
for _, uncle := range ancestor.Uncles() {
|
2018-08-06 09:55:44 +00:00
|
|
|
env.family.Add(uncle.Hash())
|
2015-05-14 00:46:23 +00:00
|
|
|
}
|
2018-08-06 09:55:44 +00:00
|
|
|
env.family.Add(ancestor.Hash())
|
|
|
|
env.ancestors.Add(ancestor.Hash())
|
2015-03-23 11:12:49 +00:00
|
|
|
}
|
2015-05-10 23:28:15 +00:00
|
|
|
// Keep track of transactions which return errors so they can be removed
|
2018-08-06 09:55:44 +00:00
|
|
|
env.tcount = 0
|
2022-01-24 07:19:52 +00:00
|
|
|
return env, nil
|
2015-04-07 10:32:55 +00:00
|
|
|
}
|
|
|
|
|
2018-08-14 15:34:33 +00:00
|
|
|
// commitUncle adds the given block to uncle block set, returns error if failed to add.
|
2018-08-16 11:14:33 +00:00
|
|
|
func (w *worker) commitUncle(env *environment, uncle *types.Header) error {
|
2022-01-24 07:19:52 +00:00
|
|
|
if w.isTTDReached(env.header) {
|
|
|
|
return errors.New("ignore uncle for beacon block")
|
|
|
|
}
|
2018-08-14 15:34:33 +00:00
|
|
|
hash := uncle.Hash()
|
2022-01-24 07:19:52 +00:00
|
|
|
if _, exist := env.uncles[hash]; exist {
|
2018-08-28 13:48:20 +00:00
|
|
|
return errors.New("uncle not unique")
|
|
|
|
}
|
|
|
|
if env.header.ParentHash == uncle.ParentHash {
|
|
|
|
return errors.New("uncle is sibling")
|
2018-08-14 15:34:33 +00:00
|
|
|
}
|
|
|
|
if !env.ancestors.Contains(uncle.ParentHash) {
|
2018-08-28 13:48:20 +00:00
|
|
|
return errors.New("uncle's parent unknown")
|
2018-08-14 15:34:33 +00:00
|
|
|
}
|
|
|
|
if env.family.Contains(hash) {
|
2018-08-28 13:48:20 +00:00
|
|
|
return errors.New("uncle already included")
|
2018-08-14 15:34:33 +00:00
|
|
|
}
|
2022-01-24 07:19:52 +00:00
|
|
|
env.uncles[hash] = uncle
|
2018-08-14 15:34:33 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// updateSnapshot updates pending snapshot block, receipts and state.
|
|
|
|
func (w *worker) updateSnapshot(env *environment) {
|
2018-08-14 15:34:33 +00:00
|
|
|
w.snapshotMu.Lock()
|
|
|
|
defer w.snapshotMu.Unlock()
|
|
|
|
|
|
|
|
w.snapshotBlock = types.NewBlock(
|
2022-01-24 07:19:52 +00:00
|
|
|
env.header,
|
|
|
|
env.txs,
|
|
|
|
env.unclelist(),
|
|
|
|
env.receipts,
|
2021-02-02 12:09:23 +00:00
|
|
|
trie.NewStackTrie(nil),
|
2018-08-14 15:34:33 +00:00
|
|
|
)
|
2022-01-24 07:19:52 +00:00
|
|
|
w.snapshotReceipts = copyReceipts(env.receipts)
|
|
|
|
w.snapshotState = env.state.Copy()
|
2018-08-14 15:34:33 +00:00
|
|
|
}
|
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
func (w *worker) commitTransaction(env *environment, tx *types.Transaction) ([]*types.Log, error) {
|
2023-03-07 10:23:52 +00:00
|
|
|
var (
|
|
|
|
snap = env.state.Snapshot()
|
|
|
|
gp = env.gasPool.Gas()
|
|
|
|
)
|
2022-01-24 07:19:52 +00:00
|
|
|
receipt, err := core.ApplyTransaction(w.chainConfig, w.chain, &env.coinbase, env.gasPool, env.state, env.header, tx, &env.header.GasUsed, *w.chain.GetVMConfig())
|
2018-08-16 11:14:33 +00:00
|
|
|
if err != nil {
|
2022-01-24 07:19:52 +00:00
|
|
|
env.state.RevertToSnapshot(snap)
|
2023-03-07 10:23:52 +00:00
|
|
|
env.gasPool.SetGas(gp)
|
2018-08-16 11:14:33 +00:00
|
|
|
return nil, err
|
|
|
|
}
|
2022-01-24 07:19:52 +00:00
|
|
|
env.txs = append(env.txs, tx)
|
|
|
|
env.receipts = append(env.receipts, receipt)
|
2018-08-16 11:14:33 +00:00
|
|
|
|
|
|
|
return receipt.Logs, nil
|
|
|
|
}
|
|
|
|
|
2023-03-31 06:32:47 +00:00
|
|
|
func (w *worker) commitTransactions(env *environment, txs *types.TransactionsByPriceAndNonce, interrupt *atomic.Int32) error {
|
2022-01-24 07:19:52 +00:00
|
|
|
gasLimit := env.header.GasLimit
|
|
|
|
if env.gasPool == nil {
|
|
|
|
env.gasPool = new(core.GasPool).AddGas(gasLimit)
|
2018-08-16 11:14:33 +00:00
|
|
|
}
|
|
|
|
var coalescedLogs []*types.Log
|
|
|
|
|
|
|
|
for {
|
2022-10-03 12:10:00 +00:00
|
|
|
// Check interruption signal and abort building if it's fired.
|
|
|
|
if interrupt != nil {
|
2023-03-31 06:32:47 +00:00
|
|
|
if signal := interrupt.Load(); signal != commitInterruptNone {
|
2022-10-03 12:10:00 +00:00
|
|
|
return signalToErr(signal)
|
2018-08-21 19:56:54 +00:00
|
|
|
}
|
2018-08-16 11:14:33 +00:00
|
|
|
}
|
2022-10-03 12:10:00 +00:00
|
|
|
// If we don't have enough gas for any further transactions then we're done.
|
2022-01-24 07:19:52 +00:00
|
|
|
if env.gasPool.Gas() < params.TxGas {
|
|
|
|
log.Trace("Not enough gas for further transactions", "have", env.gasPool, "want", params.TxGas)
|
2018-08-16 11:14:33 +00:00
|
|
|
break
|
|
|
|
}
|
2022-10-03 12:10:00 +00:00
|
|
|
// Retrieve the next transaction and abort if all done.
|
2018-08-16 11:14:33 +00:00
|
|
|
tx := txs.Peek()
|
|
|
|
if tx == nil {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
// Error may be ignored here. The error has already been checked
|
|
|
|
// during transaction acceptance is the transaction pool.
|
2022-01-24 07:19:52 +00:00
|
|
|
from, _ := types.Sender(env.signer, tx)
|
2022-10-03 12:10:00 +00:00
|
|
|
|
2018-08-16 11:14:33 +00:00
|
|
|
// Check whether the tx is replay protected. If we're not in the EIP155 hf
|
|
|
|
// phase, start ignoring the sender until we do.
|
2022-01-24 07:19:52 +00:00
|
|
|
if tx.Protected() && !w.chainConfig.IsEIP155(env.header.Number) {
|
2019-04-23 07:08:51 +00:00
|
|
|
log.Trace("Ignoring reply protected transaction", "hash", tx.Hash(), "eip155", w.chainConfig.EIP155Block)
|
2018-08-16 11:14:33 +00:00
|
|
|
|
|
|
|
txs.Pop()
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
// Start executing the transaction
|
2022-11-16 09:18:52 +00:00
|
|
|
env.state.SetTxContext(tx.Hash(), env.tcount)
|
2018-08-16 11:14:33 +00:00
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
logs, err := w.commitTransaction(env, tx)
|
2020-12-04 11:22:19 +00:00
|
|
|
switch {
|
|
|
|
case errors.Is(err, core.ErrNonceTooLow):
|
2018-08-16 11:14:33 +00:00
|
|
|
// New head notification data race between the transaction pool and miner, shift
|
|
|
|
log.Trace("Skipping transaction with low nonce", "sender", from, "nonce", tx.Nonce())
|
|
|
|
txs.Shift()
|
|
|
|
|
2020-12-04 11:22:19 +00:00
|
|
|
case errors.Is(err, nil):
|
2018-08-16 11:14:33 +00:00
|
|
|
// Everything ok, collect the logs and shift in the next transaction from the same account
|
|
|
|
coalescedLogs = append(coalescedLogs, logs...)
|
2022-01-24 07:19:52 +00:00
|
|
|
env.tcount++
|
2018-08-16 11:14:33 +00:00
|
|
|
txs.Shift()
|
|
|
|
|
|
|
|
default:
|
2023-04-05 11:09:25 +00:00
|
|
|
// Transaction is regarded as invalid, drop all consecutive transactions from
|
|
|
|
// the same sender because of `nonce-too-high` clause.
|
2018-08-16 11:14:33 +00:00
|
|
|
log.Debug("Transaction failed, account skipped", "hash", tx.Hash(), "err", err)
|
2023-04-05 11:09:25 +00:00
|
|
|
txs.Pop()
|
2018-08-16 11:14:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if !w.isRunning() && len(coalescedLogs) > 0 {
|
2022-01-24 07:19:52 +00:00
|
|
|
// We don't push the pendingLogsEvent while we are sealing. The reason is that
|
|
|
|
// when we are sealing, the worker will regenerate a sealing block every 3 seconds.
|
2018-08-16 11:14:33 +00:00
|
|
|
// In order to avoid pushing the repeated pendingLog, we disable the pending log pushing.
|
|
|
|
|
|
|
|
// make a copy, the state caches the logs and these logs get "upgraded" from pending to mined
|
|
|
|
// logs by filling in the block hash when the block was mined by the local miner. This can
|
|
|
|
// cause a race condition if a log was "upgraded" before the PendingLogsEvent is processed.
|
|
|
|
cpy := make([]*types.Log, len(coalescedLogs))
|
|
|
|
for i, l := range coalescedLogs {
|
|
|
|
cpy[i] = new(types.Log)
|
|
|
|
*cpy[i] = *l
|
|
|
|
}
|
2019-12-10 11:39:14 +00:00
|
|
|
w.pendingLogsFeed.Send(cpy)
|
2018-08-16 11:14:33 +00:00
|
|
|
}
|
2022-05-06 09:19:30 +00:00
|
|
|
return nil
|
2018-08-16 11:14:33 +00:00
|
|
|
}
|
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// generateParams wraps various of settings for generating sealing task.
|
|
|
|
type generateParams struct {
|
2023-01-25 14:32:25 +00:00
|
|
|
timestamp uint64 // The timstamp for sealing task
|
|
|
|
forceTime bool // Flag whether the given timestamp is immutable or not
|
|
|
|
parentHash common.Hash // Parent block hash, empty means the latest chain head
|
|
|
|
coinbase common.Address // The fee recipient address for including transaction
|
|
|
|
random common.Hash // The randomness generated by beacon chain, empty before the merge
|
|
|
|
withdrawals types.Withdrawals // List of withdrawals to include in block.
|
|
|
|
noUncle bool // Flag whether the uncle block inclusion is allowed
|
|
|
|
noTxs bool // Flag whether an empty block without any transaction is expected
|
optimism: historical Bedrock geth rollup changes
This commit squashes the op-geth fork history into a more maintainable
diff for rebasing upon upstream geth.
reference-optimistic-geth changes (origins of op-geth in early Bedrock
development stage):
- Deposit TX Type
- Enable deposit tx in EVM/tx pool
- Change deposit nonce to not be the max nonce
- Extend PayloadAttributesV1 with a Transactions field
- Force deposits at the start of each L2 block
- Fix height check
- noTxPool flag, reproduce block in verifier mode without tx pool interference
- Fix RPC json marshalling (ref op-geth PR 4)
- Deposit txs block height check in block body validation (ref op-geth PR 5)
- core: do not try to reinject deposit txs into tx-pool (ref-op-geth PR 6)
- deposit source hash field instead of L2 block height and tx index combination
- Include invalid deposits, rewind state, but always persist mint (#10)
- Provide gas to Call/Create in deposit transactions (#12)
- Add docker builds (ref-op-geth PR 16, 17)
- Don't panic on deposit transaction signature values or chain ID (ref-op-geth PR 18)
- core: Add version to DepositTx (ref-op-geth PR 19)
- Enable Geth build/lint/test in CircleCI (ref-op-geth PR 23)
- core: Include guaranteed gas in the gas pool (ref-op-geth PR 21)
- core: handle base fee, l1 availability fee, tx fee (ref-op-geth PR 27)
- fix: deposit tx hash
- fix l1 fee cache, rpc, tracing and tx pool
- core: remove deposit-tx sub-type (a.k.a. deposit version byte)
- eth/catalyst: allow engine user to reorg own chain
- miner: restore ability to reorg deep as block builder
- params: print Optimism consensus type in banner
- core/types: remove unused protected() method, see upstream PR 23376
- core: do not mutate original balance value in tx pool l1 cost adjustment
- core: subtract deposit gas from pool, so other txs do not use the same gas. And fail tx processing if deposits reach gas limit
- core/types: deposits do not tip, avoid basefee subtraction
- Unmeter the L1 Attributes Transaction
- miner: handle force tx errors as critical, clean up diff
- ci: Switch branch
- eth,miner: return STATUS_INVALID when failing to process forced transactions in request (ref-op-geth PR 40)
- verifier: forward tx to sequencer based on flag
- txpool: add flag to disable tx gossip (ref-op-geth PR 42)
- Add op-geth version in addition to geth version (ref-op-geth PR 43)
- ci: CircleCI improvements (ref-op-geth PR 44)
- Rename to op-geth
- Build latest tag on optimism branch
op-geth changes:
- Expose cache config in simulated backend (#2)
- Add EIP-1559 parameters
- eth/catalyst: update payload id computation (#1)
- make eip1559 configurable (#4)
- post-merge network should not log warnings about missing transition information (#5)
- Make the simulator more configurable (#6)
- fix OPB-6 - IsDepositTx check instead of artificial nonce value check (#7)
- Simulated backend - enable proof of stake consensus type and fix performance issue (#8)
- accounts: simulated backend consensus engine option and immediate tx indexing
- consensus/beacon: recognize all blocks as reached TTD with 0 TTD in chain config
- Add --rollup.historicalhttp CLI flag and fix backend iface
- Flags and interfaces for historical RPC requests (#12)
- Redirect historical RPC requests (#13)
- Use the pre-existing ethereum.NotFound error (#18)
- Add historical endpoint to TraceBlockByNumber and TraceBlockByHash (#19)
- Add historical endpoint to TraceTransaction (#20)
- Add historical endpoint to TraceCall (#21)
- optimism: fee params from info txi, update l1 cost func GPO params read (#15)
- add hardcoded addresses for fee payouts (#23)
- dynamic gas limit via engine API (#22)
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: Joshua Gutow <jgutow@oplabs.co>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: Maurelian <maurelian@protonmail.ch>
2022-03-10 20:13:11 +00:00
|
|
|
|
|
|
|
txs types.Transactions // Deposit transactions to include at the start of the block
|
|
|
|
gasLimit *uint64 // Optional gas limit override
|
2022-01-24 07:19:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// prepareWork constructs the sealing task according to the given parameters,
|
|
|
|
// either based on the last chain head or specified parent. In this function
|
|
|
|
// the pending transactions are not filled yet, only the empty task returned.
|
|
|
|
func (w *worker) prepareWork(genParams *generateParams) (*environment, error) {
|
2018-08-14 15:34:33 +00:00
|
|
|
w.mu.RLock()
|
|
|
|
defer w.mu.RUnlock()
|
2015-04-07 10:32:55 +00:00
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// Find the parent block for sealing task
|
2018-08-14 15:34:33 +00:00
|
|
|
parent := w.chain.CurrentBlock()
|
2022-01-24 07:19:52 +00:00
|
|
|
if genParams.parentHash != (common.Hash{}) {
|
2023-03-02 06:29:15 +00:00
|
|
|
block := w.chain.GetBlockByHash(genParams.parentHash)
|
|
|
|
if block == nil {
|
|
|
|
return nil, fmt.Errorf("missing parent")
|
|
|
|
}
|
|
|
|
parent = block.Header()
|
2022-01-24 07:19:52 +00:00
|
|
|
}
|
|
|
|
// Sanity check the timestamp correctness, recap the timestamp
|
|
|
|
// to parent+1 if the mutation is allowed.
|
|
|
|
timestamp := genParams.timestamp
|
2023-03-02 06:29:15 +00:00
|
|
|
if parent.Time >= timestamp {
|
2022-01-24 07:19:52 +00:00
|
|
|
if genParams.forceTime {
|
2023-03-02 06:29:15 +00:00
|
|
|
return nil, fmt.Errorf("invalid timestamp, parent %d given %d", parent.Time, timestamp)
|
2022-01-24 07:19:52 +00:00
|
|
|
}
|
2023-03-02 06:29:15 +00:00
|
|
|
timestamp = parent.Time + 1
|
2015-06-16 10:41:50 +00:00
|
|
|
}
|
2022-10-03 12:10:00 +00:00
|
|
|
// Construct the sealing block header.
|
2015-06-16 10:41:50 +00:00
|
|
|
header := &types.Header{
|
|
|
|
ParentHash: parent.Hash(),
|
2023-03-02 06:29:15 +00:00
|
|
|
Number: new(big.Int).Add(parent.Number, common.Big1),
|
|
|
|
GasLimit: core.CalcGasLimit(parent.GasLimit, w.config.GasCeil),
|
2022-01-24 07:19:52 +00:00
|
|
|
Time: timestamp,
|
|
|
|
Coinbase: genParams.coinbase,
|
|
|
|
}
|
2022-12-28 08:48:26 +00:00
|
|
|
// Set the extra field.
|
2023-02-17 19:59:18 +00:00
|
|
|
if len(w.extra) != 0 && w.chainConfig.Optimism == nil { // Optimism chains must not set any extra data.
|
2022-01-24 07:19:52 +00:00
|
|
|
header.Extra = w.extra
|
|
|
|
}
|
|
|
|
// Set the randomness field from the beacon chain if it's available.
|
|
|
|
if genParams.random != (common.Hash{}) {
|
|
|
|
header.MixDigest = genParams.random
|
2015-06-16 10:41:50 +00:00
|
|
|
}
|
2021-05-21 07:59:26 +00:00
|
|
|
// Set baseFee and GasLimit if we are on an EIP-1559 chain
|
|
|
|
if w.chainConfig.IsLondon(header.Number) {
|
2023-03-02 06:29:15 +00:00
|
|
|
header.BaseFee = misc.CalcBaseFee(w.chainConfig, parent)
|
|
|
|
if !w.chainConfig.IsLondon(parent.Number) {
|
|
|
|
parentGasLimit := parent.GasLimit * w.chainConfig.ElasticityMultiplier()
|
2021-08-10 08:28:33 +00:00
|
|
|
header.GasLimit = core.CalcGasLimit(parentGasLimit, w.config.GasCeil)
|
2021-05-21 07:59:26 +00:00
|
|
|
}
|
|
|
|
}
|
optimism: historical Bedrock geth rollup changes
This commit squashes the op-geth fork history into a more maintainable
diff for rebasing upon upstream geth.
reference-optimistic-geth changes (origins of op-geth in early Bedrock
development stage):
- Deposit TX Type
- Enable deposit tx in EVM/tx pool
- Change deposit nonce to not be the max nonce
- Extend PayloadAttributesV1 with a Transactions field
- Force deposits at the start of each L2 block
- Fix height check
- noTxPool flag, reproduce block in verifier mode without tx pool interference
- Fix RPC json marshalling (ref op-geth PR 4)
- Deposit txs block height check in block body validation (ref op-geth PR 5)
- core: do not try to reinject deposit txs into tx-pool (ref-op-geth PR 6)
- deposit source hash field instead of L2 block height and tx index combination
- Include invalid deposits, rewind state, but always persist mint (#10)
- Provide gas to Call/Create in deposit transactions (#12)
- Add docker builds (ref-op-geth PR 16, 17)
- Don't panic on deposit transaction signature values or chain ID (ref-op-geth PR 18)
- core: Add version to DepositTx (ref-op-geth PR 19)
- Enable Geth build/lint/test in CircleCI (ref-op-geth PR 23)
- core: Include guaranteed gas in the gas pool (ref-op-geth PR 21)
- core: handle base fee, l1 availability fee, tx fee (ref-op-geth PR 27)
- fix: deposit tx hash
- fix l1 fee cache, rpc, tracing and tx pool
- core: remove deposit-tx sub-type (a.k.a. deposit version byte)
- eth/catalyst: allow engine user to reorg own chain
- miner: restore ability to reorg deep as block builder
- params: print Optimism consensus type in banner
- core/types: remove unused protected() method, see upstream PR 23376
- core: do not mutate original balance value in tx pool l1 cost adjustment
- core: subtract deposit gas from pool, so other txs do not use the same gas. And fail tx processing if deposits reach gas limit
- core/types: deposits do not tip, avoid basefee subtraction
- Unmeter the L1 Attributes Transaction
- miner: handle force tx errors as critical, clean up diff
- ci: Switch branch
- eth,miner: return STATUS_INVALID when failing to process forced transactions in request (ref-op-geth PR 40)
- verifier: forward tx to sequencer based on flag
- txpool: add flag to disable tx gossip (ref-op-geth PR 42)
- Add op-geth version in addition to geth version (ref-op-geth PR 43)
- ci: CircleCI improvements (ref-op-geth PR 44)
- Rename to op-geth
- Build latest tag on optimism branch
op-geth changes:
- Expose cache config in simulated backend (#2)
- Add EIP-1559 parameters
- eth/catalyst: update payload id computation (#1)
- make eip1559 configurable (#4)
- post-merge network should not log warnings about missing transition information (#5)
- Make the simulator more configurable (#6)
- fix OPB-6 - IsDepositTx check instead of artificial nonce value check (#7)
- Simulated backend - enable proof of stake consensus type and fix performance issue (#8)
- accounts: simulated backend consensus engine option and immediate tx indexing
- consensus/beacon: recognize all blocks as reached TTD with 0 TTD in chain config
- Add --rollup.historicalhttp CLI flag and fix backend iface
- Flags and interfaces for historical RPC requests (#12)
- Redirect historical RPC requests (#13)
- Use the pre-existing ethereum.NotFound error (#18)
- Add historical endpoint to TraceBlockByNumber and TraceBlockByHash (#19)
- Add historical endpoint to TraceTransaction (#20)
- Add historical endpoint to TraceCall (#21)
- optimism: fee params from info txi, update l1 cost func GPO params read (#15)
- add hardcoded addresses for fee payouts (#23)
- dynamic gas limit via engine API (#22)
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: Joshua Gutow <jgutow@oplabs.co>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: Maurelian <maurelian@protonmail.ch>
2022-03-10 20:13:11 +00:00
|
|
|
if genParams.gasLimit != nil { // override gas limit if specified
|
|
|
|
header.GasLimit = *genParams.gasLimit
|
2022-12-16 19:06:03 +00:00
|
|
|
} else if w.chain.Config().Optimism != nil && w.config.GasCeil != 0 {
|
|
|
|
// configure the gas limit of pending blocks with the miner gas limit config when using optimism
|
|
|
|
header.GasLimit = w.config.GasCeil
|
optimism: historical Bedrock geth rollup changes
This commit squashes the op-geth fork history into a more maintainable
diff for rebasing upon upstream geth.
reference-optimistic-geth changes (origins of op-geth in early Bedrock
development stage):
- Deposit TX Type
- Enable deposit tx in EVM/tx pool
- Change deposit nonce to not be the max nonce
- Extend PayloadAttributesV1 with a Transactions field
- Force deposits at the start of each L2 block
- Fix height check
- noTxPool flag, reproduce block in verifier mode without tx pool interference
- Fix RPC json marshalling (ref op-geth PR 4)
- Deposit txs block height check in block body validation (ref op-geth PR 5)
- core: do not try to reinject deposit txs into tx-pool (ref-op-geth PR 6)
- deposit source hash field instead of L2 block height and tx index combination
- Include invalid deposits, rewind state, but always persist mint (#10)
- Provide gas to Call/Create in deposit transactions (#12)
- Add docker builds (ref-op-geth PR 16, 17)
- Don't panic on deposit transaction signature values or chain ID (ref-op-geth PR 18)
- core: Add version to DepositTx (ref-op-geth PR 19)
- Enable Geth build/lint/test in CircleCI (ref-op-geth PR 23)
- core: Include guaranteed gas in the gas pool (ref-op-geth PR 21)
- core: handle base fee, l1 availability fee, tx fee (ref-op-geth PR 27)
- fix: deposit tx hash
- fix l1 fee cache, rpc, tracing and tx pool
- core: remove deposit-tx sub-type (a.k.a. deposit version byte)
- eth/catalyst: allow engine user to reorg own chain
- miner: restore ability to reorg deep as block builder
- params: print Optimism consensus type in banner
- core/types: remove unused protected() method, see upstream PR 23376
- core: do not mutate original balance value in tx pool l1 cost adjustment
- core: subtract deposit gas from pool, so other txs do not use the same gas. And fail tx processing if deposits reach gas limit
- core/types: deposits do not tip, avoid basefee subtraction
- Unmeter the L1 Attributes Transaction
- miner: handle force tx errors as critical, clean up diff
- ci: Switch branch
- eth,miner: return STATUS_INVALID when failing to process forced transactions in request (ref-op-geth PR 40)
- verifier: forward tx to sequencer based on flag
- txpool: add flag to disable tx gossip (ref-op-geth PR 42)
- Add op-geth version in addition to geth version (ref-op-geth PR 43)
- ci: CircleCI improvements (ref-op-geth PR 44)
- Rename to op-geth
- Build latest tag on optimism branch
op-geth changes:
- Expose cache config in simulated backend (#2)
- Add EIP-1559 parameters
- eth/catalyst: update payload id computation (#1)
- make eip1559 configurable (#4)
- post-merge network should not log warnings about missing transition information (#5)
- Make the simulator more configurable (#6)
- fix OPB-6 - IsDepositTx check instead of artificial nonce value check (#7)
- Simulated backend - enable proof of stake consensus type and fix performance issue (#8)
- accounts: simulated backend consensus engine option and immediate tx indexing
- consensus/beacon: recognize all blocks as reached TTD with 0 TTD in chain config
- Add --rollup.historicalhttp CLI flag and fix backend iface
- Flags and interfaces for historical RPC requests (#12)
- Redirect historical RPC requests (#13)
- Use the pre-existing ethereum.NotFound error (#18)
- Add historical endpoint to TraceBlockByNumber and TraceBlockByHash (#19)
- Add historical endpoint to TraceTransaction (#20)
- Add historical endpoint to TraceCall (#21)
- optimism: fee params from info txi, update l1 cost func GPO params read (#15)
- add hardcoded addresses for fee payouts (#23)
- dynamic gas limit via engine API (#22)
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: Joshua Gutow <jgutow@oplabs.co>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: Maurelian <maurelian@protonmail.ch>
2022-03-10 20:13:11 +00:00
|
|
|
}
|
2022-01-24 07:19:52 +00:00
|
|
|
// Run the consensus preparation with the default or customized consensus engine.
|
2018-08-14 15:34:33 +00:00
|
|
|
if err := w.engine.Prepare(w.chain, header); err != nil {
|
2022-01-24 07:19:52 +00:00
|
|
|
log.Error("Failed to prepare header for sealing", "err", err)
|
|
|
|
return nil, err
|
2016-07-08 10:00:37 +00:00
|
|
|
}
|
2015-10-06 14:35:55 +00:00
|
|
|
// Could potentially happen if starting to mine in an odd state.
|
2022-01-24 07:19:52 +00:00
|
|
|
// Note genParams.coinbase can be different with header.Coinbase
|
|
|
|
// since clique algorithm can modify the coinbase field in header.
|
|
|
|
env, err := w.makeEnv(parent, header, genParams.coinbase)
|
2015-10-06 14:35:55 +00:00
|
|
|
if err != nil {
|
2022-01-24 07:19:52 +00:00
|
|
|
log.Error("Failed to create sealing context", "err", err)
|
|
|
|
return nil, err
|
2016-07-11 10:55:11 +00:00
|
|
|
}
|
2022-01-24 07:19:52 +00:00
|
|
|
// Accumulate the uncles for the sealing work only if it's allowed.
|
|
|
|
if !genParams.noUncle {
|
|
|
|
commitUncles := func(blocks map[common.Hash]*types.Block) {
|
|
|
|
for hash, uncle := range blocks {
|
|
|
|
if len(env.uncles) == 2 {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
if err := w.commitUncle(env, uncle.Header()); err != nil {
|
|
|
|
log.Trace("Possible uncle rejected", "hash", hash, "reason", err)
|
|
|
|
} else {
|
|
|
|
log.Debug("Committing new uncle to block", "hash", hash)
|
|
|
|
}
|
2018-09-20 21:11:55 +00:00
|
|
|
}
|
2015-03-23 11:12:49 +00:00
|
|
|
}
|
2022-01-24 07:19:52 +00:00
|
|
|
// Prefer to locally generated uncle
|
|
|
|
commitUncles(w.localUncles)
|
|
|
|
commitUncles(w.remoteUncles)
|
2015-03-23 11:12:49 +00:00
|
|
|
}
|
2022-01-24 07:19:52 +00:00
|
|
|
return env, nil
|
|
|
|
}
|
2018-08-03 08:33:37 +00:00
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// fillTransactions retrieves the pending transactions from the txpool and fills them
|
|
|
|
// into the given sealing block. The transaction selection and ordering strategy can
|
|
|
|
// be customized with the plugin in the future.
|
2023-03-31 06:32:47 +00:00
|
|
|
func (w *worker) fillTransactions(interrupt *atomic.Int32, env *environment) error {
|
2022-01-24 07:19:52 +00:00
|
|
|
// Split the pending transactions into locals and remotes
|
2018-08-03 08:33:37 +00:00
|
|
|
// Fill the block with all available pending transactions.
|
2021-10-13 21:00:45 +00:00
|
|
|
pending := w.eth.TxPool().Pending(true)
|
2018-08-21 17:30:06 +00:00
|
|
|
localTxs, remoteTxs := make(map[common.Address]types.Transactions), pending
|
|
|
|
for _, account := range w.eth.TxPool().Locals() {
|
|
|
|
if txs := remoteTxs[account]; len(txs) > 0 {
|
|
|
|
delete(remoteTxs, account)
|
|
|
|
localTxs[account] = txs
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if len(localTxs) > 0 {
|
2022-01-24 07:19:52 +00:00
|
|
|
txs := types.NewTransactionsByPriceAndNonce(env.signer, localTxs, env.header.BaseFee)
|
2022-05-06 09:19:30 +00:00
|
|
|
if err := w.commitTransactions(env, txs, interrupt); err != nil {
|
|
|
|
return err
|
2018-08-21 17:30:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if len(remoteTxs) > 0 {
|
2022-01-24 07:19:52 +00:00
|
|
|
txs := types.NewTransactionsByPriceAndNonce(env.signer, remoteTxs, env.header.BaseFee)
|
2022-05-06 09:19:30 +00:00
|
|
|
if err := w.commitTransactions(env, txs, interrupt); err != nil {
|
|
|
|
return err
|
2018-08-21 17:30:06 +00:00
|
|
|
}
|
2018-08-16 11:14:33 +00:00
|
|
|
}
|
2022-05-06 09:19:30 +00:00
|
|
|
return nil
|
2018-08-15 11:09:17 +00:00
|
|
|
}
|
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// generateWork generates a sealing block based on the given parameters.
|
optimism: historical Bedrock geth rollup changes
This commit squashes the op-geth fork history into a more maintainable
diff for rebasing upon upstream geth.
reference-optimistic-geth changes (origins of op-geth in early Bedrock
development stage):
- Deposit TX Type
- Enable deposit tx in EVM/tx pool
- Change deposit nonce to not be the max nonce
- Extend PayloadAttributesV1 with a Transactions field
- Force deposits at the start of each L2 block
- Fix height check
- noTxPool flag, reproduce block in verifier mode without tx pool interference
- Fix RPC json marshalling (ref op-geth PR 4)
- Deposit txs block height check in block body validation (ref op-geth PR 5)
- core: do not try to reinject deposit txs into tx-pool (ref-op-geth PR 6)
- deposit source hash field instead of L2 block height and tx index combination
- Include invalid deposits, rewind state, but always persist mint (#10)
- Provide gas to Call/Create in deposit transactions (#12)
- Add docker builds (ref-op-geth PR 16, 17)
- Don't panic on deposit transaction signature values or chain ID (ref-op-geth PR 18)
- core: Add version to DepositTx (ref-op-geth PR 19)
- Enable Geth build/lint/test in CircleCI (ref-op-geth PR 23)
- core: Include guaranteed gas in the gas pool (ref-op-geth PR 21)
- core: handle base fee, l1 availability fee, tx fee (ref-op-geth PR 27)
- fix: deposit tx hash
- fix l1 fee cache, rpc, tracing and tx pool
- core: remove deposit-tx sub-type (a.k.a. deposit version byte)
- eth/catalyst: allow engine user to reorg own chain
- miner: restore ability to reorg deep as block builder
- params: print Optimism consensus type in banner
- core/types: remove unused protected() method, see upstream PR 23376
- core: do not mutate original balance value in tx pool l1 cost adjustment
- core: subtract deposit gas from pool, so other txs do not use the same gas. And fail tx processing if deposits reach gas limit
- core/types: deposits do not tip, avoid basefee subtraction
- Unmeter the L1 Attributes Transaction
- miner: handle force tx errors as critical, clean up diff
- ci: Switch branch
- eth,miner: return STATUS_INVALID when failing to process forced transactions in request (ref-op-geth PR 40)
- verifier: forward tx to sequencer based on flag
- txpool: add flag to disable tx gossip (ref-op-geth PR 42)
- Add op-geth version in addition to geth version (ref-op-geth PR 43)
- ci: CircleCI improvements (ref-op-geth PR 44)
- Rename to op-geth
- Build latest tag on optimism branch
op-geth changes:
- Expose cache config in simulated backend (#2)
- Add EIP-1559 parameters
- eth/catalyst: update payload id computation (#1)
- make eip1559 configurable (#4)
- post-merge network should not log warnings about missing transition information (#5)
- Make the simulator more configurable (#6)
- fix OPB-6 - IsDepositTx check instead of artificial nonce value check (#7)
- Simulated backend - enable proof of stake consensus type and fix performance issue (#8)
- accounts: simulated backend consensus engine option and immediate tx indexing
- consensus/beacon: recognize all blocks as reached TTD with 0 TTD in chain config
- Add --rollup.historicalhttp CLI flag and fix backend iface
- Flags and interfaces for historical RPC requests (#12)
- Redirect historical RPC requests (#13)
- Use the pre-existing ethereum.NotFound error (#18)
- Add historical endpoint to TraceBlockByNumber and TraceBlockByHash (#19)
- Add historical endpoint to TraceTransaction (#20)
- Add historical endpoint to TraceCall (#21)
- optimism: fee params from info txi, update l1 cost func GPO params read (#15)
- add hardcoded addresses for fee payouts (#23)
- dynamic gas limit via engine API (#22)
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: Joshua Gutow <jgutow@oplabs.co>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: Maurelian <maurelian@protonmail.ch>
2022-03-10 20:13:11 +00:00
|
|
|
func (w *worker) generateWork(genParams *generateParams) (*types.Block, *big.Int, error) {
|
|
|
|
work, err := w.prepareWork(genParams)
|
2018-08-15 11:09:17 +00:00
|
|
|
if err != nil {
|
2022-11-02 09:32:20 +00:00
|
|
|
return nil, nil, err
|
2018-05-10 07:04:45 +00:00
|
|
|
}
|
2022-01-24 07:19:52 +00:00
|
|
|
defer work.discard()
|
optimism: historical Bedrock geth rollup changes
This commit squashes the op-geth fork history into a more maintainable
diff for rebasing upon upstream geth.
reference-optimistic-geth changes (origins of op-geth in early Bedrock
development stage):
- Deposit TX Type
- Enable deposit tx in EVM/tx pool
- Change deposit nonce to not be the max nonce
- Extend PayloadAttributesV1 with a Transactions field
- Force deposits at the start of each L2 block
- Fix height check
- noTxPool flag, reproduce block in verifier mode without tx pool interference
- Fix RPC json marshalling (ref op-geth PR 4)
- Deposit txs block height check in block body validation (ref op-geth PR 5)
- core: do not try to reinject deposit txs into tx-pool (ref-op-geth PR 6)
- deposit source hash field instead of L2 block height and tx index combination
- Include invalid deposits, rewind state, but always persist mint (#10)
- Provide gas to Call/Create in deposit transactions (#12)
- Add docker builds (ref-op-geth PR 16, 17)
- Don't panic on deposit transaction signature values or chain ID (ref-op-geth PR 18)
- core: Add version to DepositTx (ref-op-geth PR 19)
- Enable Geth build/lint/test in CircleCI (ref-op-geth PR 23)
- core: Include guaranteed gas in the gas pool (ref-op-geth PR 21)
- core: handle base fee, l1 availability fee, tx fee (ref-op-geth PR 27)
- fix: deposit tx hash
- fix l1 fee cache, rpc, tracing and tx pool
- core: remove deposit-tx sub-type (a.k.a. deposit version byte)
- eth/catalyst: allow engine user to reorg own chain
- miner: restore ability to reorg deep as block builder
- params: print Optimism consensus type in banner
- core/types: remove unused protected() method, see upstream PR 23376
- core: do not mutate original balance value in tx pool l1 cost adjustment
- core: subtract deposit gas from pool, so other txs do not use the same gas. And fail tx processing if deposits reach gas limit
- core/types: deposits do not tip, avoid basefee subtraction
- Unmeter the L1 Attributes Transaction
- miner: handle force tx errors as critical, clean up diff
- ci: Switch branch
- eth,miner: return STATUS_INVALID when failing to process forced transactions in request (ref-op-geth PR 40)
- verifier: forward tx to sequencer based on flag
- txpool: add flag to disable tx gossip (ref-op-geth PR 42)
- Add op-geth version in addition to geth version (ref-op-geth PR 43)
- ci: CircleCI improvements (ref-op-geth PR 44)
- Rename to op-geth
- Build latest tag on optimism branch
op-geth changes:
- Expose cache config in simulated backend (#2)
- Add EIP-1559 parameters
- eth/catalyst: update payload id computation (#1)
- make eip1559 configurable (#4)
- post-merge network should not log warnings about missing transition information (#5)
- Make the simulator more configurable (#6)
- fix OPB-6 - IsDepositTx check instead of artificial nonce value check (#7)
- Simulated backend - enable proof of stake consensus type and fix performance issue (#8)
- accounts: simulated backend consensus engine option and immediate tx indexing
- consensus/beacon: recognize all blocks as reached TTD with 0 TTD in chain config
- Add --rollup.historicalhttp CLI flag and fix backend iface
- Flags and interfaces for historical RPC requests (#12)
- Redirect historical RPC requests (#13)
- Use the pre-existing ethereum.NotFound error (#18)
- Add historical endpoint to TraceBlockByNumber and TraceBlockByHash (#19)
- Add historical endpoint to TraceTransaction (#20)
- Add historical endpoint to TraceCall (#21)
- optimism: fee params from info txi, update l1 cost func GPO params read (#15)
- add hardcoded addresses for fee payouts (#23)
- dynamic gas limit via engine API (#22)
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: Joshua Gutow <jgutow@oplabs.co>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: Maurelian <maurelian@protonmail.ch>
2022-03-10 20:13:11 +00:00
|
|
|
if work.gasPool == nil {
|
|
|
|
work.gasPool = new(core.GasPool).AddGas(work.header.GasLimit)
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, tx := range genParams.txs {
|
|
|
|
from, _ := types.Sender(work.signer, tx)
|
|
|
|
work.state.SetTxContext(tx.Hash(), work.tcount)
|
|
|
|
_, err := w.commitTransaction(work, tx)
|
|
|
|
if err != nil {
|
|
|
|
return nil, nil, fmt.Errorf("failed to force-include tx: %s type: %d sender: %s nonce: %d, err: %w", tx.Hash(), tx.Type(), from, tx.Nonce(), err)
|
|
|
|
}
|
|
|
|
work.tcount++
|
|
|
|
}
|
2022-01-24 07:19:52 +00:00
|
|
|
|
optimism: historical Bedrock geth rollup changes
This commit squashes the op-geth fork history into a more maintainable
diff for rebasing upon upstream geth.
reference-optimistic-geth changes (origins of op-geth in early Bedrock
development stage):
- Deposit TX Type
- Enable deposit tx in EVM/tx pool
- Change deposit nonce to not be the max nonce
- Extend PayloadAttributesV1 with a Transactions field
- Force deposits at the start of each L2 block
- Fix height check
- noTxPool flag, reproduce block in verifier mode without tx pool interference
- Fix RPC json marshalling (ref op-geth PR 4)
- Deposit txs block height check in block body validation (ref op-geth PR 5)
- core: do not try to reinject deposit txs into tx-pool (ref-op-geth PR 6)
- deposit source hash field instead of L2 block height and tx index combination
- Include invalid deposits, rewind state, but always persist mint (#10)
- Provide gas to Call/Create in deposit transactions (#12)
- Add docker builds (ref-op-geth PR 16, 17)
- Don't panic on deposit transaction signature values or chain ID (ref-op-geth PR 18)
- core: Add version to DepositTx (ref-op-geth PR 19)
- Enable Geth build/lint/test in CircleCI (ref-op-geth PR 23)
- core: Include guaranteed gas in the gas pool (ref-op-geth PR 21)
- core: handle base fee, l1 availability fee, tx fee (ref-op-geth PR 27)
- fix: deposit tx hash
- fix l1 fee cache, rpc, tracing and tx pool
- core: remove deposit-tx sub-type (a.k.a. deposit version byte)
- eth/catalyst: allow engine user to reorg own chain
- miner: restore ability to reorg deep as block builder
- params: print Optimism consensus type in banner
- core/types: remove unused protected() method, see upstream PR 23376
- core: do not mutate original balance value in tx pool l1 cost adjustment
- core: subtract deposit gas from pool, so other txs do not use the same gas. And fail tx processing if deposits reach gas limit
- core/types: deposits do not tip, avoid basefee subtraction
- Unmeter the L1 Attributes Transaction
- miner: handle force tx errors as critical, clean up diff
- ci: Switch branch
- eth,miner: return STATUS_INVALID when failing to process forced transactions in request (ref-op-geth PR 40)
- verifier: forward tx to sequencer based on flag
- txpool: add flag to disable tx gossip (ref-op-geth PR 42)
- Add op-geth version in addition to geth version (ref-op-geth PR 43)
- ci: CircleCI improvements (ref-op-geth PR 44)
- Rename to op-geth
- Build latest tag on optimism branch
op-geth changes:
- Expose cache config in simulated backend (#2)
- Add EIP-1559 parameters
- eth/catalyst: update payload id computation (#1)
- make eip1559 configurable (#4)
- post-merge network should not log warnings about missing transition information (#5)
- Make the simulator more configurable (#6)
- fix OPB-6 - IsDepositTx check instead of artificial nonce value check (#7)
- Simulated backend - enable proof of stake consensus type and fix performance issue (#8)
- accounts: simulated backend consensus engine option and immediate tx indexing
- consensus/beacon: recognize all blocks as reached TTD with 0 TTD in chain config
- Add --rollup.historicalhttp CLI flag and fix backend iface
- Flags and interfaces for historical RPC requests (#12)
- Redirect historical RPC requests (#13)
- Use the pre-existing ethereum.NotFound error (#18)
- Add historical endpoint to TraceBlockByNumber and TraceBlockByHash (#19)
- Add historical endpoint to TraceTransaction (#20)
- Add historical endpoint to TraceCall (#21)
- optimism: fee params from info txi, update l1 cost func GPO params read (#15)
- add hardcoded addresses for fee payouts (#23)
- dynamic gas limit via engine API (#22)
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: Joshua Gutow <jgutow@oplabs.co>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: Maurelian <maurelian@protonmail.ch>
2022-03-10 20:13:11 +00:00
|
|
|
// forced transactions done, fill rest of block with transactions
|
|
|
|
if !genParams.noTxs {
|
2023-03-31 06:32:47 +00:00
|
|
|
interrupt := new(atomic.Int32)
|
2022-10-03 12:10:00 +00:00
|
|
|
timer := time.AfterFunc(w.newpayloadTimeout, func() {
|
2023-03-31 06:32:47 +00:00
|
|
|
interrupt.Store(commitInterruptTimeout)
|
2022-10-03 12:10:00 +00:00
|
|
|
})
|
|
|
|
defer timer.Stop()
|
|
|
|
|
|
|
|
err := w.fillTransactions(interrupt, work)
|
|
|
|
if errors.Is(err, errBlockInterruptedByTimeout) {
|
|
|
|
log.Warn("Block building is interrupted", "allowance", common.PrettyDuration(w.newpayloadTimeout))
|
|
|
|
}
|
2022-05-18 14:33:37 +00:00
|
|
|
}
|
optimism: historical Bedrock geth rollup changes
This commit squashes the op-geth fork history into a more maintainable
diff for rebasing upon upstream geth.
reference-optimistic-geth changes (origins of op-geth in early Bedrock
development stage):
- Deposit TX Type
- Enable deposit tx in EVM/tx pool
- Change deposit nonce to not be the max nonce
- Extend PayloadAttributesV1 with a Transactions field
- Force deposits at the start of each L2 block
- Fix height check
- noTxPool flag, reproduce block in verifier mode without tx pool interference
- Fix RPC json marshalling (ref op-geth PR 4)
- Deposit txs block height check in block body validation (ref op-geth PR 5)
- core: do not try to reinject deposit txs into tx-pool (ref-op-geth PR 6)
- deposit source hash field instead of L2 block height and tx index combination
- Include invalid deposits, rewind state, but always persist mint (#10)
- Provide gas to Call/Create in deposit transactions (#12)
- Add docker builds (ref-op-geth PR 16, 17)
- Don't panic on deposit transaction signature values or chain ID (ref-op-geth PR 18)
- core: Add version to DepositTx (ref-op-geth PR 19)
- Enable Geth build/lint/test in CircleCI (ref-op-geth PR 23)
- core: Include guaranteed gas in the gas pool (ref-op-geth PR 21)
- core: handle base fee, l1 availability fee, tx fee (ref-op-geth PR 27)
- fix: deposit tx hash
- fix l1 fee cache, rpc, tracing and tx pool
- core: remove deposit-tx sub-type (a.k.a. deposit version byte)
- eth/catalyst: allow engine user to reorg own chain
- miner: restore ability to reorg deep as block builder
- params: print Optimism consensus type in banner
- core/types: remove unused protected() method, see upstream PR 23376
- core: do not mutate original balance value in tx pool l1 cost adjustment
- core: subtract deposit gas from pool, so other txs do not use the same gas. And fail tx processing if deposits reach gas limit
- core/types: deposits do not tip, avoid basefee subtraction
- Unmeter the L1 Attributes Transaction
- miner: handle force tx errors as critical, clean up diff
- ci: Switch branch
- eth,miner: return STATUS_INVALID when failing to process forced transactions in request (ref-op-geth PR 40)
- verifier: forward tx to sequencer based on flag
- txpool: add flag to disable tx gossip (ref-op-geth PR 42)
- Add op-geth version in addition to geth version (ref-op-geth PR 43)
- ci: CircleCI improvements (ref-op-geth PR 44)
- Rename to op-geth
- Build latest tag on optimism branch
op-geth changes:
- Expose cache config in simulated backend (#2)
- Add EIP-1559 parameters
- eth/catalyst: update payload id computation (#1)
- make eip1559 configurable (#4)
- post-merge network should not log warnings about missing transition information (#5)
- Make the simulator more configurable (#6)
- fix OPB-6 - IsDepositTx check instead of artificial nonce value check (#7)
- Simulated backend - enable proof of stake consensus type and fix performance issue (#8)
- accounts: simulated backend consensus engine option and immediate tx indexing
- consensus/beacon: recognize all blocks as reached TTD with 0 TTD in chain config
- Add --rollup.historicalhttp CLI flag and fix backend iface
- Flags and interfaces for historical RPC requests (#12)
- Redirect historical RPC requests (#13)
- Use the pre-existing ethereum.NotFound error (#18)
- Add historical endpoint to TraceBlockByNumber and TraceBlockByHash (#19)
- Add historical endpoint to TraceTransaction (#20)
- Add historical endpoint to TraceCall (#21)
- optimism: fee params from info txi, update l1 cost func GPO params read (#15)
- add hardcoded addresses for fee payouts (#23)
- dynamic gas limit via engine API (#22)
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: Joshua Gutow <jgutow@oplabs.co>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: Maurelian <maurelian@protonmail.ch>
2022-03-10 20:13:11 +00:00
|
|
|
block, err := w.engine.FinalizeAndAssemble(w.chain, work.header, work.state, work.txs, work.unclelist(), work.receipts, genParams.withdrawals)
|
2022-11-02 09:32:20 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
|
|
|
}
|
|
|
|
return block, totalFees(block, work.receipts), nil
|
2022-01-24 07:19:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// commitWork generates several new sealing tasks based on the parent block
|
|
|
|
// and submit them to the sealer.
|
2023-03-31 06:32:47 +00:00
|
|
|
func (w *worker) commitWork(interrupt *atomic.Int32, noempty bool, timestamp int64) {
|
2022-01-24 07:19:52 +00:00
|
|
|
start := time.Now()
|
|
|
|
|
|
|
|
// Set the coinbase if the worker is running or it's required
|
|
|
|
var coinbase common.Address
|
|
|
|
if w.isRunning() {
|
2023-01-20 16:26:01 +00:00
|
|
|
coinbase = w.etherbase()
|
|
|
|
if coinbase == (common.Address{}) {
|
2022-01-24 07:19:52 +00:00
|
|
|
log.Error("Refusing to mine without etherbase")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
work, err := w.prepareWork(&generateParams{
|
|
|
|
timestamp: uint64(timestamp),
|
|
|
|
coinbase: coinbase,
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
// Create an empty block based on temporary copied state for
|
|
|
|
// sealing in advance without waiting block execution finished.
|
2023-03-31 06:32:47 +00:00
|
|
|
if !noempty && !w.noempty.Load() {
|
2022-01-24 07:19:52 +00:00
|
|
|
w.commit(work.copy(), nil, false, start)
|
|
|
|
}
|
2022-10-03 12:10:00 +00:00
|
|
|
// Fill pending transactions from the txpool into the block.
|
2022-05-06 09:19:30 +00:00
|
|
|
err = w.fillTransactions(interrupt, work)
|
2022-10-03 12:10:00 +00:00
|
|
|
switch {
|
|
|
|
case err == nil:
|
|
|
|
// The entire block is filled, decrease resubmit interval in case
|
|
|
|
// of current interval is larger than the user-specified one.
|
|
|
|
w.resubmitAdjustCh <- &intervalAdjust{inc: false}
|
|
|
|
|
|
|
|
case errors.Is(err, errBlockInterruptedByRecommit):
|
|
|
|
// Notify resubmit loop to increase resubmitting interval if the
|
|
|
|
// interruption is due to frequent commits.
|
|
|
|
gaslimit := work.header.GasLimit
|
|
|
|
ratio := float64(gaslimit-work.gasPool.Gas()) / float64(gaslimit)
|
|
|
|
if ratio < 0.1 {
|
|
|
|
ratio = 0.1
|
|
|
|
}
|
|
|
|
w.resubmitAdjustCh <- &intervalAdjust{
|
|
|
|
ratio: ratio,
|
|
|
|
inc: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
case errors.Is(err, errBlockInterruptedByNewHead):
|
|
|
|
// If the block building is interrupted by newhead event, discard it
|
|
|
|
// totally. Committing the interrupted block introduces unnecessary
|
|
|
|
// delay, and possibly causes miner to mine on the previous head,
|
|
|
|
// which could result in higher uncle rate.
|
2022-05-06 09:19:30 +00:00
|
|
|
work.discard()
|
|
|
|
return
|
|
|
|
}
|
2022-10-03 12:10:00 +00:00
|
|
|
// Submit the generated block for consensus sealing.
|
2022-01-24 07:19:52 +00:00
|
|
|
w.commit(work.copy(), w.fullTaskHook, true, start)
|
|
|
|
|
|
|
|
// Swap out the old work with the new one, terminating any leftover
|
|
|
|
// prefetcher processes in the mean time and starting a new one.
|
|
|
|
if w.current != nil {
|
|
|
|
w.current.discard()
|
|
|
|
}
|
|
|
|
w.current = work
|
|
|
|
}
|
|
|
|
|
|
|
|
// commit runs any post-transaction state modifications, assembles the final block
|
|
|
|
// and commits new work if consensus engine is running.
|
|
|
|
// Note the assumption is held that the mutation is allowed to the passed env, do
|
|
|
|
// the deep copy first.
|
|
|
|
func (w *worker) commit(env *environment, interval func(), update bool, start time.Time) error {
|
2021-12-03 15:26:28 +00:00
|
|
|
if w.isRunning() {
|
2018-08-15 11:09:17 +00:00
|
|
|
if interval != nil {
|
|
|
|
interval()
|
2015-05-10 23:28:15 +00:00
|
|
|
}
|
2022-02-07 17:34:13 +00:00
|
|
|
// Create a local environment copy, avoid the data race with snapshot state.
|
|
|
|
// https://github.com/ethereum/go-ethereum/issues/24299
|
|
|
|
env := env.copy()
|
2023-01-25 14:32:25 +00:00
|
|
|
// Withdrawals are set to nil here, because this is only called in PoW.
|
|
|
|
block, err := w.engine.FinalizeAndAssemble(w.chain, env.header, env.state, env.txs, env.unclelist(), env.receipts, nil)
|
2022-01-24 07:19:52 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
2021-12-07 09:42:09 +00:00
|
|
|
}
|
2022-01-24 07:19:52 +00:00
|
|
|
// If we're post merge, just ignore
|
|
|
|
if !w.isTTDReached(block.Header()) {
|
|
|
|
select {
|
|
|
|
case w.taskCh <- &task{receipts: env.receipts, state: env.state, block: block, createdAt: time.Now()}:
|
|
|
|
w.unconfirmed.Shift(block.NumberU64() - 1)
|
2022-11-02 09:32:20 +00:00
|
|
|
|
|
|
|
fees := totalFees(block, env.receipts)
|
2022-11-03 14:18:28 +00:00
|
|
|
feesInEther := new(big.Float).Quo(new(big.Float).SetInt(fees), big.NewFloat(params.Ether))
|
2022-01-24 07:19:52 +00:00
|
|
|
log.Info("Commit new sealing work", "number", block.Number(), "sealhash", w.engine.SealHash(block.Header()),
|
|
|
|
"uncles", len(env.uncles), "txs", env.tcount,
|
2022-11-02 09:32:20 +00:00
|
|
|
"gas", block.GasUsed(), "fees", feesInEther,
|
2022-01-24 07:19:52 +00:00
|
|
|
"elapsed", common.PrettyDuration(time.Since(start)))
|
|
|
|
|
|
|
|
case <-w.exitCh:
|
|
|
|
log.Info("Worker has exited")
|
|
|
|
}
|
2016-11-28 13:59:06 +00:00
|
|
|
}
|
2015-02-04 13:52:59 +00:00
|
|
|
}
|
2018-08-15 11:09:17 +00:00
|
|
|
if update {
|
2022-01-24 07:19:52 +00:00
|
|
|
w.updateSnapshot(env)
|
2018-08-15 11:09:17 +00:00
|
|
|
}
|
|
|
|
return nil
|
2015-02-04 13:52:59 +00:00
|
|
|
}
|
2019-11-29 13:22:08 +00:00
|
|
|
|
2022-01-24 07:19:52 +00:00
|
|
|
// getSealingBlock generates the sealing block based on the given parameters.
|
2022-05-18 14:33:37 +00:00
|
|
|
// The generation result will be passed back via the given channel no matter
|
|
|
|
// the generation itself succeeds or not.
|
optimism: historical Bedrock geth rollup changes
This commit squashes the op-geth fork history into a more maintainable
diff for rebasing upon upstream geth.
reference-optimistic-geth changes (origins of op-geth in early Bedrock
development stage):
- Deposit TX Type
- Enable deposit tx in EVM/tx pool
- Change deposit nonce to not be the max nonce
- Extend PayloadAttributesV1 with a Transactions field
- Force deposits at the start of each L2 block
- Fix height check
- noTxPool flag, reproduce block in verifier mode without tx pool interference
- Fix RPC json marshalling (ref op-geth PR 4)
- Deposit txs block height check in block body validation (ref op-geth PR 5)
- core: do not try to reinject deposit txs into tx-pool (ref-op-geth PR 6)
- deposit source hash field instead of L2 block height and tx index combination
- Include invalid deposits, rewind state, but always persist mint (#10)
- Provide gas to Call/Create in deposit transactions (#12)
- Add docker builds (ref-op-geth PR 16, 17)
- Don't panic on deposit transaction signature values or chain ID (ref-op-geth PR 18)
- core: Add version to DepositTx (ref-op-geth PR 19)
- Enable Geth build/lint/test in CircleCI (ref-op-geth PR 23)
- core: Include guaranteed gas in the gas pool (ref-op-geth PR 21)
- core: handle base fee, l1 availability fee, tx fee (ref-op-geth PR 27)
- fix: deposit tx hash
- fix l1 fee cache, rpc, tracing and tx pool
- core: remove deposit-tx sub-type (a.k.a. deposit version byte)
- eth/catalyst: allow engine user to reorg own chain
- miner: restore ability to reorg deep as block builder
- params: print Optimism consensus type in banner
- core/types: remove unused protected() method, see upstream PR 23376
- core: do not mutate original balance value in tx pool l1 cost adjustment
- core: subtract deposit gas from pool, so other txs do not use the same gas. And fail tx processing if deposits reach gas limit
- core/types: deposits do not tip, avoid basefee subtraction
- Unmeter the L1 Attributes Transaction
- miner: handle force tx errors as critical, clean up diff
- ci: Switch branch
- eth,miner: return STATUS_INVALID when failing to process forced transactions in request (ref-op-geth PR 40)
- verifier: forward tx to sequencer based on flag
- txpool: add flag to disable tx gossip (ref-op-geth PR 42)
- Add op-geth version in addition to geth version (ref-op-geth PR 43)
- ci: CircleCI improvements (ref-op-geth PR 44)
- Rename to op-geth
- Build latest tag on optimism branch
op-geth changes:
- Expose cache config in simulated backend (#2)
- Add EIP-1559 parameters
- eth/catalyst: update payload id computation (#1)
- make eip1559 configurable (#4)
- post-merge network should not log warnings about missing transition information (#5)
- Make the simulator more configurable (#6)
- fix OPB-6 - IsDepositTx check instead of artificial nonce value check (#7)
- Simulated backend - enable proof of stake consensus type and fix performance issue (#8)
- accounts: simulated backend consensus engine option and immediate tx indexing
- consensus/beacon: recognize all blocks as reached TTD with 0 TTD in chain config
- Add --rollup.historicalhttp CLI flag and fix backend iface
- Flags and interfaces for historical RPC requests (#12)
- Redirect historical RPC requests (#13)
- Use the pre-existing ethereum.NotFound error (#18)
- Add historical endpoint to TraceBlockByNumber and TraceBlockByHash (#19)
- Add historical endpoint to TraceTransaction (#20)
- Add historical endpoint to TraceCall (#21)
- optimism: fee params from info txi, update l1 cost func GPO params read (#15)
- add hardcoded addresses for fee payouts (#23)
- dynamic gas limit via engine API (#22)
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: Joshua Gutow <jgutow@oplabs.co>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: Maurelian <maurelian@protonmail.ch>
2022-03-10 20:13:11 +00:00
|
|
|
func (w *worker) getSealingBlock(parent common.Hash, timestamp uint64, coinbase common.Address, random common.Hash, withdrawals types.Withdrawals, noTxs bool, transactions types.Transactions, gasLimit *uint64) (*types.Block, *big.Int, error) {
|
2022-01-24 07:19:52 +00:00
|
|
|
req := &getWorkReq{
|
|
|
|
params: &generateParams{
|
2023-01-25 14:32:25 +00:00
|
|
|
timestamp: timestamp,
|
|
|
|
forceTime: true,
|
|
|
|
parentHash: parent,
|
|
|
|
coinbase: coinbase,
|
|
|
|
random: random,
|
|
|
|
withdrawals: withdrawals,
|
|
|
|
noUncle: true,
|
|
|
|
noTxs: noTxs,
|
optimism: historical Bedrock geth rollup changes
This commit squashes the op-geth fork history into a more maintainable
diff for rebasing upon upstream geth.
reference-optimistic-geth changes (origins of op-geth in early Bedrock
development stage):
- Deposit TX Type
- Enable deposit tx in EVM/tx pool
- Change deposit nonce to not be the max nonce
- Extend PayloadAttributesV1 with a Transactions field
- Force deposits at the start of each L2 block
- Fix height check
- noTxPool flag, reproduce block in verifier mode without tx pool interference
- Fix RPC json marshalling (ref op-geth PR 4)
- Deposit txs block height check in block body validation (ref op-geth PR 5)
- core: do not try to reinject deposit txs into tx-pool (ref-op-geth PR 6)
- deposit source hash field instead of L2 block height and tx index combination
- Include invalid deposits, rewind state, but always persist mint (#10)
- Provide gas to Call/Create in deposit transactions (#12)
- Add docker builds (ref-op-geth PR 16, 17)
- Don't panic on deposit transaction signature values or chain ID (ref-op-geth PR 18)
- core: Add version to DepositTx (ref-op-geth PR 19)
- Enable Geth build/lint/test in CircleCI (ref-op-geth PR 23)
- core: Include guaranteed gas in the gas pool (ref-op-geth PR 21)
- core: handle base fee, l1 availability fee, tx fee (ref-op-geth PR 27)
- fix: deposit tx hash
- fix l1 fee cache, rpc, tracing and tx pool
- core: remove deposit-tx sub-type (a.k.a. deposit version byte)
- eth/catalyst: allow engine user to reorg own chain
- miner: restore ability to reorg deep as block builder
- params: print Optimism consensus type in banner
- core/types: remove unused protected() method, see upstream PR 23376
- core: do not mutate original balance value in tx pool l1 cost adjustment
- core: subtract deposit gas from pool, so other txs do not use the same gas. And fail tx processing if deposits reach gas limit
- core/types: deposits do not tip, avoid basefee subtraction
- Unmeter the L1 Attributes Transaction
- miner: handle force tx errors as critical, clean up diff
- ci: Switch branch
- eth,miner: return STATUS_INVALID when failing to process forced transactions in request (ref-op-geth PR 40)
- verifier: forward tx to sequencer based on flag
- txpool: add flag to disable tx gossip (ref-op-geth PR 42)
- Add op-geth version in addition to geth version (ref-op-geth PR 43)
- ci: CircleCI improvements (ref-op-geth PR 44)
- Rename to op-geth
- Build latest tag on optimism branch
op-geth changes:
- Expose cache config in simulated backend (#2)
- Add EIP-1559 parameters
- eth/catalyst: update payload id computation (#1)
- make eip1559 configurable (#4)
- post-merge network should not log warnings about missing transition information (#5)
- Make the simulator more configurable (#6)
- fix OPB-6 - IsDepositTx check instead of artificial nonce value check (#7)
- Simulated backend - enable proof of stake consensus type and fix performance issue (#8)
- accounts: simulated backend consensus engine option and immediate tx indexing
- consensus/beacon: recognize all blocks as reached TTD with 0 TTD in chain config
- Add --rollup.historicalhttp CLI flag and fix backend iface
- Flags and interfaces for historical RPC requests (#12)
- Redirect historical RPC requests (#13)
- Use the pre-existing ethereum.NotFound error (#18)
- Add historical endpoint to TraceBlockByNumber and TraceBlockByHash (#19)
- Add historical endpoint to TraceTransaction (#20)
- Add historical endpoint to TraceCall (#21)
- optimism: fee params from info txi, update l1 cost func GPO params read (#15)
- add hardcoded addresses for fee payouts (#23)
- dynamic gas limit via engine API (#22)
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: Joshua Gutow <jgutow@oplabs.co>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: Maurelian <maurelian@protonmail.ch>
2022-03-10 20:13:11 +00:00
|
|
|
txs: transactions,
|
|
|
|
gasLimit: gasLimit,
|
2022-01-24 07:19:52 +00:00
|
|
|
},
|
2022-11-02 09:32:20 +00:00
|
|
|
result: make(chan *newPayloadResult, 1),
|
2022-01-24 07:19:52 +00:00
|
|
|
}
|
|
|
|
select {
|
|
|
|
case w.getWorkCh <- req:
|
2022-11-02 09:32:20 +00:00
|
|
|
result := <-req.result
|
|
|
|
if result.err != nil {
|
|
|
|
return nil, nil, result.err
|
|
|
|
}
|
|
|
|
return result.block, result.fees, nil
|
2022-01-24 07:19:52 +00:00
|
|
|
case <-w.exitCh:
|
2022-05-18 14:33:37 +00:00
|
|
|
return nil, nil, errors.New("miner closed")
|
2022-01-24 07:19:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// isTTDReached returns the indicator if the given block has reached the total
|
|
|
|
// terminal difficulty for The Merge transition.
|
|
|
|
func (w *worker) isTTDReached(header *types.Header) bool {
|
|
|
|
td, ttd := w.chain.GetTd(header.ParentHash, header.Number.Uint64()-1), w.chain.Config().TerminalTotalDifficulty
|
|
|
|
return td != nil && ttd != nil && td.Cmp(ttd) >= 0
|
|
|
|
}
|
|
|
|
|
2020-07-28 16:16:49 +00:00
|
|
|
// copyReceipts makes a deep copy of the given receipts.
|
|
|
|
func copyReceipts(receipts []*types.Receipt) []*types.Receipt {
|
|
|
|
result := make([]*types.Receipt, len(receipts))
|
|
|
|
for i, l := range receipts {
|
|
|
|
cpy := *l
|
|
|
|
result[i] = &cpy
|
|
|
|
}
|
|
|
|
return result
|
|
|
|
}
|
|
|
|
|
2019-11-29 13:22:08 +00:00
|
|
|
// postSideBlock fires a side chain event, only use it for testing.
|
|
|
|
func (w *worker) postSideBlock(event core.ChainSideEvent) {
|
|
|
|
select {
|
|
|
|
case w.chainSideCh <- event:
|
|
|
|
case <-w.exitCh:
|
|
|
|
}
|
|
|
|
}
|
2020-07-28 16:16:49 +00:00
|
|
|
|
2022-11-02 09:32:20 +00:00
|
|
|
// totalFees computes total consumed miner fees in Wei. Block transactions and receipts have to have the same order.
|
|
|
|
func totalFees(block *types.Block, receipts []*types.Receipt) *big.Int {
|
2020-07-28 16:16:49 +00:00
|
|
|
feesWei := new(big.Int)
|
|
|
|
for i, tx := range block.Transactions() {
|
2021-06-08 10:05:41 +00:00
|
|
|
minerFee, _ := tx.EffectiveGasTip(block.BaseFee())
|
2021-05-21 07:59:26 +00:00
|
|
|
feesWei.Add(feesWei, new(big.Int).Mul(new(big.Int).SetUint64(receipts[i].GasUsed), minerFee))
|
2020-07-28 16:16:49 +00:00
|
|
|
}
|
2022-11-02 09:32:20 +00:00
|
|
|
return feesWei
|
2020-07-28 16:16:49 +00:00
|
|
|
}
|
2022-10-03 12:10:00 +00:00
|
|
|
|
|
|
|
// signalToErr converts the interruption signal to a concrete error type for return.
|
|
|
|
// The given signal must be a valid interruption signal.
|
|
|
|
func signalToErr(signal int32) error {
|
|
|
|
switch signal {
|
|
|
|
case commitInterruptNewHead:
|
|
|
|
return errBlockInterruptedByNewHead
|
|
|
|
case commitInterruptResubmit:
|
|
|
|
return errBlockInterruptedByRecommit
|
|
|
|
case commitInterruptTimeout:
|
|
|
|
return errBlockInterruptedByTimeout
|
|
|
|
default:
|
|
|
|
panic(fmt.Errorf("undefined signal %d", signal))
|
|
|
|
}
|
|
|
|
}
|