@gooddollar/goodprotocol 2.1.1 → 2.1.2

package/dist/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.json

@@ -0,0 +1,32 @@
+{
+    "_format": "hh-sol-artifact-1",
+    "contractName": "UUPSProxy",
+    "sourceName": "contracts/token/superfluid/UUPSProxy.sol",
+    "abi": [
+        {
+            "stateMutability": "payable",
+            "type": "fallback"
+        },
+        {
+            "inputs": [
+                {
+                    "internalType": "address",
+                    "name": "initialAddress",
+                    "type": "address"
+                }
+            ],
+            "name": "initializeProxy",
+            "outputs": [],
+            "stateMutability": "nonpayable",
+            "type": "function"
+        },
+        {
+            "stateMutability": "payable",
+            "type": "receive"
+        }
+    ],
+    "bytecode": "0x608060405234801561001057600080fd5b50610205806100206000396000f3fe6080604052600436106100225760003560e01c80634a0687ef1461003957610031565b366100315761002f610059565b005b61002f610059565b34801561004557600080fd5b5061002f61005436600461017f565b61006b565b610069610064610139565b610148565b565b6001600160a01b0381166100c05760405162461bcd60e51b81526020600482015260176024820152765555505350726f78793a207a65726f206164647265737360481b60448201526064015b60405180910390fd5b60006100ca61016c565b6001600160a01b0316146101205760405162461bcd60e51b815260206004820152601e60248201527f5555505350726f78793a20616c726561647920696e697469616c697a6564000060448201526064016100b7565b610136816000805160206101b083398151915255565b50565b600061014361016c565b905090565b3660008037600080366000845af43d6000803e808015610167573d6000f35b3d6000fd5b6000805160206101b08339815191525490565b60006020828403121561019157600080fd5b81356001600160a01b03811681146101a857600080fd5b939250505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbca264697066735822122054303c95e3083467af14f8e45d0e4948671519cda9ee34d9041f82134179ec4464736f6c63430008100033",
+    "deployedBytecode": "0x6080604052600436106100225760003560e01c80634a0687ef1461003957610031565b366100315761002f610059565b005b61002f610059565b34801561004557600080fd5b5061002f61005436600461017f565b61006b565b610069610064610139565b610148565b565b6001600160a01b0381166100c05760405162461bcd60e51b81526020600482015260176024820152765555505350726f78793a207a65726f206164647265737360481b60448201526064015b60405180910390fd5b60006100ca61016c565b6001600160a01b0316146101205760405162461bcd60e51b815260206004820152601e60248201527f5555505350726f78793a20616c726561647920696e697469616c697a6564000060448201526064016100b7565b610136816000805160206101b083398151915255565b50565b600061014361016c565b905090565b3660008037600080366000845af43d6000803e808015610167573d6000f35b3d6000fd5b6000805160206101b08339815191525490565b60006020828403121561019157600080fd5b81356001600160a01b03811681146101a857600080fd5b939250505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbca264697066735822122054303c95e3083467af14f8e45d0e4948671519cda9ee34d9041f82134179ec4464736f6c63430008100033",
+    "linkReferences": {},
+    "deployedLinkReferences": {}
+}

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

