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

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

@@ -0,0 +1,205 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "ISwapRouter",
+  "sourceName": "contracts/utils/BuyGDClone.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "components": [
+            {
+              "internalType": "bytes",
+              "name": "path",
+              "type": "bytes"
+            },
+            {
+              "internalType": "address",
+              "name": "recipient",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "amountIn",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "amountOutMinimum",
+              "type": "uint256"
+            }
+          ],
+          "internalType": "struct ISwapRouter.ExactInputParams",
+          "name": "params",
+          "type": "tuple"
+        }
+      ],
+      "name": "exactInput",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "amountOut",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "payable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "components": [
+            {
+              "internalType": "address",
+              "name": "tokenIn",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "tokenOut",
+              "type": "address"
+            },
+            {
+              "internalType": "uint24",
+              "name": "fee",
+              "type": "uint24"
+            },
+            {
+              "internalType": "address",
+              "name": "recipient",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "amountIn",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "amountOutMinimum",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint160",
+              "name": "sqrtPriceLimitX96",
+              "type": "uint160"
+            }
+          ],
+          "internalType": "struct ISwapRouter.ExactInputSingleParams",
+          "name": "params",
+          "type": "tuple"
+        }
+      ],
+      "name": "exactInputSingle",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "amountOut",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "payable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "components": [
+            {
+              "internalType": "bytes",
+              "name": "path",
+              "type": "bytes"
+            },
+            {
+              "internalType": "address",
+              "name": "recipient",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "amountOut",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "amountInMaximum",
+              "type": "uint256"
+            }
+          ],
+          "internalType": "struct ISwapRouter.ExactOutputParams",
+          "name": "params",
+          "type": "tuple"
+        }
+      ],
+      "name": "exactOutput",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "amountIn",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "payable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "components": [
+            {
+              "internalType": "address",
+              "name": "tokenIn",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "tokenOut",
+              "type": "address"
+            },
+            {
+              "internalType": "uint24",
+              "name": "fee",
+              "type": "uint24"
+            },
+            {
+              "internalType": "address",
+              "name": "recipient",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "amountOut",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "amountInMaximum",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint160",
+              "name": "sqrtPriceLimitX96",
+              "type": "uint160"
+            }
+          ],
+          "internalType": "struct ISwapRouter.ExactOutputSingleParams",
+          "name": "params",
+          "type": "tuple"
+        }
+      ],
+      "name": "exactOutputSingle",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "amountIn",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "payable",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x",
+  "deployedBytecode": "0x",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
+  "buildInfo": "../../../build-info/0b1ffe2adf61568ecaaa5a3571f228a2.json"
 }

package/contracts/invite/InvitesFuseV2.sol

@@ -272,11 +272,13 @@ contract InvitesFuseV2 is Initializable {
 	function collectBounties() public isActive {
 		address[] storage pendings = users[msg.sender].pending;
 		uint256 totalBounties = 0;
-		for (int256 i = int256(pendings.length) - 1; i >= 0; i--) {
-			if (gasleft() < 185000) break; // leave enough gas for the token transfer around 150k if we are using supertoken
-			address pending = pendings[uint256(i)];
+		for (uint256 i = pendings.length; i > 0; i--) {
+			if (gasleft() < 120000) break; // leave enough gas for the inviter transfer around 120k
+			address pending = pendings[i - 1];
 			if (canCollectBountyFor(pending)) {
+				if (gasleft() < 240000) break; // leave enough gas for the invitee+inviter transfer around 120k
 				totalBounties += _bountyFor(pending, false);
+				pendings[i - 1] = pendings[pendings.length - 1];
 				pendings.pop();
 			}
 		}

package/contracts/invite/InvitesV2.sol

@@ -278,11 +278,13 @@ contract InvitesV2 is DAOUpgradeableContract {
 	function collectBounties() public isActive {
 		address[] storage pendings = users[msg.sender].pending;
 		uint256 totalBounties = 0;
-		for (int256 i = int256(pendings.length) - 1; i >= 0; i--) {
-			if (gasleft() < 185000) break; // leave enough gas for the token transfer around 150k if we are using supertoken
-			address pending = pendings[uint256(i)];
+		for (uint256 i = pendings.length; i > 0; i--) {
+			if (gasleft() < 185000) break; // leave enough gas for the inviter transfer around 150k each if we are using supertoken
+			address pending = pendings[i - 1];
 			if (canCollectBountyFor(pending)) {
+				if (gasleft() < 300000) break; // leave enough gas for the invitee+inviter transfer around 150k each if we are using supertoken
 				totalBounties += _bountyFor(pending, false);
+				pendings[i - 1] = pendings[pendings.length - 1];
 				pendings.pop();
 			}
 		}

package/contracts/reserve/DistributionHelper.sol

@@ -22,7 +22,8 @@ contract DistributionHelper is
 	enum TransferType {
 		FuseBridge,
 		MultichainBridge,
-		Contract
+		TransferAndCall,
+		Transfer
 	}
 
 	struct DistributionRecipient {
@@ -94,10 +95,9 @@ contract DistributionHelper is
 	 * @notice add or update a recipient details, if address exists it will update, otherwise add
 	 * to "remove" set recipient bps to 0. only ADMIN_ROLE can call this.
 	 */
-	function addOrUpdateRecipient(DistributionRecipient memory _recipient)
-		external
-		onlyRole(DEFAULT_ADMIN_ROLE)
-	{
+	function addOrUpdateRecipient(
+		DistributionRecipient memory _recipient
+	) external onlyRole(DEFAULT_ADMIN_ROLE) {
 		// console.log("addOrUpdate addr: %s", _recipient.addr);
 		for (uint256 i = 0; i < distributionRecipients.length; i++) {
 			// console.log(
@@ -122,9 +122,10 @@ contract DistributionHelper is
 	 * @param _recipient data about the recipient
 	 * @param _amount how much to send
 	 */
-	function distribute(DistributionRecipient storage _recipient, uint256 _amount)
-		internal
-	{
+	function distribute(
+		DistributionRecipient storage _recipient,
+		uint256 _amount
+	) internal {
 		if (_recipient.transferType == TransferType.FuseBridge) {
 			nativeToken().transferAndCall(
 				fuseBridge,
@@ -139,8 +140,10 @@ contract DistributionHelper is
 				_amount,
 				_recipient.chainId
 			);
-		} else if (_recipient.transferType == TransferType.Contract) {
+		} else if (_recipient.transferType == TransferType.TransferAndCall) {
 			nativeToken().transferAndCall(_recipient.addr, _amount, "");
+		} else if (_recipient.transferType == TransferType.Transfer) {
+			nativeToken().transfer(_recipient.addr, _amount);
 		}
 	}
 }