@gooddollar/goodprotocol 1.0.30-beta.2 → 1.0.30-beta.3

package/hardhat.config.ts

@@ -9,11 +9,14 @@ import "@openzeppelin/hardhat-upgrades";
 import "solidity-coverage";
 import "hardhat-gas-reporter";
 import "hardhat-contract-sizer";
+import "hardhat-storage-layout";
 import { task, types } from "hardhat/config";
 import { sha3 } from "web3-utils";
 import { config } from "dotenv";
-import { airdrop } from "./scripts/governance/airdropCalculation";
+import { airdrop } from "./scripts/governance/airdropCalculationSorted";
 import { airdrop as repAirdropRecover } from "./scripts/governance/airdropCalculationRecover";
+import { airdrop as goodCheckpoint } from "./scripts/governance/goodCheckpointSorted";
+
 import {
   airdrop as gdxAirdrop,
   airdropRecover as gdxAirdropRecover
@@ -24,7 +27,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;
@@ -39,7 +44,7 @@ const MAINNET_URL = "https://mainnet.infura.io/v3/" + infura_api;
 // console.log({ mnemonic: sha3(mnemonic) });
 const hhconfig: HardhatUserConfig = {
   solidity: {
-    version: "0.8.8",
+    version: "0.8.16",
     settings: {
       optimizer: {
         enabled: true,
@@ -60,8 +65,8 @@ const hhconfig: HardhatUserConfig = {
         network: "celo",
         chainId: 42220,
         urls: {
-          apiURL: "https://api.celoscan.io",
-          browserURL: "https://celoscan.io"
+          apiURL: "https://api.celoscan.io/api",
+          browserURL: "https://celoscan.io/"
         }
       }
     ]
@@ -74,12 +79,17 @@ 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"
       },
-      initialDate: "2021-12-01" //required for DAO tests like guardian
+      initialDate: "2021-12-01", //required for DAO tests like guardian
+      forking: process.env.FORK_CHAIN_ID && {
+        url: "https://eth-mainnet.alchemyapi.io/v2/" + process.env.ALCHEMY_KEY
+      }
     },
     test: {
       allowUnlimitedContractSize: true,
@@ -177,13 +187,13 @@ const hhconfig: HardhatUserConfig = {
       accounts: [deployerPrivateKey],
       url: MAINNET_URL,
       gas: 3000000,
-      gasPrice: 50000000000,
+      gasPrice: 15000000000,
       chainId: 1
     },
     "production-celo": {
       accounts: [deployerPrivateKey],
       url: "https://forno.celo.org",
-      gas: 3000000,
+      gas: 8000000,
       gasPrice: 500000000,
       chainId: 42220
     },
@@ -193,6 +203,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: {
@@ -274,6 +305,26 @@ task("gdxAirdropRecover", "Calculates new airdrop data for recovery")
     }
   });
 
+task(
+  "goodCheckpoint",
+  "Calculates good checkpoint data and merkle tree for GOOD sync"
+)
+  .addParam("action", "calculate/tree/proof")
+  .addOptionalPositionalParam("address", "proof for address")
+  .setAction(async (taskArgs, hre) => {
+    const actions = goodCheckpoint(hre.ethers, ethplorer_key, etherscan_key);
+    switch (taskArgs.action) {
+      case "calculate":
+        return actions.collectAirdropData();
+      case "tree":
+        return actions.buildMerkleTree();
+      case "proof":
+        return actions.getProof(taskArgs.address);
+      default:
+        console.log("unknown action use calculate or tree");
+    }
+  });
+
 task("verifyjson", "verify contracts on etherscan").setAction(
   async (taskArgs, hre) => {
     return verify(hre);

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "1.0.30-beta.2",
+  "version": "1.0.30-beta.3",
   "description": "GoodDollar Protocol",
   "scripts": {
+    "prepack": "npm run minimize",
     "build": "scripts/build.sh deploy",
     "coverage:report": "export COVERALLS_REPO_TOKEN='qiXNelh1HXMAsoPah9yRD2yG2WlqrDfLh' && cat ../coverage/lcov.info coverage/lcov.info | coveralls",
     "coverage": "export CODE_COVERAGE=true; hardhat --max-memory 6096 coverage",
@@ -55,17 +56,18 @@
   },
   "homepage": "https://gooddollar.org",
   "dependencies": {
-    "@gooddollar/goodcontracts": "^2.6.2",
+    "@gooddollar/goodcontracts": "^2.6.6",
     "@jsier/retrier": "^1.2.4",
-    "@openzeppelin/contracts": "^4.5.0",
-    "@openzeppelin/contracts-upgradeable": "^4.3.2",
+    "@openzeppelin/contracts": "^4.8.0",
+    "@openzeppelin/contracts-upgradeable": "^4.8.0",
+    "@superfluid-finance/ethereum-contracts": "^1.4.3",
+    "@superfluid-finance/sdk-core": "^0.5.8",
     "@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",
-    "truffle-plugin-verify": "^0.5.11",
+    "truffle-plugin-verify": "^0.6.1",
     "truffle-source-verify": "^0.0.6"
   },
   "devDependencies": {
@@ -73,7 +75,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,17 +96,19 @@
     "chai": "*",
     "coveralls": "*",
     "dotenv": "*",
-    "ethereum-waffle": "*",
-    "ethers": "^5.4.7",
+    "ethereum-waffle": "^3.4.4",
+    "ethers": "^5.7.2",
     "ethers-eip712": "*",
+    "ethers-multicall": "^0.2.3",
     "fs-extra": "9.0.0",
     "graphql": "^15.5.0",
     "graphql-request": "^3.4.0",
     "hardhat": "^2.10.2",
     "hardhat-contract-sizer": "^2.6.1",
     "hardhat-gas-reporter": "^1.0.8",
+    "hardhat-storage-layout": "^0.1.7",
     "lodash": "^4.17.21",
-    "merkle-tree-solidity": "*",
+    "merkletreejs": "^0.3.9",
     "mocha": "^9.1.2",
     "mocha-lcov-reporter": "*",
     "node-fetch": "*",

package/releases/deploy-settings.json

@@ -1,8 +1,13 @@
 {
   "default": {
     "governance": {
+      "gdaoAirdrop": "0x2feece0e9bc03b54e63e6eb7abb81a128f6bc7ce9a3bafd5ca2bea0c40e3634b",
+      "gdaoTotalSupply": "24000000000000000000000000",
       "proposalVotingPeriod": 241920
     },
+    "guardiansSafe": null,
+    "walletAdminsCount": 10,
+    "gasPrice": 100000000,
     "compound": {},
     "aave": {},
     "expansionRatio": {
@@ -20,6 +25,14 @@
     "GoodAaveStaking": {
       "stkAaveClaimCost": 50000,
       "CollectInterestGasCost": 250000
+    },
+    "savings": {
+      "blockAPY": "1000000007735630000",
+      "daysUntilUpgrade": "7",
+      "blocksPerYear": "6307200"
+    },
+    "ubi": {
+      "maxInactiveDays": 14
     }
   },
   "develop": {
@@ -47,7 +60,9 @@
       "gdaoAirdrop": "0x2feece0e9bc03b54e63e6eb7abb81a128f6bc7ce9a3bafd5ca2bea0c40e3634b",
       "gdaoTotalSupply": "24000000000000000000000000",
       "proposalVotingPeriod": 241920
-    }
+    },
+    "walletAdminsCount": 10,
+    "gasPrice": 1000000000
   },
   "dapptest-mainnet": {
     "gdxAirdrop": "0x707f775d730a9b17ee62c21e00188da4dff26602a58c338269cd115f30acbe2f",
@@ -84,6 +99,9 @@
       "gdaoAirdrop": "0x2feece0e9bc03b54e63e6eb7abb81a128f6bc7ce9a3bafd5ca2bea0c40e3634b",
       "gdaoTotalSupply": "24000000000000000000000000",
       "proposalVotingPeriod": 241920
+    },
+    "savings": {
+      "daysUntilUpgrade": "7"
     }
   },
   "fuse-mainnet": {
@@ -193,7 +211,11 @@
       "gdaoTotalSupply": "96000000000000000000000000",
       "proposalVotingPeriod": 241920,
       "guardian": "0x914dA3B2508634998d244059dAb5488D9bA1814f"
-    }
+    },
+    "savings": {
+      "daysUntilUpgrade": 30
+    },
+    "guardiansSafe": "0x5878123fe880881f1Ecc92D5fd31e5D3F5Fba2e9"
   },
   "production-mainnet": {
     "gdxAirdrop": "0x707f775d730a9b17ee62c21e00188da4dff26602a58c338269cd115f30acbe2f",
@@ -223,6 +245,28 @@
       "dai_eth": "0x773616E4d11A78F511299002da57A0a94577F1f4",
       "eth_usd": "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419"
     },
-    "uniswapRouter": "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D"
+    "uniswapRouter": "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
+    "guardiansSafe": "0xE0c5daa7CC6F88d29505f702a53bb5E67600e7Ec"
+  },
+  "development-celo": {
+    "guardiansSafe": "0xdF3e980a175904a26A7BA627048a789Ae6A141cD",
+    "gasPrice": 150000000,
+    "superfluidHost": "0xA4Ff07cF81C02CFD356184879D953970cA957585"
+  },
+  "staging-celo": {
+    "guardiansSafe": "0xdF3e980a175904a26A7BA627048a789Ae6A141cD",
+    "gasPrice": 150000000,
+    "superfluidHost": "0xA4Ff07cF81C02CFD356184879D953970cA957585"
+  },
+  "production-celo": {
+    "governance": {
+      "gdaoAirdrop": "0x2feece0e9bc03b54e63e6eb7abb81a128f6bc7ce9a3bafd5ca2bea0c40e3634b",
+      "gdaoTotalSupply": "96000000000000000000000000",
+      "proposalVotingPeriod": 241920,
+      "guardian": "0xa2521e8F5A990903fdD8Afa6570C52526e7E0D5E"
+    },
+    "gasPrice": 150000000,
+    "guardiansSafe": "0xC9D09BA972B4EB6Bb7347F2229FB6d50434fFCa6",
+    "superfluidHost": "0xA4Ff07cF81C02CFD356184879D953970cA957585"
   }
 }

