compound-finance · MishaShWoof · Aug 9, 2024 · Aug 12, 2024 · Aug 12, 2024 · Aug 12, 2024
diff --git a/.github/workflows/deploy-market.yaml b/.github/workflows/deploy-market.yaml
@@ -14,6 +14,7 @@ on:
           - base
           - optimism
           - mantle
+          - linea
           - scroll
       deployment:
         description: Deployment Name (e.g. "usdc")
@@ -45,7 +46,7 @@ jobs:
         with:
           wallet_connect_project_id: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
           requested_network: "${{ inputs.network }}"
-          ethereum_url: "${{ fromJSON('{\"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('{\"linea\":\"https://rpc.ankr.com/linea/${ANKR_KEY}\",\"mantle\":\"https://rpc.ankr.com/mantle/${ANKR_KEY}\",\"optimism\":\"https://rpc.ankr.com/optimism/$ANKR_KEY\",\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://rpc.ankr.com/eth/${ANKR_KEY}\",\"sepolia\":\"https://rpc.ankr.com/eth_sepolia/${ANKR_KEY}\",\"polygon\":\"https://rpc.ankr.com/polygon/${ANKR_KEY}\",\"arbitrum\":\"https://rpc.ankr.com/arbitrum/${ANKR_KEY}\",\"base\":\"https://rpc.ankr.com/base/$ANKR_KEY\",\"scroll\":\"https://rpc.scroll.io\"}')[inputs.network] }}"
           port: 8585
         if: github.event.inputs.eth_pk == ''
 
@@ -87,4 +88,4 @@ jobs:
           git config user.email "<>"
           git add deployments/\*/roots.json
           git commit -m "Modified deployment roots from GitHub Actions"
-          git push origin
+          git push origin 
diff --git a/.github/workflows/enact-migration.yaml b/.github/workflows/enact-migration.yaml
@@ -13,6 +13,7 @@ on:
           - arbitrum
           - base
           - optimism
+          - linea
           - mantle
           - scroll
       deployment:
@@ -60,7 +61,7 @@ jobs:
       - name: Get governance network
         run: |
           case ${{ github.event.inputs.network }} in
-            polygon | arbitrum | base | optimism | mantle | scroll)
+            polygon | arbitrum | base | optimism | mantle | linea | scroll)
                 echo "GOV_NETWORK=mainnet" >> $GITHUB_ENV ;;
             sepolia)
                 echo "GOV_NETWORK=sepolia" >> $GITHUB_ENV ;;
@@ -73,18 +74,20 @@ jobs:
         with:
           wallet_connect_project_id: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
           requested_network: "${{ inputs.network }}"
-          ethereum_url: "${{ fromJSON('{\"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('{\"linea\":\"https://rpc.ankr.com/linea/${ANKR_KEY}\",\"mantle\":\"https://rpc.ankr.com/mantle/${ANKR_KEY}\",\"optimism\":\"https://rpc.ankr.com/optimism/$ANKR_KEY\",\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://rpc.ankr.com/eth/${ANKR_KEY}\",\"sepolia\":\"https://rpc.ankr.com/eth_sepolia/${ANKR_KEY}\",\"polygon\":\"https://rpc.ankr.com/polygon/${ANKR_KEY}\",\"arbitrum\":\"https://rpc.ankr.com/arbitrum/${ANKR_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@42330b57a0554d5b9f4b47b186d483b5e18addbf
+        uses: hayesgm/seacrest@5d8e5e3023669e93d197963273ae159ecda9d2b2
+        env:
+          GOV_NETWORK: ${{ env.GOV_NETWORK }}
         with:
           wallet_connect_project_id: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
           requested_network: "${{ env.GOV_NETWORK }}"
-          ethereum_url: "${{ fromJSON('{\"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\"}')[env.GOV_NETWORK] }}"
+          ethereum_url: "${{ fromJSON('{\"linea\":\"https://rpc.ankr.com/linea/${ANKR_KEY}\",\"mantle\":\"https://rpc.ankr.com/mantle/${ANKR_KEY}\",\"optimism\":\"https://rpc.ankr.com/optimism/$ANKR_KEY\",\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://rpc.ankr.com/eth/${ANKR_KEY}\",\"sepolia\":\"https://rpc.ankr.com/eth_sepolia/${ANKR_KEY}\",\"polygon\":\"https://rpc.ankr.com/polygon/${ANKR_KEY}\",\"arbitrum\":\"https://rpc.ankr.com/arbitrum/${ANKR_KEY}\",\"base\":\"https://rpc.ankr.com/base/$ANKR_KEY\",\"scroll\":\"https://rpc.sc
F438
roll.io\"}')[env.GOV_NETWORK] }}"
           port: 8685
