Add USDC market on Scroll mainnet

.github/workflows/deploy-market.yaml

@@ -17,6 +17,7 @@ on:
           - base-goerli
           - linea-goerli
           - scroll-goerli
+          - scroll
       deployment:
         description: Deployment Name (e.g. "usdc")
         required: true
@@ -44,7 +45,7 @@ jobs:
         with:
           wallet_connect_project_id: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
           requested_network: "${{ inputs.network }}"
-          ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://clean-spring-wind.base-mainnet.discover.quiknode.pro/$QUICKNODE_KEY\",\"base-goerli\":\"https://base-goerli.infura.io/v3/$INFURA_KEY\",\"linea-goerli\":\"https://linea-goerli.infura.io/v3/$INFURA_KEY\",\"scroll-goerli\":\"https://alpha-rpc.scroll.io/l2\"}')[inputs.network] }}"
+          ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://clean-spring-wind.base-mainnet.discover.quiknode.pro/$QUICKNODE_KEY\",\"base-goerli\":\"https://base-goerli.infura.io/v3/$INFURA_KEY\",\"linea-goerli\":\"https://linea-goerli.infura.io/v3/$INFURA_KEY\",\"scroll-goerli\":\"https://alpha-rpc.scroll.io/l2\",\"scroll\":\"https://rpc.scroll.io\"}')[inputs.network] }}"
           port: 8585
         if: github.event.inputs.eth_pk == ''
 

.github/workflows/enact-migration.yaml

@@ -17,6 +17,7 @@ on:
           - base-goerli
           - linea-goerli
           - scroll-goerli
+          - scroll
       deployment:
         description: Deployment Name (e.g. "usdc")
         required: true
@@ -52,7 +53,7 @@ jobs:
           case ${{ github.event.inputs.network }} in
             polygon | arbitrum | base)
                 echo "GOV_NETWORK=mainnet" >> $GITHUB_ENV ;;
-            mumbai | arbitrum-goerli | base-goerli | linea-goerli | scroll-goerli)
+            mumbai | arbitrum-goerli | base-goerli | linea-goerli | scroll-goerli | scroll)
                 echo "GOV_NETWORK=goerli" >> $GITHUB_ENV ;;
             *)
                 echo "No governance network for selected network" ;;
@@ -63,7 +64,7 @@ jobs:
         with:
           wallet_connect_project_id: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
           requested_network: "${{ inputs.network }}"
-          ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://clean-spring-wind.base-mainnet.discover.quiknode.pro/$QUICKNODE_KEY\",\"base-goerli\":\"https://base-goerli.infura.io/v3/$INFURA_KEY\",\"linea-goerli\":\"https://linea-goerli.infura.io/v3/$INFURA_KEY\",\"scroll-goerli\":\"https://alpha-rpc.scroll.io/l2\"}')[inputs.network] }}"
+          ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://clean-spring-wind.base-mainnet.discover.quiknode.pro/$QUICKNODE_KEY\",\"base-goerli\":\"https://base-goerli.infura.io/v3/$INFURA_KEY\",\"linea-goerli\":\"https://linea-goerli.infura.io/v3/$INFURA_KEY\",\"scroll-goerli\":\"https://alpha-rpc.scroll.io/l2\",\"scroll\":\"https://rpc.scroll.io\"}')[inputs.network] }}"
           port: 8585
         if: github.event.inputs.eth_pk == ''
 

.github/workflows/prepare-migration.yaml

@@ -45,7 +45,7 @@ jobs:
         with:
           wallet_connect_project_id: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
           requested_network: "${{ inputs.network }}"
-          ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://clean-spring-wind.base-mainnet.discover.quiknode.pro/$QUICKNODE_KEY\",\"base-goerli\":\"https://base-goerli.infura.io/v3/$INFURA_KEY\",\"linea-goerli\":\"https://linea-goerli.infura.io/v3/$INFURA_KEY\",\"scroll-goerli\":\"https://alpha-rpc.scroll.io/l2\"}')[inputs.network] }}"
+          ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://clean-spring-wind.base-mainnet.discover.quiknode.pro/$QUICKNODE_KEY\",\"base-goerli\":\"https://base-goerli.infura.io/v3/$INFURA_KEY\",\"linea-goerli\":\"https://linea-goerli.infura.io/v3/$INFURA_KEY\",\"scroll-goerli\":\"https://alpha-rpc.scroll.io/l2\",\"scroll\":\"https://rpc.scroll.io\"}')[inputs.network] }}"
           port: 8585
         if: github.event.inputs.eth_pk == ''
 