package/releases/deployment.json

@@ -21,63 +21,6 @@
         "Bridge": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9",
         "BancorFormula": "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9"
     },
-    "develop": {
-        "NameService": "0x2a810409872AfC346F9B5b26571Fd6eC42EA4849",
-        "GReputation": "0xb9bEECD1A582768711dE1EE7B0A1d582D9d72a6C",
-        "CompoundVotingMachine": "0x8A93d247134d91e0de6f96547cB0204e5BE8e5D8",
-        "ClaimersDistribution": "0x40918Ba7f132E0aCba2CE4de4c4baF9BD2D7D849",
-        "GovernanceStaking": "0xF32D39ff9f6Aa7a7A64d7a4F00a54826Ef791a55",
-        "UBIScheme": "0xd6e1afe5cA8D00A2EFC01B89997abE2De47fdfAf",
-        "ProtocolUpgradeFuse": "0x99dBE4AEa58E518C50a1c04aE9b48C9F6354612f",
-        "network": "develop",
-        "networkId": 4447,
-        "HomeBridge": "0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7",
-        "AdminWallet": "0x07882Ae1ecB7429a84f1D53048d35c4bB2056877",
-        "Identity": "0x202CCe504e04bEd6fC0521238dDf04Bc9E8E15aB",
-        "GoodDollar": "0xA5B0631c5B393d4BF30D2974dF121ea7E8b0e934",
-        "Controller": "0xb3da2F710C7356E4F6540752488e88e48Fd00Cdd",
-        "Avatar": "0x625A692E96605c988192cd59563e5EB2f1E33C87",
-        "FirstClaimPool": "0x5067457698Fd6Fa1C6964e416b3f42713513B3dD",
-        "BancorFormula": "0x36b58F5C1969B7b6591D752ea6F5486D069010AB",
-        "DAI": "0xD8a5a9b31c3C0232E196d518E89Fd8bF83AcAd43",
-        "cDAI": "0x51A1ceB83B83F1985a81C295d1fF28Afef186E02",
-        "COMP": "0xDC11f7E700A4c898AE5CAddB1082cFfa76512aDD"
-    },
-    "develop-mainnet": {
-        "NameService": "0x5FeaeBfB4439F3516c74939A9D04e95AFE82C4ae",
-        "GReputation": "0x976fcd02f7C4773dd89C309fBF55D5923B4c98a1",
-        "CompoundVotingMachine": "0x19cEcCd6942ad38562Ee10bAfd44776ceB67e923",
-        "GoodMarketMaker": "0xfcDB4564c18A9134002b9771816092C9693622e3",
-        "GoodReserveCDai": "0x32EEce76C2C2e8758584A83Ee2F522D4788feA0f",
-        "GoodFundManager": "0x6C2d83262fF84cBaDb3e416D527403135D757892",
-        "StakersDistribution": "0xa6e99A4ED7498b3cdDCBB61a6A607a4925Faa1B7",
-        "ProtocolUpgrade": "0x5302E909d1e93e30F05B5D6Eea766363D14F9892",
-        "CompoundStakingFactory": "0x0ed64d01D0B4B655E410EF1441dD677B695639E7",
-        "StakingContracts": [
-            [
-                "0x94d333510d985495DE7d96a711bE3B45F658AadF",
-                13888
-            ],
-            [
-                "0xd7C1B2B630dF30C0bFd480757b232cf1eb87dD8f",
-                "6944"
-            ]
-        ],
-        "DonationsStaking": "0xde2Bd2ffEA002b8E84ADeA96e5976aF664115E2c",
-        "AaveStakingFactory": "0x4bf010f1b9beDA5450a8dD702ED602A104ff65EE",
-        "ExchangeHelper": "0x02b0B4EFd909240FCB2Eb5FAe060dC60D112E3a4",
-        "ForeignBridge": "0x8198f5d8F8CfFE8f9C413d98a0A55aEB8ab9FbB7",
-        "Contribution": "0x2B0d36FACD61B71CC05ab8F3D2355ec3631C0dd5",
-        "Identity": "0x202CCe504e04bEd6fC0521238dDf04Bc9E8E15aB",
-        "GoodDollar": "0xA5B0631c5B393d4BF30D2974dF121ea7E8b0e934",
-        "Controller": "0xb3da2F710C7356E4F6540752488e88e48Fd00Cdd",
-        "Avatar": "0x625A692E96605c988192cd59563e5EB2f1E33C87",
-        "FirstClaimPool": "0x5067457698Fd6Fa1C6964e416b3f42713513B3dD",
-        "BancorFormula": "0x36b58F5C1969B7b6591D752ea6F5486D069010AB",
-        "DAI": "0xD8a5a9b31c3C0232E196d518E89Fd8bF83AcAd43",
-        "cDAI": "0x51A1ceB83B83F1985a81C295d1fF28Afef186E02",
-        "COMP": "0xDC11f7E700A4c898AE5CAddB1082cFfa76512aDD"
-    },
     "kovan-mainnet": {
         "NameService": "0xFD2B51bb11B7345bA592F70A685652E18Cd83946",
         "GReputation": "0xEf0c1e6f98e433d81AE3e6611944bc06e533A47B",
@@ -197,76 +140,6 @@
         "BancorFormula": "0x57b2c85934Ef1A891eC9b9945f3fdbcf1104c302",
         "FeeFormula": "0x416B5A5e12235De6838D62Fd053e7Ce59E944426"
     },
