-
Notifications
You must be signed in to change notification settings - Fork 23
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
feat: enable tx pool sync by force #13
Merged
Merged
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
This commit removes 2 flags. - `RollupSequencerHttpFlag`: This transfers transaction to geth that is specified with this flag. - `RollupDisableTxPoolGossipFlag`: This diables tx pool sync if this flag is on.
Pangssu
approved these changes
Feb 14, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
jyc228
approved these changes
Feb 16, 2023
chokobole
pushed a commit
that referenced
this pull request
Mar 8, 2023
This commit squashes the op-geth fork history into a more maintainable diff for rebasing upon upstream geth. reference-optimistic-geth changes (origins of op-geth in early Bedrock development stage): - Deposit TX Type - Enable deposit tx in EVM/tx pool - Change deposit nonce to not be the max nonce - Extend PayloadAttributesV1 with a Transactions field - Force deposits at the start of each L2 block - Fix height check - noTxPool flag, reproduce block in verifier mode without tx pool interference - Fix RPC json marshalling (ref op-geth PR 4) - Deposit txs block height check in block body validation (ref op-geth PR 5) - core: do not try to reinject deposit txs into tx-pool (ref-op-geth PR 6) - deposit source hash field instead of L2 block height and tx index combination - Include invalid deposits, rewind state, but always persist mint (#10) - Provide gas to Call/Create in deposit transactions (#12) - Add docker builds (ref-op-geth PR 16, 17) - Don't panic on deposit transaction signature values or chain ID (ref-op-geth PR 18) - core: Add version to DepositTx (ref-op-geth PR 19) - Enable Geth build/lint/test in CircleCI (ref-op-geth PR 23) - core: Include guaranteed gas in the gas pool (ref-op-geth PR 21) - core: handle base fee, l1 availability fee, tx fee (ref-op-geth PR 27) - fix: deposit tx hash - fix l1 fee cache, rpc, tracing and tx pool - core: remove deposit-tx sub-type (a.k.a. deposit version byte) - eth/catalyst: allow engine user to reorg own chain - miner: restore ability to reorg deep as block builder - params: print Optimism consensus type in banner - core/types: remove unused protected() method, see upstream PR 23376 - core: do not mutate original balance value in tx pool l1 cost adjustment - core: subtract deposit gas from pool, so other txs do not use the same gas. And fail tx processing if deposits reach gas limit - core/types: deposits do not tip, avoid basefee subtraction - Unmeter the L1 Attributes Transaction - miner: handle force tx errors as critical, clean up diff - ci: Switch branch - eth,miner: return STATUS_INVALID when failing to process forced transactions in request (ref-op-geth PR 40) - verifier: forward tx to sequencer based on flag - txpool: add flag to disable tx gossip (ref-op-geth PR 42) - Add op-geth version in addition to geth version (ref-op-geth PR 43) - ci: CircleCI improvements (ref-op-geth PR 44) - Rename to op-geth - Build latest tag on optimism branch op-geth changes: - Expose cache config in simulated backend (#2) - Add EIP-1559 parameters - eth/catalyst: update payload id computation (#1) - make eip1559 configurable (#4) - post-merge network should not log warnings about missing transition information (#5) - Make the simulator more configurable (#6) - fix OPB-6 - IsDepositTx check instead of artificial nonce value check (#7) - Simulated backend - enable proof of stake consensus type and fix performance issue (#8) - accounts: simulated backend consensus engine option and immediate tx indexing - consensus/beacon: recognize all blocks as reached TTD with 0 TTD in chain config - Add --rollup.historicalhttp CLI flag and fix backend iface - Flags and interfaces for historical RPC requests (#12) - Redirect historical RPC requests (#13) - Use the pre-existing ethereum.NotFound error (#18) - Add historical endpoint to TraceBlockByNumber and TraceBlockByHash (#19) - Add historical endpoint to TraceTransaction (#20) - Add historical endpoint to TraceCall (#21) - optimism: fee params from info txi, update l1 cost func GPO params read (#15) - add hardcoded addresses for fee payouts (#23) - dynamic gas limit via engine API (#22) Co-authored-by: Matthew Slipper <me@matthewslipper.com> Co-authored-by: Joshua Gutow <jgutow@oplabs.co> Co-authored-by: protolambda <proto@protolambda.com> Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com> Co-authored-by: Maurelian <maurelian@protonmail.ch>
chokobole
added a commit
that referenced
this pull request
Mar 8, 2023
This commit squashes the kanvas-geth fork history into a more maintainable diff for rebasing upon upstream geth. See https://github.com/wemixkanvas/go-ethereum/commits/op-geth-base for more details about how op-geth changes geth code. kanvas-geth changes: - Merge pull request #17 from light-scale/fix/change-contract-address - fix: change predeployed contract address - Merge pull request #15 from light-scale/ci/lint - Merge pull request #16 from light-scale/ci/pipeline - ci: add ci pipeline and test pipeline - ci: add worklows to run lint on push - ci: change the style of the code so that linting succeeds - Merge pull request #14 from light-scale/ci/test-disable - disable unittest temporarily for CI introduction - Merge pull request #13 from light-scale/feat/enable-tx-pool-sync-by-force - feat: enable tx pool sync by force - Merge pull request #11 from light-scale/feat/remove-daisy-chain - feat: remove daisy chain - Merge pull request #10 from light-scale/feat/set-pending-block-gas-limit - Merge pull request #12 from light-scale/zktrie - chore: upgrade zktrie library - feat: enable setting pending block gas limit - chore: rename optimism to kanvas - ci: remove circle ci config - Merge pull request #8 from light-scale/feat/add-fee-recipients-to-proof - feat(core, eth): add Optimism{Base,L1}FeeRecipient to block trace - feat: add Mint to TransactionTrace - Merge pull request #5 from light-scale/feat/add-L1CostFunc-to-EVM-BlockContext - fix(cmd): list ipcAPIs on alphabetical order - fix(eth): add L1CostFunc to evm's block context - refac(light): remove unneeded member variable - perf(trie): disable preimage by default - chore: rename voost to kanvas - Merge pull request #3 from light-scale/feat/enable-use-keccak-for-codehash - feat: use poseidon as code hash only with zktrie - fix(cmd, core): load database with Zktrie when possible - fix: fix segfault when referencing to Database - fix(common, signer): make unit test passed We wrapped code with comments like below to separate code change for scroll-geth from op-geth. ```go // [Scroll: START] // changes for scroll-geth // [Scroll: END] ``` scroll-geth changes: - Merge pull request #1 from light-scale/feat/add-scroll-patches - chore: add run_geth.sh - feat: add GetBlockResultByNumberOrHash rpc - feat: add CacheConfig to Backend interface - feat(core): add some methods to StateDB interface - feat: add MPTWitness to CacheConfig - feat: use zktrie for state trie - feat: apply poseidon to codehash - feat(core): add ReturnValue to Receipt - feat: add detailed contents to traces for zkevm - feat(core/vm, eth/tracers): add CaptureStateAfter hook - feat(core/vm): disable SelfDestruct opcode - test(cmd, internal): add custom genesis test
chokobole
added a commit
that referenced
this pull request
Mar 8, 2023
This commit squashes the kanvas-geth fork history into a more maintainable diff for rebasing upon upstream geth. See https://github.com/wemixkanvas/go-ethereum/commits/op-geth-base for more details about how op-geth changes geth code. kanvas-geth changes: - Merge pull request #17 from light-scale/fix/change-contract-address - fix: change predeployed contract address - Merge pull request #15 from light-scale/ci/lint - Merge pull request #16 from light-scale/ci/pipeline - ci: add ci pipeline and test pipeline - ci: add worklows to run lint on push - ci: change the style of the code so that linting succeeds - Merge pull request #14 from light-scale/ci/test-disable - disable unittest temporarily for CI introduction - Merge pull request #13 from light-scale/feat/enable-tx-pool-sync-by-force - feat: enable tx pool sync by force - Merge pull request #11 from light-scale/feat/remove-daisy-chain - feat: remove daisy chain - Merge pull request #10 from light-scale/feat/set-pending-block-gas-limit - Merge pull request #12 from light-scale/zktrie - chore: upgrade zktrie library - feat: enable setting pending block gas limit - chore: rename optimism to kanvas - ci: remove circle ci config - Merge pull request #8 from light-scale/feat/add-fee-recipients-to-proof - feat(core, eth): add Optimism{Base,L1}FeeRecipient to block trace - feat: add Mint to TransactionTrace - Merge pull request #5 from light-scale/feat/add-L1CostFunc-to-EVM-BlockContext - fix(cmd): list ipcAPIs on alphabetical order - fix(eth): add L1CostFunc to evm's block context - refac(light): remove unneeded member variable - perf(trie): disable preimage by default - chore: rename voost to kanvas - Merge pull request #3 from light-scale/feat/enable-use-keccak-for-codehash - feat: use poseidon as code hash only with zktrie - fix(cmd, core): load database with Zktrie when possible - fix: fix segfault when referencing to Database - fix(common, signer): make unit test passed We wrapped code with comments like below to separate code change for scroll-geth from op-geth. ```go // [Scroll: START] // changes for scroll-geth // [Scroll: END] ``` scroll-geth changes: - Merge pull request #1 from light-scale/feat/add-scroll-patches - chore: add run_geth.sh - feat: add GetBlockResultByNumberOrHash rpc - feat: add CacheConfig to Backend interface - feat(core): add some methods to StateDB interface - feat: add MPTWitness to CacheConfig - feat: use zktrie for state trie - feat: apply poseidon to codehash - feat(core): add ReturnValue to Receipt - feat: add detailed contents to traces for zkevm - feat(core/vm, eth/tracers): add CaptureStateAfter hook - feat(core/vm): disable SelfDestruct opcode - test(cmd, internal): add custom genesis test
chokobole
added a commit
that referenced
this pull request
Mar 8, 2023
This commit squashes the kanvas-geth fork history into a more maintainable diff for rebasing upon upstream geth. See https://github.com/wemixkanvas/go-ethereum/commits/op-geth-base for more details about how op-geth changes geth code. kanvas-geth changes: - Merge pull request #17 from light-scale/fix/change-contract-address - fix: change predeployed contract address - Merge pull request #15 from light-scale/ci/lint - Merge pull request #16 from light-scale/ci/pipeline - ci: add ci pipeline and test pipeline - ci: add worklows to run lint on push - ci: change the style of the code so that linting succeeds - Merge pull request #14 from light-scale/ci/test-disable - disable unittest temporarily for CI introduction - Merge pull request #13 from light-scale/feat/enable-tx-pool-sync-by-force - feat: enable tx pool sync by force - Merge pull request #11 from light-scale/feat/remove-daisy-chain - feat: remove daisy chain - Merge pull request #10 from light-scale/feat/set-pending-block-gas-limit - Merge pull request #12 from light-scale/zktrie - chore: upgrade zktrie library - feat: enable setting pending block gas limit - chore: rename optimism to kanvas - ci: remove circle ci config - Merge pull request #8 from light-scale/feat/add-fee-recipients-to-proof - feat(core, eth): add Optimism{Base,L1}FeeRecipient to block trace - feat: add Mint to TransactionTrace - Merge pull request #5 from light-scale/feat/add-L1CostFunc-to-EVM-BlockContext - fix(cmd): list ipcAPIs on alphabetical order - fix(eth): add L1CostFunc to evm's block context - refac(light): remove unneeded member variable - perf(trie): disable preimage by default - chore: rename voost to kanvas - Merge pull request #3 from light-scale/feat/enable-use-keccak-for-codehash - feat: use poseidon as code hash only with zktrie - fix(cmd, core): load database with Zktrie when possible - fix: fix segfault when referencing to Database - fix(common, signer): make unit test passed We wrapped code with comments like below to separate code change for scroll-geth from op-geth. ```go // [Scroll: START] // changes for scroll-geth // [Scroll: END] ``` scroll-geth changes: - Merge pull request #1 from light-scale/feat/add-scroll-patches - chore: add run_geth.sh - feat: add GetBlockResultByNumberOrHash rpc - feat: add CacheConfig to Backend interface - feat(core): add some methods to StateDB interface - feat: add MPTWitness to CacheConfig - feat: use zktrie for state trie - feat: apply poseidon to codehash - feat(core): add ReturnValue to Receipt - feat: add detailed contents to traces for zkevm - feat(core/vm, eth/tracers): add CaptureStateAfter hook - feat(core/vm): disable SelfDestruct opcode - test(cmd, internal): add custom genesis test
chokobole
added a commit
that referenced
this pull request
Mar 9, 2023
This commit squashes the kanvas-geth fork history into a more maintainable diff for rebasing upon upstream geth. See https://github.com/wemixkanvas/go-ethereum/commits/op-geth-base for more details about how op-geth changes geth code. kanvas-geth changes: - Merge pull request #17 from light-scale/fix/change-contract-address - fix: change predeployed contract address - Merge pull request #15 from light-scale/ci/lint - Merge pull request #16 from light-scale/ci/pipeline - ci: add ci pipeline and test pipeline - ci: add worklows to run lint on push - ci: change the style of the code so that linting succeeds - Merge pull request #14 from light-scale/ci/test-disable - disable unittest temporarily for CI introduction - Merge pull request #13 from light-scale/feat/enable-tx-pool-sync-by-force - feat: enable tx pool sync by force - Merge pull request #11 from light-scale/feat/remove-daisy-chain - feat: remove daisy chain - Merge pull request #10 from light-scale/feat/set-pending-block-gas-limit - Merge pull request #12 from light-scale/zktrie - chore: upgrade zktrie library - feat: enable setting pending block gas limit - chore: rename optimism to kanvas - ci: remove circle ci config - Merge pull request #8 from light-scale/feat/add-fee-recipients-to-proof - feat(core, eth): add Optimism{Base,L1}FeeRecipient to block trace - feat: add Mint to TransactionTrace - Merge pull request #5 from light-scale/feat/add-L1CostFunc-to-EVM-BlockContext - fix(cmd): list ipcAPIs on alphabetical order - fix(eth): add L1CostFunc to evm's block context - refac(light): remove unneeded member variable - perf(trie): disable preimage by default - chore: rename voost to kanvas - Merge pull request #3 from light-scale/feat/enable-use-keccak-for-codehash - feat: use poseidon as code hash only with zktrie - fix(cmd, core): load database with Zktrie when possible - fix: fix segfault when referencing to Database - fix(common, signer): make unit test passed We wrapped code with comments like below to separate code change for scroll-geth from op-geth. ```go // [Scroll: START] // changes for scroll-geth // [Scroll: END] ``` scroll-geth changes: - Merge pull request #1 from light-scale/feat/add-scroll-patches - chore: add run_geth.sh - feat: add GetBlockResultByNumberOrHash rpc - feat: add CacheConfig to Backend interface - feat(core): add some methods to StateDB interface - feat: add MPTWitness to CacheConfig - feat: use zktrie for state trie - feat: apply poseidon to codehash - feat(core): add ReturnValue to Receipt - feat: add detailed contents to traces for zkevm - feat(core/vm, eth/tracers): add CaptureStateAfter hook - feat(core/vm): disable SelfDestruct opcode - test(cmd, internal): add custom genesis test
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.
This commit removes 2 flags.
RollupSequencerHttpFlag
: This transfers transaction to geth that is specified with this flag.RollupDisableTxPoolGossipFlag
: This diables tx pool sync if this flag is on.