.github/workflows/run-scenarios.yaml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        bases: [ development, mainnet, mainnet-weth, goerli, goerli-weth, fuji, mumbai, polygon, arbitrum-usdc.e, arbitrum-usdc, arbitrum-goerli-usdc, arbitrum-goerli-usdc.e, base-usdbc, base-weth, base-goerli, base-goerli-weth, linea-goerli, scroll-goerli]
+        bases: [ development, mainnet, mainnet-weth, goerli, goerli-weth, fuji, mumbai, polygon, arbitrum-usdc.e, arbitrum-usdc, arbitrum-goerli-usdc, arbitrum-goerli-usdc.e, base-usdbc, base-weth, base-goerli, base-goerli-weth, linea-goerli, scroll-goerli, scroll]
     name: Run scenarios
     env:
       ETHERSCAN_KEY: ${{ secrets.ETHERSCAN_KEY }}

contracts/bridges/scroll/IScrollMessenger.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.15;
 
+/// @notice IScrollMessenger is the interface for Scroll's messenger contract
 interface IScrollMessenger {
   function xDomainMessageSender() external view returns (address);
 }

contracts/bridges/scroll/ScrollBridgeReceiver.sol

@@ -4,24 +4,33 @@ pragma solidity 0.8.15;
 import "../SweepableBridgeReceiver.sol";
 import "./IScrollMessenger.sol";
 
+/// @title Scroll Bridge Receiver
+/// @notice Contract that processes messages passed from Compound governance using the Scroll bridge
 contract ScrollBridgeReceiver is SweepableBridgeReceiver {
     error InvalidL2Messenger();
 
-    event Newl2Messenger(address indexed oldL2Messenger, address indexed newL2Messenger);
+    event NewL2Messenger(address indexed oldL2Messenger, address indexed newL2Messenger);
 
+    /// @notice Address of Scroll L2 Messenger contract
     address public l2Messenger;
 
+    /// @notice Construct a new ScrollBridgeReceiver instance
+    /// @param l2Messenger_ Address of Scroll L2 Messenger contract
     constructor(address l2Messenger_) {
         l2Messenger = l2Messenger_;
+        emit NewL2Messenger(address(0), l2Messenger_);
     }
 
-    function changel2Messenger(address newL2Messenger) public {
+    /// @notice Update the L2 Messenger address
+    /// @param newL2Messenger New address for L2 Messenger contract
+    function changeL2Messenger(address newL2Messenger) public {
         if (msg.sender != localTimelock) revert Unauthorized();
         address oldL2Messenger = l2Messenger;
         l2Messenger = newL2Messenger;
-        emit Newl2Messenger(oldL2Messenger, newL2Messenger);
+        emit NewL2Messenger(oldL2Messenger, newL2Messenger);
     }
 
+    /// @notice Fallback function to handle messages
     fallback() external payable {
         if (msg.sender != l2Messenger) revert InvalidL2Messenger();
         address messageSender = IScrollMessenger(msg.sender).xDomainMessageSender();

deployments/mainnet/usdc/relations.ts

@@ -41,5 +41,19 @@ export default {
         slot: '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'
       }
     }
+  },
+  scrollMessenger: {
+    delegates: {
+      field: {
+        slot: '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'
+      }
+    }
+  },
+  scrollL1TokenBridge: {
+    delegates: {
+      field: {
+        slot: '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'
+      }
+    }
   }
 };

deployments/mainnet/usdc/roots.json

@@ -10,5 +10,7 @@
     "CCTPTokenMessenger": "0xbd3fa81b58ba92a82136038b25adec7066af3155", 
     "CCTPMessageTransmitter": "0x0a992d191deec32afe36203ad87d7d289a738f81",
     "baseL1CrossDomainMessenger": "0x866E82a600A1414e583f7F13623F1aC5d58b0Afa",
-    "baseL1StandardBridge": "0x3154Cf16ccdb4C6d922629664174b904d80F2C35"
+    "baseL1StandardBridge": "0x3154Cf16ccdb4C6d922629664174b904d80F2C35",
+    "scrollMessenger": "0x6774Bcbd5ceCeF1336b5300fb5186a12DDD8b367",
+    "scrollL1TokenBridge": "0xF8B1378579659D8F7EE5f3C929c2f3E332E41Fd6"
 }

deployments/scroll/usdc/configuration.json

