Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream 20230918 #48

Merged
merged 212 commits into from
Sep 19, 2023
Merged
Changes from 1 commit
Commits
Show all changes
212 commits
Select commit Hold shift + click to select a range
4732cfa
specs: superchain target and protocol version
protolambda Jul 17, 2023
08b4126
:construction_worker: fix: Remove fault detector from version tags
Sep 8, 2023
19eb157
Legacy block processor
hamdiallam Sep 1, 2023
b98ba6e
improve logging
hamdiallam Sep 9, 2023
62db2c0
use the right ctc goerli contract
hamdiallam Sep 10, 2023
0b34570
ci fixes
hamdiallam Sep 10, 2023
3c97d6d
contracts-bedrock: use create2 to deploy implementations
tynes Sep 10, 2023
483d83b
ctb: ensure create2 deployer is present
tynes Sep 10, 2023
8906387
ctb: fix build
tynes Sep 10, 2023
4c9b331
devnet: refactor
tynes Sep 10, 2023
2df86f3
contracts-bedrock: lint
tynes Sep 10, 2023
40a0a24
rename some files. comments
hamdiallam Sep 11, 2023
d625e22
deps: use node lts
tynes Sep 11, 2023
85d1622
chore: add changeset
tynes Sep 11, 2023
cb20306
Update ops/docker/Dockerfile.packages
tynes Sep 11, 2023
51a287b
comments. compute withdrawal hash from the message passer contract fo…
hamdiallam Sep 11, 2023
7a4a472
Merge branch 'develop' into deps/node-lts
mergify[bot] Sep 11, 2023
bc602c0
Merge pull request #7178 from ethereum-optimism/deps/node-lts
OptimismBot Sep 11, 2023
e8671bb
Merge branch 'develop' into ctb/create2-deploy
mergify[bot] Sep 11, 2023
536a00a
nit
hamdiallam Sep 11, 2023
1b31642
fix config unit test
hamdiallam Sep 11, 2023
1ce1657
Merge pull request #7164 from ethereum-optimism/ctb/create2-deploy
OptimismBot Sep 11, 2023
1adbe46
Merge branch 'develop' into indexer.legacy.blocks
mergify[bot] Sep 11, 2023
467e6f8
Merge pull request #7119 from ethereum-optimism/indexer.legacy.blocks
OptimismBot Sep 11, 2023
5e2124d
specs: Honest Challenger specs
Inphi Sep 11, 2023
db757cd
build(deps-dev): bump markdownlint from 0.30.0 to 0.31.0
dependabot[bot] Sep 11, 2023
a895886
couple fixes
Inphi Sep 11, 2023
716f81a
Merge pull request #7189 from ethereum-optimism/dependabot/npm_and_ya…
OptimismBot Sep 11, 2023
1c70547
build(deps-dev): bump @typescript-eslint/eslint-plugin
dependabot[bot] Sep 11, 2023
e7d6b16
contracts-bedrock: migrate to ISemver
tynes Sep 10, 2023
3814ac9
contracts-bedrock: semver lock
tynes Sep 11, 2023
daef6a5
op-bindings: fix weth9
tynes Sep 11, 2023
3901433
contracts-bedrock: fix semver
tynes Sep 11, 2023
2c4713f
op-bindings: regenerate
tynes Sep 11, 2023
a3d1ab3
lint: fix
tynes Sep 11, 2023
3682f04
Merge pull request #7165 from ethereum-optimism/ctb/isemver
tynes Sep 11, 2023
143e8ff
fix challenger logic
Inphi Sep 11, 2023
8324625
update toc
Inphi Sep 12, 2023
ed20cfc
specs: Remove l2oo v2 proposal
ajsutton Sep 12, 2023
ce0a86b
op-challenger: Include pre-built cannon in the op-challenger docker file
ajsutton Sep 12, 2023
a655e89
Merge pull request #7197 from ethereum-optimism/aj/remove-l2oo2
OptimismBot Sep 12, 2023
0c1fc3b
Merge remote-tracking branch 'origin/develop' into aj/build-cannon
ajsutton Sep 12, 2023
5053698
Merge pull request #7198 from ethereum-optimism/aj/build-cannon
OptimismBot Sep 12, 2023
058b121
op-challenger: Use helper to define the expected responses.
ajsutton Sep 12, 2023
64a91e6
op-challenger: Define basic validation rules for all honest actions.
ajsutton Sep 12, 2023
486c7bb
cannon: Use atomic write pattern to avoid leaving partially written f…
ajsutton Sep 12, 2023
a6ef1ca
Merge branch 'develop' into dependabot/npm_and_yarn/typescript-eslint…
mergify[bot] Sep 12, 2023
f34bf70
Merge pull request #7196 from ethereum-optimism/dependabot/npm_and_ya…
OptimismBot Sep 12, 2023
c913695
REmove repeats
roninjin10 Sep 12, 2023
fc59c00
contracts-bedrock: migrate L2 contracts to `ISemver`
tynes Sep 12, 2023
96b5823
Merge branch 'develop' into feat/l2-contracts-isemver
mergify[bot] Sep 12, 2023
daf9920
Merge pull request #7202 from ethereum-optimism/feat/l2-contracts-ise…
OptimismBot Sep 12, 2023
4b2ba19
remove L2OutputOracle interaction
Inphi Sep 12, 2023
c681114
Merge branch 'develop' into aj/cannon-atomic-write
mergify[bot] Sep 12, 2023
4a397c5
Add PreimageOracle section to fdg specs
Inphi Sep 12, 2023
3f72bc9
update toc
Inphi Sep 12, 2023
c1cbace
Merge pull request #7201 from ethereum-optimism/aj/cannon-atomic-write
OptimismBot Sep 12, 2023
202c322
remove nit
Inphi Sep 12, 2023
d6fce37
Merge branch 'develop' into 09-08-fix_Remove_fault_detector_from_vers…
mergify[bot] Sep 12, 2023
d069786
Revert "cannon: Use atomic write pattern to avoid leaving partially w…
trianglesphere Sep 12, 2023
f2fec93
list out all contracts of interest for both l1/l2
hamdiallam Sep 12, 2023
bb97cc5
Merge pull request #7205 from ethereum-optimism/revert-7201-aj/cannon…
OptimismBot Sep 12, 2023
b90a4b4
Add op-challenger to the tagging service
trianglesphere Sep 12, 2023
e876826
fix etl test
hamdiallam Sep 12, 2023
424c580
ci: Run e2e tests when cannon changes
ajsutton Sep 12, 2023
44c9b68
missed config_test & etl test
hamdiallam Sep 12, 2023
c351000
build(deps-dev): bump typedoc from 0.24.8 to 0.25.1
dependabot[bot] Sep 12, 2023
493c883
Merge pull request #7204 from ethereum-optimism/jg/tag_service_op_cha…
sebastianst Sep 12, 2023
d21983d
Merge branch 'develop' into aj/cannon-e2e-dep
mergify[bot] Sep 12, 2023
e5e7205
feat: Add decimals to tokenFactory
Aug 9, 2023
878dbf1
reset gas snapshot
hamdiallam Sep 12, 2023
1f4eddf
Merge pull request #7207 from ethereum-optimism/aj/cannon-e2e-dep
OptimismBot Sep 12, 2023
e2f5651
redo gas-snapshot for just factory legacyerc20eth
hamdiallam Sep 12, 2023
bbe9944
relax specified ordering of responses
Inphi Sep 12, 2023
cbff704
Merge branch 'develop' into 08-09-feat_Add_decimals_to_tokenFactory
mergify[bot] Sep 12, 2023
e4d687c
Merge pull request #7182 from ethereum-optimism/08-09-feat_Add_decima…
OptimismBot Sep 12, 2023
96b5d68
Merge branch 'develop' into aj/solver-tests
mergify[bot] Sep 12, 2023
75bef5b
op-challenger: Add rule to prevent defending the root claim.
ajsutton Sep 12, 2023
214e0d8
Merge branch 'develop' into 09-08-fix_Remove_fault_detector_from_vers…
trianglesphere Sep 12, 2023
956cf18
cannon: Use atomic write pattern to avoid leaving partially written f…
ajsutton Sep 12, 2023
7c9c00c
Merge pull request #7199 from ethereum-optimism/aj/solver-tests
OptimismBot Sep 12, 2023
edea36a
Merge branch 'develop' into 09-08-fix_Remove_fault_detector_from_vers…
mergify[bot] Sep 12, 2023
f8c704d
Merge pull request #7154 from ethereum-optimism/09-08-fix_Remove_faul…
OptimismBot Sep 12, 2023
eabf282
Merge branch 'develop' into aj/action-rules
mergify[bot] Sep 12, 2023
cd59d5e
Merge pull request #7200 from ethereum-optimism/aj/action-rules
OptimismBot Sep 12, 2023
c2b14cf
Merge branch 'develop' into inphi/honest-chal
mergify[bot] Sep 13, 2023
eef2af0
op-challenger: Include note in docs that the root claim must start wi…
ajsutton Sep 13, 2023
174bfbd
Merge pull request #7184 from ethereum-optimism/inphi/honest-chal
OptimismBot Sep 13, 2023
12dd92c
op-challenger: Add unit test for the poisoned pre-state case
ajsutton Sep 13, 2023
980064a
op-challenger: Fix recording of cannon execution time.
ajsutton Sep 13, 2023
2a1b398
op-challenger: Use claim with no pre-image. Improve logging.
ajsutton Sep 13, 2023
907f223
build(deps): bump docker/login-action from 1 to 3
dependabot[bot] Sep 13, 2023
6fd2a24
build(deps): bump ethereum/client-go in /ops-bedrock
dependabot[bot] Sep 13, 2023
833e727
specs: update build-tag format and specify ProtocolVersions contract …
protolambda Sep 13, 2023
05d2352
Merge branch 'develop' into aj/cannon-atomic-write
mergify[bot] Sep 13, 2023
07aa6ec
Merge pull request #7216 from ethereum-optimism/aj/cannon-atomic-write
OptimismBot Sep 13, 2023
4f56025
Merge branch 'develop' into dependabot/docker/ops-bedrock/ethereum/cl…
mergify[bot] Sep 13, 2023
d5bc25d
Merge pull request #7225 from ethereum-optimism/dependabot/docker/ops…
OptimismBot Sep 13, 2023
f185eeb
Merge branch 'develop' into aj/poisoned-state-test
mergify[bot] Sep 13, 2023
82756f9
Merge pull request #7219 from ethereum-optimism/aj/poisoned-state-test
OptimismBot Sep 13, 2023
9c84289
Merge branch 'develop' into dependabot/github_actions/docker/login-ac…
mergify[bot] Sep 13, 2023
1febf8a
contracts-bedrock: ProtocolVersions contract
protolambda Sep 13, 2023
a9599b0
op-node: protocol versions signal handling
protolambda Sep 13, 2023
0ea82c3
Merge pull request #7222 from ethereum-optimism/dependabot/github_act…
OptimismBot Sep 13, 2023
8fe4fc8
Merge branch 'develop' into dependabot/npm_and_yarn/typedoc-0.25.1
mergify[bot] Sep 13, 2023
3a4491a
feat(op-challenger): Last Step Disk Cache Store (#7183)
refcell Sep 13, 2023
85a7a62
build(deps-dev): bump doctoc from 2.2.0 to 2.2.1 (#7211)
dependabot[bot] Sep 13, 2023
fc799df
Merge branch 'develop' into dependabot/npm_and_yarn/typedoc-0.25.1
mergify[bot] Sep 13, 2023
0795736
Merge pull request #7208 from ethereum-optimism/dependabot/npm_and_ya…
OptimismBot Sep 13, 2023
2b615f8
Merge branch 'develop' into superchain-upgrades
mergify[bot] Sep 13, 2023
dd59c06
Merge pull request #6388 from ethereum-optimism/superchain-upgrades
OptimismBot Sep 13, 2023
47b4ef9
Merge branch 'develop' into aj/invalid-byte
mergify[bot] Sep 13, 2023
df83d8f
Merge pull request #7218 from ethereum-optimism/aj/invalid-byte
OptimismBot Sep 13, 2023
12e385f
Merge branch 'develop' into aj/fix-cannon-execution-metric
mergify[bot] Sep 13, 2023
2666632
Merge pull request #7220 from ethereum-optimism/aj/fix-cannon-executi…
OptimismBot Sep 13, 2023
db7aa07
triple check everything
hamdiallam Sep 13, 2023
79e470f
Merge branch 'develop' into indexer.contracts
mergify[bot] Sep 13, 2023
75b4f1e
Merge pull request #7206 from ethereum-optimism/indexer.contracts
OptimismBot Sep 13, 2023
f63590d
build(deps-dev): bump @types/node from 20.5.0 to 20.6.0
dependabot[bot] Sep 13, 2023
c2719c6
build(deps-dev): bump eslint from 8.47.0 to 8.49.0
dependabot[bot] Sep 13, 2023
d818998
build(deps-dev): bump depcheck from 1.4.3 to 1.4.6
dependabot[bot] Sep 13, 2023
1b934e0
op-challenger: Include number of claims when listing games
ajsutton Sep 13, 2023
4615e6d
Merge pull request #7235 from ethereum-optimism/dependabot/npm_and_ya…
OptimismBot Sep 13, 2023
ca22b0c
Merge branch 'develop' into dependabot/npm_and_yarn/eslint-8.49.0
mergify[bot] Sep 13, 2023
fd799db
remove checkpoint schemas
hamdiallam Sep 13, 2023
8a228a6
Merge pull request #7233 from ethereum-optimism/dependabot/npm_and_ya…
OptimismBot Sep 13, 2023
25dcaf5
Merge branch 'develop' into dependabot/npm_and_yarn/types/node-20.6.0
mergify[bot] Sep 13, 2023
881ec4f
build(deps-dev): bump glob from 10.3.3 to 10.3.4
dependabot[bot] Sep 13, 2023
1cdd8c1
Merge pull request #7231 from ethereum-optimism/dependabot/npm_and_ya…
OptimismBot Sep 13, 2023
3635e44
Merge branch 'develop' into dependabot/npm_and_yarn/glob-10.3.4
mergify[bot] Sep 13, 2023
f1c0e0a
Merge pull request #7230 from ethereum-optimism/dependabot/npm_and_ya…
OptimismBot Sep 13, 2023
53006e4
build(deps-dev): bump eslint from 8.47.0 to 8.49.0
dependabot[bot] Sep 13, 2023
793b15b
build(deps-dev): bump @types/node from 20.5.0 to 20.6.0
dependabot[bot] Sep 13, 2023
8eb43f6
Cleans up the local devnetL1 deploy config for the devnet
refcell Sep 13, 2023
eb09231
cannon: Support compressed base64 pages in state.json
trianglesphere Sep 13, 2023
4754152
Use sync.Pool for zlib Writers
trianglesphere Sep 13, 2023
c35fc66
Test DetectEncoding
trianglesphere Sep 13, 2023
0c7b556
Return errors to make lint happy
trianglesphere Sep 13, 2023
f1b78a4
Merge branch 'develop' into indexer.checkpoints
mergify[bot] Sep 13, 2023
f24c7dc
Nosemgrep on Marshalling of a pointer type
trianglesphere Sep 13, 2023
402a471
Merge pull request #7237 from ethereum-optimism/indexer.checkpoints
OptimismBot Sep 13, 2023
ffc13a2
Merge branch 'develop' into aj/list-games-with-claims
mergify[bot] Sep 13, 2023
f8dcb4b
Merge pull request #7236 from ethereum-optimism/aj/list-games-with-cl…
OptimismBot Sep 13, 2023
d678169
Remove MarshalText
trianglesphere Sep 14, 2023
689a60d
Remove auto-detect & only use base64
trianglesphere Sep 14, 2023
3791b00
Merge branch 'develop' into jg/profile_cannon
mergify[bot] Sep 14, 2023
5a810b8
Merge pull request #7242 from ethereum-optimism/jg/profile_cannon
OptimismBot Sep 14, 2023
c00f08c
feat: adds sepolia and op sepolia
nitaliano Sep 14, 2023
352f7dd
:sparkles: feat(indexer): Add blockhash to bridgeview
Sep 13, 2023
1985f52
typo
roninjin10 Sep 14, 2023
acde10d
Merge pull request #7229 from ethereum-optimism/09-13-feat_indexer_Ad…
OptimismBot Sep 14, 2023
c81da8f
:construction: feat(indexer): Implement hardcoded tx
Sep 13, 2023
dcde214
Merge pull request #7228 from ethereum-optimism/09-13-feat_indexer_Im…
OptimismBot Sep 14, 2023
7ff952c
feat(indexer): Publish typescript types for api
Sep 13, 2023
48cb108
Merge pull request #7238 from ethereum-optimism/09-13-feat_indexer_Pu…
OptimismBot Sep 14, 2023
2cb6db5
Merge branch 'develop' into refcell/makefile-updates
mergify[bot] Sep 14, 2023
b933006
Merge pull request #7241 from ethereum-optimism/refcell/makefile-updates
OptimismBot Sep 14, 2023
8258a7b
chore(indexer): Add ci check for generated types
Sep 14, 2023
8748049
Merge branch 'develop' into nick/sdk-sepolia-support
mergify[bot] Sep 14, 2023
6792077
add changeset
nitaliano Sep 14, 2023
2440f5e
bumps @eth-optimism/contracts-bedrock
nitaliano Sep 14, 2023
8d752a5
Merge branch 'develop' into dependabot/npm_and_yarn/eslint-8.49.0
mergify[bot] Sep 14, 2023
88295e7
Merge pull request #7239 from ethereum-optimism/dependabot/npm_and_ya…
OptimismBot Sep 14, 2023
2dc8ac0
Merge branch 'develop' into dependabot/npm_and_yarn/types/node-20.6.0
mergify[bot] Sep 14, 2023
097c4f3
txmgr: Do not update nonce on failed gas estimate
Inphi Sep 14, 2023
212fa01
Merge pull request #7240 from ethereum-optimism/dependabot/npm_and_ya…
OptimismBot Sep 14, 2023
8bcc9cc
Merge branch 'develop' into 09-13-chore_indexer_Add_ci_check_for_gene…
mergify[bot] Sep 14, 2023
5c02fcc
build(deps): bump chai and @types/chai
dependabot[bot] Sep 14, 2023
f4f317d
build(deps-dev): bump @typescript-eslint/parser from 5.60.1 to 6.7.0
dependabot[bot] Sep 14, 2023
33af1ba
Merge pull request #7245 from ethereum-optimism/09-13-chore_indexer_A…
OptimismBot Sep 14, 2023
10c6748
Merge branch 'develop' into nick/sdk-sepolia-support
mergify[bot] Sep 14, 2023
9758d09
Merge pull request #7244 from ethereum-optimism/nick/sdk-sepolia-support
OptimismBot Sep 14, 2023
366eb72
Merge branch 'develop' into inphi/txmgr-nonce
mergify[bot] Sep 14, 2023
6c69786
op-e2e: change geth options init to use append
protolambda Sep 14, 2023
5f5d2fd
op-e2e: fix outdated TestRequiredProtocolVersionChangeAndHalt config …
protolambda Sep 14, 2023
3268e32
Merge pull request #7250 from ethereum-optimism/inphi/txmgr-nonce
OptimismBot Sep 14, 2023
4fe1dc3
Merge branch 'develop' into dependabot/npm_and_yarn/chai-and-types/ch…
mergify[bot] Sep 14, 2023
67943e6
Merge pull request #7232 from ethereum-optimism/dependabot/npm_and_ya…
OptimismBot Sep 14, 2023
9d772ef
Merge branch 'develop' into dependabot/npm_and_yarn/typescript-eslint…
mergify[bot] Sep 14, 2023
c235203
op-node: protocol versions review suggestions
protolambda Sep 14, 2023
cf1f0b1
Merge pull request #7212 from ethereum-optimism/dependabot/npm_and_ya…
OptimismBot Sep 14, 2023
fc87cd1
contracts-bedrock: ProtocolVersions test remove commented line
protolambda Sep 14, 2023
475f666
go.mod: update to latest op-geth, with protocol-versions typing support
protolambda Sep 14, 2023
6b9523c
Revert "chore(indexer): Add ci check for generated types"
trianglesphere Sep 14, 2023
27dbdcb
op-challenger: Fix recording of last step index.
ajsutton Sep 15, 2023
25ae152
fix(indexer): Fix tygo check in ci
Sep 15, 2023
8201484
op-challenger: Add e2e test for the poisoned post-state case.
ajsutton Sep 15, 2023
119b331
Merge pull request #7258 from ethereum-optimism/aj/poisoned-state-e2e
OptimismBot Sep 15, 2023
666d0fd
Port monitoring to resubscriptions.
refcell Aug 31, 2023
706fdc5
Remove unneeded dial changes
refcell Sep 13, 2023
612fa9c
Split out makefile changes
refcell Sep 13, 2023
ba9629c
Remove re-exported rpc
refcell Sep 14, 2023
2ebc5d8
Refactors
refcell Sep 14, 2023
b752b9e
Fixes
refcell Sep 14, 2023
9f1aacc
Adds a default config test for the poll interval
refcell Sep 14, 2023
ea82c69
fix dialing
refcell Sep 15, 2023
80fdee6
Merge pull request #7073 from ethereum-optimism/refcell/redo-subscrip…
OptimismBot Sep 15, 2023
ea12a7a
Merge branch 'develop' into aj/fix-last-step
mergify[bot] Sep 15, 2023
b3c77b0
Merge pull request #7255 from ethereum-optimism/aj/fix-last-step
OptimismBot Sep 15, 2023
cb4017b
Merge branch 'develop' into 09-14-fix_indexer_Fix_tygo_check_in_ci
mergify[bot] Sep 15, 2023
11ee8e0
Merge pull request #7256 from ethereum-optimism/09-14-fix_indexer_Fix…
OptimismBot Sep 15, 2023
0bf53e7
contracts-bedrock: fix implementation salt (#7263)
tynes Sep 15, 2023
1ee7e17
Cancel any inflight block building when stopping the sequencer, to av…
kahuang Sep 13, 2023
befcaad
Merge branch 'develop' into protocol-versions-contract
mergify[bot] Sep 15, 2023
31e11fe
Merge pull request #7226 from ethereum-optimism/protocol-versions-con…
OptimismBot Sep 15, 2023
3f2d781
Merge branch 'develop' into stop_sequencer_fix
mergify[bot] Sep 15, 2023
1c4599c
Merge pull request #7227 from ethereum-optimism/op-node-protocol-vers…
mslipper Sep 15, 2023
1dbcca5
Merge branch 'develop' into stop_sequencer_fix
mergify[bot] Sep 15, 2023
d2ce890
Merge pull request #7243 from kahuang/stop_sequencer_fix
OptimismBot Sep 15, 2023
4f62b1b
Merge remote-tracking branch 'origin/develop' into jyellick/merge-ups…
jyellick Sep 18, 2023
1cf4d21
Fix pnpm-lockfile
jyellick Sep 18, 2023
4d1570b
Update boba-bindings
jyellick Sep 18, 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
contracts-bedrock: fix implementation salt (ethereum-optimism#7263)
Updates the implementation salt. Without this change, the
deployments fail on Goerli. They work on the devnet so something
must be different between the devnet and the live network.
This change will ensure that there is less config to manage
in the superchain registry by having a canonical address for
each semver version.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
tynes and mergify[bot] authored Sep 15, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 0bf53e73b3dc50b057c2187905366e136143e340
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/scripts/Deploy.s.sol
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ contract Deploy is Deployer {
/// @notice The create2 salt used for deployment of the contract implementations.
/// Using this helps to reduce config across networks as the implementation
/// addresses will be the same across networks when deployed with create2.
bytes32 constant IMPL_SALT = bytes32("ether's phoenix");
bytes32 constant IMPL_SALT = keccak256(bytes("ether's phoenix"));

/// @notice The name of the script, used to ensure the right deploy artifacts
/// are used.