@gooddollar/goodprotocol 2.0.11 → 2.0.13

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/PausableControl.dbg.json

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

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.dbg.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package/contracts/utils/AdminWallet.sol

@@ -34,6 +34,9 @@ contract AdminWallet is
 	uint64 public maxDailyNewWallets;
 	uint64 public day;
 
+	ERC20 public gd;
+	mapping(address => uint256) public lastGdBalance; // only top non whitelisted if active G$ users
+
 	event AdminsAdded(address payable[] indexed admins);
 	event AdminsRemoved(address[] indexed admins);
 	event WalletTopped(address indexed user, uint256 amount);
@@ -63,6 +66,7 @@ contract AdminWallet is
 			addAdmins(_admins);
 		}
 		if (msg.sender != _owner) revokeRole(DEFAULT_ADMIN_ROLE, msg.sender);
+		gd = ERC20(nameService.getAddress("GOODDOLLAR"));
 	}
 
 	modifier onlyOwner() {
@@ -70,6 +74,10 @@ contract AdminWallet is
 		_;
 	}
 
+	function upgrade() public onlyOwner {
+		gd = ERC20(nameService.getAddress("GOODDOLLAR"));
+	}
+
 	function getIdentity() public view returns (IIdentityV2) {
 		return IIdentityV2(nameService.getAddress("IDENTITY"));
 	}
@@ -95,11 +103,9 @@ contract AdminWallet is
 		toppingTimes = _toppingTimes;
 	}
 
-	function _authorizeUpgrade(address newImplementation)
-		internal
-		override
-		onlyOwner
-	{}
+	function _authorizeUpgrade(
+		address newImplementation
+	) internal override onlyOwner {}
 
 	/* @dev Modifier that checks if caller is admin of wallet
 	 */
@@ -180,11 +186,10 @@ contract AdminWallet is
 	/* @dev Function to add given address to whitelist of identity contract
 	 * can only be done by admins of wallet and if wallet is an IdentityAdmin
 	 */
