Merge pull request #177 from ethereum-optimism/harry/update_to_latest…

…_develop feat: updates supersim genesis to use latest
ethereum-optimism · Sep 26, 2024 · bd741f1 · bd741f1
2 parents 71d039e + 55ef574
commit bd741f1
Show file tree

Hide file tree

Showing 36 changed files with 1,379 additions and 1,358 deletions.
diff --git a/Justfile b/Justfile
@@ -28,7 +28,7 @@ checkout-optimism-monorepo:
     cd lib/optimism && \
     git init && \
     git remote add origin https://github.com/ethereum-optimism/optimism.git && \
-    git fetch --depth=1 origin f70248a0ace5375d578e99697df7a5a1bd2d20ee && \
+    git fetch --depth=1 origin 3210a8c6bb7f98639213fb49718919d84aa8774a && \
     git reset --hard FETCH_HEAD && \
     git submodule update --init --recursive && \
     make cannon-prestate

diff --git a/bindings/l2tol2crossdomainmessenger.go b/bindings/l2tol2crossdomainmessenger.go
diff --git a/contracts/lib/forge-std b/contracts/lib/forge-std
diff --git a/contracts/lib/optimism b/contracts/lib/optimism
diff --git a/genesis/generated/addresses/901-addresses.json b/genesis/generated/addresses/901-addresses.json
@@ -1,37 +1,41 @@
 {
   "AddressManager": "0x78d21C9820A9135215202A9a8D6521483D4b75cD",
-  "AnchorStateRegistry": "0xFC30B0BC22B92Aa63260Fad9E3F4e7551bfe9e72",
-  "AnchorStateRegistryProxy": "0x5bc635E96a0D2448B6f34B58386a820Cf58e17f4",
-  "DelayedWETH": "0xe49cED258137CC5E18fB9ABA2Aa14069263D8f49",
-  "DelayedWETHProxy": "0x309DA6B9a8fE16afD7D067528d358E55314bEa6b",
-  "DisputeGameFactory": "0x8efDa795511CBBdfFC9eeca1a5bF30f5B1E1ef9E",
-  "DisputeGameFactoryProxy": "0x444689B81D485bc58AB81aC02A95a937fAa152D7",
-  "L1CrossDomainMessenger": "0x357B6CdA94109749a0dA475ac1BFd395a61eb908",
-  "L1CrossDomainMessengerProxy": "0xe5bda89cd85cE0DfB80E053281cA070D65B738e6",
-  "L1ERC721Bridge": "0xA4BD7E58A30ED0477fe7372883d09bF86619Bb66",
-  "L1ERC721BridgeProxy": "0x018dC24a6617c47cAa00C3fA25097214B2D4F447",
-  "L1StandardBridge": "0x6cb2c88ABCd6391F9496f44BE27d5D3b247E0159",
-  "L1StandardBridgeProxy": "0xa01ae68902e205B420FD164435F299E07b0C778b",
-  "L2OutputOracle": "0x60d37db59d0D14f7EA5c7425A2C03244E08B162D",
-  "L2OutputOracleProxy": "0x6cE0530E823e23be85D8e151FB023605eB4F6d43",
-  "Mips": "0x180CBe2EBb9F37D3a3C542DDc2546Fd160555a73",
-  "OptimismMintableERC20Factory": "0x5Fd8a24Baf903207375ebb3A1d1AD288b73166FA",
-  "OptimismMintableERC20FactoryProxy": "0x15c855966C196Be3a8ca747E8A8Bf40928d4741f",
-  "OptimismPortal": "0xb5A42f01EF5068F82C11fa1c4F9bBD4c8D346961",
-  "OptimismPortal2": "0xDDc34F63041f5eD53385C8502D4c775Eae64aA21",
-  "OptimismPortalInterop": "0xDDc34F63041f5eD53385C8502D4c775Eae64aA21",
-  "OptimismPortalProxy": "0xF5fe61a258CeBb54CCe428F76cdeD04Cbc12F53d",
-  "PermissionedDelayedWETHProxy": "0xa6F40d5770b3509aB40B2effa5cb544D29743ec7",
+  "AnchorStateRegistry": "0x985E6cC472bBF7d9344096834049964378cbae90",
+  "AnchorStateRegistryProxy": "0x0d4F30467d5F10c6B8D3B3cfB8f6DE07713EcaF2",
+  "DelayedWETH": "0x86514f7Febf0867C577973f4737800CF694763D3",
+  "DelayedWETHProxy": "0xCa46682C4b9cc6BE8BBdB6C205048b8355ef1F3F",
+  "DisputeGameFactory": "0x6fF73Be43cBd49d259B8E46Af90F115D59Ae235e",
+  "DisputeGameFactoryProxy": "0x7202b6739c8c4Ee4860A033a87cC9C690f2C0317",
+  "FaultDisputeGame_0": "0x0DA4EE802c501d02fA2E2e2B420065e22C49F18E",
+  "FaultDisputeGame_254": "0x3DB7a45ccC4c3b6fC8B6499Ce363eA765cF71159",
+  "FaultDisputeGame_255": "0x7aeDFEFB081BC8edAA9d58aF9e7B2536280e5A66",
+  "L1CrossDomainMessenger": "0x8a1cA67f94F3Eb5FC777E7D50a29D714f1a2Feee",
+  "L1CrossDomainMessengerProxy": "0x58a8B1eac6c632d593e36607041853396a1E85A7",
+  "L1ERC721Bridge": "0xbE7ffb69b32E80F1C94cC844BC6e03f025Ebd163",
+  "L1ERC721BridgeProxy": "0x19D454d0e1A880b0D97E0edd9358fa75639953a5",
+  "L1StandardBridge": "0x9b36713aFbD9244962f81d285Bb9587461627078",
+  "L1StandardBridgeProxy": "0xfC45b21218E73B4FE9E533c749799ac0AcdCD640",
+  "L2OutputOracle": "0x7574818DC49fb3B44EB37051E8305a7a089bb697",
+  "L2OutputOracleProxy": "0x730b2942B2462309eEf4A2a43c6b7fF56B74B100",
+  "Mips": "0x508d35F85336033007F5f6FfD7d78c39837921a2",
+  "OptimismMintableERC20Factory": "0xA582d5201efE8Ee6D823725158b1efC18c842540",
+  "OptimismMintableERC20FactoryProxy": "0x6d253eA01348d6096176e6348EF9B11EC4ff5909",
+  "OptimismPortal": "0x65dF26Af7b35Ef30495426B9D302c25D9e097C34",
+  "OptimismPortal2": "0x29499643d1C0ef76da2738d84715593cd77D6B0d",
+  "OptimismPortalInterop": "0x29499643d1C0ef76da2738d84715593cd77D6B0d",
+  "OptimismPortalProxy": "0x8A18C23041ddA499e5e25B287FfE08D34A63cd2D",
+  "PermissionedDelayedWETHProxy": "0xCCeC86ad17479c56A90cf83c535afFC6C5652ba1",
+  "PermissionedDisputeGame": "0x39bcC83cc764E25c64eC6449Ba4f5fa6887DC1a6",
   "PreimageOracle": "0x7A9Eab4CE99d157AeE7A02E95b366E972a2D5b0b",
-  "ProtocolVersions": "0xa99F1ab91821747b76Ec0cDFA38368DF4Ba06E84",
-  "ProtocolVersionsProxy": "0x6dA4f6489039d9f4F3144954DDF5bb2F4986e90b",
+  "ProtocolVersions": "0xaC2bA9d94fF2C2d0a011Be2d1Aed9B84D1B7AF02",
+  "ProtocolVersionsProxy": "0x8d58B2D452EA30aFE6493FD4741C9f0a99Db0ffb",
   "ProxyAdmin": "0xe32a4D31ffD5596542DAc8239a1DE3Fff9d63475",
   "SafeProxyFactory": "0x4a05c09875DE2DD5B81Bc01dd46eD4699b181bfA",
   "SafeSingleton": "0x99A395CE6d6b37CaaCBad64fB42d556b6CA73a48",
-  "SuperchainConfig": "0xDAf629c26abd7a84B6330c369887053B75dB2AF2",
+  "SuperchainConfig": "0x93217796BF6b295C42C261a9B87b43714eCEd856",
   "SuperchainConfigProxy": "0x7E6c6ebCF109fa23277b86bdA39738035C21BB86",
-  "SystemConfig": "0x08B1574d825E2B715F48E9EA29491f3Ef96E9a5a",
-  "SystemConfigInterop": "0x08B1574d825E2B715F48E9EA29491f3Ef96E9a5a",
-  "SystemConfigProxy": "0xf32919Ed2490b56EaD65E72749894aE4C9523320",
+  "SystemConfig": "0xBaf6C3947F4E463CdB28bf6F74f304e4b60D077B",
+  "SystemConfigInterop": "0xBaf6C3947F4E463CdB28bf6F74f304e4b60D077B",
+  "SystemConfigProxy": "0xaF9Fd322D6D3F9C616791Bdaa99148769387cC24",
   "SystemOwnerSafe": "0xc052b7316C87390E555aF97D42bCd5FB6d5eEFDa"
 }