Merge v1.12.1 #258

Tristan-Wilson · 2023-09-27T19:31:23Z

Merge upstream geth's v1.12.1 release into our geth fork: https://github.com/ethereum/go-ethereum/releases/tag/v1.12.1

Merges were done with my gradual merging script to create a merge commit for the first conflict that is found: https://github.com/Tristan-Wilson/MyScripts/blob/main/bin/merge-helper. This makes for more merge commits but hopefully each one is easier to review.

Companion nitro PR: OffchainLabs/nitro#1903

Testing done

geth and nitro tests pass.

* core: replace noarg fmt.Errorf with errors.New Signed-off-by: jsvisa <[email protected]> * console: replace noarg fmt.Errorf with errors.New Signed-off-by: jsvisa <[email protected]> * core: go autoimport Signed-off-by: jsvisa <[email protected]> * core: dry Signed-off-by: jsvisa <[email protected]> --------- Signed-off-by: jsvisa <[email protected]>

* accounts: replace noarg fmt.Errorf with errors.New Signed-off-by: jsvisa <[email protected]> * accounts: go autoimport Signed-off-by: jsvisa <[email protected]> --------- Signed-off-by: jsvisa <[email protected]>

This change implements async log retrievals via feeding logs in channels, instead of returning slices. This is a first step to implement #15063. --------- Signed-off-by: jsvisa <[email protected]> Co-authored-by: Sina Mahmoodi <[email protected]> Co-authored-by: Martin Holst Swende <[email protected]> Co-authored-by: Sina Mahmoodi <[email protected]>

RPC methods `eth_getHeaderBy*` returned a size value which was meant for internal processes. Please instead use `size` field returned by `eth_getBlockBy*` if you're interested in the RLP encoded storage size of the block. Signed-off-by: jsvisa <[email protected]>

This change splits up the multiple API functions / namespaces currently defined in the eth package into different per-namespace files.

Signed-off-by: jsvisa <[email protected]> Co-authored-by: Sina Mahmoodi <[email protected]>

eth: make StorageRangeAt take a block hash or number Co-authored-by: Martin Holst Swende <[email protected]> Co-authored-by: Sina Mahmoodi <[email protected]>

This is a minor optimization/refactoring of Feed. --------- Co-authored-by: Felix Lange <[email protected]>

