@gooddollar/goodprotocol 1.0.29-beta.0 → 1.0.29-beta.2

package/scripts/upgrades/nonubiDistribution-deploy.ts

@@ -0,0 +1,167 @@
+/***
+ * This script will deploy a reserve upgrade and the DistributionHelper so that some of the expansion can be allocated
+ * for non-ubi purposes
+ * Upgrade process:
+ * mainnet:
+ * - deploy reserve
+ * - deploy distributionHelper
+ * - create proposal that:
+ *  - upgrades the reserve
+ *  - sets the distributionHelper at reserve with the agreed bps
+ *  - add to the distributionHelper the GoodDollarMintBurnWrapper contract address on fuse as recipient with 100% bps
+ */
+
+import { network, ethers } from "hardhat";
+
+import {
+  deployDeterministic,
+  printDeploy,
+  executeViaGuardian
+} from "../multichain-deploy/helpers";
+import releaser from "../releaser";
+import dao from "../../releases/deployment.json";
+import {
+  CompoundVotingMachine,
+  DistributionHelper,
+  Controller,
+  NameService
+} from "../../types";
+const { name: networkName } = network;
+
+export const deployMainnet = async () => {
+  let release: { [key: string]: any } = dao[networkName];
+
+  let [root, ...signers] = await ethers.getSigners();
+  const proposer = new ethers.Wallet(process.env.PROPOSER_KEY, ethers.provider); //need proposer with 0.3% of GOOD tokens
+
+  console.log("got signers:", {
+    networkName,
+    root: root.address,
+    balance: await ethers.provider
+      .getBalance(root.address)
+      .then(_ => _.toString())
+  });
+
+  console.log("deploying reserve implementation");
+  const reserveImpl = await (
+    await ethers.getContractFactory("GoodReserveCDai")
+  ).deploy();
+
+  console.log("deploying DistributionHelper");
+
+  let DHelper: DistributionHelper;
+  if (!release.GoodDollarStaking) {
+    DHelper = (await deployDeterministic(
+      {
+        name: "DistributionHelper",
+        salt: "DistributionHelper",
+        isUpgradeable: true
+      },
+      [release.NameService]
+    ).then(printDeploy)) as DistributionHelper;
+
+    let torelease = {
+      DistributionHelper: DHelper.address
+    };
+
+    await releaser(torelease, networkName, "deployment", false);
+  } else {
+    DHelper = (await ethers.getContractAt(
+      "DistributionHelper",
+      release.DistributionHelper
+    )) as DistributionHelper;
+  }
+  DHelper;
+
+  //create proposal
+  const vm = (await ethers.getContractAt(
+    "CompoundVotingMachine",
+    release.CompoundVotingMachine
+  )) as CompoundVotingMachine;
+
+  const ctrl = (await ethers.getContractAt(
+    "Controller",
+    release.Controller
+  )) as Controller;
+
+  const ns = (await ethers.getContractAt(
+    "NameService",
+    release.NameService
+  )) as NameService;
+
+  const proposalContracts = [
+    release.GoodReserveCDai, //upgradeTo
+    release.GoodReserveCDai, //Reserve -> set distribution helper + non ubi bps
+    DHelper.address, //distribution helper -> add fuse GoodDollarMintBurnWrapper as recipient with 100%
+    ns.address, //nameservice add DistributionHelper
+    ns.address, //nameservice add MultiChainRouter
+    ns.address //nameservice add MultiChain AnyGoodDollar
+  ];
+
+  const proposalEthValues = proposalContracts.map(_ => 0);
+
+  const proposalFunctionSignatures = [
+    "upgradeTo(address)",
+    "setDistributionHelper(address,uint32)",
+    "addOrUpdateRecipient((uint32,uint32,address,uint8))",
+    "setAddress(string,address)",
+    "setAddress(string,address)",
+    "setAddress(string,address)"
+  ];
+
+  const proposalFunctionInputs = [
+    ethers.utils.defaultAbiCoder.encode(["address"], [reserveImpl.address]), //upgradeTo(address)
+    ethers.utils.defaultAbiCoder.encode(
+      ["address", "uint32"],
+      [release.GoodReserveCDai, 1000]
+    ), //setDistributionHelper(address,uint32)
+    ethers.utils.defaultAbiCoder.encode(
+      ["uint32", "uint32", "address", "uint8"],
+      [
+        10000, //bps
+        122, //chainid
+        release.GoodDollarMintBurnWraper, //recipient address,
+        0 //recipient type via Fuse bridge
+      ]
+    ), //addOrUpdateRecipient((uint32,uint32,address,uint8))
+    ethers.utils.defaultAbiCoder.encode(
+      ["string", "address"],
+      ["DISTRIBUTION_HELPER", DHelper.address]
+    ), //setAddress(string,address)"
+    ethers.utils.defaultAbiCoder.encode(
+      ["string", "address"],
+      ["MULTICHAIN_ROUTER", release.MultichainRouter]
+    ),
+    ethers.utils.defaultAbiCoder.encode(
+      ["string", "address"],
+      ["MULTICHAIN_ANYGOODDOLLAR", release.AnyGoodDollar]
+    )
+  ];
+
+  if (networkName === "fuse-mainnet") {
+    return executeViaGuardian(
+      proposalContracts,
+      proposalEthValues,
+      proposalFunctionSignatures,
+      proposalFunctionInputs,
+      root
+    );
+  }
+
+  console.log("creating proposal...");
+  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);
+};
+
+export const main = async () => {
+  await deployMainnet().catch(console.log);
+};
+if (process.argv[1].includes("nonubiDistribution")) main();

