Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: merge/foundation release/1.10.2 resolved #348

Closed
wants to merge 692 commits into from

Conversation

meowsbits
Copy link
Member

@meowsbits meowsbits commented Mar 23, 2021

Merges foundation at c2d2f4ed8f.

See related Tracking Issue for TODOs and review status.

@meowsbits
Copy link
Member Author

meowsbits commented Mar 24, 2021

Running 9e21746 on ETC.

/home/ia/go/src/github.com/ethereum/go-ethereum/.builds/systemd/classic/geth \
        --classic \
        --syncmode=fast \
        --http \
        --http.port 8061 \
        --http.api=debug,eth,web3,net \
        --http.corsdomain=\'*\' \
        --port 30361 \
        --debug --verbosity 4 \
        --datadir /home/ia/SAMSUNG_T5/e/clients/core-geth/classic \
        --ethash.dagdir /home/ia/SAMSUNG_T5/e/clients/core-geth/classic/.ethash \
        --ipcpath /tmp/core-geth_classic.ipc \
Mar 24 07:24:37 ubp52 sh[22547]: INFO [03-24|07:24:37.729|p2p/dial.go:339]                    Looking for peers                        peercount=0 tried=45 static=0
Mar 24 07:24:47 ubp52 sh[22547]: INFO [03-24|07:24:47.777|p2p/dial.go:339]                    Looking for peers                        peercount=0 tried=54 static=0
Mar 24 07:24:57 ubp52 sh[22547]: INFO [03-24|07:24:57.904|p2p/dial.go:339]                    Looking for peers                        peercount=1 tried=58 static=0
Mar 24 07:25:08 ubp52 sh[22547]: INFO [03-24|07:25:08.022|p2p/dial.go:339]                    Looking for peers                        peercount=0 tried=61 static=0
Mar 24 07:25:18 ubp52 sh[22547]: INFO [03-24|07:25:18.024|p2p/dial.go:339]                    Looking for peers                        peercount=0 tried=50 static=0
Mar 24 07:25:21 ubp52 sh[22547]: INFO [03-24|07:25:21.529|eth/downloader/downloader.go:382]   Block synchronisation started
Mar 24 07:25:27 ubp52 sh[22547]: INFO [03-24|07:25:27.901|eth/downloader/queue.go:391]        Downloader queue stats                   receiptTasks=0 blockTasks=361 itemSize=288.77B throttle=8192
Mar 24 07:25:28 ubp52 sh[22547]: INFO [03-24|07:25:28.101|p2p/dial.go:339]                    Looking for peers                        peercount=1 tried=65 static=0
Mar 24 07:25:30 ubp52 sh[22547]: WARN [03-24|07:25:30.763|core/rawdb/accessors_chain.go:764]  Failed to load old bad blocks            error="leveldb: not found"
Mar 24 07:25:30 ubp52 sh[22547]: ERROR[03-24|07:25:30.763|core/blockchain.go:2609]
Mar 24 07:25:30 ubp52 sh[22547]: ########## BAD BLOCK #########
Mar 24 07:25:30 ubp52 sh[22547]: Chain config: NetworkID: 1, ChainID: 61 Engine: ethash ECBP1100: 11380000 EIP1014: 9573000 EIP1052: 9573000 EIP1108: 10500839 EIP1344: 10500839 EIP140: 8772000 EIP145: 9573000 EIP150: 2500000 EIP152: 10500839 EIP155: 3000000 EIP160: 3000000 EIP161abc: 8772000 EIP161d: 8772000 EIP170: 8772000 EIP1884: 10500839 EIP198: 8772000 EIP2028: 10500839 EIP211: 8772000 EIP212: 8772000 EIP213: 8772000 EIP214: 8772000 EIP2200: 10500839 EIP2: 1150000 EIP658: 8772000 EIP7: 1150000 EthashECIP1010Continue: 5000000 EthashECIP1010Pause: 3000000 EthashECIP1017: 5000000 EthashECIP1041: 5900000 EthashECIP1099: 11700000 EthashEIP100B: 8772000 EthashHomestead: 1150000
Mar 24 07:25:30 ubp52 sh[22547]: Number: 12345334
Mar 24 07:25:30 ubp52 sh[22547]: Hash: 0xceeea5817fb17b310be4fcf3d849df023d4247729be9ef63e5e4f92008edc0de
Mar 24 07:25:30 ubp52 sh[22547]: Error: invalid mix digest
Mar 24 07:25:30 ubp52 sh[22547]: ##############################
Mar 24 07:25:30 ubp52 sh[22547]:  
Mar 24 07:25:30 ubp52 sh[22547]: WARN [03-24|07:25:30.763|eth/downloader/downloader.go:352]   Synchronisation failed, dropping peer    peer=2a62660cce76343cf2cbb563a6b9032fddae1158a9efd83a5d0a98365e1fac0d err="retrieved hash chain is invalid: invalid mix digest"
Mar 24 07:25:30 ubp52 sh[22547]: ERROR[03-24|07:25:30.764|eth/handler.go:368]                 Ethereum peer removal failed             peer=2a62660c err="peer not registered"
Mar 24 07:25:38 ubp52 sh[22547]: INFO [03-24|07:25:38.187|p2p/dial.go:339]                    Looking for peers                        peercount=0 tried=55 static=0
Mar 24 07:25:48 ubp52 sh[22547]: INFO [03-24|07:25:48.320|p2p/dial.go:339]                    Looking for peers                        peercount=0 tried=199 static=0
Mar 24 07:25:58 ubp52 sh[22547]: INFO [03-24|07:25:58.354|p2p/dial.go:339]                    Looking for peers                        peercount=0 tried=182 static=0
Mar 24 07:26:08 ubp52 sh[22547]: INFO [03-24|07:26:08.378|p2p/dial.go:339]                    Looking for peers                        peercount=2 tried=74  static=0

