@gooddollar/goodprotocol 2.0.7-beta.3 → 2.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.7-beta.3",
+  "version": "2.0.7",
   "description": "GoodDollar Protocol",
   "engines": {
     "node": "18.x"

package/releases/deploy-settings.json

@@ -207,6 +207,9 @@
     },
     "uniswapRouter": "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D"
   },
+  "goerli": {
+    "superfluidHost": "0x22ff293e14F1EC3A09B137e9e06084AFd63adDF9"
+  },
   "development-goerli": {
     "superfluidHost": "0x22ff293e14F1EC3A09B137e9e06084AFd63adDF9"
   },

package/releases/deployment.json

@@ -561,5 +561,18 @@
         "SuperFluidHost": "0x14764E92A63e73a2Dac1fF08F35A64647fB50C91",
         "UniswapV3Router": "0x5615CDAb10dc425a742d643d949a7F474C01abc4",
         "GDFaucet": "0x8986F9C6b3D0b9A8b92ef7f1eF7EB9e767D414e1"
+    },
+    "goerli": {
+        "ProxyFactory": "0xeCC2b6423A833bFE556E520d55191c8daD31f1E0",
+        "Identity": "0x6dB189E677EEaB0833C6693DFeaa979e37447eee",
+        "DAOCreator": "0x16985787b2c032a68E24dE1D7DbCeFF10685Bc96",
+        "FeeFormula": "0x93B29D34f1FCBCED99509b31fF4557ad5a32798f",
+        "GoodDollar": "0x03d3daB843e6c03b3d271eff9178e6A96c28D25f",
+        "Avatar": "0x972F855bAa27B3E04b48f3868ffa1AB35405F79B",
+        "Controller": "0xe9868c10eED2B6832DfB84b708843e5D5F5E923f",
+        "NameService": "0x17611D613268A2A017f51c72df98B1dE0A5AB407",
+        "GReputation": "0x3647469733C01713A7d9bdf6834bd4aBd59D66fa",
+        "GoodDollarMintBurnWrapper": "0x69d9c8d240E282a4ec0058CF0AC4E9D8ac7a11ac",
+        "GoodDollarStaking": "0xC9a3DdadC753e6a7675Aa125991096623d06c437"
     }
 }

package/scripts/analytics/faucetStats.ts

@@ -2,9 +2,8 @@ import { range, sortBy, toPairs } from "lodash";
 import PromisePool from "async-promise-pool";
 import fs from "fs";
 import { ethers } from "hardhat";
-import { start } from "repl";
 import { JsonRpcProvider } from "@ethersproject/providers";
