Merge/foundation release/1.12.2+spiral #561
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
Signed-off-by: meows <[email protected]>
…s/types/goethereum: install Shanghai=Spiral block number based iface methods ETC plans to install most EIPs associated with ETH's Shanghai fork, but ETC doesn't use PoS so activation by block time, so this adds supporting block-based activation methods for those features. Still TODO is to actually implement the associated conditionals where the Getters are used in the code to actually turn the new features on. Date: 2023-08-18 09:11:04-06:00 Signed-off-by: meows <[email protected]>
Date: 2023-08-18 19:28:32-06:00 Signed-off-by: meows <[email protected]>
Blocks are big ints. Times are uint64s. I am 73% certain this covers all cases. Date: 2023-08-18 19:30:17-06:00 Signed-off-by: meows <[email protected]>
Date: 2023-08-18 19:50:22-06:00 Signed-off-by: meows <[email protected]>
Date: 2023-08-19 07:24:31-06:00 Signed-off-by: meows <[email protected]>
Date: 2023-08-19 07:29:40-06:00 Signed-off-by: meows <[email protected]>
Date: 2023-08-19 07:43:32-06:00 Signed-off-by: meows <[email protected]>
…ght: GetEIP3860Transition Date: 2023-08-19 07:53:58-06:00 Signed-off-by: meows <[email protected]>
Date: 2023-08-19 07:55:11-06:00 Signed-off-by: meows <[email protected]>
…95Transition Date: 2023-08-19 08:22:35-06:00 Signed-off-by: meows <[email protected]>
Date: 2023-08-19 08:23:35-06:00 Signed-off-by: meows <[email protected]>
Date: 2023-08-19 08:27:25-06:00 Signed-off-by: meows <[email protected]>
Date: 2023-08-19 08:30:24-06:00 Signed-off-by: meows <[email protected]>
Date: 2023-08-19 08:54:33-06:00 Signed-off-by: meows <[email protected]>
Date: 2023-08-19 09:13:58-06:00 Signed-off-by: meows <[email protected]>
…lock-based Shanghai config Failing was TestCheckCompatible, which converts Geth::CoreGeth configuration types; CoreGeth's EIP3651 block transition was fatally inapplicable to Geth's config. So this patch sidesteps the issue by permitting the conversion to quietly fail; expecting that users/developers will be sane enough to configure upgrades with one pattern or the other but not both. Date: 2023-08-19 09:17:33-06:00 Signed-off-by: meows <[email protected]>
Date: 2023-08-25 08:55:58-06:00 Signed-off-by: meows <[email protected]>
…t_Features fails Mismatched EIP3651 activations caused an incompatibility between core-geth and go-ethereum config types. This is mostly just a problem of/with the tests because of the disparate configuration TYPES now (block vs. time). This patches fixes the issue by implementing a logical short-circut equivocating zero values for time and block fields in core-geth and go-ethereum configuration configurator interfaces. Probably these logical steps will only be followed by tests or testnets or networks using time OR block values. Date: 2023-08-25 14:51:50-06:00 Signed-off-by: meows <[email protected]>
Conflicts:
core/genesis.go
core/txpool/txpool.go
core/vm/jump_table.go
params/types/genesisT/genesis.go
tests/init.go
By Go conventions the Error method should return a descriptive string. When I was debugging the simulated beacon test, the reported error was hardly usedful, describing only that an error existed, but lacking any contextual detail. Now the engine api will return a more detailed error and that will hopefully help debuggers in the future. Date: 2023-08-29 09:01:11-06:00 Signed-off-by: meows <[email protected]>
This logic was just wrong because of misplaced negation. Date: 2023-08-29 09:10:51-06:00 Signed-off-by: meows <[email protected]>
This reverts commit ae0efa1. Reason: it caused a test failure TestGetBlockBodiesByRangeInvalidParams where that test compares the have/want errors as strings and I can't be bothered to adjust the test. It would be better, probably, to use errors.Is with wrapped errors.
…release/1.12.2+spiral
ziogaschr
reviewed
Aug 30, 2023
ziogaschr
reviewed
Aug 30, 2023
ziogaschr
reviewed
Aug 30, 2023
… number In order to check eip4895 features for ETC-style block number-based activations, the attributes get a block number field which is allowed to be nil. As usual for core-geth, activation numbers are OR'd with activation times. Date: 2023-09-01 10:18:47-06:00 Signed-off-by: meows <[email protected]>
... but reference forks by name to keep the important context. Date: 2023-09-04 05:22:48-06:00 Signed-off-by: meows <[email protected]>
…oregeth,params/types/goethereum: problem: TestEquivalent_Features fails" This reverts commit a5e0c62.
|
Oh actually, before we merge this, shall we set the block numbers for Spiral correctly? |
|
Ah, important. I think we should unset all activation numbers for ETC until the ECIP gets more love and confidence. (ECIP 1109 currently specs impossible (past) values of |
The ECIP does not specify valid activation blocks yet, so we should not code them. https://github.com/ethereumclassic/ECIPs/blob/64423c73b7416c2f8e40d4c66bf40b715c458b8c/_specs/ecip-1109.md Date: 2023-09-04 10:34:38-06:00 Signed-off-by: meows <[email protected]>
meowsbits
force-pushed
the
merge/foundation-release/1.12.2+spiral
branch
from
1749308
to
1c9478d
Compare
|
Test was failing, but is another flaky one https://github.com/etclabscore/core-geth/actions/runs/6084737553/job/16507292035?pr=561#step:4:1218. Cannot reproduce locally. Merging. |
meowsbits
merged commit f1d9db7
into
merge/foundation-release/1.12.2
3 of 4 checks passed
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.
Implements the pending Spiral (ECIP-1109) network upgrade for ETC.