This PR merges in upstream's v1.11.2 into our fork's master branch. There were a number of conflicts that have been resolved, see the notes below and on individual commit messages.

Nitro is now successfully building (https://github.com/OffchainLabs/nitro/pull/1517) against this PR.

There are still some tests with Nitro still need to be performed, see @tsahee's comment https://github.com/OffchainLabs/go-ethereum/pull/205#pullrequestreview-1358050644

Notes from merge

Status of tests in go-ethereum package

Some tests on master were already failing, along with some tests on the upstream v1.11.2 branch. All tests that were passing on master are still passing on this branch and I fixed a few more, so although the tests aren't all passing, I don't think we have broken anything new.

Failing only on v1.1.2 merge branch

--- FAIL: TestCallTracerNativeWithLog (0.00s) - new in v1.11.2, probably fails for same reason as TestCallTracerNative

Failing in both origin/master and v1.11.2 merge branch

--- FAIL: TestT8n (0.03s) - exact text match not expecting our L1GasUsed param, fixed on this branch --- FAIL: TestCallTracerNative (0.00s) --- FAIL: TestZeroValueToNotExitCall (0.00s)

Fails in both v1.11.2 branch and in upstream/v1.11.2

--- FAIL: TestConsoleWelcome (0.07s) - fails due to version string having git commit, fixed on this branch --- FAIL: TestAttachWelcome (5.37s) - fails due to version string having git commit, fixed on this branch --- FAIL: TestSequentialRead (0.00s) --- FAIL: TestSequentialReadByteLimit (0.00s) --- FAIL: TestFreezerReadonly --- FAIL: TestRandom (0.00s)

Conflict resolution notes (change X conflicting change -> resolution)

These are my notes from resolving the conflicts in the merge commit itself. There are also other fixes, mostly fixes relating to the initial merge, applied as separate commits after the merge commit.

[X] Limit unrolling https://github.com/OffchainLabs/go-ethereum/pull/159 X timestamp limit upstream -> Two new arguments and one return code was added to , so we combined them.
[X] non-clean shutdown support https://github.com/OffchainLabs/go-ethereum/pull/155 X make generic priority queue https://github.com/ethereum/go-ethereum/pull/26290 -> since core.Blockchain.triegc was made generic upstream, we changed the type ourselves so we need to change the generic parameter. Also this PR modified whitespace in writeBlockWithState and added a check for current block# vs TriesInMemory which is unneccessary in our fork since we check blockLimit > 0, and it also added the Blockchain.lastWrite field which we need to keep, using prevNum, also a log message about when flushing happens https://github.com/ethereum/go-ethereum/pull/24785 - manual testing required --- also conflicts with generic LRU since it doesn't have Reset() https://github.com/ethereum/go-ethereum/pull/26162/files
[X] removing callback from trie.Database.Commit() https://github.com/ethereum/go-ethereum/pull/26637 X don't attempt to commit empty state roots https://github.com/OffchainLabs/go-ethereum/pull/114 -> Use new method sig and also include the empty hash check
[X] trie.Database finalizer https://github.com/OffchainLabs/go-ethereum/pull/177 X remove DiskDB function https://github.com/ethereum/go-ethereum/pull/25690 -> remove Database.DiskDB() function again
[x] return execution results instead of modifying receipts https://github.com/OffchainLabs/go-ethereum/commit/739a0a2529fc3c4c329ac664fd68e5e14fb9928e X implement eip-1153 transient storage https://github.com/ethereum/go-ethereum/pull/26003 -> our change removed scheduled txs from the recipt and returns it separately from ApplyTransaction
[X] schedule transactions, adds resultFilter https://github.com/OffchainLabs/go-ethereum/pull/48 X changes to applyTransaction args https://github.com/ethereum/go-ethereum/pull/26345 -> used latest args with resultFilter appended
[X] deterministic statedb https://github.com/OffchainLabs/go-ethereum/pull/169 X return state error when trie can't be opened https://github.com/ethereum/go-ethereum/pull/26350 -> merge deterministic deletion functionality with rearranged deletion code
[X] selfdestruct balance tracking https://github.com/OffchainLabs/go-ethereum/pull/50 X maintain destruction flag https://github.com/ethereum/go-ethereum/pull/26371 -> seems like we just changed some whitespace and back and the merge got confused, added unexpectedBalance to the new code
[X] arblegacy type receipt https://github.com/OffchainLabs/go-ethereum/pull/114 X drop Legacy receipt types https://github.com/ethereum/go-ethereum/pull/26225 -> changed Logs []LogForStorage to []Log, might be wrong
[X] all the arbitrum tx types in transaction_marshalling.go X renaming tx to itx in this PR https://github.com/ethereum/go-ethereum/pull/26046
[X] add native tracers https://github.com/OffchainLabs/go-ethereum/pull/105 X callTracer was moved around in this file upstrem
[X] result hooks https://github.com/OffchainLabs/go-ethereum/pull/192 X fix unmarshalling https://github.com/ethereum/go-ethereum/pull/26723
[X] batch response size limit https://github.com/OffchainLabs/go-ethereum/pull/198 X improve RPC write timeout handling https://github.com/ethereum/go-ethereum/pull/25457 -> moved max response size limit logic into callBuffer

OffchainLabs / go-ethereum