@gooddollar/goodprotocol 2.0.24 → 2.0.25-beta.1

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

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

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

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

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

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

package/artifacts/contracts/utils/BuyGDClone.sol/BuyGDCloneFactory.dbg.json

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

package/artifacts/contracts/utils/BuyGDClone.sol/DonateGDClone.dbg.json

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

package/artifacts/contracts/utils/BuyGDClone.sol/IQuoterV2.dbg.json

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

package/artifacts/contracts/utils/BuyGDClone.sol/ISwapRouter.dbg.json

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/9d7f65ac9bb3f67e78f5947d61157e8d.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.24",
+  "version": "2.0.25-beta.1",
   "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/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,