merge go-ethereum v1.13.15 #79
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
slog.SetDefault has undesirable side effects. It also sets the default logger destination, for example. So we should not call it by default in init.
cmd/evm: fixes the blob gas calculation if a transaction is invalid
Co-authored-by: Felix Lange <fjl@twurst.com>
Co-authored-by: Martin HS <martin@swende.se> Co-authored-by: Felix Lange <fjl@twurst.com>
This PR schedules the cancun fork for the goerli testnet as discussed on ACD. Spec: ethereum/execution-specs#860 We schedule: goerli at 1705473120
When managing geth, it is sometimes desirable to do a partial wipe; deleting state but retaining freezer data. A partial wipe can be somewhat tricky to accomplish. This change implements the ability to perform partial wipe by making it possible to run geth removedb non-interactive, using command line options instead.
update logger test data
This is a rewrite of the 'simulated backend', an implementation of the ethclient interfaces which is backed by a simulated blockchain. It was getting annoying to maintain the old version of the simulated backend feature because there was a lot of code duplication with the main client. The new version is built using parts that we already have: an in-memory geth node instance running in developer mode provides the chain, while the Go API is provided by ethclient. A backwards-compatibility wrapper is provided, but the simulated backend has also moved to a more sensible import path: github.com/ethereum/go-ethereum/ethclient/simulated --------- Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Gary Rong <garyrong0905@gmail.com>
* Fix broken badge in README.md Replaced broken Github link with IPFS link for long-term storage. * update go badge Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> --------- Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com>
eth: refactor `GetVM`
Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com>
* Imported diffs of blockchain.go and headerchain.go from bsc@v1.4.6 * Imported fast finality reorganization from bsc@v1.4.6 (#75) * Imported fast finality reorganization from bsc@v1.4.6 * Fix errors in test code * elaborate the timeing update finalized and justified gauge (#77) --------- Co-authored-by: tak <re795h@gmail.com>
* Imported stop process of eth.handler from bsc@v1.4.6 * Imported `chainFinalizedHeightFn` of fetcher.BlockFetcher from bsc@v1.4.6 * remove stop chan from eth/handler (#82) --------- Co-authored-by: tak <re795h@gmail.com>
ironbeer
approved these changes
Nov 1, 2024
* support eth67 * secured go.mod * fix compile error * upgrade wealdtech/go-eth2-types/v2 from v2.5.2 to v2.8.1, to avoid bnb forked fastssz * downgrade github.com/wealdtech/go-eth2-types to v2.6.0, to kept github.com/ferranbt/fastssz version as v0.1.2 * rever back github.com/herumi/bls-eth-go-binary original version
There was a problem hiding this comment.
Note: This is a sample review template. Adjust the structure and content based on the specific details of your PR.
### cmd/era/README.md
**Change Type:** modified
**Language:** Go
**Additions:** 1
**Deletions:** 1
**Changes:** 2
**Change Categories:** general_change
```diff
---
+++
@@ -18,21 +18,21 @@
# This file contains sha256 checksums of optional build dependencies.
-# version:spec-tests 1.0.6
+# version:spec-tests 1.0.7
# https://github.com/ethereum/execution-spec-tests/releases
-# https://github.com/ethereum/execution-spec-tests/releases/download/v1.0.6/
-485af7b66cf41eb3a8c1bd46632913b8eb95995df867cf665617bbc9b4beedd1 fixtures_develop.tar.gz
+# https://github.com/ethereum/execution-spec-tests/releases/download/v1.0.7/
+485cbbdf4b6e6e62ed58f370f3f6d8c30825d6e56c5853c66d3c23bcdb09db19 go1.21.5.src.tar.gz
-a2e1d5743e896e5fe1e7d96479c0a769254aed18cf216cf8f4c3a2300050c0040
-285cbbdf4b6e6e62ed58f370f3f99470fc07941840b6e56c5853c66d3c23bcdb09db19 go1.21.5.darwin-amd64.tar.gz
-d0f8ac0c4fb3efc223a833010901d02954e3923cfe2c9a2ff0e4254a777cc9cc go1.21.5.freebsd-386.tar.gz
-30b6c64e9a77129605bc12f836422bf09eec577a8c899ee46130aeff81567003 go1.21.5.freebsd-amd64.tar.gz
-8f4dba9cf5c61757bbd7e9ebdb93b6a30a1b03f4a636a1ba0cc2f27b907ab8e1 go1.21.5.linux-386.tar.gz
-30b6c64e9a77100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
* support eth67 * secured go.mod * fix compile error * upgrade wealdtech/go-eth2-types/v2 from v2.5.2 to v2.8.1, to avoid bnb forked fastssz * downgrade github.com/wealdtech/go-eth2-types to v2.6.0, to kept github.com/ferranbt/fastssz version as v0.1.2 * rever back github.com/herumi/bls-eth-go-binary original version * integrate bsc cancun support * import bsc PR #2428 * import bsc PR #2525 * import bsc PR #2350 * import bsc PR #2311 * import bsc PR #2337 * Updated with `gencodec -dir eth/ethconfig/ -type Config -formats toml -out eth/ethconfig/gen_config.go` (#94) * Import eth/handler.go from bsc@v1.4.15 (#93) * Update core/blockchain.go Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com> * Update core/chain_makers.go Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com> * respond review by ironbeer part1 * Restore changes from 4e4fa3e (#95) * Update params/config.go Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com> * Import miner/worker.go from bsc@v1.4.15 (2) (#99) * Import miner/worker.go from bsc@v1.4.15 (3) (#100) * Update consensus/oasys/oasys.go Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com> --------- Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com>
* support eth67 * secured go.mod * fix compile error * upgrade wealdtech/go-eth2-types/v2 from v2.5.2 to v2.8.1, to avoid bnb forked fastssz * downgrade github.com/wealdtech/go-eth2-types to v2.6.0, to kept github.com/ferranbt/fastssz version as v0.1.2 * rever back github.com/herumi/bls-eth-go-binary original version * integrate bsc cancun support * import bsc PR #2428 * import bsc PR #2525 * import bsc PR #2350 * import bsc PR #2311 * import bsc PR #2337 * organize ParentBeaconRoot handling * unsupport eth67 * fix linter error * fix `unexpected withdrawal hash value in oasys` * set blob index during commit it * add fake beacon api * fix blob freeze bugs * Updated with `gencodec -dir eth/ethconfig/ -type Config -formats toml -out eth/ethconfig/gen_config.go` (#94) * Import eth/handler.go from bsc@v1.4.15 (#93) * Update core/blockchain.go Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com> * Update core/chain_makers.go Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com> * respond review by ironbeer part1 * Restore changes from 4e4fa3e (#95) * Update params/config.go Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com> * fastfinality: incorporate bsc changes ##2589 * fastfinality: incorporate bsc PR #2568 * fix consensus making failure caused by integration of bsc pr #2589 * Import miner/worker.go from bsc@v1.4.15 (2) (#99) * Import miner/worker.go from bsc@v1.4.15 (3) (#100) * Dedup of BaseFee field after cancun (#102) * Import blob fee API from geth@v1.14.11 (#103) * Fixed fakebeacon (#104) * Change index field to string type * Modified block estimation for Oasys * respond feedback from ironbeer --------- Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com>
* support eth67 * secured go.mod * fix compile error * upgrade wealdtech/go-eth2-types/v2 from v2.5.2 to v2.8.1, to avoid bnb forked fastssz * downgrade github.com/wealdtech/go-eth2-types to v2.6.0, to kept github.com/ferranbt/fastssz version as v0.1.2 * rever back github.com/herumi/bls-eth-go-binary original version * integrate bsc cancun support * import bsc PR #2428 * import bsc PR #2525 * import bsc PR #2350 * import bsc PR #2311 * import bsc PR #2337 * organize ParentBeaconRoot handling * unsupport eth67 * fix linter error * fix `unexpected withdrawal hash value in oasys` * set blob index during commit it * add fake beacon api * fix blob freeze bugs * Updated with `gencodec -dir eth/ethconfig/ -type Config -formats toml -out eth/ethconfig/gen_config.go` (#94) * Import eth/handler.go from bsc@v1.4.15 (#93) * Update core/blockchain.go Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com> * Update core/chain_makers.go Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com> * respond review by ironbeer part1 * Restore changes from 4e4fa3e (#95) * Update params/config.go Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com> * fastfinality: incorporate bsc changes ##2589 * fastfinality: incorporate bsc PR #2568 * fix consensus making failure caused by integration of bsc pr #2589 * Import miner/worker.go from bsc@v1.4.15 (2) (#99) * Import miner/worker.go from bsc@v1.4.15 (3) (#100) * Dedup of BaseFee field after cancun (#102) * Import blob fee API from geth@v1.14.11 (#103) * Fixed fakebeacon (#104) * Change index field to string type * Modified block estimation for Oasys * add evm access controler experlimentaly * respond feedback from ironbeer * brash up evm access controller * add missing key mapping to evm control contract * remove Oasys.TxVerify * add deployment13 testcase * resolve evm access denied tx persisted in txpool bug (#108) * Add from/to validation to eth_sendRawTransaction (#107) * Add validation to SendRawTransaction * Rename EVMAccessControl to TransactionFilter and move validation to txpool * Revert "Rename EVMAccessControl to TransactionFilter and move validation to txpool" This reverts commit 4dac3f8. * Fix package error * Improved error message --------- Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com>
…109) * temporaly force validators to enable vote to activate fast finality * remove voting as keyword to avoid confusion
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.
コンフリクトを解消してマージしただけ