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

merge upstream geth v1.13.12 #306

Merged
merged 38 commits into from
May 2, 2024
Merged

merge upstream geth v1.13.12 #306

merged 38 commits into from
May 2, 2024

Conversation

axelKingsley
Copy link
Contributor

@axelKingsley axelKingsley commented Apr 23, 2024

Merges upstream geth v1.13.12 into optimism

Additional Changes Required:

  • A new tool, "era", uses a function which we have modified considerably. Rather than rewrite how the tool works, I have corrected its signature to allow the project to build, but do not expect this tool to be functional at this time.
  • A default gas price of 1wei was added to the miner

Testing

Tested via unit tests, and also via CI Workflow on the monorepo: ethereum-optimism/optimism#10205

No Monorepo changes were required for this version.

holiman and others added 30 commits January 24, 2024 11:55
…879)

This adds an error if the signer returns a nil value for one of the signature value fields.
The hyperlink in the README file that directs to the Travis CI build was broken.
This commit updates the link to point to the corrent build page.
At some point, `ForkchoiceUpdatedV2` stopped working for `PayloadAttributesV1` while `paris` was active. This was causing a few failures in hive. This PR fixes that, and also adds a gate in `ForkchoiceUpdatedV1` to disallow `PayloadAttributesV3`.
This pull request resets the txlookup cache if chain reorg happens, 
preventing them from remaining reachable. It addresses failures in
the hive tests.
* eth/downloader: fix skeleton cleanup

* eth/downloader: short circuit if nothing to delete

* eth/downloader: polish the logic in cleanup