…mplementation (#27310) Deserialize hex keys early to shortcut on invalid input, and re-use the account storageTrie for each proof for each proof in the account, preventing repeated deep-copying of the trie. Closes #27308 -------- Co-authored-by: Martin Holst Swende <[email protected]> Co-authored-by: Marius van der Wijden <[email protected]>

Drop the notions of uncles, and disables activities while syncing - Disable activities (e.g. generate pending state) while node is syncing, - Disable empty block submission (but empty block is still kept for payload building), - Drop uncle notion since (ethash is already deprecated)

go.mod:golang upgrade

* p2p/discover: remove ReadRandomNodes Even though it's public, this method is not callable by code outside of package p2p/discover because one can't get a valid instance of Table. * p2p/discover: add Table.Nodes * p2p/discover: make Table settings configurable In unit tests and externally developed cmd/devp2p test runs, it can be useful to tune the timer intervals used by Table.

Continuing with a series of PRs to make the Trie interface more generic, this PR moves the RLP encoding of storage slots inside the StateTrie and light.Trie implementations, as other types of tries don't use RLP.

This changes the journal logic to mark the state object dirty immediately when it is reset. We're mostly adding this change to appease the fuzzer. Marking it dirty immediately makes no difference in practice because accounts will always be modified by EVM right after creation.

…(#27397) * eth/downloader: drop beacon head updates if the syncer is restarting * eth/donwloader: v2 of the goroutine spike preventer

* core/state: remove cached snap data if reset occurs * core/state: address comment from peter * core/state: skip revert in case data is nil

* core: crypto: implement BLOBHASH and pointEval precompile * core: crypto: fixed nitpicks, moved precompile return value * core/vm: fix review comments

… (#27323) * core/state/snapshot, core/types, eth: move account definition to type * core, eth: revert snapshot Account API change

* cmd/evm: make evm blocktest output logs if so instructed * Apply suggestions from code review Co-authored-by: Marius van der Wijden <[email protected]> --------- Co-authored-by: Marius van der Wijden <[email protected]>

This fix a minor implementation issue with the newly introduced isGapped function and it is described in ticket: ethereum/go-ethereum#27401

Fixed conflict around block number arg added to addStateVerify upstream, while we had changed code surrounding a call to it on master.

cla-bot · 2023-09-27T19:46:10Z

We require contributors to sign our Contributor License Agreement. In order for us to review and merge your code, please sign the linked documents below to get yourself added. https://na3.docusign.net/Member/PowerFormSigning.aspx?PowerFormId=b15c81cc-b5ea-42a6-9107-3992526f2898&env=na3&acct=6e152afc-6284-44af-a4c1-d8ef291db402&v=2

Co-authored-by: Martin Holst Swende <[email protected]> (cherry picked from commit f56ee7d)

…e) (#27992) Signed-off-by: jsvisa <[email protected]> Co-authored-by: Jared Wasinger <[email protected]> (cherry picked from commit cde462c)

cla-bot · 2023-10-11T12:40:47Z

We require contributors to sign our Contributor License Agreement. In order for us to review and merge your code, please sign the linked documents below to get yourself added. https://na3.docusign.net/Member/PowerFormSigning.aspx?PowerFormId=b15c81cc-b5ea-42a6-9107-3992526f2898&env=na3&acct=6e152afc-6284-44af-a4c1-d8ef291db402&v=2

Conflicts: rpc/handler.go In master we made more changes to our batch limit handling code that had already been reverted in merge-v1.12.1 because we are using upstream geth's batch limiting code instead, so we resolve the conflicts in this file by going with what was already on merge-v1.12.1.

cla-bot · 2023-10-20T14:10:00Z

We require contributors to sign our Contributor License Agreement. In order for us to review and merge your code, please sign the linked documents below to get yourself added. https://na3.docusign.net/Member/PowerFormSigning.aspx?PowerFormId=b15c81cc-b5ea-42a6-9107-3992526f2898&env=na3&acct=6e152afc-6284-44af-a4c1-d8ef291db402&v=2

statedb must now be recreated after Commit is called on it, see ethereum/go-ethereum#27428

cla-bot · 2023-10-27T14:54:29Z

We require contributors to sign our Contributor License Agreement. In order for us to review and merge your code, please sign the linked documents below to get yourself added. https://na3.docusign.net/Member/PowerFormSigning.aspx?PowerFormId=b15c81cc-b5ea-42a6-9107-3992526f2898&env=na3&acct=6e152afc-6284-44af-a4c1-d8ef291db402&v=2

Conflicts: core/txpool/txpool.go We added max code size to ChainConfig on master (#255) and this conflicted with upstream changes to refactoring txpool. Resolved by putting the check in ValidateTransaction in the file it was moved to.

cla-bot · 2023-10-31T00:26:06Z

We require contributors to sign our Contributor License Agreement. In order for us to review and merge your code, please sign the linked documents below to get yourself added. https://na3.docusign.net/Member/PowerFormSigning.aspx?PowerFormId=b15c81cc-b5ea-42a6-9107-3992526f2898&env=na3&acct=6e152afc-6284-44af-a4c1-d8ef291db402&v=2

…x-update fastcache fix update for v.1.12.1

cla-bot · 2023-11-01T20:23:56Z

We require contributors to sign our Contributor License Agreement. In order for us to review and merge your code, please sign the linked documents below to get yourself added. https://na3.docusign.net/Member/PowerFormSigning.aspx?PowerFormId=b15c81cc-b5ea-42a6-9107-3992526f2898&env=na3&acct=6e152afc-6284-44af-a4c1-d8ef291db402&v=2

Fix conflicts between adding apiFilter and rpcEndpointConfig.

cla-bot · 2023-11-02T22:56:01Z

We require contributors to sign our Contributor License Agreement. In order for us to review and merge your code, please sign the linked documents below to get yourself added. https://na3.docusign.net/Member/PowerFormSigning.aspx?PowerFormId=b15c81cc-b5ea-42a6-9107-3992526f2898&env=na3&acct=6e152afc-6284-44af-a4c1-d8ef291db402&v=2

tsahee

initial

tsahee · 2023-11-06T17:45:13Z

arbitrum/export.go

@@ -12,7 +12,7 @@ import (
 type TransactionArgs = ethapi.TransactionArgs

 func EstimateGas(ctx context.Context, b ethapi.Backend, args TransactionArgs, blockNrOrHash rpc.BlockNumberOrHash, gasCap uint64) (hexutil.Uint64, error) {
-	return ethapi.DoEstimateGas(ctx, b, args, blockNrOrHash, gasCap)
+	return ethapi.DoEstimateGas(ctx, b, args, blockNrOrHash, nil, gasCap)


I think we'll want to also get the overrides *StateOverride argument and pass it to DoEstimateGas, just like the EstimateGas func in BlockChainAPI

tsahee

tiny comments. great job on the merge commits

tsahee · 2023-11-07T23:41:37Z

core/types/receipt.go

 		rlp.Encode(w, data)
 	default:
-		w.WriteByte(r.Type)
+		// Arbitrum: same as above, but this should help prevent future merge conflicts,
+		// by keeping above case statement the same.


A thought: maybe add a case with all arbitrum types that will do rlp.Encode, and add a default that does nothing (including the original comment)?
I think it will be clearer / easier to merge future geth changes, but require us to remember updating new Arbitrum types

core/state/statedb_arbitrum.go

- Add state overrides to arbitrum.EstimateGas - Non-functional change to EncodeIndex to avoid future merge conflicts.

cla-bot · 2023-11-13T20:27:02Z

We require contributors to sign our Contributor License Agreement. In order for us to review and merge your code, please sign the linked documents below to get yourself added. https://na3.docusign.net/Member/PowerFormSigning.aspx?PowerFormId=b15c81cc-b5ea-42a6-9107-3992526f2898&env=na3&acct=6e152afc-6284-44af-a4c1-d8ef291db402&v=2

tsahee

LGTM

holiman and others added 30 commits May 25, 2023 12:02

params: begin v1.12.1 release cycle

690249d

accounts: replace noarg fmt.Errorf with errors.New (#27331)

9358b62

* accounts: replace noarg fmt.Errorf with errors.New Signed-off-by: jsvisa <[email protected]> * accounts: go autoimport Signed-off-by: jsvisa <[email protected]> --------- Signed-off-by: jsvisa <[email protected]>

eth: split api.go into namespace based files (#27263)

1316621

This change splits up the multiple API functions / namespaces currently defined in the eth package into different per-namespace files.

internal/ethapi: add more testcases for block/header rpc (#27325)

c57b343

Signed-off-by: jsvisa <[email protected]> Co-authored-by: Sina Mahmoodi <[email protected]>

core/types: remove superfluous todo-comment (#27383)

1888174

eth: make debug_StorageRangeAt take a block hash or number (#27328)

d789c68

eth: make StorageRangeAt take a block hash or number Co-authored-by: Martin Holst Swende <[email protected]> Co-authored-by: Sina Mahmoodi <[email protected]>

les, eth: fix typo in comment (#27369)

560dceb

event: move type fixation logic into Feed.init (#27249)

8013a49

This is a minor optimization/refactoring of Feed. --------- Co-authored-by: Felix Lange <[email protected]>

go.mod: golang.org/x upgrade (#27299)

cc2ab42

go.mod:golang upgrade

consensus, core, eth/downloader, params: 4844 chain validation (#27382)

1f9b69b

core, eth/downloader, params: validate blob tx bodies (#27392)

495692c

core, eth/downloader: validate blobtx.To at serialization time (#27393)

008086f

core/state: move slot RLP encoding into the MPT implementation (#27000)

45a3ab4

Continuing with a series of PRs to make the Trie interface more generic, this PR moves the RLP encoding of storage slots inside the StateTrie and light.Trie implementations, as other types of tries don't use RLP.

internal/web3ext: fix parameter count of miner_start (#27400)

2372fb2

all: remove the Rinkeby testnet (#27406)

c7c84ca

eth/downloader: drop beacon head updates if the syncer is restarting …

a7b2106

…(#27397) * eth/downloader: drop beacon head updates if the syncer is restarting * eth/donwloader: v2 of the goroutine spike preventer

graphql: simplify tx resolve (#27285)

78f7a6b

core/state: clear out cached state data when reset occurs (#27376)

380fb4e

* core/state: remove cached snap data if reset occurs * core/state: address comment from peter * core/state: skip revert in case data is nil

core: 4844 opcode and precompile (#27356)

c537ace

* core: crypto: implement BLOBHASH and pointEval precompile * core: crypto: fixed nitpicks, moved precompile return value * core/vm: fix review comments

core/state/snapshot, core/types, eth: move account definition to type…

0e5d2c7

… (#27323) * core/state/snapshot, core/types, eth: move account definition to type * core, eth: revert snapshot Account API change

core/txpool: fix minor flaw in isGapped check (#27404)

b8ee287

This fix a minor implementation issue with the newly introduced isGapped function and it is described in ticket: ethereum/go-ethereum#27401

les: remove unused var AdvertiseProtocolVersions (#27405)

4cf708d

Merge remote-tracking branch 'origin/master' into merge-v1.12.1

90dbc8e

Fixed conflict around block number arg added to addStateVerify upstream, while we had changed code surrounding a call to it on master.

PlasmaPower mentioned this pull request Sep 28, 2023

Fix error handling of batch pushResponse #259

Merged

jwasinger and others added 2 commits October 11, 2023 14:39

eth/catalyst: set finalized block hash properly in dev mode (#27886)

c530059

Co-authored-by: Martin Holst Swende <[email protected]> (cherry picked from commit f56ee7d)

eth/catalyst: reset to current header if chain is rewound (in dev mod…

ca2d9a7

…e) (#27992) Signed-off-by: jsvisa <[email protected]> Co-authored-by: Jared Wasinger <[email protected]> (cherry picked from commit cde462c)

Tristan-Wilson requested review from PlasmaPower and tsahee October 20, 2023 14:52

Tristan-Wilson marked this pull request as ready for review October 20, 2023 14:59

Tristan-Wilson mentioned this pull request Oct 20, 2023

Merge v1.12.1 OffchainLabs/nitro#1903

Merged

Recreate statedb after Commit() in RecordingDb

627e5f3

statedb must now be recreated after Commit is called on it, see ethereum/go-ethereum#27428

magicxyyz and others added 4 commits November 1, 2023 18:46

Merge branch 'master' into merge-v.1.12.1-fastcache-fix-update

4332b35

reset fastcache in Database.Close

bafe56a

update comment

614c728

Merge pull request #267 from OffchainLabs/merge-v.1.12.1-fastcache-fi…

4b27832

…x-update fastcache fix update for v.1.12.1

Merge remote-tracking branch 'origin/master' into merge-v1.12.1

890cbca

Fix conflicts between adding apiFilter and rpcEndpointConfig.

tsahee reviewed Nov 6, 2023

View reviewed changes

tsahee reviewed Nov 9, 2023

View reviewed changes

PR fixes

be1fd29

- Add state overrides to arbitrum.EstimateGas - Non-functional change to EncodeIndex to avoid future merge conflicts.

tsahee approved these changes Nov 13, 2023

View reviewed changes

Tristan-Wilson merged commit 6cacfc9 into master Nov 14, 2023
2 of 3 checks passed

Tristan-Wilson deleted the merge-v1.12.1 branch November 14, 2023 23:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge v1.12.1 #258

Merge v1.12.1 #258

Tristan-Wilson commented Sep 27, 2023 •

edited

Loading

cla-bot bot commented Sep 27, 2023

cla-bot bot commented Oct 11, 2023

cla-bot bot commented Oct 20, 2023

cla-bot bot commented Oct 27, 2023

cla-bot bot commented Oct 31, 2023

cla-bot bot commented Nov 1, 2023

cla-bot bot commented Nov 2, 2023

tsahee left a comment

tsahee Nov 6, 2023 •

edited

Loading

Tristan-Wilson Nov 13, 2023

tsahee left a comment

tsahee Nov 7, 2023

Tristan-Wilson Nov 13, 2023

cla-bot bot commented Nov 13, 2023

tsahee left a comment

Merge v1.12.1 #258

Merge v1.12.1 #258

Conversation

Tristan-Wilson commented Sep 27, 2023 • edited Loading

Testing done

cla-bot bot commented Sep 27, 2023

cla-bot bot commented Oct 11, 2023

cla-bot bot commented Oct 20, 2023

cla-bot bot commented Oct 27, 2023

cla-bot bot commented Oct 31, 2023

cla-bot bot commented Nov 1, 2023

cla-bot bot commented Nov 2, 2023

tsahee left a comment

Choose a reason for hiding this comment

tsahee Nov 6, 2023 • edited Loading

Choose a reason for hiding this comment

Tristan-Wilson Nov 13, 2023

Choose a reason for hiding this comment

tsahee left a comment

Choose a reason for hiding this comment

tsahee Nov 7, 2023

Choose a reason for hiding this comment

Tristan-Wilson Nov 13, 2023

Choose a reason for hiding this comment

cla-bot bot commented Nov 13, 2023

tsahee left a comment

Choose a reason for hiding this comment

Tristan-Wilson commented Sep 27, 2023 •

edited

Loading

tsahee Nov 6, 2023 •

edited

Loading