Merge branch 'squash-unichain-mainnet' of github.com:woof-software/co…

…met into woof-software/add-unichain-weth
woof-software · Feb 11, 2025 · edc43d7 · edc43d7
2 parents 7655616 + b483f00
commit edc43d7
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 18 deletions.
diff --git a/.github/workflows/deploy-market.yaml b/.github/workflows/deploy-market.yaml
@@ -47,7 +47,7 @@ jobs:
         with:
           wallet_connect_project_id: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
           requested_network: "${{ inputs.network }}"
-          ethereum_url: "${{ fromJSON('{\"unichain-sepolia\":\"https://sepolia.unichain.org\",\"mantle\":\"https://mantle-mainnet.infura.io/v3/$INFURA_KEY\",\"optimism\":\"https://rpc.ankr.com/optimism/$ANKR_KEY\",\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"sepolia\":\"https://sepolia.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://rpc.ankr.com/base/$ANKR_KEY\",\"scroll\":\"https://rpc.scroll.io\"}')[inputs.network] }}"
+          ethereum_url: "${{ fromJSON('{\"unichain\":\"https://multi-boldest-patina.unichain-mainnet.quiknode.pro/${UNICHAIN_QUICKNODE_KEY}\",\"unichain-sepolia\":\"https://sepolia.unichain.org\",\"mantle\":\"https://mantle-mainnet.infura.io/v3/$INFURA_KEY\",\"optimism\":\"https://rpc.ankr.com/optimism/$ANKR_KEY\",\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"sepolia\":\"https://sepolia.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://rpc.ankr.com/base/$ANKR_KEY\",\"scroll\":\"https://rpc.scroll.io\"}')[inputs.network] }}"
           port: 8585
         if: github.event.inputs.eth_pk == ''
 

diff --git a/.github/workflows/enact-migration.yaml b/.github/workflows/enact-migration.yaml
@@ -72,16 +72,16 @@ jobs:
           esac
 
       - name: Seacrest
-        uses: hayesgm/seacrest@5d8e5e3023669e93d197963273ae159ecda9d2b2
+        uses: hayesgm/seacrest@42330b57a0554d5b9f4b47b186d483b5e18addbf
         with:
           wallet_connect_project_id: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
           requested_network: "${{ inputs.network }}"
-          ethereum_url: "${{ fromJSON('{\"unichain-sepolia\":\"https://sepolia.unichain.org\",\"mantle\":\"https://mantle-mainnet.infura.io/v3/$INFURA_KEY\",\"optimism\":\"https://rpc.ankr.com/optimism/$ANKR_KEY\",\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"sepolia\":\"https://sepolia.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://rpc.ankr.com/base/$ANKR_KEY\",\"scroll\":\"https://rpc.scroll.io\"}')[inputs.network] }}"
+          ethereum_url: "${{ fromJSON('{\"unichain\":\"https://multi-boldest-patina.unichain-mainnet.quiknode.pro/${UNICHAIN_QUICKNODE_KEY}\",\"unichain-sepolia\":\"https://sepolia.unichain.org\",\"mantle\":\"https://mantle-mainnet.infura.io/v3/$INFURA_KEY\",\"optimism\":\"https://rpc.ankr.com/optimism/$ANKR_KEY\",\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"sepolia\":\"https://sepolia.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://rpc.ankr.com/base/$ANKR_KEY\",\"scroll\":\"https://rpc.scroll.io\"}')[inputs.network] }}"
           port: 8585
         if: github.event.inputs.eth_pk == ''
 
       - name: Seacrest (governance network)
-        uses: hayesgm/seacrest@5d8e5e3023669e93d197963273ae159ecda9d2b2
+        uses: hayesgm/seacrest@42330b57a0554d5b9f4b47b186d483b5e18addbf
         with:
           wallet_connect_project_id: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
           requested_network: "${{ env.GOV_NETWORK }}"

diff --git a/.github/workflows/prepare-migration.yaml b/.github/workflows/prepare-migration.yaml
@@ -50,7 +50,7 @@ jobs:
         with:
           wallet_connect_project_id: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
           requested_network: "${{ inputs.network }}"
