!!! Merge upstream v1.10.20 #73
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
core: set ttd override on all chain variations
…ge is not implemented (ethereum#24603) * cmd/geth: only check for presence of legacy receipts if developer mode is not enabled * cmd/geth: degrade log level * cmd/geth: fix format Co-authored-by: Gary Rong <garyrong0905@gmail.com>
…m#24598) * eth/catalyst: only apply block if we actually have the state * add header to payload queue * Update cmd/geth/dbcmd.go Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Martin Holst Swende <martin@swende.se>
Co-authored-by: Yong Yang <yangyong775654@163.com>
* internal/ethapi: add refund to StructLogRes * Update internal/ethapi/api.go Co-authored-by: rjl493456442 <garyrong0905@gmail.com> Co-authored-by: rjl493456442 <garyrong0905@gmail.com>
Makes the evm json output less verbose: omitting output of `memory` and `returndata` in case they are empty.
…um#24541) This PR adds a ExtraAllowedPath field to Solidity and exposes two APIs: CompileSource and CompileFiles, which were hidden inside CompileSolidityString and CompileSolidity before.
* Add extra-data checks for clique genesis * Update genesis.go * Update genesis.go * core: simplify clique genesis check Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Martin Holst Swende <martin@swende.se>
…d of error (ethereum#24475) * core: Change Snapshot extension registration failed to Debug * Update eth/handler.go Co-authored-by: Martin Holst Swende <martin@swende.se>
Trie tracer is an auxiliary tool to capture all deleted nodes which can't be captured by trie.Committer. The deleted nodes can be removed from the disk later.
* core,eth: add empty tx logger hooks * core,eth: add initial and remaining gas to tx hooks * store tx gasLimit in js tracer * use gasLimit to compute intrinsic cost for js tracer * re-use rules in transitiondb * rm logs * rm logs * Mv some fields from Start to TxStart * simplify sender lookup in prestate tracer * mv env to TxStart * Revert "mv env to TxStart" This reverts commit 656939634b9aff19f55a1cd167345faf8b1ec310. * Revert "simplify sender lookup in prestate tracer" This reverts commit ab65bce48007cab99e68232e7aac2fe008338d50. * Revert "Mv some fields from Start to TxStart" This reverts commit aa50d3d9b2559addc80df966111ef5fb5d0c1b6b. * fix intrinsic gas for prestate tracer * add comments * refactor * fix test case * simplify consumedGas calc in prestate tracer
This PR makes the errors we spit out a bit more clear about what block is problematic.
…thereum#24610) * eth/downloader: retrieve pivot header from local chain if necessary * eth/downloader: improve readability * eth/downloader: update fix * eth/downloader: add beacon sync tests * eth/downloader: remove duplicated code
…m#24326) * eth/tracers: refactor traceTx to separate out struct logging review fix Update eth/tracers/api.go Co-authored-by: Martin Holst Swende <martin@swende.se> Mv ExecutionResult type to logger package review fix impl GetResult for StructLogger make formatLogs private confused exit and end.. account for intrinsicGas in structlogger, fix TraceCall test Add Stop method to logger Simplify traceTx Fix test rm logger from blockchain test account for refund in structLogger * use tx hooks in struct logger * minor * avoid executionResult in struct logger * revert blockchain test changes
eth/fetcher: if peers never respond, drop them
Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de>
core/state/snapshot: remove noop map item assignment
* cmd/geth: inspect snapshot dangling storage * cmd/geth: make verify-state invoke verify-dangling
The error was introduced in PR ethereum#21686, but there is no good reason to enforce sync in this method, and it causes issues with EL/CL integration.
ethereum#25168) Co-authored-by: Felix Lange <fjl@twurst.com>
all: remove public field from rpc.API
This change updates our urfave/cli dependency to the v2 branch of the library. There are some Go API changes in cli v2: - Flag values can now be accessed using the methods ctx.Bool, ctx.Int, ctx.String, ... regardless of whether the flag is 'local' or 'global'. - v2 has built-in support for flag categories. Our home-grown category system is removed and the categories of flags are assigned as part of the flag definition. For users, there is only one observable difference with cli v2: flags must now strictly appear before regular arguments. For example, the following command is now invalid: geth account import mykey.json --password file.txt Instead, the command must be invoked as follows: geth account import --password file.txt mykey.json
…lock (ethereum#25187) * consensus/beacon: check that only the latest pow block is valid ttd block * consensus/beacon: move verification to async function * consensus/beacon: fix verifyTerminalPoWBlock, add test cases * consensus/beacon: cosmetic changes * consensus/beacon: apply karalabe's fixes
…thereum#25195) Co-authored-by: Felix Lange <fjl@twurst.com>
This upgrade is required to fix lint issues with urfave/cli/v2, which uses generics when built with Go 1.18
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
!!! Merge upstream v1.10.20 into develop.
Possible Issues
cmd/utils/flags.gohad been heavily refactored.gopkg.in/urfave/cli.v1had been upgraded github.com/urfave/cli/v2eth_chainIdnow always returns the configured chain ID regardless of sync status. This is a violation of EIP-695, but the previous behavior caused issues with CL clients. (internal/ethapi: always return chain id ethereum/go-ethereum#25166, internal/ethapi: add note about eth_chainId compatibility with EIP-695 ethereum/go-ethereum#25168).chainId field, even for untyped (legacy) transactions. (internal/ethapi: explicitly return chain id for EIP-155 legacy txs ethereum/go-ethereum#25155).Diff stats between upstream v1.10.20 and the head of this pull request: