@gooddollar/goodprotocol 1.0.5 → 1.0.6-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "1.0.5",
+  "version": "1.0.6-beta.0",
   "description": "GoodDollar Protocol",
   "scripts": {
     "build": "scripts/build.sh deploy",
@@ -16,7 +16,8 @@
     "runNode": "hardhat node &",
     "testDAOUpgrade": "yarn runNode && yarn compile && yarn deployOldDAO --network develop-mainnet && yarn daoUpgrade --network develop-mainnet",
     "testDAOUpgradeFuse": "yarn runNode && yarn compile && yarn deployOldDAO --network develop && yarn daoUpgrade --network develop",
-    "deployTest": "yarn runNode && yarn compile && hardhat run scripts/test/singleOldDaoDeploy.ts --network dapptest && yarn daoUpgrade --network dapptest && yarn daoUpgrade --network dapptest-mainnet && hardhat run scripts/test/simulateInterest.ts --network dapptest"
+    "deployTestOld": "yarn runNode && yarn compile && hardhat run scripts/test/singleOldDaoDeploy.ts --network dapptest && yarn daoUpgrade --network dapptest && yarn daoUpgrade --network dapptest-mainnet && hardhat run scripts/test/simulateInterest.ts --network dapptest",
+    "deployTest": "yarn runNode && yarn compile && hardhat run scripts/deployFullDAO.ts --network dapptest && hardhat run scripts/deployFullDAO.ts --network dapptest-mainnet && hardhat run scripts/test/simulateInterest.ts --network dapptest"
   },
   "files": [
     "artifacts/contracts",

package/scripts/deployFullDAO.ts

@@ -179,12 +179,15 @@ export const createDAO = async () => {
     Controller: controller,
     GoodDollar: gd,
     Identity: Identity.address,
-    FeeFormula: FeeFormula.address
+    FeeFormula: FeeFormula.address,
+    BancorFormula: BancorFormula.address
   };
 
   if (isMainnet) {
     mainnet = await deployMainnet(Avatar, Identity);
-    Object.entries(mainnet).forEach(([k, v]) => (release[k] = v.address));
+    Object.entries(mainnet)
+      .filter(([k, v]) => v)
+      .forEach(([k, v]) => (release[k] = v.address));
   }
 
   let sidechain: { [key: string]: any } = {};
@@ -209,24 +212,26 @@ export const createDAO = async () => {
   release = { ...release, ...bridgeRelease };
   await releaser(release, network.name);
 
-  await pressAnyKey();
+  // await pressAnyKey();
   // deploy v2 mainnet/sidechain contracts, returns their addresses
-  const v2 = await deployV2(network.name, false, {
+  const olddao = {
     FirstClaimPool: release.FirstClaimPool,
     BancorFormula: release.BancorFormula,
     Avatar: release.Avatar,
     Controller: release.Controller,
-    DAIUsdOracle: ethers.constants.AddressZero,
-    COMPUsdOracle: ethers.constants.AddressZero,
-    USDCUsdOracle: ethers.constants.AddressZero,
-    AAVEUsdOracle: ethers.constants.AddressZero,
+    DAIUsdOracle: release.DAIUsdOracle || ethers.constants.AddressZero,
+    COMPUsdOracle: release.COMPUsdOracle || ethers.constants.AddressZero,
+    USDCUsdOracle: release.USDCUsdOracle || ethers.constants.AddressZero,
+    AAVEUsdOracle: release.AAVEUsdOracle || ethers.constants.AddressZero,
     AaveLendingPool: ethers.constants.AddressZero,
     AaveIncentiveController: ethers.constants.AddressZero,
-    GasPriceOracle: ethers.constants.AddressZero,
+    GasPriceOracle: release.GasPriceOracle || ethers.constants.AddressZero,
     cDAI: release.cDAI || ethers.constants.AddressZero,
     DAI: release.DAI || ethers.constants.AddressZero,
     COMP: release.COMP || ethers.constants.AddressZero,
     USDC: ethers.constants.AddressZero,
+    DAIEthOracle: release.DAIEthOracle || ethers.constants.AddressZero,
+    ETHUsdOracle: release.ETHUsdOracle || ethers.constants.AddressZero,
     Identity: release.Identity,
     GoodDollar: release.GoodDollar,
     Contribution: release.Contribution,
@@ -235,10 +240,12 @@ export const createDAO = async () => {
     ForeignBridge: release.ForeignBridge,
     SchemeRegistrar: ethers.constants.AddressZero,
     UpgradeScheme: ethers.constants.AddressZero
-  });
+  };
+
+  const v2 = await deployV2(network.name, false, olddao);
   release = { ...v2, ...release };
   await releaser(release, network.name);
-  await pressAnyKey();
+  // await pressAnyKey();
   if (isMainnet) {
     await setSchemes([release.ProtocolUpgrade]);
     await performUpgrade(release, fusedao.UBIScheme);
@@ -329,6 +336,27 @@ const deployMainnet = async (Avatar, Identity) => {
   const daiAddr = ProtocolSettings[network.name]?.compound?.dai;
   const cdaiAddr = ProtocolSettings[network.name]?.compound?.cdai;
   const COMPAddr = ProtocolSettings[network.name]?.compound?.comp;
+  const daiEthOracleAddr = ProtocolSettings[network.name]?.chainlink?.dai_eth;
+  const ethUsdOracleAddr = ProtocolSettings[network.name]?.chainlink?.eth_usd;
+
+  let DAIUsdOracle, COMPUsdOracle, USDCUsdOracle, AAVEUsdOracle, GasPriceOracle;
+  if (name.includes("test")) {
+    const tokenUsdOracleFactory = await ethers.getContractFactory(
+      "BatUSDMockOracle"
+    );
+    DAIUsdOracle = await tokenUsdOracleFactory.deploy();
+    USDCUsdOracle = await tokenUsdOracleFactory.deploy();
+
+    COMPUsdOracle = await (
+      await ethers.getContractFactory("CompUSDMockOracle")
+    ).deploy();
+    AAVEUsdOracle = await (
+      await ethers.getContractFactory("AaveUSDMockOracle")
+    ).deploy();
+    GasPriceOracle = await (
+      await ethers.getContractFactory("GasPriceMockOracle")
+    ).deploy();
+  }
 
   let DAI = daiAddr
     ? await ethers.getContractAt("DAIMock", daiAddr)
@@ -351,16 +379,31 @@ const deployMainnet = async (Avatar, Identity) => {
   const Contribution = (await ccFactory
     .deploy(Avatar.address, 0, 1e15)
     .then(printDeploy)) as Contract;
-  // const contribution = await ethers.getContractAt(
-  //   ContributionCalculation.abi,
-  //   "0xc3171409dB6827A68294B3A0D40a31310E83eD6B"
-  // );
+
+  let DAIEthOracle = daiEthOracleAddr
+    ? await ethers.getContractAt("DaiEthPriceMockOracle", daiEthOracleAddr)
+    : ((await (await ethers.getContractFactory("DaiEthPriceMockOracle"))
+        .deploy()
+        .then(printDeploy)) as Contract);
+
+  let ETHUsdOracle = ethUsdOracleAddr
+    ? await ethers.getContractAt("EthUSDMockOracle", ethUsdOracleAddr)
+    : ((await (await ethers.getContractFactory("EthUSDMockOracle"))
+        .deploy()
+        .then(printDeploy)) as Contract);
 
   return {
     Contribution,
     DAI,
     COMP,
-    cDAI
+    cDAI,
+    ETHUsdOracle,
+    DAIEthOracle,
+    DAIUsdOracle,
+    COMPUsdOracle,
+    USDCUsdOracle,
+    AAVEUsdOracle,
+    GasPriceOracle
   };
 };
 

package/scripts/test/simulateInterest.ts

@@ -14,12 +14,11 @@ const waitTX = async tx => {
 };
 const simulate = async function () {
   const network = networkData.name;
-  const networkSettings = { ...settings["default"], ...settings[network] };
   const accounts = await ethers.getSigners();
 
   let addresses = deployment[network];
   let mainnetAddresses = deployment[`${network}-mainnet`];
-  console.log({ addresses, network });
+  console.log({ addresses, mainnetAddresses, network });
   const identity = await ethers.getContractAt("IIdentity", addresses.Identity);
   await Promise.all(
     accounts.slice(0, 10).map(a =>
@@ -66,7 +65,11 @@ const simulate = async function () {
       .balanceOf(simpleStaking)
       .then(_ => _.toString());
 
-    console.log("collecting interest...", { stakingBalance });
+    console.log("collecting interest...", {
+      stakingBalance,
+      gfm: goodFundManager.address,
+      simpleStaking
+    });
 
     await goodFundManager.collectInterest([simpleStaking], false);
 

package/scripts/upgradeToV2/upgradeToV2.ts

@@ -89,7 +89,7 @@ export const main = async (
   }
 
   const isBackendTest = networkName.startsWith("dapptest");
-  const isTest = network.name === "hardhat";
+  const isTest = network.name === "hardhat" || isBackendTest;
   const isCoverage = process.env.CODE_COVERAGE;
   const isDevelop = !isProduction;
   const isMainnet = networkName.includes("mainnet");
@@ -97,7 +97,13 @@ export const main = async (
     ...ProtocolSettings["default"],
     ...ProtocolSettings[networkName]
   };
-  console.log(`networkName ${networkName}`);
+  console.log(`networkName ${networkName}`, {
+    isTest,
+    isBackendTest,
+    isCoverage,
+    isMainnet,
+    isDevelop
+  });
   const dao = olddao || OldDAO[networkName];
   const fse = require("fs-extra");
   const ProtocolAddresses = await fse.readJson("releases/deployment.json");
@@ -656,7 +662,7 @@ export const main = async (
     //extract just the addresses without the rewards
     // release.StakingContracts = release.StakingContracts.map((_) => _[0]);
 
-    if (isProduction || isBackendTest) {
+    if (isProduction) {
       console.log(
         "SKIPPING GOVERNANCE UPGRADE FOR PRODUCTION. RUN IT MANUALLY"
       );
@@ -708,7 +714,7 @@ export const main = async (
       )
       .then(_ => countTotalGas(_, "fuse basic upgrade"));
 
-    if (isProduction || isBackendTest) {
+    if (isProduction) {
       console.log(
         "SKIPPING GOVERNANCE UPGRADE FOR PRODUCTION. RUN IT MANUALLY"
       );