@gooddollar/goodprotocol 2.0.20 → 2.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.20",
+  "version": "2.0.21",
   "description": "GoodDollar Protocol",
   "engines": {
     "node": ">=16.x"

package/scripts/blockchainTestSetup.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+mkdir /tmp/goodprotocol
+cp -R node_modules/@gooddollar/goodprotocol /tmp/goodprotocol
+pushd /tmp/goodprotocol
+export CI=false
+export MNEMONIC='test test test test test test test test test test test junk'
+export ADMIN_MNEMONIC='test test test test test test test test test test test junk'
+yarn set version 3.6.0
+echo "nodeLinker: node-modules" >> .yarnrc.yml
+yarn --immutable
+npx patch-package
+yarn runNode &
+sleep 30
+yarn deployTest
+yarn minimize
+popd
+cp -R /tmp/goodprotocol/artifacts node_modules/@gooddollar/goodprotocol/
+cp -R /tmp/goodprotocol/releases node_modules/@gooddollar/goodprotocol/

package/scripts/deployFullDAO.ts

@@ -249,6 +249,26 @@ export const createDAO = async () => {
 
   console.log("deploying v2...");
   const v2 = await deployV2(network.name, false, olddao);
+  if (isMainnet) {
+    let distHelper = await upgrades.deployProxy(
+      await ethers.getContractFactory("DistributionHelper"),
+      [v2.NameService],
+      {
+        initializer: "initialize(address)",
+        kind: "uups"
+      }
+    );
+
+    const goodReserve = await ethers.getContractFactory("GoodReserveCDai");
+    console.log("setting distribution helper...");
+
+    await genericCall(
+      v2.GoodReserveCDai,
+      goodReserve.interface.encodeFunctionData("setDistributionHelper", [
+        distHelper.address
+      ])
+    );
+  }
   console.log("deploying adminWallet...");
   const adminWallet = await deployAdminWallet(Identity.address, v2.NameService);
   console.log("setting up identity:", {
@@ -345,6 +365,7 @@ const deployBridge = async (Avatar, gd, setSchemes, isMainnet) => {
 
 const deployMainnet = async (Avatar, Identity) => {
   console.log("deploying mainnet...");
+
   const [root] = await ethers.getSigners();
 
   const cdaiFactory = await ethers.getContractFactory("cDAIMock");

package/scripts/test/simulateInterest.ts

@@ -71,7 +71,7 @@ const simulate = async function () {
       simpleStaking
     });
 
-    await goodFundManager.collectInterest([simpleStaking], false);
+    await goodFundManager.collectInterest([simpleStaking], true);
 
     console.log("claiming");