[epociask/issue-172-version-pinned-devnet-allocs] Add devnet generati…

…on to CI

.devnet/addresses.json

@@ -1,28 +1,28 @@
 {
-  "AddressManager": "0x7AF161D3b38F487275408fF97e6800B68c8CA88A",
+  "AddressManager": "0xe402f6e627Aa2de15336Eceb3E704fa39A59E790",
   "BlockOracle": "0x042deb7f12Dad67215b7dD433f53B50C1C1bcb85",
   "DisputeGameFactory": "0x1D76cd1460239F99516F165578b6A80EFb70f3C6",
-  "DisputeGameFactoryProxy": "0xed1Acc5Cac7Fa27E14966C162a100511e75E415c",
-  "L1CrossDomainMessenger": "0x8b84AF32666581DF5bA5ED70Faf4bF6547c87081",
-  "L1CrossDomainMessengerProxy": "0x8d67772deD73E2f6Be556A40420018461CC6a8ed",
-  "L1ERC721Bridge": "0xCe68D59B1cC563C9c0CFea6E8C9D2424171a20e8",
-  "L1ERC721BridgeProxy": "0x5B00E2Ab35AB652b1b89898A18B50126bc19FfAb",
-  "L1StandardBridge": "0xb0227Da95b6cB90441641e6B0d45B6e984c76A7D",
-  "L1StandardBridgeProxy": "0x9C759e3660ADD1695b5cb5BFb4335B7D14237396",
-  "L2OutputOracle": "0x021A0D5b6d54011553969Cc23838746A5297Fb27",
-  "L2OutputOracleProxy": "0xB2a8d4b8295C6AC925d3b6a8bfB061A96017a9cc",
-  "Mips": "0xf730b1417f41E295aE7470596845a3F86Fcf07F8",
-  "OptimismMintableERC20Factory": "0x6718172Cc117A87CaBEEDa4d61ccB263216ed0c9",
-  "OptimismMintableERC20FactoryProxy": "0x0134cFc4DE0Df3D3140d5678C322D028805C363A",
+  "DisputeGameFactoryProxy": "0x003857eFbC9Ecc41c99789aDEd3077ACa31a48ba",
+  "L1CrossDomainMessenger": "0xDa2332D0a7608919Cd331B1304Cd179129a90495",
+  "L1CrossDomainMessengerProxy": "0x9Dc4d9FdE701480EB92c792F4806834eb3089533",
+  "L1ERC721Bridge": "0x806C2d0d2BDDFf9279CB2A8722F9117f0b0aDE73",
+  "L1ERC721BridgeProxy": "0x775EB5B495E8B6193a6EA06dB23B247C868B8e9C",
+  "L1StandardBridge": "0xcfBCbA6d9E84A3c4FaE0eda9684cE39a09aa2c8A",
+  "L1StandardBridgeProxy": "0xFDB8fA1D54c266F4f8368a491957940d8Ef3d336",
+  "L2OutputOracle": "0x8203dEBE6cD849358473715fD46FE9b1aE44C44D",
+  "L2OutputOracleProxy": "0x22Ac31D6D02F8d8510013a299178A7A059CC563b",
+  "Mips": "0xc5E3069cF714625A6f4339549058ED310B15017E",
+  "OptimismMintableERC20Factory": "0x373B66bd178cb2716D5A9596B1a42Ed39b87A535",
+  "OptimismMintableERC20FactoryProxy": "0x337bD62462174eBfA51357A2fdb63C1df0394D9d",
   "OptimismPortal": "0xD14AA6C7B6D92803F3910Ec1DADCCd0757341862",
-  "OptimismPortalProxy": "0x411D3f0ae2Fa802A1c2600356F06989723Ad8C8D",
-  "PreimageOracle": "0x103007788A710124E93232323019e2d3477462b3",
+  "OptimismPortalProxy": "0xD7672eF7f9103032F8DbdF6a986B9f65C2c8D102",
+  "PreimageOracle": "0xC1327F8a7819f4ed1708Afb2e5cE4C810d3B6195",
   "ProtocolVersions": "0x42F0bD8313ad456A38061308857b2383fe2c72a0",
-  "ProtocolVersionsProxy": "0xc9224CB3b7AC4076C753354A9065c9Fa4dcecce2",
-  "ProxyAdmin": "0x27C36E4D7259E05300f6118122DDA5B074127823",
-  "SafeProxyFactory": "0x6179DB26790E967B0f936A4Ed9890deEC5555673",
-  "SafeSingleton": "0x8655448827b19858e39F23fEe66f4DE9FEA654d5",
+  "ProtocolVersionsProxy": "0xc6Cc1557F086004fb5E9185b3c510b218c024047",
+  "ProxyAdmin": "0xd869E6dF3307Edf2564AE5E882d14a1f4fe143c4",
+  "SafeProxyFactory": "0x9aC29028EbEdA5F9fA70BA9EB3621E6A3e1aEdB6",
+  "SafeSingleton": "0xc4b65384Ff4ecfF10Db3d916DA8EAF27B7CaD0D3",
   "SystemConfig": "0x3b6090d4ba84B94C20a789436B9010F340AaaC70",
-  "SystemConfigProxy": "0xbcB7082dfFE3Cc4e0e18a1181C0669d3B1b95181",
-  "SystemOwnerSafe": "0x05c33951f0CeCE29961e25dad7307F1Fb9387Ca3"
+  "SystemConfigProxy": "0x1D7A9d985a35E9438F8CB5b9B0673BbCDc4c2842",
+  "SystemOwnerSafe": "0x92fa725e39037768462c938709B2aE863BdbE664"
 }