-          ethereum_url: "${{ fromJSON('{\"unichain-sepolia\":\"https://sepolia.unichain.org\",\"mantle\":\"https://mantle-mainnet.infura.io/v3/$INFURA_KEY\",\"optimism\":\"https://rpc.ankr.com/optimism/$ANKR_KEY\",\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"sepolia\":\"https://sepolia.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://rpc.ankr.com/base/$ANKR_KEY\",\"scroll\":\"https://rpc.scroll.io\"}')[inputs.network] }}"
+          ethereum_url: "${{ fromJSON('{\"unichain\":\"https://multi-boldest-patina.unichain-mainnet.quiknode.pro/${UNICHAIN_QUICKNODE_KEY}\",\"unichain-sepolia\":\"https://sepolia.unichain.org\",\"mantle\":\"https://mantle-mainnet.infura.io/v3/$INFURA_KEY\",\"optimism\":\"https://rpc.ankr.com/optimism/$ANKR_KEY\",\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"sepolia\":\"https://sepolia.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://rpc.ankr.com/base/$ANKR_KEY\",\"scroll\":\"https://rpc.scroll.io\"}')[inputs.network] }}"
           port: 8585
         if: github.event.inputs.eth_pk == ''
 

diff --git a/deployments/base/aero/migrations/1735299703_update_comet_to_support_more_collaterals.ts b/deployments/base/aero/migrations/1735299703_update_comet_to_support_more_collaterals.ts
@@ -20,17 +20,15 @@ const USDBC_EXT = '0x2F9E3953b2Ef89fA265f2a32ed9F80D00229125B';
 
 export default migration('1735299703_update_comet_to_support_more_collaterals', {
   async prepare(deploymentManager: DeploymentManager) {
-    const _assetListFactory = await deploymentManager.deploy(
+    // deployed on USDS on Base
+    const _assetListFactory = await deploymentManager.existing(
       'assetListFactory',
-      'AssetListFactory.sol',
-      []
+      '0x995e394b8b2437ac8ce61ee0bc610d617962b214'
     );
 
-    const cometFactoryWithExtendedAssetList = await deploymentManager.deploy(
-      'cometFactoryWithExtendedAssetList',
-      'CometFactoryWithExtendedAssetList.sol',
-      []
-    );
+    // deployed on USDS on Base
+    const cometFactoryWithExtendedAssetListAddress = '0x3D0bb1ccaB520A66e607822fC55BC921738fAFE3';
+
     const {
       comet
     } = await deploymentManager.getContracts();
@@ -132,7 +130,7 @@ export default migration('1735299703_update_comet_to_support_more_collaterals',
       true
     );
     return {
-      cometFactoryWithExtendedAssetList: cometFactoryWithExtendedAssetList.address,
+      cometFactoryWithExtendedAssetList: cometFactoryWithExtendedAssetListAddress,
       newCometExtAERO: _newCometExtAERO.address,
       newCometExtUSDC: _newCometExtUSDC.address,
       newCometExtWETH: _newCometExtWETH.address,

diff --git a/deployments/mainnet/usdc/relations.ts b/deployments/mainnet/usdc/relations.ts
@@ -105,5 +105,12 @@ export default {
         slot: '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'
       }
     }
-  }
+  },
+  baseL1USDSBridge: {
+    delegates: {
+      field: {
+        slot: '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'
+      }
+    }
+  },
 };
diff --git a/deployments/mainnet/usdc/roots.json b/deployments/mainnet/usdc/roots.json
@@ -11,6 +11,7 @@
     "CCTPMessageTransmitter": "0x0a992d191deec32afe36203ad87d7d289a738f81",
     "baseL1CrossDomainMessenger": "0x866E82a600A1414e583f7F13623F1aC5d58b0Afa",
     "baseL1StandardBridge": "0x3154Cf16ccdb4C6d922629664174b904d80F2C35",
+    "baseL1USDSBridge": "0xA5874756416Fa632257eEA380CAbd2E87cED352A",
     "opL1CrossDomainMessenger": "0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1",
     "opL1StandardBridge": "0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1",
     "mantleL1CrossDomainMessenger": "0x676A795fe6E43C17c668de16730c3F690FEB7120",

diff --git a/scenario/SupplyScenario.ts b/scenario/SupplyScenario.ts
@@ -510,6 +510,7 @@ scenario(
         symbol === 'wstETH' ? /0xc2139725/ : /.^/,
         symbol === 'WMATIC' ? /Transaction reverted without a reason string/ : /.^/,
         symbol === 'WPOL' ? /Transaction reverted without a reason string/ : /.^/,
+        symbol === 'sUSDS' ? /SUsds\/insufficient-allowance/ : /.^/,
       ]
     );
   }