@@ -0,0 +1,45 @@
+{
+  "name": "Compound USDC",
+  "symbol": "cUSDCv3",
+  "baseToken": "USDC",
+  "baseTokenAddress": "0x06eFdBFf2a14a7c8E15944D1F4A48F9F95F663A4",
+  "baseTokenPriceFeed": "0x43d12Fb3AfCAd5347fA764EeAB105478337b7200",
+  "borrowMin": "0.001e6",
+  "storeFrontPriceFactor": 0.6,
+  "targetReserves": "1000000e6",
+  "rates": {
+    "supplyKink": 0.85,
+    "supplySlopeLow": 0.048,
+    "supplySlopeHigh": 1.6,
+    "supplyBase": 0,
+    "borrowKink": 0.85,
+    "borrowSlopeLow": 0.053,
+    "borrowSlopeHigh": 1.8,
+    "borrowBase": 0.015
+  },
+  "tracking": {
+    "indexScale": "1e15",
+    "baseSupplySpeed": "0.000402083333333e15",
+    "baseBorrowSpeed": "0.000402083333333e15",
+    "baseMinForRewards": "1000e6"
+  },
+  "assets": {
+    "WETH": {
+      "address": "0x5300000000000000000000000000000000000004",
+      "priceFeed": "0x6bF14CB0A831078629D993FDeBcB182b21A8774C",
+      "decimals": "18",
+      "borrowCF": 0.8,
+      "liquidateCF": 0.85,
+      "liquidationFactor": 0.9,
+      "supplyCap": "300e18"
+    },
+    "wstETH": {
+      "address": "0xf610A9dfB7C89644979b4A0f27063E9e7d7Cda32",
+      "decimals": "18",
+      "borrowCF": 0.75,
+      "liquidateCF": 0.8,
+      "liquidationFactor": 0.85,
+      "supplyCap": "50e18"
+    }
+  }
+}

deployments/scroll/usdc/deploy.ts

@@ -0,0 +1,86 @@
+import { Deployed, DeploymentManager } from '../../../plugins/deployment_manager';
+import { DeploySpec, deployComet, exp, wait } from '../../../src/deploy';
+
+const secondsPerDay = 24 * 60 * 60;
+
+const MAINNET_TIMELOCK = '0x6d903f6003cca6255d85cca4d3b5e5146dc33925'; // L1 contract
+
+export default async function deploy(
+  deploymentManager: DeploymentManager,
+  deploySpec: DeploySpec
+): Promise<Deployed> {
+  const trace = deploymentManager.tracer();
+  const ethers = deploymentManager.hre.ethers;
+
+  // Pull in existing assets
+  const WETH = await deploymentManager.existing('WETH','0x5300000000000000000000000000000000000004','scroll');
+  const wstETH = await deploymentManager.existing('wstETH', '0xf610A9dfB7C89644979b4A0f27063E9e7d7Cda32', 'scroll');
+
+  const l2Messenger = await deploymentManager.existing('l2Messenger','0x781e90f1c8Fc4611c9b7497C3B47F99Ef6969CbC','scroll');
+  const l2ERC20Gateway = await deploymentManager.existing('l2ERC20Gateway','0xE2b4795039517653c5Ae8C2A9BFdd783b48f447A','scroll');
+  const l2ETHGateway = await deploymentManager.existing('l2ETHGateway', '0x6EA73e05AdC79974B931123675ea8F78FfdacDF0', 'scroll');
+  const l2WETHGateway = await deploymentManager.existing('l2WETHGateway','0x7003E7B7186f0E6601203b99F7B8DECBfA391cf9','scroll');
+  const l2WstETHGateway = await deploymentManager.existing('l2WstETHGateway', '0x8aE8f22226B9d789A36AC81474e633f8bE2856c9', 'scroll');
+
+  // Deploy ScrollBridgeReceiver
+  const bridgeReceiver = await deploymentManager.deploy(
+    'bridgeReceiver',
+    'bridges/scroll/ScrollBridgeReceiver.sol',
+    [l2Messenger.address]
+  );
+
+  // Deploy Local Timelock
+  const localTimelock = await deploymentManager.deploy('timelock', 'vendor/Timelock.sol', [
+    bridgeReceiver.address, // admin
+    10 * 60, // delay
+    14 * secondsPerDay, // grace period
+    10 * 60, // minimum delay
+    30 * secondsPerDay // maximum delay
+  ]);
+
+  // Deploy multiplicative price feed for wstETH / USD
+  const wstETHMultiplicativePriceFeed = await deploymentManager.deploy(
+    'wstETH:priceFeed',
+    'pricefeeds/MultiplicativePriceFeed.sol',
+    [
+      '0xe428fbdbd61CC1be6C273dC0E27a1F43124a86F3', // wstETH / ETH price feed
+      '0x6bF14CB0A831078629D993FDeBcB182b21A8774C', // ETH / USD price feed
+      8,                                            // decimals
+      'wstETH / USD price feed'                      // description
+    ]
+  );
+
+  // Initialize BridgeReceiver
+  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);
+  const { comet } = deployed;
+
+  // Deploy Bulker
+  const bulker = await deploymentManager.deploy('bulker','bulkers/BaseBulker.sol', [
+    await comet.governor(),        // admin_
+    WETH.address,                  // weth_
+  ]);
+
+  return {
+    ...deployed,
+    bridgeReceiver,
+    l2Messenger,
+    l2ERC20Gateway,
+    l2ETHGateway,
+    l2WETHGateway,
+    l2WstETHGateway,
+    bulker,
+  };
+}