@gooddollar/goodprotocol 2.0.5-beta.9 → 2.0.6

package/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.5-beta.9",
+  "version": "2.0.6",
   "description": "GoodDollar Protocol",
+  "engines": {
+    "node": "18.x"
+  },
   "scripts": {
     "prepack": "npm run minimize",
     "build": "scripts/build.sh deploy",
@@ -17,8 +20,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",
-    "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"
+    "deployTestOld": "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 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",
@@ -60,6 +63,7 @@
     "@jsier/retrier": "^1.2.4",
     "@openzeppelin/contracts": "^4.8.0",
     "@openzeppelin/contracts-upgradeable": "^4.8.0",
+    "@openzeppelin/upgrades-core": "1.18.0",
     "@superfluid-finance/ethereum-contracts": "^1.4.3",
     "@superfluid-finance/sdk-core": "^0.5.8",
     "@typechain/hardhat": "^6.1.5",

package/scripts/analytics/activeUsersCount.ts

@@ -1,6 +1,5 @@
 import { range, chunk, uniq } from "lodash";
 import { ethers as Ethers } from "hardhat";
-import fetch from "node-fetch";
 
 const ONE_DAY = 24 * 60 * 60;
 const ONE_HOUR = 60 * 60;

package/scripts/analytics/activeWalletsStats.ts

@@ -1,5 +1,4 @@
 import { range, sortBy } from "lodash";
-import fetch from "node-fetch";
 import PromisePool from "async-promise-pool";
 import fs from "fs";
 import { ethers } from "hardhat";
@@ -33,9 +32,7 @@ const main = async () => {
   //   );
   //   fs.writeFileSync("activeWalletsBalances.json", JSON.stringify(balances));
 
-  balances = JSON.parse(
-    fs.readFileSync("activeWalletsBalances.json").toString()
-  );
+  balances = JSON.parse(fs.readFileSync("activeWalletsBalances.json").toString());
 
   const EPOCH = 60 * 60 * 6;
   const pool = new PromisePool({ concurrency: 30 });
@@ -44,9 +41,7 @@ const main = async () => {
 
   const graphQuery = async (start, skip) => {
     const query = `{
-        walletStats(first: 1000 skip:${skip} where: { dateAppeared_gte: ${start} dateAppeared_lt:${
-      start + EPOCH
-    } }) {
+        walletStats(first: 1000 skip:${skip} where: { dateAppeared_gte: ${start} dateAppeared_lt:${start + EPOCH} }) {
           id
           dateAppeared
           balance
@@ -57,16 +52,13 @@ const main = async () => {
       }`;
     // console.log({ query });
     try {
-      const { data = {}, errors } = await fetch(
-        "https://api.thegraph.com/subgraphs/name/gooddollar/gooddollarfuse",
-        {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json"
-          },
-          body: JSON.stringify({ query })
-        }
-      ).then(_ => _.json());
+      const { data = {}, errors } = await fetch("https://api.thegraph.com/subgraphs/name/gooddollar/gooddollarfuse", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({ query })
+      }).then(_ => _.json());
       errors && console.log({ errors });
       if (data?.walletStats?.length === 1000) {
         return data.walletStats.concat(await graphQuery(start, skip + 1000));
@@ -116,9 +108,7 @@ const etl = async () => {
       .join("\r\n"); // rows starting on new lines
   }
 
-  const balances = JSON.parse(
-    fs.readFileSync("activeWalletsLastUsed.json").toString()
-  );
+  const balances = JSON.parse(fs.readFileSync("activeWalletsLastUsed.json").toString());
 
   let result = [];
 
@@ -131,24 +121,18 @@ const etl = async () => {
   }
   const top100 = result.slice(0, 100);
   const pool = new PromisePool({ concurrency: 30 });
-  const provider = new ethers.providers.JsonRpcBatchProvider(
-    "https://rpc.fuse.io"
-  );
+  const provider = new ethers.providers.JsonRpcBatchProvider("https://rpc.fuse.io");
 
   for (let idx in top100) {
     pool.add(async () => {
       const record = top100[idx];
-      let isContract =
-        (await provider.getCode(record[0]).catch(e => "0x")) !== "0x";
+      let isContract = (await provider.getCode(record[0]).catch(e => "0x")) !== "0x";
       record[3] = isContract;
     });
   }
   await pool.all();
   console.log({ top100 });
-  fs.writeFileSync(
-    "activeWalletsLastUsed.csv",
-    arrayToCsv(sortBy(result, _ => -Number(_[1])))
-  );
+  fs.writeFileSync("activeWalletsLastUsed.csv", arrayToCsv(sortBy(result, _ => -Number(_[1]))));
 };
 // main().catch(e => console.log(e));
 etl();

package/scripts/analytics/claimIncidentStats.ts

@@ -1,6 +1,5 @@
 import { countBy, chunk, difference, flatten, sortBy } from "lodash";
 import fs from "fs";
-import fetch from "node-fetch";
 import { network, ethers, upgrades } from "hardhat";
 import { Contract, Provider, setMulticallAddress } from "ethers-multicall";
 import Identity from "../../artifacts/contracts/Interfaces.sol/IIdentity.json";
@@ -54,16 +53,11 @@ const hasRefunded = async wallets => {
   let startBlock = CLAIM_START_BLOCK;
   while (startBlock <= curBlock) {
     const events = await gd.queryFilter(
-      gd.filters.Transfer(
-        undefined,
-        "0xd253A5203817225e9768C05E5996d642fb96bA86"
-      ),
+      gd.filters.Transfer(undefined, "0xd253A5203817225e9768C05E5996d642fb96bA86"),
       startBlock,
       toBlock
     );
-    const accounts = events
-      .filter(e => e.args.amount >= 9622260)
-      .map(_ => _.args.from.toLowerCase());
+    const accounts = events.filter(e => e.args.amount >= 9622260).map(_ => _.args.from.toLowerCase());
     refunded.push(...accounts);
     console.log("has refunded:", {
       startBlock,
@@ -81,10 +75,7 @@ const whereIsTheMoney = async noBalance => {
   for (let batch of chunk(noBalance, 100)) {
     const tos = await Promise.all(
       batch.map(async a => {
-        const e = await gd.queryFilter(
-          gd.filters.Transfer(a),
-          CLAIM_START_BLOCK
-        );
+        const e = await gd.queryFilter(gd.filters.Transfer(a), CLAIM_START_BLOCK);
         const tos = e.filter(_ => _.args.amount > 1000000).map(_ => _.args.to);
         return tos;
       })
@@ -92,24 +83,14 @@ const whereIsTheMoney = async noBalance => {
     targets.push(...flatten(tos));
   }
   const targetCounter = countBy(targets, _ => _);
-  console.log(
-    "transfer targets:",
-    sortBy(Object.entries(targetCounter), "1").reverse()
-  );
+  console.log("transfer targets:", sortBy(Object.entries(targetCounter), "1").reverse());
 };
 const main = async () => {
-  const wallets = JSON.parse(fs.readFileSync("torefund.json").toString()).map(
-    _ => _.toLowerCase()
-  );
+  const wallets = JSON.parse(fs.readFileSync("torefund.json").toString()).map(_ => _.toLowerCase());
   console.log("Total Claimed:", wallets.length);
   const refunded = await hasRefunded(wallets);
   const notRefunded = difference(wallets, refunded);
-  console.log(
-    "refunded:",
-    refunded.length,
-    "not refunded:",
-    notRefunded.length
-  );
+  console.log("refunded:", refunded.length, "not refunded:", notRefunded.length);
 
   const noBalanceToRefund = await hasBalanceToRefund(notRefunded);
   await whereIsTheMoney(noBalanceToRefund);

package/scripts/analytics/faucetStats.ts

@@ -1,5 +1,4 @@
 import { range, sortBy, toPairs } from "lodash";
-import fetch from "node-fetch";
 import PromisePool from "async-promise-pool";
 import fs from "fs";
 import { ethers } from "hardhat";
@@ -37,14 +36,7 @@ const main = async () => {
   const dailyBalance = [];
   for (let day of days) {
     dailyBalance.push(
-      (
-        await archive.getBalance(
-          "0x01ab5966C1d742Ae0CFF7f14cC0F4D85156e83d9",
-          day
-        )
-      )
-        .div(1e10)
-        .toNumber() / 1e8
+      (await archive.getBalance("0x01ab5966C1d742Ae0CFF7f14cC0F4D85156e83d9", day)).div(1e10).toNumber() / 1e8
     );
   }
   let curBlock = startBlock;
@@ -60,19 +52,15 @@ const main = async () => {
     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.user] = (toppingsByAddress[e.args.user] || 0) + 1;
+        toppingsByAmount[e.args.amount] = (toppingsByAmount[e.args.amount] || 0) + 1;
       });
       console.log("fetched events", {
         fromBlock,

package/scripts/analytics/gdinflow.ts

@@ -1,5 +1,4 @@
 import { maxBy, range, sortBy, uniq, sum, flatten, countBy } from "lodash";
-import fetch from "node-fetch";
 import PromisePool from "async-promise-pool";
 import fs from "fs";
 import { ethers } from "hardhat";
@@ -39,10 +38,9 @@ const main = async () => {
     const incomingTxs = result
       .filter(
         _ =>
-          [
-            "0xca2f09c3ccfd7ad5cb9276918bd1868f2b922ea0",
-            "0xd253a5203817225e9768c05e5996d642fb96ba86"
-          ].includes(_.from) === false
+          ["0xca2f09c3ccfd7ad5cb9276918bd1868f2b922ea0", "0xd253a5203817225e9768c05e5996d642fb96ba86"].includes(
+            _.from
+          ) === false
       )
       .filter(_ => _.to === address.toLowerCase());
     const totalEarned = sum(incomingTxs.map(_ => Number(_.value))) / 100;

package/scripts/analytics/goodHolders.ts

@@ -1,5 +1,4 @@
 import { last, range, sortBy } from "lodash";
-import fetch from "node-fetch";
 import PromisePool from "async-promise-pool";
 import fs from "fs";
 import { ethers } from "hardhat";
@@ -19,16 +18,13 @@ const main = async () => {
       }`;
     // console.log({ query });
     try {
-      const { data = {}, errors } = await fetch(
-        "https://api.thegraph.com/subgraphs/name/gooddollar/gooddollarfuse2",
-        {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json"
-          },
-          body: JSON.stringify({ query })
-        }
-      ).then(_ => _.json());
+      const { data = {}, errors } = await fetch("https://api.thegraph.com/subgraphs/name/gooddollar/gooddollarfuse2", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({ query })
+      }).then(_ => _.json());
       errors && console.log({ errors });
       if (data?.goodBalances?.length === 1000) {
         const nextAddr = last(data?.goodBalances).id;

package/scripts/analytics/p2pTxs.ts

@@ -1,5 +1,4 @@
 import { maxBy, range, sortBy, flatten, uniq } from "lodash";
-import fetch from "node-fetch";
 import PromisePool from "async-promise-pool";
 import fs from "fs";
 import { Contract, Provider, setMulticallAddress } from "ethers-multicall";
@@ -487,9 +486,7 @@ const allProtocolAddresses: Array<string> = [
 ];
 
 setMulticallAddress(122, "0x3CE6158b7278Bf6792e014FA7B4f3c6c46fe9410");
-const fuseProvider = new ethers.providers.WebSocketProvider(
-  "wss://rpc.gooddollar.org"
-);
+const fuseProvider = new ethers.providers.WebSocketProvider("wss://rpc.gooddollar.org");
 const ethcallProvider = new Provider(fuseProvider, 122);
 
 const GD_FUSE = "0x495d133b938596c9984d462f007b676bdc57ecec";
@@ -534,31 +531,16 @@ const main = async () => {
           )
       );
 
-      const checkWhitelisted = uniq(
-        flatten(
-          clean.map(_ => [_.args.from.toLowerCase(), _.args.to.toLowerCase()])
-        )
-      );
-      const calls = checkWhitelisted.map(d =>
-        identityContract.isWhitelisted(d)
-      );
+      const checkWhitelisted = uniq(flatten(clean.map(_ => [_.args.from.toLowerCase(), _.args.to.toLowerCase()])));
+      const calls = checkWhitelisted.map(d => identityContract.isWhitelisted(d));
       const result = await ethcallProvider.all(calls);
       const whitelisted = checkWhitelisted.filter((v, i) => result[i]);
       const p2p = clean.filter(
-        _ =>
-          whitelisted.includes(_.args.to.toLowerCase()) ||
-          whitelisted.includes(_.args.from.toLowerCase())
+        _ => whitelisted.includes(_.args.to.toLowerCase()) || whitelisted.includes(_.args.from.toLowerCase())
       );
       p2pTxs = p2pTxs.concat(p2p);
       uniques = uniques.concat(whitelisted);
-      console.log(
-        { fromBlock },
-        results.length,
-        clean.length,
-        checkWhitelisted.length,
-        whitelisted.length,
-        p2p.length
-      );
+      console.log({ fromBlock }, results.length, clean.length, checkWhitelisted.length, whitelisted.length, p2p.length);
     });
   });
 

package/scripts/analytics/tokenInOutStats.ts

@@ -1,5 +1,4 @@
 import { maxBy, range, sortBy } from "lodash";
-import fetch from "node-fetch";
 import PromisePool from "async-promise-pool";
 import fs from "fs";
 import { ethers } from "hardhat";
@@ -43,10 +42,7 @@ const main = async () => {
       ins.push(r);
     }
   });
-  fs.writeFileSync(
-    "tokenInOut.json",
-    JSON.stringify({ incoming, outgoing, ins })
-  );
+  fs.writeFileSync("tokenInOut.json", JSON.stringify({ incoming, outgoing, ins }));
 };
 
 main().catch(e => console.log(e));