Skip to content

Commit

Permalink
update git module
Browse files Browse the repository at this point in the history
  • Loading branch information
@tremarkley
tremarkley committed Sep 13, 2024
1 parent c0bc907 commit 41f74bd
Show file tree
Hide file tree
Showing 37 changed files with 925 additions and 92,480 deletions.
2 changes: 1 addition & 1 deletion Justfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 5cdcfd46f0f309e9901dafd8f4c47357c8320c34 && \
git fetch --depth=1 origin f70248a0ace5375d578e99697df7a5a1bd2d20ee && \
git reset --hard FETCH_HEAD && \
git submodule update --init --recursive && \
make cannon-prestate
Expand Down
2 changes: 1 addition & 1 deletion bindings/superchainweth.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion contracts/lib/optimism
Submodule optimism updated 893 files
6 changes: 3 additions & 3 deletions contracts/src/L2NativeSuperchainERC20.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
pragma solidity 0.8.25;

import {ERC20} from "@solady/tokens/ERC20.sol";
import {IL2ToL2CrossDomainMessenger} from "@contracts-bedrock/L2/IL2ToL2CrossDomainMessenger.sol";
import {ISuperchainERC20Extensions} from "@contracts-bedrock/L2/ISuperchainERC20.sol";
import {ISemver} from "@contracts-bedrock/universal/ISemver.sol";
import {IL2ToL2CrossDomainMessenger} from "@contracts-bedrock/L2/interfaces/IL2ToL2CrossDomainMessenger.sol";
import {ISuperchainERC20Extensions} from "@contracts-bedrock/L2/interfaces/ISuperchainERC20.sol";
import {ISemver} from "@contracts-bedrock/universal/interfaces/ISemver.sol";
import {Predeploys} from "@contracts-bedrock/libraries/Predeploys.sol";

/// @notice Thrown when attempting to relay a message and the function caller (msg.sender) is not
Expand Down
4 changes: 2 additions & 2 deletions contracts/test/L2NativeSuperchainERC20.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import {
InvalidCrossDomainSender,
ZeroAddress
} from "src/L2NativeSuperchainERC20.sol";
import {IL2ToL2CrossDomainMessenger} from "@contracts-bedrock/L2/IL2ToL2CrossDomainMessenger.sol";
import {ISuperchainERC20, ISuperchainERC20Extensions} from "@contracts-bedrock/L2/ISuperchainERC20.sol";
import {IL2ToL2CrossDomainMessenger} from "@contracts-bedrock/L2/interfaces/IL2ToL2CrossDomainMessenger.sol";
import {ISuperchainERC20, ISuperchainERC20Extensions} from "@contracts-bedrock/L2/interfaces/ISuperchainERC20.sol";

