@gooddollar/goodprotocol 2.0.5-beta.1 → 2.0.5-beta.3

package/hardhat.config.ts

@@ -35,6 +35,13 @@ const ethplorer_key = process.env.ETHPLORER_KEY;
 
 const MAINNET_URL = "https://mainnet.infura.io/v3/" + infura_api;
 
+const goerli = {
+  accounts: { mnemonic },
+  url: "https://rpc.ankr.com/eth_goerli",
+  gas: 3000000,
+  chainId: 5
+};
+
 // console.log({ mnemonic: sha3(mnemonic) });
 const hhconfig: HardhatUserConfig = {
   solidity: {
@@ -216,7 +223,10 @@ const hhconfig: HardhatUserConfig = {
       gas: 3000000,
       gasPrice: 500000000,
       chainId: 100
-    }
+    },
+    goerli,
+    "development-goerli": goerli,
+    "staging-goerli": goerli
   },
   mocha: {
     timeout: 6000000

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.5-beta.1",
+  "version": "2.0.5-beta.3",
   "description": "GoodDollar Protocol",
   "scripts": {
     "prepack": "npm run minimize",
@@ -62,7 +62,7 @@
     "@openzeppelin/contracts-upgradeable": "^4.8.0",
     "@superfluid-finance/ethereum-contracts": "^1.4.3",
     "@superfluid-finance/sdk-core": "^0.5.8",
-    "@typechain/hardhat": "^6.1.2",
+    "@typechain/hardhat": "^6.1.5",
     "async-promise-pool": "^1.0.4",
     "openzeppelin-solidity": "^4.3.2",
     "patch-package": "latest",
@@ -103,7 +103,7 @@
     "fs-extra": "9.0.0",
     "graphql": "^15.5.0",
     "graphql-request": "^3.4.0",
-    "hardhat": "^2.10.2",
+    "hardhat": "^2.13.0",
     "hardhat-contract-sizer": "^2.6.1",
     "hardhat-gas-reporter": "^1.0.8",
     "hardhat-storage-layout": "^0.1.7",

package/releases/deploy-settings.json

@@ -207,6 +207,12 @@
     },
     "uniswapRouter": "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D"
   },
+  "development-goerli": {
+    "superfluidHost": "0x22ff293e14F1EC3A09B137e9e06084AFd63adDF9"
+  },
+  "staging-goerli": {
+    "superfluidHost": "0x22ff293e14F1EC3A09B137e9e06084AFd63adDF9"
+  },
   "production": {
     "governance": {
       "gdaoAirdrop": "0x2feece0e9bc03b54e63e6eb7abb81a128f6bc7ce9a3bafd5ca2bea0c40e3634b",

package/releases/deployment.json

@@ -159,6 +159,7 @@
         "FuseFaucet": "0x09Ad3430D146aa662eA8c20cBEBceBC0bbB3FB0a",
         "Invites": "0x187fc9fB37DF0fbf75149913a97B17c968Fc90d0",
         "OneTimePayments": "0x184C1F83b3eB75a2dac483D4a6b9FBD59Df961f8",
+        "OneTimePaymentsV2": "0x140A43d46F5445cdfC38E8C6f40F0a4541Fe933f",
         "AdminWallet": "0xC1526892198796d30D33355cfF9Af10EED5B86A0",
         "AdminWalletOld": "0x14204288286823042263156146334B1a4d61227c",
         "network": "fuse",
@@ -267,6 +268,7 @@
         "AdminWalletOld": "0x2961a6C2Fe39F0FFC4f4b1D9E037CD95f4e9C993",
         "UpgradeScheme": "0xfC9F6F5E3ff7BAAB3fEf82e66f56917D625ba38B",
         "OneTimePayments": "0x7912636D68E5d92708862b38698f764BF1EC297C",
+        "OneTimePaymentsV2": "0xEa6E73f5Ef1EC677FE2551128a22cDf27667a5Cd",
         "network": "staging",
         "networkId": 122,
         "ProxyFactory": "0x240d844AdA767bE0AB08F9BcCcB6D8a04aE370EC",
@@ -501,7 +503,8 @@
         "ClaimersDistribution": "0x6e3c0ad79FA7ccDFa27bE14C2630511415A2F635",
         "CompoundVotingMachine": "0xC2C303131939370ed75c95686F691f290b56Be66",
         "GuardiansSafe": "0x84C10B45fE51bfB4f86c19A47Fdbc187d4572Fb8",
-        "OneTimePayments": "0xB23e54fd8c2f35F9d38884Fc1611F5e9004f10ea"
+        "OneTimePayments": "0xB23e54fd8c2f35F9d38884Fc1611F5e9004f10ea",
+        "OneTimePaymentsV2": "0x2cb1c7d50371e277d7a36B171c0ACe9B157518EE"
     },
     "staging-celo": {
         "network": "staging-celo",
@@ -524,6 +527,19 @@
         "ClaimersDistribution": "0x671123F1c7a5B5445467Ff765a5E2Bc86878B245",
         "CompoundVotingMachine": "0xCd25fB84AB22582F1034bcd80c399a3126f2E775",
         "GuardiansSafe": "0x84C10B45fE51bfB4f86c19A47Fdbc187d4572Fb8",
-        "OneTimePayments": "0x514820Af2DaE5F537dE16E576471528176318113"
+        "OneTimePayments": "0x514820Af2DaE5F537dE16E576471528176318113",
+        "OneTimePaymentsV2": "0x963E7B4c970626Bb103c61fA16b002AFf6E6c2C7"
+    },
+    "development-goerli": {
+        "ProxyFactory": "0x65D8eACBCd9618b8780C4b444081915a5D54D611",
+        "GoodDollar": "0x70044867217EC9C46ecDe49C1f7fCA3b5Ed2f5C4",
+        "Avatar": "0xE0e3BFb1A1850bdFe36ED1563CC2abB6A8B6De78",
+        "Controller": "0x6717A1948328C8eCCb5C933Fae90e0631C2486fE",
+        "Identity": "0x53A537b6917fAFC6bFE1Ae0d54874A225Ce25bA1",
+        "NameService": "0xbd8297847F9De15409Dc0441560b2114c5e7b662",
+        "GReputation": "0x0abF3D20fCb33FC03bdF25b042E77edfAeDBBDD3",
+        "FeeFormula": "0x5fAA779cF74a1Ba51909DEeaA0e8900474DA77Cf",
+        "DAOCreator": "0xc66c970a6d99da587a7d7fa7d5383b401c3e87f4",
+        "OneTimePaymentsV2": "0x4E8112430974b4CE87283221a11BDC52097e7e2e"
     }
 }

