mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-30 16:43:46 +00:00
* ethdb/pebble: fix nil callbacks (#26650) * eth/downloader: fix timeout resurrection panic (#26652) * common/prque, eth/downloader: fix timeout resurrection panic * common/prque: revert -1 hack for les, temporaryly! * core/state, trie: remove unused error-return from trie Commit operation (#26641) * go.mod: update pebble to latest master (#26654) * core/vm: set tracer-observable `value` of a delegatecall to match parent `value` (#26632) This is a breaking change in the tracing hooks API as well as semantics of the callTracer: - CaptureEnter hook provided a nil value argument in case of DELEGATECALL. However to stay consistent with how delegate calls behave in EVM this hook is changed to pass in the value of the parent call. - callTracer will return parent call's value for DELEGATECALL frames. --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * ethdb: add benchmark test suite (#26659) * params: schedule shanghai fork on sepolia (#26662) * params: schedule shanghai fork on sepolia * params: u64 -> newUint64 * eth/filters: avoid block body retrieval when no matching logs (#25199) Logs stored on disk have minimal information. Contextual information such as block number, index of log in block, index of transaction in block are filled in upon request. We can fill in all these fields only having the block header and list of receipts. But determining the transaction hash of a log requires the block body. The goal of this PR is postponing this retrieval until we are sure we the transaction hash. It happens often that the header bloom filter signals there might be matches in a block, but after actually checking them reveals the logs do not match. We want to avoid fetching the body in this case. Note that this changes the semantics of Backend.GetLogs. Downstream callers of GetLogs now assume log context fields have not been derived, and need to call DeriveFields on the logs if necessary. * eth/tracers: more fork overrides in traceBlockToFile (#26655) This change allows all post-Berlin forks to be specified as overrides for futureForkBlock in the config parameter for traceBlockToFile. * tests/fuzzers: supply gnark multiexp config, fixes #26669 (#26670) This change fixes a fuzzer which broke when we updated the gnark dependency earlier. * cmd/devp2p: reduce output of node crawler (#26674) Our discovery crawler spits out a huge amount of logs, most of which is pretty non-interesting. This change moves the very verbose output to Debug, and adds a 8-second status log message giving the general idea about what's going on. * params: update mainnet + rinkeby CHT (#26677) This change updates the CHT entries for mainnet and rinkeby * eth/filters: replace atomic pointer with value (#26689) * eth/filters: replace atomic.Pointer * fix * improve Co-authored-by: Martin Holst Swende <martin@swende.se> --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * p2p/dnsdisc: fix tests with Go 1.20 (#26690) * eth/catalyst: return error if withdrawals are nil post-shanghai (#26691) Spec: https://github.com/ethereum/execution-apis/blob/main/src/engine/shanghai.md#request * ethdb/pebble: Fix `MemTableStopWritesThreshold` (#26692) MemTableStopWritesThreshold was set to the max size of all memtables before blocking writing but should be set to the max number of memtables. This is documented [here](https://github.com/cockroachdb/pebble/blob/master/options.go#L738-L742). * eth/downloader: handle missing withdrawals if empty list is expected (#26675) This PR relaxes the block body ingress handling a bit: if block body withdrawals are missing (but expected to be empty), the body withdrawals are set to 'empty list' before being passed to upper layers. This fixes an issue where a block passed from EthereumJS to geth was deemed invalid. * params: go-ethereum v1.11.0 stable * params: begin v1.11.1 release cycle * travis, build: update Go to 1.20.1 (#26653) travis, build: update Go to 1.20 * core: check genesis state presence by disk read (#26703) * core, eth/downloader: make body validation more strict (#26704) * eth/downloader: fix empty-body case in queue fetchresult (#26707) * eth/downloader: fix typo (#26716) * all: remove deprecated uses of math.rand (#26710) This PR is a (superior) alternative to https://github.com/ethereum/go-ethereum/pull/26708, it handles deprecation, primarily two specific cases. `rand.Seed` is typically used in two ways - `rand.Seed(time.Now().UnixNano())` -- we seed it, just to be sure to get some random, and not always get the same thing on every run. This is not needed, with global seeding, so those are just removed. - `rand.Seed(1)` this is typically done to ensure we have a stable test. If we rely on this, we need to fix up the tests to use a deterministic prng-source. A few occurrences like this has been replaced with a proper custom source. `rand.Read` has been replaced by `crypto/rand`.`Read` in this PR. * params: go-ethereum v1.11.1 stable * params: begin v1.11.2 release cycle * eth/catalyst: send INVALID instead of INVALID_BLOCK_HASH (#26696) This change will break one hive test, but pass another and it will be the better way going forward * ci: disable coverage reporting in appveyor and travis * eth/catalyst: request too large error (#26722) The method `GetPayloadBodiesByRangeV1` now returns "-38004: Too large request" error if the requested range is too large, according to spec Co-authored-by: Martin Holst Swende <martin@swende.se> * core/trie: remove trie tracer (#26665) This PR contains a small portion of the full pbss PR, namely Remove the tracer from trie (and comitter), and instead using an accessList. Related changes to the Nodeset. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * rpc: fix unmarshaling of null result in CallContext (#26723) The change fixes unmarshaling of JSON null results into json.RawMessage. --------- Co-authored-by: Jason Yuan <jason.yuan@curvegrid.com> Co-authored-by: Jason Yuan <jason.yuan869@gmail.com> * build: ship bootstrapper Go along with builder for PPA (#26731) * build: fix setting env var, temp early exit * build: fix gobootstrap path for the PPA * build: add some PPA debug logs, sigh * internal/build: revert raising the chunk size for PPA * build: yet another weird PPA fix * build: fix (finaly?) the PPA env vars for Go bootstrapping * build: fix Go 1.19.0 bootstrapper issues on 386 PPA * build: enable Lunar Lobster PPA builds * Revert "core/trie: remove trie tracer (#26665)" (#26732) This reverts commit7c749c947a. * cmd/geth: clarify dumpconfig options (#26729) Clarifies the documentation around dumpconfi Signed-off-by: Sungwoo Kim <git@sung-woo.kim> * core, eth: merge snap-sync chain download progress logs (#26676) * core: fix accessor mismatch for genesis state (#26747) * core/rawdb: expose chain freezer constructor without internals (#26748) * all: use unified emptyRootHash and emptyCodeHash (#26718) The EmptyRootHash and EmptyCodeHash are defined everywhere in the codebase, this PR replaces all of them with unified one defined in core/types package, and also defines constants for TxRoot, WithdrawalsRoot and UncleRoot * eth/filters: fix a breaking change and return rpctransaction (#26757) * eth/filters: fix a breaking change and return rpctransaction * eth/filters: fix test cases --------- Co-authored-by: Catror <me@catror.com> * common/math: allow HexOrDecimal to accept unquoted decimals too (#26758) * params: release Geth v1.11.2 * params: begin v.1.11.3 release cycle * log: improve documentation (#26753) Add usage examples * core/rawdb, node: use standalone flock dependency (#26633) * eth: use the last announced finalized block as the sync ancient limit (#26685) * cmd/devp2p: faster crawling + less verbose dns updates (#26697) This improves the speed of DHT crawling by using concurrent requests. It also removes logging of individual DNS updates. * eth/tracers: add native flatCallTracer (aka parity style tracer) (#26377) Adds support for a native call tracer with the Parity format, which outputs call frames in a flat array. This tracer accepts the following options: - `convertParityErrors: true` will convert error messages to match those of Parity - `includePrecompiles: true` will report all calls to precompiles. The default matches Parity's behavior where CALL and STATICCALLs to precompiles are excluded Incompatibilities with Parity include: - Parity removes the result object in case of failure. This behavior is maintained with the exception of reverts. Revert output usually contains useful information, i.e. Solidity revert reason. - The `gasUsed` field accounts for intrinsic gas (e.g. 21000 for simple transfers) and refunds unlike Parity - Block rewards are not reported Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * core: improve withdrawal index assignment in GenerateChain (#26756) This fixes an issue where the withdrawal index was not calculated correctly for multiple withdrawals in a single block. Co-authored-by: Gary Rong <garyrong0905@gmail.com> Co-authored-by: Felix Lange <fjl@twurst.com> * ethdb/pebble: fix range compaction (#26771) * ethdb/pebble: fix range compaction * ethdb/pebble: add comment * ethdb/pebble: fix max memorytable size (#26776) * ethclient: include withdrawals in ethclient block responses (#26778) * include withdrawals in ethclient responses * omit empty withdrawals array in json serialization * all: change chain head markers from block to header (#26777) * core/rawdb, ethdb/pebble: disable pebble on openbsd (#26801) * core: fix a merge fault (#26802) * README, go.mod, event, internal/version: bump min Go to 1.19 (#26803) * travi: remove strange leftover Go version * core, params: schedule Shanghai on goerli (#26795) * core: params: schedule Shanghai on goerli * core/forkid: fix comment * eth: remove admin.peers[i].eth.head and difficulty (#26804) * core/types: add EffectiveGasPrice in Receipt (#26713) This change adds a struct field EffectiveGasPrice in types.Receipt. The field is present in RPC responses, but not in the Go struct, and thus can't easily be accessed via ethclient. Co-authored-by: PulsarAI <dev@pulsar-systems.fi> * core, eth/catalyst: fix race conditions in tests (#26790) Fixes a race in TestNewPayloadOnInvalidTerminalBlock where setting the TTD raced with the miner. Solution: set the TTD on the blockchain config not the genesis config. Also fixes a race in CopyHeader which resulted in race reports all over the place. * metrics: improve accuracy of CPU gauges (#26793) This PR changes metrics collection to actually measure the time interval between collections, rather than assume 3 seconds. I did some ad hoc profiling, and on slower hardware (eg, my Raspberry Pi 4) I routinely saw intervals between 3.3 - 3.5 seconds, with some being as high as 4.5 seconds. This will generally cause the CPU gauge readings to be too high, and in some cases can cause impossibly large values for the CPU load metrics (eg. greater than 400 for a 4 core CPU). --------- Co-authored-by: Felix Lange <fjl@twurst.com> * ethclient: fix panic when requesting missing blocks (#26817) This fixes a regression introduced by #26723. Fixes #26816. * core, miner: revert block gas counter in case of invalid transaction (#26799) This change fixes a flaw where, in certain scenarios, the block sealer did not accurately reset the remaining gas after failing to include an invalid transaction. Fixes #26791 * internal/ethapi: add tests for transaction types JSON marshal/unmarshal (#26667) Checks that Transaction.MarshalJSON and newRPCTransaction JSON output can be parsed by Transaction.UnmarshalJSON --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * cmd/evm: correct `alloc` for `t8n` testdata (#26822) Fixes a minor error in the testdata * eth/tracers/native: set created address to nil in case of failure (#26779) Fixes #26073 * accounts/usbwallet: mitigate ledger app chunking issue (#26773) This PR mitigates an issue with Ledger's on-device RLP deserialization, see https://github.com/LedgerHQ/app-ethereum/issues/409 Ledger's RLP deserialization code does not validate the length of the RLP list received, and it may prematurely enter the signing flow when a APDU chunk boundary falls immediately before the EIP-155 chain_id when deserializing a transaction. Since the chain_id is uninitialized, it is 0 during this signing flow. This may cause the user to accidentally sign the transaction with chain_id = 0. That signature would be returned from the device 1 packet earlier than expected by the communication loop. The device blocks the second-to-last packet waiting for the signer flow, and then errors on the successive packet (which contains the chain_id, zeroed r, and zeroed s) Since the signature's early arrival causes successive errors during the communication process, geth does not parse the improper signature produced by the device, and therefore no improperly-signed transaction can be created. User funds are not at risk. We mitigate by selecting the highest chunk size that leaves at least 4 bytes in the final chunk. * beacon/engine: don't omit empty withdrawals in ExecutionPayloadBodies (#26698) This ensures the "withdrawals" field will always be present in responses to getPayloadBodiesByRangeV1 and getPayloadBodiesByHashV1. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * build: update to go 1.20.2 (#26824) * params: go-ethereum v1.11.3 stable * params: begin v1.11.4 release cycle * core/rawdb: find smallest block stored in key-value store when chain gapped (#26719) This change prints out more information about the problem, in the case where geth detects a gap between leveldb and ancients, so we can determine more exactly where the gap is (what the first missing is). Also prints out more metadata. --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * signer/core: accept all solidity primitive types for EIP-712 signing (#26770) Accept all primitive types in Solidity for EIP-712 from intN, uintN, intN[], uintN[] for N as 0 to 256 in multiples of 8 --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * params: remove EF azure bootnodes (#26828) * core/vm: use golang native big.Int (#26834) reverts #26021, to use the upstream bigint instead. * core/vm: fix typo in comment (#26838) fixes eip 220 -> 2200 * core/forkid: fix issue in validation test (#26544) This changes the test to match the comment description. Using timestampedConfig in this test case is incorrect, the comment says 'local is at Gray Glacier' and isn't aware of more forks. * cmd/evm: update readmes for the tests (#26841) * core, core/types: plain Message struct (#25977) Here, the core.Message interface turns into a plain struct and types.Message gets removed. This is a breaking change to packages core and core/types. While we do not promise API stability for package core, we do for core/types. An exception can be made for types.Message, since it doesn't have any purpose apart from invoking the state transition in package core. types.Message was also marked deprecated by the same commit it got added in,4dca5d4db7(November 2016). The core.Message interface was added in December 2014, in commitdb494170dc, for the purpose of 'testing' state transitions. It's the same change that made transaction struct fields private. Before that, the state transition used *types.Transaction directly. Over time, multiple implementations of the interface accrued across different packages, since constructing a Message is required whenever one wants to invoke the state transition. These implementations all looked very similar, a struct with private fields exposing the fields as accessor methods. By changing Message into a struct with public fields we can remove all these useless interface implementations. It will also hopefully simplify future changes to the type with less updates to apply across all of go-ethereum when a field is added to Message. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * travis: only build PPAs nightly, not on every push, too heavy (#26846) * p2p: small comment typo (#26850) Update server.go * core: add Timestamp method in BlockGen (#26844) Since forks are now scheduled by block time, it can be necessary to check the timestamp of a block while generating transactions. * core/txpool: implement additional DoS defenses (#26648) This adds two new rules to the transaction pool: - A future transaction can not evict a pending transaction. - A transaction can not overspend available funds of a sender. --- Co-authored-by: dwn1998 <42262393+dwn1998@users.noreply.github.com> Co-authored-by: Martin Holst Swende <martin@swende.se> * params: go-ethereum v1.11.4 stable * params: begin v1.11.5 release cycle * tests: define `MuirGlacier` fork (#26856) add muir glacier to t8n * code/vm: fix comment typo (#26865) it should be constantinople rather than contantinople * core: minor code refactor (#26852) * core: refactor code * core: drop it from this anonymous goroutine func * core/txpool: use priceList.Put instead of heap.Push (#26863) Minor refactor to use the 'intended' accessor * eth: return error if 'safe' or 'finalized' tag used pre-merge (#26862) Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Felix Lange <fjl@twurst.com> * .travis.yml: reenable PPA build on tag push (#26873) * core/state, trie: port changes from PBSS (#26763) * p2p/discover: pass invalid discv5 packets to Unhandled channel (#26699) This makes it possible to run another protocol alongside discv5, by reading unhandled packets from the channel. * all: update links in documentation (#26882) Co-authored-by: Stephen Flynn <stephen.flynn@gapac.com> * Increase websocket frame size (from erigon rpc client) (#26883) This increases the maximum allowed message size to 32MB. Originally submitted at https://github.com/ledgerwatch/erigon/pull/2739 example block failure: https://etherscan.io/tx/0x1317d973a55cedf9b0f2df6ea48e8077dd176f5444a3423368a46d6e4db89982#internal * cmd/devp2p, cmd/geth: add version in --help output (#26895) Not sure why this was removed, it's pretty useful to see the version also in --help. * core: show db error-info in case of mismatched hash root (#26870) When a database failure occurs, bubble it up a into statedb, and report it in suitable places, such as during a 'bad block' report. * consensus: improve consensus engine definition (#26871) Makes clear the distinction between Finalize and FinalizedAndAssemble: - In Finalize function, a series of state operations are applied according to consensus rules. The statedb is mutated and the root hash can be checked and compared afterwards. This function should be used in block processing(receive afrom network and apply it locally) but not block generation. - In FinalizeAndAssemble function, after applying state mutations, the block is also to be assembled with the latest state root computed, updating the header. This function should be used in block generation only. * eth/catalyst: increase update consensus timeout (#26840) Increases the time between consensus updates that we give the CL before we start warning the user. * internal/ethapi: avoid int overflow in GetTransactionReceipt (#26911) * trie, accounts/abi: add error-checks (#26914) * rlp: support for uint256 (#26898) This adds built-in support in package rlp for encoding, decoding and generating code dealing with uint256.Int. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * eth: fix output file permissions in admin_exportChain (#26912) * api: Use 0700 file permissions for ExportChain * change perm to 0644 * Update api.go --------- Co-authored-by: Felix Lange <fjl@twurst.com> * trie: reduce unit test time (#26918) * core/txpool: use atomic int added in go1.19 (#26913) Makes use of atomic.Uint64 instead of atomic by pointer * params: schedule shanghai fork on mainnet (#26908) Schedules the shanghai hardfork on timestamp 1681338455 as discussed on ACDE 157: https://github.com/ethereum/execution-specs/pull/727 * core/txpool: allow future local transactions (#26930) Local transactions should not be subject to the "future shouldn't churn pending txs" rule * params: go-ethereum v1.11.5 stable * params: begin v1.11.6 release cycle * build: allow building nightly archives via cron jobs (#26938) * log: add special casing of uint256 into the logger (#26936) * core/rawdb: use atomic int added in go1.19 (#26935) * core/vm: expose jumptable constructors (#26880) When interacting with geth as a library to e.g. produce state tests, it is desirable to obtain the consensus-correct jumptable definition for a given fork. This changes adds accessors so the instructionset can be obtained and characteristics about opcodes can be inspected. * eth/catalyst: fix races (#26950) * core/rawdb: update freezertable read meter (#26946) The meter for "for measuring the effective amount of data read" within the freezertable was never updated. This change remedies that. --------- Signed-off-by: jsvisa <delweng@gmail.com> * cmd/evm, tests: record preimages if dump is expected (#26955) With #25287 we made it so that preimages were not recorded by default. This had the side effect that the evm command is no longer able to dump state since it does a preimage lookup to determine the address represented by a key. This change enables the recording of preimages when the dump command is given. * core/state: add account address to Trie slot accessors (#26934) This changes the Trie interface to add the plain account address as a parameter to all storage-related methods. After the introduction of the TryAccount* functions, TryGet, TryUpdate and TryDelete are now only meant to read an account's storage. In their current form, they assume that an account storage is stored in a separate trie, and that the hashing of the slot is independent of its account's address. The proposed structure for a stateless storage breaks these two assumptions: the hashing of a slot key requires the address and all slots and accounts are stored in a single trie. This PR therefore adds an address parameter to the interface. It is ignored in the MPT version, so this change has no functional impact, however it will reduce the diff size when merging verkle trees. * metrics: add cpu counters (#26796) This PR adds counter metrics for the CPU system and the Geth process. Currently the only metrics available for these items are gauges. Gauges are fine when the consumer scrapes metrics data at the same interval as Geth produces new values (every 3 seconds), but it is likely that most consumers will not scrape that often. Intervals of 10, 15, or maybe even 30 seconds are probably more common. So the problem is, how does the consumer estimate what the CPU was doing in between scrapes. With a counter, it's easy ... you just subtract two successive values and divide by the time to get a nice, accurate average. But with a gauge, you can't do that. A gauge reading is an instantaneous picture of what was happening at that moment, but it gives you no idea about what was going on between scrapes. Taking an average of values is meaningless. * metrics/influxdb: use smaller dependency and reuse code between v1 and v2 reporters (#26963) This change switches to use the smaller influxdata/influxdb1-client package instead of depending on the whole infuxdb package. The new smaller client is very similar to the influxdb-v2 client, which made it possible to refactor the two reporters to reuse code a lot more. * eth/gasprice: change feehistory input type from int to uint64 (#26922) Change input param type from int to uint64 * go.mod: update golang.org/x/tools (#26960) * rlp/rlpgen: print want/expect output string if mismatch (#26932) Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> * ethclient: ensure returned subscription is nil on error (#26976) * core/state, trie: remove Try prefix in Trie accessors (#26975) This change renames StateTrie methods to remove the Try* prefix. We added the Trie methods with prefix 'Try' a long time ago, working around the problem that most existing methods of Trie did not return the database error. This weird naming convention has persisted until now. Co-authored-by: Gary Rong <garyrong0905@gmail.com> * metrics/librato: ensure resp.body closed (#26969) This change ensures that we call Close on a http response body, in various places in the source code (mostly tests) * core/vm: use atomic.Bool (#26951) Make use of new atomic types --------- Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Martin Holst Swende <martin@swende.se> * core/bloombits: use atomic type (#26993) * core/state: use atomic.Bool (#26992) * graphql: fix data races (#26965) Fixes multiple data races caused by the fact that resolving fields are done concurrently by the graphql library. It also enforces caching at the stateobject level for account fields. * eth/tracers/native: prevent panic for LOG edge-cases (#26848) This PR fixes OOM panic in the callTracer as well as panicing on opcode validation errors (e.g. stack underflow) in callTracer and prestateTracer. Co-authored-by: Martin Holst Swende <martin@swende.se> * internal/debug: add log.logfmt flag to set logging to use logfmt (#26970) * docs: update outdated DeriveSha docs comment (#26968) * remove @gballet as a GraphQL codeowner (#27012) * core: use atomic type (#27011) * graphql: revert storage access regression (#27007) * cmd/geth: Add `--log.format` cli param (#27001) Removes the new --log.logfmt directive and hides --log.json, replacing both with log.format=(json|logfmt|terminal). The hidden log.json option is still respected if log.format is not specified for backwards compatibility. Co-authored-by: Martin Holst Swende <martin@swende.se> * ethdb/pebble: use atomic type (#27014) * common: fix json marshaller MixedcaseAddress (#26998) Fix the json marshaller of MixedcaseAddress * eth/catalyst: improve consensus heartbeat (#26896) improve the heartbeat function that is no longer suitable in the current situation Co-authored-by: “openex27” <“openexkevin@gmail.com”> * miner: use atomic type (#27013) Use the new typed atomics in the miner package * accounts/abi/bind: handle UnpackLog with zero topics (#26920) Adds error handling for the case that UnpackLog or UnpackLogIntoMap is called with a log that has zero topics. --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * cmd/evm: use correct parent number for t8n base fee calculation (#27032) Currently the t8n tool uses the same block number for the current block and its parent while calculating the base fee. This causes incorrect base fee calculation for the london fork block. This commit sets the parent block number to be one less than the current block number * go.mod : update snappy (#27027) * common: delete MakeName (#27023) common,p2p: remove unused function MakeName * cmd/geth: enable log rotation (#26843) This change enables log rotation, which can be activated using the flag --log.rotate. Additional parameters that can be given are: - log.maxsize to set maximum size before files are rotated, - log.maxbackups to set how many files are retailed, - log.maxage to configure max age of rotated files, - log.compress whether to compress rotated files The way to configure location of the logfile(s) is left unchanged, via the `log.logfile` parameter. --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * cmd, miner, signer: avoid panic if keystore is not available (#27039) * cmd, miner, singer: avoid panic if keystore is not available * cmd/geth: print warning instead of panic * test/fuzzers: fuzz rlp handling of big.Int and uint256.Int (#26917) test/fuzzers: fuzz rlp handling of big.Lnt and uint256.Int * core/txpool: move some validation to outside of mutex (#27006) Currently, most of transaction validation while holding the txpool mutex: one exception being an early-on signature check. This PR changes that, so that we do all non-stateful checks before we entering the mutex area. This means they can be performed in parallel, and to enable that, certain fields have been made atomic bools and uint64. * eth/downloader: use atomic types (#27030) * eth/downloader: use atomic type * Update eth/downloader/downloader_test.go Co-authored-by: Martin Holst Swende <martin@swende.se> * Update eth/downloader/downloader_test.go Co-authored-by: Martin Holst Swende <martin@swende.se> --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * core/vm: clarify comment (#27045) * consensus, core/typer: add 4844 excessDataGas to header, tie it to Cancun (#27046) * consensus/misc, params: add EIP-4844 blobfee conversions (#27041) * consensus/misc, params: add EIP-4844 blobfee conversions * consensus/misc: pull in fakeExponential test cases * consensus/misc: reuse bigints * consensus/misc: nit renames, additional larger testcase --------- Co-authored-by: Roberto Bayardo <bayardo@alum.mit.edu> Co-authored-by: Martin Holst Swende <martin@swende.se> * eth/tracers: report correct gasLimit in call tracers (#27029) This includes a semantic change to the `callTracer` as well as `flatCallTracer`. The value of field `gas` in the **first** call frame will change as follows: - It previously contained gas available after initial deductions (i.e. tx costs) - It will now contain the full tx gasLimit value Signed-off-by: jsvisa <delweng@gmail.com> * all: remove debug-field from vm config (#27048) This PR removes the Debug field from vmconfig, making it so that if a tracer is set, debug=true is implied. --------- Co-authored-by: 0xTylerHolmes <tyler@ethereum.org> Co-authored-by: Sina Mahmoodi <1591639+s1na@users.noreply.github.com> * metrics: make gauge_float64 and counter_float64 lock free (#27025) Makes the float-gauges lock-free name old time/op new time/op delta CounterFloat64Parallel-8 1.45µs ±10% 0.85µs ± 6% -41.65% (p=0.008 n=5+5) --------- Co-authored-by: Exca-DK <dev@DESKTOP-RI45P4J.localdomain> Co-authored-by: Martin Holst Swende <martin@swende.se> * eth/tracers: use atomic type (#27031) Use the new atomic types in package eth/tracers --------- Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * build: upgrade -dlgo version to Go 1.20.3 * core/txpool: disallow future churn by remote txs (#26907) Prior to this change, it was possible that transactions are erroneously deemed as 'future' although they are in fact 'pending', causing them to be dropped due to 'future' not being allowed to replace 'pending'. This change fixes that, by doing a more in-depth inspection of the queue. * core, miner: drop transactions from the same sender when error occurs (#27038) This PR unifies the error handling in miner. Whenever an error occur while applying a transaction, the transaction should be regarded as invalid and all following transactions from the same sender not executable because of the nonce restriction. The only exception is the `nonceTooLow` error which is handled separately. * params: new sepolia bootnodes (#27099) New sepolia bootnodes managed by EF devops * cmd/devp2p: fix erroneous log output in crawler (#27089) cmd/devp2p: fix log of ignored recent nodes counter * signer/core: rename testdata files (#27063) Sets a meaningful name on test-files * core: fix comment to reflect function name (#27070) * params: remove `EIP150Hash` from chainconfig (#27087) The EIP150Hash was an idea where, after the fork, we hardcoded the forked hash as an extra defensive mechanism. It wasn't really used, since forks weren't contentious and for all the various testnets and private networks it's been a hassle to have around. This change removes that config field. --------- Signed-off-by: jsvisa <delweng@gmail.com> * p2p: access embedded fields of Server directly (#27078) * consensus/ethash: use atomic type (#27068) * cmd/devp2p: make crawler-route53-updater less verbose (#27116) Follow-up to #26697, makes the crawler less verbose on route53-based scenarios. It also changes the loglevel from debug to info on Updates, which are typically the root, and can be interesting to see. * cmd/geth: rename --vmodule to --log.vmodule (#27071) renames `--vmodule` to `--log.vmodule`, and prints a warning if the old form is used. * core/vm: order opcodes properly (#27113) * metrics: use atomic type (#27121) * all: refactor trie API (#26995) In this PR, all TryXXX(e.g. TryGet) APIs of trie are renamed to XXX(e.g. Get) with an error returned. The original XXX(e.g. Get) APIs are renamed to MustXXX(e.g. MustGet) and does not return any error -- they print a log output. A future PR will change the behaviour to panic on errorrs. * params: go-ethereum v1.11.6 stable * dev: chg: regression changes for bor after merge * dev: chg: more regression changes for bor after merge * dev: chg: txpool_test regression changes after merge * dev: chg: gomock re-generate mocks for backend interface * dev: chg: regression changes after develop is merged into upstream-merge * dev: chg: further fixes merging develop into upstream-merge * dev: chg: apply changes to NewParallelBlockChain * dev: chg: solve some TODOs * dev: fix: CreateConsensusEngine for new ethereum objects * dev: fix: NewParallelBlockChain using Genesis * dev: fix: build ci.go * dev: fix: thelper and tparallel lint * dev: fix: http related and nilnil lint errors * dev: fix: ineffassign lint errors * dev: chg: comment position fix * dev: fix: govet lint errors * dev: fix: error related lint issues * dev: fix: bodyclose lint issues * dev: fix: some wsl lint issues * dev: fix: more wsl lint issues * dev: fix: errorcheck lint issues * dev: fix: solve more lint issues * dev: fix: more wsl lint issues * dev: fix: more errcheck lint issues * dev: fix: most of wsl lint issues * dev: fix: all remaining lint issues * dev: fix: t.Parallel called multiple times * dev: fix: tests failing due to t.Parallel * fix : runtime testcases * fix : testcase : config, addTxWithChain, burnAmount * fix : ethhash bor burn contract * fix : genspec config * fix : freezer, TestStateProcessorErrors * core,eth,miner: fix initial test cases (#922) * fix : TestTransactionIndices, testBeaconSync * fix : TestBeaconSync66 * core,eth: fix TestDeduplication, TestSyncAccountPerformance, TestTraceTransaction * fix : TestTxIndexer * rm : multiple coinbase balance * fix : testCommitInterruptExperimentBor * adding balance send to burntcontract back * Fix header encoding test * core,eth/tracers: fix TestPrestateWithDiffModeTracer * consensus/bor,eth/filters,miner,params,tests: fix mocks * fix : TestGraphQLConcurrentResolvers * fix : TestBuildPayload * common,core,miner: fix goleaks,duplicate init and inconsistent mutex (un)locks * fix : lint * fix : lint * fix : test-integration * fix : test-integration * core: restore AddFeeTransferLog post miner tipping * fix : TestGraphQLConcurrentResolvers * fix : deadlocks * rm: t.parallel from testQueueTimeLimiting tests * Merge branch 'develop' into mardizzone/upstream-merge * fix : lint * fix : test-integration * fix : TxDependency * add rpc.enabledeprecatedpersonal flag --------- Signed-off-by: Sungwoo Kim <git@sung-woo.kim> Signed-off-by: jsvisa <delweng@gmail.com> Co-authored-by: Péter Szilágyi <peterke@gmail.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Chris Ziogas <ziogaschr@gmail.com> Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> Co-authored-by: rjl493456442 <garyrong0905@gmail.com> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: Sina Mahmoodi <1591639+s1na@users.noreply.github.com> Co-authored-by: Darioush Jalali <darioush.jalali@avalabs.org> Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Patrick O'Grady <prohb125@gmail.com> Co-authored-by: ucwong <ucwong@126.com> Co-authored-by: Roman Krasiuk <rokrassyuk@gmail.com> Co-authored-by: Jason Yuan <jason.yuan@curvegrid.com> Co-authored-by: Jason Yuan <jason.yuan869@gmail.com> Co-authored-by: Sungwoo Kim <git@sung-woo.kim> Co-authored-by: Yier <90763233+yierx@users.noreply.github.com> Co-authored-by: Catror <me@catror.com> Co-authored-by: Nate Armstrong <naterarmstrong@gmail.com> Co-authored-by: Dan Cline <6798349+Rjected@users.noreply.github.com> Co-authored-by: Peter (bitfly) <1674920+peterbitfly@users.noreply.github.com> Co-authored-by: PulsarAI <dev@pulsar-systems.fi> Co-authored-by: turboboost55 <7891737+turboboost55@users.noreply.github.com> Co-authored-by: Adrian Sutton <adrian@symphonious.net> Co-authored-by: Guruprasad Kamath <48196632+gurukamath@users.noreply.github.com> Co-authored-by: James Prestwich <10149425+prestwich@users.noreply.github.com> Co-authored-by: Daniel Fernandes <711733+daferna@users.noreply.github.com> Co-authored-by: Rafael Matias <rafael@skyle.net> Co-authored-by: xiyang <90125263+JBossBC@users.noreply.github.com> Co-authored-by: Roberto Bayardo <bayardo@alum.mit.edu> Co-authored-by: panicalways <113693386+panicalways@users.noreply.github.com> Co-authored-by: dwn1998 <42262393+dwn1998@users.noreply.github.com> Co-authored-by: s7v7nislands <s7v7nislands@gmail.com> Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> Co-authored-by: Stephen Flynn <ssflynn@gmail.com> Co-authored-by: Stephen Flynn <stephen.flynn@gapac.com> Co-authored-by: Jonathan Otto <jonathan.otto@gmail.com> Co-authored-by: Delweng <delweng@gmail.com> Co-authored-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Co-authored-by: aaronbuchwald <aaron.buchwald56@gmail.com> Co-authored-by: ucwong <ethereum2k@gmail.com> Co-authored-by: norwnd <112318969+norwnd@users.noreply.github.com> Co-authored-by: jwasinger <j-wasinger@hotmail.com> Co-authored-by: Adrian Sutton <adrian@oplabs.co> Co-authored-by: David Murdoch <187813+davidmurdoch@users.noreply.github.com> Co-authored-by: openex <openexkevin@gmail.com> Co-authored-by: “openex27” <“openexkevin@gmail.com”> Co-authored-by: sudeep <sudeepdino008@gmail.com> Co-authored-by: joohhnnn <68833933+joohhnnn@users.noreply.github.com> Co-authored-by: 0xTylerHolmes <tyler@ethereum.org> Co-authored-by: Exca-DK <85954505+Exca-DK@users.noreply.github.com> Co-authored-by: Exca-DK <dev@DESKTOP-RI45P4J.localdomain> Co-authored-by: Marius Kjærstad <mkjaerstad@protonmail.com> Co-authored-by: Parithosh Jayanthi <parithosh@indenwolken.xyz> Co-authored-by: noel <72006780+0x00Duke@users.noreply.github.com> Co-authored-by: Taeguk Kwon <xornrbboy@gmail.com> Co-authored-by: Anusha <63559942+anusha-ctrl@users.noreply.github.com> Co-authored-by: Alex Beregszaszi <alex@rtfs.hu> Co-authored-by: Shivam Sharma <shivam691999@gmail.com> Co-authored-by: Raneet Debnath <35629432+Raneet10@users.noreply.github.com> Co-authored-by: Raneet Debnath <raneetdebnath10@gmail.com> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com>
676 lines
20 KiB
Go
676 lines
20 KiB
Go
// Copyright 2015 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 trie
|
|
|
|
import (
|
|
"bytes"
|
|
"errors"
|
|
"fmt"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/ethdb"
|
|
"github.com/ethereum/go-ethereum/log"
|
|
)
|
|
|
|
// Prove constructs a merkle proof for key. The result contains all encoded nodes
|
|
// on the path to the value at key. The value itself is also included in the last
|
|
// node and can be retrieved by verifying the proof.
|
|
//
|
|
// If the trie does not contain a value for key, the returned proof contains all
|
|
// nodes of the longest existing prefix of the key (at least the root node), ending
|
|
// with the node that proves the absence of the key.
|
|
func (t *Trie) Prove(key []byte, fromLevel uint, proofDb ethdb.KeyValueWriter) error {
|
|
// Collect all nodes on the path to key.
|
|
var (
|
|
prefix []byte
|
|
nodes []node
|
|
tn = t.root
|
|
)
|
|
|
|
key = keybytesToHex(key)
|
|
for len(key) > 0 && tn != nil {
|
|
switch n := tn.(type) {
|
|
case *shortNode:
|
|
if len(key) < len(n.Key) || !bytes.Equal(n.Key, key[:len(n.Key)]) {
|
|
// The trie doesn't contain the key.
|
|
tn = nil
|
|
} else {
|
|
tn = n.Val
|
|
prefix = append(prefix, n.Key...)
|
|
key = key[len(n.Key):]
|
|
}
|
|
|
|
nodes = append(nodes, n)
|
|
case *fullNode:
|
|
tn = n.Children[key[0]]
|
|
prefix = append(prefix, key[0])
|
|
key = key[1:]
|
|
|
|
nodes = append(nodes, n)
|
|
case hashNode:
|
|
// Retrieve the specified node from the underlying node reader.
|
|
// trie.resolveAndTrack is not used since in that function the
|
|
// loaded blob will be tracked, while it's not required here since
|
|
// all loaded nodes won't be linked to trie at all and track nodes
|
|
// may lead to out-of-memory issue.
|
|
var err error
|
|
|
|
tn, err = t.reader.node(prefix, common.BytesToHash(n))
|
|
if err != nil {
|
|
log.Error("Unhandled trie error in Trie.Prove", "err", err)
|
|
return err
|
|
}
|
|
default:
|
|
panic(fmt.Sprintf("%T: invalid node: %v", tn, tn))
|
|
}
|
|
}
|
|
|
|
hasher := newHasher(false)
|
|
defer returnHasherToPool(hasher)
|
|
|
|
for i, n := range nodes {
|
|
if fromLevel > 0 {
|
|
fromLevel--
|
|
continue
|
|
}
|
|
|
|
var hn node
|
|
|
|
n, hn = hasher.proofHash(n)
|
|
if hash, ok := hn.(hashNode); ok || i == 0 {
|
|
// If the node's database encoding is a hash (or is the
|
|
// root node), it becomes a proof element.
|
|
enc := nodeToBytes(n)
|
|
if !ok {
|
|
hash = hasher.hashData(enc)
|
|
}
|
|
|
|
proofDb.Put(hash, enc)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// Prove constructs a merkle proof for key. The result contains all encoded nodes
|
|
// on the path to the value at key. The value itself is also included in the last
|
|
// node and can be retrieved by verifying the proof.
|
|
//
|
|
// If the trie does not contain a value for key, the returned proof contains all
|
|
// nodes of the longest existing prefix of the key (at least the root node), ending
|
|
// with the node that proves the absence of the key.
|
|
func (t *StateTrie) Prove(key []byte, fromLevel uint, proofDb ethdb.KeyValueWriter) error {
|
|
return t.trie.Prove(key, fromLevel, proofDb)
|
|
}
|
|
|
|
// VerifyProof checks merkle proofs. The given proof must contain the value for
|
|
// key in a trie with the given root hash. VerifyProof returns an error if the
|
|
// proof contains invalid trie nodes or the wrong value.
|
|
func VerifyProof(rootHash common.Hash, key []byte, proofDb ethdb.KeyValueReader) (value []byte, err error) {
|
|
key = keybytesToHex(key)
|
|
wantHash := rootHash
|
|
|
|
for i := 0; ; i++ {
|
|
buf, _ := proofDb.Get(wantHash[:])
|
|
if buf == nil {
|
|
return nil, fmt.Errorf("proof node %d (hash %064x) missing", i, wantHash)
|
|
}
|
|
|
|
n, err := decodeNode(wantHash[:], buf)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("bad proof node %d: %v", i, err)
|
|
}
|
|
|
|
keyrest, cld := get(n, key, true)
|
|
switch cld := cld.(type) {
|
|
case nil:
|
|
// The trie doesn't contain the key.
|
|
return nil, nil
|
|
case hashNode:
|
|
key = keyrest
|
|
|
|
copy(wantHash[:], cld)
|
|
case valueNode:
|
|
return cld, nil
|
|
}
|
|
}
|
|
}
|
|
|
|
// proofToPath converts a merkle proof to trie node path. The main purpose of
|
|
// this function is recovering a node path from the merkle proof stream. All
|
|
// necessary nodes will be resolved and leave the remaining as hashnode.
|
|
//
|
|
// The given edge proof is allowed to be an existent or non-existent proof.
|
|
func proofToPath(rootHash common.Hash, root node, key []byte, proofDb ethdb.KeyValueReader, allowNonExistent bool) (node, []byte, error) {
|
|
// resolveNode retrieves and resolves trie node from merkle proof stream
|
|
resolveNode := func(hash common.Hash) (node, error) {
|
|
buf, _ := proofDb.Get(hash[:])
|
|
if buf == nil {
|
|
return nil, fmt.Errorf("proof node (hash %064x) missing", hash)
|
|
}
|
|
|
|
n, err := decodeNode(hash[:], buf)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("bad proof node %v", err)
|
|
}
|
|
|
|
return n, err
|
|
}
|
|
// If the root node is empty, resolve it first.
|
|
// Root node must be included in the proof.
|
|
if root == nil {
|
|
n, err := resolveNode(rootHash)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
root = n
|
|
}
|
|
|
|
var (
|
|
err error
|
|
child, parent node
|
|
keyrest []byte
|
|
valnode []byte
|
|
)
|
|
|
|
key, parent = keybytesToHex(key), root
|
|
|
|
for {
|
|
keyrest, child = get(parent, key, false)
|
|
switch cld := child.(type) {
|
|
case nil:
|
|
// The trie doesn't contain the key. It's possible
|
|
// the proof is a non-existing proof, but at least
|
|
// we can prove all resolved nodes are correct, it's
|
|
// enough for us to prove range.
|
|
if allowNonExistent {
|
|
return root, nil, nil
|
|
}
|
|
|
|
return nil, nil, errors.New("the node is not contained in trie")
|
|
case *shortNode:
|
|
key, parent = keyrest, child // Already resolved
|
|
continue
|
|
case *fullNode:
|
|
key, parent = keyrest, child // Already resolved
|
|
continue
|
|
case hashNode:
|
|
child, err = resolveNode(common.BytesToHash(cld))
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
case valueNode:
|
|
valnode = cld
|
|
}
|
|
// Link the parent and child.
|
|
switch pnode := parent.(type) {
|
|
case *shortNode:
|
|
pnode.Val = child
|
|
case *fullNode:
|
|
pnode.Children[key[0]] = child
|
|
default:
|
|
panic(fmt.Sprintf("%T: invalid node: %v", pnode, pnode))
|
|
}
|
|
|
|
if len(valnode) > 0 {
|
|
return root, valnode, nil // The whole path is resolved
|
|
}
|
|
|
|
key, parent = keyrest, child
|
|
}
|
|
}
|
|
|
|
// unsetInternal removes all internal node references(hashnode, embedded node).
|
|
// It should be called after a trie is constructed with two edge paths. Also
|
|
// the given boundary keys must be the one used to construct the edge paths.
|
|
//
|
|
// It's the key step for range proof. All visited nodes should be marked dirty
|
|
// since the node content might be modified. Besides it can happen that some
|
|
// fullnodes only have one child which is disallowed. But if the proof is valid,
|
|
// the missing children will be filled, otherwise it will be thrown anyway.
|
|
//
|
|
// Note we have the assumption here the given boundary keys are different
|
|
// and right is larger than left.
|
|
func unsetInternal(n node, left []byte, right []byte) (bool, error) {
|
|
left, right = keybytesToHex(left), keybytesToHex(right)
|
|
|
|
// Step down to the fork point. There are two scenarios can happen:
|
|
// - the fork point is a shortnode: either the key of left proof or
|
|
// right proof doesn't match with shortnode's key.
|
|
// - the fork point is a fullnode: both two edge proofs are allowed
|
|
// to point to a non-existent key.
|
|
var (
|
|
pos = 0
|
|
parent node
|
|
|
|
// fork indicator, 0 means no fork, -1 means proof is less, 1 means proof is greater
|
|
shortForkLeft, shortForkRight int
|
|
)
|
|
findFork:
|
|
for {
|
|
switch rn := (n).(type) {
|
|
case *shortNode:
|
|
rn.flags = nodeFlag{dirty: true}
|
|
|
|
// If either the key of left proof or right proof doesn't match with
|
|
// shortnode, stop here and the forkpoint is the shortnode.
|
|
if len(left)-pos < len(rn.Key) {
|
|
shortForkLeft = bytes.Compare(left[pos:], rn.Key)
|
|
} else {
|
|
shortForkLeft = bytes.Compare(left[pos:pos+len(rn.Key)], rn.Key)
|
|
}
|
|
if len(right)-pos < len(rn.Key) {
|
|
shortForkRight = bytes.Compare(right[pos:], rn.Key)
|
|
} else {
|
|
shortForkRight = bytes.Compare(right[pos:pos+len(rn.Key)], rn.Key)
|
|
}
|
|
if shortForkLeft != 0 || shortForkRight != 0 {
|
|
break findFork
|
|
}
|
|
parent = n
|
|
n, pos = rn.Val, pos+len(rn.Key)
|
|
case *fullNode:
|
|
rn.flags = nodeFlag{dirty: true}
|
|
|
|
// If either the node pointed by left proof or right proof is nil,
|
|
// stop here and the forkpoint is the fullnode.
|
|
leftnode, rightnode := rn.Children[left[pos]], rn.Children[right[pos]]
|
|
if leftnode == nil || rightnode == nil || leftnode != rightnode {
|
|
break findFork
|
|
}
|
|
parent = n
|
|
n, pos = rn.Children[left[pos]], pos+1
|
|
default:
|
|
panic(fmt.Sprintf("%T: invalid node: %v", n, n))
|
|
}
|
|
}
|
|
|
|
switch rn := n.(type) {
|
|
case *shortNode:
|
|
// There can have these five scenarios:
|
|
// - both proofs are less than the trie path => no valid range
|
|
// - both proofs are greater than the trie path => no valid range
|
|
// - left proof is less and right proof is greater => valid range, unset the shortnode entirely
|
|
// - left proof points to the shortnode, but right proof is greater
|
|
// - right proof points to the shortnode, but left proof is less
|
|
if shortForkLeft == -1 && shortForkRight == -1 {
|
|
return false, errors.New("empty range")
|
|
}
|
|
|
|
if shortForkLeft == 1 && shortForkRight == 1 {
|
|
return false, errors.New("empty range")
|
|
}
|
|
|
|
if shortForkLeft != 0 && shortForkRight != 0 {
|
|
// The fork point is root node, unset the entire trie
|
|
if parent == nil {
|
|
return true, nil
|
|
}
|
|
|
|
parent.(*fullNode).Children[left[pos-1]] = nil
|
|
|
|
return false, nil
|
|
}
|
|
// Only one proof points to non-existent key.
|
|
if shortForkRight != 0 {
|
|
if _, ok := rn.Val.(valueNode); ok {
|
|
// The fork point is root node, unset the entire trie
|
|
if parent == nil {
|
|
return true, nil
|
|
}
|
|
|
|
parent.(*fullNode).Children[left[pos-1]] = nil
|
|
|
|
return false, nil
|
|
}
|
|
|
|
return false, unset(rn, rn.Val, left[pos:], len(rn.Key), false)
|
|
}
|
|
|
|
if shortForkLeft != 0 {
|
|
if _, ok := rn.Val.(valueNode); ok {
|
|
// The fork point is root node, unset the entire trie
|
|
if parent == nil {
|
|
return true, nil
|
|
}
|
|
|
|
parent.(*fullNode).Children[right[pos-1]] = nil
|
|
|
|
return false, nil
|
|
}
|
|
|
|
return false, unset(rn, rn.Val, right[pos:], len(rn.Key), true)
|
|
}
|
|
|
|
return false, nil
|
|
case *fullNode:
|
|
// unset all internal nodes in the forkpoint
|
|
for i := left[pos] + 1; i < right[pos]; i++ {
|
|
rn.Children[i] = nil
|
|
}
|
|
|
|
if err := unset(rn, rn.Children[left[pos]], left[pos:], 1, false); err != nil {
|
|
return false, err
|
|
}
|
|
|
|
if err := unset(rn, rn.Children[right[pos]], right[pos:], 1, true); err != nil {
|
|
return false, err
|
|
}
|
|
|
|
return false, nil
|
|
default:
|
|
panic(fmt.Sprintf("%T: invalid node: %v", n, n))
|
|
}
|
|
}
|
|
|
|
// unset removes all internal node references either the left most or right most.
|
|
// It can meet these scenarios:
|
|
//
|
|
// - The given path is existent in the trie, unset the associated nodes with the
|
|
// specific direction
|
|
// - The given path is non-existent in the trie
|
|
// - the fork point is a fullnode, the corresponding child pointed by path
|
|
// is nil, return
|
|
// - the fork point is a shortnode, the shortnode is included in the range,
|
|
// keep the entire branch and return.
|
|
// - the fork point is a shortnode, the shortnode is excluded in the range,
|
|
// unset the entire branch.
|
|
func unset(parent node, child node, key []byte, pos int, removeLeft bool) error {
|
|
switch cld := child.(type) {
|
|
case *fullNode:
|
|
if removeLeft {
|
|
for i := 0; i < int(key[pos]); i++ {
|
|
cld.Children[i] = nil
|
|
}
|
|
|
|
cld.flags = nodeFlag{dirty: true}
|
|
} else {
|
|
for i := key[pos] + 1; i < 16; i++ {
|
|
cld.Children[i] = nil
|
|
}
|
|
|
|
cld.flags = nodeFlag{dirty: true}
|
|
}
|
|
|
|
return unset(cld, cld.Children[key[pos]], key, pos+1, removeLeft)
|
|
case *shortNode:
|
|
if len(key[pos:]) < len(cld.Key) || !bytes.Equal(cld.Key, key[pos:pos+len(cld.Key)]) {
|
|
// Find the fork point, it's an non-existent branch.
|
|
if removeLeft {
|
|
if bytes.Compare(cld.Key, key[pos:]) < 0 {
|
|
// The key of fork shortnode is less than the path
|
|
// (it belongs to the range), unset the entire
|
|
// branch. The parent must be a fullnode.
|
|
fn := parent.(*fullNode)
|
|
fn.Children[key[pos-1]] = nil
|
|
}
|
|
//else {
|
|
// The key of fork shortnode is greater than the
|
|
// path(it doesn't belong to the range), keep
|
|
// it with the cached hash available.
|
|
//}
|
|
} else {
|
|
if bytes.Compare(cld.Key, key[pos:]) > 0 {
|
|
// The key of fork shortnode is greater than the
|
|
// path(it belongs to the range), unset the entrie
|
|
// branch. The parent must be a fullnode.
|
|
fn := parent.(*fullNode)
|
|
fn.Children[key[pos-1]] = nil
|
|
}
|
|
//else {
|
|
// The key of fork shortnode is less than the
|
|
// path(it doesn't belong to the range), keep
|
|
// it with the cached hash available.
|
|
//}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
if _, ok := cld.Val.(valueNode); ok {
|
|
fn := parent.(*fullNode)
|
|
fn.Children[key[pos-1]] = nil
|
|
|
|
return nil
|
|
}
|
|
|
|
cld.flags = nodeFlag{dirty: true}
|
|
|
|
return unset(cld, cld.Val, key, pos+len(cld.Key), removeLeft)
|
|
case nil:
|
|
// If the node is nil, then it's a child of the fork point
|
|
// fullnode(it's a non-existent branch).
|
|
return nil
|
|
default:
|
|
panic("it shouldn't happen") // hashNode, valueNode
|
|
}
|
|
}
|
|
|
|
// hasRightElement returns the indicator whether there exists more elements
|
|
// on the right side of the given path. The given path can point to an existent
|
|
// key or a non-existent one. This function has the assumption that the whole
|
|
// path should already be resolved.
|
|
func hasRightElement(node node, key []byte) bool {
|
|
pos, key := 0, keybytesToHex(key)
|
|
|
|
for node != nil {
|
|
switch rn := node.(type) {
|
|
case *fullNode:
|
|
for i := key[pos] + 1; i < 16; i++ {
|
|
if rn.Children[i] != nil {
|
|
return true
|
|
}
|
|
}
|
|
|
|
node, pos = rn.Children[key[pos]], pos+1
|
|
case *shortNode:
|
|
if len(key)-pos < len(rn.Key) || !bytes.Equal(rn.Key, key[pos:pos+len(rn.Key)]) {
|
|
return bytes.Compare(rn.Key, key[pos:]) > 0
|
|
}
|
|
|
|
node, pos = rn.Val, pos+len(rn.Key)
|
|
case valueNode:
|
|
return false // We have resolved the whole path
|
|
default:
|
|
panic(fmt.Sprintf("%T: invalid node: %v", node, node)) // hashnode
|
|
}
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
// VerifyRangeProof checks whether the given leaf nodes and edge proof
|
|
// can prove the given trie leaves range is matched with the specific root.
|
|
// Besides, the range should be consecutive (no gap inside) and monotonic
|
|
// increasing.
|
|
//
|
|
// Note the given proof actually contains two edge proofs. Both of them can
|
|
// be non-existent proofs. For example the first proof is for a non-existent
|
|
// key 0x03, the last proof is for a non-existent key 0x10. The given batch
|
|
// leaves are [0x04, 0x05, .. 0x09]. It's still feasible to prove the given
|
|
// batch is valid.
|
|
//
|
|
// The firstKey is paired with firstProof, not necessarily the same as keys[0]
|
|
// (unless firstProof is an existent proof). Similarly, lastKey and lastProof
|
|
// are paired.
|
|
//
|
|
// Expect the normal case, this function can also be used to verify the following
|
|
// range proofs:
|
|
//
|
|
// - All elements proof. In this case the proof can be nil, but the range should
|
|
// be all the leaves in the trie.
|
|
//
|
|
// - One element proof. In this case no matter the edge proof is a non-existent
|
|
// proof or not, we can always verify the correctness of the proof.
|
|
//
|
|
// - Zero element proof. In this case a single non-existent proof is enough to prove.
|
|
// Besides, if there are still some other leaves available on the right side, then
|
|
// an error will be returned.
|
|
//
|
|
// Except returning the error to indicate the proof is valid or not, the function will
|
|
// also return a flag to indicate whether there exists more accounts/slots in the trie.
|
|
//
|
|
// Note: This method does not verify that the proof is of minimal form. If the input
|
|
// proofs are 'bloated' with neighbour leaves or random data, aside from the 'useful'
|
|
// data, then the proof will still be accepted.
|
|
func VerifyRangeProof(rootHash common.Hash, firstKey []byte, lastKey []byte, keys [][]byte, values [][]byte, proof ethdb.KeyValueReader) (bool, error) {
|
|
if len(keys) != len(values) {
|
|
return false, fmt.Errorf("inconsistent proof data, keys: %d, values: %d", len(keys), len(values))
|
|
}
|
|
// Ensure the received batch is monotonic increasing and contains no deletions
|
|
for i := 0; i < len(keys)-1; i++ {
|
|
if bytes.Compare(keys[i], keys[i+1]) >= 0 {
|
|
return false, errors.New("range is not monotonically increasing")
|
|
}
|
|
}
|
|
|
|
for _, value := range values {
|
|
if len(value) == 0 {
|
|
return false, errors.New("range contains deletion")
|
|
}
|
|
}
|
|
// Special case, there is no edge proof at all. The given range is expected
|
|
// to be the whole leaf-set in the trie.
|
|
if proof == nil {
|
|
tr := NewStackTrie(nil)
|
|
for index, key := range keys {
|
|
_ = tr.Update(key, values[index])
|
|
}
|
|
|
|
if have, want := tr.Hash(), rootHash; have != want {
|
|
return false, fmt.Errorf("invalid proof, want hash %x, got %x", want, have)
|
|
}
|
|
|
|
return false, nil // No more elements
|
|
}
|
|
// Special case, there is a provided edge proof but zero key/value
|
|
// pairs, ensure there are no more accounts / slots in the trie.
|
|
if len(keys) == 0 {
|
|
root, val, err := proofToPath(rootHash, nil, firstKey, proof, true)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
|
|
if val != nil || hasRightElement(root, firstKey) {
|
|
return false, errors.New("more entries available")
|
|
}
|
|
|
|
return false, nil
|
|
}
|
|
// Special case, there is only one element and two edge keys are same.
|
|
// In this case, we can't construct two edge paths. So handle it here.
|
|
if len(keys) == 1 && bytes.Equal(firstKey, lastKey) {
|
|
root, val, err := proofToPath(rootHash, nil, firstKey, proof, false)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
|
|
if !bytes.Equal(firstKey, keys[0]) {
|
|
return false, errors.New("correct proof but invalid key")
|
|
}
|
|
|
|
if !bytes.Equal(val, values[0]) {
|
|
return false, errors.New("correct proof but invalid data")
|
|
}
|
|
|
|
return hasRightElement(root, firstKey), nil
|
|
}
|
|
// Ok, in all other cases, we require two edge paths available.
|
|
// First check the validity of edge keys.
|
|
if bytes.Compare(firstKey, lastKey) >= 0 {
|
|
return false, errors.New("invalid edge keys")
|
|
}
|
|
// todo(rjl493456442) different length edge keys should be supported
|
|
if len(firstKey) != len(lastKey) {
|
|
return false, errors.New("inconsistent edge keys")
|
|
}
|
|
// Convert the edge proofs to edge trie paths. Then we can
|
|
// have the same tree architecture with the original one.
|
|
// For the first edge proof, non-existent proof is allowed.
|
|
root, _, err := proofToPath(rootHash, nil, firstKey, proof, true)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
// Pass the root node here, the second path will be merged
|
|
// with the first one. For the last edge proof, non-existent
|
|
// proof is also allowed.
|
|
root, _, err = proofToPath(rootHash, root, lastKey, proof, true)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
// Remove all internal references. All the removed parts should
|
|
// be re-filled(or re-constructed) by the given leaves range.
|
|
empty, err := unsetInternal(root, firstKey, lastKey)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
// Rebuild the trie with the leaf stream, the shape of trie
|
|
// should be same with the original one.
|
|
tr := &Trie{root: root, reader: newEmptyReader(), tracer: newTracer()}
|
|
if empty {
|
|
tr.root = nil
|
|
}
|
|
|
|
for index, key := range keys {
|
|
_ = tr.Update(key, values[index])
|
|
}
|
|
|
|
if tr.Hash() != rootHash {
|
|
return false, fmt.Errorf("invalid proof, want hash %x, got %x", rootHash, tr.Hash())
|
|
}
|
|
|
|
return hasRightElement(tr.root, keys[len(keys)-1]), nil
|
|
}
|
|
|
|
// get returns the child of the given node. Return nil if the
|
|
// node with specified key doesn't exist at all.
|
|
//
|
|
// There is an additional flag `skipResolved`. If it's set then
|
|
// all resolved nodes won't be returned.
|
|
func get(tn node, key []byte, skipResolved bool) ([]byte, node) {
|
|
for {
|
|
switch n := tn.(type) {
|
|
case *shortNode:
|
|
if len(key) < len(n.Key) || !bytes.Equal(n.Key, key[:len(n.Key)]) {
|
|
return nil, nil
|
|
}
|
|
|
|
tn = n.Val
|
|
key = key[len(n.Key):]
|
|
|
|
if !skipResolved {
|
|
return key, tn
|
|
}
|
|
case *fullNode:
|
|
tn = n.Children[key[0]]
|
|
key = key[1:]
|
|
|
|
if !skipResolved {
|
|
return key, tn
|
|
}
|
|
case hashNode:
|
|
return key, n
|
|
case nil:
|
|
return key, nil
|
|
case valueNode:
|
|
return nil, n
|
|
default:
|
|
panic(fmt.Sprintf("%T: invalid node: %v", tn, tn))
|
|
}
|
|
}
|
|
}
|