@gooddollar/goodprotocol 2.0.10 → 2.0.12

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5377682aef8e23263485d4b473c2ff7d.json"
+  "buildInfo": "../../../build-info/d308c8e08310937e3b977036ce06818f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5377682aef8e23263485d4b473c2ff7d.json"
+  "buildInfo": "../../../build-info/d308c8e08310937e3b977036ce06818f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5377682aef8e23263485d4b473c2ff7d.json"
+  "buildInfo": "../../../build-info/d308c8e08310937e3b977036ce06818f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5377682aef8e23263485d4b473c2ff7d.json"
+  "buildInfo": "../../../build-info/d308c8e08310937e3b977036ce06818f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5377682aef8e23263485d4b473c2ff7d.json"
+  "buildInfo": "../../../build-info/d308c8e08310937e3b977036ce06818f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5377682aef8e23263485d4b473c2ff7d.json"
+  "buildInfo": "../../../build-info/d308c8e08310937e3b977036ce06818f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5377682aef8e23263485d4b473c2ff7d.json"
+  "buildInfo": "../../../build-info/d308c8e08310937e3b977036ce06818f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5377682aef8e23263485d4b473c2ff7d.json"
+  "buildInfo": "../../../build-info/d308c8e08310937e3b977036ce06818f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5377682aef8e23263485d4b473c2ff7d.json"
+  "buildInfo": "../../../build-info/d308c8e08310937e3b977036ce06818f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5377682aef8e23263485d4b473c2ff7d.json"
+  "buildInfo": "../../../build-info/d308c8e08310937e3b977036ce06818f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5377682aef8e23263485d4b473c2ff7d.json"
+  "buildInfo": "../../../build-info/d308c8e08310937e3b977036ce06818f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5377682aef8e23263485d4b473c2ff7d.json"
+  "buildInfo": "../../../build-info/d308c8e08310937e3b977036ce06818f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5377682aef8e23263485d4b473c2ff7d.json"
+  "buildInfo": "../../../build-info/d308c8e08310937e3b977036ce06818f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5377682aef8e23263485d4b473c2ff7d.json"
+  "buildInfo": "../../../build-info/d308c8e08310937e3b977036ce06818f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5377682aef8e23263485d4b473c2ff7d.json"
+  "buildInfo": "../../../build-info/d308c8e08310937e3b977036ce06818f.json"
 }

package/contracts/staking/FuseStakingV3.sol

