Deploy Arbitrum goerli for usdc native

.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, base-goerli, base-goerli-weth, linea-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-goerli, base-goerli-weth, linea-goerli]
     name: Run scenarios
     env:
       ETHERSCAN_KEY: ${{ secrets.ETHERSCAN_KEY }}

README.md

@@ -232,11 +232,16 @@ These simulations are extremely useful for testing deployments before actually c
 
 #### Deploy Workflow
 
-0. Create the deployment script and configuration file, and test locally
-1. Open a PR containing the new deployment directory files
-2. Trigger the `deploy-market` workflow action through the GitHub UI
-3. Inspect the new `roots.json` which the workflow automatically commited to your PR
-4. Start using the new protocol deployment and/or create further migrations to modify it
+1. Create the deployment script and configuration file, and test locally
+2. Open a PR containing the new deployment directory files
+3. Trigger the `deploy-market` workflow action through the GitHub UI
+4. Inspect the new `roots.json` which the workflow automatically commited to your PR
+5. Start using the new protocol deployment and/or create further migrations to modify it
+
+##### Deploy Script Gotchas and Tips
+
+- If the deploy script is for a new market on a chain with an existing market, make sure to call 'setFactory(address,address)' in the initialization migration script.
+(TODO: Scenarios will fail prior to running the migration script because the factory will not be set during deployment, will need to figure out a better way)
 
 ##### Verifying Deployments
 

deployments/arbitrum-goerli/usdc.e/configuration.json

@@ -0,0 +1,56 @@
+{
+  "name": "Compound USDC",
+  "symbol": "cUSDCv3",
+  "baseToken": "USDC.e",
+  "baseTokenAddress": "0x8FB1E3fC51F3b789dED7557E680551d93Ea9d892",
+  "baseTokenPriceFeed": "0x1692Bdd32F31b831caAc1b0c9fAF68613682813b",
+  "borrowMin": "100e6",
+  "pauseGuardian": "0x6C2fD6738e43ce0cc4A6f23a37e3a733516794A0",
+  "storeFrontPriceFactor": 0.5,
+  "targetReserves": "5000000e6",
+  "rates": {
+    "supplyKink": 0.8,
+    "supplySlopeLow": 0.0325,
+    "supplySlopeHigh": 0.4,
+    "supplyBase": 0,
+    "borrowKink": 0.8,
+    "borrowSlopeLow": 0.035,
+    "borrowSlopeHigh": 0.25,
+    "borrowBase": 0.015
+  },
+  "tracking": {
+    "indexScale": "1e15",
+    "baseSupplySpeed": "0e15",
+    "baseBorrowSpeed": "0e15",
+    "baseMinForRewards": "10000e6"
+  },
+  "assets": {
+    "LINK": {
+      "address": "0xbb7303602be1b9149b097aafb094ffce1860e532",
+      "priceFeed": "0xd28Ba6CA3bB72bF371b80a2a0a33cBcf9073C954",
+      "decimals": "18",
+      "borrowCF": 0.775,
+      "liquidateCF": 0.825,
+      "liquidationFactor": 0.95,
+      "supplyCap": "5000000e18"
+    },
+    "WETH": {
+      "address": "0xe39ab88f8a4777030a534146a9ca3b52bd5d43a3",
+      "priceFeed": "0x62CAe0FA2da220f43a51F86Db2EDb36DcA9A5A08",
+      "decimals": "18",
+      "borrowCF": 0.775,
+      "liquidateCF": 0.825,
+      "liquidationFactor": 0.95,
+      "supplyCap": "5000e18"
+    },
+    "WBTC": {
+      "address": "0x22d5e2dE578677791f6c90e0110Ec629be9d5Fb5",
+      "priceFeed": "0x6550bc2301936011c1334555e62A87705A81C12C",
+      "decimals": "8",
+      "borrowCF": 0.7,
+      "liquidateCF": 0.75,
+      "liquidationFactor": 0.93,
+      "supplyCap": "300e8"
+    }
+  }
+}

deployments/arbitrum-goerli/usdc.e/deploy.ts