@@ -0,0 +1,82 @@
+{
+    "_format": "hh-sol-artifact-1",
+    "contractName": "ERC1967Proxy",
+    "sourceName": "contracts/utils/ProxyFactory1967.sol",
+    "abi": [
+        {
+            "anonymous": false,
+            "inputs": [
+                {
+                    "indexed": false,
+                    "internalType": "address",
+                    "name": "previousAdmin",
+                    "type": "address"
+                },
+                {
+                    "indexed": false,
+                    "internalType": "address",
+                    "name": "newAdmin",
+                    "type": "address"
+                }
+            ],
+            "name": "AdminChanged",
+            "type": "event"
+        },
+        {
+            "anonymous": false,
+            "inputs": [
+                {
+                    "indexed": true,
+                    "internalType": "address",
+                    "name": "beacon",
+                    "type": "address"
+                }
+            ],
+            "name": "BeaconUpgraded",
+            "type": "event"
+        },
+        {
+            "anonymous": false,
+            "inputs": [
+                {
+                    "indexed": true,
+                    "internalType": "address",
+                    "name": "implementation",
+                    "type": "address"
+                }
+            ],
+            "name": "Upgraded",
+            "type": "event"
+        },
+        {
+            "stateMutability": "payable",
+            "type": "fallback"
+        },
+        {
+            "inputs": [
+                {
+                    "internalType": "address",
+                    "name": "_logic",
+                    "type": "address"
+                },
+                {
+                    "internalType": "bytes",
+                    "name": "_data",
+                    "type": "bytes"
+                }
+            ],
+            "name": "initialize",
+            "outputs": [],
+            "stateMutability": "payable",
+            "type": "function"
+        },
+        {
+            "stateMutability": "payable",
+            "type": "receive"
+        }
+    ],
+    "bytecode": "0x608060405234801561001057600080fd5b506105a6806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103ef565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd61047f565b60008051602061052a833981519152146100f8576100f86104a0565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061052a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610225565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161054a602791396102bf565b90505b92915050565b61022e81610337565b6102905760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080856001600160a01b0316856040516102dc91906104da565b600060405180830381855af49150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915061032d86838387610346565b9695505050505050565b6001600160a01b03163b151590565b606083156103b35782516000036103ac5761036085610337565b6103ac5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016100a8565b50816103bd565b6103bd83836103c5565b949350505050565b8151156103d55781518083602001fd5b8060405162461bcd60e51b81526004016100a891906104f6565b60008060006040848603121561040457600080fd5b83356001600160a01b038116811461041b57600080fd5b925060208401356001600160401b038082111561043757600080fd5b818601915086601f83011261044b57600080fd5b81358181111561045a57600080fd5b87602082850101111561046c57600080fd5b6020830194508093505050509250925092565b8181038181111561021f57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60005b838110156104d15781810151838201526020016104b9565b50506000910152565b600082516104ec8184602087016104b6565b9190910192915050565b60208152600082518060208401526105158160408501602087016104b6565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220e61bf4b283e7c7127b63eb541e464310619a8e941077fd50b9791d417ed8557b64736f6c63430008100033",
+    "deployedBytecode": "0x6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103ef565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd61047f565b60008051602061052a833981519152146100f8576100f86104a0565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061052a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610225565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161054a602791396102bf565b90505b92915050565b61022e81610337565b6102905760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080856001600160a01b0316856040516102dc91906104da565b600060405180830381855af49150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915061032d86838387610346565b9695505050505050565b6001600160a01b03163b151590565b606083156103b35782516000036103ac5761036085610337565b6103ac5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016100a8565b50816103bd565b6103bd83836103c5565b949350505050565b8151156103d55781518083602001fd5b8060405162461bcd60e51b81526004016100a891906104f6565b60008060006040848603121561040457600080fd5b83356001600160a01b038116811461041b57600080fd5b925060208401356001600160401b038082111561043757600080fd5b818601915086601f83011261044b57600080fd5b81358181111561045a57600080fd5b87602082850101111561046c57600080fd5b6020830194508093505050509250925092565b8181038181111561021f57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60005b838110156104d15781810151838201526020016104b9565b50506000910152565b600082516104ec8184602087016104b6565b9190910192915050565b60208152600082518060208401526105158160408501602087016104b6565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220e61bf4b283e7c7127b63eb541e464310619a8e941077fd50b9791d417ed8557b64736f6c63430008100033",
+    "linkReferences": {},
+    "deployedLinkReferences": {}
+}

package/dist/test-sdk/deploySuperGoodDollar.d.ts

@@ -0,0 +1,6 @@
+import "@openzeppelin/hardhat-upgrades";
+export declare type TokenArgs = [string, string];
+export declare const deploySuperGoodDollar: (signer: any, sfContracts: any, tokenArgs?: any[]) => Promise<{
+    GoodDollar: import("ethers").Contract;
+    Identity: import("ethers").Contract;
+}>;

package/dist/test-sdk/deploySuperGoodDollar.js

