@gooddollar/goodprotocol 1.0.26 → 1.0.27

package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.dbg.json

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

package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json

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

package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json

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

package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.dbg.json

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

package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json

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

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

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

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

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

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

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

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

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

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

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

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

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

package/artifacts/contracts/utils/MultiCall.sol/Multicall.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/1d4e700cdf55d89b032a8f9e1eb69212.json"
+  "buildInfo": "../../../build-info/0c055b479654142fbe8826f67cd9a986.json"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/4f8206a440cfa6bac16c5683c5407b03.json"
+  "buildInfo": "../../../build-info/28efded0f4a09672715b1b4a8245eaa4.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/4f8206a440cfa6bac16c5683c5407b03.json"
+  "buildInfo": "../../../build-info/28efded0f4a09672715b1b4a8245eaa4.json"
 }

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

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

package/hardhat.config.ts

@@ -54,7 +54,17 @@ const hhconfig: HardhatUserConfig = {
     apiKey: {
       mainnet: etherscan_key,
       celo: celoscan_key
-    }
+    },
+    customChains: [
+      {
+        network: "celo",
+        chainId: 42220,
+        urls: {
+          apiURL: "https://api.celoscan.io",
+          browserURL: "https://celoscan.io"
+        }
+      }
+    ]
   },
   contractSizer: {
     alphaSort: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "1.0.26",
+  "version": "1.0.27",
   "description": "GoodDollar Protocol",
   "scripts": {
     "build": "scripts/build.sh deploy",
@@ -59,7 +59,7 @@
     "@jsier/retrier": "^1.2.4",
     "@openzeppelin/contracts": "^4.5.0",
     "@openzeppelin/contracts-upgradeable": "^4.3.2",
-    "@typechain/hardhat": "^2.2.0",
+    "@typechain/hardhat": "^6.1.2",
     "async-promise-pool": "^1.0.4",
     "ethers-multicall": "^0.2.1",
     "openzeppelin-solidity": "^4.3.2",
@@ -73,10 +73,10 @@
     "@babel/polyfill": "*",
     "@babel/preset-env": "*",
     "@babel/register": "*",
-    "@nomiclabs/hardhat-ethers": "^2.0.5",
-    "@nomiclabs/hardhat-etherscan": "^3.0.3",
+    "@nomiclabs/hardhat-ethers": "^2.1.1",
+    "@nomiclabs/hardhat-etherscan": "^3.1.0",
     "@nomiclabs/hardhat-waffle": "^2.0.3",
-    "@openzeppelin/hardhat-upgrades": "1.7.0",
+    "@openzeppelin/hardhat-upgrades": "^1.20.0",
     "@typechain/ethers-v5": "^8.0.2",
     "@types/mocha": "*",
     "@types/node": "*",
@@ -93,9 +93,9 @@
     "fs-extra": "9.0.0",
     "graphql": "^15.5.0",
     "graphql-request": "^3.4.0",
-    "hardhat": "^2.9.3",
-    "hardhat-contract-sizer": "^2.0.3",
-    "hardhat-gas-reporter": "^1.0.4",
+    "hardhat": "^2.10.2",
+    "hardhat-contract-sizer": "^2.6.1",
+    "hardhat-gas-reporter": "^1.0.8",
     "lodash": "^4.17.21",
     "merkle-tree-solidity": "*",
     "mocha": "^9.1.2",

package/scripts/bulkProof.ts

@@ -1,7 +1,6 @@
 import fs from "fs";
 import { chunk } from "lodash";
 import { ethers, upgrades, network } from "hardhat";
-import { networkNames } from "@openzeppelin/upgrades-core";
 import GReputationABI from "../artifacts/contracts/governance/GReputation.sol/GReputation.json";
 import BulkProofABI from "../artifacts/contracts/utils/BulkProof.sol/BulkProof.json";
 
@@ -12,14 +11,10 @@ import MerkleTree, {
 import { BigNumber } from "ethers";
 
 console.log({
-  networkNames,
   network: network.name,
   upgrade: process.env.UPGRADE
 });
 const { name: networkName } = network;
-networkNames[1] = networkName;
-networkNames[122] = networkName;
-networkNames[3] = networkName;
 
 export const bulkProof = async () => {
   console.log("signer", await ethers.getSigners());

package/scripts/multichain-deploy/basicdao-deploy.ts

@@ -1,5 +1,4 @@
 import { network, ethers, upgrades, run } from "hardhat";
-import { networkNames } from "@openzeppelin/upgrades-core";
 import { isFunction, get, omitBy } from "lodash";
 import { getImplementationAddress } from "@openzeppelin/upgrades-core";
 import pressAnyKey from "press-any-key";

package/scripts/upgradeScheme.ts

@@ -1,14 +1,10 @@
 import { ethers, upgrades, network } from "hardhat";
-import { networkNames } from "@openzeppelin/upgrades-core";
 import { getSettings, releaser } from "../../scripts/getMigrationSettings";
 import { SchemeRegistrar } from "../types";
 import { getFounders } from "./getFounders";
 
-console.log({ networkNames, network: network.name, upgrade: process.env.UPGRADE });
+console.log({ network: network.name, upgrade: process.env.UPGRADE });
 const { name: networkName } = network;
-networkNames[1] = networkName;
-networkNames[122] = networkName;
-networkNames[3] = networkName;
 
 export const proposeUpgradeScheme = async (daoAddresses, schemeAddress) => {
   console.log("proposing conntract upgrade to DAO", {
@@ -47,7 +43,10 @@ export const voteUpgradeScheme = async (network, daoAddresses, proposalId) => {
   );
 
   const founders = await getFounders(network);
-  console.log("voteUpgradeScheme", { absoluteVote: absoluteVote.address, founders });
+  console.log("voteUpgradeScheme", {
+    absoluteVote: absoluteVote.address,
+    founders
+  });
   await Promise.all(
     founders.slice(0, Math.ceil(founders.length / 2)).map(f =>
       absoluteVote
@@ -59,12 +58,8 @@ export const voteUpgradeScheme = async (network, daoAddresses, proposalId) => {
 };
 
 const main = async () => {
-  const {
-    daoAddresses,
-    modelAddresses,
-    upgradableAddresses,
-    founders
-  } = await getSettings(networkName);
+  const { daoAddresses, modelAddresses, upgradableAddresses, founders } =
+    await getSettings(networkName);
 
   // const implementation = "0x7fca2b3e1047291f65c2c914083d970c027f4290";
   // const deployedProxy = upgradableAddresses.FuseStaking;

package/scripts/upgradeToV2/upgradeToV2.ts

@@ -8,7 +8,6 @@
  */
 
 import { network, ethers, upgrades, run } from "hardhat";
-import { networkNames } from "@openzeppelin/upgrades-core";
 import { isFunction, get, omitBy } from "lodash";
 import { getImplementationAddress } from "@openzeppelin/upgrades-core";
 import pressAnyKey from "press-any-key";
@@ -53,7 +52,6 @@ const countTotalGas = async (tx, name) => {
 };
 
 console.log({
-  networkNames,
   network: network.name,
   upgrade: process.env.UPGRADE
 });
@@ -64,12 +62,6 @@ export const main = async (
   isPerformUpgrade = true,
   olddao?
 ): Promise<{ [key: string]: any }> => {
-  if (networkName.startsWith("dapptest") === false) {
-    networkNames[1] = networkName;
-    networkNames[122] = networkName;
-    networkNames[3] = networkName;
-  }
-
   const isProduction = networkName.startsWith("production");
   if (isProduction && networkName.includes("mainnet")) {
     GAS_SETTINGS.gasLimit = 6000000;

package/scripts/upgradeToV2/upgradeToV2Recover.ts

@@ -8,7 +8,6 @@
  */
 
 import { network, ethers, upgrades, run } from "hardhat";
-import { networkNames } from "@openzeppelin/upgrades-core";
 import { isFunction, get, omitBy } from "lodash";
 import { getImplementationAddress } from "@openzeppelin/upgrades-core";
 
@@ -53,7 +52,6 @@ const countTotalGas = async (tx, name) => {
 };
 
 console.log({
-  networkNames,
   network: network.name,
   upgrade: process.env.UPGRADE
 });
@@ -64,12 +62,6 @@ export const main = async (
   isPerformUpgrade = true,
   olddao?
 ): Promise<{ [key: string]: any }> => {
-  if (networkName.startsWith("dapptest") === false) {
-    networkNames[1] = networkName;
-    networkNames[122] = networkName;
-    networkNames[3] = networkName;
-  }
-
   const isProduction = networkName.startsWith("production");
   if (isProduction && networkName.includes("mainnet")) {
     GAS_SETTINGS.gasLimit = 6000000;

package/test/utils/ProtocolUpgrade.test.ts

@@ -2,7 +2,6 @@ import { default as hre, ethers, upgrades, network } from "hardhat";
 import { BigNumber, Contract, Signer } from "ethers";
 import { deployMockContract, MockContract } from "ethereum-waffle";
 import { expect } from "chai";
-import { networkNames } from "@openzeppelin/upgrades-core";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/dist/src/signer-with-address";
 import { deploy } from "../../scripts/test/localOldDaoDeploy";
 import deploySettings from "../../releases/deploy-settings.json";
@@ -66,9 +65,7 @@ describe("ProtocolUpgrade - Upgrade old protocol contracts to new ones", () => {
     fuseController,
     goodReserve;
   const { name: networkName } = network;
-  networkNames[1] = networkName;
-  networkNames[122] = networkName;
-  networkNames[3] = networkName;
+
   before(async () => {
     [founder, ...signers] = await ethers.getSigners();
     schemeMock = signers.pop();