Add USDC market on Scroll mainnet

deployments/mainnet/usdc/relations.ts

@@ -49,7 +49,7 @@ export default {
       }
     }
   },
-  scrollL1TokenBridge: {
+  scrollL1USDCGateway: {
     delegates: {
       field: {
         slot: '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'

deployments/mainnet/usdc/roots.json

@@ -12,5 +12,5 @@
     "baseL1CrossDomainMessenger": "0x866E82a600A1414e583f7F13623F1aC5d58b0Afa",
     "baseL1StandardBridge": "0x3154Cf16ccdb4C6d922629664174b904d80F2C35",
     "scrollMessenger": "0x6774Bcbd5ceCeF1336b5300fb5186a12DDD8b367",
-    "scrollL1TokenBridge": "0xF8B1378579659D8F7EE5f3C929c2f3E332E41Fd6"
+    "scrollL1USDCGateway": "0xf1AF3b23DE0A5Ca3CAb7261cb0061C0D779A5c7B"
 }

deployments/scroll/usdc/deploy.ts

@@ -44,7 +44,7 @@ export default async function deploy(
     'wstETH:priceFeed',
     'pricefeeds/MultiplicativePriceFeed.sol',
     [
-      '0xe428fbdbd61CC1be6C273dC0E27a1F43124a86F3', // wstETH / ETH price feed
+      '0xE61Da4C909F7d86797a0D06Db63c34f76c9bCBDC', // wstETH-stETH price feed
       '0x6bF14CB0A831078629D993FDeBcB182b21A8774C', // ETH / USD price feed
       8,                                            // decimals
       'wstETH / USD price feed'                      // description

deployments/scroll/usdc/migrations/1706149385_configurate_and_ens.ts

@@ -10,7 +10,6 @@ const ENSSubdomainLabel = 'v3-additional-grants';
 const ENSSubdomain = `${ENSSubdomainLabel}.${ENSName}`;
 const ENSTextRecordKey = 'v3-official-markets';
 const scrollCOMPAddress = '0x643e160a3C3E2B7eae198f0beB1BfD2441450e86';
-const scrollL1StandardERC20GatewayAddress = "0xD8A791fE2bE73eb6E6cF1eb0cb3F36adC9B3F8f9"
 
 export default migration('1706149385_configurate_and_ens', {
   prepare: async (deploymentManager: DeploymentManager) => {
@@ -32,9 +31,9 @@ export default migration('1706149385_configurate_and_ens', {
 
     const {
       scrollMessenger,
-      scrollL1TokenBridge,
+      scrollL1USDCGateway,
       governor,
-      COMP,
+      USDC
     } = await govDeploymentManager.getContracts();
 
     // ENS Setup
@@ -79,7 +78,7 @@ export default migration('1706149385_configurate_and_ens', {
       ]
     );
 
-    const COMPAmountToBridge = exp(10_000, 18);
+    const USDCAmountToBridge = exp(10_000, 18);
 
     const actions = [
       // 1. Set Comet configuration + deployAndUpgradeTo new Comet and set reward config on Scroll
@@ -89,17 +88,17 @@ export default migration('1706149385_configurate_and_ens', {
         args: [bridgeReceiver.address, 0, l2ProposalData, 600_000]
       },
 
-      // 2. Approve Scroll's L1StandardERC20Gateway to take Timelock's COMP (for bridging)
+      // 2. Approve Scroll's L1 USDC Gateway to take Timelock's USDC (for bridging)
       {
-        contract: COMP,
+        contract: USDC,
         signature: 'approve(address,uint256)',
-        args: [scrollL1StandardERC20GatewayAddress, COMPAmountToBridge]
+        args: [scrollL1USDCGateway.address, USDCAmountToBridge]
       },
-      // 3. Bridge COMP from Ethereum to Scroll Comet using L1GatewayRouter
+      // 3. Bridge USDC from Ethereum to Scroll Comet using L1 USDC Gateway
       {
-        contract: scrollL1TokenBridge,
+        contract: scrollL1USDCGateway,
         signature: 'depositERC20(address,address,uint256,uint256)',
-        args: [COMP.address, rewards.address, COMPAmountToBridge, 300_000]
+        args: [USDC.address, comet.address, USDCAmountToBridge, 300_000]
       },
       // 4. Update the list of official markets
       {
@@ -113,7 +112,7 @@ export default migration('1706149385_configurate_and_ens', {
     ];
 
     const description =
-      '# Configurate Scroll cUSDCv3 market, set reward config, bridge over USDC and COMP, and update ENS text record.';
+      "# Initialize cUSDCv3 on Scroll\n\nThis proposal takes the governance steps recommended and necessary to initialize a Compound III USDC market on Scroll; upon execution, cUSDCv3 will be ready for use. Simulations have confirmed the market’s readiness, as much as possible, using the [Comet scenario suite](https://github.com/compound-finance/comet/tree/main/scenario). Although real tests have also been run over the Goerli/Scroll Alpha bridge, this will be the first proposal to actually bridge from Ethereum mainnet to Scroll mainnet, and therefore includes risks not present in previous proposals.\n\nAlthough the proposal sets the entire configuration in the Configurator, with parameters based off of the [recommendations from Gauntlet](https://www.comp.xyz/t/deploy-compound-iii-on-scroll/4917/3).\n\nFurther detailed information can be found on the corresponding [proposal pull request](https://github.com/compound-finance/comet/pull/824) and [forum discussion](https://www.comp.xyz/t/deploy-compound-iii-on-scroll/4917).\n\n\n## Proposal Actions\n\nThe first proposal action sets the Comet configuration and deploys a new Comet implementation on Scroll. This sends the encoded `setConfiguration` and `deployAndUpgradeTo` calls across the bridge to the governance receiver on Scroll. It also calls `setRewardConfig` on the Scroll rewards contract to establish Scroll’s bridged version of COMP as the reward token for the deployment (note that rewards speeds have been set to 0, as Gauntlet has recommended to hold off on including rewards in the comet deployment for now).\n\nThe second action approves Scroll’s [L1USDCGateway](https://etherscan.io/address/0xf1AF3b23DE0A5Ca3CAb7261cb0061C0D779A5c7B) to take Timelock's USDC, in order to seed the market reserves through the bridge.\n\nThe third action deposits 10K USDC from mainnet to the Scroll L1USDCGateway contract to bridge to Comet.\n\nThe fourth action updates the ENS TXT record `v3-official-markets` on `v3-additional-grants.compound-community-licenses.eth`, updating the official markets JSON to include the new Scroll cUSDCv3 market.";
     const txn = await govDeploymentManager.retry(async () =>
       trace(await governor.propose(...(await proposal(actions, description))))
     );

deployments/scroll/usdc/roots.json

@@ -1,12 +1,12 @@
 {
-    "comet": "0x66ffeb3340f263C209ED0477556cEc6f8Dae2e66",
-    "configurator": "0x51BcA85688acC4Ff31CEfC63006b35169E168a70",
-    "rewards": "0x341a826A93FF509776310f38111703Dc0744E5b4",
-    "bridgeReceiver": "0x022678DE7d582aBF16735551bB3ad77Ec9f99A5B",
+    "comet": "0xB2f97c1Bd3bf02f5e74d13f02E3e26F93D77CE44",
+    "configurator": "0xECAB0bEEa3e5DEa0c35d3E69468EAC20098032D7",
+    "rewards": "0x70167D30964cbFDc315ECAe02441Af747bE0c5Ee",
+    "bridgeReceiver": "0xC6bf5A64896D679Cf89843DbeC6c0f5d3C9b610D",
     "l2Messenger": "0x781e90f1c8Fc4611c9b7497C3B47F99Ef6969CbC",
     "l2ERC20Gateway": "0xE2b4795039517653c5Ae8C2A9BFdd783b48f447A",
     "l2ETHGateway": "0x6EA73e05AdC79974B931123675ea8F78FfdacDF0",
     "l2WETHGateway": "0x7003E7B7186f0E6601203b99F7B8DECBfA391cf9",
     "l2WstETHGateway": "0x8aE8f22226B9d789A36AC81474e633f8bE2856c9",
-    "bulker": "0xA5D3bedBAcAFCa95021c17748780889aA8DDbC23"
+    "bulker": "0x53C6D04e3EC7031105bAeA05B36cBc3C987C56fA"
 }