-        if: github.event.inputs.eth_pk == '' && env.GOV_NETWORK != '' && github.event.inputs.impersonateAccount == ''
+        if: github.event.inputs.eth_pk == '' && github.event.inputs.impersonateAccount == ''
 
       - name: Checkout repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/prepare-migration.yaml b/.github/workflows/prepare-migration.yaml
@@ -14,6 +14,7 @@ on:
           - base
           - optimism
           - mantle
+          - linea
           - scroll
       deployment:
         description: Deployment Name (e.g. "usdc")
@@ -48,7 +49,7 @@ jobs:
         with:
           wallet_connect_project_id: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
           requested_network: "${{ inputs.network }}"
-          ethereum_url: "${{ fromJSON('{\"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('{\"linea\":\"https://rpc.ankr.com/linea/${ANKR_KEY}\",\"mantle\":\"https://rpc.ankr.com/mantle/${ANKR_KEY}\",\"optimism\":\"https://rpc.ankr.com/optimism/$ANKR_KEY\",\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://rpc.ankr.com/eth/${ANKR_KEY}\",\"sepolia\":\"https://rpc.ankr.com/eth_sepolia/${ANKR_KEY}\",\"polygon\":\"https://rpc.ankr.com/polygon/${ANKR_KEY}\",\"arbitrum\":\"https://rpc.ankr.com/arbitrum/${ANKR_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/run-scenarios.yaml b/.github/workflows/run-scenarios.yaml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        bases: [ development, mainnet, mainnet-weth, mainnet-wbtc, mainnet-usdt, mainnet-wsteth, mainnet-usds, sepolia-usdc, sepolia-weth, fuji, polygon, polygon-usdt, arbitrum-usdc.e, arbitrum-usdc, arbitrum-weth, arbitrum-usdt, base-usdbc, base-weth, base-usdc, base-aero, base-usds, optimism-usdc, optimism-usdt, optimism-weth, mantle-usde, scroll-usdc]
+        bases: [ development, mainnet, mainnet-weth, mainnet-usdt, mainnet-wbtc, mainnet-wsteth, mainnet-usds, sepolia-usdc, sepolia-weth, fuji, polygon, polygon-usdt, arbitrum-usdc.e, arbitrum-usdc, arbitrum-weth, arbitrum-usdt, base-usdbc, base-weth, base-usdc, base-aero, optimism-usdc, base-usds, optimism-usdt, optimism-weth, mantle-usde, linea-usdc, linea-usdt, linea-weth, scroll-usdc]
     name: Run scenarios
     env:
       ETHERSCAN_KEY: ${{ secrets.ETHERSCAN_KEY }}

diff --git a/contracts/CometInterface.sol b/contracts/CometInterface.sol
@@ -9,4 +9,7 @@ import "./CometExtInterface.sol";
  * @notice An efficient monolithic money market protocol
  * @author Compound
  */
