@gooddollar/goodprotocol 2.0.25-beta.2 → 2.0.25-beta.4

package/contracts/invite/InvitesV2.sol

@@ -57,6 +57,8 @@ contract InvitesV2 is DAOUpgradeableContract {
 
 	bool public levelExpirationEnabled;
 
+	bytes32 private campaignCode;
+
 	event InviteeJoined(address indexed inviter, address indexed invitee);
 	event InviterBounty(
 		address indexed inviter,
@@ -125,8 +127,10 @@ contract InvitesV2 is DAOUpgradeableContract {
 		address inviter = codeToUser[_inviterCode];
 		//allow user to set inviter if doesnt have one
 		require(
-			user.inviteCode == 0x0 ||
-				(user.invitedBy == address(0) && inviter != address(0)),
+			!user.bountyPaid &&
+				(user.inviteCode == 0x0 ||
+					(user.invitedBy == address(0) && inviter != address(0)) ||
+					(campaignCode != 0x0 && campaignCode == _inviterCode)),
 			"user already joined"
 		);
 		if (user.inviteCode == 0x0) {
@@ -144,6 +148,11 @@ contract InvitesV2 is DAOUpgradeableContract {
 			user.bountyAtJoin = levels[users[inviter].level].bounty;
 		}
 
+		/** support special campaign code without inviter */
+		if (_inviterCode == campaignCode && campaignCode != 0x0) {
+			user.bountyAtJoin = levels[0].bounty;
+		}
+
 		if (canCollectBountyFor(msg.sender)) {
 			_bountyFor(msg.sender, true);
 		}
@@ -165,19 +174,13 @@ contract InvitesV2 is DAOUpgradeableContract {
 
 	function canCollectBountyFor(address _invitee) public view returns (bool) {
 		address invitedBy = users[_invitee].invitedBy;
-		uint256 daysToComplete = levels[users[invitedBy].level].daysToComplete;
-		bool isLevelExpired = levelExpirationEnabled == true &&
-			daysToComplete > 0 &&
-			daysToComplete <
-			(users[_invitee].joinedAt - users[invitedBy].levelStarted) / 1 days;
 
 		return
-			invitedBy != address(0) &&
+			users[_invitee].bountyAtJoin > 0 &&
 			!users[_invitee].bountyPaid &&
 			getIdentity().isWhitelisted(_invitee) &&
-			getIdentity().isWhitelisted(invitedBy) &&
-			_whitelistedOnChainOrDefault(_invitee) == _chainId() &&
-			isLevelExpired == false;
+			(invitedBy == address(0) || getIdentity().isWhitelisted(invitedBy)) &&
+			_whitelistedOnChainOrDefault(_invitee) == _chainId();
 	}
 
 	function getInvitees(
@@ -237,44 +240,51 @@ contract InvitesV2 is DAOUpgradeableContract {
 		bool isSingleBounty
 	) internal returns (uint256 bounty) {
 		address invitedBy = users[_invitee].invitedBy;
-		uint256 joinedAt = users[_invitee].joinedAt;
-		Level memory level = levels[users[invitedBy].level];
 		uint256 bountyToPay = users[_invitee].bountyAtJoin;
+		bool earnedLevel = false;
 
-		//hardcoded for users invited before the bountyAtJoin change
-		if (bountyToPay == 0) {
-			uint precision = 10 ** goodDollar.decimals();
-			bountyToPay = joinedAt > 1687878272 ? 1000 * precision : 500 * precision;
-		}
+		if (invitedBy != address(0)) {
+			uint256 joinedAt = users[_invitee].joinedAt;
+			Level memory level = levels[users[invitedBy].level];
 
-		// if inviter level is now higher than when invitee joined or the base level has changed
-		// we give level bounty if it is higher otherwise the original bounty at the time the user registered
+			//hardcoded for users invited before the bountyAtJoin change
+			if (bountyToPay == 0) {
+				uint precision = 10 ** goodDollar.decimals();
+				bountyToPay = joinedAt > 1687878272
+					? 1000 * precision
+					: 500 * precision;
+			}
+
+			// if inviter level is now higher than when invitee joined or the base level has changed
+			// we give level bounty if it is higher otherwise the original bounty at the time the user registered
 
-		bountyToPay = level.bounty > bountyToPay ? level.bounty : bountyToPay;
+			bountyToPay = level.bounty > bountyToPay ? level.bounty : bountyToPay;
 
-		bool isLevelExpired = level.daysToComplete > 0 &&
-			joinedAt > users[invitedBy].levelStarted && //prevent overflow in subtraction
-			level.daysToComplete <
-			(joinedAt - users[invitedBy].levelStarted) / 1 days; //how long after level started did invitee join
+			bool isLevelExpired = level.daysToComplete > 0 &&
+				joinedAt > users[invitedBy].levelStarted && //prevent overflow in subtraction
+				level.daysToComplete <
+				(joinedAt - users[invitedBy].levelStarted) / 1 days; //how long after level started did invitee join
+
+			users[invitedBy].totalApprovedInvites += 1;
+			users[invitedBy].totalEarned += bountyToPay;
+
+			if (
+				level.toNext > 0 &&
+				users[invitedBy].totalApprovedInvites >= level.toNext &&
+				isLevelExpired == false
+			) {
+				users[invitedBy].level += 1;
+				users[invitedBy].levelStarted = block.timestamp;
+				earnedLevel = true;
+			}
+
+			if (isSingleBounty) goodDollar.transfer(invitedBy, bountyToPay);
+		}
 
 		users[_invitee].bountyPaid = true;
-		users[invitedBy].totalApprovedInvites += 1;
-		users[invitedBy].totalEarned += bountyToPay;
 		stats.totalApprovedInvites += 1;
 		stats.totalBountiesPaid += bountyToPay;
 
-		bool earnedLevel = false;
-		if (
-			level.toNext > 0 &&
-			users[invitedBy].totalApprovedInvites >= level.toNext &&
-			isLevelExpired == false
-		) {
-			users[invitedBy].level += 1;
-			users[invitedBy].levelStarted = block.timestamp;
-			earnedLevel = true;
-		}
-
-		if (isSingleBounty) goodDollar.transfer(invitedBy, bountyToPay);
 		goodDollar.transfer(_invitee, bountyToPay / 2); //pay invitee half the bounty
 		emit InviterBounty(
 			invitedBy,
@@ -322,6 +332,10 @@ contract InvitesV2 is DAOUpgradeableContract {
 		active = _active;
 	}
 
+	function setCampaignCode(bytes32 _code) public ownerOrAvatar {
+		campaignCode = _code;
+	}
+
 	function end() public ownerOrAvatar isActive {
 		uint256 gdBalance = goodDollar.balanceOf(address(this));
 		goodDollar.transfer(msg.sender, gdBalance);
@@ -346,8 +360,9 @@ contract InvitesV2 is DAOUpgradeableContract {
 	 * 2 uses uups upgradeable - not compatible upgrade for v1
 	 * 2.1 prevent multichain claims
 	 * 2.2 record bounty at join time
+	 * 2.3 support campaignCode
 	 */
 	function version() public pure returns (string memory) {
-		return "2.2";
+		return "2.3";
 	}
 }

package/package.json

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

package/scripts/analytics/activeWalletsStats.ts

@@ -8,31 +8,10 @@ import { ethers } from "hardhat";
  * can be used to create stats about active users and how much G$ isnt active
  */
 const main = async (chain = "fuse") => {
-  let result = [];
-  let balances = {};
-  let curPage = 1;
-  let maxResult;
   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());
+  const balances = await getFuseBalances();
 
   const EPOCH = 60 * 60 * 6;
   const pool = new PromisePool({ concurrency: 30 });
@@ -92,22 +71,21 @@ const main = async (chain = "fuse") => {
   //   console.log({ lastUsed });
 };
 
+/** Convert a 2D array into a CSV string
+ */
+function arrayToCsv(data) {
+  return data
+    .map(
+      row =>
+        row
+          .map(String) // convert every value to String
+          .map(v => v.replaceAll('"', '""')) // escape double colons
+          .map(v => `"${v}"`) // quote it
+          .join(",") // comma-separated
+    )
+    .join("\r\n"); // rows starting on new lines
+}
 const etl = async () => {
-  /** Convert a 2D array into a CSV string
-   */
-  function arrayToCsv(data) {
-    return data
-      .map(
-        row =>
-          row
-            .map(String) // convert every value to String
-            .map(v => v.replaceAll('"', '""')) // escape double colons
-            .map(v => `"${v}"`) // quote it
-            .join(",") // comma-separated
-      )
-      .join("\r\n"); // rows starting on new lines
-  }
-
   const balances = JSON.parse(fs.readFileSync("activeWalletsLastUsed.json").toString());
 
   let result = [];
@@ -135,6 +113,40 @@ const etl = async () => {
   fs.writeFileSync("activeWalletsLastUsed.csv", arrayToCsv(sortBy(result, _ => -Number(_[1]))));
 };
 
+const getFuseBalances = async (refetch = true) => {
+  if (refetch === false) {
+    const balances = JSON.parse(fs.readFileSync("activeWalletsBalances.json").toString());
+    const rows = Object.entries(balances).filter(_ => Number(_[1].balance) > 10000000);
+    const sorted = sortBy(rows, _ => -Number(_[1].balance));
+    sorted.forEach(_ => (_[1].balance = Number(_[1].balance) / 100));
+    console.log(arrayToCsv(sorted.slice(0, 20).map(_ => [_[0], _[1].balance])));
+    return balances;
+  }
+  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));
+  return balances;
+};
+
 const fundsByLastSeen = async () => {
   const balances = JSON.parse(fs.readFileSync("activeWalletsLastUsed.json").toString());
   let total1Year = 0;
@@ -163,6 +175,7 @@ const fundsByLastSeen = async () => {
 
   console.log({ total, total1Year, total2Year });
 };
+getFuseBalances(false).catch(e => console.log(e));
 // main().catch(e => console.log(e));
 // etl();
-fundsByLastSeen();
+// fundsByLastSeen();