-    "dapptest": {
-        "NameService": "0x9059f66843F564f7870f7135fB039EB2034a23a3",
-        "GReputation": "0x90dE2F86DBdB2110a798326e880c83bc8779d149",
-        "CompoundVotingMachine": "0x2EF9f88EEB737655FF01F9b5017f1e3399726AF1",
-        "ClaimersDistribution": "0x035A59F228e776Cc396a8F5E1cEF989E235B0035",
-        "GovernanceStaking": "0xC65cCB966873969179B6b0bA53D67D14Bbf1204C",
-        "UBIScheme": "0xBb02F06762FBc51aD222915e6855f7482a93F9Cd",
-        "ProtocolUpgradeFuse": "0xBb976201B607f16dc76586dB8Ca5EF6C50C41c22",
-        "HomeBridge": "0x180FAF09AdD6a27554b11a131DCe6f6A3ddF4cBf",
-        "AdminWallet": "0xB8357F7f41125d4b24AD052c1b7288BeF5C43446",
-        "Identity": "0x63766F0efAa46a86E9055bB46e41ff7bc64CBEA2",
-        "GoodDollar": "0x94a9D2532DA2d9153336159907604A01c3E91C11",
-        "Controller": "0x0B57Fd12F7A95c322aD176D23765507ce09892Cb",
-        "Avatar": "0xf6Ee31185AC05C2b558fF2a561C600AF3E9486dd",
-        "FirstClaimPool": "0xC20654dB7F9483f10c91dc94924dC8F04F79bfd5",
-        "BancorFormula": "0x6852Adb5Fce1D73c08A9b3Aa7edE9A03437ac2fE",
-        "DAI": "0x0000000000000000000000000000000000000000",
-        "cDAI": "0x0000000000000000000000000000000000000000",
-        "COMP": "0x0000000000000000000000000000000000000000",
-        "networkId": 4447,
-        "network": "dapptest",
-        "FeeFormula": "0x24ef01de6baE76eE73Da210940A296F739d87952",
-        "OneTimePayments": "0xB10982193B39Eda3428d6AaeBbd7986f2A2Baa1a",
-        "Invites": "0x74156A1F9736307b7AD34e3691f3A5B54A0B3Eb8",
-        "FuseFaucet": "0x0Db32f0b116773fDD78C2e1b5E6609CC502e6784",
-        "ProxyFactory": "0xCD8a1C3ba11CF5ECfa6267617243239504a98d90"
-    },
-    "dapptest-mainnet": {
-        "NameService": "0xe528aaCA8E7cD3ce503bB4a2dEadFD4088229E1F",
-        "GReputation": "0x77423AE3ce64482ef3BB601a2EA42cf30349735A",
-        "CompoundVotingMachine": "0x6804DB9596c651A1CA24bBB821712A8899932d76",
-        "GoodMarketMaker": "0xa36ADAE77B1f6f87eD60aafEF9c080c38Ca30D0F",
-        "GoodReserveCDai": "0x411CEb987F801CdEa5a301a0CCfa4a5Df37f3f7F",
-        "ExchangeHelper": "0x1333788523bEA7C7cBdd0684Bd1ee75E940fF0Eb",
-        "GoodFundManager": "0x50589243cb1d8eEF751f4BAb253Aabef6e434c0d",
-        "StakersDistribution": "0x214c3C71191AB9bD868a5f408A61c540c787662F",
-        "ProtocolUpgrade": "0x1Fb0D426927Dab092Def63b73E1397b3F29E7b33",
-        "CompoundStakingFactory": "0xe4FEed16F54b4244C174b408Ba3B5F1f19DD1E4D",
-        "AaveStakingFactory": "0xe7213b68DC25bf30bC7f1DE9BAead075c66979F9",
-        "ForeignBridge": "0x570ADc5880D778aE5935f199aa590091586CDf75",
-        "Contribution": "0x24F2D7c50357C7B1156Ca85945D3A901c88651cB",
-        "StakingContracts": [
-            [
-                "0xc782Ee4B0d6204Ff77471884bB95d2D2f8D60fE6",
-                13888
-            ]
-        ],
-        "DonationsStaking": "0x4bfd12E943f25621d4FA368Ca7a5c0E7F6488000",
-        "Identity": "0xb2377aAE57F2072F52FBc38696BE573af2ce5bd9",
-        "GoodDollar": "0x5Bbaf48c102373B55079F941c40822C96E715d62",
-        "Controller": "0x67d49FAF26CA6A34D483B6BDFA45824EdA64D509",
-        "Avatar": "0xE9ED26a450aC15ea88b5801E5940B58F2f778b03",
-        "FirstClaimPool": "0xe3963EF7CC3044B64842d0AAe7F2Bf1543D341Ec",
-        "BancorFormula": "0x30474Ce2DE03045B8D0AE76F8a30DbfC8f000cea",
-        "DAI": "0xadf7b0f46EB35C748438F3e215F064E01cc7f5dF",
-        "cDAI": "0x0037272a7048132b10Dd8970AC964Bab2fDB3F62",
-        "COMP": "0xE8E9B139c6477D4EaD599bE5f2bB9335533D14f7",
-        "networkId": 4447,
-        "network": "dapptest-mainnet",
-        "FeeFormula": "0x8B87065fdfe4A130108E50f74ae7F85cD20A5967",
-        "ProxyFactory": "0xF47e3B0A1952A81F1afc41172762CB7CE8700133",
-        "UniswapV2SwapHelper": "0xB4059a6808Af368A69d12FBbD104Bb6B9c37e629",
-        "ETHUsdOracle": "0x79613D7834Ad35EE8dC3F9298030eaADc2A8c250",
-        "DAIEthOracle": "0x6397866132887b206EEA19f910730443E71a8CfB",
-        "DAIUsdOracle": "0xC2E1FC63cE06C279c5De18D7119C7cA123B42C1c",
-        "COMPUsdOracle": "0x9301981F27950e6546033EADD046C86754263f2D",
-        "USDCUsdOracle": "0x89Be7D874a17cD0295B2d86436a920593b5f4480",
-        "AAVEUsdOracle": "0xDFF3455E08AB33B1599D1c5B5A1D65de63d3FCd0",
-        "GasPriceOracle": "0xFAE6fA2097792Edfd7429A282F21ec2D955279D9"
-    },
     "staging-mainnet": {
         "NameService": "0xC87FAb8A8CDD346079ca6177e47408Ba18066104",
         "GReputation": "0xD50604E530fF36B2747aE8574b37B21B9f779d37",
@@ -335,69 +208,6 @@
         "GoodDollarMintBurnWrapper": "0x08CaFF2331040c9998a91B50eEee85c4AE953ece",
         "GoodDollarStaking": "0x66846F27F86f02b079e9176C7aCc10Cc32d839b2"
     },
