Deployment script mitigations

scripts/addresses/1-tmp-assets-collateral.json

@@ -6,26 +6,26 @@
     "CVX": "0x2635c3B92c8451F9D1e75BD61FCF87D1eCdf0ad0"
   },
   "collateral": {
-    "DAI": "0x7504ED02f3f151Df241ec2eb0bF1a9601fcb012a",
-    "USDC": "0xBBF50a582cC03cbbC7E228dc3196091301348B0e",
-    "USDT": "0xBC0DC981001B6673F615978B63818fD1F6B0FF98",
-    "aDAI": "0x9ea621376455B88E4022633399bcd1FfD7844210",
-    "aUSDC": "0x1645Dd4B47D7FbbFdF876061a9e7fE0eb3C72Eb1",
-    "aUSDT": "0x695980209248264Ff7FcD19f7Cc217376FEaE163",
-    "cDAI": "0xf8b09C5b3a1eacd095627fb1354665432DC1D077",
-    "cUSDC": "0x7A58646a44Dc460fe627f2fd76142b99832F0de6",
-    "cUSDT": "0xD3F81Fc6c575CE44283Fd48dA7f0337d8d3d24FB",
-    "cWBTC": "0x32Ab9216188F24434Dc629Acfa1554ab7623f300",
-    "cETH": "0x07b2b41037d89F91DC91aD1DDCCA3e8515FF049E",
-    "WBTC": "0xCab9805b012460C4E176Fb6b521c20d7bc43419F",
+    "DAI": "0x8A782e182EeE2299B3DB733659ea764A5a97AdC5",
+    "USDC": "0xDB665809eF5e2D8015c05504c242DDc2932AcDee",
+    "USDT": "0xd717d722074C8dBfd0a29F73E4638cCc49C7D53D",
+    "aDAI": "0x4615C29BbA8b2Fa32906A594e922285a09301f42",
+    "aUSDC": "0x0D346E98CECa2Fd7DE7BE3F53737D82BDE932117",
+    "aUSDT": "0x7B0E0081bf89E3307b3734d821D4297B33911C44",
+    "cDAI": "0x6394FE4995D03a2a463bae2C3A4406043dF760E8",
+    "cUSDC": "0x0072118C321181168E6643919074a0B518488637",
+    "cUSDT": "0xcAF032D20d09CEa9727Aa1dDf6F4E4367155d05e",
+    "cWBTC": "0xa58053D343299BD8818A70D5bfea0318Ca5ebEC5",
+    "cETH": "0x00a07ac1b3f9C5f7aD4C6935b1Cb2028DebB6555",
+    "WBTC": "0x7437047523dAe8116a94EF5FFAAB3A657e5dC60E",
     "WETH": "0x90c26f98cBE23666ED1E59186e1e4888512BE58d",
     "wstETH": "0xF156B8b44941C6f9c1Fd4825b0C6e50ecFDECfC7",
     "rETH": "0x81283be7aD5A6d6C4A085b4D694B127Ccf7E652E",
     "fUSDC": "0x73073c75ddaeC9Ce917f326e8fa860B8a773e5a3",
     "fUSDT": "0x169544B6422C6690457931259FAd8C0A76540A2E",
     "fDAI": "0x79ed64e67B846E483594C496F05B25835e53c614",
     "fFRAX": "0xBb7B4CAA808C9FA262095221299dbc873071CAF4",
-    "cUSDCv3": "0x309e7D2DF4fc528f8Fd58bE6ecF73293dd2e7e7f",
+    "cUSDCv3": "0x4D6F9A0F0F57A8179A146f37dD93D558073b814f",
     "cUSDTv3": "0xa52F93E61EdF1B77B2D680945F3EA4E84Bb825D3",
     "cvx3Pool": "0xE898cd20696fFE17489955101B97F3f9103B83aC",
     "cvxPayPool": "0xFDe02d56dec895f7769dC0505D98706f029738D2",
@@ -113,4 +113,4 @@
     "pyUSD": "0x6c3ea9036406852006290770bedfcaba0e23a0e8",
     "saEthRLUSD": "0x4C813CE4e2FF315f0213563A994c20BBF4637444"
   }
-}
+}

scripts/addresses/8453-tmp-assets-collateral.json