contract L2NativeSuperchainERC20Test is Test {
address internal constant ZERO_ADDRESS = address(0);
Expand Down
8 changes: 4 additions & 4 deletions genesis/generated/addresses/901-addresses.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"L1StandardBridgeProxy": "0xa01ae68902e205B420FD164435F299E07b0C778b",
"L2OutputOracle": "0x60d37db59d0D14f7EA5c7425A2C03244E08B162D",
"L2OutputOracleProxy": "0x6cE0530E823e23be85D8e151FB023605eB4F6d43",
"Mips": "0x46cce16e68c41f7EBdf485EF825AB3b46143F738",
"OptimismMintableERC20Factory": "0x79c3114E5f89266e2C8842871Bce16D4e5076b1e",
"Mips": "0x180CBe2EBb9F37D3a3C542DDc2546Fd160555a73",
"OptimismMintableERC20Factory": "0x5Fd8a24Baf903207375ebb3A1d1AD288b73166FA",
"OptimismMintableERC20FactoryProxy": "0x15c855966C196Be3a8ca747E8A8Bf40928d4741f",
"OptimismPortal": "0xb5A42f01EF5068F82C11fa1c4F9bBD4c8D346961",
"OptimismPortal2": "0xDDc34F63041f5eD53385C8502D4c775Eae64aA21",
Expand All @@ -30,8 +30,8 @@
"SafeSingleton": "0x99A395CE6d6b37CaaCBad64fB42d556b6CA73a48",
"SuperchainConfig": "0xDAf629c26abd7a84B6330c369887053B75dB2AF2",
"SuperchainConfigProxy": "0x7E6c6ebCF109fa23277b86bdA39738035C21BB86",
"SystemConfig": "0x0DF1fCC0d668E713FDd82913b3BB75Fc7023A8f7",
"SystemConfigInterop": "0x0DF1fCC0d668E713FDd82913b3BB75Fc7023A8f7",
"SystemConfig": "0x08B1574d825E2B715F48E9EA29491f3Ef96E9a5a",
"SystemConfigInterop": "0x08B1574d825E2B715F48E9EA29491f3Ef96E9a5a",
"SystemConfigProxy": "0xf32919Ed2490b56EaD65E72749894aE4C9523320",
"SystemOwnerSafe": "0xc052b7316C87390E555aF97D42bCd5FB6d5eEFDa"
}
8 changes: 4 additions & 4 deletions genesis/generated/addresses/902-addresses.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"L1StandardBridgeProxy": "0x2D8543c236a4d626f54B51Fa8bc229a257C5143E",
"L2OutputOracle": "0x60d37db59d0D14f7EA5c7425A2C03244E08B162D",
"L2OutputOracleProxy": "0x006Af3fB62c4BE4fB0393995d364BbFe6b0F3CB2",
"Mips": "0x46cce16e68c41f7EBdf485EF825AB3b46143F738",
"OptimismMintableERC20Factory": "0x79c3114E5f89266e2C8842871Bce16D4e5076b1e",
"Mips": "0x180CBe2EBb9F37D3a3C542DDc2546Fd160555a73",
"OptimismMintableERC20Factory": "0x5Fd8a24Baf903207375ebb3A1d1AD288b73166FA",
"OptimismMintableERC20FactoryProxy": "0x1A2A942d891e525D1Ab192578a378980729fD585",
"OptimismPortal": "0xb5A42f01EF5068F82C11fa1c4F9bBD4c8D346961",
"OptimismPortal2": "0xDDc34F63041f5eD53385C8502D4c775Eae64aA21",
Expand All @@ -30,8 +30,8 @@
"SafeSingleton": "0xeeB44D84d505AbD958d032e90704c56443eB3ED0",
"SuperchainConfig": "0xDAf629c26abd7a84B6330c369887053B75dB2AF2",
"SuperchainConfigProxy": "0x2ED4AA34573c36bF3856e597501aEf9d9Dc1687C",
"SystemConfig": "0x0DF1fCC0d668E713FDd82913b3BB75Fc7023A8f7",
"SystemConfigInterop": "0x0DF1fCC0d668E713FDd82913b3BB75Fc7023A8f7",
"SystemConfig": "0x08B1574d825E2B715F48E9EA29491f3Ef96E9a5a",
"SystemConfigInterop": "0x08B1574d825E2B715F48E9EA29491f3Ef96E9a5a",
"SystemConfigProxy": "0x2Db03FE998D7c20E4B65afD1f50f04Ec4BfAb694",
"SystemOwnerSafe": "0xBF3830711B7c559042453B7546dB4736eFB4245e"
}
8 changes: 4 additions & 4 deletions genesis/generated/addresses/903-addresses.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"L1StandardBridgeProxy": "0x54E3D9561377B4f2b3fc8C9Ab9167486a89Ec181",
"L2OutputOracle": "0x60d37db59d0D14f7EA5c7425A2C03244E08B162D",
"L2OutputOracleProxy": "0xF5B8530D7eE044CCB28d729ABD048760341c4eF5",
"Mips": "0x46cce16e68c41f7EBdf485EF825AB3b46143F738",
"OptimismMintableERC20Factory": "0x79c3114E5f89266e2C8842871Bce16D4e5076b1e",
"Mips": "0x180CBe2EBb9F37D3a3C542DDc2546Fd160555a73",
"OptimismMintableERC20Factory": "0x5Fd8a24Baf903207375ebb3A1d1AD288b73166FA",
"OptimismMintableERC20FactoryProxy": "0xAf4907d160a6319304f0A4A0451dE3aBC4CF0834",
"OptimismPortal": "0xb5A42f01EF5068F82C11fa1c4F9bBD4c8D346961",
"OptimismPortal2": "0xDDc34F63041f5eD53385C8502D4c775Eae64aA21",
Expand All @@ -30,8 +30,8 @@
"SafeSingleton": "0x2a576c749867796A3E6fddb4E8E4f5C6aE1eEdA1",
"SuperchainConfig": "0xDAf629c26abd7a84B6330c369887053B75dB2AF2",
"SuperchainConfigProxy": "0x355833C6f781e3501407263cb4032E1BD0a41Cc8",
"SystemConfig": "0x0DF1fCC0d668E713FDd82913b3BB75Fc7023A8f7",
"SystemConfigInterop": "0x0DF1fCC0d668E713FDd82913b3BB75Fc7023A8f7",
"SystemConfig": "0x08B1574d825E2B715F48E9EA29491f3Ef96E9a5a",
"SystemConfigInterop": "0x08B1574d825E2B715F48E9EA29491f3Ef96E9a5a",
"SystemConfigProxy": "0xf06829165a51D0dC85Dae4C4ac4207Fee616Fa34",
"SystemOwnerSafe": "0x31D3465EC054Da11ca63C39e04cb1bf8Dd58bCA0"
}
8 changes: 4 additions & 4 deletions genesis/generated/addresses/904-addresses.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"L1StandardBridgeProxy": "0xBc3BDA1599a309aC3378917F94d8D8a9Cb5D050E",
"L2OutputOracle": "0x60d37db59d0D14f7EA5c7425A2C03244E08B162D",
"L2OutputOracleProxy": "0x831B71B86c7fB1De8D3C39D2A1d955381DBa135b",
"Mips": "0x46cce16e68c41f7EBdf485EF825AB3b46143F738",
"OptimismMintableERC20Factory": "0x79c3114E5f89266e2C8842871Bce16D4e5076b1e",
"Mips": "0x180CBe2EBb9F37D3a3C542DDc2546Fd160555a73",
"OptimismMintableERC20Factory": "0x5Fd8a24Baf903207375ebb3A1d1AD288b73166FA",
"OptimismMintableERC20FactoryProxy": "0xBFB329F2a8f39683e54a44675ce5f6d22D1b1dAf",
"OptimismPortal": "0xb5A42f01EF5068F82C11fa1c4F9bBD4c8D346961",
"OptimismPortal2": "0xDDc34F63041f5eD53385C8502D4c775Eae64aA21",
Expand All @@ -30,8 +30,8 @@
"SafeSingleton": "0xAD3d33F8cB2fA116C2F006e9149Ed47823092360",
"SuperchainConfig": "0xDAf629c26abd7a84B6330c369887053B75dB2AF2",
"SuperchainConfigProxy": "0x8044331e5C4e6ECb5c6a7D0B57e5aEba84621c1a",
"SystemConfig": "0x0DF1fCC0d668E713FDd82913b3BB75Fc7023A8f7",
"SystemConfigInterop": "0x0DF1fCC0d668E713FDd82913b3BB75Fc7023A8f7",
"SystemConfig": "0x08B1574d825E2B715F48E9EA29491f3Ef96E9a5a",
"SystemConfigInterop": "0x08B1574d825E2B715F48E9EA29491f3Ef96E9a5a",
"SystemConfigProxy": "0x745ba7140D8ddd4af17bC6EAC59b7142F5EdE1df",
"SystemOwnerSafe": "0x5F3823a83C67025D292a89dC9BD85DdAaD302A4f"
}
8 changes: 4 additions & 4 deletions genesis/generated/addresses/905-addresses.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"L1StandardBridgeProxy": "0x2B3D9C66A422eb02Af0e106bbA9B783E00591eAa",
"L2OutputOracle": "0x60d37db59d0D14f7EA5c7425A2C03244E08B162D",
"L2OutputOracleProxy": "0x16C4785E62669f730266b7D96C86E721996cD79B",
"Mips": "0x46cce16e68c41f7EBdf485EF825AB3b46143F738",
"OptimismMintableERC20Factory": "0x79c3114E5f89266e2C8842871Bce16D4e5076b1e",
"Mips": "0x180CBe2EBb9F37D3a3C542DDc2546Fd160555a73",
"OptimismMintableERC20Factory": "0x5Fd8a24Baf903207375ebb3A1d1AD288b73166FA",
"OptimismMintableERC20FactoryProxy": "0x518B80c45A114BD25a1B03e0C99B91876eFB4f94",
"OptimismPortal": "0xb5A42f01EF5068F82C11fa1c4F9bBD4c8D346961",
"OptimismPortal2": "0xDDc34F63041f5eD53385C8502D4c775Eae64aA21",
Expand All @@ -30,8 +30,8 @@
"SafeSingleton": "0x85e08C45669fd75f55add987EDCAA15612dD840a",
"SuperchainConfig": "0xDAf629c26abd7a84B6330c369887053B75dB2AF2",
"SuperchainConfigProxy": "0x93365256B59F20885b0CB47acE7b07A434c314Fc",
"SystemConfig": "0x0DF1fCC0d668E713FDd82913b3BB75Fc7023A8f7",
"SystemConfigInterop": "0x0DF1fCC0d668E713FDd82913b3BB75Fc7023A8f7",
"SystemConfig": "0x08B1574d825E2B715F48E9EA29491f3Ef96E9a5a",
"SystemConfigInterop": "0x08B1574d825E2B715F48E9EA29491f3Ef96E9a5a",
"SystemConfigProxy": "0x6e3a6561b6Ed0d0124E46Ce87334d5AE756F401B",
"SystemOwnerSafe": "0xe3e62F9e0CF834533F08e679B5e21481AAF74CFc"
}
2 changes: 1 addition & 1 deletion genesis/generated/l1-allocs/901-l1-allocs.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion genesis/generated/l1-allocs/902-l1-allocs.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion genesis/generated/l1-allocs/903-l1-allocs.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion genesis/generated/l1-allocs/904-l1-allocs.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion genesis/generated/l1-allocs/905-l1-allocs.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion genesis/generated/l1-combined-allocs.json
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 41f74bd

Please sign in to comment.