@gooddollar/goodprotocol 1.0.30-beta.2 → 1.0.30

package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/d531f8943a500ebcacf5db6ea5235572.json"
+  "buildInfo": "../../../build-info/1978ac65522bd5d330515fa5e80306f2.json"
 }

package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/d531f8943a500ebcacf5db6ea5235572.json"
+  "buildInfo": "../../../build-info/1978ac65522bd5d330515fa5e80306f2.json"
 }

package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/d531f8943a500ebcacf5db6ea5235572.json"
+  "buildInfo": "../../../build-info/1978ac65522bd5d330515fa5e80306f2.json"
 }

package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/d531f8943a500ebcacf5db6ea5235572.json"
+  "buildInfo": "../../../build-info/1978ac65522bd5d330515fa5e80306f2.json"
 }

package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/d531f8943a500ebcacf5db6ea5235572.json"
+  "buildInfo": "../../../build-info/1978ac65522bd5d330515fa5e80306f2.json"
 }

package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/d531f8943a500ebcacf5db6ea5235572.json"
+  "buildInfo": "../../../build-info/1978ac65522bd5d330515fa5e80306f2.json"
 }

package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/d531f8943a500ebcacf5db6ea5235572.json"
+  "buildInfo": "../../../build-info/1978ac65522bd5d330515fa5e80306f2.json"
 }

package/contracts/reserve/DistributionHelper.sol

@@ -51,6 +51,10 @@ contract DistributionHelper is
 		__AccessControlEnumerable_init();
 		setDAO(_ns);
 		_setupRole(DEFAULT_ADMIN_ROLE, avatar); //this needs to happen after setDAO for avatar to be non empty
+		updateAddresses();
+	}
+
+	function updateAddresses() public {
 		fuseBridge = nameService.getAddress("BRIDGE_CONTRACT");
 		multiChainBridge = IMultichainRouter(
 			nameService.getAddress("MULTICHAIN_ROUTER")

package/contracts/reserve/GoodReserveCDai.sol

@@ -115,7 +115,11 @@ contract GoodReserveCDai is
 		address indexed receiverAddress
 	);
 
-	event NonUBIMinted(address distributionHelper, uint256 amountMinted);
+	event NonUBIMinted(
+		address distributionHelper,
+		uint256 amountMinted,
+		bool distributionSucceeded
+	);
 
 	event DistributionHelperSet(address distributionHelper, uint32 bps);
 
@@ -288,7 +292,10 @@ contract GoodReserveCDai is
 			tokenReturn >= _minReturn,
 			"Token return must be above the minReturn"
 		);
-		cERC20(cDaiAddress).transfer(_target, tokenReturn);
+		require(
+			cERC20(cDaiAddress).transfer(_target, tokenReturn),
+			"cdai transfer failed"
+		);
 
 		emit TokenSold(
 			_seller,
@@ -386,8 +393,11 @@ contract GoodReserveCDai is
 			nonUBI = (gdExpansionToMint * nonUbiBps) / 10000;
 			gdUBI -= nonUBI;
 			_mintGoodDollars(address(distributionHelper), nonUBI, false);
-			try distributionHelper.onDistribution(nonUBI) {} catch {} //should not prevent mintUBI from completing
-			emit NonUBIMinted(address(distributionHelper), nonUBI);
+			bool success = true;
+			try distributionHelper.onDistribution(nonUBI) {} catch {
+				success = false;
+			} //should not prevent mintUBI from completing
+			emit NonUBIMinted(address(distributionHelper), nonUBI, success);
 		}
 
 		//this enforces who can call the public mintUBI method. only an address with permissions at reserve of  RESERVE_MINTER_ROLE

package/hardhat.config.ts

@@ -24,7 +24,9 @@ import { ethers } from "ethers";
 import { fstat, readFileSync, writeFileSync } from "fs";
 config();
 
-const mnemonic = process.env.MNEMONIC;
+const mnemonic =
+  process.env.MNEMONIC ||
+  "test test test test test test test test test test test junk";
 const deployerPrivateKey =
   process.env.PRIVATE_KEY || ethers.utils.hexZeroPad("0x11", 32);
 const infura_api = process.env.INFURA_API;
