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

OPSM: Begin implementing OP Stack Manager code and it's deployment #11623

Merged
merged 32 commits into from
Sep 10, 2024
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
80711d3
begin supporting specifying versions in OPSM
mds1 Aug 26, 2024
e596583
add deploy logic
mds1 Aug 27, 2024
9ae8ac9
deploy OPSM along with implementations
mds1 Aug 27, 2024
b69c5c2
scaffold opsm interface between scripts
mds1 Aug 27, 2024
e667133
fixes
mds1 Aug 28, 2024
a2ef733
mvp of DeployOPChain
mds1 Aug 28, 2024
dc5168c
start working on an e2e opsm test, currently reverts
mds1 Aug 28, 2024
71b3664
fix tests
mds1 Aug 29, 2024
6d498d9
test cleanup
mds1 Aug 29, 2024
412e23c
rename opsmSingleton to opsm
mds1 Aug 29, 2024
f22e7d2
chore: remove unused imports
mds1 Aug 29, 2024
df20391
refactor: switch from 'new' to blueprints, 50% code size reduction
mds1 Aug 30, 2024
ac019a9
Merge branch 'develop' into opsm/deploy-op-chain
mds1 Aug 30, 2024
5480466
fix semgrep
mds1 Aug 30, 2024
60c9dc7
feat: add OPSM interop tests
mds1 Aug 30, 2024
b58a270
test: add missing specs
mds1 Aug 30, 2024
f3f15d3
Merge branch 'develop' into opsm/deploy-op-chain
mds1 Sep 3, 2024
1a4f8bf
add DisputeGameFactory deployment
mds1 Sep 3, 2024
22c637e
chore: update snapshots
mds1 Sep 3, 2024
76ade4d
Merge branch 'develop' into opsm/deploy-op-chain
mds1 Sep 6, 2024
9ccf7d8
fix opsm interop support
mds1 Sep 6, 2024
c89123a
Merge branch 'develop' into opsm/deploy-op-chain
mds1 Sep 9, 2024
8a2904f
chore: update snapshots
mds1 Sep 9, 2024
e727817
Update packages/contracts-bedrock/test/DeployOPChain.t.sol
mds1 Sep 9, 2024
8676abb
fix: add L1StandardBridge setter and initialization
mds1 Sep 9, 2024
0c40a9e
chore: small clarification of deploy flow
mds1 Sep 9, 2024
fcebe36
Update packages/contracts-bedrock/scripts/DeployImplementations.s.sol
mds1 Sep 10, 2024
0c1b274
chore: add todos
mds1 Sep 10, 2024
4717a7c
fix: change bytes32 to string
mds1 Sep 10, 2024
447504c
rename addrs to opChainAddrs for clarity
mds1 Sep 10, 2024
8e6e323
test: fix assertion string numbering
mds1 Sep 10, 2024
499758a
chore: update semver lock:
mds1 Sep 10, 2024
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
Merge branch 'develop' into opsm/deploy-op-chain
mds1 committed Sep 6, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 76ade4d91044368cbb91e7f00a1add18bb9ed43c
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/semver-lock.json
Original file line number Diff line number Diff line change
@@ -32,8 +32,8 @@
"sourceCodeHash": "0xf0c0655221c36cfe918818ca300cca74a3713be3da090b2072eb81ba29c59e38"
},
"src/L1/OPStackManager.sol": {
"initCodeHash": "0x8d17e0cd18e2006c3e714b20ff08e498ac98bcfeabf99615197a26ffb608cc71",
"sourceCodeHash": "0xe429882ca490cd51591ff22b94ec4b0c5e94a0dbd4be252a795fa378918fd01a"
"initCodeHash": "0x2fbc6b9594fd978744eace813d79ececcd56bd3f4c78de2a9968110bc0977e43",
"sourceCodeHash": "0xc44b05eca0327dcec9ec2606a7df1e1dd4d5953a9790b6a34b0efa258e040f10"
},
"src/L1/OptimismPortal.sol": {
"initCodeHash": "0x6bf59539298b20221de6c51db21016be8d3278bdbe0be1cdd49638dc828e003e",
6 changes: 3 additions & 3 deletions packages/contracts-bedrock/src/L1/OPStackManager.sol
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ import { L1ERC721Bridge } from "src/L1/L1ERC721Bridge.sol";
import { L1StandardBridge } from "src/L1/L1StandardBridge.sol";
import { OptimismMintableERC20Factory } from "src/universal/OptimismMintableERC20Factory.sol";

/// @custom:proxied TODO this is not proxied yet.
/// @custom:proxied true
contract OPStackManager is ISemver {
// -------- Structs --------

@@ -99,8 +99,8 @@ contract OPStackManager is ISemver {

// -------- Constants and Variables --------

/// @custom:semver 1.0.0-beta.2
string public constant version = "1.0.0-beta.2";
/// @custom:semver 1.0.0-beta.3
string public constant version = "1.0.0-beta.3";

/// @notice Address of the SuperchainConfig contract shared by all chains.
SuperchainConfig public immutable superchainConfig;
You are viewing a condensed version of this merge commit. You can view the full changes here.