@gooddollar/goodprotocol 1.0.3-beta.0 → 1.0.3-beta.4

package/hardhat.config.ts

@@ -57,6 +57,10 @@ const hhconfig: HardhatUserConfig = {
         accountsBalance: "10000000000000000000000000"
       }
     },
+    test: {
+      allowUnlimitedContractSize: true,
+      url: "http://127.0.0.1:8545/"
+    },
     develop: {
       gasPrice: 1000000000, //1 gwei
       url: "http://127.0.0.1:8545/",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "1.0.3-beta.0",
+  "version": "1.0.3-beta.4",
   "description": "GoodDollar Protocol",
   "scripts": {
     "build": "scripts/build.sh deploy",

package/scripts/keeper/fishInactive.ts

@@ -0,0 +1,52 @@
+import { get, range, chunk, flatten, mergeWith, sortBy, uniq } from "lodash";
+import coreContracts from "../../releases/deployment.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";
+
+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 daysAgo: number[] = range(0, 180, 1);
+  let curDay = twoWeeksAgo;
+  for (let day of daysAgo) {
+    const query = gql`
+    {
+      walletStats(first:1000, where: { lastClaimed_lt: ${curDay},lastClaimed_gt: ${
+      curDay - 24 * 60 * 60
+    } isActiveUser: true }) {
+        id        
+      }
+    }
+  `;
+
+    console.log("fetching inactive users since:", { curDay, day });
+    const { walletStats } = await request(
+      "https://api.thegraph.com/subgraphs/name/gooddollar/gooddollarfuse",
+      query
+    );
+    console.log("got inactive wallets:", walletStats.length);
+    const accounts = walletStats.map(_ => _.id);
+    for (let tofish of chunk(accounts, 50)) {
+      const tx = await ubiScheme.fishMulti(tofish, { gasLimit: 2000000 });
+      console.log("fishing tx:", tx, tofish);
+      const res = await tx.wait();
+      console.log("fishing tx result:", res);
+    }
+
+    curDay = curDay - ONE_DAY;
+  }
+};
+
+main();

package/scripts/upgradeToV2/upgradeToV2.ts

@@ -74,7 +74,7 @@ export const main = async (
   if (isProduction && networkName.includes("mainnet")) {
     GAS_SETTINGS.gasLimit = 6000000;
     GAS_SETTINGS.maxFeePerGas = ethers.utils.parseUnits("80", "gwei");
-  } else if (!networkName.includes("mainnet")) {
+  } else if (isProduction && !networkName.includes("mainnet")) {
     //case we are on fusefuse
     GAS_SETTINGS = {
       gasLimit: 6000000,
@@ -355,6 +355,7 @@ export const main = async (
 
       if (contract.isUpgradable !== false) {
         if (isCoverage) {
+          console.log("Deploying:", contract.name, "using proxy");
           //coverage has large contracts doesnt work with proxy factory
           const tx = await upgrades.deployProxy(Contract, args, {
             initializer: contract.initializer,
@@ -364,6 +365,7 @@ export const main = async (
           await countTotalGas(tx, contract.name);
           return tx;
         }
+        console.log("Deploying:", contract.name, "using proxyfactory");
         const encoded = Contract.interface.encodeFunctionData(
           contract.initializer || "initialize",
           args
@@ -394,6 +396,7 @@ export const main = async (
       } else {
         //for some reason deploying with link library via proxy doesnt work on hardhat test env
         if (isTest === false) {
+          console.log("Deploying:", contract.name, "using proxyfactory code");
           const constructor = Contract.interface.encodeDeploy(args);
           const bytecode = ethers.utils.solidityPack(
             ["bytes", "bytes"],
@@ -411,6 +414,7 @@ export const main = async (
             )
           );
         } else {
+          console.log("Deploying:", contract.name, "using regular");
           const tx = await Contract.deploy(...args, GAS_SETTINGS);
           await countTotalGas(tx, contract.name);
           const impl = await tx.deployed();
@@ -944,7 +948,7 @@ export const main = async (
     !isMainnet && (await performUpgradeFuse(release));
     console.log("upgraded contracts", { totalGas });
   }
-  if (!isTest && !isCoverage) {
+  if (isMainnet && !isTest && !isCoverage) {
     await verifyContracts(release);
   }
 
@@ -952,7 +956,7 @@ export const main = async (
   return release;
   // await proveNewRep();
 };
-if (network.name !== "hardhat") {
+if (network.name !== "hardhat" && process.argv[1].includes("upgradeToV2.ts")) {
   main(name, false)
     .catch(e => {
       console.log(e);