diff --git a/common/configuration.ts b/common/configuration.ts index 1bea82955..e50322faf 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -117,7 +117,6 @@ export interface ITokens { USDM?: string wUSDM?: string - // Demurrage collateral PAXG?: string cbBTC?: string EURC?: string @@ -125,6 +124,13 @@ export interface ITokens { export type ITokensKeys = Array +export interface IDemurrageCollateral { + DMR100PAXG?: string + DMR100cbBTC?: string + DMR100EURC?: string + DMR100ARB?: string +} + export interface IFeeds { stETHETH?: string stETHUSD?: string diff --git a/scripts/deploy.ts b/scripts/deploy.ts index 89a30a347..276622608 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -91,7 +91,7 @@ async function main() { 'phase2-assets/assets/deploy_crv.ts', 'phase2-assets/assets/deploy_cvx.ts', 'phase2-assets/collaterals/deploy_pyusd.ts', - 'phase2-assets/collaterals/deploy_paxg.ts' + 'phase2-assets/collaterals/deploy_paxg_100.ts' ) } else if (chainId == '8453' || chainId == '84531') { // Base L2 chains @@ -104,8 +104,8 @@ async function main() { 'phase2-assets/collaterals/deploy_aave_v3_usdc.ts', 'phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts', 'phase2-assets/collaterals/deploy_cbeth_collateral.ts', - 'phase2-assets/collaterals/deploy_cbbtc.ts', - 'phase2-assets/collaterals/deploy_eurc.ts', + 'phase2-assets/collaterals/deploy_cbbtc_100.ts', + 'phase2-assets/collaterals/deploy_eurc_100.ts', 'phase2-assets/assets/deploy_stg.ts' ) } else if (chainId == '42161' || chainId == '421614') { @@ -120,7 +120,8 @@ async function main() { 'phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts', 'phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts', 'phase2-assets/collaterals/deploy_usdm.ts', - 'phase2-assets/assets/deploy_arb.ts' + 'phase2-assets/assets/deploy_arb.ts', + 'phase2-assets/assets/deploy_arb_100.ts' ) } diff --git a/scripts/deployment/common.ts b/scripts/deployment/common.ts index a1f3393fd..b9fba844d 100644 --- a/scripts/deployment/common.ts +++ b/scripts/deployment/common.ts @@ -1,5 +1,11 @@ import fs from 'fs' -import { ITokens, IComponents, IImplementations, IPools } from '../../common/configuration' +import { + IDemurrageCollateral, + ITokens, + IComponents, + IImplementations, + IPools, +} from '../../common/configuration' // This file is intended to have minimal imports, so that it can be used from tasks if necessary @@ -32,8 +38,8 @@ export interface IDeployments { export interface IAssetCollDeployments { assets: ITokens - collateral: ITokens & IPools - erc20s: ITokens & IPools + collateral: ITokens & IPools & IDemurrageCollateral + erc20s: ITokens & IPools & IDemurrageCollateral } export interface IRTokenDeployments { diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_cbbtc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_cbbtc_100.ts similarity index 95% rename from scripts/deployment/phase2-assets/collaterals/deploy_cbbtc.ts rename to scripts/deployment/phase2-assets/collaterals/deploy_cbbtc_100.ts index 63ef1b77d..6a19f2eda 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_cbbtc.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_cbbtc_100.ts @@ -81,8 +81,8 @@ async function main() { await (await collateral.refresh()).wait() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - assetCollDeployments.collateral.cbBTC = collateral.address - assetCollDeployments.erc20s.cbBTC = networkConfig[chainId].tokens.cbBTC + assetCollDeployments.collateral.DMR100cbBTC = collateral.address + assetCollDeployments.erc20s.DMR100cbBTC = networkConfig[chainId].tokens.cbBTC deployedCollateral.push(collateral.address.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_eurc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_eurc_100.ts similarity index 95% rename from scripts/deployment/phase2-assets/collaterals/deploy_eurc.ts rename to scripts/deployment/phase2-assets/collaterals/deploy_eurc_100.ts index b3559219b..67c6a6d31 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_eurc.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_eurc_100.ts @@ -81,8 +81,8 @@ async function main() { await (await collateral.refresh()).wait() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - assetCollDeployments.collateral.EURC = collateral.address - assetCollDeployments.erc20s.EURC = networkConfig[chainId].tokens.EURC + assetCollDeployments.collateral.DMR100EURC = collateral.address + assetCollDeployments.erc20s.DMR100EURC = networkConfig[chainId].tokens.EURC deployedCollateral.push(collateral.address.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_paxg.ts b/scripts/deployment/phase2-assets/collaterals/deploy_paxg_100.ts similarity index 95% rename from scripts/deployment/phase2-assets/collaterals/deploy_paxg.ts rename to scripts/deployment/phase2-assets/collaterals/deploy_paxg_100.ts index 95333b35e..83a8d8b20 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_paxg.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_paxg_100.ts @@ -81,8 +81,8 @@ async function main() { await (await collateral.refresh()).wait() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - assetCollDeployments.collateral.PAXG = collateral.address - assetCollDeployments.erc20s.PAXG = networkConfig[chainId].tokens.PAXG + assetCollDeployments.collateral.DMR100PAXG = collateral.address + assetCollDeployments.erc20s.DMR100PAXG = networkConfig[chainId].tokens.PAXG deployedCollateral.push(collateral.address.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) diff --git a/scripts/verification/collateral-plugins/verify_cbbtc.ts b/scripts/verification/collateral-plugins/verify_cbbtc_100.ts similarity index 100% rename from scripts/verification/collateral-plugins/verify_cbbtc.ts rename to scripts/verification/collateral-plugins/verify_cbbtc_100.ts diff --git a/scripts/verification/collateral-plugins/verify_eurc.ts b/scripts/verification/collateral-plugins/verify_eurc_100.ts similarity index 100% rename from scripts/verification/collateral-plugins/verify_eurc.ts rename to scripts/verification/collateral-plugins/verify_eurc_100.ts diff --git a/scripts/verification/collateral-plugins/verify_paxg.ts b/scripts/verification/collateral-plugins/verify_paxg_100.ts similarity index 100% rename from scripts/verification/collateral-plugins/verify_paxg.ts rename to scripts/verification/collateral-plugins/verify_paxg_100.ts diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index 5df61ad6e..6a53ad73e 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -80,8 +80,8 @@ async function main() { 'collateral-plugins/verify_ethx.ts', 'collateral-plugins/verify_apxeth.ts', 'collateral-plugins/verify_USDe.ts', - 'collateral-plugins/verify_pyusd.ts', - 'collateral-plugins/verify_paxg.ts' + 'collateral-plugins/verify_pyusd_100.ts', + 'collateral-plugins/verify_paxg_100.ts' ) } else if (chainId == '8453' || chainId == '84531') { // Base L2 chains @@ -92,7 +92,7 @@ async function main() { 'collateral-plugins/verify_cbeth.ts', 'assets/verify_stg.ts', 'collateral-plugins/verify_cbbtc.ts', - 'collateral-plugins/verify_eurc.ts' + 'collateral-plugins/verify_eurc_100.ts' ) } else if (chainId == '42161' || chainId == '421614') { // Arbitrum One @@ -101,7 +101,8 @@ async function main() { 'collateral-plugins/verify_cusdcv3.ts', 'collateral-plugins/verify_convex_crvusd_usdc.ts', 'collateral-plugins/verify_convex_crvusd_usdt.ts', - 'collateral-plugins/verify_usdm.ts' + 'collateral-plugins/verify_usdm.ts', + 'collateral-plugins/verify_arb_100.ts' ) }