@gooddollar/goodprotocol 1.0.3-beta.2 → 1.0.4-beta.0

package/contracts/unaudited-foundation/InvitesV1.sol

@@ -134,13 +134,12 @@ contract InvitesV1 is Initializable {
 	}
 
 	function canCollectBountyFor(address _invitee) public view returns (bool) {
-		User memory user = users[_invitee];
-		User memory inviter = users[user.invitedBy];
-		Level memory level = levels[inviter.level];
+		User storage user = users[_invitee];
+		User storage inviter = users[user.invitedBy];
+		uint256 daysToComplete = levels[inviter.level].daysToComplete;
 		bool isLevelExpired = levelExpirationEnabled == true &&
-			level.daysToComplete > 0 &&
-			level.daysToComplete <
-			user.joinedAt.sub(inviter.levelStarted).div(1 days);
+			daysToComplete > 0 &&
+			daysToComplete < user.joinedAt.sub(inviter.levelStarted).div(1 days);
 
 		return
 			!user.bountyPaid &&
@@ -201,41 +200,44 @@ contract InvitesV1 is Initializable {
 	 */
 	function bountyFor(address _invitee) public isActive {
 		require(canCollectBountyFor(_invitee), "user not elligble for bounty yet");
+		return _bountyFor(_invitee);
+	}
 
-		User storage user = users[_invitee];
-		User storage inviter = users[user.invitedBy];
-		Level memory level = levels[inviter.level];
+	function _bountyFor(address _invitee) internal {
+		address invitedBy = users[_invitee].invitedBy;
+		uint256 joinedAt = users[_invitee].joinedAt;
+		Level memory level = levels[users[invitedBy].level];
 
 		bool isLevelExpired = level.daysToComplete > 0 &&
-			user.joinedAt > inviter.levelStarted && //prevent overflow in subtraction
+			joinedAt > users[invitedBy].levelStarted && //prevent overflow in subtraction
 			level.daysToComplete <
-			user.joinedAt.sub(inviter.levelStarted).div(1 days); //how long after level started did invitee join
+			joinedAt.sub(users[invitedBy].levelStarted).div(1 days); //how long after level started did invitee join
 
-		user.bountyPaid = true;
-		inviter.totalApprovedInvites += 1;
-		inviter.totalEarned += level.bounty;
+		users[_invitee].bountyPaid = true;
+		users[invitedBy].totalApprovedInvites += 1;
+		users[invitedBy].totalEarned += level.bounty;
 		stats.totalApprovedInvites += 1;
 		stats.totalBountiesPaid += level.bounty;
 
 		bool earnedLevel = false;
 		if (
 			level.toNext > 0 &&
-			inviter.totalApprovedInvites >= level.toNext &&
+			users[invitedBy].totalApprovedInvites >= level.toNext &&
 			isLevelExpired == false
 		) {
-			inviter.level += 1;
-			inviter.levelStarted = block.timestamp;
+			users[invitedBy].level += 1;
+			users[invitedBy].levelStarted = block.timestamp;
 			earnedLevel = true;
 		}
 
-		goodDollar.transfer(user.invitedBy, level.bounty);
+		goodDollar.transfer(invitedBy, level.bounty);
 		goodDollar.transfer(_invitee, level.bounty.div(2)); //pay invitee half the bounty
 
 		emit InviterBounty(
-			user.invitedBy,
+			invitedBy,
 			_invitee,
 			level.bounty,
-			inviter.level,
+			users[invitedBy].level,
 			earnedLevel
 		);
 	}
@@ -247,10 +249,12 @@ contract InvitesV1 is Initializable {
 		User storage inviter = users[msg.sender];
 
 		for (uint256 i = 0; i < inviter.pending.length; i++) {
-			if (canCollectBountyFor(inviter.pending[i])) {
-				bountyFor(inviter.pending[i]);
+			if (gasleft() < 340000) return;
+			address pending = inviter.pending[i];
+			if (canCollectBountyFor(pending)) {
+				_bountyFor(pending);
 			}
-			if (users[inviter.pending[i]].bountyPaid) {
+			if (users[pending].bountyPaid) {
 				//if still elements in array move last item to current position
 				if (inviter.pending.length - 1 > i) {
 					inviter.pending[i] = inviter.pending[inviter.pending.length - 1];
@@ -292,8 +296,9 @@ contract InvitesV1 is Initializable {
 	 * @dev
 	 * 1.2.0 - final changes before release
 	 * 1.3.0 - allow to set inviter later
+	 * 1.4.0 - improve gas for bounty collection
 	 */
 	function version() public pure returns (string memory) {
-		return "1.3.0";
+		return "1.4.0";
 	}
 }

package/hardhat.config.ts

@@ -103,7 +103,9 @@ const hhconfig: HardhatUserConfig = {
     fuse: {
       accounts: { mnemonic },
       url: "https://rpc.fuse.io/",
-      chainId: 122
+      chainId: 122,
+      gas: 6000000,
+      gasPrice: 1000000000
     },
     fusespark: {
       accounts: { mnemonic },
@@ -115,7 +117,8 @@ const hhconfig: HardhatUserConfig = {
     "fuse-mainnet": {
       accounts: { mnemonic },
       url: "https://ropsten.infura.io/v3/" + infura_api,
-
+      gasPrice: 20000000000,
+      gas: 5000000,
       chainId: 3
     },
     staging: {
@@ -141,7 +144,7 @@ const hhconfig: HardhatUserConfig = {
       accounts: [deployerPrivateKey],
       url: "https://mainnet.infura.io/v3/" + infura_api,
       gas: 3000000,
-      gasPrice: 25000000000,
+      gasPrice: 50000000000,
       chainId: 1
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "1.0.3-beta.2",
+  "version": "1.0.4-beta.0",
   "description": "GoodDollar Protocol",
   "scripts": {
     "build": "scripts/build.sh deploy",
@@ -60,6 +60,7 @@
     "ethers-multicall": "^0.2.1",
     "openzeppelin-solidity": "^4.3.2",
     "patch-package": "latest",
+    "press-any-key": "^0.1.1",
     "truffle-plugin-verify": "^0.5.11",
     "truffle-source-verify": "^0.0.6"
   },

package/releases/deployment.json

@@ -120,30 +120,30 @@
         "UniswapV2SwapHelper": "0x7D7200b2b049BB3d91bCbdf95eC0EE6c2b5f8b7E"
     },
     "fuse": {
-        "NameService": "0xE2CeeFB08f6729D8Ef764658750ce412B391a900",
-        "GReputation": "0x9F4362beB6e6a464192154926Dd7CeA0F2780277",
-        "FirstClaimPool": "0x6CF223eE3c5f95CF97065de35757247E04EaaAe3",
-        "CompoundVotingMachine": "0x7783c57c7ECa8571733Ae5b8484c756cB0CCD883",
-        "ClaimersDistribution": "0xe0f7A939cDc8750b6ebf94526396e3b62BEF2634",
-        "GovernanceStaking": "0x9b1d581bdC3491979B185dA8ee98Fc29Be3c64fd",
-        "UBIScheme": "0xec97ee6d70C626044224998192B96fEF05949De1",
-        "ProtocolUpgradeFuse": "0xd47F223FfB6a3c08ECf01158C5D5696420F6c293",
-        "Identity": "0x30e1403C075dB97fD9FE02b114cEbea5acce38b7",
-        "GoodDollar": "0xeE724540706296ebad65aeA2515Efe0949F97Ae6",
-        "Controller": "0x903a6Ba8b5A43FBd34a511fB5Cf193CE8dc8907B",
-        "Avatar": "0x07B41192DD74172576a443C7B28DDC3dC2CE3074",
-        "HomeBridge": "0x628980264f86b20BbF4181f55a35602fEe6B4E6F",
-        "FuseFaucet": "0xEEcc2620fb1EaC08Af5923B4D1D54d4703FBb29B",
-        "ProxyAdmin": "0xA74F8Ca91bA870608A909A9685e4a984Bbc068b5",
-        "Invites": "0x4218263062854C3953EF61699a85231b524A896a",
-        "ProxyAdmin2": "0x97429324686d39B424bC2d3228478280B46080Ed",
-        "UBI": "0xCC9B1382b0Ae9D80E81eCB1863DcE8685a044603",
-        "SignupBonus": "0xcdC704D3dEA0FcFD1Cae95dfdCB7883632E171b2",
-        "OneTimePayments": "0x94079dF920115c5296Cc06AE6D8F29E077906246",
-        "AdminWallet": "0xf61e08a98B446856eE3fbD6597D3698a1a138565",
+        "NameService": "0x27E3B64C671a25c191535743d63Bd06CB9B93E37",
+        "GReputation": "0xdFF4cE07253b2c3fa9dCEC8B918f91d150AC26a4",
+        "FirstClaimPool": "0x5E8732889f2d84c3D834223c38361B38D7D4B9bc",
+        "CompoundVotingMachine": "0xb9978C071f2F64016A2f8515BC03bd25684201aF",
+        "ClaimersDistribution": "0xEaDa76013C87C22843b907Ce0110ea55C8E7E2a0",
+        "GovernanceStaking": "0xe3E75Ee6895F8b30d8eC3260dAa20ec1aba6DA77",
+        "UBIScheme": "0x3bdeB796950301FfC9568fAF89B7370f8B217321",
+        "ProtocolUpgradeFuse": "0x4dB8602482576321F829baa593150393f7595439",
+        "Identity": "0x7ccF1011610138b484fCc921858e7971342d213c",
+        "GoodDollar": "0x79BeecC4b165Ccf547662cB4f7C0e83b3796E5b3",
+        "Controller": "0xb453024495525908E6cC1e3C115f4B6B30cc56b9",
+        "Avatar": "0x71ddE7b8362724bd65D88Fe29d42636a9F8f9064",
+        "HomeBridge": "0xb0aD96B62567Ebcb1660e2Af5755A11B42b3Ade5",
+        "FuseFaucet": "0x09Ad3430D146aa662eA8c20cBEBceBC0bbB3FB0a",
+        "Invites": "0x187fc9fB37DF0fbf75149913a97B17c968Fc90d0",
+        "OneTimePayments": "0x184C1F83b3eB75a2dac483D4a6b9FBD59Df961f8",
+        "AdminWallet": "0x14204288286823042263156146334B1a4d61227c",
         "network": "fuse",
         "networkId": 122,
-        "ProxyFactory": "0x86119f44AEbA334eDef64cc23D8b34188088D977"
+        "ProxyFactory": "0x4136dfD47F47792fC820E2354e9F0ce8e9c586A6",
+        "BancorFormula": "0x88e111b2A42457655A34896E5B929a75E7B82F88",
+        "DAI": "0x0000000000000000000000000000000000000000",
+        "cDAI": "0x0000000000000000000000000000000000000000",
+        "COMP": "0x0000000000000000000000000000000000000000"
     },
     "fuse-mainnet": {
         "NameService": "0x5e8bF25c75787e9fa17e2321266b0cbE95c830d0",
@@ -365,7 +365,7 @@
         "ProxyFactory": "0x4659176E962763e7C8A4eF965ecfD0fdf9f52057",
         "NameService": "0xe26867DDd22F9342d9F0D566D182f2c960683971",
         "GReputation": "0x3A9299BE789ac3730e4E4c49d6d2Ad1b8BC34DFf",
-        "CompoundVotingMachine": "0xd356358f2da1018a3733a304E9bb39CF7ED51059",
+        "CompoundVotingMachine": "0xc2Ff55b896e3c42f9e1c2f7467C51b93F1C23dFD",
         "ClaimersDistribution": "0xF34552F1583c0B981dbB09611128c3375b47182e",
         "GovernanceStaking": "0xFAF457Fb4A978Be059506F6CD41f9B30fCa753b0",
         "UBIScheme": "0x87d77A30a6819860eB8332D293810ed7b510035A",
@@ -390,7 +390,7 @@
         "ProxyFactory": "0x4659176E962763e7C8A4eF965ecfD0fdf9f52057",
         "NameService": "0xe26867DDd22F9342d9F0D566D182f2c960683971",
         "GReputation": "0x3A9299BE789ac3730e4E4c49d6d2Ad1b8BC34DFf",
-        "CompoundVotingMachine": "0xd356358f2da1018a3733a304E9bb39CF7ED51059",
+        "CompoundVotingMachine": "0xc2Ff55b896e3c42f9e1c2f7467C51b93F1C23dFD",
         "GoodMarketMaker": "0x30D37B05cF73Edd8c59ce8450F093f6C06dA9272",
         "GoodReserveCDai": "0x6C35677206ae7FF1bf753877649cF57cC30D1c42",
         "ExchangeHelper": "0x0a8c6bB832801454F6CC21761D0A293Caa003296",