.devnet/devnetL1.json

@@ -11,7 +11,7 @@
   "cliqueSignerAddress": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
   "l1UseClique": true,
   "l1StartingBlockTag": "earliest",
-  "l2OutputOracleSubmissionInterval": 10,
+  "l2OutputOracleSubmissionInterval": 6,
   "l2OutputOracleStartingTimestamp": 0,
   "l2OutputOracleStartingBlockNumber": 0,
   "l2OutputOracleProposer": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
@@ -40,12 +40,10 @@
   "governanceTokenName": "Optimism",
   "governanceTokenOwner": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
   "eip1559Denominator": 50,
-  "eip1559DenominatorCanyon": 250,
   "eip1559Elasticity": 6,
   "l1GenesisBlockTimestamp": "0x64c811bf",
   "l2GenesisRegolithTimeOffset": "0x0",
   "l2GenesisSpanBatchTimeOffset": "0x0",
-  "l2GenesisCanyonTimeOffset": "0x40",
   "faultGameAbsolutePrestate": "0x03c7ae758795765c6664a5d39bf63841c71ff191e9189522bad8ebff5d4eca98",
   "faultGameMaxDepth": 30,
   "faultGameMaxDuration": 1200,

.github/workflows/hygeine.yml

@@ -25,22 +25,6 @@ jobs:
       - name: Mock diff check
         run: make go-gen-mocks && git diff --exit-code
 
-  ensure-devnet-allocs:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: 1.21
-
-      - name: Install foundry
-        uses: foundry-rs/foundry-toolchain@v1
-
-      - name: Devnet diff check
-        run: make devnet-allocs && git diff --exit-code
-
   golangci:
     # Linting job
     # https://github.com/golangci/golangci-lint-action

.github/workflows/test.yml

@@ -52,5 +52,11 @@ jobs:
       with:
         go-version: 1.21
 
+    - name: Install foundry
+      uses: foundry-rs/foundry-toolchain@v1
+
+    - name: Generate devnet allocations
+      run: make devnet-allocs 
+
     - name: Run E2E Integration Tests
       run: make e2e-test

.gitignore

@@ -4,4 +4,5 @@ config.env
 /.idea
 genesis.json
 alert-routing.yaml
+/.devnet/
 packages/contracts-bedrock/deploy-config/devnetL1.json

scripts/devnet-allocs.sh

@@ -1,24 +1,18 @@
 #!/bin/bash
 
-## (1) Fetch monorepo binary at specific version used by Pessimism
+## Fetch monorepo binary at specific version used by Pessimism
 VERSION=$(cat go.mod | grep ethereum-optimism/optimism | awk '{print $2}' | sed 's/\/v//g')
+VERSION=$(echo ${VERSION} | sed 's/v//g')
+
 REPO_NAME=optimism-$(echo ${VERSION} | sed 's/v//g')
 
 echo "Downloading ${REPO_NAME} ..."
-git clone https://github.com/ethereum-optimism/optimism.git ${REPO_NAME}
-
-## (2) Unzip and enter the monorepo
-echo "Unzipping..."
-unzip ${VERSION}.zip
-rm -rf ${VERSION}.zip
+git clone --branch v${VERSION} https://github.com/ethereum-optimism/optimism.git ${REPO_NAME}
 
-## (3) Get version string without first 'v'
 VERSION=$(echo ${VERSION} | sed 's/v//g')
 echo "Version: ${VERSION}"
 cd ${REPO_NAME}
-git checkout ${VERSION}
 
-## (4) Install monorepo dependencies
 echo "Initializing monorepo..."
 make install-geth &&
 git submodule update --init --recursive &&
@@ -28,7 +22,7 @@ mv packages/contracts-bedrock/deploy-config/devnetL1.json ../.devnet/devnetL1.js
 
 STATUS=$?
 
-## (5) Force cleanup of monorepo 
+## Force cleanup of monorepo 
 echo "${STATUS} Cleaning up ${REPO_NAME} repo ..." &&
 cd ../ &&
 rm -rf ${REPO_NAME}