Merge branch 'main' into sepolia-support-arbitrum

keep-network · Feb 19, 2024 · 109fcaa · 109fcaa
2 parents bcd4ec5 + 2604b3d
commit 109fcaa
Show file tree

Hide file tree

Showing 142 changed files with 13,627 additions and 11,720 deletions.
diff --git a/.github/workflows/contracts.yml b/.github/workflows/contracts.yml
@@ -185,14 +185,7 @@ jobs:
 
       - name: Deploy contracts
         env:
-          # Using fake ternary expression to decide which credentials to use,
-          # depending on chosen environment. Note: if `GOERLI_ETH_HOSTNAME_HTTP`
-          # is empty, the expression will be evaluated to
-          # `SEPOLIA_ETH_HOSTNAME_HTTP`'s value.
-          CHAIN_API_URL: |
-            ${{ inputs.github.event.inputs.environment == 'goerli'
-              && secrets.GOERLI_ETH_HOSTNAME_HTTP
-              || secrets.SEPOLIA_ETH_HOSTNAME_HTTP }}
+          CHAIN_API_URL: ${{ secrets.SEPOLIA_ETH_HOSTNAME_HTTP }}
           ACCOUNTS_PRIVATE_KEYS: ${{ secrets.TESTNET_ETH_CONTRACT_OWNER_PRIVATE_KEY }}
         run: yarn deploy --network ${{ github.event.inputs.environment }}
 
@@ -275,14 +268,7 @@ jobs:
       - name: Verify contracts on Etherscan
         env:
           ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }}
-          # Using fake ternary expression to decide which credentials to use,
-          # depending on chosen environment. Note: if `GOERLI_ETH_HOSTNAME_HTTP`
-          # is empty, the expression will be evaluated to
-          # `SEPOLIA_ETH_HOSTNAME_HTTP`'s value.
-          CHAIN_API_URL: |
-            ${{ inputs.github.event.inputs.environment == 'goerli'
-              && secrets.GOERLI_ETH_HOSTNAME_HTTP
-              || secrets.SEPOLIA_ETH_HOSTNAME_HTTP }}
+          CHAIN_API_URL: ${{ secrets.SEPOLIA_ETH_HOSTNAME_HTTP }}
         run: yarn run hardhat --network ${{ github.event.inputs.environment }} etherscan-verify
 
   # This job is responsible for publishing packackes with slightly modified
@@ -340,14 +326,7 @@ jobs:
 
       - name: Deploy contracts
         env:
-          # Using fake ternary expression to decide which credentials to use,
-          # depending on chosen environment. Note: if `GOERLI_ETH_HOSTNAME_HTTP`
-          # is empty, the expression will be evaluated to
-          # `SEPOLIA_ETH_HOSTNAME_HTTP`'s value.
-          CHAIN_API_URL: |
-            ${{ inputs.github.event.inputs.environment == 'goerli'
-              && secrets.GOERLI_ETH_HOSTNAME_HTTP
-              || secrets.SEPOLIA_ETH_HOSTNAME_HTTP }}
+          CHAIN_API_URL: ${{ secrets.SEPOLIA_ETH_HOSTNAME_HTTP }}
           ACCOUNTS_PRIVATE_KEYS: ${{ secrets.DAPP_DEV_TESTNET_ETH_CONTRACT_OWNER_PRIVATE_KEY }}
         run: yarn deploy --network ${{ github.event.inputs.environment }}
 

diff --git a/.github/workflows/monitoring.yml b/.github/workflows/monitoring.yml
@@ -18,7 +18,7 @@ on:
         type: choice
         options:
           - local # Just a bare Docker build without push
-          - goerli # Pushes Docker image to keep-test cluster
+          - sepolia # Pushes Docker image to keep-test cluster
           - mainnet # Pushes Docker image to keep-prd cluster
 
 jobs:
@@ -95,7 +95,7 @@ jobs:
         if: ${{ github.event.inputs.environment != 'local' }}
         uses: docker/login-action@v1
         env:
-          CLUSTER_MAPPING: '{"goerli": "KEEP_TEST", "mainnet": "KEEP_PRD"}'
+          CLUSTER_MAPPING: '{"sepolia": "KEEP_TEST", "mainnet": "KEEP_PRD"}'
         with:
           registry: ${{ env.GCR_REGISTRY_URL }}
           username: _json_key

diff --git a/cross-chain/base/.gitignore b/cross-chain/base/.gitignore
@@ -10,8 +10,10 @@
 !/deployments/mainnet/
 !/deployments/base/
 !/deployments/baseGoerli/
+!/deployments/baseSepolia/
 
 # OZ
 /.openzeppelin/unknown-*.json
 !/.openzeppelin/unknown-84531.json
 !/.openzeppelin/unknown-8453.json
+!/.openzeppelin/unknown-84532.json