@@ -2,15 +2,15 @@
   "assets": {
     "COMP": "0xC9c37FC53682207844B058026024853A9C0b8c7B",
     "AERO": "0x7f7B77e49d5b30445f222764a794AFE14af062eB",
-    "STG": "0xe0E1d3c6f09DA01399e84699722B11308607BBfC"
+    "STG": "0x3962695aCce0Efce11cFf997890f3D1D7467ec40"
   },
   "collateral": {
-    "DAI": "0xD31eEc6679Dd18D5D42A92F32f01Ed98d4e91941",
-    "USDC": "0x18a26902126154437322fe01fBa04A36b093906f",
-    "USDbC": "0x27F672aAf061cb0b2640a4DFCCBd799cD1a7309A",
-    "WETH": "0x6a0Fc14d21247D4fDf7E12Ebe22307687b7750fb",
+    "DAI": "0x49A44d50d3B1E098DAC9402c4aF8D0C0E499F250",
+    "USDC": "0x33E840e5711549358f6d4D11F9Ab2896B36E9822",
+    "USDbC": "0xf003b8A8200F14db13f5F712EC8e76c41e7e9A7A",
+    "WETH": "0x2387C22727ACb91519b80A15AEf393ad40dFdb2F",
     "cbETH": "0x14c443d8BdbE9A65F3a23FA4e199d8741D5B38Fa",
-    "cUSDCv3": "0xdEBe74dc2A415e00bE8B4b9d1e6e0007153D006a",
+    "cUSDCv3": "0x41edAFFB50CA1c2FEC86C629F845b8490ced8A2c",
     "saBasUSDC": "0xa9F0eca90B5d4f213f8119834E0920785bb70F46",
     "wstETH": "0x9b2A9bAeB8F1930fC2AF9b7Fa473edF2B8c3B549",
     "aeroUSDCeUSD": "0x97F9d5ed17A0C99B279887caD5254d15fb1B619B",

scripts/addresses/base-4.2.0/8453-tmp-assets-collateral.json

@@ -2,15 +2,15 @@
   "assets": {
     "COMP": "0xC9c37FC53682207844B058026024853A9C0b8c7B",
     "AERO": "0x7f7B77e49d5b30445f222764a794AFE14af062eB",
-    "STG": "0xe0E1d3c6f09DA01399e84699722B11308607BBfC"
+    "STG": "0x3962695aCce0Efce11cFf997890f3D1D7467ec40"
   },
   "collateral": {
-    "DAI": "0xD31eEc6679Dd18D5D42A92F32f01Ed98d4e91941",
-    "USDC": "0x18a26902126154437322fe01fBa04A36b093906f",
-    "USDbC": "0x27F672aAf061cb0b2640a4DFCCBd799cD1a7309A",
-    "WETH": "0x6a0Fc14d21247D4fDf7E12Ebe22307687b7750fb",
+    "DAI": "0x49A44d50d3B1E098DAC9402c4aF8D0C0E499F250",
+    "USDC": "0x33E840e5711549358f6d4D11F9Ab2896B36E9822",
+    "USDbC": "0xf003b8A8200F14db13f5F712EC8e76c41e7e9A7A",
+    "WETH": "0x2387C22727ACb91519b80A15AEf393ad40dFdb2F",
     "cbETH": "0x14c443d8BdbE9A65F3a23FA4e199d8741D5B38Fa",
-    "cUSDCv3": "0xdEBe74dc2A415e00bE8B4b9d1e6e0007153D006a",
+    "cUSDCv3": "0x41edAFFB50CA1c2FEC86C629F845b8490ced8A2c",
     "saBasUSDC": "0xa9F0eca90B5d4f213f8119834E0920785bb70F46",
     "wstETH": "0x9b2A9bAeB8F1930fC2AF9b7Fa473edF2B8c3B549",
     "aeroUSDCeUSD": "0x97F9d5ed17A0C99B279887caD5254d15fb1B619B",
@@ -43,4 +43,4 @@
     "meUSD": "0xbb819D845b573B5D7C538F5b85057160cfb5f313",
     "wsuperOETHb": "0x7FcD174E80f264448ebeE8c88a7C4476AAF58Ea6"
   }
-}
+}

scripts/addresses/mainnet-4.2.0/1-tmp-assets-collateral.json

