mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-25 06:06:44 +00:00
* cmd, core, trie: verkle-capable `geth init` (#28270) This change allows the creation of a genesis block for verkle testnets. This makes for a chunk of code that is easier to review and still touches many discussion points. * eth/tracers/js: fix isPush for push0 (#28520) Fixes so that `push0` opcode is correctly reported as `true` by the `IsPush` function --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * trie: spelling - fix comments in hasher (#28507) Co-authored-by: VM <arimas@foxmail.com> * tests/fuzzers: move fuzzers into native packages (#28467) This PR moves our fuzzers from tests/fuzzers into whatever their respective 'native' package is. The historical reason why they were placed in an external location, is that when they were based on go-fuzz, they could not be "hidden" via the _test.go prefix. So in order to shove them away from the go-ethereum "production code", they were put aside. But now we've rewritten them to be based on golang testing, and thus can be brought back. I've left (in tests/) the ones that are not production (bls128381), require non-standard imports (secp requires btcec, bn256 requires gnark/google/cloudflare deps). This PR also adds a fuzzer for precompiled contracts, because why not. This PR utilizes a newly rewritten replacement for go-118-fuzz-build, namely gofuzz-shim, which utilises the inputs from the fuzzing engine better. * tests: skip tests on windows 32bit CI (#28521) tests: skip half the blockchain- and state-tests on windows 32bit CI-tests * cmd/geth: more special cases logging tests (#28527) adds logging tests for errors and custom fmt.Stringer-types which output strings that needs to be quoted/escaped. * accounts,cmd,console,les,metrics: refactor some errors checked by (ST1005) go-staticcheck (#28532) fix: fix some (ST1005)go-staticcheck * miner: run tests in parallel (#28506) Changes many of the tests in the miner package to run in parallel * internal/jsre/deps: fix typo in jsdoc (#28511) minor typo fix * accounts/abi: improve readability of method-to-string conversion (#28530) refactor: improve readability of NewMethod print * all: replace some cases of strings.SplitN with strings.Cut (#28446) * ethdb/memorydb, trie: reduced allocations (#28473) * trie: use pooling of iterator states in iterator The node iterator burns through a lot of memory while iterating a trie, and a lot of that can be avoided by using a fairly small pool (max 40 items). name old time/op new time/op delta Iterator-8 6.22ms ± 3% 5.40ms ± 6% -13.18% (p=0.008 n=5+5) name old alloc/op new alloc/op delta Iterator-8 2.36MB ± 0% 1.67MB ± 0% -29.23% (p=0.008 n=5+5) name old allocs/op new allocs/op delta Iterator-8 37.0k ± 0% 29.8k ± 0% ~ (p=0.079 n=4+5) * ethdb/memorydb: avoid one copying of key By making the transformation from []byte to string at an earlier point, we save an allocation which otherwise happens later on. name old time/op new time/op delta BatchAllocs-8 412µs ± 6% 382µs ± 2% -7.18% (p=0.016 n=5+4) name old alloc/op new alloc/op delta BatchAllocs-8 480kB ± 0% 490kB ± 0% +1.93% (p=0.008 n=5+5) name old allocs/op new allocs/op delta BatchAllocs-8 3.03k ± 0% 2.03k ± 0% -32.98% (p=0.008 n=5+5) * Dockerfile: update Go to 1.21 (#28538) * cmd/evm: validate blockchain tests poststate account storage (#28443) This PR verifies the accounts' storage as specified in a blockchain test's postState field The expect-section, it does really only check that the test works. It's meant for the test-author to verify that "If the test does what it's supposed to, then the nonce of X should be 2, and the slot Y at Z should be 0x123. This expect-section is not exhaustive (not full post-state) It is also not auto-generated, but put there manually by the author. We can still check it, as a test-sanity-check, in geth * signer: run tests in parallel (#28536) marks tests as parallel-safe in package signer * accounts, cmd: fix typos (#28526) * core/txpool/legacypool: respect nolocals-setting (#28435) This change adds a check to ensure that transactions added to the legacy pool are not treated as 'locals' if the global locals-management has been disabled. This change makes the pool enforce the --txpool.pricelimit setting. * cmd: run tests in parallel (#28546) * core/state/snapshot: print correct error from trie iterator (#28560) * cmd/evm: capitalize evm commands (#28569) * standard:fix for a unified standard * standard:fix more as a complements --------- Co-authored-by: haotian <haotian@haotiandeMacBook-Air.local> * accounts/abi: context info on unpack-errors (#28529) adds contextual information to errors returned by unpack * core, trie, rpc: speed up tests (#28461) * rpc: make subscription test faster reduces time for TestClientSubscriptionChannelClose from 25 sec to < 1 sec. * trie: cache trie nodes for faster sanity check This reduces the time spent on TestIncompleteSyncHash from ~25s to ~16s. * core/forkid: speed up validation test This takes the validation test from > 5s to sub 1 sec * core/state: improve snapshot test run brings the time for TestSnapshotRandom from 13s down to 6s * accounts/keystore: improve keyfile test This removes some unnecessary waits and reduces the runtime of TestUpdatedKeyfileContents from 5 to 3 seconds * trie: remove resolver * trie: only check ~5% of all trie nodes * ethdb/pebble: don't double-close iterator inside pebbleIterator (#28566) Adds 'released' flag to pebbleIterator to avoid double closing cockroachdb/pebble.Iterator as it is an invalid operation. Fixes #28565 * eth/filters: reuse error msg for invalid block range (#28479) * core/types: make 'v' optional for DynamicFeeTx and BlobTx (#28564) This fixes an issue where transactions would not be accepted when they have only 'yParity' and not 'v'. * rpc: improve performance of subscription notification encoding (#28328) It turns out that encoding json.RawMessage is slow because package json basically parses the message again to ensure it is valid. We can avoid the slowdown by encoding the entire RPC notification once, which yields a 30% speedup. * cmd/utils: validate pre-existing genesis in --dev mode (#28468) geth --dev can be used with an existing data directory and genesis block. Since dev mode only works with PoS, we need to verify that the merge has happened. Co-authored-by: Felix Lange <fjl@twurst.com> * cmd/geth: add support for --dev flag in dumpgenesis (#28463) Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: lightclient <lightclient@protonmail.com> * les/vflux: run tests in parallel (#28524) * cmd/{geth,utils}: add cmd to export preimages in snap enumeration order (#28256) Adds a subcommand: `geth snapshot export-preimages`, to export preimages of every hash found during a snapshot enumeration: that is, it exports _only the active state_, and not _all_ preimages that have been used but are no longer part of the state. This tool is needed for the verkle transition, in order to distribute the preimages needed for the conversion. Since only the 'active' preimages are exported, the output is shrunk from ~70GB to ~4GB. The order of the output is the order used by the snapshot enumeration, which avoids database thrashing. However, it also means that storage-slot preimages are not deduplicated. * cmd/geth: fix build error (#28585) * cmd/devp2p/internal/ethtest: undo debug-hack (#28588) cmd/devp2p/internal/ethtest: remove a debug-hack flaw which prevented certain tests from running * params: update discV5 bootnodes (#28562) update discV5 bootnodes from https://github.com/eth-clients/eth2-networks/blob/master/shared/mainnet/bootstrap_nodes.txt * cmd, les, tests: remove light client code (#28586) * cmd, les, tests: remove light client code This commit removes the light client (LES) code. Since the merge the light client has been broken and it is hard to maintain it alongside the normal client. We decided it would be best to remove it for now and maybe rework and reintroduce it in the future. * cmd, eth: remove some more mentions of light mode * cmd: re-add flags and mark as deprecated * cmd: warn the user about deprecated flags * eth: better error message * eth, internal/ethapi: drop some weird indirection (#28597) * trie: fix random test generator early terminate (#28590) This change fixes a minor bug in the `randTest.Generate` function, which caused the `quick.Check` to be a no-op. * eth/gasestimator, internal/ethapi: move gas estimator out of rpc (#28600) * go.mod: update uint256 to v1.2.4 (#28612) * eth/catalyst, eth/downloader: expose more sync information (#28584) This change exposes more information from sync module internally * light: remove package light(#28614) This changes removes the package 'light', which is currently unused. * cmd/evm, core/state: fix post-exec dump of state (statetests, blockchaintests) (#28504) There were several problems related to dumping state. - If a preimage was missing, even if we had set the `OnlyWithAddresses` to `false`, to export them anyway, the way the mapping was constructed (using `common.Address` as key) made the entries get lost anyway. Concerns both state- and blockchain tests. - Blockchain test execution was not configured to store preimages. This changes makes it so that the block test executor takes a callback, just like the state test executor already does. This callback can be used to examine the post-execution state, e.g. to aid debugging of test failures. * ethereum: remove TODO comment about subscription (#28609) * eth/tracers/js: fix type inconsistencies (#28488) This change fixes two type-inconsistencies in the JS tracer: - In most places we return byte arrays as a `Uint8Array` to the tracer. However it seems we missed doing the conversion for `ctx` fields which are passed to the tracer during `result`. They are passed as simple arrays. I think Uint8Arrays are more suitable and we should change this inconsistency. Note: this will be a breaking-change. But I believe the effect is small. If we look at our tracers we see that these fields (`ctx.from`, `ctx.to`, etc.) are used in 2 ways. Passed to `toHex` which takes both array or buffer. Or the length was measured which is the same for both types. - The `slice` taking in `int, int` params versus `memory.slice` taking `int64, int64` params. I suggest changing `slice` types to `int64`. This should have no effect almost in any case. * crypto/secp256k1: fix 32-bit tests when CGO_ENABLED=0 (#28602) * consensus: verify the nonexistence of shanghai- and cancun-specific header fields (#28605) * eth/gasestimator: allow slight estimation error in favor of less iterations (#28618) * eth/gasestimator: early exit for plain transfer and error allowance * core, eth/gasestimator: hard guess at a possible required gas * internal/ethapi: update estimation tests with the error ratio * eth/gasestimator: I hate you linter * graphql: fix gas estimation test --------- Co-authored-by: Oren <orenyomtov@users.noreply.github.com> * all: replace log15 with slog (#28187) This PR replaces Geth's logger package (a fork of [log15](https://github.com/inconshreveable/log15)) with an implementation using slog, a logging library included as part of the Go standard library as of Go1.21. Main changes are as follows: * removes any log handlers that were unused in the Geth codebase. * Json, logfmt, and terminal formatters are now slog handlers. * Verbosity level constants are changed to match slog constant values. Internal translation is done to make this opaque to the user and backwards compatible with existing `--verbosity` and `--vmodule` options. * `--log.backtraceat` and `--log.debug` are removed. The external-facing API is largely the same as the existing Geth logger. Logger method signatures remain unchanged. A small semantic difference is that a `Handler` can only be set once per `Logger` and not changed dynamically. This just means that a new logger must be instantiated every time the handler of the root logger is changed. ---- For users of the `go-ethereum/log` module. If you were using this module for your own project, you will need to change the initialization. If you previously did ```golang log.Root().SetHandler(log.LvlFilterHandler(log.LvlInfo, log.StreamHandler(os.Stderr, log.TerminalFormat(true)))) ``` You now instead need to do ```golang log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelInfo, true))) ``` See more about reasoning here: https://github.com/ethereum/go-ethereum/issues/28558#issuecomment-1820606613 * core/state: make stateobject.create selfcontain (#28459) * trie/triedb/hashdb: take lock around access to dirties cache (#28542) Add read locking of db lock around access to dirties cache in hashdb.Database to prevent data race versus hashdb.Database.dereference which can modify the dirities map by deleting an item. Fixes #28541 --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * accounts/abi/bind: fix typo (#28630) * slog: faster and less memory-consumption (#28621) These changes improves the performance of the non-coloured terminal formatting, _quite a lot_. ``` name old time/op new time/op delta TerminalHandler-8 10.2µs ±15% 5.4µs ± 9% -47.02% (p=0.008 n=5+5) name old alloc/op new alloc/op delta TerminalHandler-8 2.17kB ± 0% 0.40kB ± 0% -81.46% (p=0.008 n=5+5) name old allocs/op new allocs/op delta TerminalHandler-8 33.0 ± 0% 5.0 ± 0% -84.85% (p=0.008 n=5+5) ``` I tried to _somewhat_ organize the commits, but the it might still be a bit chaotic. Some core insights: - The function `terminalHandler.Handl` uses a mutex, and writes all output immediately to 'upstream'. Thus, it can reuse a scratch-buffer every time. - This buffer can be propagated internally, making all the internal formatters either write directly to it, - OR, make use of the `tmp := buf.AvailableBuffer()` in some cases, where a byte buffer "extra capacity" can be temporarily used. - The `slog` package uses `Attr` by value. It makes sense to minimize operating on them, since iterating / collecting into a new slice, iterating again etc causes copy-on-heap. Better to operate on them only once. - If we want to do padding, it's better to copy from a constant `space`-buffer than to invoke `bytes.Repeat` every single time. * eth/tracers: tx-level state in debug_traceCall (#28460) * cmd/evm: fix Env struct json tag (#28635) * accounts/abi/bind: fixed typos (#28634) * Update auth.go * Update backend.go * Update bind.go * Update bind_test.go * eth/fetcher: fix invalid tracking of received at time for block (#28637) eth/fetcher: fix invalid tracking of received at time * accounts: run tests in parallel (#28544) * eth/tracers/logger: make structlog/json-log stack hex again (#28628) * common/hexutil: define hex wrappers for uint256.Int * eth/tracers/logger: make structlog/json-log stack hex again * common/hexutil: goimports * log: remove lazy, remove unused interfaces, unexport methods (#28622) This change - Removes interface `log.Format`, - Removes method `log.FormatFunc`, - unexports `TerminalHandler.TerminalFormat` formatting methods (renamed to `TerminalHandler.format`) - removes the notion of `log.Lazy` values The lazy handler was useful in the old log package, since it could defer the evaluation of costly attributes until later in the log pipeline: thus, if the logging was done at 'Trace', we could skip evaluation if logging only was set to 'Info'. With the move to slog, this way of deferring evaluation is no longer needed, since slog introduced 'Enabled': the caller can thus do the evaluate-or-not decision at the callsite, which is much more straight-forward than dealing with lazy reflect-based evaluation. Also, lazy evaluation would not work with 'native' slog, as in, these two statements would be evaluated differently: ```golang log.Info("foo", "my lazy", lazyObj) slog.Info("foo", "my lazy", lazyObj) ``` * .github: use github actions to run 32-bit linux tests (#28549) use github actions to run 32-bit linux tests * ethdb/pebble: remove a dependency (#28627) The dependency was not really used anyway, so we can get rid of it. Co-authored-by: Felix Lange <fjl@twurst.com> * tests/fuzzers/bls12381: deactivate BLS fuzzer when CGO_ENABLED=0 (#28653) tests/fuzzers/bls12381: deactivate fuzzer when CGO_ENABLED=0 * build: upgrade -dlgo version to Go 1.21.5 (#28648) * rpc: fix ns/µs mismatch in metrics (#28649) The rpc/duration/all meter was in nanoseconds, the individual meter in microseconds. This PR changes it so both of them use nanoseconds. * cmd/evm: fix dump after state-test exec (#28650) The dump after state-test didn't work, the problem was an error, "Already committed", which was silently ignored. This change re-initialises the state, so the dumping works again. * beacon/light: add CommitteeChain (#27766) This change implements CommitteeChain which is a key component of the beacon light client. It is a passive data structure that can validate, hold and update a chain of beacon light sync committees and updates, starting from a checkpoint that proves the starting committee through a beacon block hash, header and corresponding state. Once synced to the current sync period, CommitteeChain can also validate signed beacon headers. * cmd/utils, eth: disallow invalid snap sync / snapshot flag combos (#28657) * eth: prevent startup in snap mode without snapshots * cmd/utils: try to fix bad flag combos wrt snap sync and snapshot generation * trie: remove inconsistent trie nodes during sync in path mode (#28595) This fixes a database corruption issue that could occur during state healing. When sync is aborted while certain modifications were already committed, and a reorg occurs, the database would contain incorrect trie nodes stored by path. These nodes need to detected/deleted in order to obtain a complete and fully correct state after state healing. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * cmd/utils: fix HTTPHost, WSHost flag priority (#28669) Co-authored-by: Felix Lange <fjl@twurst.com> * eth/protocols/eth: fix typos in comments (#28652) * core/txpool : small cleanup refactors (#28654) * eth/fetcher, eth/gasestimator: fix typos in comments (#28675) * all: fix typos in comments (#28662) Co-authored-by: Felix Lange <fjl@twurst.com> * miner: eliminate the dead loop possibility for `newWorkLoop` and `mainLoop` (#28677) discard the intervalAdjust message if the channel is full * all: fix typos in comments (#28682) chore(core,eth):fix a couple of typos * p2p/discover: add liveness check in collectTableNodes (#28686) * p2p/discover: add liveness check in collectTableNodes * p2p/discover: fix test * p2p/discover: rename to appendLiveNodes * p2p/discover: add dedup logic back * p2p/discover: simplify * p2p/discover: fix issue found by test * internal/flags: add missing flag types for auto-env-var generation (#28692) Certain flags, such as `--rpc.txfeecap` currently do not have an env-var auto-generated for them. This change adds three missing cli flag types to the auto env-var helper function to fix this. * cmd/evm: default to mirror mainnet forks enabled (#28691) cmd/evm: default to using dev chain config (all mainnet HFs activated at block/timestamp 0 * cmd/evm, cmd/clef, cmd/bootnode: fix / unify logging (#28696) This change fixes a problem with our non-core binaries: evm, clef, bootnode. First of all, they failed to convert from legacy loglevels 1 to 5, to the new slog loglevels -4 to 4. Secondly, the logging was actually setup in the init phase, and then overridden in the main. This is not needed for evm, since it used the same flag name as the main geth verbosity. Better to let the flags/internal handle the logging init. * cmd/evm: t8n support custom tracers (#28557) This change implements ability for the `evm t8n` tool to use custom tracers; either 'native' golang tracers or javascript tracers. * params: release go-ethereum v1.13.6 stable * Fix build errors * Fix test-integration --------- Co-authored-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Co-authored-by: Sina Mahmoodi <1591639+s1na@users.noreply.github.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: VM <112189277+sysvm@users.noreply.github.com> Co-authored-by: VM <arimas@foxmail.com> Co-authored-by: jwasinger <j-wasinger@hotmail.com> Co-authored-by: Zoro <40222601+BabyHalimao@users.noreply.github.com> Co-authored-by: Håvard Anda Estensen <haavard.ae@gmail.com> Co-authored-by: aliening <128203330+aliening@users.noreply.github.com> Co-authored-by: Halimao <1065621723@qq.com> Co-authored-by: danceratopz <danceratopz@gmail.com> Co-authored-by: levisyin <150114626+levisyin@users.noreply.github.com> Co-authored-by: jp-imx <109574657+jp-imx@users.noreply.github.com> Co-authored-by: rjl493456442 <garyrong0905@gmail.com> Co-authored-by: Haotian <51777534+tmelhao@users.noreply.github.com> Co-authored-by: haotian <haotian@haotiandeMacBook-Air.local> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: Maciej Kulawik <10907694+magicxyyz@users.noreply.github.com> Co-authored-by: ucwong <ucwong@126.com> Co-authored-by: Mario Vega <marioevz@gmail.com> Co-authored-by: Delweng <delweng@gmail.com> Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: lightclient <lightclient@protonmail.com> Co-authored-by: Mikel Cortes <45786396+cortze@users.noreply.github.com> Co-authored-by: Péter Szilágyi <peterke@gmail.com> Co-authored-by: Ng Wei Han <47109095+weiihann@users.noreply.github.com> Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> Co-authored-by: Shivam Sandbhor <shivam.sandbhor@gmail.com> Co-authored-by: Jakub Freebit <49676311+jakub-freebit@users.noreply.github.com> Co-authored-by: Oren <orenyomtov@users.noreply.github.com> Co-authored-by: BorkBorked <107079055+BorkBorked@users.noreply.github.com> Co-authored-by: ddl <dengdiliang@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> Co-authored-by: Marius Kjærstad <sandakersmann@users.noreply.github.com> Co-authored-by: Felföldi Zsolt <zsfelfoldi@gmail.com> Co-authored-by: Ford <153042616+guerrierindien@users.noreply.github.com> Co-authored-by: Ursulafe <152976968+Ursulafe@users.noreply.github.com> Co-authored-by: Elias Rad <146735585+nnsW3@users.noreply.github.com> Co-authored-by: FletcherMan <fanciture@163.com> Co-authored-by: alex <152680487+bodhi-crypo@users.noreply.github.com> Co-authored-by: Sebastian Stammler <seb@oplabs.co>
514 lines
19 KiB
Go
514 lines
19 KiB
Go
// Copyright 2023 The go-ethereum Authors
|
|
// 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 light
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"math"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/ethereum/go-ethereum/beacon/params"
|
|
"github.com/ethereum/go-ethereum/beacon/types"
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/common/lru"
|
|
"github.com/ethereum/go-ethereum/common/mclock"
|
|
"github.com/ethereum/go-ethereum/core/rawdb"
|
|
"github.com/ethereum/go-ethereum/ethdb"
|
|
"github.com/ethereum/go-ethereum/log"
|
|
)
|
|
|
|
var (
|
|
ErrNeedCommittee = errors.New("sync committee required")
|
|
ErrInvalidUpdate = errors.New("invalid committee update")
|
|
ErrInvalidPeriod = errors.New("invalid update period")
|
|
ErrWrongCommitteeRoot = errors.New("wrong committee root")
|
|
ErrCannotReorg = errors.New("can not reorg committee chain")
|
|
)
|
|
|
|
// CommitteeChain is a passive data structure that can validate, hold and update
|
|
// a chain of beacon light sync committees and updates. It requires at least one
|
|
// externally set fixed committee root at the beginning of the chain which can
|
|
// be set either based on a BootstrapData or a trusted source (a local beacon
|
|
// full node). This makes the structure useful for both light client and light
|
|
// server setups.
|
|
//
|
|
// It always maintains the following consistency constraints:
|
|
// - a committee can only be present if its root hash matches an existing fixed
|
|
// root or if it is proven by an update at the previous period
|
|
// - an update can only be present if a committee is present at the same period
|
|
// and the update signature is valid and has enough participants.
|
|
// The committee at the next period (proven by the update) should also be
|
|
// present (note that this means they can only be added together if neither
|
|
// is present yet). If a fixed root is present at the next period then the
|
|
// update can only be present if it proves the same committee root.
|
|
//
|
|
// Once synced to the current sync period, CommitteeChain can also validate
|
|
// signed beacon headers.
|
|
type CommitteeChain struct {
|
|
// chainmu guards against concurrent access to the canonicalStore structures
|
|
// (updates, committees, fixedCommitteeRoots) and ensures that they stay consistent
|
|
// with each other and with committeeCache.
|
|
chainmu sync.RWMutex
|
|
db ethdb.KeyValueStore
|
|
updates *canonicalStore[*types.LightClientUpdate]
|
|
committees *canonicalStore[*types.SerializedSyncCommittee]
|
|
fixedCommitteeRoots *canonicalStore[common.Hash]
|
|
committeeCache *lru.Cache[uint64, syncCommittee] // cache deserialized committees
|
|
|
|
clock mclock.Clock // monotonic clock (simulated clock in tests)
|
|
unixNano func() int64 // system clock (simulated clock in tests)
|
|
sigVerifier committeeSigVerifier // BLS sig verifier (dummy verifier in tests)
|
|
|
|
config *types.ChainConfig
|
|
signerThreshold int
|
|
minimumUpdateScore types.UpdateScore
|
|
enforceTime bool // enforceTime specifies whether the age of a signed header should be checked
|
|
}
|
|
|
|
// NewCommitteeChain creates a new CommitteeChain.
|
|
func NewCommitteeChain(db ethdb.KeyValueStore, config *types.ChainConfig, signerThreshold int, enforceTime bool) *CommitteeChain {
|
|
return newCommitteeChain(db, config, signerThreshold, enforceTime, blsVerifier{}, &mclock.System{}, func() int64 { return time.Now().UnixNano() })
|
|
}
|
|
|
|
// newCommitteeChain creates a new CommitteeChain with the option of replacing the
|
|
// clock source and signature verification for testing purposes.
|
|
func newCommitteeChain(db ethdb.KeyValueStore, config *types.ChainConfig, signerThreshold int, enforceTime bool, sigVerifier committeeSigVerifier, clock mclock.Clock, unixNano func() int64) *CommitteeChain {
|
|
s := &CommitteeChain{
|
|
committeeCache: lru.NewCache[uint64, syncCommittee](10),
|
|
db: db,
|
|
sigVerifier: sigVerifier,
|
|
clock: clock,
|
|
unixNano: unixNano,
|
|
config: config,
|
|
signerThreshold: signerThreshold,
|
|
enforceTime: enforceTime,
|
|
minimumUpdateScore: types.UpdateScore{
|
|
SignerCount: uint32(signerThreshold),
|
|
SubPeriodIndex: params.SyncPeriodLength / 16,
|
|
},
|
|
}
|
|
|
|
var err1, err2, err3 error
|
|
if s.fixedCommitteeRoots, err1 = newCanonicalStore[common.Hash](db, rawdb.FixedCommitteeRootKey); err1 != nil {
|
|
log.Error("Error creating fixed committee root store", "error", err1)
|
|
}
|
|
if s.committees, err2 = newCanonicalStore[*types.SerializedSyncCommittee](db, rawdb.SyncCommitteeKey); err2 != nil {
|
|
log.Error("Error creating committee store", "error", err2)
|
|
}
|
|
if s.updates, err3 = newCanonicalStore[*types.LightClientUpdate](db, rawdb.BestUpdateKey); err3 != nil {
|
|
log.Error("Error creating update store", "error", err3)
|
|
}
|
|
if err1 != nil || err2 != nil || err3 != nil || !s.checkConstraints() {
|
|
log.Info("Resetting invalid committee chain")
|
|
s.Reset()
|
|
}
|
|
// roll back invalid updates (might be necessary if forks have been changed since last time)
|
|
for !s.updates.periods.isEmpty() {
|
|
update, ok := s.updates.get(s.db, s.updates.periods.End-1)
|
|
if !ok {
|
|
log.Error("Sync committee update missing", "period", s.updates.periods.End-1)
|
|
s.Reset()
|
|
break
|
|
}
|
|
if valid, err := s.verifyUpdate(update); err != nil {
|
|
log.Error("Error validating update", "period", s.updates.periods.End-1, "error", err)
|
|
} else if valid {
|
|
break
|
|
}
|
|
if err := s.rollback(s.updates.periods.End); err != nil {
|
|
log.Error("Error writing batch into chain database", "error", err)
|
|
}
|
|
}
|
|
if !s.committees.periods.isEmpty() {
|
|
log.Trace("Sync committee chain loaded", "first period", s.committees.periods.Start, "last period", s.committees.periods.End-1)
|
|
}
|
|
return s
|
|
}
|
|
|
|
// checkConstraints checks committee chain validity constraints
|
|
func (s *CommitteeChain) checkConstraints() bool {
|
|
isNotInFixedCommitteeRootRange := func(r periodRange) bool {
|
|
return s.fixedCommitteeRoots.periods.isEmpty() ||
|
|
r.Start < s.fixedCommitteeRoots.periods.Start ||
|
|
r.Start >= s.fixedCommitteeRoots.periods.End
|
|
}
|
|
|
|
valid := true
|
|
if !s.updates.periods.isEmpty() {
|
|
if isNotInFixedCommitteeRootRange(s.updates.periods) {
|
|
log.Error("Start update is not in the fixed roots range")
|
|
valid = false
|
|
}
|
|
if s.committees.periods.Start > s.updates.periods.Start || s.committees.periods.End <= s.updates.periods.End {
|
|
log.Error("Missing committees in update range")
|
|
valid = false
|
|
}
|
|
}
|
|
if !s.committees.periods.isEmpty() {
|
|
if isNotInFixedCommitteeRootRange(s.committees.periods) {
|
|
log.Error("Start committee is not in the fixed roots range")
|
|
valid = false
|
|
}
|
|
if s.committees.periods.End > s.fixedCommitteeRoots.periods.End && s.committees.periods.End > s.updates.periods.End+1 {
|
|
log.Error("Last committee is neither in the fixed roots range nor proven by updates")
|
|
valid = false
|
|
}
|
|
}
|
|
return valid
|
|
}
|
|
|
|
// Reset resets the committee chain.
|
|
func (s *CommitteeChain) Reset() {
|
|
s.chainmu.Lock()
|
|
defer s.chainmu.Unlock()
|
|
|
|
if err := s.rollback(0); err != nil {
|
|
log.Error("Error writing batch into chain database", "error", err)
|
|
}
|
|
}
|
|
|
|
// CheckpointInit initializes a CommitteeChain based on the checkpoint.
|
|
// Note: if the chain is already initialized and the committees proven by the
|
|
// checkpoint do match the existing chain then the chain is retained and the
|
|
// new checkpoint becomes fixed.
|
|
func (s *CommitteeChain) CheckpointInit(bootstrap *types.BootstrapData) error {
|
|
s.chainmu.Lock()
|
|
defer s.chainmu.Unlock()
|
|
|
|
if err := bootstrap.Validate(); err != nil {
|
|
return err
|
|
}
|
|
|
|
period := bootstrap.Header.SyncPeriod()
|
|
if err := s.deleteFixedCommitteeRootsFrom(period + 2); err != nil {
|
|
s.Reset()
|
|
return err
|
|
}
|
|
if s.addFixedCommitteeRoot(period, bootstrap.CommitteeRoot) != nil {
|
|
s.Reset()
|
|
if err := s.addFixedCommitteeRoot(period, bootstrap.CommitteeRoot); err != nil {
|
|
s.Reset()
|
|
return err
|
|
}
|
|
}
|
|
if err := s.addFixedCommitteeRoot(period+1, common.Hash(bootstrap.CommitteeBranch[0])); err != nil {
|
|
s.Reset()
|
|
return err
|
|
}
|
|
if err := s.addCommittee(period, bootstrap.Committee); err != nil {
|
|
s.Reset()
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// addFixedCommitteeRoot sets a fixed committee root at the given period.
|
|
// Note that the period where the first committee is added has to have a fixed
|
|
// root which can either come from a BootstrapData or a trusted source.
|
|
func (s *CommitteeChain) addFixedCommitteeRoot(period uint64, root common.Hash) error {
|
|
if root == (common.Hash{}) {
|
|
return ErrWrongCommitteeRoot
|
|
}
|
|
|
|
batch := s.db.NewBatch()
|
|
oldRoot := s.getCommitteeRoot(period)
|
|
if !s.fixedCommitteeRoots.periods.canExpand(period) {
|
|
// Note: the fixed committee root range should always be continuous and
|
|
// therefore the expected syncing method is to forward sync and optionally
|
|
// backward sync periods one by one, starting from a checkpoint. The only
|
|
// case when a root that is not adjacent to the already fixed ones can be
|
|
// fixed is when the same root has already been proven by an update chain.
|
|
// In this case the all roots in between can and should be fixed.
|
|
// This scenario makes sense when a new trusted checkpoint is added to an
|
|
// existing chain, ensuring that it will not be rolled back (might be
|
|
// important in case of low signer participation rate).
|
|
if root != oldRoot {
|
|
return ErrInvalidPeriod
|
|
}
|
|
// if the old root exists and matches the new one then it is guaranteed
|
|
// that the given period is after the existing fixed range and the roots
|
|
// in between can also be fixed.
|
|
for p := s.fixedCommitteeRoots.periods.End; p < period; p++ {
|
|
if err := s.fixedCommitteeRoots.add(batch, p, s.getCommitteeRoot(p)); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
if oldRoot != (common.Hash{}) && (oldRoot != root) {
|
|
// existing old root was different, we have to reorg the chain
|
|
if err := s.rollback(period); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
if err := s.fixedCommitteeRoots.add(batch, period, root); err != nil {
|
|
return err
|
|
}
|
|
if err := batch.Write(); err != nil {
|
|
log.Error("Error writing batch into chain database", "error", err)
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// deleteFixedCommitteeRootsFrom deletes fixed roots starting from the given period.
|
|
// It also maintains chain consistency, meaning that it also deletes updates and
|
|
// committees if they are no longer supported by a valid update chain.
|
|
func (s *CommitteeChain) deleteFixedCommitteeRootsFrom(period uint64) error {
|
|
if period >= s.fixedCommitteeRoots.periods.End {
|
|
return nil
|
|
}
|
|
batch := s.db.NewBatch()
|
|
s.fixedCommitteeRoots.deleteFrom(batch, period)
|
|
if s.updates.periods.isEmpty() || period <= s.updates.periods.Start {
|
|
// Note: the first period of the update chain should always be fixed so if
|
|
// the fixed root at the first update is removed then the entire update chain
|
|
// and the proven committees have to be removed. Earlier committees in the
|
|
// remaining fixed root range can stay.
|
|
s.updates.deleteFrom(batch, period)
|
|
s.deleteCommitteesFrom(batch, period)
|
|
} else {
|
|
// The update chain stays intact, some previously fixed committee roots might
|
|
// get unfixed but are still proven by the update chain. If there were
|
|
// committees present after the range proven by updates, those should be
|
|
// removed if the belonging fixed roots are also removed.
|
|
fromPeriod := s.updates.periods.End + 1 // not proven by updates
|
|
if period > fromPeriod {
|
|
fromPeriod = period // also not justified by fixed roots
|
|
}
|
|
s.deleteCommitteesFrom(batch, fromPeriod)
|
|
}
|
|
if err := batch.Write(); err != nil {
|
|
log.Error("Error writing batch into chain database", "error", err)
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// deleteCommitteesFrom deletes committees starting from the given period.
|
|
func (s *CommitteeChain) deleteCommitteesFrom(batch ethdb.Batch, period uint64) {
|
|
deleted := s.committees.deleteFrom(batch, period)
|
|
for period := deleted.Start; period < deleted.End; period++ {
|
|
s.committeeCache.Remove(period)
|
|
}
|
|
}
|
|
|
|
// addCommittee adds a committee at the given period if possible.
|
|
func (s *CommitteeChain) addCommittee(period uint64, committee *types.SerializedSyncCommittee) error {
|
|
if !s.committees.periods.canExpand(period) {
|
|
return ErrInvalidPeriod
|
|
}
|
|
root := s.getCommitteeRoot(period)
|
|
if root == (common.Hash{}) {
|
|
return ErrInvalidPeriod
|
|
}
|
|
if root != committee.Root() {
|
|
return ErrWrongCommitteeRoot
|
|
}
|
|
if !s.committees.periods.contains(period) {
|
|
if err := s.committees.add(s.db, period, committee); err != nil {
|
|
return err
|
|
}
|
|
s.committeeCache.Remove(period)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// InsertUpdate adds a new update if possible.
|
|
func (s *CommitteeChain) InsertUpdate(update *types.LightClientUpdate, nextCommittee *types.SerializedSyncCommittee) error {
|
|
s.chainmu.Lock()
|
|
defer s.chainmu.Unlock()
|
|
|
|
period := update.AttestedHeader.Header.SyncPeriod()
|
|
if !s.updates.periods.canExpand(period) || !s.committees.periods.contains(period) {
|
|
return ErrInvalidPeriod
|
|
}
|
|
if s.minimumUpdateScore.BetterThan(update.Score()) {
|
|
return ErrInvalidUpdate
|
|
}
|
|
oldRoot := s.getCommitteeRoot(period + 1)
|
|
reorg := oldRoot != (common.Hash{}) && oldRoot != update.NextSyncCommitteeRoot
|
|
if oldUpdate, ok := s.updates.get(s.db, period); ok && !update.Score().BetterThan(oldUpdate.Score()) {
|
|
// a better or equal update already exists; no changes, only fail if new one tried to reorg
|
|
if reorg {
|
|
return ErrCannotReorg
|
|
}
|
|
return nil
|
|
}
|
|
if s.fixedCommitteeRoots.periods.contains(period+1) && reorg {
|
|
return ErrCannotReorg
|
|
}
|
|
if ok, err := s.verifyUpdate(update); err != nil {
|
|
return err
|
|
} else if !ok {
|
|
return ErrInvalidUpdate
|
|
}
|
|
addCommittee := !s.committees.periods.contains(period+1) || reorg
|
|
if addCommittee {
|
|
if nextCommittee == nil {
|
|
return ErrNeedCommittee
|
|
}
|
|
if nextCommittee.Root() != update.NextSyncCommitteeRoot {
|
|
return ErrWrongCommitteeRoot
|
|
}
|
|
}
|
|
if reorg {
|
|
if err := s.rollback(period + 1); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
batch := s.db.NewBatch()
|
|
if addCommittee {
|
|
if err := s.committees.add(batch, period+1, nextCommittee); err != nil {
|
|
return err
|
|
}
|
|
s.committeeCache.Remove(period + 1)
|
|
}
|
|
if err := s.updates.add(batch, period, update); err != nil {
|
|
return err
|
|
}
|
|
if err := batch.Write(); err != nil {
|
|
log.Error("Error writing batch into chain database", "error", err)
|
|
return err
|
|
}
|
|
log.Info("Inserted new committee update", "period", period, "next committee root", update.NextSyncCommitteeRoot)
|
|
return nil
|
|
}
|
|
|
|
// NextSyncPeriod returns the next period where an update can be added and also
|
|
// whether the chain is initialized at all.
|
|
func (s *CommitteeChain) NextSyncPeriod() (uint64, bool) {
|
|
s.chainmu.RLock()
|
|
defer s.chainmu.RUnlock()
|
|
|
|
if s.committees.periods.isEmpty() {
|
|
return 0, false
|
|
}
|
|
if !s.updates.periods.isEmpty() {
|
|
return s.updates.periods.End, true
|
|
}
|
|
return s.committees.periods.End - 1, true
|
|
}
|
|
|
|
// rollback removes all committees and fixed roots from the given period and updates
|
|
// starting from the previous period.
|
|
func (s *CommitteeChain) rollback(period uint64) error {
|
|
max := s.updates.periods.End + 1
|
|
if s.committees.periods.End > max {
|
|
max = s.committees.periods.End
|
|
}
|
|
if s.fixedCommitteeRoots.periods.End > max {
|
|
max = s.fixedCommitteeRoots.periods.End
|
|
}
|
|
for max > period {
|
|
max--
|
|
batch := s.db.NewBatch()
|
|
s.deleteCommitteesFrom(batch, max)
|
|
s.fixedCommitteeRoots.deleteFrom(batch, max)
|
|
if max > 0 {
|
|
s.updates.deleteFrom(batch, max-1)
|
|
}
|
|
if err := batch.Write(); err != nil {
|
|
log.Error("Error writing batch into chain database", "error", err)
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// getCommitteeRoot returns the committee root at the given period, either fixed,
|
|
// proven by a previous update or both. It returns an empty hash if the committee
|
|
// root is unknown.
|
|
func (s *CommitteeChain) getCommitteeRoot(period uint64) common.Hash {
|
|
if root, ok := s.fixedCommitteeRoots.get(s.db, period); ok || period == 0 {
|
|
return root
|
|
}
|
|
if update, ok := s.updates.get(s.db, period-1); ok {
|
|
return update.NextSyncCommitteeRoot
|
|
}
|
|
return common.Hash{}
|
|
}
|
|
|
|
// getSyncCommittee returns the deserialized sync committee at the given period.
|
|
func (s *CommitteeChain) getSyncCommittee(period uint64) (syncCommittee, error) {
|
|
if c, ok := s.committeeCache.Get(period); ok {
|
|
return c, nil
|
|
}
|
|
if sc, ok := s.committees.get(s.db, period); ok {
|
|
c, err := s.sigVerifier.deserializeSyncCommittee(sc)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("Sync committee #%d deserialization error: %v", period, err)
|
|
}
|
|
s.committeeCache.Add(period, c)
|
|
return c, nil
|
|
}
|
|
return nil, fmt.Errorf("Missing serialized sync committee #%d", period)
|
|
}
|
|
|
|
// VerifySignedHeader returns true if the given signed header has a valid signature
|
|
// according to the local committee chain. The caller should ensure that the
|
|
// committees advertised by the same source where the signed header came from are
|
|
// synced before verifying the signature.
|
|
// The age of the header is also returned (the time elapsed since the beginning
|
|
// of the given slot, according to the local system clock). If enforceTime is
|
|
// true then negative age (future) headers are rejected.
|
|
func (s *CommitteeChain) VerifySignedHeader(head types.SignedHeader) (bool, time.Duration, error) {
|
|
s.chainmu.RLock()
|
|
defer s.chainmu.RUnlock()
|
|
|
|
return s.verifySignedHeader(head)
|
|
}
|
|
|
|
func (s *CommitteeChain) verifySignedHeader(head types.SignedHeader) (bool, time.Duration, error) {
|
|
var age time.Duration
|
|
now := s.unixNano()
|
|
if head.Header.Slot < (uint64(now-math.MinInt64)/uint64(time.Second)-s.config.GenesisTime)/12 {
|
|
age = time.Duration(now - int64(time.Second)*int64(s.config.GenesisTime+head.Header.Slot*12))
|
|
} else {
|
|
age = time.Duration(math.MinInt64)
|
|
}
|
|
if s.enforceTime && age < 0 {
|
|
return false, age, nil
|
|
}
|
|
committee, err := s.getSyncCommittee(types.SyncPeriod(head.SignatureSlot))
|
|
if err != nil {
|
|
return false, 0, err
|
|
}
|
|
if committee == nil {
|
|
return false, age, nil
|
|
}
|
|
if signingRoot, err := s.config.Forks.SigningRoot(head.Header); err == nil {
|
|
return s.sigVerifier.verifySignature(committee, signingRoot, &head.Signature), age, nil
|
|
}
|
|
return false, age, nil
|
|
}
|
|
|
|
// verifyUpdate checks whether the header signature is correct and the update
|
|
// fits into the specified constraints (assumes that the update has been
|
|
// successfully validated previously)
|
|
func (s *CommitteeChain) verifyUpdate(update *types.LightClientUpdate) (bool, error) {
|
|
// Note: SignatureSlot determines the sync period of the committee used for signature
|
|
// verification. Though in reality SignatureSlot is always bigger than update.Header.Slot,
|
|
// setting them as equal here enforces the rule that they have to be in the same sync
|
|
// period in order for the light client update proof to be meaningful.
|
|
ok, age, err := s.verifySignedHeader(update.AttestedHeader)
|
|
if age < 0 {
|
|
log.Warn("Future committee update received", "age", age)
|
|
}
|
|
return ok, err
|
|
}
|