@gooddollar/goodprotocol 2.0.25-beta.1 → 2.0.25-beta.3

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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,7 +148,12 @@ contract InvitesV2 is DAOUpgradeableContract {
 			user.bountyAtJoin = levels[users[inviter].level].bounty;
 		}
 
-		if (canCollectBountyFor(msg.sender)) {
+		/** support special campaign code without inviter */
+		if (_inviterCode == campaignCode && campaignCode != 0x0) {
+			stats.totalInvited += 1;
+			user.bountyAtJoin = levels[0].bounty;
+			_bountyForCampaign(msg.sender);
+		} else if (canCollectBountyFor(msg.sender)) {
 			_bountyFor(msg.sender, true);
 		}
 		emit InviteeJoined(inviter, msg.sender);
@@ -287,6 +296,29 @@ contract InvitesV2 is DAOUpgradeableContract {
 		return bountyToPay;
 	}
 
+	function _bountyForCampaign(
+		address _invitee
+	) internal returns (uint256 bounty) {
+		require(
+			!users[_invitee].bountyPaid &&
+				getIdentity().isWhitelisted(_invitee) &&
+				_whitelistedOnChainOrDefault(_invitee) == _chainId(),
+			"not eligble"
+		);
+
+		uint256 joinedAt = users[_invitee].joinedAt;
+		uint256 bountyToPay = users[_invitee].bountyAtJoin;
+
+		users[_invitee].bountyPaid = true;
+		stats.totalApprovedInvites += 1;
+		stats.totalBountiesPaid += bountyToPay;
+
+		goodDollar.transfer(_invitee, bountyToPay); //pay invitee half the bounty
+		emit InviterBounty(address(0), _invitee, bountyToPay, 0, false);
+
+		return bountyToPay;
+	}
+
 	/**
      @dev collect bounties for invitees by msg.sender that are now whitelisted
      */
@@ -322,6 +354,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 +382,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/contracts/staking/FuseStakingV3.sol

@@ -103,7 +103,7 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 		validators.push(address(0xcb876A393F05a6677a8a029f1C6D7603B416C0A6));
 		stakeBackRatio = 33333; //%33
 		communityPoolRatio = 33333; //%33
-		maxSlippageRatio = 3000; //3%
+		maxSlippageRatio = 600; //0.6%
 		keeperFeeRatio = 30; //0.03%
 		RATIO_BASE = 100000; //100%
 		uniswap = Uniswap(
@@ -146,10 +146,12 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 
 	function updateSettings(
 		uint256 _stakeBackRatio,
-		uint256 _communityPoolRatio
+		uint256 _communityPoolRatio,
+		uint256 _maxSlippageRatio
 	) external onlyGuardian {
 		communityPoolRatio = _communityPoolRatio;
 		stakeBackRatio = _stakeBackRatio;
+		maxSlippageRatio = _maxSlippageRatio;
 	}
 
 	function stake() public payable returns (bool) {

package/dist/test-sdk/deploySuperGoodDollar.js

@@ -31,7 +31,7 @@ const deploySuperGoodDollar = async (signer, sfContracts, tokenArgs = []) => {
     const initializeArgs = [
         "GoodDollar",
         "G$",
-        0,
+        0, // cap
         FeeFormula.address,
         idProxy.address,
         hardhat_1.ethers.constants.AddressZero,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.25-beta.1",
+  "version": "2.0.25-beta.3",
   "description": "GoodDollar Protocol",
   "engines": {
     "node": ">=16.x"
@@ -106,6 +106,7 @@
     "chai": "*",
     "coveralls": "*",
     "dotenv": "*",
+    "ethereum-block-by-date": "^1.4.9",
     "ethereum-waffle": "3",
     "ethers": "^5.7.2",
     "ethers-eip712": "*",
@@ -132,7 +133,7 @@
     "ts-generator": "^0.1.1",
     "ts-node": "^10.9.1",
     "typechain": "^8.3.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   },
   "packageManager": "yarn@3.6.0",
   "resolutions": {

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();