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.

Sign up for GitHub

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

Jump to bottom

Develop -> Master #4969

Merged
merged 48 commits into from
Feb 24, 2023
Merged

Develop -> Master #4969

Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
b29e003
contracts-bedrock: fix setup chain in tests
tynes Feb 22, 2023
aa9c4d6
lint: fix
tynes Feb 22, 2023
8039995
contracts-bedrock: regenerate snapshot
tynes Feb 22, 2023
f6f8244
build(deps): bump golang.org/x/text from 0.3.7 to 0.3.8 in /op-exporter
dependabot[bot] Feb 23, 2023
2dca930
build(deps): bump golang.org/x/text from 0.3.7 to 0.3.8 in /indexer
dependabot[bot] Feb 23, 2023
0d7b69b
ci: Remove proxyd and indexer from changesets workflow
mslipper Feb 23, 2023
a6a14b7
Merge pull request #4938 from ethereum-optimism/fix/test-setup
mslipper Feb 23, 2023
11fceca
op-chain-ops: Fix misleading comment
maurelian Feb 23, 2023
a8b042b
contracts-bedrock: make the portal pausable
tynes Feb 18, 2023
996d1f1
bindings: regenerate
tynes Feb 18, 2023
249fcc7
contracts-bedrock: gas snapshot, natspec
tynes Feb 18, 2023
4144e69
contracts-bedrock: lint fix
tynes Feb 18, 2023
be8d68a
contracts-bedrock: better initialize
tynes Feb 18, 2023
41accd0
deployment: optimism portal with pausability
tynes Feb 18, 2023
0d0df07
contracts-bedrock: cleanup
tynes Feb 18, 2023
7be28f9
contracts-bedrock: cleanup fixes
tynes Feb 22, 2023
b296f5b
contracts-bedrock: remove deposit pausable
tynes Feb 22, 2023
820c230
contracts-bedrock: fix test names
tynes Feb 23, 2023
1a234df
op-node: regolith rollup config attribute
protolambda Feb 23, 2023
d328189
Merge pull request #4921 from ethereum-optimism/feat/portal-pausable
tynes Feb 23, 2023
19fd276
fix(migration-data): prevent query block from going past end
maurelian Feb 23, 2023
c084cd0
Merge pull request #4948 from ethereum-optimism/feat/remove-proxyd-in…
mslipper Feb 23, 2023
098e803
fix(ctb): Add correct prefix to errors
maurelian Feb 23, 2023
035391a
ci-builder: add changeset
tynes Feb 23, 2023
eab53ea
Merge pull request #4956 from ethereum-optimism/fix/ci-builder-changeset
mslipper Feb 23, 2023
dda861e
Merge pull request #4950 from ethereum-optimism/jm/fix-migrate-eth-co…
mslipper Feb 23, 2023
34e13a5
Merge pull request #4951 from ethereum-optimism/regolith-config
mslipper Feb 23, 2023
a01241f
Merge branch 'develop' into jm/fix-error-strings
mergify[bot] Feb 23, 2023
68e2b49
op-node: regolith fork systemtx change
protolambda Feb 23, 2023
fbe14d5
Merge pull request #4949 from ethereum-optimism/jm/fix-error-strings
mslipper Feb 23, 2023
5101faa
Merge pull request #4953 from ethereum-optimism/jm/fix-step
mslipper Feb 23, 2023
e9734a3
Merge pull request #4942 from ethereum-optimism/dependabot/go_modules…
tynes Feb 23, 2023
a596609
Create pretty-pants-beam.md
tynes Feb 23, 2023
0c1f45e
Merge pull request #4944 from ethereum-optimism/dependabot/go_modules…
tynes Feb 23, 2023
096d9c2
Merge pull request #4961 from ethereum-optimism/regolith-sys-deposits
mslipper Feb 23, 2023
49c57bc
op-e2e: Introduce l2_geth e2e test util
ajsutton Feb 23, 2023
dbf29ae
Merge pull request #4957 from ethereum-optimism/aj/l2geth-e2e
mergify[bot] Feb 24, 2023
edb1224
op-node: fix stale payload-ID in sequencer log
protolambda Feb 24, 2023
814b9a9
ci-devnet: increase sequencer time drift to 5 min of L1 blocks, seq w…
protolambda Feb 24, 2023
e928cc2
Merge pull request #4965 from ethereum-optimism/increase-devnet-params
mslipper Feb 24, 2023
e36ddb0
Merge pull request #4964 from ethereum-optimism/fix-sequencer-log
mslipper Feb 24, 2023
80f2271
Update foundry & forge-std
clabby Feb 24, 2023
471186c
fix(ctb): Remove duplicate onlyOtherBridge check
maurelian Feb 23, 2023
903052e
Merge pull request #4968 from ethereum-optimism/clabby/update-foundry
mergify[bot] Feb 24, 2023
04c12a8
Merge branch 'develop' into jm/remove-duplicate-check
mergify[bot] Feb 24, 2023
7b7a26c
Merge pull request #4952 from ethereum-optimism/jm/remove-duplicate-c…
mergify[bot] Feb 24, 2023
f9a0e80
fix(ctb): Use multiplication of divisors for more precision
maurelian Feb 23, 2023
aa67575
Merge pull request #4955 from ethereum-optimism/jm/fix-dbl-div
mergify[bot] Feb 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ci-devnet: increase sequencer time drift to 5 min of L1 blocks, seq w… 
…indow to 10 min, channel timeout to 6 min of L1 blocks
  • Loading branch information
@protolambda
protolambda committed Feb 24, 2023
commit 814b9a90b73f66517eef3c0a401dde598defdfe4
6 changes: 3 additions & 3 deletions packages/contracts-bedrock/deploy-config/devnetL1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"l1ChainID": 900,
"l2ChainID": 901,
"l2BlockTime": 2,
"maxSequencerDrift": 10,
"sequencerWindowSize": 15,
"channelTimeout": 40,
"maxSequencerDrift": 300,
"sequencerWindowSize": 200,
"channelTimeout": 120,
"p2pSequencerAddress": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
"batchInboxAddress": "0xff00000000000000000000000000000000000000",
"batchSenderAddress": "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
Expand Down