@@ -6,26 +6,26 @@
     "CVX": "0x2635c3B92c8451F9D1e75BD61FCF87D1eCdf0ad0"
   },
   "collateral": {
-    "DAI": "0x7504ED02f3f151Df241ec2eb0bF1a9601fcb012a",
-    "USDC": "0xBBF50a582cC03cbbC7E228dc3196091301348B0e",
-    "USDT": "0xBC0DC981001B6673F615978B63818fD1F6B0FF98",
-    "aDAI": "0x9ea621376455B88E4022633399bcd1FfD7844210",
-    "aUSDC": "0x1645Dd4B47D7FbbFdF876061a9e7fE0eb3C72Eb1",
-    "aUSDT": "0x695980209248264Ff7FcD19f7Cc217376FEaE163",
-    "cDAI": "0xf8b09C5b3a1eacd095627fb1354665432DC1D077",
-    "cUSDC": "0x7A58646a44Dc460fe627f2fd76142b99832F0de6",
-    "cUSDT": "0xD3F81Fc6c575CE44283Fd48dA7f0337d8d3d24FB",
-    "cWBTC": "0x32Ab9216188F24434Dc629Acfa1554ab7623f300",
-    "cETH": "0x07b2b41037d89F91DC91aD1DDCCA3e8515FF049E",
-    "WBTC": "0xCab9805b012460C4E176Fb6b521c20d7bc43419F",
+    "DAI": "0x8A782e182EeE2299B3DB733659ea764A5a97AdC5",
+    "USDC": "0xDB665809eF5e2D8015c05504c242DDc2932AcDee",
+    "USDT": "0xd717d722074C8dBfd0a29F73E4638cCc49C7D53D",
+    "aDAI": "0x4615C29BbA8b2Fa32906A594e922285a09301f42",
+    "aUSDC": "0x0D346E98CECa2Fd7DE7BE3F53737D82BDE932117",
+    "aUSDT": "0x7B0E0081bf89E3307b3734d821D4297B33911C44",
+    "cDAI": "0x6394FE4995D03a2a463bae2C3A4406043dF760E8",
+    "cUSDC": "0x0072118C321181168E6643919074a0B518488637",
+    "cUSDT": "0xcAF032D20d09CEa9727Aa1dDf6F4E4367155d05e",
+    "cWBTC": "0xa58053D343299BD8818A70D5bfea0318Ca5ebEC5",
+    "cETH": "0x00a07ac1b3f9C5f7aD4C6935b1Cb2028DebB6555",
+    "WBTC": "0x7437047523dAe8116a94EF5FFAAB3A657e5dC60E",
     "WETH": "0x90c26f98cBE23666ED1E59186e1e4888512BE58d",
     "wstETH": "0xF156B8b44941C6f9c1Fd4825b0C6e50ecFDECfC7",
     "rETH": "0x81283be7aD5A6d6C4A085b4D694B127Ccf7E652E",
     "fUSDC": "0x73073c75ddaeC9Ce917f326e8fa860B8a773e5a3",
     "fUSDT": "0x169544B6422C6690457931259FAd8C0A76540A2E",
     "fDAI": "0x79ed64e67B846E483594C496F05B25835e53c614",
     "fFRAX": "0xBb7B4CAA808C9FA262095221299dbc873071CAF4",
-    "cUSDCv3": "0x309e7D2DF4fc528f8Fd58bE6ecF73293dd2e7e7f",
+    "cUSDCv3": "0x4D6F9A0F0F57A8179A146f37dD93D558073b814f",
     "cUSDTv3": "0xa52F93E61EdF1B77B2D680945F3EA4E84Bb825D3",
     "cvx3Pool": "0xE898cd20696fFE17489955101B97F3f9103B83aC",
     "cvxPayPool": "0xFDe02d56dec895f7769dC0505D98706f029738D2",

scripts/deployment/phase2-assets/2_deploy_collateral.ts

@@ -77,7 +77,7 @@ async function main() {
     fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2))
   }
 
-  const usdcOracleTimeout = '86400'
+  const usdcOracleTimeout = baseL2Chains.includes(hre.network.name) ? '86400' : '82800' // 24h base, 23 hr mainnet
   const usdcOracleError = getUsdcOracleError(hre.network.name)
 
   /********  Deploy Fiat Collateral - USDC  **************************/