package/scripts/voltageswaps.ts

@@ -0,0 +1,47 @@
+import { request, gql } from "graphql-request";
+import fetch from "node-fetch";
+
+let txCount = {};
+const fetchSwaps = async (to, url, pair) => {
+  let from = to - 60 * 60 * 24;
+  //0xa02ed9fe9e3351fe2cd1f588b23973c1542dcbcc
+  //0x8d441c2ff54c015a1be22ad88e5d42efbec6c7ef
+  const query = gql`
+    {
+        swaps(first:1000 where:{pair: "${pair}", timestamp_gt:${from}, timestamp_lte:${to}}) {
+          to
+        }
+      }
+    `;
+
+  const { swaps } = await request(
+    url,
+    // "https://api.thegraph.com/subgraphs/name/fuseio/fuseswap",
+    //"https://api.thegraph.com/subgraphs/name/voltfinance/voltage-exchange",
+    query
+  );
+  swaps.forEach(({ to }) => (txCount[to] = (txCount[to] || 0) + 1));
+  console.log(swaps.length);
+  //   if (from < 1646925850) return;
+  if (from < 1604823310) return;
+  return fetchSwaps(from, url, pair);
+};
+//1652752130
+
+const main = async () => {
+  await Promise.all([
+    fetchSwaps(
+      1652755140,
+      "https://api.thegraph.com/subgraphs/name/fuseio/fuseswap",
+      "0x8d441c2ff54c015a1be22ad88e5d42efbec6c7ef"
+    ).then(_ => console.log({ txCount, unique: Object.keys(txCount).length })),
+    fetchSwaps(
+      1652755140,
+      "https://api.thegraph.com/subgraphs/name/voltfinance/voltage-exchange",
+      "0xa02ed9fe9e3351fe2cd1f588b23973c1542dcbcc"
+    ).then(_ => console.log({ txCount, unique: Object.keys(txCount).length }))
+  ]);
+
+  console.log("final:", { txCount, unique: Object.keys(txCount).length });
+};
+main();

package/test/governance/ClaimersDistribution.test.ts

@@ -203,7 +203,7 @@ describe("ClaimersDistribution", () => {
       await increaseTime(60 * 60 * 24);
       const tx = await (await ubiScheme.connect(claimer3).claim()).wait();
       totalGas += tx.gasUsed.toNumber();
-      console.log({ totalGas }, tx.gasUsed.toNumber());
+      // console.log({ totalGas }, tx.gasUsed.toNumber());
     }
     expect(totalGas / 30).lt(310000);
   });