@@ -74,7 +76,9 @@ const hhconfig: HardhatUserConfig = {
 
   networks: {
     hardhat: {
-      chainId: 4447,
+      chainId: process.env.FORK_CHAIN_ID
+        ? Number(process.env.FORK_CHAIN_ID)
+        : 4447,
       allowUnlimitedContractSize: true,
       accounts: {
         accountsBalance: "10000000000000000000000000"
@@ -193,6 +197,27 @@ const hhconfig: HardhatUserConfig = {
       gas: 3000000,
       gasPrice: 500000000,
       chainId: 42220
+    },
+    "staging-celo": {
+      accounts: { mnemonic },
+      url: "https://forno.celo.org",
+      gas: 3000000,
+      gasPrice: 150000000,
+      chainId: 42220
+    },
+    "development-celo": {
+      accounts: { mnemonic },
+      url: "https://forno.celo.org",
+      gas: 3000000,
+      gasPrice: 150000000,
+      chainId: 42220
+    },
+    gnosis: {
+      accounts: [deployerPrivateKey],
+      url: "https://rpc.gnosischain.com",
+      gas: 3000000,
+      gasPrice: 500000000,
+      chainId: 100
     }
   },
   mocha: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "1.0.30-beta.2",
+  "version": "1.0.30",
   "description": "GoodDollar Protocol",
   "scripts": {
     "build": "scripts/build.sh deploy",
@@ -61,7 +61,6 @@
     "@openzeppelin/contracts-upgradeable": "^4.3.2",
     "@typechain/hardhat": "^6.1.2",
     "async-promise-pool": "^1.0.4",
-    "ethers-multicall": "^0.2.1",
     "openzeppelin-solidity": "^4.3.2",
     "patch-package": "latest",
     "press-any-key": "^0.1.1",
@@ -73,7 +72,12 @@
     "@babel/polyfill": "*",
     "@babel/preset-env": "*",
     "@babel/register": "*",
-    "@nomiclabs/hardhat-ethers": "^2.1.1",
+    "@gnosis.pm/safe-core-sdk": "^3.2.0",
+    "@gnosis.pm/safe-core-sdk-types": "^1.7.0",
+    "@gnosis.pm/safe-ethers-lib": "^1.7.0",
+    "@gnosis.pm/safe-service-client": "^1.4.0",
+    "@nomicfoundation/hardhat-network-helpers": "^1.0.6",
+    "@nomiclabs/hardhat-ethers": "^2.2.1",
     "@nomiclabs/hardhat-etherscan": "^3.1.0",
     "@nomiclabs/hardhat-waffle": "^2.0.3",
     "@openzeppelin/hardhat-upgrades": "^1.20.0",
@@ -89,8 +93,9 @@
     "chai": "*",
     "coveralls": "*",
     "dotenv": "*",
-    "ethereum-waffle": "*",
-    "ethers": "^5.4.7",
+    "ethereum-waffle": "^3.4.4",
+    "ethers": "^5.7.2",
+    "ethers-multicall": "^0.2.3",
     "ethers-eip712": "*",
     "fs-extra": "9.0.0",
     "graphql": "^15.5.0",

package/releases/deployment.json

@@ -521,8 +521,9 @@
             ]
         ],
         "MultichainRouter": "0x765277eebeca2e31912c9946eae1021199b39c61",
-        "anyGoodDollar": "0xd17652350cfd2a37ba2f947c910987a3b1a1c60d",
-        "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8"
+        "AnyGoodDollar": "0xd17652350cfd2a37ba2f947c910987a3b1a1c60d",
+        "GuardiansSafe": "0xE0c5daa7CC6F88d29505f702a53bb5E67600e7Ec",
+        "DistributionHelper": "0xAcadA0C9795fdBb6921AE96c4D7Db2F8B8c52Fd0"
     },
     "production": {
         "NameService": "0xec6dcE387B1616a0c44fF2E4fA9E90E53Cf14eb0",
@@ -549,7 +550,7 @@
         "ProxyAdmin": "0x57179b2A8eB019157b0C3E761cdB26c82C982a3B",
         "FuseFaucet": "0x01ab5966C1d742Ae0CFF7f14cC0F4D85156e83d9",
         "FuseStaking": "0xA199F0C353E25AdF022378B0c208D600f39a6505",
-        "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8"
+        "GuardiansSafe": "0x5878123fe880881f1Ecc92D5fd31e5D3F5Fba2e9"
     },
     "production-celo": {
         "ProxyFactory": "0x99C22e78A579e2176311c736C4c9F0b0D5A47806",
@@ -560,13 +561,54 @@
         "NameService": "0x563a80a452264a9e1aa37c6FA0B46D04C3c71b24",
         "GReputation": "0xAC132ECe25217867E318eA8ff63420C90d5a74A6",
         "GuardiansSafeOld": "0xC9D09BA972B4EB6Bb7347F2229FB6d50434fFCa6",
-        "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8",
+        "GuardiansSafe": "0xa2521e8F5A990903fdD8Afa6570C52526e7E0D5E",
         "network": "production-celo",
         "networkId": 42220,
         "GoodDollarMintBurnWrapper": "0x5566b6E4962BA83e05a426Ad89031ec18e9CadD3",
         "MultichainRouter": "0xf27Ee99622C3C9b264583dACB2cCE056e194494f"
     },
-    "localhost": {
+    "development-celo": {
+        "ProxyFactory": "0xA441cd89b0964B51d23201d65E037DA7aF8F74E9",
+        "GoodDollar": "0xAB89A70d1Af04ED8badf915Ba1f5b28E9F322624",
+        "Avatar": "0xE0e3BFb1A1850bdFe36ED1563CC2abB6A8B6De78",
+        "Controller": "0x6717A1948328C8eCCb5C933Fae90e0631C2486fE",
+        "Identity": "0xec97ee6d70C626044224998192B96fEF05949De1",
+        "NameService": "0x266E5a0931E52229CC241376bC701Ab6199Aec4D",
+        "GReputation": "0x6614823763EAd52aCc4952b9634624439B738683",
+        "AdminWallet": "0xb7b543bfd9e2E0AD1d0aA68f56c883Dd377E3D24",
+        "Faucet": "0x256AFcfEcB5C7f62CE46b54492Bb8ac38163672f",
+        "Invites": "0xdC8F0da3f29A3C419a8EEf36665ba2a3EF737B8f",
+        "GoodDollarMintBurnWrapper": "0x3fa553a5a044D5c4f5C70878148568410305f953",
+        "UBIScheme": "0x2d42e6220af2485d1e6E5B4d3661A74671AA9a79",
+        "ClaimersDistribution": "0x80018e6Dd79f6B892Fca6b592746136a3aa5ef6d",
+        "CompoundVotingMachine": "0x00e44d746F3931cAB775099F4C6451f893BB9378",
+        "network": "development-celo",
+        "networkId": 42220,
+        "GoodDollarStaking": "0x0b13807334C1618D71E5FCe792f40A22007c433A"
+    },
+    "staging-celo": {
+        "ProxyFactory": "0x7e8292481EA8EbEb49e486B7e99c00C50fBa2689",
+        "GoodDollar": "0x33265D74abd5ae87cA02A4Fb0C30B7405C8b0682",
+        "Avatar": "0x2FD18f9de3F581Ca492A485D2b32E361EeAE2e63",
+        "Controller": "0xa229BdD05436362484b10586dAa79a316e3080C5",
+        "Identity": "0xc82d50c667F389906aCA4B72D577fA56Bf7F8910",
+        "NameService": "0x8d0b621796445454180e7DD25f96B1782848338B",
+        "GReputation": "0x759a03326df90b740f6b8b6D31e12a3F95D64C28",
+        "FeeFormula": "0xcf08461E5bAd9C508D482329Eae0f1b4c4D4c489",
+        "DAOCreator": "0xA614d2641c21FEa4c73A2D6e71C6ad341349808B",
+        "AddFounders": "0x558fA360988601601ac410678963Bf785156076D",
+        "AdminWallet": "0x822590F8baf606b1e18dC1FA8Ca39D5C66C20981",
+        "Faucet": "0x9803B5811260Bfd1F5b0b0c9eC9aD4bF96D7ea94",
+        "Invites": "0x4E094c2e35e57c90667AbD6D8FE25CE63F4ae00B",
+        "GoodDollarMintBurnWrapper": "0x156Fd9563973EFB94a297B76CFac32CdC92a8d1A",
+        "UBIScheme": "0x04f2Cf8865e2ddfEf0047FdfA7A1b05ade614288",
+        "ClaimersDistribution": "0x83186CE77ef296BA6561096447938AE05D1F026e",
+        "CompoundVotingMachine": "0xEdde78b850a08B6b8AB3E84f61cD6dC70Cc7f156",
+        "network": "staging-celo",
+        "networkId": 42220,
+        "GoodDollarStaking": "0x1eF9D3Ed46D4B82E7e8089BDdd00a493e9930f46"
+    },
+    "gnosis": {
         "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8"
     }
 }

package/scripts/analytics/activeWalletsStats.ts

@@ -4,6 +4,10 @@ import PromisePool from "async-promise-pool";
 import fs from "fs";
 import { ethers } from "hardhat";
 
+/****
+ * Fetch token holders and their last activity date
+ * can be used to create stats about active users and how much G$ isnt active
+ */
 const main = async () => {
   let result = [];
   let balances = {};

package/scripts/analytics/gdinflow.ts

@@ -5,6 +5,9 @@ import fs from "fs";
 import { ethers } from "hardhat";
 import { keccak256 } from "web3-utils";
 
+/***
+ * fetch all income to certain accounts
+ */
 const main = async () => {
   const uniques = {};
   let addresses = [];