Tried rolling back to 12_000_000, but no joy:

Mar 24 07:40:51 ubp52 sh[24111]: WARN [03-24|07:40:51.216|eth/downloader/downloader.go:1659]  Invalid header encountered               number=12000024 hash="e43eda…ad483a" parent="4d6e10…42a99c" err="invalid mix digest"
Mar 24 07:40:51 ubp52 sh[24111]: WARN [03-24|07:40:51.216|core/blockchain.go:623]             Rewinding blockchain                     target=12000000
Mar 24 07:40:51 ubp52 sh[24111]: INFO [03-24|07:40:51.216|core/blockchain.go:477]             Loaded most recent local header          number=12000000 hash="4df1f3…2702fb" td=1070480238291937640602 age=2mo1w4h
Mar 24 07:40:51 ubp52 sh[24111]: INFO [03-24|07:40:51.216|core/blockchain.go:478]             Loaded most recent local full block      number=0        hash="d4e567…cb8fa3" td=17179869184            age=51y11mo2w
Mar 24 07:40:51 ubp52 sh[24111]: INFO [03-24|07:40:51.216|core/blockchain.go:479]             Loaded most recent local fast block      number=12000000 hash="4df1f3…2702fb" td=1070480238291937640602 age=2mo1w4h
Mar 24 07:40:51 ubp52 sh[24111]: INFO [03-24|07:40:51.216|core/blockchain.go:481]             Loaded last fast-sync pivot marker       number=12419347
Mar 24 07:40:51 ubp52 sh[24111]: WARN [03-24|07:40:51.216|eth/downloader/downloader.go:1560]  Rolled back chain segment                header=12000000->12000000 fast=12000000->12000000 block=0->0 reason="invalid mix digest"
Mar 24 07:41:32 ubp52 sh[24111]: WARN [03-24|07:41:32.558|eth/downloader/downloader.go:352]   Synchronisation failed, dropping peer    peer=818e05481c883d1bfe49aa680a587226459f4c80a7ab44086ce7c1a4dfd68d15 err="retrieved hash chain is invalid: invalid mix digest"
Mar 24 07:41:32 ubp52 sh[24111]: ERROR[03-24|07:41:32.558|eth/handler.go:368]                 Ethereum peer removal failed             peer=818e0548 err="peer not registered"
Mar 24 07:41:49 ubp52 sh[24111]: WARN [03-24|07:41:49.892|eth/downloader/downloader.go:1659]  Invalid header encountered               number=12000031 hash="19eaf2…fb5b97" parent="0ed0e0…436b7a" err="invalid mix digest"
Mar 24 07:41:49 ubp52 sh[24111]: WARN [03-24|07:41:49.892|core/blockchain.go:623]             Rewinding blockchain                     target=12000000
Mar 24 07:41:49 ubp52 sh[24111]: INFO [03-24|07:41:49.893|core/blockchain.go:477]             Loaded most recent local header          number=12000000 hash="4df1f3…2702fb" td=1070480238291937640602 age=2mo1w4h
Mar 24 07:41:49 ubp52 sh[24111]: INFO [03-24|07:41:49.893|core/blockchain.go:478]             Loaded most recent local full block      number=0        hash="d4e567…cb8fa3" td=17179869184            age=51y11mo2w
Mar 24 07:41:49 ubp52 sh[24111]: INFO [03-24|07:41:49.893|core/blockchain.go:479]             Loaded most recent local fast block      number=12000000 hash="4df1f3…2702fb" td=1070480238291937640602 age=2mo1w4h
Mar 24 07:41:49 ubp52 sh[24111]: INFO [03-24|07:41:49.893|core/blockchain.go:481]             Loaded last fast-sync pivot marker       number=12419360
Mar 24 07:41:49 ubp52 sh[24111]: WARN [03-24|07:41:49.893|eth/downloader/downloader.go:1560]  Rolled back chain segment                header=12000000->12000000 fast=12000000->12000000 block=0->0 reason="invalid mix digest"
Mar 24 07:41:49 ubp52 sh[24111]: INFO [03-24|07:41:49.893|eth/downloader/statesync.go:610]    Imported new state entries               count=1   elapsed="1.845µs" processed=153584202 pending=17   trieretry=0 coderetry=0 duplicate=0 unexpected=0
Mar 24 07:41:49 ubp52 sh[24111]: INFO [03-24|07:41:49.893|eth/downloader/queue.go:391]        Downloader queue stats                   receiptTasks=0 blockTasks=0   itemSize=698.79B throttle=8192
Mar 24 07:41:49 ubp52 sh[24111]: WARN [03-24|07:41:49.893|eth/downloader/downloader.go:352]   Synchronisation failed, dropping peer    peer=2a62660cce76343cf2cbb563a6b9032fddae1158a9efd83a5d0a98365e1fac0d err="retrieved hash chain is invalid: invalid mix digest"
Mar 24 07:41:49 ubp52 sh[24111]: ERROR[03-24|07:41:49.893|eth/handler.go:368]                 Ethereum peer removal failed             peer=2a62660c err="peer not registered"
Mar 24 07:41:55 ubp52 sh[24111]: INFO [03-24|07:41:55.862|p2p/dial.go:339]                    Looking for peers                        peercount=2 tried=173 static=0
Mar 24 07:42:06 ubp52 sh[24111]: WARN [03-24|07:42:06.432|eth/downloader/downloader.go:1659]  Invalid header encountered               number=12000033 hash="81494d…f28286" parent="6052fe…0cbbe1" err="invalid mix digest"
Mar 24 07:42:06 ubp52 sh[24111]: WARN [03-24|07:42:06.432|core/blockchain.go:623]             Rewinding blockchain                     target=12000000
Mar 24 07:42:06 ubp52 sh[24111]: INFO [03-24|07:42:06.432|core/blockchain.go:477]             Loaded most recent local header          number=12000000 hash="4df1f3…2702fb" td=1070480238291937640602 age=2mo1w4h
Mar 24 07:42:06 ubp52 sh[24111]: INFO [03-24|07:42:06.432|core/blockchain.go:478]             Loaded most recent local full block      number=0        hash="d4e567…cb8fa3" td=17179869184            age=51y11mo2w
Mar 24 07:42:06 ubp52 sh[24111]: INFO [03-24|07:42:06.432|core/blockchain.go:479]             Loaded most recent local fast block      number=12000000 hash="4df1f3…2702fb" td=1070480238291937640602 age=2mo1w4h
Mar 24 07:42:06 ubp52 sh[24111]: INFO [03-24|07:42:06.432|core/blockchain.go:481]             Loaded last fast-sync pivot marker       number=12419368
Mar 24 07:42:06 ubp52 sh[24111]: WARN [03-24|07:42:06.432|eth/downloader/downloader.go:1560]  Rolled back chain segment                header=12000000->12000000 fast=12000000->12000000 block=0->0 reason="invalid mix digest"
Mar 24 07:42:49 ubp52 sh[24111]: WARN [03-24|07:42:49.766|eth/downloader/downloader.go:352]   Synchronisation failed, dropping peer    peer=2a62660cce76343cf2cbb563a6b9032fddae1158a9efd83a5d0a98365e1fac0d err="retrieved hash chain is invalid: invalid mix digest"