@@ -0,0 +1,46 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deploySuperGoodDollar = void 0;
+require("@openzeppelin/hardhat-upgrades");
+const hardhat_1 = require("hardhat");
+const SuperGoodDollar_json_1 = __importDefault(require("../artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.json"));
+const UUPSProxy_json_1 = __importDefault(require("../artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.json"));
+const IdentityV2_json_1 = __importDefault(require("../artifacts/contracts/identity/IdentityV2.sol/IdentityV2.json"));
+const FeeFormula_json_1 = __importDefault(require("@gooddollar/goodcontracts/build/contracts/FeeFormula.json"));
+const ERC1967Proxy_json_1 = __importDefault(require("../artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.json"));
+const deploySuperGoodDollar = async (signer, sfContracts, tokenArgs = []) => {
+    const IdentityFactory = new hardhat_1.ethers.ContractFactory(IdentityV2_json_1.default.abi, IdentityV2_json_1.default.bytecode, signer);
+    const FeeFormulaFactory = new hardhat_1.ethers.ContractFactory(FeeFormula_json_1.default.abi, FeeFormula_json_1.default.bytecode, signer);
+    const FeeFormula = await FeeFormulaFactory.deploy(0);
+    const proxyFactory = new hardhat_1.ethers.ContractFactory(ERC1967Proxy_json_1.default.abi, ERC1967Proxy_json_1.default.bytecode, signer);
+    const idProxy = await proxyFactory.deploy();
+    const idLogic = await IdentityFactory.deploy();
+    const encodedInit = idLogic.interface.encodeFunctionData("initialize", [await signer.getAddress(), hardhat_1.ethers.constants.AddressZero]);
+    await idProxy.initialize(idLogic.address, encodedInit);
+    // const Identity = await upgrades.deployProxy(
+    //     IdentityFactory,
+    //     [await signer.getAddress(), ethers.constants.AddressZero],
+    //     { kind: "uups" }
+    //   );
+    const initializeArgs = [
+        "GoodDollar",
+        "G$",
+        0,
+        FeeFormula.address,
+        idProxy.address,
+        hardhat_1.ethers.constants.AddressZero,
+        await signer.getAddress(), ...tokenArgs
+    ];
+    const SuperGoodDollarFactory = new hardhat_1.ethers.ContractFactory(SuperGoodDollar_json_1.default.abi, SuperGoodDollar_json_1.default.bytecode, signer);
+    const SuperGoodDollar = await SuperGoodDollarFactory.deploy(sfContracts.host);
+    const GoodDollarProxyFactory = new hardhat_1.ethers.ContractFactory(UUPSProxy_json_1.default.abi, UUPSProxy_json_1.default.bytecode, signer);
+    const GoodDollarProxy = await GoodDollarProxyFactory.deploy();
+    await GoodDollarProxy.initializeProxy(SuperGoodDollar.address);
+    const GoodDollar = SuperGoodDollar.attach(GoodDollarProxy.address);
+    await GoodDollar["initialize(string,string,uint256,address,address,address,address)"](...initializeArgs);
+    return { GoodDollar, Identity: idLogic.attach(idProxy.address) };
+};
+exports.deploySuperGoodDollar = deploySuperGoodDollar;

package/dist/test-sdk/index.d.ts

@@ -0,0 +1 @@
+export * from "./deploySuperGoodDollar";

package/dist/test-sdk/index.js

@@ -0,0 +1,13 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./deploySuperGoodDollar"), exports);

package/hardhat.config.ts

@@ -29,7 +29,7 @@ envEnc.config();
 config();
 
 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 deployerPrivateKey = process.env.ADMIN_KEY || ethers.utils.hexZeroPad("0x11", 32);
 const infura_api = process.env.INFURA_API;
 const alchemy_key = process.env.ALCHEMY_KEY;
 const etherscan_key = process.env.ETHERSCAN_KEY;
