arbitrum crvusd crvusdt deployments (#1142)

reserve-protocol · May 23, 2024 · 5aecbfc · 5aecbfc
1 parent 30058cc
commit 5aecbfc
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 16 deletions.
diff --git a/scripts/addresses/arbitrum-3.4.0/42161-tmp-assets-collateral.json b/scripts/addresses/arbitrum-3.4.0/42161-tmp-assets-collateral.json
@@ -9,7 +9,9 @@
     "USDT": "0x3Ac8F000D75a2EA4a9a36c6844410926bc0c32f7",
     "saArbUSDCn": "0x7be9Bc50734820516693A376238Cc6Bf029BA682",
     "saArbUSDT": "0x529D7e23Ce63efdcE41dA2a41296Fd7399157F5b",
-    "cUSDCv3": "0x8a5DfEa5cdA35AB374ac558951A3dF1437A6FcA6"
+    "cUSDCv3": "0x8a5DfEa5cdA35AB374ac558951A3dF1437A6FcA6",
+    "cvxCrvUSDUSDT": "0xf729b03AcbD60c8aF9B449d51444445815a56d0e",
+    "cvxCrvUSDUSDC": "0x57547D29cf0D5B4d31c6c71Ec73b3A8c8416ade6"
   },
   "erc20s": {
     "COMP": "0x354A6dA3fcde098F8389cad84b0182725c6C91dE",
@@ -19,6 +21,8 @@
     "saArbUSDCn": "0x030cDeCBDcA6A34e8De3f49d1798d5f70E3a3414",
     "saArbUSDT": "0xffef97179f58a582dEf73e6d2e4BcD2BDC8ca128",
     "cUSDCv3": "0xd54804250E9C561AEa9Dee34e9cf2342f767ACC5",
-    "ARB": "0x912ce59144191c1204e64559fe8253a0e49e6548"
+    "ARB": "0x912ce59144191c1204e64559fe8253a0e49e6548",
+    "cvxCrvUSDUSDT": "0xf74d4C9b0F49fb70D8Ff6706ddF39e3a16D61E67",
+    "cvxCrvUSDUSDC": "0xBFEE9F3E015adC754066424AEd535313dc764116"
   }
-}
+}
diff --git a/scripts/addresses/arbitrum-3.4.0/42161-tmp-deployments.json b/scripts/addresses/arbitrum-3.4.0/42161-tmp-deployments.json
@@ -35,4 +35,4 @@
       "stRSR": "0x437b525F96A2Da0A4b165efe27c61bea5c8d3CD4"
     }
   }
-}
+}
diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts
@@ -2,7 +2,7 @@ import fs from 'fs'
 import hre, { ethers } from 'hardhat'
 import { getChainId } from '../../../../common/blockchain-utils'
 import { arbitrumL2Chains, networkConfig } from '../../../../common/configuration'