-	function whitelist(address _user, string memory _did)
-		public
-		onlyAdmin
-		reimburseGas
-	{
+	function whitelist(
+		address _user,
+		string memory _did
+	) public onlyAdmin reimburseGas {
 		getIdentity().addWhitelistedWithDID(_user, _did);
 	}
 
@@ -231,10 +236,16 @@ contract AdminWallet is
 	 * @param _user The address to transfer to
 	 */
 	function topWallet(address payable _user) public onlyAdmin reimburseGas {
+		uint256 gdBalance = gd.balanceOf(_user);
+		require(
+			getIdentity().isWhitelisted(_user) || gdBalance != lastGdBalance[_user],
+			"User has not used G$"
+		);
 		require(
 			toppings[currentDay()][_user] < toppingTimes,
 			"User wallet has been topped too many times today"
 		);
+		lastGdBalance[_user] = gdBalance;
 		if (address(_user).balance >= toppingAmount / 4) return;
 
 		_topWallet(_user);

package/contracts/utils/AdminWalletFuse.sol

@@ -39,6 +39,9 @@ contract AdminWalletFuse is
 
 	uint32 public version;
 
+	ERC20 public gd;
+	mapping(address => uint256) public lastGdBalance; // only top non whitelisted if active G$ users
+
 	event AdminsAdded(address payable[] indexed admins);
 	event AdminsRemoved(address[] indexed admins);
 	event WalletTopped(address indexed user, uint256 amount);
@@ -68,12 +71,11 @@ contract AdminWalletFuse is
 		if (_admins.length > 0) {
 			addAdmins(_admins);
 		}
+		gd = ERC20(nameService.getAddress("GOODDOLLAR"));
 	}
 
-	function upgrade(NameService _ns) public {
-		require(version == 0, "already upgraded");
-		version++;
-		nameService = _ns;
+	function upgrade() public onlyOwner {
+		gd = ERC20(nameService.getAddress("GOODDOLLAR"));
 	}
 
 	function getIdentity() public view returns (IIdentityV2) {
@@ -101,11 +103,9 @@ contract AdminWalletFuse is
 		toppingTimes = _toppingTimes;
 	}
 
-	function _authorizeUpgrade(address newImplementation)
-		internal
-		override
-		onlyOwner
-	{}
+	function _authorizeUpgrade(
+		address newImplementation
+	) internal override onlyOwner {}
 
 	/* @dev Modifier that checks if caller is admin of wallet
 	 */
@@ -186,11 +186,10 @@ contract AdminWalletFuse is
 	/* @dev Function to add given address to whitelist of identity contract
 	 * can only be done by admins of wallet and if wallet is an IdentityAdmin
 	 */
-	function whitelist(address _user, string memory _did)
-		public
-		onlyAdmin
-		reimburseGas
-	{
+	function whitelist(
+		address _user,
+		string memory _did
+	) public onlyAdmin reimburseGas {
 		getIdentity().addWhitelistedWithDID(_user, _did);
 	}
 
@@ -237,10 +236,16 @@ contract AdminWalletFuse is
 	 * @param _user The address to transfer to
 	 */
 	function topWallet(address payable _user) public onlyAdmin reimburseGas {
+		uint256 gdBalance = gd.balanceOf(_user);
+		require(
+			getIdentity().isWhitelisted(_user) || gdBalance != lastGdBalance[_user],
+			"User has not used G$"
+		);
 		require(
 			toppings[currentDay()][_user] < toppingTimes,
 			"User wallet has been topped too many times today"
 		);
+		lastGdBalance[_user] = gdBalance;
 		if (address(_user).balance >= toppingAmount / 4) return;
 
 		_topWallet(_user);

package/hardhat.config.ts

@@ -100,6 +100,10 @@ const hhconfig: HardhatUserConfig = {
         url: "https://eth-mainnet.alchemyapi.io/v2/" + process.env.ALCHEMY_KEY
       }
     },
+    fork: {
+      chainId: 1,
+      url: "https://rpc.vnet.tenderly.co/devnet/reserve-ujpgrade/9f79f839-996c-495a-b470-c0237eede293"
+    },
     test: {
       allowUnlimitedContractSize: true,
       url: "http://127.0.0.1:8545/"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "description": "GoodDollar Protocol",
   "engines": {
     "node": "18.x"

package/releases/deployment.json

@@ -482,7 +482,7 @@
         "SwapHelper": "0xE45CaB86609a16dFaDec112FDd61E4EA80EdaA8D",
         "UniswapV3Router": "0x5615CDAb10dc425a742d643d949a7F474C01abc4",
         "StaticOracle": "0x00851A91a3c4E9a4c1B48df827Bacc1f884bdE28",
-        "BuyGDFactory": "0x85188b32a2322a54f5fD6204013A7b0dAA3EBFef"
+        "BuyGDFactory": "0x00e533B7d6255D05b7f15034B1c989c21F51b91C"
     },
     "gnosis": {
         "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8"
@@ -547,7 +547,9 @@
         "GReputation": "0x0abF3D20fCb33FC03bdF25b042E77edfAeDBBDD3",
         "FeeFormula": "0x5fAA779cF74a1Ba51909DEeaA0e8900474DA77Cf",
         "DAOCreator": "0xc66c970a6d99da587a7d7fa7d5383b401c3e87f4",
-        "OneTimePaymentsV2": "0x4E8112430974b4CE87283221a11BDC52097e7e2e"
+        "OneTimePaymentsV2": "0x4E8112430974b4CE87283221a11BDC52097e7e2e",
+        "network": "development-goerli",
+        "networkId": 5
     },
     "alfajores": {
         "network": "alfajores",

package/scripts/analytics/checkActiveWallets.ts

@@ -0,0 +1,60 @@
+import { countBy, chunk, difference, flatten, sortBy } from "lodash";
+import fs from "fs";
+import { network, ethers, upgrades } from "hardhat";
+import { Contract, Provider, setMulticallAddress } from "ethers-multicall";
+import Identity from "../../artifacts/contracts/Interfaces.sol/IIdentity.json";
+
+setMulticallAddress(122, "0x3CE6158b7278Bf6792e014FA7B4f3c6c46fe9410");
+
+setMulticallAddress(42220, "0x188C1bf697B66474dC3eaa119Ae691a8352537e3");
+
+const fuseProvider = new ethers.providers.JsonRpcBatchProvider(
+  "https://explorer-node.fuse.io/"
+  // "https://rpc.fuse.io"
+);
+const celoProvider = new ethers.providers.JsonRpcBatchProvider(
+  "https://forno.celo.org"
+  // "https://rpc.fuse.io"
+);
+const ethcallProvider = new Provider(fuseProvider, 122);
+const ethcallProviderCelo = new Provider(celoProvider, 42220);
+
+const GD_FUSE = "0x495d133b938596c9984d462f007b676bdc57ecec";
+const GD_CELO = "0x62B8B11039FcfE5aB0C56E502b1C372A3d2a9c7A";
+
+const gdMulti = new Contract(GD_FUSE, [
+  "event Transfer(address indexed from, address indexed to, uint amount)",
+  "function balanceOf(address) view returns(uint256)"
+]);
+const gdMultiCelo = new Contract(GD_CELO, [
+  "event Transfer(address indexed from, address indexed to, uint amount)",
+  "function balanceOf(address) view returns(uint256)"
+]);
+
+const hasBalance = async wallets => {
+  console.log("checking balances for:", wallets.length);
+  const chunks = chunk(wallets, 100);
+  let balances = {};
+  let users = [];
+  for (let batch of chunks) {
+    const calls = batch.map(a => gdMultiCelo.balanceOf(a));
+    const result = await ethcallProviderCelo.all(calls);
+    const found = batch.filter((d, i) => result[i] > 0);
+    console.log("batch:", batch.length, calls.length, result.length, found.length);
+    users = users.concat(found);
+  }
+  console.log("got balances for:", Object.entries(balances).length, "found users:", users.length);
+  console.log(users);
+};
+
+const main = async () => {
+  const wallets = fs
+    .readFileSync("accounts.csv")
+    .toString()
+    .split("\n")
+    .map(l => l.split(",")[0])
+    .filter(a => a.startsWith("0x"));
+
+  const refunded = await hasBalance(wallets);
+};
+main().catch(e => console.log(e));

package/scripts/analytics/faucetStats.ts

@@ -21,9 +21,7 @@ function arrayToCsv(data) {
 const celoStats = async () => {};
 const main = async (isCelo = true) => {
   const archive = new JsonRpcProvider(
-    isCelo
-      ? "https://celo-mainnet-archive.allthatnode.com"
-      : "https://explorer-node.fuse.io"
+    isCelo ? "https://celo-mainnet-archive.allthatnode.com" : "https://explorer-node.fuse.io"
   );
   const faucetAddr = isCelo
     ? "0x4F93Fa058b03953C851eFaA2e4FC5C34afDFAb84"
@@ -39,31 +37,24 @@ const main = async (isCelo = true) => {
     ],
     faucetAddr
   );
-  const endBlock = Number(await ethers.provider.getBlockNumber());
-  const daysBack = 60;
+  const endBlock = Number(await archive.getBlockNumber());
+  const daysBack = 90;
   const dayBlocks = 12 * 60 * 24;
   const startBlock = endBlock - dayBlocks * daysBack;
   const days = range(startBlock, endBlock, dayBlocks);
+  console.log({ startBlock, endBlock });
   const dailyBalance = [];
   const dailyAdminBalance = [];
   for (let day of days) {
-    dailyBalance.push(
-      (await archive.getBalance(faucetAddr, day)).div(1e10).toNumber() / 1e8
-      // isCelo
-      //   ?
-      //   await fetch(
-      //       `https://api.celoscan.io/api?module=account&action=balance&address=${faucetAddr}&tag=${day}&apikey=${process.env.CELOSCAN_KEY}`
-      //     )
-      //       .then(_ => _.json())
-      //       .then(_ => _.result)
-      //   : (await archive.getBalance(faucetAddr, day)).div(1e10).toNumber() / 1e8
-    );
+    dailyBalance.push([
+      (await archive.getBalance("0x4F93Fa058b03953C851eFaA2e4FC5C34afDFAb84", day)).div(1e10).toNumber() / 1e8,
+      (await archive.getBalance("0x7119CD89D4792aF90277d84cDffa3F2Ab22a0022", day)).div(1e10).toNumber() / 1e8
+    ]);
+    console.log({ day });
   }
 
   for (let day of days) {
-    dailyAdminBalance.push(
-      (await archive.getBalance(adminAddr, day)).div(1e10).toNumber() / 1e8
-    );
+    dailyAdminBalance.push((await archive.getBalance(adminAddr, day)).div(1e10).toNumber() / 1e8);
   }
   let curBlock = startBlock;
   const toppingsByAddress = {};
@@ -71,35 +62,31 @@ const main = async (isCelo = true) => {
   const toppingsByRelayer = {};
   let totalToppings = 0;
   let totalAmount = 0;
-  const dailyUsage = dailyBalance.map((v, i) =>
-    i < dailyBalance.length - 1 ? v - dailyBalance[i + 1] : 0
-  );
+  const dailyUsage = dailyBalance.map((v, i) => (i < dailyBalance.length - 1 ? v - dailyBalance[i + 1] : 0));
   const dailyAdminUsage = dailyAdminBalance.map((v, i) =>
     i < dailyAdminBalance.length - 1 ? v - dailyAdminBalance[i + 1] : 0
   );
   console.log({ dailyUsage, dailyAdminUsage });
+  fs.writeFileSync("celospend.csv", arrayToCsv(dailyBalance));
+  console.log(arrayToCsv(dailyBalance));
+  return;
   console.log({ startBlock, endBlock });
   while (curBlock <= endBlock) {
     const fromBlock = curBlock;
     const toBlock = Math.min(fromBlock + blockStep, endBlock);
     pool.add(async () => {
       const f = faucet.filters.WalletTopped();
-      const events = await faucet
-        .queryFilter(f, fromBlock, toBlock)
-        .catch(e => {
-          console.log("failed", { fromBlock, toBlock });
-          return [];
-        });
+      const events = await faucet.queryFilter(f, fromBlock, toBlock).catch(e => {
+        console.log("failed", { fromBlock, toBlock });
+        return [];
+      });
       events.forEach(e => {
         totalToppings += 1;
         totalAmount += Number(e.args.amount);
-        toppingsByAddress[e.args.whitelistedRoot] =
-          (toppingsByAddress[e.args.whitelistedRoot] || 0) + 1;
+        toppingsByAddress[e.args.whitelistedRoot] = (toppingsByAddress[e.args.whitelistedRoot] || 0) + 1;
         if (e.args.account !== e.args.relayerOrWhitelisted)
-          toppingsByRelayer[e.args.relayerOrWhitelisted] =
-            (toppingsByRelayer[e.args.relayerOrWhitelisted] || 0) + 1;
-        toppingsByAmount[e.args.amount] =
-          (toppingsByAmount[e.args.amount] || 0) + 1;
+          toppingsByRelayer[e.args.relayerOrWhitelisted] = (toppingsByRelayer[e.args.relayerOrWhitelisted] || 0) + 1;
+        toppingsByAmount[e.args.amount] = (toppingsByAmount[e.args.amount] || 0) + 1;
       });
       console.log("fetched events", {
         fromBlock,

package/scripts/multichain-deploy/helpers.ts

@@ -328,11 +328,11 @@ export const executeViaSafe = async (
 export const verifyContract = async (
   address,
   contractName,
-  networkName,
+  networkName = network.name,
   proxyName?: string,
   forcedConstructorArguments?: string
 ) => {
-  let networkProvider = network.name.includes("-") ? network.name.split("-")[1] : network.name;
+  let networkProvider = networkName.includes("-") ? networkName.split("-")[1] : "fuse";
   networkProvider = networkProvider === "mainnet" ? "ethereum" : networkProvider;
   console.log("truffle compile...");
   await exec("npx truffle compile");

package/scripts/upgrades/upgradeAdminWallet.ts

@@ -0,0 +1,29 @@
+import { network, ethers } from "hardhat";
+import { Contract } from "ethers";
+
+import { printDeploy, verifyProductionSigner } from "../multichain-deploy/helpers";
+
+import dao from "../../releases/deployment.json";
+import { verifyContract } from "../multichain-deploy/helpers";
+
+let { name: networkName } = network;
+
+export const upgrade = async () => {
+  const isProduction = networkName.includes("production");
+  let [root, ...signers] = await ethers.getSigners();
+
+  if (isProduction) verifyProductionSigner(root);
+
+  let guardian = root;
+  const isCelo = networkName.includes("celo");
+  let release: { [key: string]: any } = dao[networkName];
+
+  const deployed = await ethers.deployContract(isCelo ? "AdminWallet" : "AdminWalletFuse");
+  console.log("new impl:", deployed.address);
+  await verifyContract(deployed.address, isCelo ? "AdminWallet" : "AdminWalletFuse", networkName);
+  const old = await ethers.getContractAt("AdminWallet", release.AdminWallet);
+  await old.upgradeTo(deployed.address).then(printDeploy);
+  await deployed.attach(release.AdminWallet).upgrade().then(printDeploy);
+};
+
+upgrade().catch(console.log);