* eth/downloader: address comments
… (#28914)

* core/txpool/blobpool: clean up resurrected junk after a crash

* core/txpool/blobpool: track transaction insertions and rejections

* core/txpool/blobpool: linnnnnnnt
…er (#28917)

* core/txpool: don't inject lazy resolved transactions into the container

* core/txpool: minor typo fixes
Co-authored-by: Martin HS <martin@swende.se>
Co-authored-by: Felix Lange <fjl@twurst.com>
* eth, miner: fix enforcing the minimum miner tip

* ethclient/simulated: fix failing test due the min tip change

* accounts/abi/bind: fix simulater gas tip issue
* all: implement era format, add history importer/export

* internal/era/e2store: refactor e2store to provide ReadAt interface

* internal/era/e2store: export HeaderSize

* internal/era: refactor era to use ReadAt interface

* internal/era: elevate anonymous func to named

* cmd/utils: don't store entire era file in-memory during import / export

* internal/era: better abstraction between era and e2store

* cmd/era: properly close era files

* cmd/era: don't let defers stack

* cmd/geth: add description for import-history

* cmd/utils: better bytes buffer

* internal/era: error if accumulator has more records than max allowed

* internal/era: better doc comment

* internal/era/e2store: rm superfluous reader, rm superfluous testcases, add fuzzer

* internal/era: avoid some repetition

* internal/era: simplify clauses

* internal/era: unexport things

* internal/era,cmd/utils,cmd/era: change to iterator interface for reading era entries

* cmd/utils: better defer handling in history test

* internal/era,cmd: add number method to era iterator to get the current block number

* internal/era/e2store: avoid double allocation during write

* internal/era,cmd/utils: fix lint issues

* internal/era: add ReaderAt func so entry value can be read lazily

Co-authored-by: lightclient <lightclient@protonmail.com>
Co-authored-by: Martin Holst Swende <martin@swende.se>

* internal/era: improve iterator interface

* internal/era: fix rlp decode of header and correctly read total difficulty

* cmd/era: fix rebase errors

* cmd/era: clearer comments

* cmd,internal: fix comment typos

---------

Co-authored-by: Martin Holst Swende <martin@swende.se>
Adds a configurable HTTP request limit, and bumps the engine default
* fix wrong comment

* reviewers input

* Update log/handler_glog.go

---------

Co-authored-by: Martin HS <martin@swende.se>
(ethclient/simulated):fix typo
* params: add cancun timestamp for mainnet

* core/forkid: add test for mainnet cancun forkid

* core/forkid: update todo tests for cancun
This change adds support for blob-transaction in certain API-endpoints, e.g. eth_fillTransaction. A follow-up PR will add support for signing such transactions.
…(#28959)

As mentioned in #26621, the block index format for era1 is not in line with the regular era block index. This change modifies the index so all relative offsets are based against the beginning of the block index record.
@axelKingsley axelKingsley marked this pull request as ready for review May 1, 2024 14:20
@axelKingsley axelKingsley requested a review from a team as a code owner May 1, 2024 14:20
@axelKingsley axelKingsley requested review from protolambda and removed request for a team May 1, 2024 14:20
@axelKingsley axelKingsley changed the title Axel/1 13 12 merge merge upstream geth v1.13.12 May 1, 2024
@axelKingsley axelKingsley merged commit df2bf41 into optimism May 2, 2024
10 checks passed
@axelKingsley axelKingsley deleted the axel/1_13_12_merge branch May 2, 2024 14:07
sebastianst pushed a commit that referenced this pull request May 23, 2024
Squashed commit of the following:

commit 07f6d7a8c149f8752aa8deef4598cfd184a37e94
Merge: 5b7b36a33 3ad148820
Author: Maciej Kulawik <10907694+magicxyyz@users.noreply.github.com>
Date:   Wed May 22 13:48:09 2024 +0200

    Merge branch 'master' into pebble-extra-options

commit 5b7b36a339ac28d708bca072dc5ec8189ceadac2
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Wed May 15 21:23:29 2024 +0200

    remove unnecessary new lines

commit bb30724a7b0ba4cd7b2f57a7a2c964087f97f068
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Wed May 15 21:21:01 2024 +0200

    revert accidental comment change

commit 6d23a7b7e6a99701adf1f69701ad367dec61c08c
Merge: ac85a19d5 8512c124d
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Tue May 14 12:41:37 2024 +0200

    Merge branch 'master' into pebble-extra-options

commit ac85a19d5f56231076d5bab95504d666b084fa3b
Merge: 1aaeef759 da4c975e3
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Sat May 4 00:26:27 2024 +0200

    Merge branch 'master' into pebble-extra-options

commit 1aaeef75987a3d4379cf7d876cdf1526d8701884
Merge: 3ecb5979a f94174378
Author: Maciej Kulawik <10907694+magicxyyz@users.noreply.github.com>
Date:   Thu May 2 18:04:36 2024 +0200

    Merge branch 'master' into pebble-extra-options

commit 3ecb5979ae489902c97d7146209c35071d167be6
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Thu May 2 17:38:21 2024 +0200

    use GetOrRegister* for new metrics

commit d1e94af41742958623210f7a0beae6a93f52e750
Merge: 9f39f194d 92b91d3fa
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Thu May 2 17:35:40 2024 +0200

    Merge branch 'fix-pebble-metrics-registration' into pebble-extra-options

commit 9f39f194d0a5b1ab1a47b1d4f83cd112f18dc4b3
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Fri Apr 26 22:50:02 2024 +0200

    remove wal queue wait metric as it's not used by pebble yet

commit a67aac7029db022dd0e078783809e2fedf20de53
Merge: 31dcc5497 19f822748
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Thu Apr 25 02:28:55 2024 +0200

    Merge branch 'master' into pebble-extra-options

commit 31dcc54970876a09e13820a4a7334f39af38157d
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Thu Apr 25 00:54:11 2024 +0200

    revert metrics interval change

commit 07d08fede3e5e8bbfbdb3797fad08d94f8c7699a
Merge: 76745ffed 56f17c846
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Thu Apr 25 00:49:25 2024 +0200

    Merge branch 'master' into pebble-extra-options

commit 76745ffed5649d82beea1766aadeb4420aa62d48
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Thu Apr 25 00:47:05 2024 +0200

    add pebble commit delay metrics

commit 5e8d11c191c4b88e53ca53e69b7854efe89487fd
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Wed Apr 24 16:00:16 2024 +0200

    fix default MemTableStopWritesThreshold

commit 040c6f787056826112340ce0b4e5b8d43503f20a
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Wed Apr 24 15:37:40 2024 +0200

    add mem-table-stop-writes-threshold pebble extra option

commit 509f1114edd9d4e367cedfe4011ceed5766e3f07
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Wed Apr 24 15:11:05 2024 +0200

    add block size and index block size pebble options

commit d6428a6842a8c7d39821e74662fe3e0af34babd7
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Tue Apr 23 19:39:43 2024 +0200

    add pebble layers extra options

commit 9e62e652e211a47ad1c71a428b4a7ea6b96ae710
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Mon Apr 22 16:20:18 2024 +0200

    fix lint err

commit 935cb216402c9693faf86d75a7fbb045109ed4a3
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Sat Apr 20 02:24:38 2024 +0200

    expose more pebble open options, add compact/debt and compact/inprogress metrics
sebastianst pushed a commit that referenced this pull request May 23, 2024
Squashed commit of the following:

commit 07f6d7a8c149f8752aa8deef4598cfd184a37e94
Merge: 5b7b36a33 3ad148820
Author: Maciej Kulawik <10907694+magicxyyz@users.noreply.github.com>
Date:   Wed May 22 13:48:09 2024 +0200

    Merge branch 'master' into pebble-extra-options

commit 5b7b36a339ac28d708bca072dc5ec8189ceadac2
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Wed May 15 21:23:29 2024 +0200

    remove unnecessary new lines

commit bb30724a7b0ba4cd7b2f57a7a2c964087f97f068
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Wed May 15 21:21:01 2024 +0200

    revert accidental comment change

commit 6d23a7b7e6a99701adf1f69701ad367dec61c08c
Merge: ac85a19d5 8512c124d
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Tue May 14 12:41:37 2024 +0200

    Merge branch 'master' into pebble-extra-options

commit ac85a19d5f56231076d5bab95504d666b084fa3b
Merge: 1aaeef759 da4c975e3
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Sat May 4 00:26:27 2024 +0200

    Merge branch 'master' into pebble-extra-options

commit 1aaeef75987a3d4379cf7d876cdf1526d8701884
Merge: 3ecb5979a f94174378
Author: Maciej Kulawik <10907694+magicxyyz@users.noreply.github.com>
Date:   Thu May 2 18:04:36 2024 +0200

    Merge branch 'master' into pebble-extra-options

commit 3ecb5979ae489902c97d7146209c35071d167be6
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Thu May 2 17:38:21 2024 +0200

    use GetOrRegister* for new metrics

commit d1e94af41742958623210f7a0beae6a93f52e750
Merge: 9f39f194d 92b91d3fa
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Thu May 2 17:35:40 2024 +0200

    Merge branch 'fix-pebble-metrics-registration' into pebble-extra-options

commit 9f39f194d0a5b1ab1a47b1d4f83cd112f18dc4b3
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Fri Apr 26 22:50:02 2024 +0200

    remove wal queue wait metric as it's not used by pebble yet

commit a67aac7029db022dd0e078783809e2fedf20de53
Merge: 31dcc5497 19f822748
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Thu Apr 25 02:28:55 2024 +0200

    Merge branch 'master' into pebble-extra-options

commit 31dcc54970876a09e13820a4a7334f39af38157d
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Thu Apr 25 00:54:11 2024 +0200

    revert metrics interval change

commit 07d08fede3e5e8bbfbdb3797fad08d94f8c7699a
Merge: 76745ffed 56f17c846
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Thu Apr 25 00:49:25 2024 +0200

    Merge branch 'master' into pebble-extra-options

commit 76745ffed5649d82beea1766aadeb4420aa62d48
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Thu Apr 25 00:47:05 2024 +0200

    add pebble commit delay metrics

commit 5e8d11c191c4b88e53ca53e69b7854efe89487fd
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Wed Apr 24 16:00:16 2024 +0200

    fix default MemTableStopWritesThreshold

commit 040c6f787056826112340ce0b4e5b8d43503f20a
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Wed Apr 24 15:37:40 2024 +0200

    add mem-table-stop-writes-threshold pebble extra option

commit 509f1114edd9d4e367cedfe4011ceed5766e3f07
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Wed Apr 24 15:11:05 2024 +0200

    add block size and index block size pebble options

commit d6428a6842a8c7d39821e74662fe3e0af34babd7
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Tue Apr 23 19:39:43 2024 +0200

    add pebble layers extra options

commit 9e62e652e211a47ad1c71a428b4a7ea6b96ae710
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Mon Apr 22 16:20:18 2024 +0200

    fix lint err

commit 935cb216402c9693faf86d75a7fbb045109ed4a3
Author: Maciej Kulawik <mkulawik@offchainlabs.com>
Date:   Sat Apr 20 02:24:38 2024 +0200

    expose more pebble open options, add compact/debt and compact/inprogress metrics
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.