-import { bn } from '../../../../common/numbers'
+import { bn, fp } from '../../../../common/numbers'
 import { expect } from 'chai'
 import { CollateralStatus, ONE_ADDRESS } from '../../../../common/constants'
 import {
@@ -18,7 +18,7 @@ import {
   L2ConvexStableCollateral,
   IConvexRewardPool,
 } from '../../../../typechain'
-import { revenueHiding } from '../../utils'
+import { combinedError, revenueHiding } from '../../utils'
 import {
   CurvePoolType,
   DEFAULT_THRESHOLD,
@@ -129,7 +129,9 @@ async function main() {
         oracleError: bn('1'), // unused but cannot be zero
         oracleTimeout: ARB_USDC_ORACLE_TIMEOUT, // max of oracleTimeouts
         maxTradeVolume: MAX_TRADE_VOL,
-        defaultThreshold: DEFAULT_THRESHOLD,
+        defaultThreshold: combinedError(ARB_crvUSD_ORACLE_ERROR, ARB_USDC_ORACLE_ERROR)
+          .add(fp('0.01'))
+          .toString(),
         delayUntilDefault: DELAY_UNTIL_DEFAULT,
       },
       revenueHiding.toString(),

diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts
@@ -2,7 +2,7 @@ import fs from 'fs'
 import hre, { ethers } from 'hardhat'
 import { getChainId } from '../../../../common/blockchain-utils'
 import { arbitrumL2Chains, networkConfig } from '../../../../common/configuration'
-import { bn } from '../../../../common/numbers'
+import { bn, fp } from '../../../../common/numbers'
 import { expect } from 'chai'
 import { CollateralStatus, ONE_ADDRESS } from '../../../../common/constants'
 import {
@@ -18,7 +18,7 @@ import {
   L2ConvexStableCollateral,
   IConvexRewardPool,
 } from '../../../../typechain'
-import { revenueHiding } from '../../utils'
+import { combinedError, revenueHiding } from '../../utils'
 import {
   CurvePoolType,
   DEFAULT_THRESHOLD,
@@ -129,7 +129,9 @@ async function main() {
         oracleError: bn('1'), // unused but cannot be zero
         oracleTimeout: ARB_USDT_ORACLE_TIMEOUT, // max of oracleTimeouts
         maxTradeVolume: MAX_TRADE_VOL,
-        defaultThreshold: DEFAULT_THRESHOLD,
+        defaultThreshold: combinedError(ARB_crvUSD_ORACLE_ERROR, ARB_USDT_ORACLE_ERROR)
+          .add(fp('0.01'))
+          .toString(),
         delayUntilDefault: DELAY_UNTIL_DEFAULT,
       },
       revenueHiding.toString(),

diff --git a/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts b/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts
@@ -1,15 +1,15 @@
 import hre, { ethers } from 'hardhat'
 import { getChainId } from '../../../common/blockchain-utils'
 import { arbitrumL2Chains, developmentChains, networkConfig } from '../../../common/configuration'
-import { bn } from '../../../common/numbers'
+import { bn, fp } from '../../../common/numbers'
 import { ONE_ADDRESS } from '../../../common/constants'
 import {
   getDeploymentFile,
   getAssetCollDeploymentFilename,
   IAssetCollDeployments,
 } from '../../deployment/common'
 import { verifyContract } from '../../deployment/utils'
-import { revenueHiding } from '../../deployment/utils'
+import { combinedError, revenueHiding } from '../../deployment/utils'
 import {
   CurvePoolType,
   DEFAULT_THRESHOLD,
@@ -112,7 +112,9 @@ async function main() {
           oracleError: bn('1'), // unused but cannot be zero
           oracleTimeout: ARB_USDC_ORACLE_TIMEOUT, // max of oracleTimeouts
           maxTradeVolume: MAX_TRADE_VOL,
-          defaultThreshold: DEFAULT_THRESHOLD,
+          defaultThreshold: combinedError(ARB_crvUSD_ORACLE_ERROR, ARB_USDC_ORACLE_ERROR)
+            .add(fp('0.01'))
+            .toString(),
           delayUntilDefault: DELAY_UNTIL_DEFAULT,
         },
         revenueHiding.toString(),

diff --git a/scripts/verification/collateral-plugins/verify_convex_crvusd_usdt.ts b/scripts/verification/collateral-plugins/verify_convex_crvusd_usdt.ts
@@ -1,15 +1,15 @@
 import hre, { ethers } from 'hardhat'
 import { getChainId } from '../../../common/blockchain-utils'
 import { arbitrumL2Chains, developmentChains, networkConfig } from '../../../common/configuration'
-import { bn } from '../../../common/numbers'
+import { bn, fp } from '../../../common/numbers'
 import { ONE_ADDRESS } from '../../../common/constants'
 import {
   getDeploymentFile,
   getAssetCollDeploymentFilename,
   IAssetCollDeployments,
 } from '../../deployment/common'
 import { verifyContract } from '../../deployment/utils'
-import { revenueHiding } from '../../deployment/utils'
+import { combinedError, revenueHiding } from '../../deployment/utils'
 import {
   CurvePoolType,
   DEFAULT_THRESHOLD,
@@ -107,7 +107,9 @@ async function main() {
           oracleError: bn('1'), // unused but cannot be zero
           oracleTimeout: ARB_USDT_ORACLE_TIMEOUT, // max of oracleTimeouts
           maxTradeVolume: MAX_TRADE_VOL,
-          defaultThreshold: DEFAULT_THRESHOLD,
+          defaultThreshold: combinedError(ARB_crvUSD_ORACLE_ERROR, ARB_USDT_ORACLE_ERROR)
+            .add(fp('0.01'))
+            .toString(),
           delayUntilDefault: DELAY_UNTIL_DEFAULT,
         },
         revenueHiding.toString(),
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,4 +35,4 @@ @@
           "stRSR": "0x437b525F96A2Da0A4b165efe27c61bea5c8d3CD4"
         }
       }
-    }
+    }