-import { off } from "process";
+import fetch from "node-fetch";
 
 function arrayToCsv(data) {
   return data
@@ -19,48 +18,88 @@ function arrayToCsv(data) {
     .join("\r\n"); // rows starting on new lines
 }
 
-const main = async () => {
-  const archive = new JsonRpcProvider("https://explorer-node.fuse.io");
+const celoStats = async () => {};
+const main = async (isCelo = true) => {
+  const archive = new JsonRpcProvider(
+    isCelo
+      ? "https://celo-mainnet-archive.allthatnode.com"
+      : "https://explorer-node.fuse.io"
+  );
+  const faucetAddr = isCelo
+    ? "0x4F93Fa058b03953C851eFaA2e4FC5C34afDFAb84"
+    : "0x01ab5966C1d742Ae0CFF7f14cC0F4D85156e83d9";
+
+  const adminAddr = "0x7119CD89D4792aF90277d84cDffa3F2Ab22a0022";
   const blockStep = 10000;
-  const pool = new PromisePool({ concurrency: 10 });
+  const pool = new PromisePool({ concurrency: 5 });
 
   let faucet = await ethers.getContractAt(
-    ["event WalletTopped(address indexed user, uint256 amount)"],
-    "0x01ab5966C1d742Ae0CFF7f14cC0F4D85156e83d9"
+    [
+      "event WalletTopped(address indexed account, uint256 amount,address whitelistedRoot,address indexed relayerOrWhitelisted)"
+    ],
+    faucetAddr
   );
   const endBlock = Number(await ethers.provider.getBlockNumber());
-  const daysBack = 30;
+  const daysBack = 60;
   const dayBlocks = 12 * 60 * 24;
   const startBlock = endBlock - dayBlocks * daysBack;
   const days = range(startBlock, endBlock, dayBlocks);
   const dailyBalance = [];
+  const dailyAdminBalance = [];
   for (let day of days) {
     dailyBalance.push(
-      (await archive.getBalance("0x01ab5966C1d742Ae0CFF7f14cC0F4D85156e83d9", day)).div(1e10).toNumber() / 1e8
+      (await archive.getBalance(faucetAddr, day)).div(1e10).toNumber() / 1e8
+      // isCelo
+      //   ?
+      //   await fetch(
+      //       `https://api.celoscan.io/api?module=account&action=balance&address=${faucetAddr}&tag=${day}&apikey=${process.env.CELOSCAN_KEY}`
+      //     )
+      //       .then(_ => _.json())
+      //       .then(_ => _.result)
+      //   : (await archive.getBalance(faucetAddr, day)).div(1e10).toNumber() / 1e8
     );
   }
-  let curBlock = startBlock;
 
+  for (let day of days) {
+    dailyAdminBalance.push(
+      (await archive.getBalance(adminAddr, day)).div(1e10).toNumber() / 1e8
+    );
+  }
+  let curBlock = startBlock;
   const toppingsByAddress = {};
   const toppingsByAmount = {};
+  const toppingsByRelayer = {};
   let totalToppings = 0;
   let totalAmount = 0;
-  console.log({ dailyBalance });
+  const dailyUsage = dailyBalance.map((v, i) =>
+    i < dailyBalance.length - 1 ? v - dailyBalance[i + 1] : 0
+  );
+  const dailyAdminUsage = dailyAdminBalance.map((v, i) =>
+    i < dailyAdminBalance.length - 1 ? v - dailyAdminBalance[i + 1] : 0
+  );
+  console.log({ dailyUsage, dailyAdminUsage });
   console.log({ startBlock, endBlock });
   while (curBlock <= endBlock) {
     const fromBlock = curBlock;
     const toBlock = Math.min(fromBlock + blockStep, endBlock);
     pool.add(async () => {
       const f = faucet.filters.WalletTopped();
-      const events = await faucet.queryFilter(f, fromBlock, toBlock).catch(e => {
-        console.log("failed", { fromBlock, toBlock });
-        return [];
-      });
+      const events = await faucet
+        .queryFilter(f, fromBlock, toBlock)
+        .catch(e => {
+          console.log("failed", { fromBlock, toBlock });
+          return [];
+        });
       events.forEach(e => {
         totalToppings += 1;
         totalAmount += Number(e.args.amount);
-        toppingsByAddress[e.args.user] = (toppingsByAddress[e.args.user] || 0) + 1;
-        toppingsByAmount[e.args.amount] = (toppingsByAmount[e.args.amount] || 0) + 1;
+        toppingsByAddress[e.args.whitelistedRoot] =
+          (toppingsByAddress[e.args.whitelistedRoot] || 0) + 1;
+        if (e.args.account !== e.args.relayerOrWhitelisted)
+          toppingsByRelayer[e.args.relayerOrWhitelisted] =
+            (toppingsByRelayer[e.args.relayerOrWhitelisted] || 0) + 1;
+        toppingsByAmount[e.args.amount] =
+          (toppingsByAmount[e.args.amount] || 0) + 1;
       });
       console.log("fetched events", {
         fromBlock,
@@ -74,13 +113,18 @@ const main = async () => {
 
   const topToppers = sortBy(toPairs(toppingsByAddress), "1").reverse();
   const topAmounts = sortBy(toPairs(toppingsByAmount), "1").reverse();
+  const topRelayers = sortBy(toPairs(toppingsByRelayer), "1").reverse();
+
   const totalWallets = topToppers.length;
 
   const avgToppingsPerWallet = totalToppings / totalWallets;
   const avgToppingAmount = totalAmount / totalToppings;
 
+  console.log(topRelayers.slice(0, 50));
   fs.writeFileSync("topToppers.csv", arrayToCsv(topToppers));
   fs.writeFileSync("topAmounts.csv", arrayToCsv(topAmounts));
+  fs.writeFileSync("topRelayers.csv", arrayToCsv(topRelayers));
+
   console.log({
     totalAmount,
     totalToppings,

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

@@ -56,20 +56,28 @@ export const createDAO = async () => {
   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(
-    {
-      name: "IdentityV2",
-      salt: "Identity",
-      isUpgradeable: true
-    },
-    [root.address, ethers.constants.AddressZero]
-  ).then(printDeploy)) as Contract;
+  let Identity;
+  if (release.Identity) Identity = await ethers.getContractAt("IdentityV2", release.Identity);
+  else
+    Identity = (await deployDeterministic(
+      {
+        name: "IdentityV2",
+        salt: "Identity",
+        isUpgradeable: true
+      },
+      [root.address, ethers.constants.AddressZero]
+    ).then(printDeploy)) as Contract;
 
-  const daoCreator = (await DAOCreatorFactory.deploy().then(printDeploy)) as Contract;
+  let daoCreator;
+  if (release.DAOCreator) daoCreator = await DAOCreatorFactory.attach(release.DAOCreator);
+  else daoCreator = (await DAOCreatorFactory.deploy().then(printDeploy)) as Contract;
 
-  const FeeFormula = (await deployDeterministic({ name: "FeeFormula", factory: FeeFormulaFactory }, [0]).then(
-    printDeploy
-  )) as Contract;
+  let FeeFormula;
+  if (release.FeeFormula) FeeFormula = await FeeFormulaFactory.attach(release.FeeFormula);
+  else
+    FeeFormula = (await deployDeterministic({ name: "FeeFormula", factory: FeeFormulaFactory }, [0]).then(
+      printDeploy
+    )) as Contract;
 
   let GoodDollar;
   if (protocolSettings.superfluidHost) {

package/scripts/multichain-deploy/3_gdSavings-deploy.ts

@@ -32,11 +32,7 @@ import releaser from "../../scripts/releaser";
 import ProtocolSettings from "../../releases/deploy-settings.json";
 import dao from "../../releases/deployment.json";
 import { deployWrapper } from "./multichainWrapper-deploy";
-import {
-  GoodDollarMintBurnWrapper,
-  Controller,
-  NameService
-} from "../../types";
+import { GoodDollarMintBurnWrapper, Controller, NameService } from "../../types";
 const { name: networkName } = network;
 
 export const deploySidechain = async () => {
@@ -46,30 +42,18 @@ export const deploySidechain = async () => {
   if (isProduction) verifyProductionSigner(root);
 
   let release: { [key: string]: any } = dao[networkName];
-  let settings = defaultsDeep(
-    {},
-    ProtocolSettings[networkName],
-    ProtocolSettings["default"]
-  );
+  let settings = defaultsDeep({}, ProtocolSettings[networkName], ProtocolSettings["default"]);
 
   console.log("got signers:", {
     networkName,
     root: root.address,
-    balance: await ethers.provider
-      .getBalance(root.address)
-      .then(_ => _.toString())
+    balance: await ethers.provider.getBalance(root.address).then(_ => _.toString())
   });
 
   let Wrapper;
-  if (!release.GoodDollarMintBurnWrapper)
-    Wrapper = (await deployWrapper(
-      release.Avatar
-    )) as GoodDollarMintBurnWrapper;
+  if (!release.GoodDollarMintBurnWrapper) Wrapper = (await deployWrapper(release.Avatar)) as GoodDollarMintBurnWrapper;
   else {
-    Wrapper = await ethers.getContractAt(
-      "GoodDollarMintBurnWrapper",
-      release.GoodDollarMintBurnWrapper
-    );
+    Wrapper = await ethers.getContractAt("GoodDollarMintBurnWrapper", release.GoodDollarMintBurnWrapper);
   }
 
   console.log("deploying savings...");
@@ -95,28 +79,15 @@ export const deploySidechain = async () => {
 
     await releaser(torelease, networkName, "deployment", false);
   } else {
-    GDSavings = await ethers.getContractAt(
-      "GoodDollarStaking",
-      release.GoodDollarStaking
-    );
+    GDSavings = await ethers.getContractAt("GoodDollarStaking", release.GoodDollarStaking);
   }
   if (networkName.includes("production"))
-    return console.log(
-      "Skipping proposal/upgrade for production, need to perform manually"
-    );
+    return console.log("Skipping proposal/upgrade for production, need to perform manually");
 
-  await executeProposal(
-    GDSavings.address,
-    Wrapper.address,
-    settings.guardiansSafe
-  );
+  await executeProposal(GDSavings.address, Wrapper.address, settings.guardiansSafe);
 };
 
-const executeProposal = async (
-  savingsAddress: string,
-  wrapperAddress: string,
-  guardiansSafe: string
-) => {
+const executeProposal = async (savingsAddress: string, wrapperAddress: string, guardiansSafe: string) => {
   console.log("executing savings + wrapper proposal");
   const isProduction = networkName.includes("production");
   const viaGuardians = false;
@@ -134,15 +105,9 @@ const executeProposal = async (
   //     ? new ethers.Wallet(process.env.PROPOSER_KEY, ethers.provider)
   //     : root; //need proposer with 0.3% of GOOD tokens
 
-  const ctrl = (await ethers.getContractAt(
-    "Controller",
-    release.Controller
-  )) as Controller;
+  const ctrl = (await ethers.getContractAt("Controller", release.Controller)) as Controller;
 
-  const ns = (await ethers.getContractAt(
-    "NameService",
-    release.NameService
-  )) as NameService;
+  const ns = (await ethers.getContractAt("NameService", release.NameService)) as NameService;
 
   const proposalContracts = [
     wrapperAddress, //MinterWrapper -> add GDSavings
@@ -162,16 +127,7 @@ const executeProposal = async (
 
   const proposalFunctionInputs = [
     ethers.utils.defaultAbiCoder.encode(
-      [
-        "address",
-        "uint256",
-        "uint256",
-        "uint32",
-        "uint256",
-        "uint256",
-        "uint32",
-        "bool"
-      ],
+      ["address", "uint256", "uint256", "uint32", "uint256", "uint256", "uint32", "bool"],
       [savingsAddress, 0, 0, 30, 0, 0, 0, true]
     ), //function addMinter(
     ethers.utils.defaultAbiCoder.encode(
@@ -192,10 +148,7 @@ const executeProposal = async (
         release.Avatar
       ]
     ),
-    ethers.utils.defaultAbiCoder.encode(
-      ["string", "address"],
-      ["MINTBURN_WRAPPER", wrapperAddress]
-    )
+    ethers.utils.defaultAbiCoder.encode(["string", "address"], ["MINTBURN_WRAPPER", wrapperAddress])
   ];
 
   if (!viaGuardians) {
@@ -218,36 +171,11 @@ const executeProposal = async (
       proposalFunctionInputs,
       guardiansSafe
     );
-
-    // const vm = (await ethers.getContractAt(
-    //   "CompoundVotingMachine",
-    //   release.CompoundVotingMachine
-    // )) as CompoundVotingMachine;
-
-    // await vm
-    //   .connect(proposer)
-    //   ["propose(address[],uint256[],string[],bytes[],string)"](
-    //     proposalContracts,
-    //     proposalEthValues,
-    //     proposalFunctionSignatures,
-    //     proposalFunctionInputs,
-    //     "https://discourse.gooddollar.org/t/gip-5-allocating-part-of-ubi-inflation-towards-g-savings-account/114/20"
-    //   )
-    //   .then(printDeploy);
   }
 
-  const Controller = await ethers.getContractAt(
-    "Controller",
-    release.Controller
-  );
-  const wrapperDaoPermissions = await Controller.getSchemePermissions(
-    wrapperAddress,
-    release.Avatar
-  );
-  const savingsDaoPermissions = await Controller.getSchemePermissions(
-    savingsAddress,
-    release.Avatar
-  );
+  const Controller = await ethers.getContractAt("Controller", release.Controller);
+  const wrapperDaoPermissions = await Controller.getSchemePermissions(wrapperAddress, release.Avatar);
+  const savingsDaoPermissions = await Controller.getSchemePermissions(savingsAddress, release.Avatar);
 
   console.log({
     wrapperDaoPermissions,

package/scripts/upgrades/multichain-temp-fix.ts

@@ -9,7 +9,6 @@
 import { network, ethers } from "hardhat";
 import { Contract } from "ethers";
 import { defaultsDeep } from "lodash";
-
 import { printDeploy, executeViaGuardian, executeViaSafe, verifyProductionSigner } from "../multichain-deploy/helpers";
 
 import ProtocolSettings from "../../releases/deploy-settings.json";
@@ -54,8 +53,12 @@ export const upgrade = async () => {
 
   let f = await ethers.getContractFactory("GoodFundManager");
   console.log("bytecode", f.bytecode.length);
-  let newDistHelper = (await ethers.deployContract("DistributionHelper").then(printDeploy)) as Contract;
-
+  // let newDistHelper = (await ethers
+  //   .deployContract("DistributionHelper", { maxFeePerGas: 22e9, nonce: 118 })
+  //   .then(printDeploy)) as Contract;
+  let newDistHelper = (await (await ethers.getContractFactory("DistributionHelper"))
+    .deploy({ maxFeePerGas: 15e9, maxPriorityFeePerGas: 1e9 })
+    .then(printDeploy)) as Contract;
   if (isProduction) await verifyContract(newDistHelper, "GoodReserveCDai", networkName);
 
   const proposalContracts = [

package/truffle-config.js

@@ -58,6 +58,10 @@ module.exports = {
     // },
     // Useful for deploying to a public network.
     // NB: It's important to wrap the provider as a function.
+    "production-mainnet": {
+      provider: () => new Web3.providers.HttpProvider(`https://cloudflare-eth.com`),
+      network_id: 1
+    },
     kovan: {
       provider: () => new Web3.providers.HttpProvider(`https://ropsten.infura.io/v3/YOUR-PROJECT-ID`),
       network_id: 42, // Ropsten's id