Jyellic/merge upstream 20230911 #7180
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
Squashed commit of the following:
commit c4bcfa9a63225ea319498e79392c567ae8640c0b
Author: Michael Montour <mmontour@enya.ai>
Date: Tue Dec 6 22:18:10 2022 -0800
Merge cleanup.
Changes to be committed:
modified: op-geth
modified: op-node/node/api.go
commit daf0df6cd5c5085a28208da731972ddca644ae7e
Author: Michael Montour <mmontour@enya.ai>
Date: Tue Dec 6 21:43:49 2022 -0800
Build fixes
Changes to be committed:
modified: go.work.sum
modified: op-batcher/Dockerfile
modified: op-batcher/go.mod
modified: op-bindings/Makefile
modified: op-bindings/go.mod
modified: op-node/go.mod
modified: op-proposer/Dockerfile
modified: op-proposer/go.mod
modified: op-service/go.mod
commit b86c77bc6af62c52554c7d9ba41242ac511eb2c1
Author: Michael Montour <mmontour@enya.ai>
Date: Tue Dec 6 21:39:28 2022 -0800
Updated op-geth to match upstream/optimism.
Changes to be committed:
modified: op-geth
commit 0ef35d700410586fe4254ee3c398e2d6ce504bc7
Author: Michael Montour <mmontour@enya.ai>
Date: Tue Dec 6 21:31:55 2022 -0800
Update some Erigon command line parameters.
Changes to be committed:
modified: ops-bedrock/l2-erigon.sh
commit ae7077a393c25fa2dbee603564f9c6c363743bbc
Author: Michael Montour <mmontour@enya.ai>
Date: Tue Dec 6 21:30:57 2022 -0800
Fix the Boba-L2 contract deployment.
Changes to be committed:
modified: op-chain-ops/genesis/config.go
modified: op-chain-ops/genesis/setters.go
modified: op-chain-ops/go.mod
modified: op-chain-ops/immutables/immutables.go
commit bc29105d9bc4229e74647a28be3c47fe70148a11
Author: Michael Montour <mmontour@enya.ai>
Date: Tue Dec 6 21:30:31 2022 -0800
Rebuilt bundings
Changes to be committed:
modified: op-bindings/bindings/bobaturingcredit_more.go
modified: op-bindings/bindings/deployerwhitelist_more.go
modified: op-bindings/bindings/governancetoken_more.go
modified: op-bindings/bindings/l1crossdomainmessenger_more.go
modified: op-bindings/bindings/l2crossdomainmessenger_more.go
modified: op-bindings/bindings/l2standardbridge_more.go
modified: op-bindings/bindings/l2tol1messagepasser_more.go
modified: op-bindings/bindings/legacyerc20eth_more.go
modified: op-bindings/bindings/legacymessagepasser_more.go
modified: op-bindings/bindings/optimismmintableerc20_more.go
modified: op-bindings/bindings/optimismmintableerc721factory_more.go
modified: op-bindings/bindings/optimismportal_more.go
modified: op-bindings/bindings/proxyadmin_more.go
modified: op-bindings/bindings/weth9_more.go
commit 6e248b5893da30bb8c7e714661c994ed2835b191
Merge: f945813aa cba069eff
Author: Michael Montour <mmontour@enya.ai>
Date: Fri Dec 2 17:35:01 2022 -0800
Merge remote-tracking branch 'upstream/develop' into MergeTest
Conflicts:
go.work
op-batcher/go.mod
op-bindings/Makefile
op-bindings/bindings/deployerwhitelist_more.go
op-bindings/bindings/gaspriceoracle_more.go
op-bindings/bindings/governancetoken_more.go
op-bindings/bindings/l1crossdomainmessenger_more.go
op-bindings/bindings/l2crossdomainmessenger_more.go
op-bindings/bindings/l2standardbridge_more.go
op-bindings/bindings/l2tol1messagepasser_more.go
op-bindings/bindings/legacyerc20eth_more.go
op-bindings/bindings/legacymessagepasser_more.go
op-bindings/bindings/optimismportal_more.go
op-bindings/bindings/registry.go
op-bindings/bindings/weth9_more.go
op-bindings/go.mod
op-bindings/predeploys/addresses.go
op-chain-ops/genesis/config.go
op-chain-ops/genesis/layer_one.go
op-chain-ops/genesis/setters.go
op-chain-ops/go.mod
op-chain-ops/immutables/immutables.go
op-node/Dockerfile
op-node/eth/account_proof.go
op-node/go.mod
op-node/node/api.go
op-proposer/drivers/l2output/driver.go
op-proposer/go.mod
op-service/go.mod
commit cba069eff6d8951ec3d58f72c089a0bb0b8e1f2d
Merge: d247e706f 084786eda
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri Dec 2 21:51:25 2022 +0000
Merge pull request #4187 from ethereum-optimism/config/delete-sequencer-gen-hash
ops-bedrock: delete dead config
commit d247e706f5724eca57a9eed4377ec033bf8b1c06
Merge: ba2051fab 41c958bf4
Author: Matthew Slipper <me@matthewslipper.com>
Date: Fri Dec 2 16:14:37 2022 -0500
Merge pull request #4125 from ethereum-optimism/jm/ctb-test-cleanup/fuzzAndDiff
Test cleanup: rename fuzz and differential tests
commit ba2051fabc6acc9f064f6f022a0dc392ce4ac7d3
Merge: 905efc0cc fa6bfbbe7
Author: Matthew Slipper <me@matthewslipper.com>
Date: Fri Dec 2 16:14:28 2022 -0500
Merge pull request #4124 from ethereum-optimism/jm/ctb-test-cleanup/script
ctb: Add simple script for enforcing test conventions
commit 905efc0cc0e10404a82293394cb13460342cb6d1
Merge: 7300a7ca7 3f653df99
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri Dec 2 21:03:31 2022 +0000
Merge pull request #4138 from ethereum-optimism/12-01-ctb_Create_Goerli_deploy_config
ctb: Create Goerli deploy config
commit 084786eda00875ab717406ef503a668d962c9b2e
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Fri Dec 2 13:01:07 2022 -0800
ops-bedrock: delete dead config
`SEQUENCER_GENESIS_HASH` was not used, delete
it to simplify the deploy config. We should
not allow dead config to live.
commit 41c958bf40fa6b9eef1e99e29b741c9842448dbe
Author: Matthew Slipper <me@matthewslipper.com>
Date: Fri Dec 2 13:54:50 2022 -0700
snapshot
commit 775fe0e73d33ed92f14c65dbe87f9d679756881c
Author: Maurelian <maurelian@protonmail.ch>
Date: Wed Nov 30 13:40:05 2022 -0500
ctb: Fix names of fuzz and diff test functions
commit fa6bfbbe749d0795368171ca97cd31a976845248
Author: Maurelian <maurelian@protonmail.ch>
Date: Thu Dec 1 15:55:55 2022 -0500
ctb: Read abi rather than operating on text
commit cdb67852d294915370d1c111ec906f6cebf534a4
Author: Maurelian <maurelian@protonmail.ch>
Date: Thu Dec 1 13:59:05 2022 -0500
ctb: Put test-name checks into an object
commit 3e5fea45564fa613d46d2f3d9ac30f628c28e041
Author: Maurelian <maurelian@protonmail.ch>
Date: Mon Oct 31 21:40:22 2022 -0400
ctb: Add simple script for enforcing test conventions
commit 7300a7ca7acf90d0f425735017fb058d5ef5f2dd
Author: Maurelian <maurelian@protonmail.ch>
Date: Fri Dec 2 15:42:58 2022 -0500
docs(ctb): Document the testing conventions (#4122)
commit 7768eddb26376f11530c34d19f2029625ddc18ca
Merge: ca293fb49 f31f4c04e
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Fri Dec 2 12:39:51 2022 -0800
Merge pull request #4182 from ethereum-optimism/fix/deploy-config-to-rollup-config
op-chain-ops: deploy config to rollup config
commit f31f4c04e5a95e4c2067e8ea3959e8abfa6b0413
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Fri Dec 2 12:24:56 2022 -0800
op-migrate: fix docker setup
commit b0a70bb008041798a2ef34b0cb3172b4d75bb7f2
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Fri Dec 2 12:21:30 2022 -0800
op-chain-ops: go mod tidy
commit 2650227ef590d5fd0561269c287346ba289d02cc
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Fri Dec 2 12:20:06 2022 -0800
fix: configurable L2 genesis block number
commit 4c09d29395cbeaf47ed2344a578bbd16407250f9
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Fri Dec 2 12:15:53 2022 -0800
op-migrate: automatically create op-node config
commit ca293fb49e6147b9da8eb4ca409942dc47cd74a8
Merge: 7b4a0a87b 1a0bd8711
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri Dec 2 20:13:38 2022 +0000
Merge pull request #4113 from ethereum-optimism/sc/ctb-single-dictator
maint(ctb): combine Dictator contracts
commit 0be4c1c33ac5d85edf2269d34fb90ba1d2c417dd
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Fri Dec 2 12:01:58 2022 -0800
op-chain-ops: deploy config to rollup config
Refactor to create a method on the deploy config
to create a rollup config. This will be useful
for creating a script to build a rollup config.
commit 1a0bd8711d2587549c986eb1a2b261893cbed551
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Wed Nov 30 13:12:06 2022 -0500
maint(ctb): combine Dictator contracts
Combines the two remaining dictator contracts into a single
SystemDictator now that we no longer have the FreshSystemDictator.
commit 7b4a0a87b32c1a8032ea7178492b01cd107e6977
Merge: 2d0601caa 7bc014546
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri Dec 2 19:45:39 2022 +0000
Merge pull request #4141 from ethereum-optimism/sc/ctb-migration-fixes
fix(ctb): various migration fixes
commit 2d0601caa446f32a48af9295273ae69e2cb8edba
Merge: 3659a0975 2617c9ae4
Author: Joshua Gutow <jgutow@oplabs.co>
Date: Fri Dec 2 11:25:22 2022 -0800
Merge pull request #4056 from ethereum-optimism/clabby/specs/two-step-withdrawals
specs: Update `withdrawals` spec
commit 7bc014546a2c5323effc8bab06127b4962c6232b
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Thu Dec 1 14:49:52 2022 -0500
fix(ctb): various migration fixes
Various fixes to the migration script as discovered during migration
practice.
commit 3659a097542b017e79f41405e5e5c68b3a51cf69
Merge: df47e202a b6af42798
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri Dec 2 18:45:06 2022 +0000
Merge pull request #4135 from ethereum-optimism/sc/ctb-mp-versioned-nonce
feat(ctb): add message versioning to MessagePasser
commit df47e202a95c17e3e5d6b2fef244d3401dc9bfb7
Merge: cb976cba6 e7c08a50a
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri Dec 2 18:02:14 2022 +0000
Merge pull request #4177 from ethereum-optimism/jg/add_me_to_circleci_codeowners
Update CODEOWNERS
commit e7c08a50a2837a671347385c946f6ae3dc932336
Author: Joshua Gutow <jgutow@oplabs.co>
Date: Fri Dec 2 09:33:52 2022 -0800
Update CODEOWNERS
commit cb976cba60113fec32c4960f686fd0f9deccf5a6
Author: Matthew Slipper <me@matthewslipper.com>
Date: Fri Dec 2 12:33:00 2022 -0500
ci: Always run devnet, fix devnet CI (#4175)
* ci: Always run devnet
* fix sdk
commit ab5c1b8978864bb69b4c5e1bda3ae268e172baff
Author: smartcontracts <kelvin@optimism.io>
Date: Fri Dec 2 12:30:30 2022 -0500
feat(fd): event cache for Geth L1s (#3950)
Introduces a new event cache to the fault detector. Requires for running
the fault detector against Geth as the L1 node and with certain L1 node
providers.
commit 8b628a78edc087fea500eca966b32212c122d2da
Merge: 2565fd6e8 49b6905c6
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri Dec 2 16:48:06 2022 +0000
Merge pull request #4174 from ethereum-optimism/jg/increase_contracts_bedrock_timeout
CI: Increase contracts-bedrock timeout
commit 49b6905c6fdd8d2c31d75247d2c4c12be99cb428
Author: Joshua Gutow <jgutow@oplabs.co>
Date: Fri Dec 2 08:30:49 2022 -0800
CI: Increase contracts-bedrock timeout
The test was occasionally failing because of a slow test.
commit 2565fd6e8e4f99f44f0d1dfc8fac25de5285a515
Merge: 18928f9d3 d4ae0f794
Author: Joshua Gutow <jgutow@optimism.io>
Date: Fri Dec 2 08:31:23 2022 -0800
Merge pull request #4171 from ethereum-optimism/12-02-ctb_Fix_devnet
ctb: Fix devnet
commit d4ae0f794d3594b311c151d5284421906384e185
Author: Matthew Slipper <me@matthewslipper.com>
Date: Fri Dec 2 08:50:51 2022 -0700
ctb: Fix devnet
commit 18928f9d3191e3f6f006b8464a02c3cb820ca589
Author: Matthew Slipper <me@matthewslipper.com>
Date: Fri Dec 2 01:47:10 2022 -0500
op-node: Update heartbeat DNS (#4167)
commit ea804234f2b8a5b79fb19cc1fbeaee0c3a884690
Author: Matthew Slipper <me@matthewslipper.com>
Date: Thu Dec 1 20:46:14 2022 -0500
ci: Fix check-changed devnet (#4164)
commit 0812b26271e2e3371df5f637d3e89cdbe58a8915
Merge: 0e8652c29 2ce227adb
Author: Joshua Gutow <jgutow@optimism.io>
Date: Thu Dec 1 17:30:36 2022 -0800
Merge pull request #4163 from ethereum-optimism/jg/increase_seq_window
Increase sequencer window & sequncer drift
commit 0e8652c29b665b8868934592bd40a7ac6cc6d2ab
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Thu Dec 1 17:30:29 2022 -0800
l2geth: cleanly shut down the syncservice (#4129)
The ss was not previously being shut down cleanly, which
can result in a corrupted db state. This makes the shutdown
more clean.
commit 5acb97e07f1ebb0a6b5708b13f01fb41df7057b6
Merge: 014b91d22 cae1605e0
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri Dec 2 01:20:43 2022 +0000
Merge pull request #4160 from ethereum-optimism/feat/configurable-db-migrate
op-chain-ops: allow config of LevelDB in `op-migrate`
commit 2ce227adb519cf36f44a0bd0501c97172f3b2834
Author: Joshua Gutow <jgutow@oplabs.co>
Date: Thu Dec 1 17:15:31 2022 -0800
Add l2GenesisBlockBaseFeePerGas to deploy configs
commit e99ef3087573b2589c2b2d1b45c0449f4268a6a0
Author: Joshua Gutow <jgutow@oplabs.co>
Date: Thu Dec 1 16:39:55 2022 -0800
Increase sequencer window & sequncer drift
This should hopefully help some of the reorgs we've seen on the devnets.
commit cae1605e08f325394eea939e8be429facb1915cf
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Thu Dec 1 16:13:27 2022 -0800
op-chain-ops: allow config of LevelDB in `op-migrate`
Two new flags are added
- `db-cache`
- `db-handles`
These are passed through the the LevelDB constructor
commit 014b91d229497a04ad12a9291ce1c72afdcf6637
Merge: 1a24329e5 33be0e654
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu Dec 1 23:50:39 2022 +0000
Merge pull request #4139 from ethereum-optimism/fixes/op-migrate
op-migrate: various sanity checks + cleanup
commit 33be0e65465c7b88e5e6527543250f0e82da7928
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Thu Dec 1 09:54:33 2022 -0800
op-migrate: various sanity checks + cleanup
Adds cleanup to the migration script, ensures that
config is sane.
We cannot allow for non monotonic block time. We also
try to make eip 1159 stable at start and use a hardcoded
initial base fee.
Add additional logging
commit 1a24329e53e2618330958aa3d444ba0b9996a514
Merge: 1743dba45 34584e10a
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Thu Dec 1 15:33:18 2022 -0800
Merge pull request #4145 from ethereum-optimism/fix/deploy-config-validation
op-chain-ops: check for transition block config
commit 34584e10a647398379470366aca03621581d36a1
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Thu Dec 1 14:59:19 2022 -0800
op-chain-ops: check for transition block config
Adds checks for transition block config. We do not
want these values to be 0 because it will mess with
eip 1559 in the beginning.
commit 1743dba4578d756656df8d927a6720cdb06534b8
Merge: 1c83162b7 c69870c7f
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Thu Dec 1 15:21:00 2022 -0800
Merge pull request #4132 from ethereum-optimism/fix/no-check-migrate-eth
op-chain-ops: add no check to eth migration
commit 1c83162b7bc4b4c916d424e1effd3c6d520a2e1d
Merge: c975c9620 fcb58c1ad
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Thu Dec 1 15:20:32 2022 -0800
Merge pull request #4144 from ethereum-optimism/fix/ensure-monotonic
op-chain-ops: migrate db monotonic timestamp
commit c975c96204350af777e99fa10773ca3e7a58ba36
Author: smartcontracts <kelvin@optimism.io>
Date: Thu Dec 1 18:03:51 2022 -0500
feat(sdk): support legacy withdraws after Bedrock (#4119)
Adds support for finalizing legacy withdrawals after the Bedrock
migration. Cleans up some SDK code at the same time.
commit fcb58c1ad924259e33a667c9b9761528942b8998
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Thu Dec 1 14:53:31 2022 -0800
op-chain-ops: migrate db monotonic timestamp
Ensure that the timestamps are monotonic when
creating the bedrock transition block
commit 6a1abd2641ece35e369ce1623af4607ec7586964
Merge: fad6a6a4d e7e830e87
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu Dec 1 22:52:42 2022 +0000
Merge pull request #4143 from ethereum-optimism/fix/deploy-config-checks
op-chain-ops: add 1559 config checks
commit 3f653df99bea489a0d9462487c3db7e35d002ee4
Author: Matthew Slipper <me@matthewslipper.com>
Date: Thu Dec 1 10:31:44 2022 -0700
ctb: Create Goerli deploy config
commit e7e830e87f3dcf7e1a5e136cbb8a626c7cdb7ca1
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Thu Dec 1 11:36:27 2022 -0800
op-chain-ops: add 1559 config checks
For both the denominator and elasticity. They cannot be 0.
commit fad6a6a4d8352a30f5a0f53388dbdae73dd970c1
Merge: 7cf0fb768 5ec570fa6
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu Dec 1 05:13:51 2022 +0000
Merge pull request #4134 from ethereum-optimism/fix/safety-basefee
op-chain-ops: base fee check
commit 7cf0fb768a2b03831554dc95c40214610b3a2b4c
Merge: f6cdc1d92 db022ddf5
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu Dec 1 04:59:36 2022 +0000
Merge pull request #4133 from ethereum-optimism/fix/safe-params
op-chain-ops: safety with params
commit b6af427985fa8ba889e963e96d7d33e8dbc1fbf7
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Wed Nov 30 20:31:44 2022 -0500
feat(ctb): add message versioning to MessagePasser
Adds message versioning to the L2ToL1MessagePasser, using the same
scheme as in the CrossDomainMessenger. Also renames the "nonce" variable
to "messageNonce" in line with the naming within the
CrossDomainMessenger contracts.
commit 5ec570fa66fdbfce37c2c199ea3dc1ec1bc7bb00
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 19:01:01 2022 -0800
op-chain-ops: base fee check
Check that the L2 genesis block base fee per gas
is not set to `nil`. If it is, it will cause a segfault
in `op-geth` on startup after the migration.
It is configured with the key: `"l2GenesisBlockBaseFeePerGas"`
commit db022ddf59e3779a6aa51b84929868062de62155
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 18:48:28 2022 -0800
op-chain-ops: safety with params
Check for `nil` when getting the chain params.
Also log info about the chain params
commit f6cdc1d922074ed6ce3864ee48c1a224000037dd
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 18:45:15 2022 -0800
op-chain-ops: add goerli chain params (#4131)
Without it, there will be a `nil` dereference.
Each network should be added explicitly
commit c69870c7fec537148436596164b188c78bdca2cb
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 18:40:56 2022 -0800
op-chain-ops: add no check to eth migration
commit 8eaf6f4c6c056addc1ad0fe8cecbb55577552ba6
Merge: 8381a6f46 182d36c42
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 18:22:00 2022 -0800
Merge pull request #4130 from ethereum-optimism/fix/migration-dd-path
op-migrate: use correct ancient path
commit 182d36c42c3a79841e8cf9cf7aeb10d04ff5fa5f
Author: Matthew Slipper <me@matthewslipper.com>
Date: Wed Nov 30 19:16:38 2022 -0700
use correct ancient path
commit 8381a6f4678b25743f13382675d012414d769d9f
Merge: 64bff0e7f 0c189f09e
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 18:17:55 2022 -0800
Merge pull request #4128 from ethereum-optimism/fix/err-handling
op-chain-ops: better error handling in op-migrate
commit 64bff0e7fd778c36484af4265fb15033f01fee36
Merge: 3369efef6 3ae4e9c54
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu Dec 1 02:03:44 2022 +0000
Merge pull request #4123 from ethereum-optimism/11-30-Remove_changesets_dir_from_codeowners
Remove changesets dir from codeowners
commit 0c189f09e949d03bb8ca14adbf3ef0da8bce1aa9
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 17:51:49 2022 -0800
op-chain-ops: better error handling in op-migrate
Prevent `nil` dereference by explicitly checking for `nil`.
Add in logs to give better understanding of what the script is
doing.
commit 3369efef66e0261ac099185bcf728709124066e3
Merge: 9e7a7d9d9 eb7e9d184
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 17:39:36 2022 -0800
Merge pull request #4126 from ethereum-optimism/11-30-op-chain-ops_Migration_should_not_use_readonly
op-chain-ops: Migration should not use readonly
commit eb7e9d1842ae77d8580d059055ea4383d426ef21
Author: Matthew Slipper <me@matthewslipper.com>
Date: Wed Nov 30 18:38:11 2022 -0700
op-chain-ops: Migration should not use readonly
commit 3ae4e9c5450a6e3d98d82563e0be0068cbeb0466
Author: Matthew Slipper <me@matthewslipper.com>
Date: Wed Nov 30 18:31:12 2022 -0700
Remove changesets dir from codeowners
commit 9e7a7d9d9fc4414b95e7812f01eb04144816e8c1
Merge: af9a5eed4 7b95f5bf1
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu Dec 1 01:07:21 2022 +0000
Merge pull request #4112 from ethereum-optimism/sc/ctb-clean-deploy-config-3
maint(ctb): clean up deploy config
commit af9a5eed46cb45402c5894250c8688faaac691e9
Merge: 3694de47d 6c8254786
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed Nov 30 22:15:16 2022 +0000
Merge pull request #4118 from ethereum-optimism/fix/migrate-cleanup-2
op-chain-ops: more cleanup in migrate script
commit 6c8254786f96f4553aedceada6f330298c7faa54
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 13:55:37 2022 -0800
op-chain-ops: more cleanup in migrate script
The `op-migrate` script had some leftover stuff
in it from early iterations on its development.
The leftover stuff was cleaned up to improve the
overall UX of the script. Now code should not need
to be commented out + rebuild the binary, it will
automatically detect when the script has already
ran on a datadir.
Also pass through the no check arg so that we can
re-enable the checking and dynamically change if
we want to run the data validation as part of the
migration.
commit 3694de47d0d1f711ce8ceaba2a5063f076bd2fae
Merge: c6932d705 edfa48615
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed Nov 30 21:50:53 2022 +0000
Merge pull request #4117 from ethereum-optimism/fix/mp-nonce
op-chain-ops: set initial message passer nonce
commit edfa486151e8ef95676a28c94592259a859c4885
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 13:37:01 2022 -0800
op-chain-ops: set initial message passer nonce
The `L2ToL1MessagePasser` nonce is set to `type(uint32).max`
initially to prevent nonce collisions with legacy withdrawals
that have been upgraded. The max value for the nonce is
`type(uint256).max` so it is not a problem to start at a non
zero nonce.
commit c6932d7053b17edfcb5c4bf286b72e29cb90cc80
Merge: f7f64dd1f 72958876b
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed Nov 30 20:38:57 2022 +0000
Merge pull request #4115 from ethereum-optimism/fix/revert-receipts
op-chain-ops: no longer embed receipts
commit 72958876b3dda88a437fc63a35d8f36670da6f58
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 12:32:50 2022 -0800
op-chain-ops: remove dead code
commit 90da8b488d28500dbc3583c20887c465f5507a2a
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 12:28:08 2022 -0800
op-chain-ops: no longer embed receipts
The functionality was added to create a bunch of receipts
as part of the bedrock transition so make the sdk and
withdrawal workflows "just work". We are going to instead
implement logic into the sdk instead of having the extra
receipts. The extra receipts would throw off data people.
It would look like withdrawals happened twice.
commit f7f64dd1f9c13a65d943751f2de99b260e44f89f
Merge: 87aa40daa ec02f95b1
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed Nov 30 19:56:04 2022 +0000
Merge pull request #4114 from ethereum-optimism/feat/migrate-docker-image
feat: op-migrate docker image
commit ec02f95b194865d1bad2a4ddab01d92e2551c462
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 11:49:58 2022 -0800
ci: fix step requirements
Was missing a `requires` statement
commit be38f9684069da13f4cf6346149bc08481154cda
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 11:42:34 2022 -0800
nit: fix tabs vs spaces
commit c0222d33bfa2fe6601c61f82dd32e1dc14d6a973
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 11:39:51 2022 -0800
op-migrate: rename and add docker public to ci
commit 2480cf859792d0c8af8458c8e424e3de4d5bf5b6
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 11:32:49 2022 -0800
op-chain-ops: migrate binary
Adds a `migrate` binary as well as a dockerfile for
building it. This `Dockerfile` should be accessed from
the root of the repository, similar to the other docker
files for the other bedrock packages.
commit 2617c9ae4ad344b09944cbd9f5d6e5bc0e75c7ad
Author: clabby <ben@clab.by>
Date: Wed Nov 30 13:12:36 2022 -0500
Add link to `Types.WithdrawalTransaction` & `Types.OutputRootProof`
commit 0d4c166429526a82b8e3b507b9a3b9f4b0e8a187
Merge: 1ed0167b9 87aa40daa
Author: clabby <ben@clab.by>
Date: Wed Nov 30 13:09:06 2022 -0500
Merge branch 'develop' into clabby/specs/two-step-withdrawals
commit 7b95f5bf1cf2485bf5f91550351ba5bbc08be589
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Tue Nov 29 13:02:32 2022 -0500
maint(ctb): clean up deploy config
Cleans up the deployment configuration structs for contracts-bedrock.
commit 87aa40daaef127847ee2449faa851b33ec3adfb5
Author: Matthew Slipper <me@matthewslipper.com>
Date: Wed Nov 30 12:51:59 2022 -0500
op-node: Update Beta-1 config (#4110)
commit 79e1155d82d94d651a32166126f2a0bb7246b13f
Merge: c5dc64149 6891e3220
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 07:55:18 2022 -0800
Merge pull request #4109 from neutiyoo/patch-2
docs: fix l2-output link
commit c5dc64149c52111f217c8f24ea10680220d41c8c
Merge: baa0e3053 811f53f4e
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 30 07:54:54 2022 -0800
Merge pull request #4107 from neutiyoo/patch-1
docs: fix typo `qn` -> `an`
commit 6891e3220ad65f4376ecf4faa727d92615c38b5f
Author: Neuti Yoo <103201346+neutiyoo@users.noreply.github.com>
Date: Wed Nov 30 15:44:45 2022 +0900
docs: fix l2-output link
commit 811f53f4ee57b7328d66ff2b9e39f32db9bca8d0
Author: Neuti Yoo <103201346+neutiyoo@users.noreply.github.com>
Date: Wed Nov 30 15:30:15 2022 +0900
docs: fix typo `qn` -> `an`
commit baa0e3053361f878b79e44335e3ea94a059e205e
Merge: c1e7f122f 9e02ddbd2
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed Nov 30 02:17:52 2022 +0000
Merge pull request #4105 from ethereum-optimism/fix/chain-ops-cleanup
op-chain-ops: various cleanup
commit 9e02ddbd2e3cb333fd208b565977294d4dc853d4
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Tue Nov 29 17:51:54 2022 -0800
op-chain-ops: various cleanup
Fixes a bug were an error should have been returned and it was not.
Wraps some errors so that its easier to tell what the problem is
in the case of there being an error. A bit of refactoring that
allows the strict withdrawal migration checks to be skipped optionally.
This should not be used in production, but can be used in early test
iterations.
commit c1e7f122fa92918b44d8795d521b2e99fc5429b5
Merge: 1366092e6 7d2fa7344
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue Nov 29 22:40:50 2022 +0000
Merge pull request #4078 from ethereum-optimism/feat/receipts
op-chain-ops: add bedrock transition receipts
commit 7d2fa73447488697ddca57c65695c86cca1b4b98
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Mon Nov 28 20:16:21 2022 -0800
op-chain-ops: refactor
Cleanup code, refactor some interfaces, make logIndex canonical
commit 37d5187687e656e0e8c0195d3b67a783263401ca
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Mon Nov 28 08:44:46 2022 -0800
op-chain-ops: add comments
commit 8acece4910342fa4ec80cbf5b9ff2c3a58e81ff2
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 23 16:01:26 2022 -0800
op-chain-ops: add bedrock transition receipts
To make withdrawals really easy, we need to add in
receipts corresponding to the migrated withdrawals.
This will allow the exact same flow to be used when
creating the withdrawing transactions as normal
withdrawals.
commit 1366092e675c14d6e46226339c39cd1f75829d2a
Merge: 1d9e8c1de 287d0a7f6
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue Nov 29 21:55:53 2022 +0000
Merge pull request #4064 from ethereum-optimism/sc/ctb-clamp-func
fix(ctb): break out clamp func in Metering
commit 287d0a7f6b54ac459cf9d4dda1ef6690b39e4531
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Wed Nov 23 12:07:49 2022 -0500
fix(ctb): break out clamp func in Metering
Breaks out the base fee clamping function in ResourceMetering to
deduplicate some code.
commit 1d9e8c1dec80bd06ad795b2dbeea7e035a45aa55
Merge: 054c47eb4 136ea1785
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Tue Nov 29 13:04:54 2022 -0800
Merge pull request #4093 from ethereum-optimism/sc/ctb-make-interval-changeable
feat(ctb): make SUBMISSION_INTERVAL modifiable
commit 136ea178555cf23c579003f1ce1bcbf4f35ef62a
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Mon Nov 28 14:35:39 2022 -0500
feat(ctb): make SUBMISSION_INTERVAL modifiable
Updates the L2OutputOracle so that SUBMISSION_INTERVAL can be modified.
This is a relatively significant refactor that makes the l2Outputs
mapping keyed by index rather than L2 block number.
commit 054c47eb4fa3296088fd5d63aad048d00b04b2fa
Merge: 5ecb8169e 4ea2555c2
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue Nov 29 19:55:59 2022 +0000
Merge pull request #4103 from ethereum-optimism/11-29-op-node_Hardcode_beta-1_config
op-node: Hardcode beta-1 config
commit 4ea2555c2185aa3b1011ac01838e13f30d833c2c
Author: Matthew Slipper <me@matthewslipper.com>
Date: Tue Nov 29 11:20:25 2022 -0700
op-node: Hardcode beta-1 config
commit 5ecb8169e12f38c9e6c7bd53f3f7e93fac2af4ca
Author: Matthew Slipper <me@matthewslipper.com>
Date: Tue Nov 29 12:04:06 2022 -0500
ci: Add CODEOWNERS, reduce required reviewers to 1 (#4100)
commit 66f7de23fe1cc5c768b55dfb2b26aac3c310fa71
Merge: c9e38c1a2 51ccc0e83
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue Nov 29 16:43:03 2022 +0000
Merge pull request #3932 from ethereum-optimism/fix/mintable-erc20-immutable
contracts-bedrock: OptimismMintableERC20 immutables
commit c9e38c1a216c5310a91f78dca22eb90200488917
Merge: 66dbe4a86 9687770bc
Author: Maurelian <maurelian@protonmail.ch>
Date: Tue Nov 29 06:35:46 2022 -0500
Merge pull request #4101 from ethereum-optimism/11-28-ci_Remove_unused_workflows
commit 51ccc0e83b52fbaffc132303abef4aecb68b1aa6
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Mon Nov 28 10:52:06 2022 -0800
contracts-bedrock: regenerate storage snapshot
commit f5f9dab71f89093746cfd128abe1a9310f61650f
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Mon Nov 28 10:37:36 2022 -0800
contracts-bedrock: fix lint
commit db8bf1e6972e8ab73b3b6008a8dea30b2dc15e70
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Mon Nov 28 10:29:25 2022 -0800
all: cleanup deployment process
The `LegacyERC20ETH` needed some cleanup because
it extended the `OptimismMintableERC20` which had
its interface changed such that the remote token
and bridge are immutables instead of being held in
storage. Changing these values to immutables will
make interactions for mint/burn much cheaper.
commit 04c7017892aa65b5d4497e78de89020c5565cd6a
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Mon Nov 28 10:14:32 2022 -0800
op-bindings: regenerate
commit 7723df4e89f720022f3ab272cde3cb3189dea4f4
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Mon Nov 28 10:12:13 2022 -0800
contracts-bedrock: add legacy getters
commit 87a37226a11704f51f7c01e5cb60add96a6b79f7
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Tue Nov 8 16:53:24 2022 -0800
contracts-bedrock: OptimismMintableERC20 immutables
Turn the constructor args into immutables. There isn't
a real reason for them to be in storage. The legacy
tokens can have the constructor args held in storage
and it shouldn't make a difference.
commit 9687770bc2a633f7ba05e97469daa3af3f275622
Author: Matthew Slipper <me@matthewslipper.com>
Date: Mon Nov 28 20:17:05 2022 -0700
ci: Remove unused workflows
commit 66dbe4a8695fd9205d18a0062bb0d846e9dfe5e4
Author: smartcontracts <kelvin@optimism.io>
Date: Mon Nov 28 21:53:34 2022 -0500
feat(ctb): make L2OO addrs immutable (#4095)
Makes the L2OO proposer and challenger addresses immutable and gets rid
of the concept of ownership in the L2OO.
commit 91a80d287237032a47d68d8809b1dc67ad15293f
Merge: 0e44785f7 f5c6160ad
Author: Joshua Gutow <jgutow@optimism.io>
Date: Mon Nov 28 15:34:11 2022 -0800
Merge pull request #4035 from ethereum-optimism/jg/l1_state_uninit_v2
op-node: Audit use of L1 State
commit 0e44785f7489bb9564b481e86ba02ce9512f8a60
Merge: 3b1dce10b 7bd83a55d
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Mon Nov 28 15:22:07 2022 -0800
Merge pull request #4096 from ethereum-optimism/fix/log-set-storage
op-chain-ops: log when setting storage
commit 7bd83a55d4b37de3d32d5e780572b98236429866
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Mon Nov 28 14:13:12 2022 -0800
op-chain-ops: log when setting storage
Adds a global logger to the `SetStorage` operation. Not ideal
that a global logger is used, but that is currently how the logging
is handled for the migration. This will help to prevent errors in
misconfiguration of the system. In setups like hive, it is difficult
to get insight into the state of the system as it is being brought
up, so this should log when the system is being brought up. Bad
config should stick out, ie setting an empty value because something
was left out of the config.
commit f5c6160adf3071e2cb705dfe037ee887330cbc34
Merge: 9eaae63d4 956bc0725
Author: Joshua Gutow <jgutow@oplabs.co>
Date: Mon Nov 28 11:45:29 2022 -0800
Merge branch 'develop' into jg/l1_state_uninit_v2
commit 3b1dce10b6c9b8731622e3695c7d108cf6103cef
Merge: 956bc0725 fc3d66eea
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon Nov 28 19:05:43 2022 +0000
Merge pull request #4089 from ethereum-optimism/11-27-Remove_oneshot
ops-bedrock: Remove oneshot
commit fc3d66eea74a4042c20ce5b03aacb81cc435f689
Author: Matthew Slipper <me@matthewslipper.com>
Date: Sun Nov 27 16:08:15 2022 -0700
Remove oneshot
commit 9eaae63d4887355b1b89fa4c8e2730cfc72c0b72
Author: Joshua Gutow <jgutow@oplabs.co>
Date: Mon Nov 28 10:18:33 2022 -0800
op-e2e: Increase timeout in p2p test
commit 956bc0725b09ac09816c54f457c53e5ce95bd214
Merge: ea10aafde bc10b10d3
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Mon Nov 28 10:05:07 2022 -0800
Merge pull request #4061 from 0xYYY/0xyyy/fix-spec-typo
doc: fix spec typos
commit ea10aafde622a98b774b61086ee769a855e3f376
Merge: 43e87118d 36bd8fbff
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon Nov 28 17:53:22 2022 +0000
Merge pull request #4051 from ethereum-optimism/sc/dtl-shutoff-block
feat(dtl): handle deposit shutoff
commit 36bd8fbffc35a87f192b83cc722dbbde45257768
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Tue Nov 22 15:54:04 2022 -0500
feat(dtl): handle deposit shutoff
Updates the DTL to correctly handle the deposit shutoff flag. We put the
flag inside the AddressManager because the DTL already had easy access
to the AddressManager. We parse the address as a uint256 and check if
it's non-zero. By checking this every loop we can smoothly recover if
the shutoff flag is reset.
commit 43e87118da00be8c8b96e83d26544e2b22d268dd
Merge: 7a27de9cf 15aa881bc
Author: Zach Howard <zach@optimism.io>
Date: Mon Nov 28 12:29:45 2022 -0500
Merge pull request #4069 from ethereum-optimism/zhwrd/fix-release-job
Fix: build and publish all bedrock docker images before tagging release
commit 7a27de9cfc262e5b49e58fbcf99a535baf68f887
Merge: ba9fbc1b7 f74c70cbf
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Mon Nov 28 09:20:11 2022 -0800
Merge pull request #4066 from ethereum-optimism/sc/ctb-no-genesis-output
feat(ctb): remove genesis output
commit ba9fbc1b7bd2fdf4a0ac48861c1aee87b28b6353
Merge: 7a50b5a66 0704df0cc
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon Nov 28 13:46:46 2022 +0000
Merge pull request #4085 from d1onys1us/patch-1
chore: update license year
commit 7a50b5a66a9d2877adff92b2c9268675803c0299
Merge: 4de317619 fce262f93
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon Nov 28 13:46:23 2022 +0000
Merge pull request #4086 from ethereum-optimism/jm/no-build-diff
fix(ctb): gas snapshot rm extra build step
commit 4de3176197afd123843b0d77a651bdab7fc7a790
Author: Will Cory <willcory10@gmail.com>
Date: Sun Nov 27 15:16:41 2022 -0800
Remove Nick and Imran from mergify (#4077)
They never asked to be added I'm not sure why I added them in the first place
commit fce262f93ebf0f9c4e1c1e13f788a66b405c19de
Author: Maurelian <maurelian@protonmail.ch>
Date: Fri Nov 25 14:59:49 2022 -0500
fix(ctb): gas snapshot rm extra build step
commit 5705ada56d3a3f8f22e3121287405911671f49b7
Merge: b14ac6b01 43f33f39f
Author: Maurelian <maurelian@protonmail.ch>
Date: Fri Nov 25 11:53:42 2022 -0500
Merge pull request #4083 from ethereum-optimism/jm/ci-echidna-job
commit 0704df0cc86ff9e44a669127d23c807b5a73b783
Author: d1onys1us <dave@taiko.xyz>
Date: Fri Nov 25 00:46:48 2022 -0500
chore: update license year
commit 43f33f39fac10b16b29f2358726fb2346ceeecac
Author: Maurelian <maurelian@protonmail.ch>
Date: Wed Nov 23 13:10:47 2022 -0500
ci: Add job to run echidna
ctb: Echidna script runs all fuzz contracts
ctb: Include metadatahash in compilation for echidna
commit 1ed0167b9e79b72653203508c18212c604f519ec
Author: clabby <ben@clab.by>
Date: Thu Nov 24 13:25:29 2022 -0500
Fix list numbering
commit b14ac6b01b1a008cc2de5a123b0458fa90de8e30
Merge: 738b6aa73 30a6a9ee6
Author: Zach Howard <zach@optimism.io>
Date: Thu Nov 24 10:28:32 2022 -0500
Merge pull request #4081 from ethereum-optimism/changeset-release/master
Version Packages
commit 30a6a9ee60e3098a018721aa2390be3f22d0c787
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date: Thu Nov 24 15:27:49 2022 +0000
Version Packages
commit 3f9756e658ff76dcd0263846627fd19a3674c9b7
Merge: 5b74973b7 738b6aa73
Author: Zach Howard <zach@optimism.io>
Date: Thu Nov 24 10:25:46 2022 -0500
Merge pull request #4080 from ethereum-optimism/develop
Release ci-builder
commit 738b6aa7380c96bf87d66184fc17cfa04dcd240f
Merge: e73a66d0c 011acf411
Author: Zach Howard <zach@optimism.io>
Date: Thu Nov 24 10:24:24 2022 -0500
Merge pull request #4079 from ethereum-optimism/jm/builder-changeset
Add missing changeset
commit 011acf41136c9c09012fb49c505eee80212439e3
Author: Maurelian <maurelian@protonmail.ch>
Date: Wed Nov 23 19:07:32 2022 -0500
ci: Add echidna to ci-builder
commit 5b74973b74d30628edb39fefe0c559ca4fdcef16
Merge: be86d6fd9 e73a66d0c
Author: Zach Howard <zach@optimism.io>
Date: Wed Nov 23 17:00:08 2022 -0500
Merge pull request #4076 from ethereum-optimism/develop
Merging develop to master for release
commit e73a66d0c6607d109bde7463c91d5780de12b336
Merge: f2fe3029c 4f7903801
Author: Zach Howard <zach@optimism.io>
Date: Wed Nov 23 16:58:12 2022 -0500
Merge pull request #4075 from ethereum-optimism/changeset-release/master
Version Packages
commit 4f7903801addfbf349cc7616ba5d451a6e2fbc9e
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date: Wed Nov 23 21:55:24 2022 +0000
Version Packages
commit be86d6fd9737c2346e7241fca314d65b471d1fa5
Merge: 2198e3bb5 f2fe3029c
Author: Zach Howard <zach@optimism.io>
Date: Wed Nov 23 16:53:01 2022 -0500
Merge pull request #4074 from ethereum-optimism/develop
Fix changesets and release
commit f2fe3029c7cb9137a74e15d28aacab0950d766e9
Merge: a6db381a5 4dad1b11a
Author: Zach Howard <zach@optimism.io>
Date: Wed Nov 23 16:49:40 2022 -0500
Merge pull request #4073 from ethereum-optimism/zhwrd/remove-integration-tests-bedrock-changeset
remove the integration-tests-bedrock changeset since the package was …
commit 4dad1b11a8f1c37cdd9c03ac1ca01e9fcd085a49
Author: Zach Howard <zach@optimism.io>
Date: Wed Nov 23 16:49:08 2022 -0500
remove the integration-tests-bedrock changeset since the package was deleted
commit 2198e3bb5dbfdb4b6209d93181cfdf5da1358823
Merge: 2b3b09be2 a6db381a5
Author: Zach Howard <zach@optimism.io>
Date: Wed Nov 23 16:40:48 2022 -0500
Merge pull request #4071 from ethereum-optimism/develop
Trigger releases
commit f74c70cbfa2a80be40756c3a87b73508fbd2084b
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Wed Nov 23 13:40:41 2022 -0500
feat(ctb): remove genesis output
Removes the startingL2Output from the L2OutputOracle. There's no reason
for this parameter to exist, there's nothing special about the
startingL2Output. It only complicates the initialization process.
Instead, the first output can be published by a proposer just like any
other output.
commit a6db381a51619fa9a5ef2e3334fbe2a115d7f8e2
Merge: 0ac339ea0 ae37ff0d0
Author: Maurelian <maurelian@protonmail.ch>
Date: Wed Nov 23 15:31:12 2022 -0500
Merge pull request #4068 from ethereum-optimism/sc/ctb-fix-deploy-bug
commit 15aa881bc7037cc44b019656909cc30aed793424
Author: Zach Howard <zach@optimism.io>
Date: Wed Nov 23 11:06:53 2022 -0500
build and publish docker images before tagging release
commit 0ac339ea0e18e53e733572e737968d12c6ad9b54
Merge: 0851fdb6d 9c00a9d82
Author: Maurelian <maurelian@protonmail.ch>
Date: Wed Nov 23 15:05:34 2022 -0500
Merge pull request #4067 from ethereum-optimism/jm/echidna-ci-builder
commit ae37ff0d00a0a33dc922e9605b0a209643799d4d
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Wed Nov 23 14:50:31 2022 -0500
fix(ctb): deploy bug
Fixes a deploy bug that slipped through CI because the devnet test was
not a required check.
commit 9c00a9d82d512d0baa7f310cfd8f4b0b152453cb
Author: Maurelian <maurelian@protonmail.ch>
Date: Thu Nov 3 17:00:44 2022 -0400
ci: Add echidna to Dockerfile
commit b35164df47729114a883e1fb9f4d29f3d93c40da
Author: clabby <ben@clab.by>
Date: Wed Nov 23 13:25:32 2022 -0500
Change signature of L2OutputOracle function
commit 0851fdb6df67a519b3a80087f48bd285c855786e
Merge: b8ce7ded8 164fe8aff
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed Nov 23 18:20:37 2022 +0000
Merge pull request #4033 from ethereum-optimism/sc/ctb-l2oo-genesis-init
feat(ctb): move L2OO genesis setup to init
commit 164fe8affd0b91795f4d14794a4f2b0823fcc213
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Mon Nov 21 16:28:53 2022 -0500
feat(ctb): move L2OO genesis setup to init
Moves genesis output, timestamp, and block number setup to the
initializer. This is necessary because we will not have this information
at deploy time for the migration deployment.
commit b8ce7ded8202460f49bcbae2cc1f6ba741a41396
Merge: 030833df9 c0c2267ae
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed Nov 23 16:14:13 2022 +0000
Merge pull request #4019 from ethereum-optimism/sc/remote-teleportr
maint: remove teleportr
commit bc10b10d3d7a9db53941894d68112407a359adfe
Author: 0xYYY <0xYYY@protonmail.com>
Date: Thu Nov 24 00:02:03 2022 +0800
doc: set ordered list index to 1
commit 030833df9b2de01c017be4c550f2eb8f6384a457
Merge: 6a5fb4800 55c3369f1
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 23 08:00:27 2022 -0800
Merge pull request #4058 from neutiyoo/refactor/fix-typo
refactor: fix typo `NewTransactionManger`
commit 6a5fb48006c20e0a3775cd40d80cfabece26d49d
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed Nov 23 07:59:43 2022 -0800
ci: enable devnet deploy (#4059)
commit ed31c64099448d518e2a874d53a988323848af1d
Author: 0xYYY <0xYYY@protonmail.com>
Date: Wed Nov 23 22:55:59 2022 +0800
doc: fix CONTRIBUTING.md typo
commit 903437d16168087dc8ac39e410355e0c5c8d6d25
Author: 0xYYY <0xYYY@protonmail.com>
Date: Wed Nov 23 22:50:34 2022 +0800
doc: fix spec typos
commit d94ca27cc1d1be0156a291986e4a899172d18d81
Merge: c3235dfb1 f468e58ef
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed Nov 23 13:58:25 2022 +0000
Merge pull request #4057 from ethereum-optimism/clabby/ctb/withdrawal-dos
fix(ctb): Address DoS vulnerability in `OptimismPortal`'s `proveWithdrawalTransaction`
commit 55c3369f1e33244e3bda7ce4207314d52abd1f0f
Author: Neuti Yoo <neutiyoo@gmail.com>
Date: Wed Nov 23 22:14:30 2022 +0900
refactor: fix typo `NewTransactionManger`
commit f468e58ef9554501d0821008c98b233411e19915
Author: clabby <ben@clab.by>
Date: Tue Nov 22 18:12:09 2022 -0500
Resolve conflicts with `develop`
commit 41f36560682cfeddf8edda1155c4c25831a562cc
Merge: 599101cad c3235dfb1
Author: clabby <ben@clab.by>
Date: Tue Nov 22 18:10:19 2022 -0500
Merge branch 'develop' into @clabby/ctb/fix-withdrawal-dos
commit 3ce0ddee652fc2ff251614d64d769ea87a2b4c82
Author: clabby <ben@clab.by>
Date: Tue Nov 22 17:19:38 2022 -0500
lint
toc
commit c3235dfb1220e259b96219d8767ab9041ff6c34c
Merge: 59c9a79fc c71500a7e
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue Nov 22 22:17:40 2022 +0000
Merge pull request #4014 from ethereum-optimism/sc/ctb-del-outputs
feat(ctb): allow multiple output deletions
commit 59b0102829517d6eab7d7b7a33d5b3e469e26037
Author: clabby <ben@clab.by>
Date: Tue Nov 22 17:11:09 2022 -0500
Update withdrawal specs
commit 59c9a79fc6ce6187da1d83cc1e4f1ba91097ceee
Merge: 49685f811 3b0aff691
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue Nov 22 22:00:49 2022 +0000
Merge pull request #4053 from ethereum-optimism/sc/sdk-flakes-3
fix(sdk): final flake hotfix
commit c0c2267ae23a2a0aefbdc647e811b1119a2ad994
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Sat Nov 19 23:24:40 2022 +0000
maint: remove teleportr
Removes teleportr since it's being deprecated.
commit c71500a7e134b9ed6bb5510ad204ca392e156cbb
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Thu Nov 17 15:28:20 2022 +0000
feat(ctb): allow multiple output deletions
Updates the L2OutputOracle to allow deletion of multiple outputs at the
same time. This is a safety mechanism that prevents a compromised
sequencer from forcing the multisig into deleting potentially thousands
of bad outputs one by one.
commit 3b0aff691f92533cda0af456e021852341d47b69
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Tue Nov 22 16:24:25 2022 -0500
fix(sdk): final flake hotfix
Final hotfix for flakes, if this doesn't work then I'll dive into
figuring out the root cause. Now we wait 30 seconds and only continue if
we haven't seen a reorg for the full 30 seconds.
commit 49685f811a678674d4402f7c32e7982ce09dfdfb
Merge: 7c6e9a56b dcdbd78e3
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue Nov 22 21:23:37 2022 +0000
Merge pull request #4040 from ethereum-optimism/sc/ctb-l2oo-cleanups-2
maint(ctb): minor cleanups in L2OO
commit 7c6e9a56b421bd22740e0201946ffe5357d53608
Merge: 088d168d6 1362c8084
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue Nov 22 21:02:56 2022 +0000
Merge pull request #4039 from ethereum-optimism/sc/ctb-unified-deploy-2
feat(ctb): unify fresh and migration deployments
commit 088d168d6ec6eb0c8c58c1695874687324157c1d
Merge: 7d0483a17 0510e5a27
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue Nov 22 20:54:10 2022 +0000
Merge pull request #4042 from ethereum-optimism/feat/remove-beta-1
ctb: Remove old beta-1 network
commit dcdbd78e3bdb68bd2dc25cb5408d2c49ea3561fc
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Mon Nov 21 20:45:04 2022 -0500
maint(ctb): minor cleanups in L2OO
Several small cleanups to the L2OutputOracle.
commit 7d0483a17d2e05d649d760b8ea89d9ba45e3c5ad
Merge: b63f57601 c313dc1ab
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue Nov 22 20:34:13 2022 +0000
Merge pull request #4048 from ethereum-optimism/sc/ctb-sdk-flakes-2
fix(sdk): test flakes #2
commit c313dc1ab3bed1952e4315ad3e375119c3db7c6a
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Tue Nov 22 15:23:04 2022 -0500
fix(sdk): test flakes #2
Additional tweaks to prevent test flakes in the SDK.
commit 1362c80843c7b9e699414b1f4c9db0c2aa115d65
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Mon Nov 21 19:12:22 2022 -0500
feat(ctb): unify fresh and migration deployments
Removes the concept of a "Fresh" deployment and deploys some legacy
contracts where necessary so that all new deployments will mirror the
mainnet system. Although this enshrines some legacy code, it means that
we won't have multiple conflicting deployments in the future.
commit b63f57601d87c803006c9384dadd0566c18de030
Merge: 085daa6c6 69a0602ef
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue Nov 22 19:54:11 2022 +0000
Merge pull request #4028 from ethereum-optimism/sc/ctb-sdk-flakes
fix(sdk): test flakes
commit 69a0602efd177ae0d00429b2799166b27a1c50d0
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Mon Nov 21 14:41:44 2022 -0500
fix(sdk): test flakes
Fixes test flakes in the SDK
commit 599101cada3c98ddfe49ee0ed6399b670321b008
Author: clabby <ben@clab.by>
Date: Tue Nov 22 12:56:16 2022 -0500
Fix John's nits
commit 085daa6c61d82d9dc42d6ceb6c108db8c71fee5f
Merge: 0dccbdaaf 4277f52ff
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue Nov 22 17:45:26 2022 +0000
Merge pull request #4015 from ethereum-optimism/sc/ctb-msd-exit-1
feat(ctb): MSD exit point 1
commit 0dccbdaaf2d9b3137a245b12e36de29d8b4ecc0f
Author: Matthew Slipper <me@matthewslipper.com>
Date: Tue Nov 22 09:14:06 2022 -0700
ctb: Configurable verification for deployer network (#4041)
Most ephemeral networks created via the regntool don't need verification. This PR allows verification to be enabled on a case-by-case basis by setting an environment variable.
commit ea2cf94cc5940f9b91bc976a2095a167c5a61b61
Merge: 12dc97ab3 985b853cb
Author: Maurelian <maurelian@protonmail.ch>
Date: Tue Nov 22 07:05:00 2022 -0500
Merge pull request #3937 from ethereum-optimism/tob-opnode-tests
commit 985b853cbc66655ff7c935245b5c27e41ddf2d74
Author: Maurelian <maurelian@protonmail.ch>
Date: Thu Nov 17 18:25:40 2022 -0500
op-node: Add FuzzDecodeDepositTxDataToL1Info
op-node: More test cleanup
commit 8d1272511dd07c09e1536940b14024969ce3bd94
Author: Maurelian <maurelian@protonmail.ch>
Date: Thu Nov 17 15:44:51 2022 -0500
op-node: clean up FuzzParseL1InfoDepositTxDataValid
commit c3af045547d0db6022599becedda27092c1cae70
Author: Maurelian <maurelian@protonmail.ch>
Date: Thu Nov 10 21:53:03 2022 -0500
op-node: Add new tests to Makefile fuzz cmd
commit 884af5ed904e3aae8c715bf544cee9e59e88855d
Author: Maurelian <maurelian@protonmail.ch>
Date: Wed Nov 9 12:49:55 2022 -0500
op-node: Update ToB tests to current implementation
op-node: Use assert rather than require
commit 63072ca18009edb1c7d32dff330193f10e55847a
Author: Maurelian <maurelian@protonmail.ch>
Date: Thu Nov 3 11:26:49 2022 -0400
op-node: add ToB tests
commit 0510e5a27868b0976abdc480618ceeac81db4ab6
Author: Matthew Slipper <me@matthewslipper.com>
Date: Mon Nov 21 23:21:33 2022 -0500
ctb: Remove old beta-1 network
commit 4277f52ff0de6a0fe176196d8ef5a5d74cae5e2b
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Thu Nov 17 16:07:15 2022 +0000
feat(ctb): MSD exit point 1
Introduces the first exit point for the MigrationSystemDictator.
commit 12dc97ab35d957694218410855ce09cd9e3e217d
Merge: 181c63e0a 80e17c002
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon Nov 21 23:47:49 2022 +0000
Merge pull request #4032 from ethereum-optimism/jg/ci_hive_external_contrib
CI: Enable Hive to work with external contributors
commit 181c63e0aaa0caec807dbcafb883cb17ea4e800d
Merge: c70bf95d9 59e53b0b5
Author: Matthew Slipper <me@matthewslipper.com>
Date: Mon Nov 21 16:42:52 2022 -0700
Merge pull request #4036 from ethereum-optimism/release_v0_10_1
Bedrock: release v0.10.1 go modules
commit 59e53b0b5f6b8af801238a0425f3ba54a44b42d1
Author: protolambda <proto@protolambda.com>
Date: Tue Nov 22 00:36:21 2022 +0100
chore: Upgrade op-e2e dependencies
commit be26284af7f1ffa09d5a0751cb3351eb18147a05
Author: protolambda <proto@protolambda.com>
Date: Tue Nov 22 00:36:01 2022 +0100
chore: Upgrade op-batcher dependencies
commit 07faf9a41a97989637f6a55bdc0d68c56f130ead
Author: protolambda <proto@protolambda.com>
Date: Tue Nov 22 00:35:44 2022 +0100
chore: Upgrade op-proposer dependencies
commit f93d6d8ff9f9fa465347a7e7b614020cd9219f4d
Author: protolambda <proto@protolambda.com>
Date: Tue Nov 22 00:35:21 2022 +0100
chore: Upgrade op-node dependencies
commit 96f1b6b2222c07d9345385de771a4db1d4c0498c
Author: protolambda <proto@protolambda.com>
Date: Tue Nov 22 00:34:58 2022 +0100
chore: Upgrade op-chain-ops dependencies
commit f05b0eb8dea8120e7dd3e48b831d6f78996826df
Author: Joshua Gutow <jgutow@optimism.io>
Date: Mon Nov 21 14:42:48 2022 -0800
op-node: Audit use of L1 State
The L1 State can return uninitialized values. I have checked every
usage in the op-node and either check the return value from L1
state if is important or let the empty value through.
commit c70bf95d9fb16a72b65a3be4eab804e0bd093d3e
Merge: ee7abf3b2 ccaf5bc83
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon Nov 21 22:39:00 2022 +0000
Merge pull request #4013 from ethereum-optimism/sc/ctb-oracle-owner-xfer
fix(ctb): allow same L2OO owner and proposer
commit 9f02838a81d52b5822be9d9631e4ab06ada749dd
Author: clabby <ben@clab.by>
Date: Mon Nov 21 17:15:14 2022 -0500
Update gas snapshot w/ correct version of forge
commit c3f30db3e590680308fab65c964a11dfe6be8500
Author: clabby <ben@clab.by>
Date: Mon Nov 21 16:07:50 2022 -0500
Resolve conflicts
commit cb1c704ce03c53f6dc75bb1e4c8c20ac7b11d855
Merge: c025a1153 ee7abf3b2
Author: clabby <ben@clab.by>
Date: Mon Nov 21 16:06:31 2022 -0500
Merge branch 'develop' into @clabby/ctb/fix-withdrawal-dos
commit c025a1153551b8b031b2513351379b771509d60c
Author: clabby <ben@clab.by>
Date: Mon Nov 21 16:05:18 2022 -0500
Allow re-proving withdrawal if the `outputRoot` changes and the `l2BlockNumber` stays the same
commit ccaf5bc839c43012eda073ab247389caef558ce0
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Wed Nov 16 17:30:16 2022 +0000
fix(ctb): allow same L2OO owner and proposer
Tweaks the L2OutputOracle to allow owner and proposer addresses to be
the same. Extra logic required to prevent this case added smart contract
code to a critical contract and it's unlikely that this will be a
problem in practice.
commit 80e17c002ceac92599ca60dfbd93d302cf96943b
Author: Joshua Gutow <jgutow@oplabs.co>
Date: Mon Nov 21 12:29:22 2022 -0800
ci: Split docker build & publish
This splits the docker publish job into a build & publish job. They were
previously just steps. The build step uses docker save & circle workspaces
to provide the docker images to dependent jobs (like the publish & hive jobs).
This makes one change to the hive job to remove the docker.pull=true flag. This
is because it loads the image locally but in the case of an external contributor
the image will not be published. Docker will use the local image first & then
pull other images if they are not present.
commit b664880e756a607add1b9c2e241c7dc93d807d83
Author: clabby <ben@clab.by>
Date: Mon Nov 21 14:03:59 2022 -0500
Fix TOB's high severity finding in `OptimismPortal`
commit 324db7e3e17e99fb84a94b17394d4ccebd5a6f5a
Author: Joshua Gutow <jgutow@oplabs.co>
Date: Mon Nov 21 09:40:54 2022 -0800
CI: Remove optional target from docker-publish step
The old nightlies used a partial build (which is the purpose of
the --target flag), but they were removed in PR #3330 (commit
f772f66cfcb59e57d43bdd0419baf5a5ee96228e).
commit ee7abf3b2faf4d45632557c0d620b1c37d170f10
Merge: 58d224772 896e23387
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Mon Nov 21 08:53:53 2022 -0800
Merge pull request #4017 from epociask/fix/debug-regression-exporter
Fix: Proper debug output for L1 CTC Address env var in l2geth-exporter
commit 58d224772e3d289a63c8b1276b30528c82fded46
Merge: dd4bf9cdc 9d5ca227d
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon Nov 21 16:21:38 2022 +0000
Merge pull request #4018 from ethereum-optimism/sc/ctb-no-gas-fuzz
feat(ctb): no gas snapshot for fuzz tests
commit 896e2338789996a9dee3269fc7c86ca91a55b889
Author: Mark Tyneway <mark.tyneway@gmail.com>
Date: Mon Nov 21 08:21:35 2022 -0800
Create pink-kiwis-wink.md
commit 9d5ca227d5a81b4079eca8b2714c729c1749f0f6
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Sat Nov 19 22:47:25 2022 +0000
feat(ctb): no gas snapshot for fuzz tests
Use the new no-match-test option for gas snapshots to remove
differential and fuzz tests from gas snapshots. Significantly speeds up
the process of generating gas snapshots.
commit 3bae8fd5fe5c7b2ede068e3591b07907e3717ab4
Author: epociask <empociask@dons.usfca.edu>
Date: Fri Nov 18 17:59:33 2022 -0800
fix: Adding proper debug output for OVM_CTC_ADDRESS env var in l2geth-exporter
commit dd4bf9cdc45fee4d80f0c71ba6a8178d6ba17f42
Merge: 29cee901a f49b71d50
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu Nov 17 23:44:08 2022 +0000
Merge pull request #3862 from ethereum-optimism/vm-bound
Update forge-std and use bound instead of vm.assume
commit f49b71d5079860279f114a0b3729fbde7ec6f1ea
Author: Maurelian <maurelian@protonmail.ch>
Date: Wed Nov 2 21:24:48 2022 -0400
Use bound instead of vm.assume
ctb: Update Hashing tests with bounded version
ctb: Update Portal tests with bound
commit c8714cb4f7b03528c47e7129f6c688f3726c48ba
Author: Maurelian <maurelian@protonmail.ch>
Date: Wed Nov 2 21:34:23 2022 -0400
ctb: Update forge-std
commit 29cee901a821b396544f03adb214e674d4c527c5
Merge: 1896b7c74 f19d11c56
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed Nov 16 15:11:13 2022 +0000
Merge pull request #4000 from ethereum-optimism/sc/ctb-msd-finalize
feat(ctb): allow owner to finalize MSD at any time
commit 1896b7c74576eb57f68330133efa9931a7eb9728
Merge: 66d56a47a 9fda7d93c
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed Nov 16 14:34:47 2022 +0000
Merge pull request #4003 from protocolwhisper/develop
Deleted unused variables from contracts-bedrock and add changeset
commit f19d11c56be8837dc6e4e8fd816bf2ec0d864dbc
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Mon Nov 14 21:44:43 2022 +0000
feat(ctb): allow owner to finalize MSD at any time
Allows the owner of the MigrationSystemDictator to finalize the
deployment at any time. Finalizing the deployment will transfer
ownership of relevant contracts to the final owner.
commit 9fda7d93cc78aae86de824454f773af792858f67
Merge: c20747ea7 66d56a47a
Author: ProtocolWhisper <57886661+protocolwhisper@users.noreply.github.com>
Date: Tue Nov 15 23:29:14 2022 -0500
Merge branch 'ethereum-optimism:develop' into develop
commit 66d56a47a233451d3db1fefb764dd4212300c66f
Merge: 05e86e85b dbb76ac21
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue Nov 15 19:20:42 2022 +0000
Merge pull request #4001 from ethereum-optimism/sc/ctb-msd-del-addrs
fix(ctb): tweak addresses for MSD to wipe
commit dbb76ac2180374039c540c1cb1787fbe2e42bdba
Merge: da791d566 05e86e85b
Author: Matthew Slipper <me@matthewslipper.com>
Date: Tue Nov 15 14:02:11 2022 -0500
Merge branch 'develop' into sc/ctb-msd-del-addrs
commit c20747ea73130783b1d7681d59154abd7844a904
Merge: 3e76e6b78 05e86e85b
Author: ProtocolWhisper <57886661+protocolwhisper@users.noreply.github.com>
Date: Tue Nov 15 13:40:03 2022 -0500
Merge branch 'ethereum-optimism:develop' into develop
commit 3e76e6b7896347e72f856972235bbe63f2a58f25
Author: Theprotocolwhisperer <chrismata10@gmail.com>
Date: Tue Nov 15 13:38:11 2022 -0500
Unused imports
commit 05e86e85b44c96afa83f3c7edfb842081d24eaff
Merge: dbb8721b5 63d877a00
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue Nov 15 18:35:17 2022 +0000
Merge pull request #3998 from ethereum-optimism/sc/ctb-msd-better-pause
fix(ctb): better XDM pause in MSD
commit b53dc7267adb9e361c460379857b82cfdc71d01d
Author: ProtocolWhisper <57886661+protocolwhisper@users.noreply.github.com>
Date: Tue Nov 15 12:04:08 2022 -0500
Update package.json
commit ed4395c211b2ffc053489f28a298a91563fdc99b
Author: ProtocolWhisper <57886661+protocolwhisper@users.noreply.github.com>
Date: Tue Nov 15 12:03:16 2022 -0500
Update yarn.lock
commit 59adcaa0992753ea4b297f8c901e78c02e4cfbec
Author: Theprotocolwhisperer <chrismata10@gmail.com>
Date: Mon Nov 14 18:13:54 2022 -0500
Deleted unused variables and add changeset
commit 63d877a00b3c4b5a90aad03a7abd4d230a7f977e
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Mon Nov 14 20:42:04 2022 +0000
fix(ctb): better XDM pause in MSD
Improves the pausing mechanism for the CrossDomainMessenger in the
MigrationSystemDictator.
commit dbb8721b5451390c1ff389ef6a7196e4acd6cfad
Author: Maurelian <maurelian@protonmail.ch>
Date: Tue Nov 15 12:45:05 2022 -0500
specs: Fix long line (#4006)
commit 69fe6f4d28bd56b6f3c4772cea4e8d1a42869c1d
Author: Matthew Slipper <me@matthewslipper.com>
Date: Tue Nov 15 10:02:50 2022 -0500
fix markdown lint
commit 39fa3ca3c68f25195fc91bc61df893b2ae0e48e8
Author: Abhishek Kumar <43061995+xenowits@users.noreply.github.com>
Date: Tue Nov 15 20:08:27 2022 +0530
fix typo in spec (#3678)
* fix typo in spec
* More better words about sequencing windows
Co-authored-by: norswap <norswap@gmail.com>
Co-authored-by: Maurelian <john@optimism.io>
Co-authored-by: norswap <norswap@gmail.com>
commit d4791589dc3b94a2cd4a2315847f07fe43996cb8
Merge: 7636eb76d 90ca2a5c8
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon Nov 14 22:30:21 2022 +0000
Merge pull request #3999 from ethereum-optimism/sc/ctb-fix-deploy-order
fix(ctb): deploy file ordering
commit da791d566289c7b902e700ffa958e2aaa099bde8
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Mon Nov 14 22:02:35 2022 +0000
fix(ctb): tweak addresses for MSD to wipe
Tweaks the addresses that the MigrationSystemDictator will zero out
inside of the AddressManager. The Proxy addresses should not be deleted
since some external services may rely on them as part of the current
system. The BondManager should be wiped so that no more state batches
can be appended.
commit 90ca2a5c8b97c35da24050aa3e21a3eae4840eeb
Author: Kelvin Fichter <kelvin@optimism.io>
Date: Mon Nov 14 21:38:54 2022 +0000
fix(ctb): deploy file ordering
Fxies an error in deploy file ordering.
commit 7636eb76dec8e2d2b5cfe4be839cb3f5b988d39d
Merge: 7e9af98a0 f8697a607
Author: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon Nov 14 20:39:09 2022 +0000
Merge pull request #3973 from ethereum-optimis…
Changes to be committed: modified: op-chain-ops/genesis/layer_two_test.go modified: op-chain-ops/immutables/immutables.go modified: op-chain-ops/immutables/immutables_test.go
Conflicts: .changeset/breezy-rockets-knock.md .changeset/famous-insects-try.md .changeset/friendly-rats-scream.md .circleci/config.yml .github/CODEOWNERS .gitignore codecov.yml go.work go.work.sum indexer/CHANGELOG.md indexer/integration_tests/bedrock_test.go indexer/package.json integration-tests/package.json l2geth/CHANGELOG.md l2geth/package.json op-batcher/Dockerfile op-batcher/driver.go op-batcher/go.mod op-batcher/go.sum op-batcher/txmgr.go op-bindings/Makefile op-bindings/bindings/basefeevault.go op-bindings/bindings/deployerwhitelist_more.go op-bindings/bindings/gaspriceoracle.go op-bindings/bindings/governancetoken_more.go op-bindings/bindings/l1crossdomainmessenger.go op-bindings/bindings/l1crossdomainmessenger_more.go op-bindings/bindings/l1erc721bridge.go op-bindings/bindings/l1feevault.go op-bindings/bindings/l1standardbridge.go op-bindings/bindings/l2crossdomainmessenger.go op-bindings/bindings/l2crossdomainmessenger_more.go op-bindings/bindings/l2outputoracle.go op-bindings/bindings/l2standardbridge_more.go op-bindings/bindings/l2tol1messagepasser_more.go op-bindings/bindings/legacyerc20eth.go op-bindings/bindings/legacyerc20eth_more.go op-bindings/bindings/legacymessagepasser_more.go op-bindings/bindings/optimismmintableerc721factory_more.go op-bindings/bindings/optimismportal.go op-bindings/bindings/optimismportal_more.go op-bindings/bindings/proxyadmin_more.go op-bindings/bindings/sequencerfeevault.go op-bindings/bindings/sequencerfeevault_more.go op-bindings/bindings/systemconfig.go op-bindings/bindings/weth9_more.go op-bindings/go.mod op-bindings/go.sum op-bindings/predeploys/addresses.go op-chain-ops/Dockerfile op-chain-ops/cmd/op-migrate/main.go op-chain-ops/ether/cli.go op-chain-ops/ether/migrate.go op-chain-ops/genesis/config.go op-chain-ops/genesis/db_migration.go op-chain-ops/genesis/layer_one.go op-chain-ops/genesis/layer_two_test.go op-chain-ops/genesis/setters.go op-chain-ops/genesis/testdata/test-deploy-config-full.json op-chain-ops/go.mod op-chain-ops/go.sum op-chain-ops/immutables/immutables.go op-chain-ops/immutables/immutables_test.go op-e2e/actions/l2_proposer.go op-e2e/actions/user.go op-e2e/e2eutils/setup.go op-e2e/go.mod op-e2e/go.sum op-e2e/setup.go op-e2e/system_test.go op-node/Dockerfile op-node/cmd/genesis/cmd.go op-node/eth/account_proof.go op-node/go.mod op-node/go.sum op-node/node/api.go op-node/node/server_test.go op-node/rollup/derive/channel_out.go op-node/rollup/driver/sequencer.go op-node/rollup/driver/state.go op-node/rollup/driver/state_tob_test.go op-node/withdrawals/utils.go op-proposer/Dockerfile op-proposer/drivers/l2output/driver.go op-proposer/go.mod op-proposer/go.sum op-proposer/l2_output_submitter.go op-service/go.mod op-service/go.sum ops/docker/ci-builder/CHANGELOG.md ops/docker/ci-builder/Dockerfile ops/docker/ci-builder/package.json package.json packages/actor-tests/CHANGELOG.md packages/actor-tests/package.json packages/common-ts/CHANGELOG.md packages/common-ts/package.json packages/contracts-bedrock/.gas-snapshot packages/contracts-bedrock/.gitignore packages/contracts-bedrock/.storage-layout packages/contracts-bedrock/CHANGELOG.md packages/contracts-bedrock/contracts/L1/L1ERC721Bridge.sol packages/contracts-bedrock/contracts/L1/L2OutputOracle.sol packages/contracts-bedrock/contracts/L1/OptimismPortal.sol packages/contracts-bedrock/contracts/L1/SystemConfig.sol packages/contracts-bedrock/contracts/L2/BaseFeeVault.sol packages/contracts-bedrock/contracts/L2/GasPriceOracle.sol packages/contracts-bedrock/contracts/L2/L1FeeVault.sol packages/contracts-bedrock/contracts/L2/L2ERC721Bridge.sol packages/contracts-bedrock/contracts/L2/SequencerFeeVault.sol packages/contracts-bedrock/contracts/deployment/SystemDictator.sol packages/contracts-bedrock/contracts/libraries/rlp/RLPReader.sol packages/contracts-bedrock/contracts/libraries/trie/MerkleTrie.sol packages/contracts-bedrock/contracts/test/AddressAliasHelper.t.sol packages/contracts-bedrock/contracts/test/CrossDomainMessenger.t.sol packages/contracts-bedrock/contracts/test/FeeVault.t.sol packages/contracts-bedrock/contracts/test/GasPriceOracle.t.sol packages/contracts-bedrock/contracts/test/L1BlockNumber.t.sol packages/contracts-bedrock/contracts/test/L1CrossDomainMessenger.t.sol packages/contracts-bedrock/contracts/test/L1StandardBridge.t.sol packages/contracts-bedrock/contracts/test/L2CrossDomainMessenger.t.sol packages/contracts-bedrock/contracts/test/L2OutputOracle.t.sol packages/contracts-bedrock/contracts/test/OptimismMintableERC20.t.sol packages/contracts-bedrock/contracts/test/OptimismPortal.t.sol packages/contracts-bedrock/contracts/test/ProxyAdmin.t.sol packages/contracts-bedrock/contracts/test/RLPReader.t.sol packages/contracts-bedrock/contracts/test/SequencerFeeVault.t.sol packages/contracts-bedrock/contracts/universal/FeeVault.sol packages/contracts-bedrock/contracts/universal/OptimismMintableERC721.sol packages/contracts-bedrock/deploy-config/devnetL1.json packages/contracts-bedrock/deploy-config/goerli-forked.json packages/contracts-bedrock/deploy-config/goerli.json packages/contracts-bedrock/deploy-config/hardhat.json packages/contracts-bedrock/deploy/000-ProxyAdmin.ts packages/contracts-bedrock/deploy/001-AddressManager.ts packages/contracts-bedrock/deploy/002-L1StandardBridgeProxy.ts packages/contracts-bedrock/deploy/003-L2OutputOracleProxy.ts packages/contracts-bedrock/deploy/004-L1CrossDomainMessengerProxy.ts packages/contracts-bedrock/deploy/005-OptimismPortalProxy.ts packages/contracts-bedrock/deploy/006-OptimismMintableERC20FactoryProxy.ts packages/contracts-bedrock/deploy/007-L1ERC721BridgeProxy.ts packages/contracts-bedrock/deploy/008-SystemConfigProxy.ts packages/contracts-bedrock/package.json packages/contracts-bedrock/scripts/forge-test-names.ts packages/contracts-bedrock/src/deploy-config.ts packages/contracts-bedrock/src/deploy-utils.ts packages/contracts-bedrock/tasks/index.ts packages/contracts-governance/CHANGELOG.md packages/contracts-governance/README.md packages/contracts-governance/package.json packages/contracts-periphery/CHANGELOG.md packages/contracts-periphery/hardhat.config.ts packages/contracts-periphery/package.json packages/contracts/CHANGELOG.md packages/contracts/package.json packages/core-utils/CHANGELOG.md packages/core-utils/package.json packages/data-transport-layer/CHANGELOG.md packages/data-transport-layer/package.json packages/drippie-mon/CHANGELOG.md packages/drippie-mon/package.json packages/fault-detector/CHANGELOG.md packages/fault-detector/package.json packages/message-relayer/CHANGELOG.md packages/message-relayer/package.json packages/migration-data/package.json packages/replica-healthcheck/CHANGELOG.md packages/replica-healthcheck/package.json packages/sdk/CHANGELOG.md packages/sdk/package.json packages/sdk/src/cross-chain-messenger.ts specs/predeploys.md specs/withdrawals.md yarn.lock
modified: op-bindings/bindings/deployerwhitelist_more.go modified: op-bindings/bindings/governancetoken_more.go modified: op-bindings/bindings/l1crossdomainmessenger_more.go modified: op-bindings/bindings/l2crossdomainmessenger_more.go modified: op-bindings/bindings/l2standardbridge_more.go modified: op-bindings/bindings/l2tol1messagepasser_more.go modified: op-bindings/bindings/legacyerc20eth_more.go modified: op-bindings/bindings/legacymessagepasser_more.go modified: op-bindings/bindings/optimismmintableerc721factory_more.go modified: op-bindings/bindings/optimismportal_more.go modified: op-bindings/bindings/proxyadmin_more.go modified: op-bindings/bindings/weth9_more.go
Changes to be committed: modified: op-batcher/Dockerfile modified: op-proposer/Dockerfile
Conflicts: go.work op-batcher/go.mod op-bindings/go.mod op-chain-ops/go.mod op-node/go.mod op-proposer/go.mod op-service/go.mod
Conflicts: op-chain-ops/genesis/layer_two_test.go op-node/eth/account_proof.go op-node/node/api.go op-node/sources/eth_client.go
Changes to be committed: modified: op-chain-ops/genesis/setters.go
Conflicts: .changeset/famous-insects-try.md op-bindings/Makefile op-bindings/bindings/l1crossdomainmessenger_more.go op-bindings/bindings/l2crossdomainmessenger_more.go op-bindings/bindings/weth9.go op-bindings/bindings/weth9_more.go op-chain-ops/genesis/layer_two_test.go
Changes to be committed: modified: bindings/l1crossdomainmessenger_more.go modified: bindings/l2crossdomainmessenger_more.go modified: bindings/weth9.go modified: bindings/weth9_more.go
Conflicts: op-batcher/Dockerfile op-proposer/Dockerfile op-proposer/proposer/driver.go
Changes to be committed: modified: op-batcher/docker.go.work modified: op-geth modified: op-proposer/docker.go.work modified: ops-bedrock/docker-compose.yml
external systems). Changes to be committed: modified: ops-bedrock/docker-compose.yml
Please see the README.md in the directory for more details, but, building Erigon from inside the test processes of the Optimism repo is currently impossible because of the assorted Geth related imports and overrides. This commit simply adds an 'erigon-build-hack', which allows for an Erigon binary to be built in-tree without a new submodule.
This commit adds a test helper to build Erigon (using the erigon-build-hack directory added in the previous commit) and a basic test that this binary can run, and function as an Ethereum node with a private dev network.
This change simply scrapes the Erigon output to find the port that was actually bound when starting.
This adds a field, defaulting to false, to use Erigon as the L2 node in the e2e tests. The remaining changes respect this flag, but, are a no-op because the flag is currently always false.
This adds a flag to the op-e2e tests (--erigon) which will cause an Erigon L2 node to be substituted for the op-geth L2 node. All tests are currently passing (except one which is skipped because it does not apply to Erigon). You may execute the end to end tests with go test ./op-geth --erigon -timeout 1h or you may use the make target: cd op-geth && make erigon-test
Enable Erigon in op-e2e tests
taken as a diff from boba-develop to 'e09468b23' and manually patched onto the latest upstream/develop branch. Changes to be committed: modified: Makefile modified: op-batcher/Dockerfile modified: op-bindings/Makefile new file: op-bindings/bindings/boba.go new file: op-bindings/bindings/bobaturingcredit.go new file: op-bindings/bindings/bobaturingcredit_more.go modified: op-bindings/bindings/deployerwhitelist_more.go modified: op-bindings/bindings/governancetoken_more.go modified: op-bindings/bindings/l1crossdomainmessenger_more.go modified: op-bindings/bindings/l2crossdomainmessenger_more.go modified: op-bindings/bindings/l2standardbridge_more.go modified: op-bindings/bindings/l2tol1messagepasser_more.go modified: op-bindings/bindings/legacyerc20eth_more.go modified: op-bindings/bindings/legacymessagepasser_more.go new file: op-bindings/bindings/optimismmintableerc20_more.go modified: op-bindings/bindings/optimismmintableerc721factory_more.go modified: op-bindings/bindings/optimismportal_more.go modified: op-bindings/bindings/proxyadmin_more.go modified: op-bindings/bindings/weth9.go modified: op-bindings/bindings/weth9_more.go modified: op-bindings/predeploys/addresses.go modified: op-chain-ops/genesis/config.go modified: op-chain-ops/genesis/layer_one.go modified: op-chain-ops/genesis/layer_two_test.go modified: op-chain-ops/genesis/setters.go modified: op-chain-ops/immutables/immutables.go modified: op-chain-ops/immutables/immutables_test.go modified: op-chain-ops/state/state.go modified: op-node/Makefile modified: op-proposer/Dockerfile new file: ops-bedrock/Dockerfile.l2-erigon modified: ops-bedrock/devnet-up.sh new file: ops-bedrock/docker-compose-geth.yml modified: ops-bedrock/docker-compose.yml new file: ops-bedrock/l2-erigon.sh new file: packages/contracts-bedrock/contracts/boba/BOBA.sol new file: packages/contracts-bedrock/contracts/boba/BobaTuringCredit.sol new file: packages/contracts-bedrock/contracts/boba/ITuringHelper.sol
This patch can be reverted later for cleanup. Changes to be committed: modified: op-chain-ops/genesis/layer_one.go modified: op-chain-ops/immutables/immutables.go modified: op-chain-ops/state/state.go modified: op-node/eth/account_proof.go modified: op-node/node/api.go modified: op-node/rollup/derive/attributes_queue.go modified: op-node/rollup/derive/batch_queue.go modified: op-node/rollup/derive/l1_traversal.go modified: op-node/rollup/derive/pipeline.go modified: op-node/rollup/driver/state.go modified: op-node/sources/eth_client.go
Changes to be committed: modified: .gitmodules modified: go.mod modified: go.sum modified: op-e2e/Makefile new file: op-e2e/erigon-build-hack/README.md new file: op-e2e/erigon-build-hack/build.go new file: op-e2e/erigon-build-hack/build_test.go new file: op-e2e/erigon-build-hack/go.mod new file: op-e2e/erigon-build-hack/go.sum new file: op-e2e/erigon-build-hack/go.work new file: op-e2e/erigon-build-hack/go.work.sum new file: op-e2e/erigon.go new file: op-e2e/erigon_test.go new file: op-erigon
Changes to be committed: modified: op-e2e/bridge_test.go modified: op-e2e/setup.go modified: op-e2e/system_test.go modified: op-e2e/system_tob_test.go
Changes to be committed: modified: .gitmodules modified: go.mod modified: go.sum modified: op-batcher/Dockerfile modified: op-chain-ops/Dockerfile new file: op-geth modified: op-node/Dockerfile modified: op-proposer/Dockerfile
Conflicts: .gitmodules Makefile go.mod go.work go.work.sum op-batcher/Dockerfile op-batcher/docker.go.work op-batcher/go.mod op-bindings/Makefile op-bindings/bindings/l1crossdomainmessenger_more.go op-bindings/bindings/l2crossdomainmessenger_more.go op-bindings/bindings/optimismmintableerc20_more.go op-bindings/bindings/optimismportal_more.go op-bindings/go.mod op-chain-ops/genesis/layer_one.go op-chain-ops/go.mod op-e2e/op_geth_test.go op-e2e/setup.go op-e2e/system_test.go op-erigon op-geth op-node/docker.go.work op-node/eth/account_proof.go op-node/go.mod op-node/rollup/derive/engine_queue.go op-node/rollup/derive/pipeline.go op-proposer/Dockerfile op-proposer/docker.go.work op-proposer/go.mod op-service/go.mod
Changes to be committed: modified: op-node/Dockerfile modified: op-node/node/api.go modified: op-node/sources/engine_client.go deleted: packages/contracts-bedrock/deploy/009-L1CrossDomainMessengerImpl.ts deleted: packages/contracts-bedrock/deploy/010-L1StandardBridgeImpl.ts deleted: packages/contracts-bedrock/deploy/011-L2OutputOracleImpl.ts deleted: packages/contracts-bedrock/deploy/012-OptimismPortalImpl.ts deleted: packages/contracts-bedrock/deploy/013-OptimismMintableERC20FactoryImpl.ts deleted: packages/contracts-bedrock/deploy/014-L1ERC721BridgeImpl.ts deleted: packages/contracts-bedrock/deploy/015-PortalSenderImpl.ts deleted: packages/contracts-bedrock/deploy/016-SystemConfigImpl.ts deleted: packages/contracts-bedrock/deploy/017-SystemDictator.ts deleted: packages/contracts-bedrock/deploy/018-SystemDictatorSteps.ts deleted: packages/contracts/deployments/mainnet-forked/.chainId deleted: packages/contracts/deployments/mainnet-forked/AddressDictator.json deleted: packages/contracts/deployments/mainnet-forked/BondManager.json deleted: packages/contracts/deployments/mainnet-forked/CanonicalTransactionChain.json deleted: packages/contracts/deployments/mainnet-forked/ChainStorageContainer-CTC-batches.json deleted: packages/contracts/deployments/mainnet-forked/ChainStorageContainer-SCC-batches.json deleted: packages/contracts/deployments/mainnet-forked/ChugSplashDictator.json deleted: packages/contracts/deployments/mainnet-forked/L1StandardBridge_for_verification_only.json deleted: packages/contracts/deployments/mainnet-forked/Lib_AddressManager.json deleted: packages/contracts/deployments/mainnet-forked/OVM_L1CrossDomainMessenger.json deleted: packages/contracts/deployments/mainnet-forked/Proxy__OVM_L1CrossDomainMessenger.json deleted: packages/contracts/deployments/mainnet-forked/Proxy__OVM_L1StandardBridge.json deleted: packages/contracts/deployments/mainnet-forked/README.md deleted: packages/contracts/deployments/mainnet-forked/StateCommitmentChain.json deleted: packages/contracts/deployments/mainnet-forked/TeleportrDeposit.json deleted: packages/contracts/deployments/mainnet-forked/solcInputs/4532a57dbcb505a79ddf510df0371b5f.json deleted: packages/contracts/deployments/mainnet-forked/solcInputs/475653b7e5822844bbc8885f604f5e79.json deleted: packages/contracts/deployments/mainnet-forked/solcInputs/7531d7762a77038a37e7490a7b4b176f.json deleted: packages/contracts/deployments/mainnet-forked/solcInputs/8a22f2b322f61ab13865f2d2a82e5f09.json deleted: packages/contracts/deployments/mainnet-forked/solcInputs/ad04ab9565e42a9370aa7f055041028d.json deleted: packages/contracts/deployments/mainnet-forked/solcInputs/e2f1121f17d06f85851dd0c837a00344.json deleted: packages/contracts/deployments/mainnet-forked/solcInputs/ef3f334bac4d7e77d91b457a0d89ab0a.json deleted: packages/contracts/deployments/mainnet-forked/solcInputs/f20d616c1af6713a0e8ca9fae9d7bae7.json
Merging boba-develop into develop
Merge upstream 20230905
With fixes in Erigon, these tests now work properly again.
Re-enable some e2e tests.
Support KMS in ufm
Add script to verify l2 state
jyellick
requested review from
a team,
protolambda and
trianglesphere
as code owners
|
Wrong repo, apologies |
mergify
bot
added
A-op-batcher
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.
Merge of upstream changes.
This merge contains more changes, and includes some contract changes. The full list excluding markdown, go, images, and go.mod/go.sum files follows.
Specifically, the contract changes include:
Reviewers are encouraged to scrutinize these contract changes. It's not anticipated that these changes are problematic, as I believe both the EAS contracts and cannon/dispute contracts are new and not related to the legacy system.