@meowsbits
Copy link
Member Author

meowsbits commented Mar 24, 2021

Just some notes about important changes.

  • (cmd/utils/flags.go) Legacy datadir migration/path handling for --testnet vs --ropsten is gone (along with the --testnet flag removal)

meowsbits added a commit that referenced this pull request Mar 24, 2021
This would cause an invalid mix digest hash error.

Rel #348 (comment)

Date: 2021-03-24 10:10:45-05:00
Signed-off-by: meows <[email protected]>
Date: 2021-03-24 11:44:18-05:00
Signed-off-by: meows <[email protected]>
Date: 2021-03-24 11:47:38-05:00
Signed-off-by: meows <[email protected]>
@meowsbits
Copy link
Member Author

meowsbits commented Mar 24, 2021

Fixme:

  • fixup empty versions=[]
39|eth/backend.go:170]                 Initialising Ethereum protocol           versions=[] network=1 dbversion=8
  • review and maybe fix genesis block overrides w/r/t berlin, ecbp1100, ecbp1100noDisable, magneto; as below and in SetupGenesisBlockWithOverride
// ECBP1100NoDisable overrides
	// When this value is *true, ECBP100 will not (ever) be disabled; when *false, it will never be enabled.
	ECBP1100NoDisable *bool `toml:",omitempty"`

	// Berlin block override (TODO: remove after the fork)
	OverrideBerlin *big.Int `toml:",omitempty"`