@@ -597,6 +598,7 @@ scenario(
         symbol === 'wstETH' ? /0x00b284f2/ : /.^/,
         symbol === 'WMATIC' ? /Transaction reverted without a reason string/ : /.^/,
         symbol === 'WPOL' ? /Transaction reverted without a reason string/ : /.^/,
+        symbol === 'sUSDS' ? /SUsds\/insufficient-balance/ : /.^/,
       ]
     );
   }

diff --git a/scenario/utils/isBridgeProposal.ts b/scenario/utils/isBridgeProposal.ts
@@ -34,8 +34,11 @@ export async function isBridgeProposal(
       const baseL1StandardBridge = await governanceDeploymentManager.getContractOrThrow(
         'baseL1StandardBridge'
       );
-      const bridgeContracts = [baseL1CrossDomainMessenger.address, baseL1StandardBridge.address];
+      const baseL1USDSBridge = await governanceDeploymentManager.getContractOrThrow(
+        'baseL1USDSBridge'
+      );
       const targets = openProposal.targets;
+      const bridgeContracts = [baseL1CrossDomainMessenger.address, baseL1StandardBridge.address, baseL1USDSBridge.address];
       return targets.some(t => bridgeContracts.includes(t));
     }
     // case 'linea': {

diff --git a/scenario/utils/relayBaseMessage.ts b/scenario/utils/relayBaseMessage.ts
@@ -4,7 +4,6 @@ import { setNextBaseFeeToZero, setNextBlockTimestamp } from './hreUtils';
 import { BigNumber, ethers } from 'ethers';
 import { Log } from '@ethersproject/abstract-provider';
 import { OpenBridgedProposal } from '../context/Gov';
-
 /*
 The Base relayer applies an offset to the message sender.
 
@@ -27,6 +26,7 @@ export default async function relayBaseMessage(
   const bridgeReceiver = await bridgeDeploymentManager.getContractOrThrow('bridgeReceiver');
   const l2CrossDomainMessenger = await bridgeDeploymentManager.getContractOrThrow('l2CrossDomainMessenger');
   const l2StandardBridge = await bridgeDeploymentManager.getContractOrThrow('l2StandardBridge');
+  const l2USDSBridge = await bridgeDeploymentManager.contract('l2USDSBridge');
 
   const openBridgedProposals: OpenBridgedProposal[] = [];
 
@@ -63,7 +63,9 @@ export default async function relayBaseMessage(
     // there are two types:
     // 1. Bridging ERC20 token or ETH
     // 2. Cross-chain message passing
-    if (target === l2StandardBridge.address) {
+    if (target === l2StandardBridge.address ||
+      (l2USDSBridge ? target === l2USDSBridge.address : target.toLowerCase() === '0xee44cdb68D618d58F75d9fe0818B640BD7B8A7B7'.toLowerCase())
+    ) {
       // Bridging ERC20 token
       const messageWithoutPrefix = message.slice(2); // strip out the 0x prefix
       const messageWithoutSigHash = '0x' + messageWithoutPrefix.slice(8);

diff --git a/src/deploy/index.ts b/src/deploy/index.ts
@@ -153,6 +153,7 @@ export const WHALES = {
     '0x651C9D1F9da787688225f49d63ad1623ba89A8D5', // FBTC whale
     '0xC455fE28a76da80022d4C35A37eB08FF405Eb78f', // FBTC whale
     '0x524db930F0886CdE7B5FFFc920Aae85e98C2abfb', // FBTC whale
+    '0x651C9D1F9da787688225f49d63ad1623ba89A8D5', // FBTC whale
     '0x72c7d27320e042417506e594697324dB5Fbf334C', // FBTC whale
     '0x3880233e78966eb13a9c2881d5f162d646633178', // FBTC whale
     '0x233493E9DC68e548AC27E4933A600A3A4682c0c3', // FBTC whale