choire: updated hh deploy tasks

mstable · Sep 3, 2021 · 3be1a8e · 3be1a8e
1 parent 61630e1
commit 3be1a8e
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 34 deletions.
diff --git a/tasks/deployFeeders.ts b/tasks/deployFeeders.ts
@@ -128,7 +128,7 @@ task("deployVault", "Deploy Feeder Pool with boosted dual vault")
             dualRewardToken: dualRewardToken?.address,
         }
 
-        await deployVault(signer, vaultData, chain)
+        await deployVault(hre, vaultData)
     })
 
 task("FeederWrapper-deploy", "Deploy a new FeederWrapper").setAction(async (taskArgs, hre) => {

diff --git a/tasks/deployLegacy.ts b/tasks/deployLegacy.ts
@@ -13,6 +13,7 @@ import { BigNumberish, Signer } from "ethers"
 import { getChain, getChainAddress, resolveAddress } from "./utils/networkAddressFactory"
 import { getSigner } from "./utils/signerFactory"
 import { Chain, logTxDetails } from "./utils"
+import { verifyEtherscan } from "./utils/etherscan"
 
 interface UserBalance {
     user: string
@@ -49,7 +50,7 @@ const vaults: VaultData[] = [
         symbol: "v-fPmUSD/GUSD",
         userBal: {
             user: "0xf794CF2d946BC6eE6eD905F47db211EBd451Aa5F",
-            balance: simpleToExactAmount(1500000),
+            balance: simpleToExactAmount(425000),
         },
     },
     {
@@ -177,7 +178,7 @@ task("LegacyVault.deploy", "Deploys a vault contract")
                 const tx2 = await proxyAdmin.acceptUpgradeRequest(vaultProxyAddress)
                 await logTxDetails(tx2, `${vault.underlyingTokenSymbol} acceptUpgradeRequest`)
             } else {
-                await hre.run("verify:verify", {
+                await verifyEtherscan(hre, {
                     address: vaultImpl.address,
                     constructorArguments,
                 })

diff --git a/tasks/deployRewards.ts b/tasks/deployRewards.ts
@@ -5,6 +5,7 @@ import { ONE_WEEK } from "@utils/constants"
 
 import { Contract } from "@ethersproject/contracts"
 import { formatBytes32String } from "ethers/lib/utils"
+import { simpleToExactAmount } from "@utils/math"
 import { params } from "./taskUtils"
 import {
     AssetProxy__factory,
@@ -34,6 +35,12 @@ task("getBytecode-BoostedDualVault").setAction(async () => {
 
 task("BoostDirector.deploy", "Deploys a new BoostDirector")
     .addOptionalParam("stakingToken", "Symbol of the staking token", "MTA", types.string)
+    .addOptionalParam(
+        "vaults",
+        "Comma separated list of vault underlying token symbols, eg RmUSD,RmBTC",
+        "mUSD,mBTC,GUSD,BUSD,alUSD,HBTC,TBTC",
+        types.string,
+    )
     .addOptionalParam("speed", "Defender Relayer speed param: 'safeLow' | 'average' | 'fast' | 'fastest'", "fast", types.string)
     .setAction(async (taskArgs, hre) => {
         const signer = await getSigner(hre, taskArgs.speed)
@@ -47,18 +54,12 @@ task("BoostDirector.deploy", "Deploys a new BoostDirector")
             stakingToken.address,
         ])
 
-        const tx = await boostDirector.initialize([
-            resolveAddress("mUSD", chain, "vault"),
-            resolveAddress("mBTC", chain, "vault"),
-            resolveAddress("GUSD", chain, "vault"),
-            resolveAddress("BUSD", chain, "vault"),
-            resolveAddress("HBTC", chain, "vault"),
-            resolveAddress("TBTC", chain, "vault"),
-            resolveAddress("alUSD", chain, "vault"),
-        ])
+        const vaultSymbols = taskArgs.vaults.split(",")
+        const vaultAddresses = vaultSymbols.map((symbol) => resolveAddress(symbol, chain, "vault"))
+        const tx = await boostDirector.initialize(vaultAddresses)
         await logTxDetails(tx, "initialize BoostDirector")
 
-        await hre.run("verify:verify", {
+        await verifyEtherscan(hre, {
             address: boostDirector.address,
             constructorArguments: [nexusAddress, stakingToken.address],
         })
@@ -68,24 +69,23 @@ task("Vault.deploy", "Deploys a vault contract")
     .addParam("boosted", "True if a mainnet boosted vault", true, types.boolean)
     .addParam("vaultName", "Vault name", undefined, types.string, false)
     .addParam("vaultSymbol", "Vault symbol", undefined, types.string, false)
-    .addOptionalParam("stakingToken", "Symbol of staking token. eg MTA, BAL, RMTA", "MTA", types.string)
+    .addOptionalParam("stakingToken", "Symbol of staking token. eg MTA, BAL, RMTA, mUSD, RmUSD", "MTA", types.string)
     .addOptionalParam("rewardsToken", "Symbol of rewards token. eg MTA or RMTA for Ropsten", "MTA", types.string)
-    .addParam("priceCoefficient", "Price coefficient", undefined, types.string, false)
+    .addOptionalParam("priceCoeff", "Price coefficient without 18 decimal places. eg 1 or 4800", 1, types.int)
     .addOptionalParam("speed", "Defender Relayer speed param: 'safeLow' | 'average' | 'fast' | 'fastest'", "fast", types.string)
     .setAction(async (taskArgs, hre) => {
-        const signer = await getSigner(hre, taskArgs.speed)
         const chain = getChain(hre)
 
         const vaultData: VaultData = {
             boosted: taskArgs.boosted,
             name: taskArgs.vaultName,
             symbol: taskArgs.vaultSymbol,
-            priceCoeff: taskArgs.priceCoefficient,
+            priceCoeff: simpleToExactAmount(taskArgs.priceCoeff),
             stakingToken: resolveAddress(taskArgs.stakingToken, chain),
             rewardToken: resolveAddress(taskArgs.rewardsToken, chain),
         }
 
-        await deployVault(signer, vaultData, chain)
+        await deployVault(hre, vaultData)
     })
 
 task("StakedToken.deploy", "Deploys a Staked Token behind a proxy")

diff --git a/tasks/utils/feederUtils.ts b/tasks/utils/feederUtils.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable no-await-in-loop */
 import { DEAD_ADDRESS, ZERO_ADDRESS } from "@utils/constants"
-import { BN } from "@utils/math"
+import { BN, simpleToExactAmount } from "@utils/math"
 import { Signer } from "ethers"
 import { formatEther } from "ethers/lib/utils"
 import {
@@ -23,7 +23,9 @@ import {
     StakingRewards__factory,
 } from "types/generated"
 import { deployContract, logTxDetails } from "./deploy-utils"
-import { getChainAddress } from "./networkAddressFactory"
+import { verifyEtherscan } from "./etherscan"
+import { getChain, getChainAddress } from "./networkAddressFactory"
+import { getSigner } from "./signerFactory"
 import { Chain, Token } from "./tokens"
 
 interface Config {
@@ -130,64 +132,83 @@ export const deployFeederPool = async (signer: Signer, feederData: FeederData, c
 }
 
 export const deployVault = async (
-    signer: Signer,
+    hre: any,
     vaultParams: VaultData,
-    chain = Chain.mainnet,
 ): Promise<BoostedDualVault | BoostedVault | StakingRewardsWithPlatformToken | StakingRewards> => {
+    const signer = await getSigner(hre)
+    const chain = getChain(hre)
+
     const vaultData: VaultData = {
-        priceCoeff: BN.from(1),
+        priceCoeff: simpleToExactAmount(1),
         ...vaultParams,
     }
     const rewardsDistributorAddress = getChainAddress("RewardsDistributor", chain)
     const boostCoeff = 48
     let vault: BoostedDualVault | BoostedVault | StakingRewardsWithPlatformToken | StakingRewards
+    let constructorArguments: any[]
     if (vaultData.boosted) {
         if (vaultData.dualRewardToken) {
-            vault = await deployContract<BoostedDualVault>(new BoostedDualVault__factory(signer), "BoostedDualVault", [
+            constructorArguments = [
                 getChainAddress("Nexus", chain),
                 vaultData.stakingToken,
                 getChainAddress("BoostDirector", chain),
                 vaultData.priceCoeff,
                 boostCoeff,
                 vaultData.rewardToken,
                 vaultData.dualRewardToken,
-            ])
+            ]
+            vault = await deployContract<BoostedDualVault>(new BoostedDualVault__factory(signer), "BoostedDualVault", constructorArguments)
         } else {
-            vault = await deployContract<BoostedVault>(new BoostedVault__factory(signer), "BoostedVault", [
+            constructorArguments = [
                 getChainAddress("Nexus", chain),
                 vaultData.stakingToken,
                 getChainAddress("BoostDirector", chain),
                 vaultData.priceCoeff,
                 boostCoeff,
                 vaultData.rewardToken,
-            ])
+            ]
+            vault = await deployContract<BoostedVault>(new BoostedVault__factory(signer), "BoostedVault", constructorArguments)
         }
     } else if (vaultData.dualRewardToken) {
+        constructorArguments = [getChainAddress("Nexus", chain), vaultData.stakingToken, vaultData.rewardToken, vaultData.dualRewardToken]
         vault = await deployContract<StakingRewardsWithPlatformToken>(
             new StakingRewardsWithPlatformToken__factory(signer),
             "StakingRewardsWithPlatformToken",
-            [getChainAddress("Nexus", chain), vaultData.stakingToken, vaultData.rewardToken, vaultData.dualRewardToken],
+            constructorArguments,
         )
     } else {
-        vault = await deployContract<StakingRewards>(new StakingRewards__factory(signer), "StakingRewards", [
+        constructorArguments = [
             getChainAddress("Nexus", chain),
             vaultData.stakingToken,
             getChainAddress("BoostDirector", chain),
             vaultData.priceCoeff,
             boostCoeff,
             vaultData.rewardToken,
-        ])
+        ]
+        vault = await deployContract<StakingRewards>(new StakingRewards__factory(signer), "StakingRewards", constructorArguments)
     }
 
+    await verifyEtherscan(hre, {
+        address: vault.address,
+        constructorArguments,
+    })
+
     const initializeData = vault.interface.encodeFunctionData("initialize", [rewardsDistributorAddress, vaultData.name, vaultData.symbol])
     const proxyAdminAddress = getChainAddress("DelayedProxyAdmin", chain)
+
     // Proxy
     const proxy = await deployContract(new AssetProxy__factory(signer), "AssetProxy for vault", [
         vault.address,
         proxyAdminAddress,
         initializeData,
     ])
 
+    await verifyEtherscan(hre, {
+        address: proxy.address,
+        contract: "contracts/upgradability/Proxies.sol:AssetProxy",
+        constructorArguments: [vault.address, proxyAdminAddress, initializeData],
+    })
+
     return vault.attach(proxy.address)
 }
 

diff --git a/tasks/utils/networkAddressFactory.ts b/tasks/utils/networkAddressFactory.ts
@@ -198,15 +198,15 @@ export const getChainAddress = (contractName: ContractNames, chain: Chain): stri
             case "DelayedProxyAdmin":
                 return "0x2d369F83E9DC764a759a74e87a9Bc542a2BbfdF0"
             case "BoostDirector":
-                return "0x8D084F66e8594C91461E4E0B85433feFf1CA8AA9"
+                return "0x363FDC050722e74C5549C11B7d2c9d68FB9D7411"
             case "SignatureVerifier":
                 return "0x3Bf48139e7C714ADA37C97Cd29e0F04D9673494a"
             case "QuestManager":
                 return "0x3e8aa84E846EEb89392E99d44cD51acA668ae7BA"
             case "StakedTokenMTA":
-                return "0xf98c297368c3e341f7f6dC9eCE8D3A33CBE62B6A"
-            // case "StakedTokenBPT":
-            //     return "0x4A869C278b7f397734F0dAFd4E5EEE1A1543Cb80"
+                return "0xa5583F67311231A2127D2C6f9a15aB112222C080"
+            case "StakedTokenBPT":
+                return "0x2813Baaf158F53F8251a369c296c7934cb1fbAF0"
             case "PlatformTokenVendorFactory":
                 return "0x91fdDea51aD5A4e050c2A34e209284344206aF8e"
             case "BalancerVault":

diff --git a/tasks/utils/tokens.ts b/tasks/utils/tokens.ts
@@ -82,6 +82,7 @@ export const MmUSD: Token = {
     decimals: 18,
     quantityFormatter: "USD",
 }
+// Ropsten
 export const RmUSD: Token = {
     symbol: "RmUSD",
     address: "0x4E1000616990D83e56f4b5fC6CC8602DcfD20459",
@@ -91,6 +92,15 @@ export const RmUSD: Token = {
     savings: "0x5b7f01dAe6BCE656c9cA4175Eb3E406ADC6c7957",
     vault: "0xDEFc008BAC1e38F13F081DDD20acf89985DFa7C8",
 }
+export const RmBTC: Token = {
+    symbol: "RmBTC",
+    address: "0x4A677A48A790f26eac4c97f495E537558Abf6A79",
+    chain: Chain.ropsten,
+    decimals: 18,
+    quantityFormatter: "BTC",
+    savings: "0xBfe31D984d688628d06Ae2Da1D640Cf5D9e242A5",
+    vault: "0x7799BEEAf20120CC78f5cF2EB9C85e395B43bF4D",
+}
 
 // USD Main Pool Assets on Mainnet
 export const sUSD: Token = {
@@ -414,6 +424,7 @@ export const tokens = [
     PDAI,
     PWMATIC,
     RmUSD,
+    RmBTC,
     BAL,
     RBAL,
 ]