@gooddollar/goodprotocol 1.0.3 → 1.0.4-beta.0

package/hardhat.config.ts

@@ -117,7 +117,8 @@ const hhconfig: HardhatUserConfig = {
     "fuse-mainnet": {
       accounts: { mnemonic },
       url: "https://ropsten.infura.io/v3/" + infura_api,
-
+      gasPrice: 20000000000,
+      gas: 5000000,
       chainId: 3
     },
     staging: {
@@ -143,7 +144,7 @@ const hhconfig: HardhatUserConfig = {
       accounts: [deployerPrivateKey],
       url: "https://mainnet.infura.io/v3/" + infura_api,
       gas: 3000000,
-      gasPrice: 25000000000,
+      gasPrice: 50000000000,
       chainId: 1
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "1.0.3",
+  "version": "1.0.4-beta.0",
   "description": "GoodDollar Protocol",
   "scripts": {
     "build": "scripts/build.sh deploy",
@@ -60,6 +60,7 @@
     "ethers-multicall": "^0.2.1",
     "openzeppelin-solidity": "^4.3.2",
     "patch-package": "latest",
+    "press-any-key": "^0.1.1",
     "truffle-plugin-verify": "^0.5.11",
     "truffle-source-verify": "^0.0.6"
   },

package/scripts/deployFullDAO.ts

@@ -22,6 +22,7 @@ import ProtocolSettings from "../releases/deploy-settings.json";
 import dao from "../releases/deployment.json";
 import { main as deployV2 } from "./upgradeToV2/upgradeToV2";
 import { TransactionResponse } from "@ethersproject/providers";
+import pressAnyKey from "press-any-key";
 
 const { name } = network;
 
@@ -41,6 +42,7 @@ const printDeploy = async (
 
 export const createDAO = async () => {
   const fusedao = dao[network.name.split("-")[0]];
+  let release: { [key: string]: any } = {}; //dao[network.name];
   let [root, ...signers] = await ethers.getSigners();
   //generic call permissions
   let schemeMock = root;
@@ -79,7 +81,9 @@ export const createDAO = async () => {
 
   const BancorFormula = (await (
     await ethers.getContractFactory("BancorFormula")
-  ).deploy()) as Contract;
+  )
+    .deploy()
+    .then(printDeploy)) as Contract;
 
   const AddFounders = (await AddFoundersFactory.deploy().then(
     printDeploy
@@ -94,7 +98,7 @@ export const createDAO = async () => {
   )) as Contract;
   // const Identity = await ethers.getContractAt(
   //   IdentityABI.abi,
-  //   "0x77Bd4D825F4df162BDdda73a7E295c27e09E289f"
+  //   release.Identity
   // );
 
   const daoCreator = (await DAOCreatorFactory.deploy(AddFounders.address).then(
@@ -129,6 +133,15 @@ export const createDAO = async () => {
     root
   );
 
+  // const Avatar = new ethers.Contract(
+  //   release.Avatar,
+  //   [
+  //     "function owner() view returns (address)",
+  //     "function nativeToken() view returns (address)"
+  //   ],
+  //   root
+  // );
+
   await Identity.setAvatar(Avatar.address).then(printDeploy);
 
   console.log("Done deploying DAO, setting schemes permissions");
@@ -158,13 +171,22 @@ export const createDAO = async () => {
   );
 
   let mainnet: { [key: string]: Contract } = {};
+  release = {
+    ...release,
+    Avatar: Avatar.address,
+    Controller: controller,
+    GoodDollar: gd,
+    Identity: Identity.address,
+    FeeFormula: FeeFormula.address
+  };
 
   if (isMainnet) {
     mainnet = await deployMainnet(Avatar, Identity);
+    Object.entries(mainnet).forEach(([k, v]) => (release[k] = v.address));
   }
 
   let sidechain: { [key: string]: any } = {};
-  let release: { [key: string]: any } = {};
+
   if (false === isMainnet) {
     sidechain = await deploySidechain(
       setSchemes,
@@ -175,25 +197,24 @@ export const createDAO = async () => {
     );
     schemes.push(sidechain.OneTimePayments.address);
     const adminWallet = await deployAdminWallet(Identity.address);
-    await root
-      .sendTransaction({
-        to: adminWallet.address,
-        value: ethers.utils.parseUnits("0.1", "ether")
-      })
-      .then(printDeploy);
     Object.entries(sidechain).forEach(([k, v]) => (release[k] = v.address));
     release["AdminWallet"] = adminWallet.address;
   }
 
+  await releaser(release, network.name);
+
+  await pressAnyKey();
   const bridgeRelease = await deployBridge(Avatar, gd, setSchemes, isMainnet);
   release = { ...release, ...bridgeRelease };
+  await releaser(release, network.name);
 
-  //deploy v2 mainnet/sidechain contracts, returns their addresses
+  await pressAnyKey();
+  // deploy v2 mainnet/sidechain contracts, returns their addresses
   const v2 = await deployV2(network.name, false, {
-    FirstClaimPool: sidechain?.FirstClaimPool?.address,
-    BancorFormula: BancorFormula.address,
-    Avatar: Avatar.address,
-    Controller: controller,
+    FirstClaimPool: release.FirstClaimPool,
+    BancorFormula: release.BancorFormula,
+    Avatar: release.Avatar,
+    Controller: release.Controller,
     DAIUsdOracle: ethers.constants.AddressZero,
     COMPUsdOracle: ethers.constants.AddressZero,
     USDCUsdOracle: ethers.constants.AddressZero,
@@ -201,20 +222,22 @@ export const createDAO = async () => {
     AaveLendingPool: ethers.constants.AddressZero,
     AaveIncentiveController: ethers.constants.AddressZero,
     GasPriceOracle: ethers.constants.AddressZero,
-    cDAI: mainnet?.cDAI?.address || ethers.constants.AddressZero,
-    DAI: mainnet?.dai?.address || ethers.constants.AddressZero,
-    COMP: mainnet?.COMP?.address || 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,
-    Identity: Identity.address,
-    GoodDollar: gd,
-    Contribution: mainnet?.contribution?.address,
+    Identity: release.Identity,
+    GoodDollar: release.GoodDollar,
+    Contribution: release.Contribution,
     UniswapRouter: "0x0000000000000000000000000000000000000001",
-    ...bridgeRelease,
+    HomeBridge: release.HomeBridge,
+    ForeignBridge: release.ForeignBridge,
     SchemeRegistrar: ethers.constants.AddressZero,
     UpgradeScheme: ethers.constants.AddressZero
   });
   release = { ...v2, ...release };
-
+  await releaser(release, network.name);
+  await pressAnyKey();
   if (isMainnet) {
     await setSchemes([release.ProtocolUpgrade]);
     await performUpgrade(release, fusedao.UBIScheme);
@@ -233,28 +256,16 @@ export const createDAO = async () => {
 
   if (false === isMainnet) {
     let encoded = (
-      await ethers.getContractAt("IGoodDollar", gd)
+      await ethers.getContractAt("IGoodDollar", release.GoodDollar)
     ).interface.encodeFunctionData("mint", [release.UBIScheme, 1000000]);
 
-    await genericCall(gd, encoded);
+    await genericCall(release.GoodDollar, encoded);
 
     await setSchemes([release.ProtocolUpgradeFuse]);
     await performUpgradeFuse(release);
   }
 
   await releaser(release, network.name);
-
-  return {
-    ...mainnet,
-    ...sidechain,
-    daoCreator,
-    controller,
-    avatar: await daoCreator.avatar(),
-    gd: await Avatar.nativeToken(),
-    identity: Identity.address,
-    bancorFormula: BancorFormula.address
-    // bridge: Bridge.address,
-  };
 };
 
 const deployBridge = async (Avatar, gd, setSchemes, isMainnet) => {
@@ -318,7 +329,7 @@ const deployMainnet = async (Avatar, Identity) => {
   const cdaiAddr = ProtocolSettings[network.name]?.compound?.cdai;
   const COMPAddr = ProtocolSettings[network.name]?.compound?.comp;
 
-  let dai = daiAddr
+  let DAI = daiAddr
     ? await ethers.getContractAt("DAIMock", daiAddr)
     : ((await daiFactory.deploy().then(printDeploy)) as Contract);
 
@@ -328,7 +339,7 @@ const deployMainnet = async (Avatar, Identity) => {
 
   let cDAI = cdaiAddr
     ? await ethers.getContractAt("DAIMock", cdaiAddr)
-    : ((await cdaiFactory.deploy(dai.address).then(printDeploy)) as Contract);
+    : ((await cdaiFactory.deploy(DAI.address).then(printDeploy)) as Contract);
 
   const ccFactory = new ethers.ContractFactory(
     ContributionCalculation.abi,
@@ -336,7 +347,7 @@ const deployMainnet = async (Avatar, Identity) => {
     root
   );
 
-  const contribution = (await ccFactory
+  const Contribution = (await ccFactory
     .deploy(Avatar.address, 0, 1e15)
     .then(printDeploy)) as Contract;
   // const contribution = await ethers.getContractAt(
@@ -345,8 +356,8 @@ const deployMainnet = async (Avatar, Identity) => {
   // );
 
   return {
-    contribution,
-    dai,
+    Contribution,
+    DAI,
     COMP,
     cDAI
   };
@@ -416,6 +427,13 @@ export const deploySidechain = async (
     .deployProxy(faucetf, [identity])
     .then(printDeploy)) as Contract;
 
+  await root
+    .sendTransaction({
+      to: faucet.address,
+      value: ethers.utils.parseEther("5")
+    })
+    .then(printDeploy);
+
   console.log("setting firstclaim and otp schemes...");
   await setSchemes([firstClaim.address, otp.address]);
   await firstClaim.start().then(printDeploy);
@@ -554,10 +572,35 @@ const performUpgrade = async (release, ubiScheme) => {
   console.log("performing protocol v2 upgrade on Mainnet...", {
     release
   });
-  console.log("upgrading nameservice + staking rewards...");
+  console.log(
+    "upgrading nameservice + staking rewards...",
+    release.NameService,
+    [
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("RESERVE")),
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("MARKET_MAKER")),
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("FUND_MANAGER")),
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("REPUTATION")),
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("GDAO_STAKERS")),
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("BRIDGE_CONTRACT")),
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("UBI_RECIPIENT")),
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("EXCHANGE_HELPER"))
+    ],
+    [
+      release.GoodReserveCDai,
+      release.GoodMarketMaker,
+      release.GoodFundManager,
+      release.GReputation,
+      release.StakersDistribution,
+      release.ForeignBridge || ethers.constants.AddressZero,
+      ubiScheme,
+      release.ExchangeHelper
+    ],
+    release.StakingContracts.map((_: any) => _[0]),
+    release.StakingContracts.map((_: any) => _[1])
+  );
   let tx;
-  tx = await (
-    await upgrade.upgradeBasic(
+  tx = await upgrade
+    .upgradeBasic(
       release.NameService,
       [
         ethers.utils.keccak256(ethers.utils.toUtf8Bytes("RESERVE")),
@@ -582,7 +625,7 @@ const performUpgrade = async (release, ubiScheme) => {
       release.StakingContracts.map((_: any) => _[0]),
       release.StakingContracts.map((_: any) => _[1])
     )
-  ).wait();
+    .then(printDeploy);
 
   console.log("upgrading reserve...", {
     params: [

package/scripts/upgradeToV2/upgradeToV2.ts

@@ -11,7 +11,7 @@ import { network, ethers, upgrades, run } from "hardhat";
 import { networkNames } from "@openzeppelin/upgrades-core";
 import { isFunction, get, omitBy } from "lodash";
 import { getImplementationAddress } from "@openzeppelin/upgrades-core";
-// import pressAnyKey from "press-any-key";
+import pressAnyKey from "press-any-key";
 import {
   AaveStakingFactory,
   CompoundStakingFactory,
@@ -80,6 +80,12 @@ export const main = async (
       gasLimit: 6000000,
       gasPrice: ethers.utils.parseUnits("1", "gwei")
     };
+  } else {
+    GAS_SETTINGS = {
+      maxPriorityFeePerGas: ethers.utils.parseUnits("1", "gwei"),
+      maxFeePerGas: ethers.utils.parseUnits("10", "gwei"),
+      gasLimit: 6000000
+    };
   }
 
   const isBackendTest = networkName.startsWith("dapptest");
@@ -619,7 +625,7 @@ export const main = async (
         dao.Reserve,
         dao.MarketMaker,
         dao.FundManager,
-        dao.COMP
+        release.COMP
       ]
     });
     tx = await upgrade.upgradeReserve(
@@ -627,7 +633,8 @@ export const main = async (
       dao.Reserve,
       dao.MarketMaker,
       dao.FundManager,
-      dao.COMP
+      release.COMP,
+      GAS_SETTINGS
     );
     await countTotalGas(tx, "call upgrade reserve");
     console.log("upgrading donationstaking...", {
@@ -641,7 +648,8 @@ export const main = async (
       release.NameService,
       dao.DonationsStaking, //old
       release.DonationsStaking, //new
-      dao.DAIStaking
+      dao.DAIStaking,
+      GAS_SETTINGS
     );
     await countTotalGas(tx, "call upgrade donations");
     console.log("Donation staking upgraded");
@@ -671,31 +679,34 @@ export const main = async (
     )) as unknown as ProtocolUpgradeFuse;
 
     console.log("performing protocol v2 upgrade on Fuse...", { release, dao });
-    await upgrade.upgrade(
-      release.NameService,
-      //old contracts
-      [
-        dao.SchemeRegistrar,
-        dao.UpgradeScheme,
-        dao.UBIScheme,
-        dao.FirstClaimPool
-      ],
-      release.UBIScheme,
-      [
-        ethers.utils.keccak256(ethers.utils.toUtf8Bytes("REPUTATION")),
-        ethers.utils.keccak256(ethers.utils.toUtf8Bytes("BRIDGE_CONTRACT")),
-        ethers.utils.keccak256(ethers.utils.toUtf8Bytes("UBISCHEME")),
-        ethers.utils.keccak256(ethers.utils.toUtf8Bytes("GDAO_STAKING")),
-        ethers.utils.keccak256(ethers.utils.toUtf8Bytes("GDAO_CLAIMERS"))
-      ],
-      [
-        release.GReputation,
-        dao.HomeBridge,
+    await upgrade
+      .upgrade(
+        release.NameService,
+        //old contracts
+        [
+          dao.SchemeRegistrar || ethers.constants.AddressZero,
+          dao.UpgradeScheme,
+          dao.UBIScheme,
+          dao.FirstClaimPool
+        ],
         release.UBIScheme,
-        release.GovernanceStaking,
-        release.ClaimersDistribution
-      ]
-    );
+        [
+          ethers.utils.keccak256(ethers.utils.toUtf8Bytes("REPUTATION")),
+          ethers.utils.keccak256(ethers.utils.toUtf8Bytes("BRIDGE_CONTRACT")),
+          ethers.utils.keccak256(ethers.utils.toUtf8Bytes("UBISCHEME")),
+          ethers.utils.keccak256(ethers.utils.toUtf8Bytes("GDAO_STAKING")),
+          ethers.utils.keccak256(ethers.utils.toUtf8Bytes("GDAO_CLAIMERS"))
+        ],
+        [
+          release.GReputation,
+          dao.HomeBridge,
+          release.UBIScheme,
+          release.GovernanceStaking,
+          release.ClaimersDistribution
+        ],
+        GAS_SETTINGS
+      )
+      .then(_ => countTotalGas(_, "fuse basic upgrade"));
 
     if (isProduction || isBackendTest) {
       console.log(
@@ -707,7 +718,8 @@ export const main = async (
       await upgrade.upgradeGovernance(
         dao.SchemeRegistrar,
         dao.UpgradeScheme,
-        release.CompoundVotingMachine
+        release.CompoundVotingMachine,
+        GAS_SETTINGS
       );
     }
   };
@@ -757,10 +769,13 @@ export const main = async (
       founders
     });
     await Promise.all(
-      founders.slice(0, Math.ceil(founders.length / 2)).map(f =>
+      founders.slice(1).map(f =>
         absoluteVote
           .connect(f)
-          .vote(proposalId, 1, 0, f.address, { gasLimit: 300000 })
+          .vote(proposalId, 1, 0, f.address, {
+            ...GAS_SETTINGS,
+            gasLimit: 300000
+          })
           .then(_ => countTotalGas(_.wait(), "vote"))
           .catch(e => console.log("founder vote failed:", f.address, e.message))
       )
@@ -946,8 +961,10 @@ export const main = async (
   await deployContracts();
 
   if (isPerformUpgrade) {
-    console.log("deployed contracts", { totalGas });
+    console.log("deployed contracts", { totalGas, dao, release });
+    if (isTest === false) await pressAnyKey();
     await voteProtocolUpgrade(release);
+    if (isTest === false) await pressAnyKey();
     console.log("voted contracts", { totalGas });
     isMainnet && (await performUpgrade(release));
     !isMainnet && (await performUpgradeFuse(release));

package/yarn.lock

@@ -13647,6 +13647,13 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
   integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
+press-any-key@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/press-any-key/-/press-any-key-0.1.1.tgz#97cf184ae84f25858fe3d83ab824e9d1dce2cde8"
+  integrity sha512-TR722R9UpZjvOtyVcmS7hx2/1KzKIyeizIqHJ7sRcfXvCDzeSknS3UNLhmQMN7075Jd9gGUBdq98sHw2eqb86Q==
+  dependencies:
+    single-line-log "^1.1.2"
+
 prettier@^1.14.3:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
@@ -15022,6 +15029,13 @@ simple-get@^2.7.0:
     once "^1.3.1"
     simple-concat "^1.0.0"
 
+single-line-log@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/single-line-log/-/single-line-log-1.1.2.tgz#c2f83f273a3e1a16edb0995661da0ed5ef033364"
+  integrity sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=
+  dependencies:
+    string-width "^1.0.1"
+
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"