@@ -240,7 +240,7 @@ async function main() {
       oracleError: fp('0.0025').toString(), // 0.25%
       staticAToken: erc20,
       maxTradeVolume: fp('1e6').toString(), // $1m,
-      oracleTimeout: '86400', // 24 hr
+      oracleTimeout: usdcOracleTimeout, // 24h base, 23 hr mainnet
       targetName: hre.ethers.utils.formatBytes32String('USD'),
       defaultThreshold: fp('0.0125').toString(), // 1.25%
       delayUntilDefault: bn('86400').toString(), // 24h
@@ -306,7 +306,7 @@ async function main() {
     fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2))
   }
 
-  const wbtcOracleError = fp('0.02') // 2%
+  const wbtcOracleError = fp('0.005') // 0.5%
   const btcOracleError = fp('0.005') // 0.5%
   const combinedBTCWBTCError = combinedError(wbtcOracleError, btcOracleError)
 
@@ -342,7 +342,7 @@ async function main() {
       oracleError: fp('0.0025').toString(), // 0.25%
       cToken: networkConfig[chainId].tokens.cUSDC,
       maxTradeVolume: fp('1e6').toString(), // $1m,
-      oracleTimeout: '86400', // 24 hr
+      oracleTimeout: usdcOracleTimeout, // 24h base, 23 hr mainnet
       targetName: hre.ethers.utils.formatBytes32String('USD'),
       defaultThreshold: fp('0.0125').toString(), // 1.25%
       delayUntilDefault: bn('86400').toString(), // 24h

scripts/deployment/phase2-assets/assets/deploy_stg.ts

@@ -40,7 +40,7 @@ async function main() {
   const { asset: stgAsset } = await hre.run('deploy-asset', {
     priceTimeout: priceTimeout.toString(),
     priceFeed: networkConfig[chainId].chainlinkFeeds.STG,
-    oracleError: fp('0.05').toString(), // 5%
+    oracleError: fp('0.02').toString(), // 2%
     tokenAddress: networkConfig[chainId].tokens.STG,
     maxTradeVolume: fp('1e6').toString(), // $1m,
     oracleTimeout: '86400', // 24 hr

scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts

@@ -57,7 +57,7 @@ async function main() {
 
   /********  Deploy Aave V3 pyUSD ERC20  **************************/
 
-  let saEthPyUSD = networkConfig[chainId].tokens.saEthPyUSD!
+  let saEthPyUSD = networkConfig[chainId].tokens.saEthPyUSD
 
   if (!saEthPyUSD) {
     const erc20 = await StaticATokenFactory.deploy(

scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts

@@ -58,17 +58,18 @@ async function main() {
   const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral')
 
   const StaticATokenFactory = await hre.ethers.getContractFactory('StaticATokenV3LM')
-  const erc20 = await StaticATokenFactory.deploy(
-    networkConfig[chainId].AAVE_V3_POOL!,
-    networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER!
-  )
-  await erc20.deployed()
 
   /********  Deploy Aave V3 USDC wrapper  **************************/
 
   if (arbitrumL2Chains.includes(hre.network.name)) {
     // === Arbitrum ===
 
+    const erc20 = await StaticATokenFactory.deploy(
+      networkConfig[chainId].AAVE_V3_POOL!,
+      networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER!
+    )
+    await erc20.deployed()
+
     await (
       await erc20.initialize(
         networkConfig[chainId].tokens.aArbUSDCn!,
@@ -109,9 +110,15 @@ async function main() {
   } else if (baseL2Chains.includes(hre.network.name)) {
     // === Base ===
 
-    let saBasUSDC = networkConfig[chainId].tokens.saBasUSDC!
+    let saBasUSDC = networkConfig[chainId].tokens.saBasUSDC
 
     if (!saBasUSDC) {
+      const erc20 = await StaticATokenFactory.deploy(
+        networkConfig[chainId].AAVE_V3_POOL!,
+        networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER!
+      )
+      await erc20.deployed()
+
       await (
         await erc20.initialize(
           networkConfig[chainId].tokens.aBasUSDC!,
@@ -154,9 +161,15 @@ async function main() {
   } else {
     // === Mainnet ===
 
-    let saEthUSDC = networkConfig[chainId].tokens.saEthUSDC!
+    let saEthUSDC = networkConfig[chainId].tokens.saEthUSDC
 
     if (!saEthUSDC) {
+      const erc20 = await StaticATokenFactory.deploy(
+        networkConfig[chainId].AAVE_V3_POOL!,
+        networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER!
+      )
+      await erc20.deployed()
+
       await (
         await erc20.initialize(
           networkConfig[chainId].tokens.aEthUSDC!,

scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdt.ts

@@ -54,17 +54,18 @@ async function main() {
 
   const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral')
   const StaticATokenFactory = await hre.ethers.getContractFactory('StaticATokenV3LM')
-  const erc20 = await StaticATokenFactory.deploy(
-    networkConfig[chainId].AAVE_V3_POOL!,
-    networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER!
-  )
-  await erc20.deployed()
 
   /********  Deploy Aave V3 USDT wrapper  **************************/
 
   if (arbitrumL2Chains.includes(hre.network.name)) {
     // === Arbitrum ===
 
+    const erc20 = await StaticATokenFactory.deploy(
+      networkConfig[chainId].AAVE_V3_POOL!,
+      networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER!
+    )
+    await erc20.deployed()
+
     await (
       await erc20.initialize(
         networkConfig[chainId].tokens.aArbUSDT!,
@@ -108,9 +109,15 @@ async function main() {
   } else {
     // === Mainnet ===
 
-    let saEthUSDT = networkConfig[chainId].tokens.saEthUSDT!
+    let saEthUSDT = networkConfig[chainId].tokens.saEthUSDT
 
     if (!saEthUSDT) {
+      const erc20 = await StaticATokenFactory.deploy(
+        networkConfig[chainId].AAVE_V3_POOL!,
+        networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER!
+      )
+      await erc20.deployed()
+
       await (
         await erc20.initialize(
           networkConfig[chainId].tokens.aEthUSDT!,

scripts/deployment/phase2-assets/collaterals/deploy_convex_3pool_collateral.ts

@@ -88,7 +88,7 @@ async function main() {
       priceTimeout: PRICE_TIMEOUT,
       chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero
       oracleError: bn('1'), // unused but cannot be zero
-      oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts
+      oracleTimeout: bn('1'), // unused but cannot be zero
       maxTradeVolume: MAX_TRADE_VOL,
       defaultThreshold: DEFAULT_THRESHOLD,
       delayUntilDefault: DELAY_UNTIL_DEFAULT,

scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts

@@ -101,7 +101,7 @@ async function main() {
         priceTimeout: PRICE_TIMEOUT,
         chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero
         oracleError: bn('1'), // unused but cannot be zero
-        oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts
+        oracleTimeout: bn('1'), // unused but cannot be zero
         maxTradeVolume: MAX_TRADE_VOL,
         defaultThreshold: DEFAULT_THRESHOLD,
         delayUntilDefault: DELAY_UNTIL_DEFAULT,
@@ -135,7 +135,7 @@ async function main() {
         priceTimeout: PRICE_TIMEOUT,
         chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero
         oracleError: bn('1'), // unused but cannot be zero
-        oracleTimeout: ARB_USDC_ORACLE_TIMEOUT, // max of oracleTimeouts
+        oracleTimeout: bn('1'), // unused but cannot be zero
         maxTradeVolume: MAX_TRADE_VOL,
         defaultThreshold: combinedError(ARB_crvUSD_ORACLE_ERROR, ARB_USDC_ORACLE_ERROR)
           .add(fp('0.01'))

scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts

@@ -101,7 +101,7 @@ async function main() {
         priceTimeout: PRICE_TIMEOUT,
         chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero
         oracleError: bn('1'), // unused but cannot be zero
-        oracleTimeout: USDT_ORACLE_TIMEOUT, // max of oracleTimeouts
+        oracleTimeout: bn('1'), // unused but cannot be zero
         maxTradeVolume: MAX_TRADE_VOL,
         defaultThreshold: DEFAULT_THRESHOLD,
         delayUntilDefault: DELAY_UNTIL_DEFAULT,
@@ -135,7 +135,7 @@ async function main() {
         priceTimeout: PRICE_TIMEOUT,
         chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero
         oracleError: bn('1'), // unused but cannot be zero
-        oracleTimeout: ARB_USDT_ORACLE_TIMEOUT, // max of oracleTimeouts
+        oracleTimeout: bn('1'), // unused but cannot be zero
         maxTradeVolume: MAX_TRADE_VOL,
         defaultThreshold: combinedError(ARB_crvUSD_ORACLE_ERROR, ARB_USDT_ORACLE_ERROR)
           .add(fp('0.01'))

scripts/deployment/phase2-assets/collaterals/deploy_convex_paypool_collateral.ts

@@ -84,7 +84,7 @@ async function main() {
       priceTimeout: PRICE_TIMEOUT,
       chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero
       oracleError: bn('1'), // unused but cannot be zero
-      oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts
+      oracleTimeout: bn('1'), // unused but cannot be zero
       maxTradeVolume: MAX_TRADE_VOL,
       defaultThreshold: DEFAULT_THRESHOLD,
       delayUntilDefault: DELAY_UNTIL_DEFAULT,

scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts

@@ -88,7 +88,7 @@ async function main() {
         priceTimeout: PRICE_TIMEOUT,
         chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero
         oracleError: bn('1'), // unused but cannot be zero
-        oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts
+        oracleTimeout: bn('1'), // unused but cannot be zero
         maxTradeVolume: MAX_TRADE_VOL,
         defaultThreshold: DEFAULT_THRESHOLD, // 2%: 1% error on FRAX oracle + 1% base defaultThreshold
         delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT,

scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts

@@ -1,7 +1,7 @@
 import fs from 'fs'
 import hre from 'hardhat'
 import { getChainId } from '../../../../common/blockchain-utils'
-import { networkConfig } from '../../../../common/configuration'
+import { baseL2Chains, networkConfig } from '../../../../common/configuration'
 import { bn, fp } from '../../../../common/numbers'
 import { expect } from 'chai'
 import { CollateralStatus } from '../../../../common/constants'
@@ -64,7 +64,7 @@ async function main() {
 
   const CTokenV3Factory: ContractFactory = await hre.ethers.getContractFactory('CTokenV3Collateral')
 
-  const usdcOracleTimeout = '82800' // 23 hr
+  const usdcOracleTimeout = baseL2Chains.includes(hre.network.name) ? '86400' : '82800' // 24h base, 23 hr mainnet
   const usdcOracleError = getUsdcOracleError(hre.network.name)
 
   const collateral = <CTokenV3Collateral>await CTokenV3Factory.connect(deployer).deploy(
@@ -74,7 +74,7 @@ async function main() {
       oracleError: usdcOracleError.toString(),
       erc20: erc20,
       maxTradeVolume: fp('1e6').toString(), // $1m,
-      oracleTimeout: usdcOracleTimeout, // 24h hr,
+      oracleTimeout: usdcOracleTimeout, // 24h base, 23 hr mainnet
       targetName: hre.ethers.utils.formatBytes32String('USD'),
       defaultThreshold: fp('0.01').add(usdcOracleError).toString(),
       delayUntilDefault: bn('86400').toString(), // 24h

scripts/deployment/phase2-assets/collaterals/deploy_morphoeUSD.ts

@@ -58,7 +58,7 @@ async function main() {
     ).deploy(
       {
         priceTimeout: PRICE_TIMEOUT.toString(),
-        chainlinkFeed: networkConfig[chainId].chainlinkFeeds.eUSD,
+        chainlinkFeed: networkConfig[chainId].chainlinkFeeds.eUSD!,
         oracleError: eUSD_ORACLE_ERROR.toString(),
         erc20: networkConfig[chainId].tokens.meUSD,
         maxTradeVolume: fp('1e6').toString(), // 17m vault

scripts/deployment/phase2-assets/collaterals/deploy_sky_susds.ts

@@ -54,7 +54,7 @@ async function main() {
       oracleError: ORACLE_ERROR.toString(), // 0.3%
       erc20: networkConfig[chainId].tokens.sUSDS,
       maxTradeVolume: fp('1e6').toString(), // $1m,
-      oracleTimeout: ORACLE_TIMEOUT.toString(), // 24h
+      oracleTimeout: ORACLE_TIMEOUT.toString(), // 23h
       targetName: hre.ethers.utils.formatBytes32String('USD'),
       defaultThreshold: ORACLE_ERROR.add(fp('0.01')).toString(), // 1.3%
       delayUntilDefault: bn('86400').toString(), // 24h