-    "test": {
-        "ProxyFactory": "0x36dE29DB57062A583436Ae071e141404dFE2311C",
-        "NameService": "0x105678e10c32a29543902067fEd1BB2e5E0B3CEe",
-        "GReputation": "0xFf73F4DEeFFe4f7E53E20d757b99d82D465c93b9",
-        "CompoundVotingMachine": "0x1dfBd51e464E45A9Dfe33B79222D6B3f0bedC1f0",
-        "ClaimersDistribution": "0xB3375A6f09CFFF8591577d03133eeaF39cA76a84",
-        "GovernanceStaking": "0xFD6F7A6a5c21A3f503EBaE7a473639974379c351",
-        "UBIScheme": "0x137dbc6fd877D802c567B74741D9B2526685718A",
-        "ProtocolUpgradeFuse": "0x0ed64d01D0B4B655E410EF1441dD677B695639E7",
-        "network": "test",
-        "networkId": 4447,
-        "HomeBridge": "0xDC11f7E700A4c898AE5CAddB1082cFfa76512aDD",
-        "OneTimePayments": "0x86A2EE8FAf9A840F7a2c64CA3d51209F9A02081D",
-        "AdminWallet": "0x34B40BA116d5Dec75548a9e9A8f15411461E8c70",
-        "Identity": "0x36b58F5C1969B7b6591D752ea6F5486D069010AB",
-        "GoodDollar": "0x5971B98C0066517Bae7D44021f42e50B77cfe1F9",
-        "Controller": "0xF380bC8b4e595dECa3A55A4C98A6C4fA1c96f537",
-        "Avatar": "0x724dbC61127E39A610Be416b455deb800d51A3B2",
-        "FirstClaimPool": "0x720472c8ce72c2A2D711333e064ABD3E6BbEAdd3",
-        "BancorFormula": "0xD8a5a9b31c3C0232E196d518E89Fd8bF83AcAd43",
-        "DAI": "0x4C4a2f8c81640e47606d3fd77B353E87Ba015584",
-        "cDAI": "0x2E2Ed0Cfd3AD2f1d34481277b3204d807Ca2F8c2",
-        "COMP": "0x21dF544947ba3E8b3c32561399E88B52Dc8b2823"
-    },
-    "test-mainnet": {
-        "ProxyFactory": "0xce17442a9e26bcFDFAb2e9028e3A655d046f1654",
-        "NameService": "0xE88Cd74511b17f10363b557c2E9632CAab353b39",
-        "GReputation": "0x3B7bF1232414Bc52E3C233D0aF8524f259463034",
-        "CompoundVotingMachine": "0xA6F88E890518adAB4517f95c74b0aF4370b7e0be",
-        "GoodMarketMaker": "0xa3b0167657e47ABa3b541C1b21448B449f2CE3bc",
-        "GoodReserveCDai": "0xFE67C7f6d6A9eDA3adE28d8d1bdf1B764491E823",
-        "ExchangeHelper": "0x9bDB9d2aD7Aaf2763e49aa518A3b3CC4798210c6",
-        "GoodFundManager": "0xfE16B3e38B6eEb8f4eA0C820cB4547ec03edFE0e",
-        "StakersDistribution": "0xab06522CFF9ec6302a32b9db057293E80e1BC43a",
-        "ProtocolUpgrade": "0x5D42EBdBBa61412295D7b0302d6F50aC449Ddb4F",
-        "UniswapV2SwapHelper": "0xddE78e6202518FF4936b5302cC2891ec180E8bFf",
-        "CompoundStakingFactory": "0xB06c856C8eaBd1d8321b687E188204C1018BC4E5",
-        "AaveStakingFactory": "0xaB7B4c595d3cE8C85e16DA86630f2fc223B05057",
-        "network": "test-mainnet",
-        "networkId": 4447,
-        "ForeignBridge": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9",
-        "Contribution": "0xA51c1fc2f0D1a1b8494Ed1FE312d7C3a78Ed91C0",
-        "StakingContracts": [
-            [
-                "0x8f19E89ed457Ca4a3cb0dF96653d1952F465ca4A",
-                13888
-            ],
-            [
-                "0x810D8eB0BC99Faebc340EcA183e0110Cf0635A89",
-                "6944"
-            ]
-        ],
-        "DonationsStaking": "0x0B92eE05ABeeeEdef0a0e861468A4317d6E2AC93",
-        "Identity": "0x0165878A594ca255338adfa4d48449f69242Eb8F",
-        "GoodDollar": "0x9bd03768a7DCc129555dE410FF8E85528A4F88b5",
-        "Controller": "0x23dB4a08f2272df049a4932a4Cc3A6Dc1002B33E",
-        "Avatar": "0x61c36a8d610163660E21a8b7359e1Cac0C9133e1",
-        "FirstClaimPool": "0xE6E340D132b5f46d1e472DebcD681B2aBc16e57E",
-        "BancorFormula": "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9",
-        "DAI": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
-        "cDAI": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0",
-        "COMP": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512"
-    },
     "production-bug": {
         "ProxyFactory": "0x4659176E962763e7C8A4eF965ecfD0fdf9f52057",
         "NameService": "0xe26867DDd22F9342d9F0D566D182f2c960683971",
@@ -521,8 +331,9 @@
             ]
         ],
         "MultichainRouter": "0x765277eebeca2e31912c9946eae1021199b39c61",