-abstract contract CometInterface is CometMainInterface, CometExtInterface {}
+abstract contract CometInterface is CometMainInterface, CometExtInterface {
+    function assetListFactory() external view virtual returns (address);
+    function assetList() external view virtual returns (address);
+}
diff --git a/deployments/arbitrum/usdt/deploy.ts b/deployments/arbitrum/usdt/deploy.ts
@@ -39,7 +39,7 @@ export default async function deploy(deploymentManager: DeploymentManager, deplo
   const bridgeReceiver = await deploymentManager.fromDep('bridgeReceiver', 'arbitrum', 'usdc.e');
 
   // Deploy Comet
-  const deployed = await deployComet(deploymentManager, deploySpec);
+  const deployed = await deployComet(deploymentManager, deploySpec, {}, true);
 
   return {
     ...deployed,

diff --git a/...rum/weth/migrations/1722937909_update_wsteth_and_weeth_price_feeds_on_arbitrum_markets.ts b/...rum/weth/migrations/1722937909_update_wsteth_and_weeth_price_feeds_on_arbitrum_markets.ts
@@ -103,10 +103,6 @@ export default migration('1722937909_update_wsteth_and_weeth_price_feeds_on_arbi
     newWeETHToETHPriceFeed = weETHToETHPriceFeed;
     newWstETHToUSDPriceFeed = wstETHToUSDPriceFeed;
 
-    console.log('wstETHToETHPriceFeed', wstETHToETHPriceFeed);
-    console.log('weETHToETHPriceFeed', weETHToETHPriceFeed);
-    console.log('wstETHToUSDPriceFeed', wstETHToUSDPriceFeed);
-
     const updateAssetPriceFeedCalldataWstETHToWETHComet = ethers.utils.defaultAbiCoder.encode(
       ['address', 'address', 'address'],
       [comet.address, wstETH.address, wstETHToETHPriceFeed]

diff --git a/deployments/linea/usdc/configuration.json b/deployments/linea/usdc/configuration.json
@@ -0,0 +1,55 @@
+{
+  "name": "Compound USDC",
+  "symbol": "cUSDCv3",
+  "baseToken": "USDC",
+  "baseTokenAddress": "0x176211869cA2b568f2A7D4EE941E073a821EE1ff",
+  "baseTokenPriceFeed": "0xAADAa473C1bDF7317ec07c915680Af29DeBfdCb5",
+  "pauseGuardian": "0x5A1e5d7E09cA94506084a26304d53A138145bF52",
+  "borrowMin": "1e6",
+  "storeFrontPriceFactor": 0.6,
+  "targetReserves": "20_000_000e6",
+  "rates": {
+    "supplyKink": 0.9,
+    "supplySlopeLow": 0.054,
+    "supplySlopeHigh": 3.034,
+    "supplyBase": 0,
+    "borrowKink": 0.9,
+    "borrowSlopeLow": 0.05,
+    "borrowSlopeHigh": 3.4,
+    "borrowBase": 0.015
+  },
+  "tracking": {
+    "indexScale": "1e15",
+    "baseSupplySpeed": "46296296296e0",
+    "baseBorrowSpeed": "34722222222e0",
+    "baseMinForRewards": "1000e6"
+  },
+  "assets": {
+    "WETH": {
+      "address": "0xe5D7C2a44FfDDf6b295A15c148167daaAf5Cf34f",
+      "priceFeed": "0x3c6Cd9Cc7c7a4c2Cf5a82734CD249D7D593354dA",
+      "decimals": "18",
+      "borrowCF": 0.83,
+      "liquidateCF": 0.9,
+      "liquidationFactor": 0.95,
+      "supplyCap": "530e18"
+    },
+    "wstETH": {
+      "address": "0xB5beDd42000b71FddE22D3eE8a79Bd49A568fC8F",
+      "decimals": "18",
+      "borrowCF": 0.82,
+      "liquidateCF": 0.87,
+      "liquidationFactor": 0.95,
+      "supplyCap": "340e18"
+    },
+    "WBTC": {
+      "address": "0x3aAB2285ddcDdaD8edf438C1bAB47e1a9D05a9b4",
+      "priceFeed": "0x7A99092816C8BD5ec8ba229e3a6E6Da1E628E1F9",
+      "decimals": "8",
+      "borrowCF": 0.8,
+      "liquidateCF": 0.85,
+      "liquidationFactor": 0.9,
+      "supplyCap": "18e8"
+    }
+  }
+}
diff --git a/deployments/linea/usdc/deploy.ts b/deployments/linea/usdc/deploy.ts
@@ -0,0 +1,141 @@
+import {
+  Deployed,
+  DeploymentManager,
+} from '../../../plugins/deployment_manager';
+import { DeploySpec, deployComet } from '../../../src/deploy';
+
+const HOUR = 60 * 60;
+const DAY = 24 * HOUR;
+
+const MAINNET_TIMELOCK = '0x6d903f6003cca6255d85cca4d3b5e5146dc33925';
+
+const WSTETH_TO_STETH_PRICE_FEED = '0x3C8A95F2264bB3b52156c766b738357008d87cB7';
+const ETH_TO_USD_PRICE_FEED = '0x3c6Cd9Cc7c7a4c2Cf5a82734CD249D7D593354dA';
+
+const  L2MESSAGE_SERVICE_ADDRESS = '0x508Ca82Df566dCD1B0DE8296e70a96332cD644ec';
+const  L2STANDARD_BRIDGE_ADDRESS = '0x353012dc4a9A6cF55c941bADC267f82004A8ceB9';
+const  L2USDC_BRIDGE_ADDRESS = '0xA2Ee6Fce4ACB62D95448729cDb781e3BEb62504A';
+
+export default async function deploy(
+  deploymentManager: DeploymentManager,
+  deploySpec: DeploySpec
+): Promise<Deployed> {
+  const deployed = await deployContracts(deploymentManager, deploySpec);
+  return deployed;
+}
+
+async function deployContracts(
+  deploymentManager: DeploymentManager,
+  deploySpec: DeploySpec
+): Promise<Deployed> {
+  const trace = deploymentManager.tracer();
+
+  // Pull in existing assets
+  const USDC = await deploymentManager.existing(
+    'USDC',
+    '0x176211869cA2b568f2A7D4EE941E073a821EE1ff',
+    'linea'
+  );
+  const WETH = await deploymentManager.existing(
+    'WETH',
+    '0xe5D7C2a44FfDDf6b295A15c148167daaAf5Cf34f',
+    'linea'
+  );
+  const WBTC = await deploymentManager.existing(
+    'WBTC',
+    '0x3aAB2285ddcDdaD8edf438C1bAB47e1a9D05a9b4',
+    'linea'
+  );
+
+  const wstETH = await deploymentManager.existing(
+    'wstETH',
+    '0xB5beDd42000b71FddE22D3eE8a79Bd49A568fC8F',
+    'linea'
+  );
+
+  const wstETHtoUsdPriceFeed = await deploymentManager.deploy(
+    'wstETH:priceFeed',
+    'pricefeeds/MultiplicativePriceFeed.sol',
+    [
+      WSTETH_TO_STETH_PRICE_FEED, // wstETH / stETH price feed
+      ETH_TO_USD_PRICE_FEED,      // ETH / USD price feed (we consider stETH / ETH as 1:1)
+      8,                          // decimals
+      'wstETH / USD price feed'   // description
+    ]
+  );
+
+
+  const l2MessageService = await deploymentManager.existing(
+    'l2MessageService',
+    L2MESSAGE_SERVICE_ADDRESS,
+    'linea'
+  );
+
+  const l2StandardBridge = await deploymentManager.existing(
+    'l2StandardBridge',
+    L2STANDARD_BRIDGE_ADDRESS,
+    'linea'
+  );
+
+  const l2USDCBridge = await deploymentManager.existing(
+    'l2USDCBridge',
+    L2USDC_BRIDGE_ADDRESS,
+    'linea'
+  );
+
+  // Deploy LineaBridgeReceiver
+  const bridgeReceiver = await deploymentManager.deploy(
+    'bridgeReceiver',
+    'bridges/linea/LineaBridgeReceiver.sol',
+    [l2MessageService.address]
+  );
+
+  // Deploy Local Timelock
+  const localTimelock = await deploymentManager.deploy(
+    'timelock',
+    'vendor/Timelock.sol',
+    [
+      bridgeReceiver.address, // admin
+      1 * DAY, // delay
+      14 * DAY, // grace period
+      12 * HOUR, // minimum delay
+      30 * DAY, // maxiumum delay
+    ]
+  );
+
+  // Initialize OptimismBridgeReceiver
+  await deploymentManager.idempotent(
+    async () => !(await bridgeReceiver.initialized()),
+    async () => {
+      trace(`Initializing BridgeReceiver`);
+      await bridgeReceiver.initialize(
+        MAINNET_TIMELOCK, // govTimelock
+        localTimelock.address // localTimelock
+      );
+      trace(`BridgeReceiver initialized`);
+    }
+  );
+
+  // Deploy Comet
+  const deployed = await deployComet(deploymentManager, deploySpec, {}, true);
+  const { comet } = deployed;
+
+  // Deploy Bulker
+  const bulker = await deploymentManager.deploy(
+    'bulker',
+    'bulkers/BaseBulker.sol',
+    [
+      await comet.governor(), // admin
+      WETH.address, // weth
+    ]
+  );
+
+  return {
+    ...deployed,
+    bridgeReceiver,
+    l2MessageService,
+    l2StandardBridge,
+    l2USDCBridge,
+    bulker,
+  };
+}