@@ -24,17 +24,16 @@ interface IConsensus {
 	 */
 	function withdraw(address _validator, uint256 _amount) external;
 
-	function delegatedAmount(address _address, address _validator)
-		external
-		view
-		returns (uint256);
+	function delegatedAmount(
+		address _address,
+		address _validator
+	) external view returns (uint256);
 
 	function stakeAmount(address _address) external view returns (uint256);
 
-	function delegators(address _validator)
-		external
-		view
-		returns (address[] memory);
+	function delegators(
+		address _validator
+	) external view returns (address[] memory);
 }
 
 interface PegSwap {
@@ -44,11 +43,7 @@ interface PegSwap {
 	 * @param source the token that is being given
 	 * @param target the token that is being taken
 	 */
-	function swap(
-		uint256 sourceAmount,
-		address source,
-		address target
-	) external;
+	function swap(uint256 sourceAmount, address source, address target) external;
 }
 
 contract FuseStakingV3 is Initializable, OwnableUpgradeable {
@@ -84,6 +79,10 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 
 	PegSwap pegSwap;
 
+	address payable public gasFaucet;
+	address payable public communityPool;
+	uint256 public lastFaucetBalance;
+
 	event UBICollected(
 		uint256 indexed currentDay,
 		uint256 ubi, //G$ sent to ubischeme
@@ -131,6 +130,11 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 		_;
 	}
 
+	function upgrade() external onlyGuardian {
+		gasFaucet = payable(0x01ab5966C1d742Ae0CFF7f14cC0F4D85156e83d9);
+		communityPool = payable(0xCe69892CbDA078BbFAA3E5aE7A4b4d2Bf3E5c412);
+	}
+
 	function approve() external {
 		cERC20(fUSD).approve(address(pegSwap), type(uint256).max);
 		cERC20(USDC).approve(address(uniswap), type(uint256).max);
@@ -140,16 +144,21 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 		ubischeme = UBIScheme(_ubischeme);
 	}
 
+	function updateSettings(
+		uint256 _stakeBackRatio,
+		uint256 _communityPoolRatio
+	) external onlyGuardian {
+		communityPoolRatio = _communityPoolRatio;
+		stakeBackRatio = _stakeBackRatio;
+	}
+
 	function stake() public payable returns (bool) {
 		return stake(address(0));
 	}
 
-	function stake(address _validator)
-		public
-		payable
-		onlyGuardian
-		returns (bool)
-	{
+	function stake(
+		address _validator
+	) public payable onlyGuardian returns (bool) {
 		require(msg.value > 0, "stake must be > 0");
 		require(validators.length > 0, "no approved validators");
 		bool found;
@@ -168,7 +177,7 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 			"validator not in approved list"
 		);
 
-		bool staked = stakeNextValidator(msg.value, _validator);
+		bool staked = _stakeNextValidator(msg.value, _validator);
 		stakers[msg.sender] += msg.value;
 		return staked;
 	}
@@ -181,9 +190,9 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 		for (uint256 i = 0; i < validators.length; i++) {
 			uint256 cur = consensus.delegatedAmount(address(this), validators[i]);
 			if (cur == 0) continue;
-			undelegateWithCatch(validators[i], cur);
+			_undelegateWithCatch(validators[i], cur);
 		}
-		uint256 effectiveBalance = balance(); //use only undelegated funds
+		uint256 effectiveBalance = _balance(); //use only undelegated funds
 		pendingFuseEarnings = 0;
 		if (effectiveBalance > 0) {
 			(bool ok, ) = msg.sender.call{ value: effectiveBalance }("");
@@ -192,7 +201,7 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 	}
 
 	function withdraw(uint256 _value) public returns (uint256) {
-		uint256 effectiveBalance = balance(); //use only undelegated funds
+		uint256 effectiveBalance = _balance(); //use only undelegated funds
 		uint256 toWithdraw = _value == 0 ? stakers[msg.sender] : _value;
 		uint256 toCollect = toWithdraw;
 		require(
@@ -204,16 +213,16 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 			uint256 cur = consensus.delegatedAmount(address(this), validators[i]);
 			if (cur == 0) continue;
 			if (cur <= perValidator) {
-				undelegateWithCatch(validators[i], cur);
+				_undelegateWithCatch(validators[i], cur);
 				toCollect = toCollect.sub(cur);
 			} else {
-				undelegateWithCatch(validators[i], perValidator);
+				_undelegateWithCatch(validators[i], perValidator);
 				toCollect = toCollect.sub(perValidator);
 			}
 			if (toCollect == 0) break;
 		}
 
-		effectiveBalance = balance().sub(effectiveBalance); //use only undelegated funds
+		effectiveBalance = _balance().sub(effectiveBalance); //use only undelegated funds
 
 		// in case some funds where not withdrawn
 		if (toWithdraw > effectiveBalance) {
@@ -227,10 +236,10 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 		return toWithdraw;
 	}
 
-	function stakeNextValidator(uint256 _value, address _validator)
-		internal
-		returns (bool)
-	{
+	function _stakeNextValidator(
+		uint256 _value,
+		address _validator
+	) internal returns (bool) {
 		if (validators.length == 0) return false;
 		if (_validator != address(0)) {
 			consensus.delegate{ value: _value }(_validator);
@@ -269,11 +278,11 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 	function removeValidator(address _validator) public onlyOwner {
 		uint256 delegated = consensus.delegatedAmount(address(this), _validator);
 		if (delegated > 0) {
-			uint256 prevBalance = balance();
-			undelegateWithCatch(_validator, delegated);
+			uint256 prevBalance = _balance();
+			_undelegateWithCatch(_validator, delegated);
 
 			// wasnt withdrawn because validator needs to be taken of active validators
-			if (balance() == prevBalance) {
+			if (_balance() == prevBalance) {
 				// pendingValidators.push(_validator);
 				return;
 			}
@@ -289,20 +298,32 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 		}
 	}
 
+	function _fillGasFaucet(uint256 earned) internal returns (uint256 toTop) {
+		if (gasFaucet != address(0) && lastFaucetBalance > gasFaucet.balance) {
+			toTop = lastFaucetBalance - gasFaucet.balance;
+			if (toTop > earned) toTop = earned;
+			gasFaucet.call{ value: toTop }("");
+		}
+
+		lastFaucetBalance = gasFaucet.balance;
+	}
+
 	function collectUBIInterest() public notPaused {
 		uint256 curDay = ubischeme.currentDay();
 		require(curDay != lastDayCollected, "can collect only once in a ubi cycle");
 
-		uint256 earnings = balance() - pendingFuseEarnings;
+		uint256 earnings = _balance() - pendingFuseEarnings;
 		require(pendingFuseEarnings + earnings > 0, "no earnings to collect");
 
 		lastDayCollected = curDay;
 		uint256 fuseUBI = earnings.mul(RATIO_BASE - stakeBackRatio).div(RATIO_BASE);
 		uint256 stakeBack = earnings - fuseUBI;
+		uint256 gasTopped = _fillGasFaucet(stakeBack);
+		stakeBack -= gasTopped;
 
 		uint256[] memory fuseswapResult = _buyGD(fuseUBI + pendingFuseEarnings); //buy GD with X% of earnings
 		pendingFuseEarnings = fuseUBI + pendingFuseEarnings - fuseswapResult[0];
-		stakeNextValidator(stakeBack, address(0)); //stake back the rest of the earnings
+		_stakeNextValidator(stakeBack, address(0)); //stake back the rest of the earnings
 
 		uint256 gdBought = fuseswapResult[fuseswapResult.length - 1];
 		uint256 keeperFee = gdBought.mul(keeperFeeRatio).div(RATIO_BASE);
@@ -315,7 +336,7 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 		uint256 ubiAfterFeeAndPool = gdBought.sub(communityPoolContribution);
 
 		GD.transfer(address(ubischeme), ubiAfterFeeAndPool); //transfer to ubischeme
-		communityPoolBalance += communityPoolContribution;
+		GD.transfer(address(communityPool), communityPoolContribution);
 
 		emit UBICollected(
 			curDay,
@@ -378,10 +399,9 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 	 * @return usdcAmount and usedFuse how much usdc we got and how much fuse was used
 	 */
 
-	function _buyUSDC(uint256 _fuseIn)
-		internal
-		returns (uint256 usdcAmount, uint256 usedFuse)
-	{
+	function _buyUSDC(
+		uint256 _fuseIn
+	) internal returns (uint256 usdcAmount, uint256 usedFuse) {
 		//buy from uniwasp
 		require(_fuseIn > 0, "buy value should be > 0");
 		UniswapPair uniswapFUSEfUSDPair = UniswapPair(
@@ -410,11 +430,9 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 		usdcAmount = result[1] / 1e12; //convert fusd from 1e18 to usdc 1e6
 	}
 
-	function calcMaxFuseWithPriceImpact(uint256 _value)
-		public
-		view
-		returns (uint256 fuseAmount, uint256 tokenOut)
-	{
+	function calcMaxFuseWithPriceImpact(
+		uint256 _value
+	) public view returns (uint256 fuseAmount, uint256 tokenOut) {
 		(uint256 r_fuse, uint256 r_gd, ) = UniswapPair(
 			uniswapFactory.getPair(uniswap.WETH(), address(GD))
 		).getReserves();
@@ -422,11 +440,9 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 		return calcMaxTokenWithPriceImpact(r_fuse, r_gd, _value);
 	}
 
-	function calcMaxFuseUSDCWithPriceImpact(uint256 _value)
-		public
-		view
-		returns (uint256 maxFuse, uint256 gdOut)
-	{
+	function calcMaxFuseUSDCWithPriceImpact(
+		uint256 _value
+	) public view returns (uint256 maxFuse, uint256 gdOut) {
 		UniswapPair uniswapFUSEfUSDPair = UniswapPair(
 			uniswapFactory.getPair(uniswap.WETH(), fUSD)
 		); //fusd is pegged 1:1 to usdc
@@ -463,7 +479,7 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 	/**
 	 * uniswap amountOut helper
 	 */
-	function getAmountOut(
+	function _getAmountOut(
 		uint256 _amountIn,
 		uint256 _reserveIn,
 		uint256 _reserveOut
@@ -484,7 +500,7 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 	) public view returns (uint256 maxToken, uint256 tokenOut) {
 		maxToken = (r_token * maxSlippageRatio) / RATIO_BASE;
 		maxToken = maxToken < _value ? maxToken : _value;
-		tokenOut = getAmountOut(maxToken, r_token, r_gd);
+		tokenOut = _getAmountOut(maxToken, r_token, r_gd);
 		// uint256 start = 0;
 		// uint256 end = _value.div(1e18); //save iterations by moving precision to whole Fuse quantity
 		// // uint256 curPriceWei = uint256(1e18).mul(r_gd) / r_token; //uniswap quote  formula UniswapV2Library.sol
@@ -524,22 +540,18 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 		// }
 	}
 
-	function undelegateWithCatch(address _validator, uint256 _amount)
-		internal
-		returns (bool)
-	{
+	function _undelegateWithCatch(
+		address _validator,
+		uint256 _amount
+	) internal returns (bool) {
 		try consensus.withdraw(_validator, _amount) {
 			return true;
-		} catch Error(
-			string memory /*reason*/
-		) {
+		} catch Error(string memory /*reason*/) {
 			// This is executed in case
 			// revert was called inside getData
 			// and a reason string was provided.
 			return false;
-		} catch (
-			bytes memory /*lowLevelData*/
-		) {
+		} catch (bytes memory /*lowLevelData*/) {
 			// This is executed in case revert() was used
 			// or there was a failing assertion, division
 			// by zero, etc. inside getData.
@@ -547,7 +559,7 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 		}
 	}
 
-	function balance() internal view returns (uint256) {
+	function _balance() internal view returns (uint256) {
 		return payable(address(this)).balance;
 	}
 
@@ -559,10 +571,10 @@ contract FuseStakingV3 is Initializable, OwnableUpgradeable {
 		guardian = _guardian;
 	}
 
-	function collectCommunityPool(address _to, uint256 amount)
-		external
-		onlyGuardian
-	{
+	function collectCommunityPool(
+		address _to,
+		uint256 amount
+	) external onlyGuardian {
 		communityPoolBalance -= amount;
 		GD.transfer(_to, amount);
 	}

package/contracts/utils/BuyGDClone.sol

@@ -3,39 +3,9 @@
 pragma solidity >=0.8;
 import "@openzeppelin/contracts-upgradeable/proxy/ClonesUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import "@mean-finance/uniswap-v3-oracle/solidity/interfaces/IStaticOracle.sol";
 import "../Interfaces.sol";
 
-//@mean-finance/uniswap-v3-oracle
-interface IStaticOracle {
-	/// @notice Will increase observations for all existing pools for the given pair, so they start accruing information for twap calculations
-	/// @dev Will revert if there are no pools available for the pair and period combination
-	/// @param tokenA One of the pair's tokens
-	/// @param tokenB The other of the pair's tokens
-	/// @param cardinality The cardinality that will be guaranteed when quoting
-	/// @return preparedPools The pools that were prepared
-	function prepareAllAvailablePoolsWithCardinality(
-		address tokenA,
-		address tokenB,
-		uint16 cardinality
-	) external returns (address[] memory preparedPools);
-
-	/// @notice Returns a quote, based on the given tokens and amount, by querying all of the pair's pools
-	/// @dev If some pools are not configured correctly for the given period, then they will be ignored
-	/// @dev Will revert if there are no pools available/configured for the pair and period combination
-	/// @param baseAmount Amount of token to be converted
-	/// @param baseToken Address of an ERC20 token contract used as the baseAmount denomination
-	/// @param quoteToken Address of an ERC20 token contract used as the quoteAmount denomination
-	/// @param period Number of seconds from which to calculate the TWAP
-	/// @return quoteAmount Amount of quoteToken received for baseAmount of baseToken
-	/// @return queriedPools The pools that were queried to calculate the quote
-	function quoteAllAvailablePoolsWithTimePeriod(
-		uint128 baseAmount,
-		address baseToken,
-		address quoteToken,
-		uint32 period
-	) external view returns (uint256 quoteAmount, address[] memory queriedPools);
-}
-
 // @uniswap/v3-core
 interface ISwapRouter {
 	struct ExactInputSingleParams {
@@ -155,12 +125,15 @@ contract BuyGDClone is Initializable {
 	 * @dev If the contract has a balance of cUSD, it will swap cUSD for GD tokens.
 	 * @param _minAmount The minimum amount of GD tokens to receive from the swap.
 	 */
-	function swap(uint256 _minAmount) external payable {
+	function swap(
+		uint256 _minAmount,
+		address payable refundGas
+	) external payable {
 		uint256 balance = address(this).balance;
-		if (balance > 0) return swapCelo(_minAmount);
+		if (balance > 0) return swapCelo(_minAmount, refundGas);
 
 		balance = ERC20(cusd).balanceOf(address(this));
-		if (balance > 0) return swapCusd(_minAmount);
+		if (balance > 0) return swapCusd(_minAmount, refundGas);
 
 		revert NO_BALANCE();
 	}
@@ -169,23 +142,35 @@ contract BuyGDClone is Initializable {
 	 * @notice Swaps Celo for GD tokens.
 	 * @param _minAmount The minimum amount of GD tokens to receive from the swap.
 	 */
-	function swapCelo(uint256 _minAmount) public payable {
-		uint256 gasCosts = msg.sender == owner ? 0 : (block.basefee + 1e9) * 400000;
-		uint256 balance = address(this).balance;
+	function swapCelo(
+		uint256 _minAmount,
+		address payable refundGas
+	) public payable {
+		uint256 gasCosts;
+		if (refundGas != owner) {
+			(gasCosts, ) = oracle.quoteAllAvailablePoolsWithTimePeriod(
+				1e17, //0.1$
+				cusd,
+				celo,
+				60
+			);
+		}
 
-		uint256 minByTwap = minAmountByTWAP(balance, celo);
+		uint256 amountIn = address(this).balance - gasCosts;
+
+		(uint256 minByTwap, ) = minAmountByTWAP(amountIn, celo, twapPeriod);
 		_minAmount = _minAmount > minByTwap ? _minAmount : minByTwap;
 
-		ERC20(celo).approve(address(router), balance);
+		ERC20(celo).approve(address(router), amountIn);
 		ISwapRouter.ExactInputParams memory params = ISwapRouter.ExactInputParams({
 			path: abi.encodePacked(celo, uint24(3000), cusd, uint24(10000), gd),
 			recipient: owner,
-			amountIn: balance - gasCosts,
+			amountIn: amountIn,
 			amountOutMinimum: _minAmount
 		});
 		router.exactInput(params);
-		if (msg.sender != owner) {
-			(bool sent, ) = msg.sender.call{ value: gasCosts }("");
+		if (refundGas != owner) {
+			(bool sent, ) = refundGas.call{ value: gasCosts }("");
 			if (!sent) revert REFUND_FAILED(gasCosts);
 		}
 	}
@@ -194,23 +179,23 @@ contract BuyGDClone is Initializable {
 	 * @notice Swaps cUSD for GD tokens.
 	 * @param _minAmount The minimum amount of GD tokens to receive from the swap.
 	 */
-	function swapCusd(uint256 _minAmount) public {
-		uint256 gasCosts = msg.sender != owner ? 1e17 : 0; //fixed 0.1$
-		uint balance = ERC20(cusd).balanceOf(address(this));
+	function swapCusd(uint256 _minAmount, address refundGas) public {
+		uint256 gasCosts = refundGas != owner ? 1e17 : 0; //fixed 0.1$
+		uint256 amountIn = ERC20(cusd).balanceOf(address(this)) - gasCosts;
 
-		uint256 minByTwap = minAmountByTWAP(balance, cusd);
+		(uint256 minByTwap, ) = minAmountByTWAP(amountIn, cusd, twapPeriod);
 		_minAmount = _minAmount > minByTwap ? _minAmount : minByTwap;
 
-		ERC20(cusd).approve(address(router), balance);
+		ERC20(cusd).approve(address(router), amountIn);
 		ISwapRouter.ExactInputParams memory params = ISwapRouter.ExactInputParams({
 			path: abi.encodePacked(cusd, uint24(10000), gd),
 			recipient: owner,
-			amountIn: balance - gasCosts,
+			amountIn: amountIn,
 			amountOutMinimum: _minAmount
 		});
 		router.exactInput(params);
-		if (msg.sender != owner) {
-			ERC20(cusd).transfer(msg.sender, gasCosts);
+		if (refundGas != owner) {
+			ERC20(cusd).transfer(refundGas, gasCosts);
 		}
 	}
 
@@ -223,16 +208,16 @@ contract BuyGDClone is Initializable {
 	 */
 	function minAmountByTWAP(
 		uint256 baseAmount,
-		address baseToken
-	) public view returns (uint256 minTwap) {
+		address baseToken,
+		uint32 period
+	) public view returns (uint256 minTwap, uint256 quote) {
 		uint128 toConvert = uint128(baseAmount);
-		uint256 quote;
 		if (baseToken == celo) {
 			(quote, ) = oracle.quoteAllAvailablePoolsWithTimePeriod(
 				toConvert,
 				baseToken,
 				cusd,
-				twapPeriod
+				period
 			);
 			toConvert = uint128(quote);
 		}
@@ -240,10 +225,10 @@ contract BuyGDClone is Initializable {
 			toConvert,
 			cusd,
 			gd,
-			twapPeriod
+			period
 		);
-		//minAmount should not be 5% under twap (ie we dont expect price movement > 5% in timePeriod)
-		return (quote * 95) / 100;
+		//minAmount should not be 2% under twap (ie we dont expect price movement > 2% in timePeriod)
+		return ((quote * 98) / 100, quote);
 	}
 
 	/**
@@ -265,7 +250,7 @@ contract BuyGDClone is Initializable {
  * @notice Factory contract for creating clones of BuyGDClone contract
  */
 contract BuyGDCloneFactory {
-	address immutable impl;
+	address public immutable impl;
 
 	/**
 	 * @notice Initializes the BuyGDCloneFactory contract with the provided parameters.
@@ -281,6 +266,7 @@ contract BuyGDCloneFactory {
 		IStaticOracle _oracle
 	) {
 		impl = address(new BuyGDClone(_router, _cusd, _gd, _oracle));
+		_oracle.prepareAllAvailablePoolsWithTimePeriod(_gd, _cusd, 600);
 	}
 
 	/**
@@ -295,6 +281,17 @@ contract BuyGDCloneFactory {
 		return clone;
 	}
 
+	function createAndSwap(
+		address owner,
+		uint256 minAmount
+	) external returns (address) {
+		bytes32 salt = keccak256(abi.encode(owner));
+		address clone = ClonesUpgradeable.cloneDeterministic(impl, salt);
+		BuyGDClone(payable(clone)).initialize(owner);
+		BuyGDClone(payable(clone)).swap(minAmount, payable(msg.sender));
+		return clone;
+	}
+
 	/**
 	 * @notice Predicts the address of a new clone of the BuyGDClone contract with the provided owner address.
 	 * @param owner The address of the owner of the new BuyGDClone contract.
@@ -306,4 +303,8 @@ contract BuyGDCloneFactory {
 		return
 			ClonesUpgradeable.predictDeterministicAddress(impl, salt, address(this));
 	}
+
+	function getBaseFee() external view returns (uint256) {
+		return block.basefee;
+	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "description": "GoodDollar Protocol",
   "engines": {
     "node": "18.x"
@@ -82,10 +82,12 @@
     "@babel/polyfill": "*",
     "@babel/preset-env": "*",
     "@babel/register": "*",
+    "@celo-tools/celo-ethers-wrapper": "^0.4.0",
     "@gnosis.pm/safe-core-sdk": "^3.2.0",
     "@gnosis.pm/safe-core-sdk-types": "^1.7.0",
     "@gnosis.pm/safe-ethers-lib": "^1.7.0",
     "@gnosis.pm/safe-service-client": "^1.4.0",
+    "@mean-finance/uniswap-v3-oracle": "^1.0.3",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
     "@nomiclabs/hardhat-ethers": "^2.2.1",
     "@nomiclabs/hardhat-etherscan": "^3.1.0",