package/scripts/multichain-deploy/1_basicdao-deploy.ts

@@ -12,19 +12,13 @@ import DAOCreatorABI from "@gooddollar/goodcontracts/build/contracts/DaoCreatorG
 // import IdentityABI from "@gooddollar/goodcontracts/build/contracts/Identity.json";
 import FeeFormulaABI from "@gooddollar/goodcontracts/build/contracts/FeeFormula.json";
 
-import {
-  deployDeterministic,
-  deploySuperGoodDollar,
-  verifyProductionSigner
-} from "./helpers";
+import { deployDeterministic, deploySuperGoodDollar, verifyProductionSigner } from "./helpers";
 import releaser from "../releaser";
 import ProtocolSettings from "../../releases/deploy-settings.json";
 import dao from "../../releases/deployment.json";
 import { TransactionResponse } from "@ethersproject/providers";
 
-const printDeploy = async (
-  c: Contract | TransactionResponse
-): Promise<Contract | TransactionResponse> => {
+const printDeploy = async (c: Contract | TransactionResponse): Promise<Contract | TransactionResponse> => {
   if (c instanceof Contract) {
     await c.deployed();
     console.log("deployed to: ", c.address);
@@ -37,11 +31,7 @@ const printDeploy = async (
 };
 
 export const createDAO = async () => {
-  let protocolSettings = defaultsDeep(
-    {},
-    ProtocolSettings[network.name],
-    ProtocolSettings["default"]
-  );
+  let protocolSettings = defaultsDeep({}, ProtocolSettings[network.name], ProtocolSettings["default"]);
 
   let release: { [key: string]: any } = dao[network.name];
   const isProduction = network.name.includes("production");
@@ -54,34 +44,17 @@ export const createDAO = async () => {
     network,
     daoOwner,
     root: root.address,
-    balance: await ethers.provider
-      .getBalance(root.address)
-      .then(_ => _.toString()),
+    balance: await ethers.provider.getBalance(root.address).then(_ => _.toString()),
     release
   });
 
-  const DAOCreatorFactory = new ethers.ContractFactory(
-    DAOCreatorABI.abi,
-    DAOCreatorABI.bytecode,
-    root
-  );
+  const DAOCreatorFactory = new ethers.ContractFactory(DAOCreatorABI.abi, DAOCreatorABI.bytecode, root);
 
-  const FeeFormulaFactory = new ethers.ContractFactory(
-    FeeFormulaABI.abi,
-    FeeFormulaABI.bytecode,
-    root
-  );
+  const FeeFormulaFactory = new ethers.ContractFactory(FeeFormulaABI.abi, FeeFormulaABI.bytecode, root);
 
-  const proxyFactory = await ethers.getContractAt(
-    "ProxyFactory1967",
-    release.ProxyFactory
-  );
-  const salt = ethers.BigNumber.from(
-    ethers.utils.keccak256(ethers.utils.toUtf8Bytes("NameService"))
-  );
-  const nameserviceFutureAddress = await proxyFactory[
-    "getDeploymentAddress(uint256,address)"
-  ](salt, root.address);
+  const proxyFactory = await ethers.getContractAt("ProxyFactory1967", release.ProxyFactory);
+  const salt = ethers.BigNumber.from(ethers.utils.keccak256(ethers.utils.toUtf8Bytes("NameService")));
+  const nameserviceFutureAddress = await proxyFactory["getDeploymentAddress(uint256,address)"](salt, root.address);
   console.log("deploying identity", { nameserviceFutureAddress });
   const Identity = (await deployDeterministic(
     {
@@ -92,12 +65,11 @@ export const createDAO = async () => {
     [root.address, ethers.constants.AddressZero]
   ).then(printDeploy)) as Contract;
 
-  const daoCreator = await DAOCreatorFactory.deploy();
+  const daoCreator = (await DAOCreatorFactory.deploy().then(printDeploy)) as Contract;
 
-  const FeeFormula = (await deployDeterministic(
-    { name: "FeeFormula", factory: FeeFormulaFactory },
-    [0]
-  ).then(printDeploy)) as Contract;
+  const FeeFormula = (await deployDeterministic({ name: "FeeFormula", factory: FeeFormulaFactory }, [0]).then(
+    printDeploy
+  )) as Contract;
 
   let GoodDollar;
   if (protocolSettings.superfluidHost) {
@@ -115,8 +87,7 @@ export const createDAO = async () => {
       {
         name: "GoodDollar",
         isUpgradeable: true,
-        initializer:
-          "initialize(string, string, uint256, address, address, address,address)"
+        initializer: "initialize(string, string, uint256, address, address, address,address)"
       },
       [
         isProduction ? "GoodDollar" : "GoodDollar Dev",
@@ -148,16 +119,11 @@ export const createDAO = async () => {
   // await Identity.setAuthenticationPeriod(365).then(printDeploy);
 
   console.log("creating dao");
-  await daoCreator
-    .forgeOrg(GoodDollar.address, GReputation.address, [], 0, [])
-    .then(printDeploy);
+  await daoCreator.forgeOrg(GoodDollar.address, GReputation.address, [], 0, []).then(printDeploy);
   console.log("forgeOrg done ");
   const Avatar = new ethers.Contract(
     await daoCreator.avatar(),
-    [
-      "function owner() view returns (address)",
-      "function nativeToken() view returns (address)"
-    ],
+    ["function owner() view returns (address)", "function nativeToken() view returns (address)"],
     root
   );
 
@@ -181,16 +147,13 @@ export const createDAO = async () => {
     )
     .then(printDeploy);
 
-  const NameService = await deployDeterministic(
-    { name: "NameService", isUpgradeable: true },
-    [
-      controller,
-      ["CONTROLLER", "AVATAR", "IDENTITY", "GOODDOLLAR", "REPUTATION"].map(_ =>
-        ethers.utils.keccak256(ethers.utils.toUtf8Bytes(_))
-      ),
-      [controller, Avatar.address, Identity.address, gd, GReputation.address]
-    ]
-  );
+  const NameService = await deployDeterministic({ name: "NameService", isUpgradeable: true }, [
+    controller,
+    ["CONTROLLER", "AVATAR", "IDENTITY", "GOODDOLLAR", "REPUTATION"].map(_ =>
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes(_))
+    ),
+    [controller, Avatar.address, Identity.address, gd, GReputation.address]
+  ]);
 
   console.log("set GRep nameservice..");
   await (await GReputation.updateDAO(NameService.address)).wait();
@@ -206,54 +169,31 @@ export const createDAO = async () => {
     await GoodDollar.renounceMinter().then(printDeploy);
   }
 
-  const daoOwnerDaoPermissions = await Controller.getSchemePermissions(
-    daoOwner,
-    Avatar.address
-  );
+  const daoOwnerDaoPermissions = await Controller.getSchemePermissions(daoOwner, Avatar.address);
 
-  const deployerIsNotGDMinter =
-    (await GoodDollar.isMinter(root.address)) === false;
+  const deployerIsNotGDMinter = (await GoodDollar.isMinter(root.address)) === false;
 
   const avatarIsGDMinter = await GoodDollar.isMinter(Avatar.address);
 
-  const deployerIsNotGDPauser =
-    (await GoodDollar.isPauser(root.address)) === false;
+  const deployerIsNotGDPauser = (await GoodDollar.isPauser(root.address)) === false;
 
-  const deployerIsNotRepMinter =
-    (await GReputation.hasRole(GReputation.MINTER_ROLE(), root.address)) ===
-    false;
-  const avatarIsRepMinter = await GReputation.hasRole(
-    GReputation.MINTER_ROLE(),
-    Avatar.address
-  );
+  const deployerIsNotRepMinter = (await GReputation.hasRole(GReputation.MINTER_ROLE(), root.address)) === false;
+  const avatarIsRepMinter = await GReputation.hasRole(GReputation.MINTER_ROLE(), Avatar.address);
 
-  const deployerIsIdentityOwner = await Identity.hasRole(
-    ethers.constants.HashZero,
-    root.address
-  );
+  const deployerIsIdentityOwner = await Identity.hasRole(ethers.constants.HashZero, root.address);
 
-  const avatarIsIdentityOwner = await Identity.hasRole(
-    ethers.constants.HashZero,
-    Avatar.address
-  );
+  const avatarIsIdentityOwner = await Identity.hasRole(ethers.constants.HashZero, Avatar.address);
 
   //try to modify DAO -> should not succeed
   await (await GReputation.updateDAO(ethers.constants.AddressZero)).wait();
 
-  const grepHasDAOSet =
-    (await GReputation.nameService()) === NameService.address;
+  const grepHasDAOSet = (await GReputation.nameService()) === NameService.address;
 
-  const factoryIsNotGoodOwner =
-    (await GReputation.hasRole(
-      ethers.constants.HashZero,
-      proxyFactory.address
-    )) === false;
+  const factoryIsNotGoodOwner = (await GReputation.hasRole(ethers.constants.HashZero, proxyFactory.address)) === false;
 
-  const factoryIsNotGDMinter =
-    (await GoodDollar.isMinter(proxyFactory.address)) === false;
+  const factoryIsNotGDMinter = (await GoodDollar.isMinter(proxyFactory.address)) === false;
 
-  const factoryIsNotGDPauser =
-    (await GoodDollar.isPauser(root.address)) === false;
+  const factoryIsNotGDPauser = (await GoodDollar.isPauser(root.address)) === false;
 
   console.log({
     daoOwnerDaoPermissions,

package/scripts/multichain-deploy/2b_otp-deploy.ts

@@ -49,8 +49,8 @@ export const deployHelpers = async () => {
   console.log("deploying onetime payments", { gasprice: protocolSettings.gasPrice });
   const OTP = (await deployDeterministic(
     {
-      name: "OneTimePayments",
-      salt: "OneTimePayments",
+      name: "OneTimePaymentsV2",
+      salt: "OneTimePaymentsV2",
       isUpgradeable: false
     },
     [release.NameService]
@@ -59,12 +59,12 @@ export const deployHelpers = async () => {
   // const OTP = await ethers.getContractAt("OneTimePayments", release.OneTimePayments);
 
   const torelease = {
-    OneTimePayments: OTP.address
+    OneTimePaymentsV2: OTP.address
   };
   await releaser(torelease, network.name, "deployment", false);
 
   const constructorArgs = ethers.utils.defaultAbiCoder.encode(["address"], [release.NameService]);
-  await verifyContract(OTP.address, "OneTimePayments", network.name, undefined, constructorArgs);
+  await verifyContract(OTP.address, "OneTimePaymentsV2", network.name, undefined, constructorArgs);
 };
 
 export const main = async () => {

package/scripts/multichain-deploy/helpers.ts

@@ -65,11 +65,11 @@ export const deploySuperGoodDollar = async (superfluidHost, tokenArgs) => {
     []
   ).then(printDeploy)) as Contract;
 
-  await GoodDollarProxy.initializeProxy(SuperGoodDollar.address);
+  await GoodDollarProxy.initializeProxy(SuperGoodDollar.address).then(printDeploy);
 
-  await SuperGoodDollar.attach(GoodDollarProxy.address)[
-    "initialize(string,string,uint256,address,address,address,address)"
-  ](...tokenArgs);
+  await SuperGoodDollar.attach(GoodDollarProxy.address)
+    ["initialize(string,string,uint256,address,address,address,address)"](...tokenArgs)
+    .then(printDeploy);
 
   const GoodDollar = await ethers.getContractAt("ISuperGoodDollar", GoodDollarProxy.address);
   return GoodDollar;

package/truffle-config.js

@@ -74,6 +74,12 @@ module.exports = {
       timeoutBlocks: 200, // # of blocks before a deployment times out  (minimum/default: 50)
       skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
     },
+    goerli: {
+      provider: () => new Web3.providers.HttpProvider(`https://rpc.ankr.io/eth_goerli`),
+      network_id: 5, // Ropsten's id
+      gas: 3000000, // Ropsten has a lower block limit than mainnet
+      skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
+    },
     fuse: {
       provider: () => new Web3.providers.HttpProvider(`https://rpc.fuse.io`),
       network_id: 122, // Ropsten's id