-        "anyGoodDollar": "0xd17652350cfd2a37ba2f947c910987a3b1a1c60d",
-        "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8"
+        "AnyGoodDollar": "0xd17652350cfd2a37ba2f947c910987a3b1a1c60d",
+        "GuardiansSafe": "0xE0c5daa7CC6F88d29505f702a53bb5E67600e7Ec",
+        "DistributionHelper": "0xAcadA0C9795fdBb6921AE96c4D7Db2F8B8c52Fd0"
     },
     "production": {
         "NameService": "0xec6dcE387B1616a0c44fF2E4fA9E90E53Cf14eb0",
@@ -549,24 +360,84 @@
         "ProxyAdmin": "0x57179b2A8eB019157b0C3E761cdB26c82C982a3B",
         "FuseFaucet": "0x01ab5966C1d742Ae0CFF7f14cC0F4D85156e83d9",
         "FuseStaking": "0xA199F0C353E25AdF022378B0c208D600f39a6505",
-        "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8"
+        "GuardiansSafe": "0x5878123fe880881f1Ecc92D5fd31e5D3F5Fba2e9"
     },
-    "production-celo": {
+    "pre-production-celo": {
         "ProxyFactory": "0x99C22e78A579e2176311c736C4c9F0b0D5A47806",
         "GoodDollar": "0xf2283840cE37DAe0a06B40a9A80603977f36fA3F",
+        "FeeFormula": "0xb25de92ce16127ebf6659a7a30a9f395c7bbf182",
         "Avatar": "0xCD5e8a81B1e02c1837A674f87dF327C14f4e5748",
         "Controller": "0x3D0bacBdC06A28971855275D511e6249bE67112d",
         "Identity": "0x96B81f82A29e78C5ba9E2034Ce8490fd641a24eb",
         "NameService": "0x563a80a452264a9e1aa37c6FA0B46D04C3c71b24",
         "GReputation": "0xAC132ECe25217867E318eA8ff63420C90d5a74A6",
         "GuardiansSafeOld": "0xC9D09BA972B4EB6Bb7347F2229FB6d50434fFCa6",
-        "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8",
+        "GuardiansSafe": "0xa2521e8F5A990903fdD8Afa6570C52526e7E0D5E",
+        "network": "production-celo",
+        "networkId": 42220,
+        "GoodDollarMintBurnWrapper": "0x5566b6E4962BA83e05a426Ad89031ec18e9CadD3",
+        "MultichainRouter": "0xf27Ee99622C3C9b264583dACB2cCE056e194494f"
+    },
+    "production-celo": {
         "network": "production-celo",
         "networkId": 42220,
+        "ProxyFactory": "0xD86cd6Bb3c2a576b2C2CEF4e047b1A7adC5Be62D",
+        "GoodDollar": "0x62B8B11039FcfE5aB0C56E502b1C372A3d2a9c7A",
+        "Avatar": "0x495d133B938596C9984d462F007B676bDc57eCEC",
+        "Controller": "0x0be7C592374EE0bD0CcBFC76Be758a138BcaEc6E",
+        "Identity": "0xC361A6E67822a0EDc17D899227dd9FC50BD62F42",
+        "NameService": "0x0F5dB7a64A6a64052693676CA898EC7F7A94FF4e",
+        "GReputation": "0xa9000Aa66903b5E26F88Fa8462739CdCF7956EA6",
+        "FeeFormula": "0x1151867dA39003695eed28Fafa871079C91884C9",
+        "DAOCreator": "0x76e76e10Ac308A1D54a00f9df27EdCE4801F288b",
         "GoodDollarMintBurnWrapper": "0x5566b6E4962BA83e05a426Ad89031ec18e9CadD3",
+        "GuardiansSafeOld": "0xC9D09BA972B4EB6Bb7347F2229FB6d50434fFCa6",
+        "GuardiansSafe": "0xa2521e8F5A990903fdD8Afa6570C52526e7E0D5E",
         "MultichainRouter": "0xf27Ee99622C3C9b264583dACB2cCE056e194494f"
     },
-    "localhost": {
+    "gnosis": {
         "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8"
+    },
+    "development-celo": {
+        "network": "development-celo",
+        "networkId": 42220,
+        "ProxyFactory": "0x94B2BF218f15489ACEB798d24Ed2aCe16f2e1728",
+        "GoodDollar": "0xFa51eFDc0910CCdA91732e6806912Fa12e2FD475",
+        "Avatar": "0x14204392270CD38D02C43465909Cade33BF5D6E5",
+        "Controller": "0xC3258A20571B34C9acb34cAAAF8E1a1728F04F1c",
+        "Identity": "0xF25fA0D4896271228193E782831F6f3CFCcF169C",
+        "NameService": "0x9e2aFd45f8cf8a67c466F73Ad4C0FC9dDeFe4E73",
+        "GReputation": "0xD624B176B58A0350F2Cd7b5509dF485A51890B97",
+        "FeeFormula": "0x885245799C721D586AA9d509D5e6A3564a7d038A",
+        "DAOCreator": "0x8a8AE918085599864ED21bd477a29a27f660e8d1",
+        "AdminWallet": "0xB7667eaE50cd3507046A696E5b29D4e2Ce474fd6",
+        "Faucet": "0x635b420e95b364def3A031166dA4bC4F57bf9dEB",
+        "Invites": "0x25E6E3Be62c62e2eba673426fD39Ab0209bedbfB",
+        "GoodDollarMintBurnWrapper": "0x5b9E4F63f7E9692Ab2a5330F23B2E89DE86C2dA2",
+        "GoodDollarStaking": "0x9c22bD642f0B0c5C53Aa54f8ea8ABE49Fba69B01",
+        "UBIScheme": "0x6B86F82293552C3B9FE380FC038A89e0328C7C5f",
+        "ClaimersDistribution": "0x6e3c0ad79FA7ccDFa27bE14C2630511415A2F635",
+        "CompoundVotingMachine": "0xC2C303131939370ed75c95686F691f290b56Be66"
+    },
+    "staging-celo": {
+        "network": "staging-celo",
+        "networkId": 42220,
+        "ProxyFactory": "0xFecb7467D29A65bb46D7E5c8a67884178A3f8657",
+        "GoodDollar": "0x61FA0fB802fd8345C06da558240E0651886fec69",
+        "Avatar": "0xbC20139f6e6ad0B34E5E044a02E5a8eCB35e6C43",
+        "Controller": "0x3DF1472f1dB87c11e1D5fB55da77c3E617719D85",
+        "Identity": "0x0108BBc09772973aC27983Fc17c7D82D8e87ef4D",
+        "NameService": "0x852bA371f5DF80D1B8E96Ec1D69F07B1043e3e03",
+        "GReputation": "0x5Abd4DEeeDa7a7b7725c40c165dE7006cE0e5B40",
+        "FeeFormula": "0xa59F28fc940AF3afcd81d72a02E65e62a775d67C",
+        "DAOCreator": "0x84786bE3774fc79c18710a0e809cdB66B4024512",
+        "AdminWallet": "0xF6f3F9889E2E47A0632e6758387Fe7dFd4531d3E",
+        "Faucet": "0x9A0F8AEc626A0f493941Ceb1dA6021cFB0567293",
+        "Invites": "0x06EE642b036f05aA97c8d346Deb8A7E78385e0a9",
+        "GoodDollarMintBurnWrapper": "0x8B29D92ec4BBE5D6Db63c2c48e9972d3ABB42f84",
+        "GoodDollarStaking": "0xae1b807C3fEfdf37589dbA33F98F26cbD7CB72E8",
+        "UBIScheme": "0x2881d417dA066600372753E73A3570F0781f18cB",
+        "ClaimersDistribution": "0x671123F1c7a5B5445467Ff765a5E2Bc86878B245",
+        "CompoundVotingMachine": "0xCd25fB84AB22582F1034bcd80c399a3126f2E775"
     }
 }

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 = [];