Align forkdiff commit #77
Closed
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
Note, this only implements the "Fee" and not the other fields. We need to adjust wiring generally for L1Cost Also, I've very hackily disabled the caching path because we would have to either change the db format to store more, or, more likely wire the block state into reconstructing the receipt.
Since eth_getProof works with historical proofs, there's no need to save them into a proof db. This can be added back easily enough if we need it, but better to reduce conflicts in the near term.
Upstream plus anchorage
Changes to be committed: modified: erigon-lib
Changes to be committed: modified: cmd/rpcdaemon/commands/eth_receipts.go modified: core/error.go modified: core/state_processor.go modified: core/state_transition.go modified: core/types/deposit_tx.go modified: core/types/legacy_tx.go modified: core/types/receipt.go modified: core/types/transaction.go modified: erigon-lib modified: params/config_test.go modified: turbo/adapter/ethapi/api.go
…elop Conflicts: accounts/abi/bind/backends/simulated.go cl/cltypes/attestations.go cl/cltypes/checkpoint.go cl/cltypes/eth1_header.go cmd/ef-tests-cl/consensus_tests/consensus_tester.go cmd/ef-tests-cl/consensus_tests/sanity.go cmd/erigon-cl/core/beacon_changeset/list_changeset.go cmd/erigon-cl/core/beacon_changeset/list_changeset_test.go cmd/erigon-cl/core/state/accessors.go cmd/erigon-cl/core/state/changeset.go cmd/erigon-cl/core/state/mutators.go cmd/erigon-cl/core/state/setters.go cmd/erigon-cl/core/state/state.go cmd/erigon-cl/core/transition/operations.go cmd/erigon-cl/core/transition/operations_test.go cmd/erigon-cl/forkchoice/fork_graph/fork_graph.go cmd/erigon-cl/forkchoice/fork_graph/fork_graph_test.go cmd/erigon-cl/forkchoice/forkchoice.go cmd/integration/commands/state_domains.go cmd/rpcdaemon/cli/config.go cmd/rpcdaemon/commands/eth_receipts.go cmd/rpcdaemon/commands/otterscan_generic_tracer.go cmd/rpcdaemon/commands/otterscan_search_trace.go cmd/rpcdaemon/commands/trace_filtering.go cmd/rpcdaemon/commands/tracing.go cmd/sentinel/main.go cmd/sentinel/sentinel/sentinel.go cmd/sentinel/sentinel/service/start.go cmd/state/commands/erigon4.go cmd/state/commands/history22.go cmd/state/commands/opcode_tracer.go cmd/state/exec22/txtask.go cmd/state/exec3/state.go cmd/txpool/main.go consensus/parlia/parlia.go core/blockchain.go core/chain_makers.go core/evm.go core/state/rw_v3.go core/state_processor.go core/types/legacy_tx.go core/types/transaction.go diagnostics/logs_access.go eth/stagedsync/exec3.go eth/stagedsync/stage_execute.go eth/stagedsync/stage_mining_exec.go ethdb/privateapi/ethbackend.go go.mod go.sum params/version.go tests/state_test_util.go turbo/app/support.go turbo/debug/flags.go turbo/stages/mock_sentry.go turbo/transactions/call.go turbo/transactions/tracing.go turbo/trie/retain_list.go turbo/trie/retain_list_test.go
Changes to be committed: deleted: cmd/erigon-cl/core/beacon_changeset/reverse_beacon_state_changeset.go modified: core/types/signed_blob_tx.go modified: core/types/transaction.go modified: eth/stagedsync/exec3.go modified: ethdb/privateapi/ethbackend.go
Changes to be committed: modified: cmd/rpcdaemon/commands/erigon_block.go modified: cmd/rpcdaemon/commands/eth_block.go modified: turbo/adapter/ethapi/api.go modified: turbo/adapter/ethapi/internal.go
…elop Conflicts: cmd/rpcdaemon/commands/engine_api.go consensus/parlia/parlia.go core/blockchain.go core/types/gen_receipt_json.go go.sum params/protocol_params.go turbo/transactions/tracing.go
Changes to be committed: modified: node/node.go
modified: cmd/rpcdaemon/commands/engine_api.go modified: cmd/rpcdaemon/commands/eth_receipts.go modified: core/types/deposit_tx.go modified: core/types/transaction.go
…elop Conflicts: cmd/rpcdaemon/commands/trace_adhoc.go core/blockchain.go core/types/transaction.go go.sum tests/state_test_util.go turbo/adapter/ethapi/api.go turbo/trie/retain_list_test.go
Changes to be committed: modified: .gitmodules modified: Dockerfile deleted: erigon-lib modified: go.mod modified: go.sum
…elop Conflicts: cmd/rpcdaemon/commands/eth_receipts.go core/blockchain.go core/state_transition.go core/types/receipt.go core/types/transaction.go eth/stagedsync/stage_headers.go eth/stagedsync/stage_mining_exec.go eth/stagedsync/stagebuilder.go ethdb/privateapi/ethbackend.go go.sum node/node.go turbo/adapter/ethapi/api.go turbo/stages/stageloop.go
Changes to be committed: modified: core/types/access_list_tx.go modified: core/types/deposit_tx.go modified: core/types/dynamic_fee_tx.go modified: core/types/legacy_tx.go modified: core/types/signed_blob_tx.go
Conflicts: consensus/misc/eip1559.go eth/backend.go eth/stagedsync/stage_mining_create_block.go go.sum
When an Optimism chain re-orgs, it can do so to a previous block in the canonical chain. Ethereum does not allow this behavior, and, presumably the Erigon code is assuming that a new block must commit and advance the block head hash. So, prior to this commit, Erigon would not set hashes if the block number of the headed head was less than or equal execution block.
Traditional Ethereum ignores forkchoice requests which are to a point in the canonical chain. Optimism needs to allow 'arbitrarily deep re-orgs' including into the canonical chain. So, we added a check to explicitly disallow this 'ignore'. But, this means we re-org every fork choice, even when the forkchoice is to the current canonical head. This change allows the forkchoice to be ignored when the forkchoice is truly a no-op.
It seems like this regression was fixed in upstream Erigon already, no need to keep it around as tests still pass.
aren't implemented for Deposits and shouldn't be called. Remove debug messages elsewhere. Changes to be committed: modified: core/types/deposit_tx.go
Changes to be committed: modified: eth/stagedsync/stage_mining_create_block.go
…tech#8646) Co-authored-by: Alex Sharp <[email protected]>
At `turbo/jsonrpc/bor_snapshot.go:239` creates read only transaction and acquire semaphore but does not rollback or commit transaction and unrelease semaphore lock. Over time, this will result in the locking all of semaphore resources. Any other resources can't acquire semaphore. I added defer function to rollback transaction to release semaphore.
This PR also adds snippets to download caplin snapshots
This fixes an issue where the mumbai testnet node struggle to find peers. Before this fix in general test peer numbers are typically around 20 in total between eth66, eth67 and eth68. For new peers some can struggle to find even a single peer after days of operation. These are the numbers after 12 hours or running on a node which previously could not find any peers: eth66=13, eth67=76, eth68=91. The root cause of this issue is the following: - A significant number of mumbai peers around the boot node return network ids which are different from those currently available in the DHT - The available nodes are all consequently busy and return 'too many peers' for long periods These issues case a significant number of discovery timeouts, some of the queries will never receive a response. This causes the discovery read loop to enter a channel deadlock - which means that no responses are processed, nor timeouts fired. This causes the discovery process in the node to stop. From then on it just re-requests handshakes from a relatively small number of peers. This check in fixes this situation with the following changes: - Remove the deadlock by running the timer in a separate go-routine so it can run independently of the main request processing. - Allow the discovery process matcher to match on port if no id match can be established on initial ping. This allows subsequent node validation to proceed and if the node proves to be valid via the remainder of the look-up and handshake process it us used as a valid peer. - Completely unsolicited responses, i.e. those which come from a completely unknown ip:port combination continue to be ignored. -
added debug_traceBlockByNumber API pattern test
…igontech#8616) Based on maticnetwork/bor#871 in bor, this PR handles import of same difficulty chains (tie breaker conditions) based on their height and hash. This PR also modifies an existing test to check different types of side-chain import and how the canonical is decided.
Merge upstream 20231108
…oice Write the genesis block as the first forkchoice
Add canyon hardfork
Add Boba Sepolia configuration
Only check withdrawals if it is not optimism
jyellick
pushed a commit
that referenced
this pull request
Feb 26, 2024
…-disable Disable adding Deposit Transactions to Txpool
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.
No description provided.