Upstream merge up to 1.9.18 #1593
Merged
Conversation
This file contains hidden or 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/vm: use pointers to operations vs. copy by value
Fixes #21175 Co-authored-by: sammy007 <sammy007@users.noreply.github.com> Co-authored-by: Adam Schmideg <adamschmideg@users.noreply.github.com>
cmd/utils: reuse existing genesis in persistent dev mode
…#21301) * geth,utils: implement configurable developer account options Prior to this change --dev (developer) mode generated one account with an empty password, irrespective of existing --password and --miner.etherbase options. This change makes --dev mode compatible with these existing flags. --dev mode may now be used in conjunction with --password and --miner.etherbase flags to configure the developer faucet using an existing keystore or in creating a new account. Signed-off-by: meows <b5c6@protonmail.com> * main: remove key/pass flags from usage developer section These flags are included already in other sections, and it is not desired to duplicate them. They were originally included in this section along with added support for these flags in the developer mode. Signed-off-by: meows <b5c6@protonmail.com>
This fixes the iOS framework build by naming the second parameter of the Signer interface method. The name is important because it becomes part of the objc method signature. Fixes #21340
* eth/downloader: refactor downloader + queue downloader, fetcher: throttle-metrics, fetcher filter improvements, standalone resultcache downloader: more accurate deliverytime calculation, less mem overhead in state requests downloader/queue: increase underlying buffer of results, new throttle mechanism eth/downloader: updates to tests eth/downloader: fix up some review concerns eth/downloader/queue: minor fixes eth/downloader: minor fixes after review call eth/downloader: testcases for queue.go eth/downloader: minor change, don't set progress unless progress... eth/downloader: fix flaw which prevented useless peers from being dropped eth/downloader: try to fix tests eth/downloader: verify non-deliveries against advertised remote head eth/downloader: fix flaw with checking closed-status causing hang eth/downloader: hashing avoidance eth/downloader: review concerns + simplify resultcache and queue eth/downloader: add back some locks, address review concerns downloader/queue: fix remaining lock flaw * eth/downloader: nitpick fixes * eth/downloader: remove the *2*3/4 throttling threshold dance * eth/downloader: print correct throttle threshold in stats Co-authored-by: Péter Szilágyi <peterke@gmail.com>
Solves issue#20582. Non-executable transactions should not be evicted on each tick if there are no promote transactions or if a pending/reset empties the pending list. Tests and logging expanded to handle these cases in the future. core/tx_pool: use a ts for each tx in the queue, but only update the heartbeat on promotion or pending replaced queuedTs proper naming
core: address comment
core: fix queued transaction eviction
deps: update uint256 to v1.1.1
# Conflicts: # core/vm/jump_table.go
# Conflicts: # params/version.go
Conflicts: cmd/utils/flags.go
Conflicts: cmd/utils/flags.go
Conflicts: core/types/block.go eth/downloader/downloader.go eth/downloader/downloader_test.go eth/downloader/queue.go eth/fetcher/block_fetcher.go
Conflicts: core/tx_pool.go core/tx_pool_test.go
Conflicts: core/tx_pool.go core/tx_pool_test.go
# Conflicts: # go.mod # go.sum
# Conflicts: # params/config.go
# Conflicts: # params/version.go
gastonponti
changed the title
Codecov Report
@@ Coverage Diff @@
## master #1593 +/- ##
==========================================
- Coverage 54.72% 54.68% -0.05%
==========================================
Files 605 606 +1
Lines 69932 69896 -36
==========================================
- Hits 38272 38220 -52
- Misses 28238 28248 +10
- Partials 3422 3428 +6
Continue to review full report at Codecov.
|
hbandura
approved these changes
Jun 18, 2021
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.
Description
Merge from upstream, go-ethereum v 1.9.18 (https://github.com/ethereum/go-ethereum/releases/tag/v1.9.18)
a bugfix release
1.9.18 notes
1059221PR#21263(All headers must be fetched so that the random beacon can be updated correctly.)
queue.goreserveHeaders(L528 https://github.com/celo-org/celo-blockchain/pull/1593/files#diff-0a851c7ef3c51f50e6748b50b97e2fd27d7f380438b64b523a640379190d2169R528) changed to force as a pending for bodyTypes reserves (even if the block has an empty body, we have to retrieve it to update the random beacon)queue_test.goTestBasicsfetchReq.Headers == 10, all headers must be fetchTestDeliveryc374447tx_pool_test.gotestTransactionQueueTimeLimitingkept the test as we had, because it was already cherrypicked and changed before (Fixed the aggressive eviction of txns in txn pool #1149)subsequent commits left the same as the cherrypicked before (5413df1, 6793ffa)
Tested
Unit and integration tests pass
Related issues