2022-05-24 21:39:40 +03:00
// Copyright 2021 The go-ethereum Authors
2021-04-16 22:29:22 +03:00
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
// 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.
//
// The go-ethereum library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
// Package catalyst implements the temporary eth1/eth2 RPC integration.
package catalyst
import (
2022-03-11 15:14:45 +03:00
"errors"
2021-04-16 22:29:22 +03:00
"fmt"
2024-03-15 12:44:41 +03:00
"strconv"
2022-05-18 17:30:42 +03:00
"sync"
2022-03-11 15:14:45 +03:00
"time"
2021-04-16 22:29:22 +03:00
2023-02-06 18:37:58 +03:00
"github.com/ethereum/go-ethereum/beacon/engine"
2021-04-16 22:29:22 +03:00
"github.com/ethereum/go-ethereum/common"
2022-03-17 18:20:03 +03:00
"github.com/ethereum/go-ethereum/common/hexutil"
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
"github.com/ethereum/go-ethereum/core"
2022-03-11 15:14:45 +03:00
"github.com/ethereum/go-ethereum/core/rawdb"
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
"github.com/ethereum/go-ethereum/core/stateless"
2022-05-20 11:12:12 +03:00
"github.com/ethereum/go-ethereum/core/types"
2021-04-16 22:29:22 +03:00
"github.com/ethereum/go-ethereum/eth"
2022-07-01 14:38:26 +03:00
"github.com/ethereum/go-ethereum/eth/downloader"
2024-02-15 14:01:30 +03:00
"github.com/ethereum/go-ethereum/internal/version"
2021-04-16 22:29:22 +03:00
"github.com/ethereum/go-ethereum/log"
2022-11-02 12:32:20 +03:00
"github.com/ethereum/go-ethereum/miner"
2021-04-16 22:29:22 +03:00
"github.com/ethereum/go-ethereum/node"
2024-01-23 18:02:08 +03:00
"github.com/ethereum/go-ethereum/params/forks"
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
"github.com/ethereum/go-ethereum/rlp"
2021-04-16 22:29:22 +03:00
"github.com/ethereum/go-ethereum/rpc"
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 14:23:02 +03:00
)
2022-07-23 10:56:02 +03:00
// Register adds the engine API to the full node.
2021-04-16 22:29:22 +03:00
func Register ( stack * node . Node , backend * eth . Ethereum ) error {
2022-07-23 10:56:02 +03:00
log . Warn ( "Engine API enabled" , "protocol" , "eth" )
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 14:23:02 +03:00
stack . RegisterAPIs ( [ ] rpc . API {
{
2022-03-07 10:30:27 +03:00
Namespace : "engine" ,
Service : NewConsensusAPI ( backend ) ,
Authenticated : true ,
} ,
2021-04-16 22:29:22 +03:00
} )
return nil
}
2022-07-25 16:51:04 +03:00
const (
// invalidBlockHitEviction is the number of times an invalid block can be
// referenced in forkchoice update or new payload before it is attempted
// to be reprocessed again.
invalidBlockHitEviction = 128
// invalidTipsetsCap is the max number of recent block hashes tracked that
// have lead to some bad ancestor block. It's just an OOM protection.
invalidTipsetsCap = 512
2022-08-01 15:13:25 +03:00
2022-08-22 11:27:39 +03:00
// beaconUpdateStartupTimeout is the time to wait for a beacon client to get
// attached before starting to issue warnings.
beaconUpdateStartupTimeout = 30 * time . Second
// beaconUpdateConsensusTimeout is the max time allowed for a beacon client
// to send a consensus update before it's considered offline and the user is
// warned.
2023-03-16 22:35:36 +03:00
beaconUpdateConsensusTimeout = 2 * time . Minute
2022-08-22 11:27:39 +03:00
// beaconUpdateWarnFrequency is the frequency at which to warn the user that
// the beacon client is offline.
beaconUpdateWarnFrequency = 5 * time . Minute
2022-07-25 16:51:04 +03:00
)
2023-01-27 14:03:03 +03:00
// All methods provided over the engine endpoint.
var caps = [ ] string {
"engine_forkchoiceUpdatedV1" ,
"engine_forkchoiceUpdatedV2" ,
2023-08-26 05:52:12 +03:00
"engine_forkchoiceUpdatedV3" ,
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
"engine_forkchoiceUpdatedWithWitnessV1" ,
"engine_forkchoiceUpdatedWithWitnessV2" ,
"engine_forkchoiceUpdatedWithWitnessV3" ,
2023-01-27 14:03:03 +03:00
"engine_exchangeTransitionConfigurationV1" ,
"engine_getPayloadV1" ,
"engine_getPayloadV2" ,
2023-07-18 10:44:16 +03:00
"engine_getPayloadV3" ,
2024-09-04 15:33:51 +03:00
"engine_getPayloadV4" ,
2024-10-17 19:27:35 +03:00
"engine_getBlobsV1" ,
2023-01-27 14:03:03 +03:00
"engine_newPayloadV1" ,
"engine_newPayloadV2" ,
2023-07-18 10:44:16 +03:00
"engine_newPayloadV3" ,
2024-09-04 15:33:51 +03:00
"engine_newPayloadV4" ,
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
"engine_newPayloadWithWitnessV1" ,
"engine_newPayloadWithWitnessV2" ,
"engine_newPayloadWithWitnessV3" ,
"engine_newPayloadWithWitnessV4" ,
"engine_executeStatelessPayloadV1" ,
"engine_executeStatelessPayloadV2" ,
"engine_executeStatelessPayloadV3" ,
"engine_executeStatelessPayloadV4" ,
2023-02-06 12:21:40 +03:00
"engine_getPayloadBodiesByHashV1" ,
2024-09-04 15:33:51 +03:00
"engine_getPayloadBodiesByHashV2" ,
2023-02-06 12:21:40 +03:00
"engine_getPayloadBodiesByRangeV1" ,
2024-09-04 15:33:51 +03:00
"engine_getPayloadBodiesByRangeV2" ,
2024-02-15 16:43:45 +03:00
"engine_getClientVersionV1" ,
2023-01-27 14:03:03 +03:00
}
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 14:23:02 +03:00
type ConsensusAPI struct {
2022-07-25 16:51:04 +03:00
eth * eth . Ethereum
2022-03-11 15:14:45 +03:00
remoteBlocks * headerQueue // Cache of remote payloads received
localBlocks * payloadQueue // Cache of local payloads generated
2022-07-25 16:51:04 +03:00
// The forkchoice update and new payload method require us to return the
// latest valid hash in an invalid chain. To support that return, we need
// to track historical bad blocks as well as bad tipsets in case a chain
// is constantly built on it.
//
// There are a few important caveats in this mechanism:
// - The bad block tracking is ephemeral, in-memory only. We must never
// persist any bad block information to disk as a bug in Geth could end
// up blocking a valid chain, even if a later Geth update would accept
// it.
// - Bad blocks will get forgotten after a certain threshold of import
// attempts and will be retried. The rationale is that if the network
// really-really-really tries to feed us a block, we should give it a
// new chance, perhaps us being racey instead of the block being legit
// bad (this happened in Geth at a point with import vs. pending race).
// - Tracking all the blocks built on top of the bad one could be a bit
// problematic, so we will only track the head chain segment of a bad
// chain to allow discarding progressing bad chains and side chains,
// without tracking too much bad data.
2022-10-11 10:37:00 +03:00
invalidBlocksHits map [ common . Hash ] int // Ephemeral cache to track invalid blocks and their hit count
2022-07-25 16:51:04 +03:00
invalidTipsets map [ common . Hash ] * types . Header // Ephemeral cache to track invalid tipsets and their bad ancestor
invalidLock sync . Mutex // Protects the invalid maps from concurrent access
2022-08-01 15:13:25 +03:00
// Geth can appear to be stuck or do strange things if the beacon client is
// offline or is sending us strange data. Stash some update stats away so
// that we can warn the user and not have them open issues on our tracker.
lastTransitionUpdate time . Time
lastTransitionLock sync . Mutex
lastForkchoiceUpdate time . Time
lastForkchoiceLock sync . Mutex
lastNewPayloadUpdate time . Time
lastNewPayloadLock sync . Mutex
forkchoiceLock sync . Mutex // Lock for the forkChoiceUpdated method
2022-09-21 14:48:09 +03:00
newPayloadLock sync . Mutex // Lock for the NewPayload method
2021-04-16 22:29:22 +03:00
}
2022-01-31 15:22:35 +03:00
// NewConsensusAPI creates a new consensus api for the given backend.
// The underlying blockchain needs to have a valid terminal total difficulty set.
func NewConsensusAPI ( eth * eth . Ethereum ) * ConsensusAPI {
2023-08-24 11:48:09 +03:00
api := newConsensusAPIWithoutHeartbeat ( eth )
go api . heartbeat ( )
return api
}
// newConsensusAPIWithoutHeartbeat creates a new consensus api for the SimulatedBeacon Node.
func newConsensusAPIWithoutHeartbeat ( eth * eth . Ethereum ) * ConsensusAPI {
2022-01-31 15:22:35 +03:00
if eth . BlockChain ( ) . Config ( ) . TerminalTotalDifficulty == nil {
2022-07-25 12:06:22 +03:00
log . Warn ( "Engine API started but chain not configured for merge yet" )
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 14:23:02 +03:00
}
2022-07-25 16:51:04 +03:00
api := & ConsensusAPI {
eth : eth ,
remoteBlocks : newHeaderQueue ( ) ,
localBlocks : newPayloadQueue ( ) ,
invalidBlocksHits : make ( map [ common . Hash ] int ) ,
invalidTipsets : make ( map [ common . Hash ] * types . Header ) ,
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 14:23:02 +03:00
}
2022-07-25 16:51:04 +03:00
eth . Downloader ( ) . SetBadBlockCallback ( api . setInvalidAncestor )
return api
2021-04-16 22:29:22 +03:00
}
2022-01-31 15:22:35 +03:00
// ForkchoiceUpdatedV1 has several responsibilities:
2022-09-10 14:25:40 +03:00
//
// We try to set our blockchain to the headBlock.
//
// If the method is called with an empty head block: we return success, which can be used
// to check if the engine API is enabled.
//
// If the total difficulty was not reached: we return INVALID.
//
// If the finalizedBlockHash is set: we check if we have the finalizedBlockHash in our db,
// if not we start a sync.
//
// If there are payloadAttributes: we try to assemble a block with the payloadAttributes
// and return its payloadID.
2023-02-06 18:37:58 +03:00
func ( api * ConsensusAPI ) ForkchoiceUpdatedV1 ( update engine . ForkchoiceStateV1 , payloadAttributes * engine . PayloadAttributes ) ( engine . ForkChoiceResponse , error ) {
2023-02-09 11:53:22 +03:00
if payloadAttributes != nil {
2024-01-29 13:53:25 +03:00
if payloadAttributes . Withdrawals != nil || payloadAttributes . BeaconRoot != nil {
return engine . STATUS_INVALID , engine . InvalidParams . With ( errors . New ( "withdrawals and beacon root not supported in V1" ) )
2023-02-09 11:53:22 +03:00
}
2023-05-19 11:27:19 +03:00
if api . eth . BlockChain ( ) . Config ( ) . IsShanghai ( api . eth . BlockChain ( ) . Config ( ) . LondonBlock , payloadAttributes . Timestamp ) {
2023-05-25 09:57:34 +03:00
return engine . STATUS_INVALID , engine . InvalidParams . With ( errors . New ( "forkChoiceUpdateV1 called post-shanghai" ) )
2023-02-09 11:53:22 +03:00
}
2023-01-25 17:32:25 +03:00
}
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
return api . forkchoiceUpdated ( update , payloadAttributes , engine . PayloadV1 , false )
2023-01-25 17:32:25 +03:00
}
2024-01-29 13:53:25 +03:00
// ForkchoiceUpdatedV2 is equivalent to V1 with the addition of withdrawals in the payload
// attributes. It supports both PayloadAttributesV1 and PayloadAttributesV2.
2024-01-23 18:02:08 +03:00
func ( api * ConsensusAPI ) ForkchoiceUpdatedV2 ( update engine . ForkchoiceStateV1 , params * engine . PayloadAttributes ) ( engine . ForkChoiceResponse , error ) {
if params != nil {
2024-02-28 21:59:16 +03:00
if params . BeaconRoot != nil {
return engine . STATUS_INVALID , engine . InvalidPayloadAttributes . With ( errors . New ( "unexpected beacon root" ) )
}
2024-01-29 13:53:25 +03:00
switch api . eth . BlockChain ( ) . Config ( ) . LatestFork ( params . Timestamp ) {
case forks . Paris :
if params . Withdrawals != nil {
2024-02-28 21:59:16 +03:00
return engine . STATUS_INVALID , engine . InvalidPayloadAttributes . With ( errors . New ( "withdrawals before shanghai" ) )
2024-01-29 13:53:25 +03:00
}
case forks . Shanghai :
if params . Withdrawals == nil {
2024-02-28 21:59:16 +03:00
return engine . STATUS_INVALID , engine . InvalidPayloadAttributes . With ( errors . New ( "missing withdrawals" ) )
2024-01-29 13:53:25 +03:00
}
default :
return engine . STATUS_INVALID , engine . UnsupportedFork . With ( errors . New ( "forkchoiceUpdatedV2 must only be called with paris and shanghai payloads" ) )
2024-01-23 18:02:08 +03:00
}
2023-01-27 17:33:28 +03:00
}
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
return api . forkchoiceUpdated ( update , params , engine . PayloadV2 , false )
2023-01-27 17:33:28 +03:00
}
2024-01-29 13:53:25 +03:00
// ForkchoiceUpdatedV3 is equivalent to V2 with the addition of parent beacon block root
// in the payload attributes. It supports only PayloadAttributesV3.
2024-01-23 18:02:08 +03:00
func ( api * ConsensusAPI ) ForkchoiceUpdatedV3 ( update engine . ForkchoiceStateV1 , params * engine . PayloadAttributes ) ( engine . ForkChoiceResponse , error ) {
if params != nil {
if params . Withdrawals == nil {
2024-02-28 21:59:16 +03:00
return engine . STATUS_INVALID , engine . InvalidPayloadAttributes . With ( errors . New ( "missing withdrawals" ) )
2024-01-23 18:02:08 +03:00
}
if params . BeaconRoot == nil {
2024-02-28 21:59:16 +03:00
return engine . STATUS_INVALID , engine . InvalidPayloadAttributes . With ( errors . New ( "missing beacon root" ) )
2024-01-23 18:02:08 +03:00
}
2024-09-04 15:33:51 +03:00
if api . eth . BlockChain ( ) . Config ( ) . LatestFork ( params . Timestamp ) != forks . Cancun && api . eth . BlockChain ( ) . Config ( ) . LatestFork ( params . Timestamp ) != forks . Prague {
2024-01-23 18:02:08 +03:00
return engine . STATUS_INVALID , engine . UnsupportedFork . With ( errors . New ( "forkchoiceUpdatedV3 must only be called for cancun payloads" ) )
2023-01-27 13:42:14 +03:00
}
}
2024-01-23 18:02:08 +03:00
// TODO(matt): the spec requires that fcu is applied when called on a valid
// hash, even if params are wrong. To do this we need to split up
// forkchoiceUpdate into a function that only updates the head and then a
// function that kicks off block construction.
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
return api . forkchoiceUpdated ( update , params , engine . PayloadV3 , false )
2023-01-25 17:32:25 +03:00
}
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
// ForkchoiceUpdatedWithWitnessV1 is analogous to ForkchoiceUpdatedV1, only it
// generates an execution witness too if block building was requested.
func ( api * ConsensusAPI ) ForkchoiceUpdatedWithWitnessV1 ( update engine . ForkchoiceStateV1 , payloadAttributes * engine . PayloadAttributes ) ( engine . ForkChoiceResponse , error ) {
if payloadAttributes != nil {
if payloadAttributes . Withdrawals != nil || payloadAttributes . BeaconRoot != nil {
return engine . STATUS_INVALID , engine . InvalidParams . With ( errors . New ( "withdrawals and beacon root not supported in V1" ) )
}
if api . eth . BlockChain ( ) . Config ( ) . IsShanghai ( api . eth . BlockChain ( ) . Config ( ) . LondonBlock , payloadAttributes . Timestamp ) {
return engine . STATUS_INVALID , engine . InvalidParams . With ( errors . New ( "forkChoiceUpdateV1 called post-shanghai" ) )
}
}
return api . forkchoiceUpdated ( update , payloadAttributes , engine . PayloadV1 , true )
}
// ForkchoiceUpdatedWithWitnessV2 is analogous to ForkchoiceUpdatedV2, only it
// generates an execution witness too if block building was requested.
func ( api * ConsensusAPI ) ForkchoiceUpdatedWithWitnessV2 ( update engine . ForkchoiceStateV1 , params * engine . PayloadAttributes ) ( engine . ForkChoiceResponse , error ) {
if params != nil {
if params . BeaconRoot != nil {
return engine . STATUS_INVALID , engine . InvalidPayloadAttributes . With ( errors . New ( "unexpected beacon root" ) )
}
switch api . eth . BlockChain ( ) . Config ( ) . LatestFork ( params . Timestamp ) {
case forks . Paris :
if params . Withdrawals != nil {
return engine . STATUS_INVALID , engine . InvalidPayloadAttributes . With ( errors . New ( "withdrawals before shanghai" ) )
}
case forks . Shanghai :
if params . Withdrawals == nil {
return engine . STATUS_INVALID , engine . InvalidPayloadAttributes . With ( errors . New ( "missing withdrawals" ) )
}
default :
return engine . STATUS_INVALID , engine . UnsupportedFork . With ( errors . New ( "forkchoiceUpdatedV2 must only be called with paris and shanghai payloads" ) )
}
}
return api . forkchoiceUpdated ( update , params , engine . PayloadV2 , true )
}
// ForkchoiceUpdatedWithWitnessV3 is analogous to ForkchoiceUpdatedV3, only it
// generates an execution witness too if block building was requested.
func ( api * ConsensusAPI ) ForkchoiceUpdatedWithWitnessV3 ( update engine . ForkchoiceStateV1 , params * engine . PayloadAttributes ) ( engine . ForkChoiceResponse , error ) {
if params != nil {
if params . Withdrawals == nil {
return engine . STATUS_INVALID , engine . InvalidPayloadAttributes . With ( errors . New ( "missing withdrawals" ) )
}
if params . BeaconRoot == nil {
return engine . STATUS_INVALID , engine . InvalidPayloadAttributes . With ( errors . New ( "missing beacon root" ) )
}
if api . eth . BlockChain ( ) . Config ( ) . LatestFork ( params . Timestamp ) != forks . Cancun && api . eth . BlockChain ( ) . Config ( ) . LatestFork ( params . Timestamp ) != forks . Prague {
return engine . STATUS_INVALID , engine . UnsupportedFork . With ( errors . New ( "forkchoiceUpdatedV3 must only be called for cancun payloads" ) )
}
}
// TODO(matt): the spec requires that fcu is applied when called on a valid
// hash, even if params are wrong. To do this we need to split up
// forkchoiceUpdate into a function that only updates the head and then a
// function that kicks off block construction.
return api . forkchoiceUpdated ( update , params , engine . PayloadV3 , true )
}
func ( api * ConsensusAPI ) forkchoiceUpdated ( update engine . ForkchoiceStateV1 , payloadAttributes * engine . PayloadAttributes , payloadVersion engine . PayloadVersion , payloadWitness bool ) ( engine . ForkChoiceResponse , error ) {
2022-08-01 15:13:25 +03:00
api . forkchoiceLock . Lock ( )
defer api . forkchoiceLock . Unlock ( )
2022-05-18 17:30:42 +03:00
2022-03-17 18:20:03 +03:00
log . Trace ( "Engine API request received" , "method" , "ForkchoiceUpdated" , "head" , update . HeadBlockHash , "finalized" , update . FinalizedBlockHash , "safe" , update . SafeBlockHash )
2022-03-11 15:14:45 +03:00
if update . HeadBlockHash == ( common . Hash { } ) {
log . Warn ( "Forkchoice requested update to zero hash" )
2023-02-06 18:37:58 +03:00
return engine . STATUS_INVALID , nil // TODO(karalabe): Why does someone send us this?
2022-03-11 15:14:45 +03:00
}
2022-08-01 15:13:25 +03:00
// Stash away the last update to warn the user if the beacon client goes offline
api . lastForkchoiceLock . Lock ( )
api . lastForkchoiceUpdate = time . Now ( )
api . lastForkchoiceLock . Unlock ( )
2022-05-18 17:30:42 +03:00
2022-03-11 15:14:45 +03:00
// Check whether we have the block yet in our database or not. If not, we'll
// need to either trigger a sync, or to reject this forkchoice update for a
// reason.
block := api . eth . BlockChain ( ) . GetBlockByHash ( update . HeadBlockHash )
if block == nil {
2022-07-25 16:51:04 +03:00
// If this block was previously invalidated, keep rejecting it here too
if res := api . checkInvalidAncestor ( update . HeadBlockHash , update . HeadBlockHash ) ; res != nil {
2023-02-06 18:37:58 +03:00
return engine . ForkChoiceResponse { PayloadStatus : * res , PayloadID : nil } , nil
2022-07-25 16:51:04 +03:00
}
2022-03-11 15:14:45 +03:00
// If the head hash is unknown (was not given to us in a newPayload request),
// we cannot resolve the header, so not much to do. This could be extended in
// the future to resolve from the `eth` network, but it's an unexpected case
// that should be fixed, not papered over.
header := api . remoteBlocks . get ( update . HeadBlockHash )
if header == nil {
2022-03-17 18:20:03 +03:00
log . Warn ( "Forkchoice requested unknown head" , "hash" , update . HeadBlockHash )
2023-02-06 18:37:58 +03:00
return engine . STATUS_SYNCING , nil
2022-03-11 15:14:45 +03:00
}
2023-02-23 14:22:41 +03:00
// If the finalized hash is known, we can direct the downloader to move
// potentially more data to the freezer from the get go.
finalized := api . remoteBlocks . get ( update . FinalizedBlockHash )
2022-03-11 15:14:45 +03:00
// Header advertised via a past newPayload request. Start syncing to it.
2023-02-23 14:22:41 +03:00
context := [ ] interface { } { "number" , header . Number , "hash" , header . Hash ( ) }
if update . FinalizedBlockHash != ( common . Hash { } ) {
if finalized == nil {
context = append ( context , [ ] interface { } { "finalized" , "unknown" } ... )
} else {
context = append ( context , [ ] interface { } { "finalized" , finalized . Number } ... )
}
}
log . Info ( "Forkchoice requested sync to new head" , context ... )
if err := api . eth . Downloader ( ) . BeaconSync ( api . eth . SyncMode ( ) , header , finalized ) ; err != nil {
2023-02-06 18:37:58 +03:00
return engine . STATUS_SYNCING , err
2022-03-11 15:14:45 +03:00
}
2023-02-06 18:37:58 +03:00
return engine . STATUS_SYNCING , nil
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 14:23:02 +03:00
}
2022-03-11 15:14:45 +03:00
// Block is known locally, just sanity check that the beacon client does not
2022-03-17 18:20:03 +03:00
// attempt to push us back to before the merge.
if block . Difficulty ( ) . BitLen ( ) > 0 || block . NumberU64 ( ) == 0 {
2022-03-11 15:14:45 +03:00
var (
td = api . eth . BlockChain ( ) . GetTd ( update . HeadBlockHash , block . NumberU64 ( ) )
ptd = api . eth . BlockChain ( ) . GetTd ( block . ParentHash ( ) , block . NumberU64 ( ) - 1 )
ttd = api . eth . BlockChain ( ) . Config ( ) . TerminalTotalDifficulty
)
if td == nil || ( block . NumberU64 ( ) > 0 && ptd == nil ) {
log . Error ( "TDs unavailable for TTD check" , "number" , block . NumberU64 ( ) , "hash" , update . HeadBlockHash , "td" , td , "parent" , block . ParentHash ( ) , "ptd" , ptd )
2023-02-06 18:37:58 +03:00
return engine . STATUS_INVALID , errors . New ( "TDs unavailable for TDD check" )
2022-03-11 15:14:45 +03:00
}
2022-05-30 14:28:15 +03:00
if td . Cmp ( ttd ) < 0 {
2022-03-11 15:14:45 +03:00
log . Error ( "Refusing beacon update to pre-merge" , "number" , block . NumberU64 ( ) , "hash" , update . HeadBlockHash , "diff" , block . Difficulty ( ) , "age" , common . PrettyAge ( time . Unix ( int64 ( block . Time ( ) ) , 0 ) ) )
2023-02-06 18:37:58 +03:00
return engine . ForkChoiceResponse { PayloadStatus : engine . INVALID_TERMINAL_BLOCK , PayloadID : nil } , nil
2021-12-03 18:26:28 +03:00
}
2022-05-30 14:28:15 +03:00
if block . NumberU64 ( ) > 0 && ptd . Cmp ( ttd ) >= 0 {
log . Error ( "Parent block is already post-ttd" , "number" , block . NumberU64 ( ) , "hash" , update . HeadBlockHash , "diff" , block . Difficulty ( ) , "age" , common . PrettyAge ( time . Unix ( int64 ( block . Time ( ) ) , 0 ) ) )
2023-02-06 18:37:58 +03:00
return engine . ForkChoiceResponse { PayloadStatus : engine . INVALID_TERMINAL_BLOCK , PayloadID : nil } , nil
2022-05-30 14:28:15 +03:00
}
2021-12-03 18:26:28 +03:00
}
2023-02-06 18:37:58 +03:00
valid := func ( id * engine . PayloadID ) engine . ForkChoiceResponse {
return engine . ForkChoiceResponse {
PayloadStatus : engine . PayloadStatusV1 { Status : engine . VALID , LatestValidHash : & update . HeadBlockHash } ,
2022-06-22 14:59:55 +03:00
PayloadID : id ,
}
}
2022-03-17 18:20:03 +03:00
if rawdb . ReadCanonicalHash ( api . eth . ChainDb ( ) , block . NumberU64 ( ) ) != update . HeadBlockHash {
// Block is not canonical, set head.
2022-05-17 12:32:55 +03:00
if latestValid , err := api . eth . BlockChain ( ) . SetCanonical ( block ) ; err != nil {
2023-02-06 18:37:58 +03:00
return engine . ForkChoiceResponse { PayloadStatus : engine . PayloadStatusV1 { Status : engine . INVALID , LatestValidHash : & latestValid } } , err
2022-03-17 18:20:03 +03:00
}
2022-06-22 14:59:55 +03:00
} else if api . eth . BlockChain ( ) . CurrentBlock ( ) . Hash ( ) == update . HeadBlockHash {
// If the specified head matches with our local head, do nothing and keep
// generating the payload. It's a special corner case that a few slots are
// missing and we are requested to generate the payload in slot.
2022-03-17 18:20:03 +03:00
} else {
// If the head block is already in our canonical chain, the beacon client is
// probably resyncing. Ignore the update.
2023-03-02 09:29:15 +03:00
log . Info ( "Ignoring beacon update to old head" , "number" , block . NumberU64 ( ) , "hash" , update . HeadBlockHash , "age" , common . PrettyAge ( time . Unix ( int64 ( block . Time ( ) ) , 0 ) ) , "have" , api . eth . BlockChain ( ) . CurrentBlock ( ) . Number )
2022-06-22 14:59:55 +03:00
return valid ( nil ) , nil
2022-03-11 15:14:45 +03:00
}
api . eth . SetSynced ( )
// If the beacon client also advertised a finalized block, mark the local
// chain final and completely in PoS mode.
if update . FinalizedBlockHash != ( common . Hash { } ) {
2024-01-23 22:59:38 +03:00
// If the finalized block is not in our canonical tree, something is wrong
2022-03-17 18:20:03 +03:00
finalBlock := api . eth . BlockChain ( ) . GetBlockByHash ( update . FinalizedBlockHash )
if finalBlock == nil {
log . Warn ( "Final block not available in database" , "hash" , update . FinalizedBlockHash )
2023-02-06 18:37:58 +03:00
return engine . STATUS_INVALID , engine . InvalidForkChoiceState . With ( errors . New ( "final block not available in database" ) )
2022-03-17 18:20:03 +03:00
} else if rawdb . ReadCanonicalHash ( api . eth . ChainDb ( ) , finalBlock . NumberU64 ( ) ) != update . FinalizedBlockHash {
2024-07-09 15:19:55 +03:00
log . Warn ( "Final block not in canonical chain" , "number" , finalBlock . NumberU64 ( ) , "hash" , update . FinalizedBlockHash )
2023-02-06 18:37:58 +03:00
return engine . STATUS_INVALID , engine . InvalidForkChoiceState . With ( errors . New ( "final block not in canonical chain" ) )
2022-03-17 18:20:03 +03:00
}
2022-05-18 17:30:42 +03:00
// Set the finalized block
2023-03-02 09:29:15 +03:00
api . eth . BlockChain ( ) . SetFinalized ( finalBlock . Header ( ) )
2022-03-17 18:20:03 +03:00
}
2024-01-23 22:59:38 +03:00
// Check if the safe block hash is in our canonical tree, if not something is wrong
2022-03-17 18:20:03 +03:00
if update . SafeBlockHash != ( common . Hash { } ) {
safeBlock := api . eth . BlockChain ( ) . GetBlockByHash ( update . SafeBlockHash )
if safeBlock == nil {
log . Warn ( "Safe block not available in database" )
2023-02-06 18:37:58 +03:00
return engine . STATUS_INVALID , engine . InvalidForkChoiceState . With ( errors . New ( "safe block not available in database" ) )
2022-03-17 18:20:03 +03:00
}
if rawdb . ReadCanonicalHash ( api . eth . ChainDb ( ) , safeBlock . NumberU64 ( ) ) != update . SafeBlockHash {
log . Warn ( "Safe block not in canonical chain" )
2023-02-06 18:37:58 +03:00
return engine . STATUS_INVALID , engine . InvalidForkChoiceState . With ( errors . New ( "safe block not in canonical chain" ) )
2022-03-17 18:20:03 +03:00
}
2022-07-25 18:42:05 +03:00
// Set the safe block
2023-03-02 09:29:15 +03:00
api . eth . BlockChain ( ) . SetSafe ( safeBlock . Header ( ) )
2021-12-03 18:26:28 +03:00
}
2022-03-11 15:14:45 +03:00
// If payload generation was requested, create a new block to be potentially
// sealed by the beacon client. The payload will be requested later, and we
2022-11-02 12:32:20 +03:00
// will replace it arbitrarily many times in between.
2022-01-31 15:22:35 +03:00
if payloadAttributes != nil {
2022-11-02 12:32:20 +03:00
args := & miner . BuildPayloadArgs {
Parent : update . HeadBlockHash ,
Timestamp : payloadAttributes . Timestamp ,
FeeRecipient : payloadAttributes . SuggestedFeeRecipient ,
Random : payloadAttributes . Random ,
2023-01-25 17:32:25 +03:00
Withdrawals : payloadAttributes . Withdrawals ,
2023-08-26 05:52:12 +03:00
BeaconRoot : payloadAttributes . BeaconRoot ,
2024-01-24 10:39:12 +03:00
Version : payloadVersion ,
2022-05-18 17:33:37 +03:00
}
2022-11-07 17:30:54 +03:00
id := args . Id ( )
// If we already are busy generating this work, then we do not need
// to start a second process.
if api . localBlocks . has ( id ) {
return valid ( & id ) , nil
}
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
payload , err := api . eth . Miner ( ) . BuildPayload ( args , payloadWitness )
2021-12-03 18:26:28 +03:00
if err != nil {
2022-11-02 12:32:20 +03:00
log . Error ( "Failed to build payload" , "err" , err )
2023-02-06 18:37:58 +03:00
return valid ( nil ) , engine . InvalidPayloadAttributes . With ( err )
2021-12-03 18:26:28 +03:00
}
2022-11-02 12:32:20 +03:00
api . localBlocks . put ( id , payload )
2022-05-17 12:32:55 +03:00
return valid ( & id ) , nil
2022-03-17 18:20:03 +03:00
}
2022-05-17 12:32:55 +03:00
return valid ( nil ) , nil
2022-03-17 18:20:03 +03:00
}
// ExchangeTransitionConfigurationV1 checks the given configuration against
// the configuration of the node.
2023-02-06 18:37:58 +03:00
func ( api * ConsensusAPI ) ExchangeTransitionConfigurationV1 ( config engine . TransitionConfigurationV1 ) ( * engine . TransitionConfigurationV1 , error ) {
2022-08-01 15:13:25 +03:00
log . Trace ( "Engine API request received" , "method" , "ExchangeTransitionConfiguration" , "ttd" , config . TerminalTotalDifficulty )
2022-03-17 18:20:03 +03:00
if config . TerminalTotalDifficulty == nil {
return nil , errors . New ( "invalid terminal total difficulty" )
}
2022-08-01 15:13:25 +03:00
// Stash away the last update to warn the user if the beacon client goes offline
api . lastTransitionLock . Lock ( )
api . lastTransitionUpdate = time . Now ( )
api . lastTransitionLock . Unlock ( )
2022-03-17 18:20:03 +03:00
ttd := api . eth . BlockChain ( ) . Config ( ) . TerminalTotalDifficulty
2022-07-23 10:56:02 +03:00
if ttd == nil || ttd . Cmp ( config . TerminalTotalDifficulty . ToInt ( ) ) != 0 {
2022-03-23 23:00:26 +03:00
log . Warn ( "Invalid TTD configured" , "geth" , ttd , "beacon" , config . TerminalTotalDifficulty )
return nil , fmt . Errorf ( "invalid ttd: execution %v consensus %v" , ttd , config . TerminalTotalDifficulty )
2022-03-17 18:20:03 +03:00
}
if config . TerminalBlockHash != ( common . Hash { } ) {
if hash := api . eth . BlockChain ( ) . GetCanonicalHash ( uint64 ( config . TerminalBlockNumber ) ) ; hash == config . TerminalBlockHash {
2023-02-06 18:37:58 +03:00
return & engine . TransitionConfigurationV1 {
2022-03-17 18:20:03 +03:00
TerminalTotalDifficulty : ( * hexutil . Big ) ( ttd ) ,
TerminalBlockHash : config . TerminalBlockHash ,
TerminalBlockNumber : config . TerminalBlockNumber ,
} , nil
}
2023-05-25 09:57:34 +03:00
return nil , errors . New ( "invalid terminal block hash" )
2021-12-03 18:26:28 +03:00
}
2023-02-06 18:37:58 +03:00
return & engine . TransitionConfigurationV1 { TerminalTotalDifficulty : ( * hexutil . Big ) ( ttd ) } , nil
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 14:23:02 +03:00
}
2022-01-31 15:22:35 +03:00
// GetPayloadV1 returns a cached payload by id.
2023-02-06 18:37:58 +03:00
func ( api * ConsensusAPI ) GetPayloadV1 ( payloadID engine . PayloadID ) ( * engine . ExecutableData , error ) {
2024-01-24 10:39:12 +03:00
if ! payloadID . Is ( engine . PayloadV1 ) {
return nil , engine . UnsupportedFork
}
2023-08-23 15:14:04 +03:00
data , err := api . getPayload ( payloadID , false )
2023-01-25 17:32:25 +03:00
if err != nil {
return nil , err
}
return data . ExecutionPayload , nil
}
// GetPayloadV2 returns a cached payload by id.
2023-02-06 18:37:58 +03:00
func ( api * ConsensusAPI ) GetPayloadV2 ( payloadID engine . PayloadID ) ( * engine . ExecutionPayloadEnvelope , error ) {
2024-01-24 10:39:12 +03:00
if ! payloadID . Is ( engine . PayloadV1 , engine . PayloadV2 ) {
return nil , engine . UnsupportedFork
}
2023-08-23 15:14:04 +03:00
return api . getPayload ( payloadID , false )
2023-01-25 17:32:25 +03:00
}
2023-07-18 10:44:16 +03:00
// GetPayloadV3 returns a cached payload by id.
func ( api * ConsensusAPI ) GetPayloadV3 ( payloadID engine . PayloadID ) ( * engine . ExecutionPayloadEnvelope , error ) {
2024-01-24 10:39:12 +03:00
if ! payloadID . Is ( engine . PayloadV3 ) {
return nil , engine . UnsupportedFork
}
2023-08-23 15:14:04 +03:00
return api . getPayload ( payloadID , false )
2023-07-06 11:42:34 +03:00
}
2024-09-04 15:33:51 +03:00
// GetPayloadV4 returns a cached payload by id.
func ( api * ConsensusAPI ) GetPayloadV4 ( payloadID engine . PayloadID ) ( * engine . ExecutionPayloadEnvelope , error ) {
2024-09-10 21:52:20 +03:00
if ! payloadID . Is ( engine . PayloadV3 ) {
2024-09-04 15:33:51 +03:00
return nil , engine . UnsupportedFork
}
return api . getPayload ( payloadID , false )
}
2023-08-23 15:14:04 +03:00
func ( api * ConsensusAPI ) getPayload ( payloadID engine . PayloadID , full bool ) ( * engine . ExecutionPayloadEnvelope , error ) {
2023-07-18 10:44:16 +03:00
log . Trace ( "Engine API request received" , "method" , "GetPayload" , "id" , payloadID )
2023-08-23 15:14:04 +03:00
data := api . localBlocks . get ( payloadID , full )
2022-01-31 15:22:35 +03:00
if data == nil {
2023-02-06 18:37:58 +03:00
return nil , engine . UnknownPayload
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 14:23:02 +03:00
}
2022-01-31 15:22:35 +03:00
return data , nil
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 14:23:02 +03:00
}
2024-10-17 19:27:35 +03:00
// GetBlobsV1 returns a blob from the transaction pool.
func ( api * ConsensusAPI ) GetBlobsV1 ( hashes [ ] common . Hash ) ( [ ] * engine . BlobAndProofV1 , error ) {
if len ( hashes ) > 128 {
return nil , engine . TooLargeRequest . With ( fmt . Errorf ( "requested blob count too large: %v" , len ( hashes ) ) )
}
res := make ( [ ] * engine . BlobAndProofV1 , len ( hashes ) )
blobs , proofs := api . eth . TxPool ( ) . GetBlobs ( hashes )
for i := 0 ; i < len ( blobs ) ; i ++ {
if blobs [ i ] != nil {
res [ i ] = & engine . BlobAndProofV1 {
Blob : ( * blobs [ i ] ) [ : ] ,
Proof : ( * proofs [ i ] ) [ : ] ,
}
}
}
return res , nil
}
2022-03-17 18:20:03 +03:00
// NewPayloadV1 creates an Eth1 block, inserts it in the chain, and returns the status of the chain.
2023-02-06 18:37:58 +03:00
func ( api * ConsensusAPI ) NewPayloadV1 ( params engine . ExecutableData ) ( engine . PayloadStatusV1 , error ) {
2023-01-25 17:32:25 +03:00
if params . Withdrawals != nil {
2023-05-25 09:57:34 +03:00
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "withdrawals not supported in V1" ) )
2023-01-25 17:32:25 +03:00
}
2024-10-09 13:24:58 +03:00
return api . newPayload ( params , nil , nil , nil , false )
2023-01-25 17:32:25 +03:00
}
// NewPayloadV2 creates an Eth1 block, inserts it in the chain, and returns the status of the chain.
2023-02-06 18:37:58 +03:00
func ( api * ConsensusAPI ) NewPayloadV2 ( params engine . ExecutableData ) ( engine . PayloadStatusV1 , error ) {
2024-01-23 18:02:08 +03:00
if api . eth . BlockChain ( ) . Config ( ) . IsCancun ( api . eth . BlockChain ( ) . Config ( ) . LondonBlock , params . Timestamp ) {
2024-02-23 11:57:47 +03:00
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "can't use newPayloadV2 post-cancun" ) )
2024-01-23 18:02:08 +03:00
}
if api . eth . BlockChain ( ) . Config ( ) . LatestFork ( params . Timestamp ) == forks . Shanghai {
2023-02-14 21:39:00 +03:00
if params . Withdrawals == nil {
2023-05-25 09:57:34 +03:00
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil withdrawals post-shanghai" ) )
2023-02-14 21:39:00 +03:00
}
2024-01-23 18:02:08 +03:00
} else {
if params . Withdrawals != nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "non-nil withdrawals pre-shanghai" ) )
}
}
if params . ExcessBlobGas != nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "non-nil excessBlobGas pre-cancun" ) )
2023-02-14 21:39:00 +03:00
}
2024-01-23 18:02:08 +03:00
if params . BlobGasUsed != nil {
2024-02-23 11:57:47 +03:00
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "non-nil blobGasUsed pre-cancun" ) )
2023-07-18 10:44:16 +03:00
}
2024-10-09 13:24:58 +03:00
return api . newPayload ( params , nil , nil , nil , false )
2023-01-25 17:32:25 +03:00
}
2023-07-18 10:44:16 +03:00
// NewPayloadV3 creates an Eth1 block, inserts it in the chain, and returns the status of the chain.
2023-08-26 05:52:12 +03:00
func ( api * ConsensusAPI ) NewPayloadV3 ( params engine . ExecutableData , versionedHashes [ ] common . Hash , beaconRoot * common . Hash ) ( engine . PayloadStatusV1 , error ) {
2024-01-23 18:02:08 +03:00
if params . Withdrawals == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil withdrawals post-shanghai" ) )
}
2023-07-27 16:53:28 +03:00
if params . ExcessBlobGas == nil {
2023-08-01 10:07:25 +03:00
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil excessBlobGas post-cancun" ) )
2023-07-18 10:44:16 +03:00
}
2023-08-26 05:52:12 +03:00
if params . BlobGasUsed == nil {
2024-02-23 11:57:47 +03:00
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil blobGasUsed post-cancun" ) )
2023-07-18 10:44:16 +03:00
}
2024-01-23 18:02:08 +03:00
2023-08-26 05:52:12 +03:00
if versionedHashes == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil versionedHashes post-cancun" ) )
}
if beaconRoot == nil {
2024-02-23 11:57:47 +03:00
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil beaconRoot post-cancun" ) )
2023-08-26 05:52:12 +03:00
}
2024-01-23 18:02:08 +03:00
if api . eth . BlockChain ( ) . Config ( ) . LatestFork ( params . Timestamp ) != forks . Cancun {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . UnsupportedFork . With ( errors . New ( "newPayloadV3 must only be called for cancun payloads" ) )
2023-08-26 05:52:12 +03:00
}
2024-10-09 13:24:58 +03:00
return api . newPayload ( params , versionedHashes , beaconRoot , nil , false )
2023-07-18 10:44:16 +03:00
}
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
// NewPayloadV4 creates an Eth1 block, inserts it in the chain, and returns the status of the chain.
2024-10-17 11:05:17 +03:00
func ( api * ConsensusAPI ) NewPayloadV4 ( params engine . ExecutableData , versionedHashes [ ] common . Hash , beaconRoot * common . Hash , executionRequests [ ] hexutil . Bytes ) ( engine . PayloadStatusV1 , error ) {
2024-09-04 15:33:51 +03:00
if params . Withdrawals == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil withdrawals post-shanghai" ) )
}
if params . ExcessBlobGas == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil excessBlobGas post-cancun" ) )
}
if params . BlobGasUsed == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil blobGasUsed post-cancun" ) )
}
if versionedHashes == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil versionedHashes post-cancun" ) )
}
if beaconRoot == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil beaconRoot post-cancun" ) )
}
2024-10-17 11:05:17 +03:00
if executionRequests == nil {
2024-10-09 13:24:58 +03:00
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil executionRequests post-prague" ) )
}
2024-09-04 15:33:51 +03:00
if api . eth . BlockChain ( ) . Config ( ) . LatestFork ( params . Timestamp ) != forks . Prague {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . UnsupportedFork . With ( errors . New ( "newPayloadV4 must only be called for prague payloads" ) )
}
2024-10-17 11:05:17 +03:00
requests := convertRequests ( executionRequests )
2024-10-09 13:24:58 +03:00
return api . newPayload ( params , versionedHashes , beaconRoot , requests , false )
2024-09-04 15:33:51 +03:00
}
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
// NewPayloadWithWitnessV1 is analogous to NewPayloadV1, only it also generates
// and returns a stateless witness after running the payload.
func ( api * ConsensusAPI ) NewPayloadWithWitnessV1 ( params engine . ExecutableData ) ( engine . PayloadStatusV1 , error ) {
if params . Withdrawals != nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "withdrawals not supported in V1" ) )
}
2024-10-09 13:24:58 +03:00
return api . newPayload ( params , nil , nil , nil , true )
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
}
// NewPayloadWithWitnessV2 is analogous to NewPayloadV2, only it also generates
// and returns a stateless witness after running the payload.
func ( api * ConsensusAPI ) NewPayloadWithWitnessV2 ( params engine . ExecutableData ) ( engine . PayloadStatusV1 , error ) {
if api . eth . BlockChain ( ) . Config ( ) . IsCancun ( api . eth . BlockChain ( ) . Config ( ) . LondonBlock , params . Timestamp ) {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "can't use newPayloadV2 post-cancun" ) )
}
if api . eth . BlockChain ( ) . Config ( ) . LatestFork ( params . Timestamp ) == forks . Shanghai {
if params . Withdrawals == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil withdrawals post-shanghai" ) )
}
} else {
if params . Withdrawals != nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "non-nil withdrawals pre-shanghai" ) )
}
}
if params . ExcessBlobGas != nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "non-nil excessBlobGas pre-cancun" ) )
}
if params . BlobGasUsed != nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "non-nil blobGasUsed pre-cancun" ) )
}
2024-10-09 13:24:58 +03:00
return api . newPayload ( params , nil , nil , nil , true )
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
}
// NewPayloadWithWitnessV3 is analogous to NewPayloadV3, only it also generates
// and returns a stateless witness after running the payload.
func ( api * ConsensusAPI ) NewPayloadWithWitnessV3 ( params engine . ExecutableData , versionedHashes [ ] common . Hash , beaconRoot * common . Hash ) ( engine . PayloadStatusV1 , error ) {
if params . Withdrawals == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil withdrawals post-shanghai" ) )
}
if params . ExcessBlobGas == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil excessBlobGas post-cancun" ) )
}
if params . BlobGasUsed == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil blobGasUsed post-cancun" ) )
}
if versionedHashes == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil versionedHashes post-cancun" ) )
}
if beaconRoot == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil beaconRoot post-cancun" ) )
}
if api . eth . BlockChain ( ) . Config ( ) . LatestFork ( params . Timestamp ) != forks . Cancun {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . UnsupportedFork . With ( errors . New ( "newPayloadWithWitnessV3 must only be called for cancun payloads" ) )
}
2024-10-09 13:24:58 +03:00
return api . newPayload ( params , versionedHashes , beaconRoot , nil , true )
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
}
// NewPayloadWithWitnessV4 is analogous to NewPayloadV4, only it also generates
// and returns a stateless witness after running the payload.
2024-10-17 11:05:17 +03:00
func ( api * ConsensusAPI ) NewPayloadWithWitnessV4 ( params engine . ExecutableData , versionedHashes [ ] common . Hash , beaconRoot * common . Hash , executionRequests [ ] hexutil . Bytes ) ( engine . PayloadStatusV1 , error ) {
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
if params . Withdrawals == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil withdrawals post-shanghai" ) )
}
if params . ExcessBlobGas == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil excessBlobGas post-cancun" ) )
}
if params . BlobGasUsed == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil blobGasUsed post-cancun" ) )
}
if versionedHashes == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil versionedHashes post-cancun" ) )
}
if beaconRoot == nil {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil beaconRoot post-cancun" ) )
}
2024-10-17 11:05:17 +03:00
if executionRequests == nil {
2024-10-09 13:24:58 +03:00
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil executionRequests post-prague" ) )
}
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
if api . eth . BlockChain ( ) . Config ( ) . LatestFork ( params . Timestamp ) != forks . Prague {
return engine . PayloadStatusV1 { Status : engine . INVALID } , engine . UnsupportedFork . With ( errors . New ( "newPayloadWithWitnessV4 must only be called for prague payloads" ) )
}
2024-10-17 11:05:17 +03:00
requests := convertRequests ( executionRequests )
2024-10-09 13:24:58 +03:00
return api . newPayload ( params , versionedHashes , beaconRoot , requests , true )
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
}
// ExecuteStatelessPayloadV1 is analogous to NewPayloadV1, only it operates in
// a stateless mode on top of a provided witness instead of the local database.
func ( api * ConsensusAPI ) ExecuteStatelessPayloadV1 ( params engine . ExecutableData , opaqueWitness hexutil . Bytes ) ( engine . StatelessPayloadStatusV1 , error ) {
if params . Withdrawals != nil {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "withdrawals not supported in V1" ) )
}
2024-10-09 13:24:58 +03:00
return api . executeStatelessPayload ( params , nil , nil , nil , opaqueWitness )
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
}
// ExecuteStatelessPayloadV2 is analogous to NewPayloadV2, only it operates in
// a stateless mode on top of a provided witness instead of the local database.
func ( api * ConsensusAPI ) ExecuteStatelessPayloadV2 ( params engine . ExecutableData , opaqueWitness hexutil . Bytes ) ( engine . StatelessPayloadStatusV1 , error ) {
if api . eth . BlockChain ( ) . Config ( ) . IsCancun ( api . eth . BlockChain ( ) . Config ( ) . LondonBlock , params . Timestamp ) {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "can't use newPayloadV2 post-cancun" ) )
}
if api . eth . BlockChain ( ) . Config ( ) . LatestFork ( params . Timestamp ) == forks . Shanghai {
if params . Withdrawals == nil {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil withdrawals post-shanghai" ) )
}
} else {
if params . Withdrawals != nil {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "non-nil withdrawals pre-shanghai" ) )
}
}
if params . ExcessBlobGas != nil {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "non-nil excessBlobGas pre-cancun" ) )
}
if params . BlobGasUsed != nil {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "non-nil blobGasUsed pre-cancun" ) )
}
2024-10-09 13:24:58 +03:00
return api . executeStatelessPayload ( params , nil , nil , nil , opaqueWitness )
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
}
// ExecuteStatelessPayloadV3 is analogous to NewPayloadV3, only it operates in
// a stateless mode on top of a provided witness instead of the local database.
func ( api * ConsensusAPI ) ExecuteStatelessPayloadV3 ( params engine . ExecutableData , versionedHashes [ ] common . Hash , beaconRoot * common . Hash , opaqueWitness hexutil . Bytes ) ( engine . StatelessPayloadStatusV1 , error ) {
if params . Withdrawals == nil {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil withdrawals post-shanghai" ) )
}
if params . ExcessBlobGas == nil {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil excessBlobGas post-cancun" ) )
}
if params . BlobGasUsed == nil {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil blobGasUsed post-cancun" ) )
}
if versionedHashes == nil {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil versionedHashes post-cancun" ) )
}
if beaconRoot == nil {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil beaconRoot post-cancun" ) )
}
if api . eth . BlockChain ( ) . Config ( ) . LatestFork ( params . Timestamp ) != forks . Cancun {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . UnsupportedFork . With ( errors . New ( "executeStatelessPayloadV3 must only be called for cancun payloads" ) )
}
2024-10-09 13:24:58 +03:00
return api . executeStatelessPayload ( params , versionedHashes , beaconRoot , nil , opaqueWitness )
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
}
// ExecuteStatelessPayloadV4 is analogous to NewPayloadV4, only it operates in
// a stateless mode on top of a provided witness instead of the local database.
2024-10-17 11:05:17 +03:00
func ( api * ConsensusAPI ) ExecuteStatelessPayloadV4 ( params engine . ExecutableData , versionedHashes [ ] common . Hash , beaconRoot * common . Hash , executionRequests [ ] hexutil . Bytes , opaqueWitness hexutil . Bytes ) ( engine . StatelessPayloadStatusV1 , error ) {
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
if params . Withdrawals == nil {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil withdrawals post-shanghai" ) )
}
if params . ExcessBlobGas == nil {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil excessBlobGas post-cancun" ) )
}
if params . BlobGasUsed == nil {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil blobGasUsed post-cancun" ) )
}
if versionedHashes == nil {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil versionedHashes post-cancun" ) )
}
if beaconRoot == nil {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil beaconRoot post-cancun" ) )
}
2024-10-17 11:05:17 +03:00
if executionRequests == nil {
2024-10-09 13:24:58 +03:00
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . InvalidParams . With ( errors . New ( "nil executionRequests post-prague" ) )
}
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
if api . eth . BlockChain ( ) . Config ( ) . LatestFork ( params . Timestamp ) != forks . Prague {
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID } , engine . UnsupportedFork . With ( errors . New ( "executeStatelessPayloadV4 must only be called for prague payloads" ) )
}
2024-10-17 11:05:17 +03:00
requests := convertRequests ( executionRequests )
2024-10-09 13:24:58 +03:00
return api . executeStatelessPayload ( params , versionedHashes , beaconRoot , requests , opaqueWitness )
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
}
2024-10-09 13:24:58 +03:00
func ( api * ConsensusAPI ) newPayload ( params engine . ExecutableData , versionedHashes [ ] common . Hash , beaconRoot * common . Hash , requests [ ] [ ] byte , witness bool ) ( engine . PayloadStatusV1 , error ) {
2022-09-21 14:48:09 +03:00
// The locking here is, strictly, not required. Without these locks, this can happen:
//
// 1. NewPayload( execdata-N ) is invoked from the CL. It goes all the way down to
// api.eth.BlockChain().InsertBlockWithoutSetHead, where it is blocked on
// e.g database compaction.
// 2. The call times out on the CL layer, which issues another NewPayload (execdata-N) call.
// Similarly, this also get stuck on the same place. Importantly, since the
// first call has not gone through, the early checks for "do we already have this block"
// will all return false.
// 3. When the db compaction ends, then N calls inserting the same payload are processed
// sequentially.
// Hence, we use a lock here, to be sure that the previous call has finished before we
// check whether we already have the block locally.
api . newPayloadLock . Lock ( )
defer api . newPayloadLock . Unlock ( )
2023-01-25 17:32:25 +03:00
log . Trace ( "Engine API request received" , "method" , "NewPayload" , "number" , params . Number , "hash" , params . BlockHash )
2024-10-09 13:24:58 +03:00
block , err := engine . ExecutableDataToBlock ( params , versionedHashes , beaconRoot , requests )
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 14:23:02 +03:00
if err != nil {
2024-03-15 12:44:41 +03:00
bgu := "nil"
if params . BlobGasUsed != nil {
bgu = strconv . Itoa ( int ( * params . BlobGasUsed ) )
}
ebg := "nil"
2024-08-05 20:14:22 +03:00
if params . ExcessBlobGas != nil {
2024-03-15 12:44:41 +03:00
ebg = strconv . Itoa ( int ( * params . ExcessBlobGas ) )
}
log . Warn ( "Invalid NewPayload params" ,
"params.Number" , params . Number ,
"params.ParentHash" , params . ParentHash ,
"params.BlockHash" , params . BlockHash ,
"params.StateRoot" , params . StateRoot ,
"params.FeeRecipient" , params . FeeRecipient ,
"params.LogsBloom" , common . PrettyBytes ( params . LogsBloom ) ,
"params.Random" , params . Random ,
"params.GasLimit" , params . GasLimit ,
"params.GasUsed" , params . GasUsed ,
"params.Timestamp" , params . Timestamp ,
"params.ExtraData" , common . PrettyBytes ( params . ExtraData ) ,
"params.BaseFeePerGas" , params . BaseFeePerGas ,
"params.BlobGasUsed" , bgu ,
"params.ExcessBlobGas" , ebg ,
"len(params.Transactions)" , len ( params . Transactions ) ,
"len(params.Withdrawals)" , len ( params . Withdrawals ) ,
"beaconRoot" , beaconRoot ,
2024-10-09 13:24:58 +03:00
"len(requests)" , len ( requests ) ,
2024-03-15 12:44:41 +03:00
"error" , err )
2023-09-29 21:27:30 +03:00
return api . invalid ( err , nil ) , nil
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 14:23:02 +03:00
}
2022-08-01 15:13:25 +03:00
// Stash away the last update to warn the user if the beacon client goes offline
api . lastNewPayloadLock . Lock ( )
api . lastNewPayloadUpdate = time . Now ( )
api . lastNewPayloadLock . Unlock ( )
2022-03-11 15:14:45 +03:00
// If we already have the block locally, ignore the entire execution and just
// return a fake success.
if block := api . eth . BlockChain ( ) . GetBlockByHash ( params . BlockHash ) ; block != nil {
log . Warn ( "Ignoring already known beacon payload" , "number" , params . Number , "hash" , params . BlockHash , "age" , common . PrettyAge ( time . Unix ( int64 ( block . Time ( ) ) , 0 ) ) )
2022-03-17 18:20:03 +03:00
hash := block . Hash ( )
2023-02-06 18:37:58 +03:00
return engine . PayloadStatusV1 { Status : engine . VALID , LatestValidHash : & hash } , nil
2022-03-11 15:14:45 +03:00
}
2022-07-25 16:51:04 +03:00
// If this block was rejected previously, keep rejecting it
if res := api . checkInvalidAncestor ( block . Hash ( ) , block . Hash ( ) ) ; res != nil {
return * res , nil
}
2022-03-11 15:14:45 +03:00
// If the parent is missing, we - in theory - could trigger a sync, but that
// would also entail a reorg. That is problematic if multiple sibling blocks
// are being fed to us, and even more so, if some semi-distant uncle shortens
// our live chain. As such, payload execution will not permit reorgs and thus
// will not trigger a sync cycle. That is fine though, if we get a fork choice
// update after legit payload executions.
parent := api . eth . BlockChain ( ) . GetBlock ( block . ParentHash ( ) , block . NumberU64 ( ) - 1 )
if parent == nil {
2024-03-14 02:26:46 +03:00
return api . delayPayloadImport ( block ) , nil
2022-03-11 15:14:45 +03:00
}
// We have an existing parent, do some sanity checks to avoid the beacon client
// triggering too early
var (
2022-05-30 14:28:15 +03:00
ptd = api . eth . BlockChain ( ) . GetTd ( parent . Hash ( ) , parent . NumberU64 ( ) )
ttd = api . eth . BlockChain ( ) . Config ( ) . TerminalTotalDifficulty
gptd = api . eth . BlockChain ( ) . GetTd ( parent . ParentHash ( ) , parent . NumberU64 ( ) - 1 )
2022-03-11 15:14:45 +03:00
)
2022-05-30 14:28:15 +03:00
if ptd . Cmp ( ttd ) < 0 {
log . Warn ( "Ignoring pre-merge payload" , "number" , params . Number , "hash" , params . BlockHash , "td" , ptd , "ttd" , ttd )
2023-02-06 18:37:58 +03:00
return engine . INVALID_TERMINAL_BLOCK , nil
2022-05-30 14:28:15 +03:00
}
if parent . Difficulty ( ) . BitLen ( ) > 0 && gptd != nil && gptd . Cmp ( ttd ) >= 0 {
log . Error ( "Ignoring pre-merge parent block" , "number" , params . Number , "hash" , params . BlockHash , "td" , ptd , "ttd" , ttd )
2023-02-06 18:37:58 +03:00
return engine . INVALID_TERMINAL_BLOCK , nil
2022-03-17 18:20:03 +03:00
}
if block . Time ( ) <= parent . Time ( ) {
log . Warn ( "Invalid timestamp" , "parent" , block . Time ( ) , "block" , block . Time ( ) )
2022-07-25 16:51:04 +03:00
return api . invalid ( errors . New ( "invalid timestamp" ) , parent . Header ( ) ) , nil
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 14:23:02 +03:00
}
2023-09-28 13:15:50 +03:00
// Another corner case: if the node is in snap sync mode, but the CL client
2022-07-01 14:38:26 +03:00
// tries to make it import a block. That should be denied as pushing something
// into the database directly will conflict with the assumptions of snap sync
// that it has an empty db that it can fill itself.
if api . eth . SyncMode ( ) != downloader . FullSync {
2024-03-14 02:26:46 +03:00
return api . delayPayloadImport ( block ) , nil
2022-07-01 14:38:26 +03:00
}
2022-03-29 19:26:18 +03:00
if ! api . eth . BlockChain ( ) . HasBlockAndState ( block . ParentHash ( ) , block . NumberU64 ( ) - 1 ) {
api . remoteBlocks . put ( block . Hash ( ) , block . Header ( ) )
log . Warn ( "State not available, ignoring new payload" )
2023-02-06 18:37:58 +03:00
return engine . PayloadStatusV1 { Status : engine . ACCEPTED } , nil
2022-03-29 19:26:18 +03:00
}
2024-04-16 12:21:20 +03:00
log . Trace ( "Inserting block without sethead" , "hash" , block . Hash ( ) , "number" , block . Number ( ) )
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
proofs , err := api . eth . BlockChain ( ) . InsertBlockWithoutSetHead ( block , witness )
if err != nil {
log . Warn ( "NewPayload: inserting block failed" , "error" , err )
2022-07-25 16:51:04 +03:00
api . invalidLock . Lock ( )
api . invalidBlocksHits [ block . Hash ( ) ] = 1
api . invalidTipsets [ block . Hash ( ) ] = block . Header ( )
api . invalidLock . Unlock ( )
return api . invalid ( err , parent . Header ( ) ) , nil
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 14:23:02 +03:00
}
2022-03-17 18:20:03 +03:00
hash := block . Hash ( )
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
// If witness collection was requested, inject that into the result too
var ow * hexutil . Bytes
if proofs != nil {
ow = new ( hexutil . Bytes )
* ow , _ = rlp . EncodeToBytes ( proofs )
}
return engine . PayloadStatusV1 { Status : engine . VALID , Witness : ow , LatestValidHash : & hash } , nil
}
2024-10-09 13:24:58 +03:00
func ( api * ConsensusAPI ) executeStatelessPayload ( params engine . ExecutableData , versionedHashes [ ] common . Hash , beaconRoot * common . Hash , requests [ ] [ ] byte , opaqueWitness hexutil . Bytes ) ( engine . StatelessPayloadStatusV1 , error ) {
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
log . Trace ( "Engine API request received" , "method" , "ExecuteStatelessPayload" , "number" , params . Number , "hash" , params . BlockHash )
2024-10-09 13:24:58 +03:00
block , err := engine . ExecutableDataToBlockNoHash ( params , versionedHashes , beaconRoot , requests )
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
if err != nil {
bgu := "nil"
if params . BlobGasUsed != nil {
bgu = strconv . Itoa ( int ( * params . BlobGasUsed ) )
}
ebg := "nil"
if params . ExcessBlobGas != nil {
ebg = strconv . Itoa ( int ( * params . ExcessBlobGas ) )
}
log . Warn ( "Invalid ExecuteStatelessPayload params" ,
"params.Number" , params . Number ,
"params.ParentHash" , params . ParentHash ,
"params.BlockHash" , params . BlockHash ,
"params.StateRoot" , params . StateRoot ,
"params.FeeRecipient" , params . FeeRecipient ,
"params.LogsBloom" , common . PrettyBytes ( params . LogsBloom ) ,
"params.Random" , params . Random ,
"params.GasLimit" , params . GasLimit ,
"params.GasUsed" , params . GasUsed ,
"params.Timestamp" , params . Timestamp ,
"params.ExtraData" , common . PrettyBytes ( params . ExtraData ) ,
"params.BaseFeePerGas" , params . BaseFeePerGas ,
"params.BlobGasUsed" , bgu ,
"params.ExcessBlobGas" , ebg ,
"len(params.Transactions)" , len ( params . Transactions ) ,
"len(params.Withdrawals)" , len ( params . Withdrawals ) ,
"beaconRoot" , beaconRoot ,
2024-10-09 13:24:58 +03:00
"len(requests)" , len ( requests ) ,
beacon, core, eth, miner: integrate witnesses into production Geth (#30069)
This PR integrates witness-enabled block production, witness-creating
payload execution and stateless cross-validation into the `engine` API.
The purpose of the PR is to enable the following use-cases (for API
details, please see next section):
- Cross validating locally created blocks:
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Cross validating locally processed blocks:
- Call `newPayloadWithWitness` instead of `newPayload` to trigger
witness creation too.
- Call `executeStatelessPayload` against another client to
cross-validate the block.
- Block production for stateless clients (local or MEV builders):
- Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to
trigger witness creation too.
- Call `getPayload` as before to retrieve the new block and also the
above created witness.
- Propagate witnesses across the consensus libp2p network for stateless
Ethereum.
- Stateless validator validation:
- Call `executeStatelessPayload` with the propagated witness to
statelessly validate the block.
*Note, the various `WithWitness` methods could also *just be* an
additional boolean flag on the base methods, but this PR wanted to keep
the methods separate until a final consensus is reached on how to
integrate in production.*
---
The following `engine` API types are introduced:
```go
// StatelessPayloadStatusV1 is the result of a stateless payload execution.
type StatelessPayloadStatusV1 struct {
Status string `json:"status"`
StateRoot common.Hash `json:"stateRoot"`
ReceiptsRoot common.Hash `json:"receiptsRoot"`
ValidationError *string `json:"validationError"`
}
```
- Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns
as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness
building if block production is requested.
- Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an
additional `witness` field of type `bytes` iff created via
`forkchoiceUpdatedWithWitnessV2,3`.
- Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as
`newPayloadV1,2,3,4`, but triggering a stateless witness creation during
payload execution to allow cross validating it.
- Extend `payloadStatusV1` with a `witness` field of type `bytes` if
returned by `newPayloadWithWitnessV1,2,3,4`.
- Add `executeStatelessPayloadV1,2,3,4` with same base params as
`newPayloadV1,2,3,4` and one more additional param (`witness`) of type
`bytes`. The method returns `statelessPayloadStatusV1`, which mirrors
`payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and
`receiptRoot`.
2024-09-20 16:43:42 +03:00
"error" , err )
errorMsg := err . Error ( )
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID , ValidationError : & errorMsg } , nil
}
witness := new ( stateless . Witness )
if err := rlp . DecodeBytes ( opaqueWitness , witness ) ; err != nil {
log . Warn ( "Invalid ExecuteStatelessPayload witness" , "err" , err )
errorMsg := err . Error ( )
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID , ValidationError : & errorMsg } , nil
}
// Stash away the last update to warn the user if the beacon client goes offline
api . lastNewPayloadLock . Lock ( )
api . lastNewPayloadUpdate = time . Now ( )
api . lastNewPayloadLock . Unlock ( )
log . Trace ( "Executing block statelessly" , "number" , block . Number ( ) , "hash" , params . BlockHash )
stateRoot , receiptRoot , err := core . ExecuteStateless ( api . eth . BlockChain ( ) . Config ( ) , block , witness )
if err != nil {
log . Warn ( "ExecuteStatelessPayload: execution failed" , "err" , err )
errorMsg := err . Error ( )
return engine . StatelessPayloadStatusV1 { Status : engine . INVALID , ValidationError : & errorMsg } , nil
}
return engine . StatelessPayloadStatusV1 { Status : engine . VALID , StateRoot : stateRoot , ReceiptsRoot : receiptRoot } , nil
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 14:23:02 +03:00
}
2022-07-01 14:38:26 +03:00
// delayPayloadImport stashes the given block away for import at a later time,
// either via a forkchoice update or a sync extension. This method is meant to
// be called by the newpayload command when the block seems to be ok, but some
2022-07-25 16:51:04 +03:00
// prerequisite prevents it from being processed (e.g. no parent, or snap sync).
2024-03-14 02:26:46 +03:00
func ( api * ConsensusAPI ) delayPayloadImport ( block * types . Block ) engine . PayloadStatusV1 {
2022-07-25 16:51:04 +03:00
// Sanity check that this block's parent is not on a previously invalidated
// chain. If it is, mark the block as invalid too.
if res := api . checkInvalidAncestor ( block . ParentHash ( ) , block . Hash ( ) ) ; res != nil {
2024-03-14 02:26:46 +03:00
return * res
2022-07-25 16:51:04 +03:00
}
2022-07-01 14:38:26 +03:00
// Stash the block away for a potential forced forkchoice update to it
// at a later time.
api . remoteBlocks . put ( block . Hash ( ) , block . Header ( ) )
// Although we don't want to trigger a sync, if there is one already in
2024-04-19 10:58:14 +03:00
// progress, try to extend it with the current payload request to relieve
2022-07-01 14:38:26 +03:00
// some strain from the forkchoice update.
2023-11-28 10:38:30 +03:00
err := api . eth . Downloader ( ) . BeaconExtend ( api . eth . SyncMode ( ) , block . Header ( ) )
if err == nil {
2022-07-01 14:38:26 +03:00
log . Debug ( "Payload accepted for sync extension" , "number" , block . NumberU64 ( ) , "hash" , block . Hash ( ) )
2024-03-14 02:26:46 +03:00
return engine . PayloadStatusV1 { Status : engine . SYNCING }
2022-07-01 14:38:26 +03:00
}
// Either no beacon sync was started yet, or it rejected the delivered
// payload as non-integratable on top of the existing sync. We'll just
// have to rely on the beacon client to forcefully update the head with
// a forkchoice update request.
2022-07-28 08:46:13 +03:00
if api . eth . SyncMode ( ) == downloader . FullSync {
// In full sync mode, failure to import a well-formed block can only mean
// that the parent state is missing and the syncer rejected extending the
// current cycle with the new payload.
2023-11-28 10:38:30 +03:00
log . Warn ( "Ignoring payload with missing parent" , "number" , block . NumberU64 ( ) , "hash" , block . Hash ( ) , "parent" , block . ParentHash ( ) , "reason" , err )
2022-07-28 08:46:13 +03:00
} else {
// In non-full sync mode (i.e. snap sync) all payloads are rejected until
// snap sync terminates as snap sync relies on direct database injections
// and cannot afford concurrent out-if-band modifications via imports.
2023-11-28 10:38:30 +03:00
log . Warn ( "Ignoring payload while snap syncing" , "number" , block . NumberU64 ( ) , "hash" , block . Hash ( ) , "reason" , err )
2022-07-28 08:46:13 +03:00
}
2024-03-14 02:26:46 +03:00
return engine . PayloadStatusV1 { Status : engine . SYNCING }
2022-07-01 14:38:26 +03:00
}
2022-07-25 16:51:04 +03:00
// setInvalidAncestor is a callback for the downloader to notify us if a bad block
// is encountered during the async sync.
func ( api * ConsensusAPI ) setInvalidAncestor ( invalid * types . Header , origin * types . Header ) {
api . invalidLock . Lock ( )
defer api . invalidLock . Unlock ( )
api . invalidTipsets [ origin . Hash ( ) ] = invalid
api . invalidBlocksHits [ invalid . Hash ( ) ] ++
}
// checkInvalidAncestor checks whether the specified chain end links to a known
// bad ancestor. If yes, it constructs the payload failure response to return.
2023-02-06 18:37:58 +03:00
func ( api * ConsensusAPI ) checkInvalidAncestor ( check common . Hash , head common . Hash ) * engine . PayloadStatusV1 {
2022-07-25 16:51:04 +03:00
api . invalidLock . Lock ( )
defer api . invalidLock . Unlock ( )
// If the hash to check is unknown, return valid
invalid , ok := api . invalidTipsets [ check ]
if ! ok {
return nil
}
// If the bad hash was hit too many times, evict it and try to reprocess in
// the hopes that we have a data race that we can exit out of.
badHash := invalid . Hash ( )
api . invalidBlocksHits [ badHash ] ++
if api . invalidBlocksHits [ badHash ] >= invalidBlockHitEviction {
log . Warn ( "Too many bad block import attempt, trying" , "number" , invalid . Number , "hash" , badHash )
delete ( api . invalidBlocksHits , badHash )
for descendant , badHeader := range api . invalidTipsets {
if badHeader . Hash ( ) == badHash {
delete ( api . invalidTipsets , descendant )
}
}
return nil
}
// Not too many failures yet, mark the head of the invalid chain as invalid
if check != head {
log . Warn ( "Marked new chain head as invalid" , "hash" , head , "badnumber" , invalid . Number , "badhash" , badHash )
for len ( api . invalidTipsets ) >= invalidTipsetsCap {
for key := range api . invalidTipsets {
delete ( api . invalidTipsets , key )
break
}
}
api . invalidTipsets [ head ] = invalid
}
2022-07-28 16:16:15 +03:00
// If the last valid hash is the terminal pow block, return 0x0 for latest valid hash
lastValid := & invalid . ParentHash
if header := api . eth . BlockChain ( ) . GetHeader ( invalid . ParentHash , invalid . Number . Uint64 ( ) - 1 ) ; header != nil && header . Difficulty . Sign ( ) != 0 {
lastValid = & common . Hash { }
}
2022-07-25 16:51:04 +03:00
failure := "links to previously rejected block"
2023-02-06 18:37:58 +03:00
return & engine . PayloadStatusV1 {
Status : engine . INVALID ,
2022-07-28 16:16:15 +03:00
LatestValidHash : lastValid ,
2022-07-25 16:51:04 +03:00
ValidationError : & failure ,
}
}
2023-09-29 21:27:30 +03:00
// invalid returns a response "INVALID" with the latest valid hash supplied by latest.
2023-02-06 18:37:58 +03:00
func ( api * ConsensusAPI ) invalid ( err error , latestValid * types . Header ) engine . PayloadStatusV1 {
2023-09-29 21:27:30 +03:00
var currentHash * common . Hash
2022-05-20 11:12:12 +03:00
if latestValid != nil {
2023-09-29 21:27:30 +03:00
if latestValid . Difficulty . BitLen ( ) != 0 {
// Set latest valid hash to 0x0 if parent is PoW block
currentHash = & common . Hash { }
} else {
2022-06-02 14:15:17 +03:00
// Otherwise set latest valid hash to parent hash
2023-09-29 21:27:30 +03:00
h := latestValid . Hash ( )
currentHash = & h
2022-06-02 14:15:17 +03:00
}
2022-05-20 11:12:12 +03:00
}
2022-03-17 18:20:03 +03:00
errorMsg := err . Error ( )
2023-09-29 21:27:30 +03:00
return engine . PayloadStatusV1 { Status : engine . INVALID , LatestValidHash : currentHash , ValidationError : & errorMsg }
2021-04-16 22:29:22 +03:00
}
2022-08-01 15:13:25 +03:00
2022-08-19 09:00:21 +03:00
// heartbeat loops indefinitely, and checks if there have been beacon client updates
2022-08-01 15:13:25 +03:00
// received in the last while. If not - or if they but strange ones - it warns the
// user that something might be off with their consensus node.
//
// TODO(karalabe): Spin this goroutine down somehow
func ( api * ConsensusAPI ) heartbeat ( ) {
2022-08-22 11:27:39 +03:00
// Sleep a bit on startup since there's obviously no beacon client yet
2022-08-01 15:13:25 +03:00
// attached, so no need to print scary warnings to the user.
2022-08-22 11:27:39 +03:00
time . Sleep ( beaconUpdateStartupTimeout )
2022-08-01 15:13:25 +03:00
2022-08-31 13:28:35 +03:00
// If the network is not yet merged/merging, don't bother continuing.
2023-03-30 22:09:35 +03:00
if api . eth . BlockChain ( ) . Config ( ) . TerminalTotalDifficulty == nil {
2022-08-31 13:28:35 +03:00
return
}
2023-03-30 22:09:35 +03:00
var offlineLogged time . Time
2022-08-01 15:13:25 +03:00
for {
// Sleep a bit and retrieve the last known consensus updates
time . Sleep ( 5 * time . Second )
api . lastTransitionLock . Lock ( )
lastTransitionUpdate := api . lastTransitionUpdate
api . lastTransitionLock . Unlock ( )
api . lastForkchoiceLock . Lock ( )
lastForkchoiceUpdate := api . lastForkchoiceUpdate
api . lastForkchoiceLock . Unlock ( )
api . lastNewPayloadLock . Lock ( )
lastNewPayloadUpdate := api . lastNewPayloadUpdate
api . lastNewPayloadLock . Unlock ( )
// If there have been no updates for the past while, warn the user
// that the beacon client is probably offline
2024-03-05 17:13:28 +03:00
if time . Since ( lastForkchoiceUpdate ) <= beaconUpdateConsensusTimeout || time . Since ( lastNewPayloadUpdate ) <= beaconUpdateConsensusTimeout {
offlineLogged = time . Time { }
continue
}
if time . Since ( offlineLogged ) > beaconUpdateWarnFrequency {
if lastForkchoiceUpdate . IsZero ( ) && lastNewPayloadUpdate . IsZero ( ) {
if lastTransitionUpdate . IsZero ( ) {
log . Warn ( "Post-merge network, but no beacon client seen. Please launch one to follow the chain!" )
2022-08-31 13:28:35 +03:00
} else {
2024-03-05 17:13:28 +03:00
log . Warn ( "Beacon client online, but never received consensus updates. Please ensure your beacon client is operational to follow the chain!" )
2022-08-31 13:28:35 +03:00
}
2024-03-05 17:13:28 +03:00
} else {
log . Warn ( "Beacon client online, but no consensus updates received in a while. Please fix your beacon client to follow the chain!" )
2022-08-31 13:28:35 +03:00
}
2024-03-05 17:13:28 +03:00
offlineLogged = time . Now ( )
2022-08-31 13:28:35 +03:00
}
2024-03-05 17:13:28 +03:00
continue
2022-08-01 15:13:25 +03:00
}
}
2023-01-27 14:03:03 +03:00
// ExchangeCapabilities returns the current methods provided by this node.
func ( api * ConsensusAPI ) ExchangeCapabilities ( [ ] string ) [ ] string {
return caps
}
2023-02-06 12:21:40 +03:00
2024-02-15 14:01:30 +03:00
// GetClientVersionV1 exchanges client version data of this node.
func ( api * ConsensusAPI ) GetClientVersionV1 ( info engine . ClientVersionV1 ) [ ] engine . ClientVersionV1 {
log . Trace ( "Engine API request received" , "method" , "GetClientVersionV1" , "info" , info . String ( ) )
commit := make ( [ ] byte , 4 )
if vcs , ok := version . VCS ( ) ; ok {
commit = common . FromHex ( vcs . Commit ) [ 0 : 4 ]
}
return [ ] engine . ClientVersionV1 {
{
Code : engine . ClientCode ,
Name : engine . ClientName ,
2024-10-20 19:28:39 +03:00
Version : version . WithMeta ,
2024-02-15 14:01:30 +03:00
Commit : hexutil . Encode ( commit ) ,
} ,
}
}
2023-07-18 10:44:16 +03:00
// GetPayloadBodiesByHashV1 implements engine_getPayloadBodiesByHashV1 which allows for retrieval of a list
// of block bodies by the engine api.
2024-09-04 15:33:51 +03:00
func ( api * ConsensusAPI ) GetPayloadBodiesByHashV1 ( hashes [ ] common . Hash ) [ ] * engine . ExecutionPayloadBody {
bodies := make ( [ ] * engine . ExecutionPayloadBody , len ( hashes ) )
for i , hash := range hashes {
block := api . eth . BlockChain ( ) . GetBlockByHash ( hash )
2024-10-09 13:24:58 +03:00
bodies [ i ] = getBody ( block )
2024-09-04 15:33:51 +03:00
}
return bodies
}
// GetPayloadBodiesByHashV2 implements engine_getPayloadBodiesByHashV1 which allows for retrieval of a list
// of block bodies by the engine api.
func ( api * ConsensusAPI ) GetPayloadBodiesByHashV2 ( hashes [ ] common . Hash ) [ ] * engine . ExecutionPayloadBody {
bodies := make ( [ ] * engine . ExecutionPayloadBody , len ( hashes ) )
2023-02-06 12:21:40 +03:00
for i , hash := range hashes {
block := api . eth . BlockChain ( ) . GetBlockByHash ( hash )
bodies [ i ] = getBody ( block )
}
return bodies
}
2023-07-18 10:44:16 +03:00
// GetPayloadBodiesByRangeV1 implements engine_getPayloadBodiesByRangeV1 which allows for retrieval of a range
// of block bodies by the engine api.
2024-09-04 15:33:51 +03:00
func ( api * ConsensusAPI ) GetPayloadBodiesByRangeV1 ( start , count hexutil . Uint64 ) ( [ ] * engine . ExecutionPayloadBody , error ) {
2024-10-09 13:24:58 +03:00
return api . getBodiesByRange ( start , count )
2024-09-04 15:33:51 +03:00
}
// GetPayloadBodiesByRangeV2 implements engine_getPayloadBodiesByRangeV1 which allows for retrieval of a range
// of block bodies by the engine api.
func ( api * ConsensusAPI ) GetPayloadBodiesByRangeV2 ( start , count hexutil . Uint64 ) ( [ ] * engine . ExecutionPayloadBody , error ) {
return api . getBodiesByRange ( start , count )
}
func ( api * ConsensusAPI ) getBodiesByRange ( start , count hexutil . Uint64 ) ( [ ] * engine . ExecutionPayloadBody , error ) {
2023-02-17 21:30:38 +03:00
if start == 0 || count == 0 {
2023-02-06 18:37:58 +03:00
return nil , engine . InvalidParams . With ( fmt . Errorf ( "invalid start or count, start: %v count: %v" , start , count ) )
2023-02-06 12:21:40 +03:00
}
2023-02-17 21:30:38 +03:00
if count > 1024 {
return nil , engine . TooLargeRequest . With ( fmt . Errorf ( "requested count too large: %v" , count ) )
}
2023-02-06 12:21:40 +03:00
// limit count up until current
2023-03-02 09:29:15 +03:00
current := api . eth . BlockChain ( ) . CurrentBlock ( ) . Number . Uint64 ( )
2023-02-08 18:04:40 +03:00
last := uint64 ( start ) + uint64 ( count ) - 1
if last > current {
last = current
2023-02-06 12:21:40 +03:00
}
2024-09-04 15:33:51 +03:00
bodies := make ( [ ] * engine . ExecutionPayloadBody , 0 , uint64 ( count ) )
2023-02-08 18:04:40 +03:00
for i := uint64 ( start ) ; i <= last ; i ++ {
2023-02-06 12:21:40 +03:00
block := api . eth . BlockChain ( ) . GetBlockByNumber ( i )
bodies = append ( bodies , getBody ( block ) )
}
return bodies , nil
}
2024-09-04 15:33:51 +03:00
func getBody ( block * types . Block ) * engine . ExecutionPayloadBody {
2023-02-06 12:21:40 +03:00
if block == nil {
return nil
}
2023-07-18 10:44:16 +03:00
2024-10-09 13:24:58 +03:00
var result engine . ExecutionPayloadBody
2023-07-18 10:44:16 +03:00
2024-10-09 13:24:58 +03:00
result . TransactionData = make ( [ ] hexutil . Bytes , len ( block . Transactions ( ) ) )
for j , tx := range block . Transactions ( ) {
result . TransactionData [ j ] , _ = tx . MarshalBinary ( )
2023-02-06 12:21:40 +03:00
}
2023-07-18 10:44:16 +03:00
2023-02-06 12:21:40 +03:00
// Post-shanghai withdrawals MUST be set to empty slice instead of nil
2024-10-09 13:24:58 +03:00
result . Withdrawals = block . Withdrawals ( )
if block . Withdrawals ( ) == nil && block . Header ( ) . WithdrawalsHash != nil {
result . Withdrawals = [ ] * types . Withdrawal { }
2023-02-06 12:21:40 +03:00
}
2023-07-18 10:44:16 +03:00
2024-10-09 13:24:58 +03:00
return & result
2023-02-06 12:21:40 +03:00
}
2024-10-17 11:05:17 +03:00
// convertRequests converts a hex requests slice to plain [][]byte.
func convertRequests ( hex [ ] hexutil . Bytes ) [ ] [ ] byte {
if hex == nil {
return nil
}
req := make ( [ ] [ ] byte , len ( hex ) )
for i := range hex {
req [ i ] = hex [ i ]
}
return req
}