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

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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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/477a426513f742b063a1272cb54d7c4c.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);
 		}
 	}
 }

package/contracts/utils/BuyGDClone.sol

@@ -0,0 +1,171 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.8;
+import "@openzeppelin/contracts-upgradeable/proxy/ClonesUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import "../Interfaces.sol";
+
+interface ISwapRouter {
+	struct ExactInputSingleParams {
+		address tokenIn;
+		address tokenOut;
+		uint24 fee;
+		address recipient;
+		uint256 amountIn;
+		uint256 amountOutMinimum;
+		uint160 sqrtPriceLimitX96;
+	}
+
+	/// @notice Swaps `amountIn` of one token for as much as possible of another token
+	/// @dev Setting `amountIn` to 0 will cause the contract to look up its own balance,
+	/// and swap the entire amount, enabling contracts to send tokens before calling this function.
+	/// @param params The parameters necessary for the swap, encoded as `ExactInputSingleParams` in calldata
+	/// @return amountOut The amount of the received token
+	function exactInputSingle(
+		ExactInputSingleParams calldata params
+	) external payable returns (uint256 amountOut);
+
+	struct ExactInputParams {
+		bytes path;
+		address recipient;
+		uint256 amountIn;
+		uint256 amountOutMinimum;
+	}
+
+	/// @notice Swaps `amountIn` of one token for as much as possible of another along the specified path
+	/// @dev Setting `amountIn` to 0 will cause the contract to look up its own balance,
+	/// and swap the entire amount, enabling contracts to send tokens before calling this function.
+	/// @param params The parameters necessary for the multi-hop swap, encoded as `ExactInputParams` in calldata
+	/// @return amountOut The amount of the received token
+	function exactInput(
+		ExactInputParams calldata params
+	) external payable returns (uint256 amountOut);
+
+	struct ExactOutputSingleParams {
+		address tokenIn;
+		address tokenOut;
+		uint24 fee;
+		address recipient;
+		uint256 amountOut;
+		uint256 amountInMaximum;
+		uint160 sqrtPriceLimitX96;
+	}
+
+	/// @notice Swaps as little as possible of one token for `amountOut` of another token
+	/// that may remain in the router after the swap.
+	/// @param params The parameters necessary for the swap, encoded as `ExactOutputSingleParams` in calldata
+	/// @return amountIn The amount of the input token
+	function exactOutputSingle(
+		ExactOutputSingleParams calldata params
+	) external payable returns (uint256 amountIn);
+
+	struct ExactOutputParams {
+		bytes path;
+		address recipient;
+		uint256 amountOut;
+		uint256 amountInMaximum;
+	}
+
+	/// @notice Swaps as little as possible of one token for `amountOut` of another along the specified path (reversed)
+	/// that may remain in the router after the swap.
+	/// @param params The parameters necessary for the multi-hop swap, encoded as `ExactOutputParams` in calldata
+	/// @return amountIn The amount of the input token
+	function exactOutput(
+		ExactOutputParams calldata params
+	) external payable returns (uint256 amountIn);
+}
+
+contract BuyGDClone is Initializable {
+	error NOT_ALLOWED(address);
+	error REFUND_FAILED(uint256);
+
+	ISwapRouter public immutable router;
+	address public constant celo = 0x471EcE3750Da237f93B8E339c536989b8978a438;
+	address public immutable cusd;
+	address public immutable gd;
+
+	address public owner;
+	address public executer;
+
+	receive() external payable {}
+
+	constructor(ISwapRouter _router, address _cusd, address _gd) {
+		router = _router;
+		cusd = _cusd;
+		gd = _gd;
+	}
+
+	function initialize(address _owner, address _executer) external initializer {
+		owner = _owner;
+		executer = _executer;
+	}
+
+	function swap(uint256 _minAmount) external {
+		uint256 gasCosts = msg.sender == owner ? 0 : (block.basefee + 1e9) * 400000;
+		if (msg.sender != owner && msg.sender != executer)
+			revert NOT_ALLOWED(msg.sender);
+		uint256 balance = address(this).balance;
+		ERC20(celo).approve(address(router), balance);
+		ISwapRouter.ExactInputParams memory params = ISwapRouter.ExactInputParams({
+			path: abi.encodePacked(celo, uint24(3000), cusd, uint24(10000), gd),
+			recipient: owner,
+			amountIn: balance - gasCosts,
+			amountOutMinimum: _minAmount
+		});
+		router.exactInput(params);
+		if (msg.sender != owner) {
+			(bool sent, ) = msg.sender.call{ value: gasCosts }("");
+			if (!sent) revert REFUND_FAILED(gasCosts);
+		}
+	}
+
+	function swapCusd(uint256 _minAmount) external {
+		uint256 gasCosts = msg.sender == executer ? 1e17 : 0;
+		if (msg.sender != owner && msg.sender != executer)
+			revert NOT_ALLOWED(msg.sender);
+		uint balance = ERC20(cusd).balanceOf(address(this));
+		ERC20(cusd).approve(address(router), balance);
+		ISwapRouter.ExactInputParams memory params = ISwapRouter.ExactInputParams({
+			path: abi.encodePacked(cusd, uint24(10000), gd),
+			recipient: owner,
+			amountIn: balance - gasCosts,
+			amountOutMinimum: _minAmount
+		});
+		router.exactInput(params);
+		if (msg.sender == executer) {
+			ERC20(cusd).transfer(msg.sender, gasCosts);
+		}
+	}
+
+	function recover(address token) external {
+		if (token == address(0)) {
+			(bool sent, ) = payable(owner).call{ value: address(this).balance }("");
+			if (!sent) revert REFUND_FAILED(address(this).balance);
+		} else ERC20(token).transfer(owner, ERC20(token).balanceOf(address(this)));
+	}
+}
+
+contract BuyGDCloneFactory {
+	address immutable impl;
+
+	constructor(ISwapRouter _router, address _cusd, address _gd) {
+		impl = address(new BuyGDClone(_router, _cusd, _gd));
+	}
+
+	function create(address owner, address executer) external returns (address) {
+		bytes32 salt = keccak256(abi.encode(owner, executer));
+		address clone = ClonesUpgradeable.cloneDeterministic(impl, salt);
+		BuyGDClone(payable(clone)).initialize(owner, executer);
+		return clone;
+	}
+
+	function predict(
+		address owner,
+		address executer
+	) external view returns (address) {
+		bytes32 salt = keccak256(abi.encode(owner, executer));
+
+		return
+			ClonesUpgradeable.predictDeterministicAddress(impl, salt, address(this));
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.7-beta.2",
+  "version": "2.0.7-beta.3",
   "description": "GoodDollar Protocol",
   "engines": {
     "node": "18.x"