meowsbits and others added 20 commits March 24, 2021 11:51
…gine fn

Date: 2021-03-24 11:51:43-05:00
Signed-off-by: meows <[email protected]>
Date: 2021-03-24 14:44:40-05:00
Signed-off-by: meows <[email protected]>
Date: 2021-03-24 15:04:22-05:00
Signed-off-by: meows <[email protected]>
Date: 2021-03-24 15:06:51-05:00
Signed-off-by: meows <[email protected]>
Date: 2021-03-24 15:13:05-05:00
Signed-off-by: meows <[email protected]>
Date: 2021-03-24 15:17:16-05:00
Signed-off-by: meows <[email protected]>
Date: 2021-03-24 15:22:32-05:00
Signed-off-by: meows <[email protected]>
Date: 2021-03-24 15:23:48-05:00
Signed-off-by: meows <[email protected]>
Date: 2021-03-24 15:56:19-05:00
Signed-off-by: meows <[email protected]>
…ad ok

Date: 2021-03-24 16:33:29-05:00
Signed-off-by: meows <[email protected]>
Date: 2021-03-24 16:34:03-05:00
Signed-off-by: meows <[email protected]>
Date: 2021-03-24 16:46:50-05:00
Signed-off-by: meows <[email protected]>
…pturestart (#22333)

Fixes the CaptureStart api to include the EVM, thus being able to set the statedb early on. This pr also exposes the struct we used internally in the interpreter to encapsulate the contract, mem, stack, rstack, so we pass it as a single struct to the tracer, and removes the error returns on the capture methods.
* cmd/devp2p: fix comparison of TXT record value

The AWS API returns quoted DNS strings, so we must encode the new value
before comparing it against the existing record content.

* cmd/devp2p: add test

* cmd/devp2p: fix typo and rename val -> newValue
core: fix condition on header verification
Date: 2021-03-25 08:31:37-05:00
Signed-off-by: meows <[email protected]>
meowsbits and others added 11 commits April 30, 2021 06:13
Adapts the canonical list of methods that
should be provided by the document to meet
what the document says.

Date: 2021-04-30 06:13:54-05:00
Signed-off-by: meows <[email protected]>
This EIP was removed at the last minute from
the Berlin spec, and is -- pending merge --
slated for removal at the Magneto spec as well.

ethereumclassic/ECIPs#419

Date: 2021-04-30 07:05:01-05:00
Signed-off-by: meows <[email protected]>
Date: 2021-04-30 07:11:38-05:00
Signed-off-by: meows <[email protected]>
…0.1-resolved-stateDiff-openrpc

Test for OpenRPC subscription methods on trace/debug modules
…0.2-resolved

Merge/foundation release/1.10.2 resolved
@meowsbits meowsbits changed the title WIP: merge/foundation release/1.10.1 resolved WIP: merge/foundation release/1.10.2 resolved May 4, 2021
@meowsbits
Copy link
Member Author

meowsbits commented May 4, 2021

Note for posterity: With the merge commit at 3e39797, this branch now includes all changes from 1.10.2, at noted in the changed title of this PR. (Although the branch name is still ...1.10.1...).

@meowsbits meowsbits force-pushed the merge/foundation-release/1.10.1-resolved branch from 370870a to 04b459f Compare May 6, 2021 11:29
ziogaschr and others added 6 commits May 6, 2021 14:45
TestGethStartupLogs was failing because of shutdown
timeout, via https://travis-ci.org/github/etclabscore/core-geth/jobs/770485427.

This allows a configurable process kill timeout window
and provides an unchanged default (5 seconds).

Note that the field isn't protected or really closely
integrated with the process runner at (ie via runGeth function),
so the kill field basically just gets set on the fly and
hopes that it gets set before the shutdown logic is called.

Date: 2021-05-11 05:56:29-05:00
Signed-off-by: meows <[email protected]>
…0.1-resolved-protocol-versions

Fix allowing of selecting protocol versions after merge of 1.10.x
…0.1-resolved-testcmd-timeout

cmd/geth,internal/cmdtest: add KillTimeout field to TestCmd struct
@ziogaschr
Copy link
Member

@meowsbits & @iquidus I reviewed all the file changes (not tests) and it looks that we haven't missed anything on merge. It LGTM for an RC release.

@meowsbits
Copy link
Member Author

meowsbits commented May 11, 2021

The Travis CI test failures look to me to be typically spurious (A7-looksgoodtestsfail 😂). I'll run a devp2p discv4 crawl right now to make sure we won't break the downstream DNS updater, then AOK to me too.

Testing at f912896.

  • Update: Looks OK. ✔️

@meowsbits
Copy link
Member Author

Closing in favor of #376 Release/1.12 RC-1.

@meowsbits meowsbits closed this May 17, 2021
@ziogaschr ziogaschr deleted the merge/foundation-release/1.10.1-resolved branch June 7, 2021 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.