@@ -0,0 +1,70 @@
+import { Deployed, DeploymentManager } from '../../../plugins/deployment_manager';
+import { DeploySpec, deployComet } from '../../../src/deploy';
+
+const SECONDS_PER_DAY = 24 * 60 * 60;
+
+const GOERLI_TIMELOCK = '0x8Fa336EB4bF58Cfc508dEA1B0aeC7336f55B1399';
+
+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 USDC = await deploymentManager.existing('USDC', '0x8FB1E3fC51F3b789dED7557E680551d93Ea9d892', 'arbitrum-goerli');
+  const LINK = await deploymentManager.existing('LINK', '0xbb7303602be1b9149b097aafb094ffce1860e532', 'arbitrum-goerli');
+  const WETH = await deploymentManager.existing('WETH', '0xe39ab88f8a4777030a534146a9ca3b52bd5d43a3', 'arbitrum-goerli');
+  const WBTC = await deploymentManager.existing('WBTC', '0x22d5e2dE578677791f6c90e0110Ec629be9d5Fb5', 'arbitrum-goerli');
+
+  // Deploy ArbitrumBridgeReceiver
+  const bridgeReceiver = await deploymentManager.deploy(
+    'bridgeReceiver',
+    'bridges/arbitrum/ArbitrumBridgeReceiver.sol',
+    []
+  );
+
+  // Deploy Local Timelock
+  const localTimelock = await deploymentManager.deploy(
+    'timelock',
+    'vendor/Timelock.sol',
+    [
+      bridgeReceiver.address, // admin
+      10 * 60,                // delay
+      14 * SECONDS_PER_DAY,   // grace period
+      10 * 60,                // minimum delay
+      30 * SECONDS_PER_DAY    // maximum delay
+    ]
+  );
+
+  // Initialize ArbitrumBridgeReceiver
+  await deploymentManager.idempotent(
+    async () => !(await bridgeReceiver.initialized()),
+    async () => {
+      trace(`Initializing BridgeReceiver`);
+      await bridgeReceiver.initialize(
+        GOERLI_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,
+    bulker
+  };
+}

deployments/arbitrum-goerli/usdc.e/relations.ts

@@ -0,0 +1,29 @@
+import baseRelationConfig from '../../relations';
+
+export default {
+  ...baseRelationConfig,
+  governor: {
+    artifact: 'contracts/bridges/arbitrum/ArbitrumBridgeReceiver.sol:ArbitrumBridgeReceiver'
+  },
+  ClonableBeaconProxy: {
+    artifact: 'contracts/ERC20.sol:ERC20'
+  },
+  // USDC
+  '0x8FB1E3fC51F3b789dED7557E680551d93Ea9d892': {
+    artifact: 'contracts/ERC20.sol:ERC20',
+    delegates: {
+      field: {
+        slot: '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'
+      }
+    }
+  },
+  // WETH
+  '0xe39ab88f8a4777030a534146a9ca3b52bd5d43a3': {
+    artifact: 'contracts/ERC20.sol:ERC20',
+    delegates: {
+      field: {
+        slot: '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'
+      }
+    }
+  }
+};

deployments/arbitrum-goerli/usdc.e/roots.json

@@ -0,0 +1,7 @@
+{
+    "comet": "0x1d573274E19174260c5aCE3f2251598959d24456",
+    "configurator": "0x1Ead344570F0f0a0cD86d95d8adDC7855C8723Fb",
+    "rewards": "0x8DA65F8E3Aa22A498211fc4204C498ae9050DAE4",
+    "bridgeReceiver": "0xAC9fC1a9532BC92a9f33eD4c6Ce4A7a54930F376",
+    "bulker": "0x987350Af5a17b6DdafeB95E6e329c178f44841d7"
+}

deployments/arbitrum-goerli/usdc/configuration.json

@@ -2,9 +2,9 @@
   "name": "Compound USDC",
   "symbol": "cUSDCv3",
   "baseToken": "USDC",
-  "baseTokenAddress": "0x8FB1E3fC51F3b789dED7557E680551d93Ea9d892",
+  "baseTokenAddress": "0xfd064A18f3BF249cf1f87FC203E90D8f650f2d63",
   "baseTokenPriceFeed": "0x1692Bdd32F31b831caAc1b0c9fAF68613682813b",
-  "borrowMin": "100e6",
+  "borrowMin": "1e6",
   "pauseGuardian": "0x6C2fD6738e43ce0cc4A6f23a37e3a733516794A0",
   "storeFrontPriceFactor": 0.5,
   "targetReserves": "5000000e6",
@@ -20,8 +20,8 @@
   },
   "tracking": {
     "indexScale": "1e15",
-    "baseSupplySpeed": "0e15",
-    "baseBorrowSpeed": "0e15",
+    "baseSupplySpeed": "0.000402083333333e15",
+    "baseBorrowSpeed": "0.000402083333333e15",
     "baseMinForRewards": "10000e6"
   },
   "assets": {

deployments/arbitrum-goerli/usdc/deploy.ts

@@ -10,61 +10,28 @@ export default async function deploy(deploymentManager: DeploymentManager, deplo
   const ethers = deploymentManager.hre.ethers;
 
   // pull in existing assets
-  const USDC = await deploymentManager.existing('USDC', '0x8FB1E3fC51F3b789dED7557E680551d93Ea9d892', 'arbitrum-goerli');
+  const USDC = await deploymentManager.existing('USDC', '0xfd064A18f3BF249cf1f87FC203E90D8f650f2d63', 'arbitrum-goerli');
   const LINK = await deploymentManager.existing('LINK', '0xbb7303602be1b9149b097aafb094ffce1860e532', 'arbitrum-goerli');
   const WETH = await deploymentManager.existing('WETH', '0xe39ab88f8a4777030a534146a9ca3b52bd5d43a3', 'arbitrum-goerli');
   const WBTC = await deploymentManager.existing('WBTC', '0x22d5e2dE578677791f6c90e0110Ec629be9d5Fb5', 'arbitrum-goerli');
 
-  // Deploy ArbitrumBridgeReceiver
-  const bridgeReceiver = await deploymentManager.deploy(
-    'bridgeReceiver',
-    'bridges/arbitrum/ArbitrumBridgeReceiver.sol',
-    []
-  );
-
-  // Deploy Local Timelock
-  const localTimelock = await deploymentManager.deploy(
-    'timelock',
-    'vendor/Timelock.sol',
-    [
-      bridgeReceiver.address, // admin
-      10 * 60,                // delay
-      14 * SECONDS_PER_DAY,   // grace period
-      10 * 60,                // minimum delay
-      30 * SECONDS_PER_DAY    // maximum delay
-    ]
-  );
-
-  // Initialize ArbitrumBridgeReceiver
-  await deploymentManager.idempotent(
-    async () => !(await bridgeReceiver.initialized()),
-    async () => {
-      trace(`Initializing BridgeReceiver`);
-      await bridgeReceiver.initialize(
-        GOERLI_TIMELOCK,      // govTimelock
-        localTimelock.address // localTimelock
-      );
-      trace(`BridgeReceiver initialized`);
-    }
-  );
+  // Import shared contracts from cUSDCv3
+  const cometAdmin = await deploymentManager.fromDep('cometAdmin', 'arbitrum-goerli', 'usdc.e');
+  const cometFactory = await deploymentManager.fromDep('cometFactory', 'arbitrum-goerli', 'usdc.e');
+  const $configuratorImpl = await deploymentManager.fromDep('configurator:implementation', 'arbitrum-goerli', 'usdc.e');
+  const configurator = await deploymentManager.fromDep('configurator', 'arbitrum-goerli', 'usdc.e');
+  const rewards = await deploymentManager.fromDep('rewards', 'arbitrum-goerli', 'usdc.e');
+  const bulker = await deploymentManager.fromDep('bulker', 'arbitrum-goerli', 'usdc.e');
+  const localTimelock = await deploymentManager.fromDep('timelock', 'arbitrum-goerli', 'usdc.e');
+  const bridgeReceiver = await deploymentManager.fromDep('bridgeReceiver', 'arbitrum-goerli', 'usdc.e');
 
   // 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,
-    bulker
+    bulker,
+    rewards,
   };
 }