@@ -41,7 +41,7 @@ const MAINNET_URL = "https://mainnet.infura.io/v3/" + infura_api;
 
 const xdc = {
   accounts: { mnemonic },
-  url: "https://rpc.ankr.com/xdc/ef07ba6590dc46db9275bba237aed203ed6d5fb3e3203ff237a82a841f75b2ce",
+  url: "https://rpc.xdc.org",
   gas: 3000000,
   gasPrice: 12.5e9,
   chainId: 50
@@ -65,15 +65,7 @@ const hhconfig: HardhatUserConfig = {
     enabled: true
   },
   etherscan: {
-    apiKey: {
-      mainnet: etherscan_key,
-      txdc: etherscan_key,
-      xdc: etherscan_key,
-      celo: etherscan_key,
-      alfajores: celoscan_key,
-      base: basescan_key,
-      fuse: etherscan_key
-    },
+    apiKey: etherscan_key,
     customChains: [
       {
         network: "fuse",
@@ -133,7 +125,8 @@ const hhconfig: HardhatUserConfig = {
       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
-      }
+      },
+      blockGasLimit: 100000000429720,
     },
     fork: {
       chainId: 1,
@@ -155,6 +148,7 @@ const hhconfig: HardhatUserConfig = {
     },
     dapptest: {
       gasPrice: 1000000000, //1 gwei
+      blockGasLimit: 100000000429720,
       url: "http://127.0.0.1:8545/"
     },
     "dapptest-mainnet": {

package/package.json

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

package/releases/deployment.json

@@ -684,6 +684,8 @@
     "AdminWallet": "0x66fc1bE551f752706130b6f54d84141F8c2Ae8Bb",
     "Faucet": "0x7344Da1Be296f03fbb8082aDaC5696058B5a9bd9",
     "Invites": "0x6bd698566632bf2e81e2278f1656CB24aAF06D2e",
-    "UBIScheme": "0x22867567E2D80f2049200E25C6F31CB6Ec2F0faf"
+    "UBIScheme": "0x22867567E2D80f2049200E25C6F31CB6Ec2F0faf",
+    "MpbBridge": "0xa3247276DbCC76Dd7705273f766eB3E8a5ecF4a5",
+    "BulkWhitelist": "0xe8861A20452Db53dF685F1d9e6B7017de3DB0E46"
   }
 }

package/scripts/bulkWhitelist.ts

@@ -0,0 +1,31 @@
+import farmed from "../farming.json";
+import { ethers, network } from "hardhat";
+import { chunk } from "lodash";
+import contracts from "../releases/deployment.json";
+import { bulkIsWhitelisted } from "./utils";
+const main = async () => {
+  const signer = (await ethers.getSigners())[0];
+
+  console.log("signer", signer.address);
+  const whitelist = await ethers.getContractAt("BulkWhitelist", contracts[network.name].BulkWhitelist);
+  const chunks = chunk(farmed, 300);
+  for (let batch of chunks) {
+    console.log("whitelisting batch of", batch.length, batch[0], batch[batch.length - 1]);
+    const res = await (await whitelist.connect(signer).removeWhitelisted(batch, { gasLimit: 25000000 })).wait();
+    console.log("tx:", res.transactionHash);
+  }
+};
+
+const checkReVerified = async () => {
+  const chunks = chunk(farmed, 300);
+  let total = 0;
+  for (let batch of chunks) {
+    console.log("check whitelisting batch of", batch.length, batch[0], batch[batch.length - 1]);
+    const res = await bulkIsWhitelisted(batch);
+    console.log(`${res.length}/${batch.length}`);
+    total += res.length;
+  }
+  console.log(`total: ${total}/${farmed.length}`);
+};
+checkReVerified();
+// main().catch(console.log);

package/scripts/multichain-deploy/helpers.ts

@@ -5,7 +5,7 @@ import { TransactionResponse, TransactionReceipt } from "@ethersproject/provider
 import { getImplementationAddress } from "@openzeppelin/upgrades-core";
 
 import SafeApiKit from "@safe-global/api-kit";
-import Safe from "@safe-global/protocol-kit";
+import Safe, { SafeTransactionOptionalProps } from "@safe-global/protocol-kit";
 import { MetaTransactionData } from "@safe-global/types-kit";
 
 import util from "util";
@@ -357,6 +357,7 @@ export const executeViaSafe = async (
   functionInputs,
   safeAddress: string,
   safeSignerOrNetwork?: Signer | string,
+  safeOptions: SafeTransactionOptionalProps = {},
   isSimulation = false
 ) => {
   if (typeof safeSignerOrNetwork !== "object" && !process.env.SAFEOWNER_PRIVATE_KEY) {
@@ -387,6 +388,10 @@ export const executeViaSafe = async (
         //   new ethers.providers.JsonRpcProvider("https://rpc.fuse.io")
         // );
         break;
+      case "xdc":
+        chainId = 50;
+        provider = "https://rpc.xdcrpc.com";
+        break;
     }
   } else if (safeSignerOrNetwork) {
     // safeSigner = safeSignerOrNetwork as any;