@gooddollar/goodprotocol 2.0.5 → 2.0.6

package/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "GoodDollar Protocol",
+  "engines": {
+    "node": "18.x"
+  },
   "scripts": {
     "prepack": "npm run minimize",
     "build": "scripts/build.sh deploy",

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));

package/scripts/governance/airdropCalculation.ts

@@ -1,15 +1,11 @@
 import { get, range, chunk, flatten, mergeWith, sortBy, uniq } from "lodash";
 import fs from "fs";
-import MerkleTree, {
-  checkProof,
-  checkProofOrdered
-} from "merkle-tree-solidity";
+import MerkleTree, { checkProof, checkProofOrdered } from "merkle-tree-solidity";
 import coreContracts from "@gooddollar/goodcontracts/releases/deployment.json";
 import stakingContracts from "@gooddollar/goodcontracts/stakingModel/releases/deployment.json";
 import upgradablesContracts from "@gooddollar/goodcontracts/upgradables/releases/deployment.json";
 import SimpleDAIStaking from "@gooddollar/goodcontracts/stakingModel/build/contracts/SimpleDAIStaking.min.json";
 import { ethers as Ethers } from "hardhat";
-import fetch from "node-fetch";
 import { request, gql } from "graphql-request";
 import { Retrier } from "@jsier/retrier";
 import PromisePool from "async-promise-pool";
