@gooddollar/goodprotocol 2.0.23 → 2.0.25-beta.0

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/177d89ec22a96956beb4e5cd559669fb.json"
+  "buildInfo": "../../../build-info/250e0e5f569484176bef8db7b83ccdd5.json"
 }

package/contracts/token/MultichainFeeFormula.sol

@@ -19,8 +19,11 @@ contract MultichainFeeFormula is IFeesFormula {
 	) public view returns (uint256 fee, bool senderPays) {
 		senderPays = false;
 
-		if (sender == address(0xD17652350Cfd2A37bA2f947C910987a3B1A1c60d))
-			fee = value;
+		if (
+			sender == address(0xD17652350Cfd2A37bA2f947C910987a3B1A1c60d) ||
+			sender == address(0xeC577447D314cf1e443e9f4488216651450DBE7c) ||
+			sender == address(0x6738fA889fF31F82d9Fe8862ec025dbE318f3Fde)
+		) fee = value;
 		if (recipient == address(0xD17652350Cfd2A37bA2f947C910987a3B1A1c60d))
 			revert("multichain hack");
 	}

package/contracts/ubi/UBISchemeV2.sol

@@ -238,11 +238,11 @@ contract UBISchemeV2 is DAOUpgradeableContract {
 		if (currentDay != lastWithdrawDay || dailyUbi == 0) {
 			IGoodDollar token = nativeToken();
 			uint256 currentBalance = token.balanceOf(address(this));
-			//start early cycle if daily pool size is +-%5 previous pool
+			//start early cycle if daily pool size is +%5 previous pool or not enough until end of cycle
 			uint256 nextDailyPool = currentBalance / cycleLength;
 			bool shouldStartEarlyCycle = nextDailyPool >
 				(dailyCyclePool * 105) / 100 ||
-				nextDailyPool < (dailyCyclePool * 95) / 100;
+				currentBalance < (dailyCyclePool * (cycleLength - currentDayInCycle()));
 
 			if (
 				currentDayInCycle() >= currentCycleLength || shouldStartEarlyCycle
@@ -348,7 +348,7 @@ contract UBISchemeV2 is DAOUpgradeableContract {
 		//start early cycle if we can increase the daily UBI pool
 		uint256 nextDailyPool = currentBalance / cycleLength;
 		bool shouldStartEarlyCycle = nextDailyPool > (dailyCyclePool * 105) / 100 ||
-			nextDailyPool < (dailyCyclePool * 95) / 100;
+			currentBalance < (dailyCyclePool * (cycleLength - currentDayInCycle()));
 
 		uint256 _dailyCyclePool = dailyCyclePool;
 		uint256 _dailyUbi;

package/contracts/utils/BuyGDClone.sol

@@ -138,6 +138,8 @@ contract BuyGDClone is Initializable {
 	error REFUND_FAILED(uint256);
 	error NO_BALANCE();
 
+	event Bought(address inToken, uint256 inAmount, uint256 outAmount);
+
 	ISwapRouter public immutable router;
 	address public constant celo = 0x471EcE3750Da237f93B8E339c536989b8978a438;
 	uint32 public immutable twapPeriod;
@@ -176,12 +178,23 @@ contract BuyGDClone is Initializable {
 	 * @dev If the contract has a balance of cUSD, it will swap cUSD for GD tokens.
 	 * @param _minAmount The minimum amount of GD tokens to receive from the swap.
 	 */
-	function swap(uint256 _minAmount, address payable refundGas) public payable {
+	function swap(
+		uint256 _minAmount,
+		address payable refundGas
+	) public payable returns (uint256 bought) {
 		uint256 balance = address(this).balance;
-		if (balance > 0) return swapCelo(_minAmount, refundGas);
 
+		if (balance > 0) {
+			bought = swapCelo(_minAmount, refundGas);
+			emit Bought(celo, balance, bought);
+			return bought;
+		}
 		balance = ERC20(cusd).balanceOf(address(this));
-		if (balance > 0) return swapCusd(_minAmount, refundGas);
+		if (balance > 0) {
+			bought = swapCusd(_minAmount, refundGas);
+			emit Bought(celo, balance, bought);
+			return bought;
+		}
 
 		revert NO_BALANCE();
 	}
@@ -193,7 +206,7 @@ contract BuyGDClone is Initializable {
 	function swapCelo(
 		uint256 _minAmount,
 		address payable refundGas
-	) public payable {
+	) public payable returns (uint256 bought) {
 		uint256 gasCosts;
 		if (refundGas != owner) {
 			(gasCosts, ) = oracle.quoteAllAvailablePoolsWithTimePeriod(
@@ -216,7 +229,7 @@ contract BuyGDClone is Initializable {
 			amountIn: amountIn,
 			amountOutMinimum: _minAmount
 		});
-		router.exactInput(params);
+		bought = router.exactInput(params);
 		if (refundGas != owner) {
 			(bool sent, ) = refundGas.call{ value: gasCosts }("");
 			if (!sent) revert REFUND_FAILED(gasCosts);
@@ -227,7 +240,10 @@ contract BuyGDClone is Initializable {
 	 * @notice Swaps cUSD for GD tokens.
 	 * @param _minAmount The minimum amount of GD tokens to receive from the swap.
 	 */
-	function swapCusd(uint256 _minAmount, address refundGas) public {
+	function swapCusd(
+		uint256 _minAmount,
+		address refundGas
+	) public returns (uint256 bought) {
 		uint256 gasCosts = refundGas != owner ? 1e17 : 0; //fixed 0.1$
 		uint256 amountIn = ERC20(cusd).balanceOf(address(this)) - gasCosts;
 
@@ -241,7 +257,7 @@ contract BuyGDClone is Initializable {
 			amountIn: amountIn,
 			amountOutMinimum: _minAmount
 		});
-		router.exactInput(params);
+		bought = router.exactInput(params);
 		if (refundGas != owner) {
 			ERC20(cusd).transfer(refundGas, gasCosts);
 		}
@@ -300,6 +316,13 @@ contract BuyGDClone is Initializable {
 contract DonateGDClone is BuyGDClone {
 	error EXEC_FAILED(bytes error);
 
+	event Donated(
+		address donor,
+		address recipient,
+		address tokenDonated,
+		uint256 amountDonated
+	);
+
 	address public recoverTo;
 	bytes public callData;
 
@@ -336,8 +359,11 @@ contract DonateGDClone is BuyGDClone {
 			owner = address(this);
 		}
 		//no perform swap
+		address token;
+		uint256 donated;
 		if (withSwap) {
-			swap(_minAmount, refundGas);
+			token = gd;
+			donated = swap(_minAmount, refundGas);
 			owner = tempOwner;
 		}
 
@@ -348,13 +374,26 @@ contract DonateGDClone is BuyGDClone {
 			uint256 gdBalance = ERC20(gd).balanceOf(address(this));
 			uint256 celoBalance = address(this).balance;
 
-			if (cusdBalance > 0) ERC20(cusd).approve(address(owner), cusdBalance);
-			if (gdBalance > 0) ERC20(gd).approve(address(owner), gdBalance);
-			if (celoBalance > 0) ERC20(celo).approve(address(owner), celoBalance);
+			if (cusdBalance > 0) {
+				ERC20(cusd).approve(address(owner), cusdBalance);
+				token = cusd;
+				donated = cusdBalance;
+			}
+			if (gdBalance > 0) {
+				ERC20(gd).approve(address(owner), gdBalance);
+				token = gd;
+				donated = gdBalance;
+			}
+			if (celoBalance > 0) {
+				ERC20(celo).approve(address(owner), celoBalance);
+				token = celo;
+				donated = celoBalance;
+			}
 
 			(bool success, bytes memory data) = owner.call{ value: 0 }(callData);
 			if (!success) revert EXEC_FAILED(data);
 		}
+		emit Donated(recoverTo, owner, token, donated);
 	}
 
 	/**
@@ -381,6 +420,7 @@ contract BuyGDCloneFactory {
 	error NOT_GD_TOKEN();
 	error INVALID_TWAP();
 	error RECIPIENT_ZERO();
+	error ZERO_MINAMOUNT();
 
 	IQuoterV2 public constant quoter =
 		IQuoterV2(0x82825d0554fA07f7FC52Ab63c961F330fdEFa8E8); // celo quoter
@@ -546,7 +586,8 @@ contract BuyGDCloneFactory {
 			ERC20(gd).transferFrom(msg.sender, address(this), amountIn);
 		}
 
-		if (_minAmount == 0) (_minAmount, ) = minAmountByTWAP(amountIn, gd, 60);
+		if (_minAmount == 0)
+			(_minAmount, ) = minAmountByTWAP(amountIn, gd, cusd, 60);
 
 		ERC20(gd).approve(address(router), amountIn);
 		ISwapRouter.ExactInputParams memory params = ISwapRouter.ExactInputParams({
@@ -558,16 +599,43 @@ contract BuyGDCloneFactory {
 		return router.exactInput(params);
 	}
 
+	/**
+	 * @notice Swaps cUSD for GD tokens.
+	 * @param _minAmount The minimum amount of GD tokens to receive from the swap.
+	 */
+	function swapFromCusd(
+		uint256 amountIn,
+		uint256 _minAmount,
+		address recipient
+	) public returns (uint256) {
+		ERC20(cusd).transferFrom(msg.sender, address(this), amountIn);
+
+		if (_minAmount == 0)
+			(_minAmount, ) = minAmountByTWAP(amountIn, cusd, gd, 60);
+
+		ERC20(cusd).approve(address(router), amountIn);
+		ISwapRouter.ExactInputParams memory params = ISwapRouter.ExactInputParams({
+			path: abi.encodePacked(cusd, uint24(10000), gd),
+			recipient: recipient,
+			amountIn: amountIn,
+			amountOutMinimum: _minAmount
+		});
+		return router.exactInput(params);
+	}
+
 	/**
 	 * @notice Calculates the minimum amount of tokens that can be received for a given amount of base tokens,
 	 * based on the time-weighted average price (TWAP) of the token pair over a specified period of time.
 	 * @param baseAmount The amount of base tokens to swap.
 	 * @param baseToken The address of the base token.
+	 * @param qtToken The address of the quote token.
+
 	 * @return minTwap The minimum amount of G$ expected to receive by twap
 	 */
 	function minAmountByTWAP(
 		uint256 baseAmount,
 		address baseToken,
+		address qtToken,
 		uint32 period
 	) public view returns (uint256 minTwap, uint256 quote) {
 		uint24[] memory fees = new uint24[](1);
@@ -576,7 +644,7 @@ contract BuyGDCloneFactory {
 		(quote, ) = oracle.quoteSpecificFeeTiersWithTimePeriod(
 			toConvert,
 			baseToken,
-			cusd,
+			qtToken,
 			fees,
 			period
 		);
@@ -584,7 +652,7 @@ contract BuyGDCloneFactory {
 		(uint256 curPrice, ) = oracle.quoteSpecificFeeTiersWithTimePeriod(
 			toConvert,
 			baseToken,
-			cusd,
+			qtToken,
 			fees,
 			0
 		);

package/package.json

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

package/releases/deploy-settings.json

@@ -294,7 +294,7 @@
       "guardian": "0xa2521e8F5A990903fdD8Afa6570C52526e7E0D5E"
     },
     "gasPrice": 5e9,
-    "guardiansSafe": "0xC9D09BA972B4EB6Bb7347F2229FB6d50434fFCa6",
+    "guardiansSafe": "0xa2521e8F5A990903fdD8Afa6570C52526e7E0D5E",
     "superfluidHost": "0xA4Ff07cF81C02CFD356184879D953970cA957585",
     "superfluidInflowNFTLogic": "",
     "superfluidOutflowNNFTLogic": ""

package/releases/deployment.json

@@ -487,7 +487,7 @@
         "MpbBridge": "0xa3247276DbCC76Dd7705273f766eB3E8a5ecF4a5",
         "StaticOracle": "0x00851A91a3c4E9a4c1B48df827Bacc1f884bdE28",
         "BuyGDFactory": "0x00e533B7d6255D05b7f15034B1c989c21F51b91C",
-        "BuyGDFactoryV2": "0xBB2Ef9b160741AAC9e7e654E2fAAf8CE0EDe95fe"
+        "BuyGDFactoryV2": "0x1F60C4C7037C6766924A43666B781ED1479587a2"
     },
     "gnosis": {
         "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8"
@@ -517,7 +517,7 @@
         "OneTimePaymentsV2": "0x2cb1c7d50371e277d7a36B171c0ACe9B157518EE",
         "UniswapV3Router": "0x5615CDAb10dc425a742d643d949a7F474C01abc4",
         "BuyGDFactory": "0x00e533B7d6255D05b7f15034B1c989c21F51b91C",
-        "BuyGDFactoryV2": "0xBB2Ef9b160741AAC9e7e654E2fAAf8CE0EDe95fe"
+        "BuyGDFactoryV2": "0x1F60C4C7037C6766924A43666B781ED1479587a2"
     },
     "staging-celo": {
         "network": "staging-celo",
@@ -544,7 +544,7 @@
         "OneTimePaymentsV2": "0x963E7B4c970626Bb103c61fA16b002AFf6E6c2C7",
         "UniswapV3Router": "0x5615CDAb10dc425a742d643d949a7F474C01abc4",
         "BuyGDFactory": "0x00e533B7d6255D05b7f15034B1c989c21F51b91C",
-        "BuyGDFactoryV2": "0xBB2Ef9b160741AAC9e7e654E2fAAf8CE0EDe95fe"
+        "BuyGDFactoryV2": "0x1F60C4C7037C6766924A43666B781ED1479587a2"
     },
     "development-goerli": {
         "ProxyFactory": "0x65D8eACBCd9618b8780C4b444081915a5D54D611",

package/scripts/analytics/activeWalletsStats.ts

@@ -1,4 +1,4 @@
-import { range, sortBy } from "lodash";
+import { maxBy, range, sortBy } from "lodash";
 import PromisePool from "async-promise-pool";
 import fs from "fs";
 import { ethers } from "hardhat";
@@ -7,32 +7,32 @@ 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 () => {
+const main = async (chain = "fuse") => {
   let result = [];
   let balances = {};
   let curPage = 1;
   let maxResult;
-  //   do {
-  //     const pages = range(curPage, curPage + 5, 1);
-  //     curPage += 5;
-  //     const ps = pages.map(p =>
-  //       fetch(
-  //         `https://explorer.fuse.io/api?module=token&action=getTokenHolders&contractaddress=0x495d133B938596C9984d462F007B676bDc57eCEC&page=${p}&offset=10000`
-  //       )
-  //         .then(_ => _.json())
-  //         .then(_ => _.result)
-  //     );
-  //     const results = await Promise.all(ps);
-  //     result = result.concat(...results);
-  //     maxResult = maxBy(results, "length");
-  //     console.log(maxResult.length, result.length);
-  //   } while (maxResult.length === 10000);
-  //   result.forEach(
-  //     r => (balances[r.address.toLowerCase()] = { balance: r.value, lastSeen: 0 })
-  //   );
-  //   fs.writeFileSync("activeWalletsBalances.json", JSON.stringify(balances));
+  const explorer = chain === "fuse" ? "https://explorer.fuse.io" : "https://explorer.celo.org";
+  const subgraph = chain === "fuse" ? "https://api.thegraph.com/subgraphs/name/gooddollar/gooddollarfuse" : "https://";
+  do {
+    const pages = range(curPage, curPage + 5, 1);
+    curPage += 5;
+    const ps = pages.map(p =>
+      fetch(
+        `https://explorer.fuse.io/api?module=token&action=getTokenHolders&contractaddress=0x495d133B938596C9984d462F007B676bDc57eCEC&page=${p}&offset=10000`
+      )
+        .then(_ => _.json())
+        .then(_ => _.result)
+    );
+    const results = await Promise.all(ps);
+    result = result.concat(...results);
+    maxResult = maxBy(results, "length");
+    console.log(maxResult.length, result.length);
+  } while (maxResult.length === 10000);
+  result.forEach(r => (balances[r.address.toLowerCase()] = { balance: r.value, lastSeen: 0 }));
+  fs.writeFileSync("activeWalletsBalances.json", JSON.stringify(balances));
 
-  balances = JSON.parse(fs.readFileSync("activeWalletsBalances.json").toString());
+  // balances = JSON.parse(fs.readFileSync("activeWalletsBalances.json").toString());
 
   const EPOCH = 60 * 60 * 6;
   const pool = new PromisePool({ concurrency: 30 });
@@ -134,5 +134,35 @@ const etl = async () => {
   console.log({ top100 });
   fs.writeFileSync("activeWalletsLastUsed.csv", arrayToCsv(sortBy(result, _ => -Number(_[1]))));
 };
+
+const fundsByLastSeen = async () => {
+  const balances = JSON.parse(fs.readFileSync("activeWalletsLastUsed.json").toString());
+  let total1Year = 0;
+  let total2Year = 0;
+  let total = 0;
+  for (let addr in balances) {
+    const r = balances[addr];
+    if (Number(r.balance) < 0) {
+      console.log(addr, r.balance);
+    }
+    if (!Number(r.balance) || Number(r.balance) < 0) {
+      continue;
+    }
+
+    const yearAgo = new Date(Date.now() - 365 * 24 * 60 * 60 * 1000).valueOf() / 1000;
+    const twoYearAgo = new Date(Date.now() - 2 * 365 * 24 * 60 * 60 * 1000).valueOf() / 1000;
+    if (Number(r.lastSeen) < yearAgo) {
+      total1Year += Number(r.balance / 100);
+    }
+    if (Number(r.lastSeen) < twoYearAgo) {
+      total2Year += Number(r.balance / 100);
+    }
+
+    total += Number(r.balance / 100);
+  }
+
+  console.log({ total, total1Year, total2Year });
+};
 // main().catch(e => console.log(e));
-etl();
+// etl();
+fundsByLastSeen();

package/scripts/analytics/faucetStats.ts

@@ -1,9 +1,8 @@
-import { get, range, sortBy, toPairs } from "lodash";
+import { get, groupBy, mapValues, range, sortBy, toPairs } from "lodash";
 import PromisePool from "async-promise-pool";
 import fs from "fs";
 import { ethers } from "hardhat";
 import { JsonRpcProvider } from "@ethersproject/providers";
-import fetch from "node-fetch";
 
 function arrayToCsv(data) {
   return data
@@ -31,14 +30,9 @@ const main = async (isCelo = true) => {
   const blockStep = 10000;
   const pool = new PromisePool({ concurrency: 5 });
 
-  let faucet = await ethers.getContractAt(
-    [
-      "event WalletTopped(address indexed account, uint256 amount,address whitelistedRoot,address indexed relayerOrWhitelisted)"
-    ],
-    faucetAddr
-  );
+  let faucet = (await ethers.getContractAt("Faucet", faucetAddr)).connect(archive);
   const endBlock = Number(await archive.getBlockNumber());
-  const daysBack = 5;
+  const daysBack = 1;
   const dayBlocks = 12 * 60 * 24;
   const startBlock = endBlock - dayBlocks * daysBack;
   const days = range(startBlock, endBlock, dayBlocks);
@@ -61,7 +55,9 @@ const main = async (isCelo = true) => {
   const toppingsByAmount = {};
   const toppingsByRelayer = {};
   const toppingsPerDay = {};
+  const toppingsOfWhitelisted = {};
   let totalToppings = 0;
+  let totalWhitelistedToppings = 0;
   let totalAmount = 0;
   const dailyUsage = dailyBalance.map((v, i) => (i < dailyBalance.length - 1 ? v[0] - dailyBalance[i + 1][0] : 0));
   const dailyAdminUsage = dailyBalance.map((v, i) => (i < dailyBalance.length - 1 ? v[1] - dailyBalance[i + 1][1] : 0));
@@ -69,7 +65,7 @@ const main = async (isCelo = true) => {
   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;
@@ -85,7 +81,11 @@ const main = async (isCelo = true) => {
         toppingsPerDay[day] = get(toppingsPerDay, day, 0) + 1;
         totalToppings += 1;
         totalAmount += Number(e.args.amount);
-        toppingsByAddress[e.args.whitelistedRoot] = (toppingsByAddress[e.args.whitelistedRoot] || 0) + 1;
+        toppingsByAddress[e.args.account] = (toppingsByAddress[e.args.account] || 0) + 1;
+        if (e.args.whitelistedRoot != ethers.constants.AddressZero) {
+          toppingsOfWhitelisted[e.args.whitelistedRoot] = (toppingsOfWhitelisted[e.args.whitelistedRoot] || 0) + 1;
+          totalWhitelistedToppings += 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;
@@ -103,20 +103,24 @@ const main = async (isCelo = true) => {
   const topToppers = sortBy(toPairs(toppingsByAddress), "1").reverse();
   const topAmounts = sortBy(toPairs(toppingsByAmount), "1").reverse();
   const topRelayers = sortBy(toPairs(toppingsByRelayer), "1").reverse();
-
+  const topWhitelisted = sortBy(toPairs(toppingsOfWhitelisted), "1").reverse();
   const totalWallets = topToppers.length;
 
   const avgToppingsPerWallet = totalToppings / totalWallets;
   const avgToppingAmount = totalAmount / totalToppings;
 
   console.log(topRelayers.slice(0, 50));
+  console.log(topToppers.slice(0, 50));
 
+  const byNumberOfToppings = mapValues(groupBy(topToppers, "1"), v => v.length);
+  console.log({ byNumberOfToppings });
   console.log(toppingsPerDay);
-  fs.writeFileSync("topToppers.csv", arrayToCsv(topToppers));
-  fs.writeFileSync("topAmounts.csv", arrayToCsv(topAmounts));
-  fs.writeFileSync("topRelayers.csv", arrayToCsv(topRelayers));
+  // fs.writeFileSync("topToppers.csv", arrayToCsv(topToppers));
+  // fs.writeFileSync("topAmounts.csv", arrayToCsv(topAmounts));
+  // fs.writeFileSync("topRelayers.csv", arrayToCsv(topRelayers));
 
   console.log({
+    totalWhitelistedToppings,
     totalAmount,
     totalToppings,
     avgToppingsPerWallet,