@gooddollar/goodprotocol 2.1.4 → 2.2.0

package/contracts/reserve/GenericDistributionHelper.sol

@@ -298,6 +298,8 @@ contract GenericDistributionHelper is
 		uint256 amountToSell,
 		uint256 minReceived
 	) internal returns (uint256 nativeBought) {
+		if (amountToSell == 0) return 0;
+
 		address[] memory gdPools = STATIC_ORACLE.getAllPoolsForPair(
 			reserveToken,
 			address(nativeToken())
@@ -306,17 +308,35 @@ contract GenericDistributionHelper is
 			reserveToken,
 			gasToken
 		);
+
+		if (gdPools.length == 0 || gasPools.length == 0) {
+			emit BuyNativeFailed("no pools available", amountToSell, minReceived);
+			return 0;
+		}
+
+		// initialize with first pool and track max liquidity
 		uint24 gasFee = IUniswapV3Pool(gasPools[0]).fee();
-		uint24 gdFee = IUniswapV3Pool(gdPools[0]).fee();
-		for (uint i = 1; i < gasPools.length; i++) {
-			uint24 fee = IUniswapV3Pool(gasPools[i]).fee();
-			gasFee = gasFee < fee ? gasFee : fee;
+		uint256 maxGasBalance = ERC20(gasToken).balanceOf(gasPools[0]);
+		for (uint256 i = 1; i < gasPools.length; i++) {
+			uint256 balance = ERC20(gasToken).balanceOf(gasPools[i]);
+			if (balance > maxGasBalance) {
+				maxGasBalance = balance;
+				gasFee = IUniswapV3Pool(gasPools[i]).fee();
+			}
 		}
-		for (uint i = 1; i < gdPools.length; i++) {
-			uint24 fee = IUniswapV3Pool(gdPools[i]).fee();
-			gdFee = gdFee < fee ? gdFee : fee;
+
+		uint24 gdFee = IUniswapV3Pool(gdPools[0]).fee();
+		uint256 maxStableBalance = ERC20(reserveToken).balanceOf(gdPools[0]);
+		for (uint256 i = 1; i < gdPools.length; i++) {
+			uint256 balance = ERC20(reserveToken).balanceOf(gdPools[i]);
+			if (balance > maxStableBalance) {
+				maxStableBalance = balance;
+				gdFee = IUniswapV3Pool(gdPools[i]).fee();
+			}
 		}
+
 		ERC20(nativeToken()).approve(address(ROUTER), amountToSell);
+
 		uint256 amountOutMinimum = (minReceived * (100 - feeSettings.maxSlippage)) /
 			100; // 5% slippage
 		ISwapRouter.ExactInputParams memory params = ISwapRouter.ExactInputParams({
@@ -331,11 +351,19 @@ contract GenericDistributionHelper is
 			amountIn: amountToSell,
 			amountOutMinimum: amountOutMinimum
 		});
+
 		try ROUTER.exactInput(params) returns (uint256 amountOut) {
 			return amountOut;
 		} catch Error(string memory reason) {
 			emit BuyNativeFailed(reason, amountToSell, amountOutMinimum);
 			return 0;
+		} catch {
+			emit BuyNativeFailed(
+				"swap reverted without reason",
+				amountToSell,
+				amountOutMinimum
+			);
+			return 0;
 		}
 	}
 }

package/contracts/ubi/UBISchemeV2.sol

@@ -386,7 +386,14 @@ contract UBISchemeV2 is DAOUpgradeableContract {
 		if (
 			currentDay == (block.timestamp - periodStart) / (1 days) && dailyUbi > 0
 		) {
-			return hasClaimed(_member) ? 0 : dailyUbi;
+			return
+				hasClaimed(
+					IIdentityV2(nameService.getAddress("IDENTITY")).getWhitelistedRoot(
+						_member
+					)
+				)
+					? 0
+					: dailyUbi;
 		}
 		return estimateNextDailyUBI();
 	}

package/contracts/utils/UpdateReserveRatio.sol

@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.0;
+
+import "../utils/NameService.sol";
+import "../Interfaces.sol";
+import "../DAOStackInterfaces.sol";
+import "../MentoInterfaces.sol";
+
+import "hardhat/console.sol";
+
+interface MentoExchange {
+	function reserve() external view returns (address);
+}
+
+/**
+ * @notice set the new reserve ratio on Celo for xdc reserve deploy
+ */
+contract UpdateReserveRatio {
+	address owner;
+
+	constructor(address _owner) {
+		owner = _owner;
+	}
+
+	function upgrade(
+		Controller _controller,
+		address _mentoExchange,
+		bytes32 _exchangeId,
+		uint32 _reserveRatio,
+		uint256 _verifyCurrentSupply,
+		uint256 _newTotalSupply
+	) external {
+		require(msg.sender == owner, "only owner can call this");
+		address avatar = _controller.avatar();
+		//verify that the total supply the new reserve ratio was based on still applies
+		require(
+			ERC20(Avatar(avatar).nativeToken()).totalSupply() == _verifyCurrentSupply,
+			"total supply mismatch"
+		);
+
+		if (block.chainid == 42220) {
+			IBancorExchangeProvider.PoolExchange
+				memory _exchange = IBancorExchangeProvider(_mentoExchange)
+					.getPoolExchange(_exchangeId);
+
+			_exchange.reserveRatio = _reserveRatio;
+			_exchange.tokenSupply = _newTotalSupply;
+
+			(bool ok, bytes memory result) = _controller.genericCall(
+				address(_mentoExchange),
+				abi.encodeCall(
+					IBancorExchangeProvider.updateExchange,
+					(_exchangeId, _exchange)
+				),
+				address(avatar),
+				0
+			);
+
+			require(ok, "update failed");
+			console.log("update done");
+			bool updated = abi.decode(result, (bool));
+			require(updated, "not updated");
+		} else {
+			IBancorExchangeProvider.PoolExchange memory _exchange;
+
+			_exchange.reserveRatio = _reserveRatio;
+			_exchange.tokenSupply = _newTotalSupply;
+			_exchange.reserveAsset = 0xfA2958CB79b0491CC627c1557F441eF849Ca8eb1; //usdc on xdc
+			_exchange.tokenAddress = Avatar(avatar).nativeToken();
+			_exchange.reserveBalance = 200000 * 1e6; // 200k USDC on xdc
+			_exchange.exitContribution = 10000000; //10%
+
+			(bool ok, bytes memory result) = _controller.genericCall(
+				address(_mentoExchange),
+				abi.encodeCall(IBancorExchangeProvider.createExchange, (_exchange)),
+				address(avatar),
+				0
+			);
+
+			require(ok, "create failed");
+			console.log("create done");
+			bytes32 created = abi.decode(result, (bytes32));
+			console.logBytes32(created);
+			require(created != bytes32(0), "not created");
+		}
+		owner = address(0); //mark as run;
+		// prevent executing again
+		require(_controller.unregisterSelf(avatar), "unregistering failed");
+	}
+}
+
+contract CreateReserveExchange {
+	address owner;
+
+	constructor(address _owner) {
+		owner = _owner;
+	}
+
+	function upgrade(
+		Controller _controller,
+		address _mentoExchange,
+		IBancorExchangeProvider.PoolExchange memory _exchange
+	) external {
+		require(msg.sender == owner, "only owner can call this");
+		address avatar = _controller.avatar();
+
+		(bool ok, ) = _controller.genericCall(
+			address(_mentoExchange),
+			abi.encodeCall(IBancorExchangeProvider.createExchange, _exchange),
+			address(avatar),
+			0
+		);
+
+		// console.log("createExchange %s", ok);
+		require(ok, "createExchange failed");
+
+		owner = address(0); //mark as run;
+		// prevent executing again
+		require(_controller.unregisterSelf(avatar), "unregistering failed");
+	}
+}

package/hardhat.config.ts

@@ -29,7 +29,7 @@ envEnc.config();
 config();
 
 const mnemonic = process.env.MNEMONIC || "test test test test test test test test test test test junk";
-const deployerPrivateKey = process.env.ADMIN_KEY || ethers.utils.hexZeroPad("0x11", 32);
+const deployerPrivateKey = process.env.PRIVATE_KEY || ethers.utils.hexZeroPad("0x11", 32);
 const infura_api = process.env.INFURA_API;
 const alchemy_key = process.env.ALCHEMY_KEY;
 const etherscan_key = process.env.ETHERSCAN_KEY;
@@ -125,8 +125,7 @@ const hhconfig: HardhatUserConfig = {
       initialDate: "2021-12-01", //required for DAO tests like guardian
       forking: process.env.FORK_CHAIN_ID && {
         url: "https://eth-mainnet.alchemyapi.io/v2/" + process.env.ALCHEMY_KEY
-      },
-      blockGasLimit: 100000000429720,
+      }
     },
     fork: {
       chainId: 1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.1.4",
+  "version": "2.2.0",
   "description": "GoodDollar Protocol",
   "engines": {
     "node": ">=16.x"
@@ -30,7 +30,9 @@
     "artifacts/abis",
     "contracts",
     "releases",
-    "scripts",
+    "scripts/test",
+    "scripts/blockchainTestSetup.sh",
+    "scripts/deployFullDAO.ts",
     "yarn.lock",
     "package.json",
     "hardhat.config.ts",
@@ -76,7 +78,7 @@
     "@jsier/retrier": "^1.2.4",
     "@mean-finance/uniswap-v3-oracle": "^1.0.3",
     "@nomicfoundation/hardhat-chai-matchers": "1",
-    "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
+    "@nomicfoundation/hardhat-network-helpers": "1.*",
     "@nomicfoundation/hardhat-verify": "^2.1.0",
     "@nomiclabs/hardhat-ethers": "^2.2.1",
     "@nomiclabs/hardhat-waffle": "^2.0.6",
@@ -110,7 +112,7 @@
     "fs-extra": "9.0.0",
     "graphql": "^15.5.0",
     "graphql-request": "^3.4.0",
-    "hardhat": "2.27.2",
+    "hardhat": "2.26",
     "hardhat-contract-sizer": "^2.6.1",
     "hardhat-deploy": "^1.0.4",
     "hardhat-gas-reporter": "^1.0.8",

package/releases/deploy-settings.json

@@ -311,6 +311,9 @@
   "production-xdc": {
     "gasPrice": 12.5e9,
     "superfluidHost": "0x0000000000000000000000000000000000000000",
+    "reserve": {
+      "gasToken": "0x951857744785e80e2de051c32ee7b25f9c458c42"
+    },
     "ubi": {
       "maxInactiveDays": 14,
       "minActiveUsers": 30000