@@ -56,9 +52,7 @@ const otherContracts = [
 
 const systemContracts = {};
 const allContracts = flatten(
-  [coreContracts, stakingContracts, upgradablesContracts].map(_ =>
-    Object.values(_).map(_ => Object.values(_))
-  )
+  [coreContracts, stakingContracts, upgradablesContracts].map(_ => Object.values(_).map(_ => Object.values(_)))
 );
 flatten(
   [].concat(
@@ -89,27 +83,17 @@ const quantile = (sorted, q) => {
 let FUSE_SNAPSHOT_BLOCK = 13175510; //September-29-2021 03:00:00 PM +3 UTC
 let ETH_SNAPSHOT_BLOCK = 13320531; //first blocka after 12pm Sep-29-2021 12:00:20 PM +UTC
 
-export const airdrop = (
-  ethers: typeof Ethers,
-  ethplorer_key,
-  etherscan_key
-) => {
+export const airdrop = (ethers: typeof Ethers, ethplorer_key, etherscan_key) => {
   const fusePoktProvider = new ethers.providers.JsonRpcProvider({
     url: "https://fuse-mainnet.gateway.pokt.network/v1/lb/60ee374fc6318362996a1fb0",
     user: "",
     password: "d57939c260bdf0a6f22550e2350b4312" //end point will be removed, so its ok to keep clear text password
   });
 
-  const fuseProvider = new ethers.providers.JsonRpcProvider(
-    "https://rpc.fuse.io"
-  );
+  const fuseProvider = new ethers.providers.JsonRpcProvider("https://rpc.fuse.io");
 
-  const fuseGDProvider = new ethers.providers.JsonRpcProvider(
-    "https://gooddollar-rpc.fuse.io"
-  );
-  const fuseArchiveProvider = new ethers.providers.JsonRpcBatchProvider(
-    "https://explorer-node.fuse.io/"
-  );
+  const fuseGDProvider = new ethers.providers.JsonRpcProvider("https://gooddollar-rpc.fuse.io");
+  const fuseArchiveProvider = new ethers.providers.JsonRpcBatchProvider("https://explorer-node.fuse.io/");
 
   const poktArchiveProvider = new ethers.providers.JsonRpcProvider({
     url: "https://eth-trace.gateway.pokt.network/v1/lb/6130bad2dc57c50036551041",
@@ -182,8 +166,7 @@ export const airdrop = (
     const nowBlock = ETH_SNAPSHOT_BLOCK; //await staking.provider.getBlockNumber();
     let toAggregate = events.map(_ => [
       _.args.staker.toLowerCase(),
-      parseFloat(ethers.utils.formatEther(_.args.daiValue)) *
-        (nowBlock - _.blockNumber), //value staked multiplied by time staked (there where no withdraws so far besides foundation account)
+      parseFloat(ethers.utils.formatEther(_.args.daiValue)) * (nowBlock - _.blockNumber), //value staked multiplied by time staked (there where no withdraws so far besides foundation account)
       parseFloat(ethers.utils.formatEther(_.args.daiValue))
     ]);
 
@@ -200,16 +183,12 @@ export const airdrop = (
       .filter(_ => !isSystemContract(_.args.from))
       .map(e => [
         e.args.from.toLowerCase(),
-        parseFloat(ethers.utils.formatEther(e.args.value)) *
-          (nowBlock - e.blockNumber),
+        parseFloat(ethers.utils.formatEther(e.args.value)) * (nowBlock - e.blockNumber),
         parseFloat(ethers.utils.formatEther(e.args.value))
       ]);
 
     //read eth donations and calculate period * $ value
-    let provider = new ethers.providers.EtherscanProvider(
-      "homestead",
-      etherscan_key
-    );
+    let provider = new ethers.providers.EtherscanProvider("homestead", etherscan_key);
 
     //use etherscan to read past eth transfers to the donation contract
     let historyPromises = (
@@ -222,9 +201,9 @@ export const airdrop = (
       .filter(_ => _.value.gt(ethers.constants.Zero))
       .map(async _ => {
         const data = await fetch(
-          `https://poloniex.com/public?command=returnChartData&currencyPair=USDT_ETH&start=${
-            _.timestamp
-          }&end=${_.timestamp + 30000}&period=300`
+          `https://poloniex.com/public?command=returnChartData&currencyPair=USDT_ETH&start=${_.timestamp}&end=${
+            _.timestamp + 30000
+          }&period=300`
         ).then(_ => _.json());
         const price = data[0].weightedAverage || data[0].open;
         if (price == 0) console.error("error 0 price", { data });
@@ -234,18 +213,13 @@ export const airdrop = (
           timestamp: _.timestamp,
           price,
           usdvalue: price * parseFloat(ethers.utils.formatEther(_.value)),
-          share:
-            price *
-            parseFloat(ethers.utils.formatEther(_.value)) *
-            (nowBlock - _.blockNumber) //value staked multiplied by time staked
+          share: price * parseFloat(ethers.utils.formatEther(_.value)) * (nowBlock - _.blockNumber) //value staked multiplied by time staked
         };
       });
 
     let ethDonations = await Promise.all(historyPromises);
 
-    let donationsToAggregate = daiDonationsToAggregate.concat(
-      ethDonations.map(_ => [_.from, _.share, _.usdvalue])
-    );
+    let donationsToAggregate = daiDonationsToAggregate.concat(ethDonations.map(_ => [_.from, _.share, _.usdvalue]));
 
     const stakerToTotal: { [key: string]: number } = {};
     toAggregate = toAggregate.concat(donationsToAggregate);
@@ -265,8 +239,7 @@ export const airdrop = (
     withdrawevents.forEach(
       _ =>
         (stakerToTotal[_.args.staker.toLowerCase()] -=
-          parseFloat(ethers.utils.formatEther(_.args.daiValue)) *
-          (nowBlock - _.blockNumber))
+          parseFloat(ethers.utils.formatEther(_.args.daiValue)) * (nowBlock - _.blockNumber))
     );
 
     //filter contracts + calculate total shares
@@ -323,10 +296,7 @@ export const airdrop = (
         liquidityPositions(
           orderDirection: desc
           orderBy: liquidityTokenBalance
-          where: {
-            pair: "0xa56a281cd8ba5c083af121193b2aaccaaac9850a"
-            liquidityTokenBalance_gt: 0
-          }
+          where: { pair: "0xa56a281cd8ba5c083af121193b2aaccaaac9850a", liquidityTokenBalance_gt: 0 }
         ) {
           id
           user {
@@ -341,10 +311,7 @@ export const airdrop = (
       }
     `;
 
-    let pair = await ethers.getContractAt(
-      "UniswapPair",
-      "0xa56a281cd8ba5c083af121193b2aaccaaac9850a"
-    );
+    let pair = await ethers.getContractAt("UniswapPair", "0xa56a281cd8ba5c083af121193b2aaccaaac9850a");
     pair = pair.connect(poktArchiveProvider);
 
     const pairTotalSupply = await pair
@@ -358,10 +325,7 @@ export const airdrop = (
     console.log("uniswap pair data:", { reserve0, pairTotalSupply });
 
     //TODO: read supplier balance at snapshot
-    const { liquidityPositions } = await request(
-      "https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v2",
-      query
-    );
+    const { liquidityPositions } = await request("https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v2", query);
 
     const gdHoldings = liquidityPositions.map(async pos => {
       const uAddress = pos.user.id.toLowerCase();
@@ -376,8 +340,7 @@ export const airdrop = (
         `${uAddress}.isNotContract`,
         (await gdMainnet.provider.getCode(uAddress).catch(e => "0x")) === "0x"
       );
-      const newBalance =
-        (get(addresses, `${uAddress}.balance`, 0) as number) + gdShare;
+      const newBalance = (get(addresses, `${uAddress}.balance`, 0) as number) + gdShare;
       console.log("uniswap position:", {
         pos,
         newBalance,
@@ -396,11 +359,7 @@ export const airdrop = (
     return addresses;
   };
 
-  const getFuseSwapBalances = async (
-    graphqlUrl,
-    tokenId,
-    addresses: Balances = {}
-  ) => {
+  const getFuseSwapBalances = async (graphqlUrl, tokenId, addresses: Balances = {}) => {
     const _calcHoldings = async (pair, addresses: Balances = {}) => {
       const { liquidityPositions, reserve0: isReserve0, id } = pair;
       let pairContract = await ethers.getContractAt("UniswapPair", id);
@@ -443,8 +402,7 @@ export const airdrop = (
               reserve: reserve
             });
 
-            const newBalance =
-              (get(addresses, `${uAddress}.balance`, 0) as number) + gdShare;
+            const newBalance = (get(addresses, `${uAddress}.balance`, 0) as number) + gdShare;
 
             addresses[uAddress] = updateBalance(addresses[uAddress], {
               balance: newBalance
@@ -516,8 +474,7 @@ export const airdrop = (
     );
 
     const farmers = {};
-    const yieldFarmingRep =
-      addresses[usdcgdYieldFarming.address.toLowerCase()]?.balance || 0;
+    const yieldFarmingRep = addresses[usdcgdYieldFarming.address.toLowerCase()]?.balance || 0;
     if (yieldFarmingRep > 0) {
       const [totalStaked, ,] = await usdcgdYieldFarming.interestData({
         blockTag: FUSE_SNAPSHOT_BLOCK
@@ -525,19 +482,14 @@ export const airdrop = (
 
       await Promise.all(
         staked.map(async e => {
-          const [balance] = await usdcgdYieldFarming.getStakerData(
-            e.args.staker,
-            { blockTag: FUSE_SNAPSHOT_BLOCK }
-          );
+          const [balance] = await usdcgdYieldFarming.getStakerData(e.args.staker, { blockTag: FUSE_SNAPSHOT_BLOCK });
 
           if (balance > 0) {
             const share = balance.toNumber() / totalStaked.toNumber();
             const uAddress = e.args.staker;
             const repShare = parseInt((share * yieldFarmingRep).toFixed(0));
             farmers[uAddress] = [share, repShare];
-            const newBalance =
-              (get(addresses, `${uAddress}.balance`, 0) as number) +
-              share * yieldFarmingRep;
+            const newBalance = (get(addresses, `${uAddress}.balance`, 0) as number) + share * yieldFarmingRep;
 
             addresses[uAddress] = updateBalance(addresses[uAddress], {
               balance: newBalance
@@ -563,16 +515,8 @@ export const airdrop = (
     return addresses;
   };
 
-  const getFuseHolders = async (
-    addresses: Balances = {},
-    onlyBalances = false,
-    onlyFailed = false
-  ) => {
-    console.log(
-      "getFuseHolders",
-      { onlyBalances, onlyFailed },
-      Object.keys(addresses).length
-    );
+  const getFuseHolders = async (addresses: Balances = {}, onlyBalances = false, onlyFailed = false) => {
+    console.log("getFuseHolders", { onlyBalances, onlyFailed }, Object.keys(addresses).length);
     const toFetch = {};
 
     const step = 1000;
@@ -596,11 +540,7 @@ export const airdrop = (
           const logs = await retrier.resolve(attempt => {
             console.log("fetching block transfer logs", { attempt, bc });
 
-            return contracts[idx++ % contracts.length].queryFilter(
-              filter,
-              bc,
-              Math.min(bc + step - 1, latestBlock)
-            );
+            return contracts[idx++ % contracts.length].queryFilter(filter, bc, Math.min(bc + step - 1, latestBlock));
           });
 
           logs.forEach(l => (toFetch[l.args.to.toLowerCase()] = true));
@@ -652,14 +592,11 @@ export const airdrop = (
     for (let addrChunk of chunk(addrs, 50)) {
       balancesPool.add(async () => {
         const ps = addrChunk.map(async (uAddress: string) => {
-          const curBalance = onlyFailed
-            ? 0
-            : get(addresses, `${uAddress}.balance`, 0);
+          const curBalance = onlyFailed ? 0 : get(addresses, `${uAddress}.balance`, 0);
           const isNotContract = get(
             addresses,
             `${uAddress}.isNotContract`,
-            (await gdNonArchive.provider.getCode(uAddress).catch(e => "0x")) ===
-              "0x"
+            (await gdNonArchive.provider.getCode(uAddress).catch(e => "0x")) === "0x"
           );
           const balance = await gd
             .balanceOf(uAddress)
@@ -682,8 +619,7 @@ export const airdrop = (
 
     await balancesPool.all();
     console.log("fuseHolders failed:", failed.length);
-    if (!onlyFailed)
-      fs.writeFileSync("airdrop/failed.tmp", JSON.stringify(failed));
+    if (!onlyFailed) fs.writeFileSync("airdrop/failed.tmp", JSON.stringify(failed));
     return addresses;
   };
 
@@ -706,8 +642,7 @@ export const airdrop = (
           const isNotContract = get(
             addresses,
             `${uAddress}.isNotContract`,
-            (await gdNonArchive.provider.getCode(b[0]).catch(e => "0x")) ===
-              "0x"
+            (await gdNonArchive.provider.getCode(b[0]).catch(e => "0x")) === "0x"
           );
           const cleanBalance = await gdNonArchive
             .balanceOf(uAddress, { blockTag: FUSE_SNAPSHOT_BLOCK })
@@ -738,9 +673,7 @@ export const airdrop = (
       }
 
       if (items && items.length) {
-        const foundBalances = items.map(i =>
-          i.match(/(0x\w{20,})|([0-9\.,]+ G\$)/g)
-        );
+        const foundBalances = items.map(i => i.match(/(0x\w{20,})|([0-9\.,]+ G\$)/g));
         analyzedPages++;
         analyzedBalances += foundBalances.length;
         toFetch = toFetch.concat(foundBalances);
@@ -795,13 +728,11 @@ export const airdrop = (
             .then(_ => _.toNumber())
             .catch(e => failedAccounts.push(uAddress));
 
-          const newBalance =
-            get(addresses, `${uAddress}.balance`, 0) + cleanBalance;
+          const newBalance = get(addresses, `${uAddress}.balance`, 0) + cleanBalance;
           const isNotContract = get(
             addresses,
             `${uAddress}.isNotContract`,
-            (await gdMainnet.provider.getCode(uAddress).catch(e => "0x")) ===
-              "0x"
+            (await gdMainnet.provider.getCode(uAddress).catch(e => "0x")) === "0x"
           );
           addresses[uAddress] = updateBalance(addresses[uAddress], {
             balance: newBalance,
@@ -820,10 +751,7 @@ export const airdrop = (
     return addresses;
   };
 
-  const getClaimsPerAddress = async (
-    balances: Balances = {},
-    ubiContract = ubi
-  ) => {
+  const getClaimsPerAddress = async (balances: Balances = {}, ubiContract = ubi) => {
     const ubiFuse = ubiContract.connect(fuseProvider);
     const ubiPokt = ubiContract.connect(fusePoktProvider);
     const ubiGD = ubiContract.connect(fuseGDProvider);
@@ -831,11 +759,7 @@ export const airdrop = (
     const pool = new PromisePool({ concurrency: 50 });
     const step = 1000;
     const latestBlock = FUSE_SNAPSHOT_BLOCK; //await ubiContract.provider.getBlockNumber();
-    const blocks = range(
-      ubiContract === ubi ? 6276288 : 9376522,
-      ubiContract === ubi ? 9497482 : latestBlock,
-      step
-    );
+    const blocks = range(ubiContract === ubi ? 6276288 : 9376522, ubiContract === ubi ? 9497482 : latestBlock, step);
     const filter = ubiContract.filters.UBIClaimed();
     const contracts = [ubiFuse, ubiGD];
     let idx = 0;
@@ -847,11 +771,7 @@ export const airdrop = (
         const logs = await retrier.resolve(attempt => {
           console.log("fetching block ubiclaimed logs", { attempt, bc });
 
-          return contracts[idx++ % contracts.length].queryFilter(
-            filter,
-            bc,
-            Math.min(bc + step - 1, latestBlock)
-          );
+          return contracts[idx++ % contracts.length].queryFilter(filter, bc, Math.min(bc + step - 1, latestBlock));
         });
 
         console.log("found claim logs in block:", { bc }, logs.length);
@@ -870,20 +790,12 @@ export const airdrop = (
   };
 
   const calcRelativeRep = (balances: Balances) => {
-    const totalSupply = Object.values(balances).reduce(
-      (cur, data) => cur + data.balance,
-      0
-    );
-    const totalClaims = Object.values(balances).reduce(
-      (cur, data) => cur + (data.claims || 0),
-      0
-    );
+    const totalSupply = Object.values(balances).reduce((cur, data) => cur + data.balance, 0);
+    const totalClaims = Object.values(balances).reduce((cur, data) => cur + (data.claims || 0), 0);
 
     for (let addr in balances) {
-      balances[addr].gdRepShare =
-        totalSupply > 0 ? balances[addr].balance / totalSupply : 0;
-      balances[addr].claimRepShare =
-        totalClaims > 0 ? balances[addr].claims / totalClaims : 0;
+      balances[addr].gdRepShare = totalSupply > 0 ? balances[addr].balance / totalSupply : 0;
+      balances[addr].claimRepShare = totalClaims > 0 ? balances[addr].claims / totalClaims : 0;
     }
     return { totalSupply, totalClaims, balances };
   };
@@ -903,35 +815,26 @@ export const airdrop = (
 
     ps[0] = _timer(
       "getFuseSwapBalances",
-      getFuseSwapBalances(
-        "https://graph.fuse.io/subgraphs/name/fuseio/fuseswap",
-        GD_FUSE
-      ).then(r =>
+      getFuseSwapBalances("https://graph.fuse.io/subgraphs/name/fuseio/fuseswap", GD_FUSE).then(r =>
         fs.writeFileSync("airdrop/fuseswapBalances.json", JSON.stringify(r))
       )
     );
 
     ps[1] = _timer(
       "getUniswapBalances",
-      getUniswapBalances().then(r =>
-        fs.writeFileSync("airdrop/uniswapBalances.json", JSON.stringify(r))
-      )
+      getUniswapBalances().then(r => fs.writeFileSync("airdrop/uniswapBalances.json", JSON.stringify(r)))
     );
 
     ps[2] = _timer(
       "getClaimsPerAddress",
       getClaimsPerAddress()
         .then(r => getClaimsPerAddress(r, ubinew))
-        .then(r =>
-          fs.writeFileSync("airdrop/claimBalances.json", JSON.stringify(r))
-        )
+        .then(r => fs.writeFileSync("airdrop/claimBalances.json", JSON.stringify(r)))
     );
 
     ps[3] = _timer(
       "getEthPlorerHolders",
-      getEthPlorerHolders().then(r =>
-        fs.writeFileSync("airdrop/ethBalances.json", JSON.stringify(r))
-      )
+      getEthPlorerHolders().then(r => fs.writeFileSync("airdrop/ethBalances.json", JSON.stringify(r)))
     );
 
     // ps[4] = _timer(
@@ -945,16 +848,12 @@ export const airdrop = (
     // );
     ps[4] = _timer(
       "getFuseHolders",
-      getFuseHolders({}).then(r =>
-        fs.writeFileSync("airdrop/fuseBalances.json", JSON.stringify(r))
-      )
+      getFuseHolders({}).then(r => fs.writeFileSync("airdrop/fuseBalances.json", JSON.stringify(r)))
     );
 
     ps[5] = _timer(
       "getStakersBalance",
-      getStakersBalance().then(r =>
-        fs.writeFileSync("airdrop/stakersBalances.json", JSON.stringify(r))
-      )
+      getStakersBalance().then(r => fs.writeFileSync("airdrop/stakersBalances.json", JSON.stringify(r)))
     );
 
     await Promise.all(ps);
@@ -980,13 +879,8 @@ export const airdrop = (
       obj1.claims = get(obj1, "claims", 0) + get(obj2, "claims", 0);
       obj1.balance = get(obj1, "balance", 0) + get(obj2, "balance", 0);
       obj1.stake = get(obj1, "stake", 0) + get(obj2, "stake", 0);
-      obj1.stakeRepShare =
-        get(obj1, "stakeRepShare") || get(obj2, "stakeRepShare", 0);
-      obj1.isNotContract = get(
-        obj1,
-        "isNotContract",
-        get(obj2, "isNotContract")
-      );
+      obj1.stakeRepShare = get(obj1, "stakeRepShare") || get(obj2, "stakeRepShare", 0);
+      obj1.isNotContract = get(obj1, "isNotContract", get(obj2, "isNotContract"));
       return obj1;
     };
 
@@ -1003,14 +897,9 @@ export const airdrop = (
     const HOLDER_REP_ALLOCATION = 24000000;
     const STAKER_REP_ALLOCATION = 24000000;
 
-    const ETORO = [
-      "0xf79b804bae955ae4cd8e8b0331c4bc437104804f",
-      "0x61ec01ad0937ebc10d448d259a2bbb1556b61e38"
-    ];
-    const EtoroOfficial =
-      "0x61ec01ad0937ebc10d448d259a2bbb1556b61e38".toLowerCase();
-    const FoundationOfficial =
-      "0x66582D24FEaD72555adaC681Cc621caCbB208324".toLowerCase();
+    const ETORO = ["0xf79b804bae955ae4cd8e8b0331c4bc437104804f", "0x61ec01ad0937ebc10d448d259a2bbb1556b61e38"];
+    const EtoroOfficial = "0x61ec01ad0937ebc10d448d259a2bbb1556b61e38".toLowerCase();
+    const FoundationOfficial = "0x66582D24FEaD72555adaC681Cc621caCbB208324".toLowerCase();
 
     const TEAM = [
       "0x5AeE2397b39B479B72bcfbDA114512BD3329E5aC",
@@ -1045,24 +934,24 @@ export const airdrop = (
 
     ETORO.forEach(addr => delete balances[addr]);
 
-    let toTree: Array<
-      [string, number, boolean, number, number, number, number]
-    > = Object.entries(balances).map(([addr, data]) => {
-      let rep =
-        data.claimRepShare * CLAIMER_REP_ALLOCATION +
-        data.gdRepShare * HOLDER_REP_ALLOCATION +
-        data.stakeRepShare * STAKER_REP_ALLOCATION;
-
-      return [
-        addr,
-        rep,
-        !data.isNotContract,
-        data.claimRepShare * CLAIMER_REP_ALLOCATION,
-        data.gdRepShare * HOLDER_REP_ALLOCATION,
-        data.stakeRepShare * STAKER_REP_ALLOCATION,
-        0
-      ];
-    });
+    let toTree: Array<[string, number, boolean, number, number, number, number]> = Object.entries(balances).map(
+      ([addr, data]) => {
+        let rep =
+          data.claimRepShare * CLAIMER_REP_ALLOCATION +
+          data.gdRepShare * HOLDER_REP_ALLOCATION +
+          data.stakeRepShare * STAKER_REP_ALLOCATION;
+
+        return [
+          addr,
+          rep,
+          !data.isNotContract,
+          data.claimRepShare * CLAIMER_REP_ALLOCATION,
+          data.gdRepShare * HOLDER_REP_ALLOCATION,
+          data.stakeRepShare * STAKER_REP_ALLOCATION,
+          0
+        ];
+      }
+    );
 
     //split etoro's rep between team,etoro and foundation
     const foundationEtoroRepShare = 8640000;
@@ -1072,15 +961,7 @@ export const airdrop = (
     foundationRecord[6] = foundationEtoroRepShare;
     console.log("Foundation updated record:", foundationRecord);
 
-    const etoroRecord: [
-      string,
-      number,
-      boolean,
-      number,
-      number,
-      number,
-      number
-    ] = [
+    const etoroRecord: [string, number, boolean, number, number, number, number] = [
       EtoroOfficial,
       foundationEtoroRepShare,
       false,
@@ -1128,11 +1009,7 @@ export const airdrop = (
       console.log({
         precentile: q * 100 + "%",
         addresses: (sorted.length * q).toFixed(0),
-        rep:
-          quantile(sorted, q) /
-          (CLAIMER_REP_ALLOCATION +
-            HOLDER_REP_ALLOCATION +
-            STAKER_REP_ALLOCATION)
+        rep: quantile(sorted, q) / (CLAIMER_REP_ALLOCATION + HOLDER_REP_ALLOCATION + STAKER_REP_ALLOCATION)
       })
     );
 
@@ -1145,10 +1022,7 @@ export const airdrop = (
         })
         .split(".")[0];
       const hash = ethers.utils.keccak256(
-        ethers.utils.defaultAbiCoder.encode(
-          ["address", "uint256"],
-          [e[0], repInWei]
-        )
+        ethers.utils.defaultAbiCoder.encode(["address", "uint256"], [e[0], repInWei])
       );
       treeData[e[0]] = {
         rep: repInWei,
@@ -1176,9 +1050,7 @@ export const airdrop = (
       1
     );
 
-    const lastProof = merkleTree
-      .getProof(elements[elements.length - 1])
-      .map(_ => _.toString("hex"));
+    const lastProof = merkleTree.getProof(elements[elements.length - 1]).map(_ => _.toString("hex"));
     const lastValidProof = checkProofOrdered(
       lastProof.map(_ => Buffer.from(_, "hex")),
       merkleTree.getRoot(),
@@ -1230,10 +1102,7 @@ export const airdrop = (
     const proof = merkleTree.getProof(proofFor);
     const proofIndex = entries.findIndex(_ => _[1].hash === addrData.hash) + 1;
 
-    console.log(
-      "checkProof:",
-      checkProofOrdered(proof, merkleTree.getRoot(), proofFor, proofIndex)
-    );
+    console.log("checkProof:", checkProofOrdered(proof, merkleTree.getRoot(), proofFor, proofIndex));
     const hexProof = proof.map(_ => "0x" + _.toString("hex"));
     console.log({ proofIndex, proof: hexProof, [addr]: addrData });
   };

package/scripts/governance/goodCheckpointSorted.ts

@@ -9,7 +9,6 @@ import { MerkleTree } from "merkletreejs";
 import PromisePool from "async-promise-pool";
 import { ethers as Ethers } from "hardhat";
 import { BigNumber } from "ethers";
-import fetch from "node-fetch";
 
 const quantile = (sorted, q) => {
   const pos = (sorted.length - 1) * q;
@@ -22,18 +21,11 @@ const quantile = (sorted, q) => {
 };
 
 export const airdrop = (ethers: typeof Ethers) => {
-  const fuseProvider = new ethers.providers.JsonRpcProvider(
-    "https://rpc.fuse.io"
-  );
-
-  const zxfastProvider = new ethers.providers.JsonRpcProvider(
-    "https://eth-eu.0xfast.com/rpc/free"
-  );
-
-  const cfProvider = new ethers.providers.InfuraProvider(
-    1,
-    "143f9cf968fe4c3da0db77ff525e0da4"
-  );
+  const fuseProvider = new ethers.providers.JsonRpcProvider("https://rpc.fuse.io");
+
+  const zxfastProvider = new ethers.providers.JsonRpcProvider("https://eth-eu.0xfast.com/rpc/free");
+
+  const cfProvider = new ethers.providers.InfuraProvider(1, "143f9cf968fe4c3da0db77ff525e0da4");
   const goodActiveVotes = async (network = "fuse") => {
     let balances = [];
 
@@ -45,9 +37,7 @@ export const airdrop = (ethers: typeof Ethers) => {
 
     const graphQuery = async (start, skip, step = EPOCH) => {
       const query = `{
-          goodBalances(first: 1000 skip:${skip} where: { memberSince_gte: ${start} memberSince_lt:${
-        start + step
-      } }) {
+          goodBalances(first: 1000 skip:${skip} where: { memberSince_gte: ${start} memberSince_lt:${start + step} }) {
             id
             coreBalance
             totalVotes
@@ -64,16 +54,11 @@ export const airdrop = (ethers: typeof Ethers) => {
           body: JSON.stringify({ query })
         }).then(_ => _.json());
         errors && console.log({ errors });
-        if (
-          errors?.[0]?.message ===
-          "The `skip` argument must be between 0 and 5000, but is 6000"
-        ) {
+        if (errors?.[0]?.message === "The `skip` argument must be between 0 and 5000, but is 6000") {
           throw new Error("skip");
         }
         if (data?.goodBalances?.length === 1000) {
-          return data.goodBalances.concat(
-            await graphQuery(start, skip + 1000, step)
-          );
+          return data.goodBalances.concat(await graphQuery(start, skip + 1000, step));
         }
         return data.goodBalances || [];
       } catch (error) {
@@ -111,11 +96,7 @@ export const airdrop = (ethers: typeof Ethers) => {
     await pool.all();
     console.log(`total ${network} GOOD Holders:`, balances.length, {
       uniques: uniq(balances.map(_ => _.id)).length,
-      delegatees: uniq(
-        balances
-          .filter(_ => Number(_.coreBalance) < Number(_.totalVotes))
-          .map(_ => _.id)
-      ).length,
+      delegatees: uniq(balances.filter(_ => Number(_.coreBalance) < Number(_.totalVotes)).map(_ => _.id)).length,
       sample: balances.slice(0, 5)
     });
 
@@ -128,10 +109,7 @@ export const airdrop = (ethers: typeof Ethers) => {
         rep: record.activeVotes,
         hash: ethers.utils.keccak256(
           ethers.utils.keccak256(
-            ethers.utils.defaultAbiCoder.encode(
-              ["address", "uint256"],
-              [record.id, record.activeVotes]
-            )
+            ethers.utils.defaultAbiCoder.encode(["address", "uint256"], [record.id, record.activeVotes])
           )
         )
       };
@@ -140,9 +118,7 @@ export const airdrop = (ethers: typeof Ethers) => {
       `goodCheckpoints/goodCheckpoint_${network}.json`,
       JSON.stringify({ treeData, balances, until: Date.now() })
     );
-    console.log(
-      balances.filter(_ => Number(_.coreBalance) < Number(_.totalVotes))
-    );
+    console.log(balances.filter(_ => Number(_.coreBalance) < Number(_.totalVotes)));
   };
 
   const collectAirdropData = async () => {
@@ -157,33 +133,15 @@ export const airdrop = (ethers: typeof Ethers) => {
       for (let blockChunk of chunk(blocks, 10)) {
         // Get the filter (the second null could be omitted)
         const ps = blockChunk.map(async (bc: number) => {
-          const logs = await good
-            .queryFilter(
-              good.filters.Mint(),
-              bc,
-              Math.min(bc + step - 1, LAST_BLOCK)
-            )
-            .catch(e => {
-              console.log("block transfer logs failed retrying...", bc);
-              return good.queryFilter(
-                good.filters.Mint(),
-                bc,
-                Math.min(bc + step - 1, LAST_BLOCK)
-              );
-            });
+          const logs = await good.queryFilter(good.filters.Mint(), bc, Math.min(bc + step - 1, LAST_BLOCK)).catch(e => {
+            console.log("block transfer logs failed retrying...", bc);
+            return good.queryFilter(good.filters.Mint(), bc, Math.min(bc + step - 1, LAST_BLOCK));
+          });
           const claimedLogs = await good
-            .queryFilter(
-              good.filters.StateHashProof(),
-              bc,
-              Math.min(bc + step - 1, LAST_BLOCK)
-            )
+            .queryFilter(good.filters.StateHashProof(), bc, Math.min(bc + step - 1, LAST_BLOCK))
             .catch(e => {
               console.log("block transfer logs failed retrying...", bc);
-              return good.queryFilter(
-                good.filters.StateHashProof(),
-                bc,
-                Math.min(bc + step - 1, LAST_BLOCK)
-              );
+              return good.queryFilter(good.filters.StateHashProof(), bc, Math.min(bc + step - 1, LAST_BLOCK));
             });
           console.log("found logs:", claimedLogs.length, logs.length, bc);
           return logs.concat(claimedLogs);
@@ -201,20 +159,14 @@ export const airdrop = (ethers: typeof Ethers) => {
       let totalMints = ethers.constants.Zero;
       logs.forEach(l => {
         if (l.event === "Mint") {
-          mints[l.args._to.toLowerCase()] = (
-            mints[l.args._to.toLowerCase()] || BigNumber.from("0")
-          ).add(l.args._amount);
+          mints[l.args._to.toLowerCase()] = (mints[l.args._to.toLowerCase()] || BigNumber.from("0")).add(
+            l.args._amount
+          );
           totalMints = totalMints.add(l.args._amount);
         } else claims[l.args.user.toLowerCase()] = l.args.repBalance.toString();
       });
-      Object.entries(mints).forEach(
-        ([k, v]) =>
-          (result[k] = { claim: "0", ...result[k], mint: v.toString() })
-      );
-      Object.entries(claims).forEach(
-        ([k, v]) =>
-          (result[k] = { mint: "0", ...result[k], claim: v.toString() })
-      );
+      Object.entries(mints).forEach(([k, v]) => (result[k] = { claim: "0", ...result[k], mint: v.toString() }));
+      Object.entries(claims).forEach(([k, v]) => (result[k] = { mint: "0", ...result[k], claim: v.toString() }));
       console.log({ result, totalMints: totalMints.toString() });
       fs.writeFileSync("goodCheckpointMainnet.json", JSON.stringify(result));
     };
@@ -227,33 +179,21 @@ export const airdrop = (ethers: typeof Ethers) => {
   const buildMerkleTree = async () => {
     const buildTree = async (network = "fuse") => {
       const good = await ethers
-        .getContractAt(
-          "GReputation",
-          "0x603B8C0F110E037b51A381CBCacAbb8d6c6E4543"
-        )
+        .getContractAt("GReputation", "0x603B8C0F110E037b51A381CBCacAbb8d6c6E4543")
         .then(_ => _.connect(network === "fuse" ? fuseProvider : cfProvider));
 
-      const checkpoint = JSON.parse(
-        fs
-          .readFileSync(`goodCheckpoints/goodCheckpoint_${network}.json`)
-          .toString()
-      );
+      const checkpoint = JSON.parse(fs.readFileSync(`goodCheckpoints/goodCheckpoint_${network}.json`).toString());
 
       const treeData = checkpoint.treeData;
 
-      let toTree: Array<[string, BigNumber]> = Object.entries(treeData).map(
-        ([k, v]) => {
-          return [k, BigNumber.from((v as any).rep)];
-        }
-      );
+      let toTree: Array<[string, BigNumber]> = Object.entries(treeData).map(([k, v]) => {
+        return [k, BigNumber.from((v as any).rep)];
+      });
 
       toTree = toTree.sort((a, b) => (a[1].gte(b[1]) ? 1 : -1)).reverse();
       //     console.log({ toTree });
       //     const topContracts = toTree.filter(_ => _[2] === true);
-      const totalReputation = toTree.reduce(
-        (c, a) => c.add(a[1]),
-        BigNumber.from(0)
-      );
+      const totalReputation = toTree.reduce((c, a) => c.add(a[1]), BigNumber.from(0));
       const totalSupply = (await good.totalSupply()).toString();
       console.log({
         totalSupply,
@@ -271,9 +211,7 @@ export const airdrop = (ethers: typeof Ethers) => {
           precentile: q * 100 + "%",
           addresses: (sorted.length * q).toFixed(0),
           quantileRep,
-          rep:
-            Number(quantileRep.div(1e10).toString()) /
-            Number(totalReputation.div(1e10).toString())
+          rep: Number(quantileRep.div(1e10).toString()) / Number(totalReputation.div(1e10).toString())
         });
       });
       const items = Object.values(treeData);
@@ -296,16 +234,10 @@ export const airdrop = (ethers: typeof Ethers) => {
       const validProof = merkleTree.verify(proof, elements[0], merkleRoot);
 
       const lastProof = merkleTree.getHexProof(elements[elements.length - 1]);
-      const lastValidProof = merkleTree.verify(
-        lastProof,
-        elements[elements.length - 1],
-        merkleRoot
-      );
+      const lastValidProof = merkleTree.verify(lastProof, elements[elements.length - 1], merkleRoot);
 
       //check for possible address preimage
-      const danger = (merkleTree.getHexLayers() as any).map(_ =>
-        _.find(_ => _.startsWith("0x000000"))
-      );
+      const danger = (merkleTree.getHexLayers() as any).map(_ => _.find(_ => _.startsWith("0x000000")));
 
       console.log({
         danger,
@@ -322,10 +254,7 @@ export const airdrop = (ethers: typeof Ethers) => {
 
       checkpoint.merkleRoot = merkleRoot;
       checkpoint.totalSupply = totalSupply;
-      fs.writeFileSync(
-        "goodCheckpoints/goodCheckpoint_fuse.json",
-        JSON.stringify(checkpoint)
-      );
+      fs.writeFileSync("goodCheckpoints/goodCheckpoint_fuse.json", JSON.stringify(checkpoint));
     };
 
     await buildTree();
@@ -333,9 +262,7 @@ export const airdrop = (ethers: typeof Ethers) => {
   };
 
   const getProof = addr => {
-    const { treeData, merkleRoot } = JSON.parse(
-      fs.readFileSync("airdrop/airdrop.json").toString()
-    );
+    const { treeData, merkleRoot } = JSON.parse(fs.readFileSync("airdrop/airdrop.json").toString());
 
     let entries = Object.entries(treeData as Tree);
     let elements = entries.map(e => Buffer.from(e[1].hash.slice(2), "hex"));
@@ -355,14 +282,10 @@ export const airdrop = (ethers: typeof Ethers) => {
     const proofFor = Buffer.from(addrData.hash.slice(2), "hex");
 
     const proof = merkleTree.getHexProof(proofFor);
-    const proofIndex =
-      elements.findIndex(_ => "0x" + _.toString("hex") === addrData.hash) + 1;
+    const proofIndex = elements.findIndex(_ => "0x" + _.toString("hex") === addrData.hash) + 1;
 
     console.log({ proofIndex, proof, [addr]: addrData });
-    console.log(
-      "checkProof:",
-      merkleTree.verify(proof, proofFor, calcMerkleRoot)
-    );
+    console.log("checkProof:", merkleTree.verify(proof, proofFor, calcMerkleRoot));
   };
 
   return { buildMerkleTree, collectAirdropData, getProof };

package/scripts/keeper/fishInactive.ts

@@ -1,18 +1,15 @@
 import { range, chunk } from "lodash";
 import { ethers as Ethers } from "hardhat";
-import fetch from "node-fetch";
 
 const ONE_DAY = 24 * 60 * 60;
 
 const main = async () => {
   const signer = (await Ethers.getSigners())[0];
   console.log("signer:", signer.address);
-  const ubiScheme = new Ethers.Contract(
-    "0xD7aC544F8A570C4d8764c3AAbCF6870CBD960D0D",
-    ["function fishMulti(address[] tofish)"]
-  ).connect(signer);
-  const twoWeeksAgo =
-    parseInt((Date.now() / 1000).toFixed(0)) - 24 * 60 * 60 * 14;
+  const ubiScheme = new Ethers.Contract("0xD7aC544F8A570C4d8764c3AAbCF6870CBD960D0D", [
+    "function fishMulti(address[] tofish)"
+  ]).connect(signer);
+  const twoWeeksAgo = parseInt((Date.now() / 1000).toFixed(0)) - 24 * 60 * 60 * 14;
 
   const daysAgo: number[] = range(0, 180, 1);
   let curDay = twoWeeksAgo;
@@ -27,19 +24,12 @@ const main = async () => {
     }
   `;
 
-    console.log(
-      "fetching inactive users since:",
-      { curDay, day },
-      JSON.stringify({ query })
-    );
-    const { walletStats } = await fetch(
-      "https://api.thegraph.com/subgraphs/name/gooddollar/gooddollarfuse",
-      {
-        method: "post",
-        body: JSON.stringify({ query }),
-        headers: { "Content-Type": "application/json" }
-      }
-    ).then(_ => _.json());
+    console.log("fetching inactive users since:", { curDay, day }, JSON.stringify({ query }));
+    const { walletStats } = await fetch("https://api.thegraph.com/subgraphs/name/gooddollar/gooddollarfuse", {
+      method: "post",
+      body: JSON.stringify({ query }),
+      headers: { "Content-Type": "application/json" }
+    }).then(_ => _.json());
 
     console.log("got inactive wallets:", walletStats.length);
     const accounts = walletStats.map(_ => _.id);

package/scripts/voltageswaps.ts

@@ -1,5 +1,4 @@
 import { request, gql } from "graphql-request";
-import fetch from "node-fetch";
 
 let txCount = {};
 const fetchSwaps = async (to, url, pair) => {