@gooddollar/goodprotocol 2.1.0 → 2.1.2

package/artifacts/contracts/utils/UpdateReserveRatioAfterXDC.sol/UpdateReserveRatioAfterXDC.json

@@ -0,0 +1,50 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "UpdateReserveRatioAfterXDC",
+  "sourceName": "contracts/utils/UpdateReserveRatioAfterXDC.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "_owner",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "contract Controller",
+          "name": "_controller",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "_mentoExchange",
+          "type": "address"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "_exchangeId",
+          "type": "bytes32"
+        },
+        {
+          "internalType": "uint32",
+          "name": "_reserveRatio",
+          "type": "uint32"
+        }
+      ],
+      "name": "upgrade",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x608060405234801561001057600080fd5b5060405161090038038061090083398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b61086d806100936000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063fb7b652814610030575b600080fd5b61004361003e366004610592565b610045565b005b6000546001600160a01b0316331461009f5760405162461bcd60e51b81526020600482015260186024820152776f6e6c79206f776e65722063616e2063616c6c207468697360401b60448201526064015b60405180910390fd5b6000836001600160a01b0316633149d54a6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156100df573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061010391906105e5565b6040516309e1222960e21b8152600481018590529091506000906001600160a01b0386169063278488a49060240160c060405180830381865afa15801561014e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610172919061061f565b63ffffffff841660808201526040516024810186905260006044820181905291925081906001600160a01b0389169063d1b7089a90899060640160408051601f198184030181529181526020820180516001600160e01b03166372375adb60e11b179052516001600160e01b031960e085901b1681526101fb92919089906000906004016106dd565b6000604051808303816000875af115801561021a573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526102429190810190610743565b915091508161028c5760405162461bcd60e51b815260206004820152601660248201527519195cdd1c9bde515e18da185b99d94819985a5b195960521b6044820152606401610096565b6040805184516001600160a01b03908116602483015260208601518116604483015291850151606482015260608501516084820152608085015163ffffffff90811660a483015260a08601511660c48201529089169063d1b7089a90899060e40160408051601f198184030181529181526020820180516001600160e01b031663aec36c1f60e01b179052516001600160e01b031960e085901b16815261033c92919089906000906004016106dd565b6000604051808303816000875af115801561035b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526103839190810190610743565b9092509050816103cd5760405162461bcd60e51b815260206004820152601560248201527418dc99585d19515e18da185b99d94819985a5b1959605a1b6044820152606401610096565b6000818060200190518101906103e39190610803565b905086811461042b5760405162461bcd60e51b81526020600482015260146024820152731b9bdd081cd85b5948195e18da185b99d9481a5960621b6044820152606401610096565b610434816104fe565b604051636c525b1360e01b81526001600160a01b0386811660048301528a1690636c525b13906024016020604051808303816000875af115801561047c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104a0919061081c565b6104e35760405162461bcd60e51b81526020600482015260146024820152731d5b9c9959da5cdd195c9a5b99c819985a5b195960621b6044820152606401610096565b5050600080546001600160a01b031916905550505050505050565b6105438160405160240161051491815260200190565b60408051601f198184030181529190526020810180516001600160e01b03166327b7cf8560e01b179052610546565b50565b6105438160006a636f6e736f6c652e6c6f679050600080835160208501845afa505050565b6001600160a01b038116811461054357600080fd5b63ffffffff8116811461054357600080fd5b600080600080608085870312156105a857600080fd5b84356105b38161056b565b935060208501356105c38161056b565b92506040850135915060608501356105da81610580565b939692955090935050565b6000602082840312156105f757600080fd5b81516106028161056b565b9392505050565b634e487b7160e01b600052604160045260246000fd5b600060c0828403121561063157600080fd5b60405160c081016001600160401b038111828210171561065357610653610609565b60405282516106618161056b565b815260208301516106718161056b565b806020830152506040830151604082015260608301516060820152608083015161069a81610580565b608082015260a08301516106ad81610580565b60a08201529392505050565b60005b838110156106d45781810151838201526020016106bc565b50506000910152565b600060018060a01b03808716835260806020840152855180608085015261070b8160a0860160208a016106b9565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b8051801515811461073e57600080fd5b919050565b6000806040838503121561075657600080fd5b61075f8361072e565b60208401519092506001600160401b038082111561077c57600080fd5b818501915085601f83011261079057600080fd5b8151818111156107a2576107a2610609565b604051601f8201601f19908116603f011681019083821181831017156107ca576107ca610609565b816040528281528860208487010111156107e357600080fd5b6107f48360208301602088016106b9565b80955050505050509250929050565b60006020828403121561081557600080fd5b5051919050565b60006020828403121561082e57600080fd5b6106028261072e56fea26469706673582212200fce731fac65158d43214b3007af300c6df7bc0a05f1f9f971f545474e09566b64736f6c63430008130033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061002b5760003560e01c8063fb7b652814610030575b600080fd5b61004361003e366004610592565b610045565b005b6000546001600160a01b0316331461009f5760405162461bcd60e51b81526020600482015260186024820152776f6e6c79206f776e65722063616e2063616c6c207468697360401b60448201526064015b60405180910390fd5b6000836001600160a01b0316633149d54a6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156100df573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061010391906105e5565b6040516309e1222960e21b8152600481018590529091506000906001600160a01b0386169063278488a49060240160c060405180830381865afa15801561014e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610172919061061f565b63ffffffff841660808201526040516024810186905260006044820181905291925081906001600160a01b0389169063d1b7089a90899060640160408051601f198184030181529181526020820180516001600160e01b03166372375adb60e11b179052516001600160e01b031960e085901b1681526101fb92919089906000906004016106dd565b6000604051808303816000875af115801561021a573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526102429190810190610743565b915091508161028c5760405162461bcd60e51b815260206004820152601660248201527519195cdd1c9bde515e18da185b99d94819985a5b195960521b6044820152606401610096565b6040805184516001600160a01b03908116602483015260208601518116604483015291850151606482015260608501516084820152608085015163ffffffff90811660a483015260a08601511660c48201529089169063d1b7089a90899060e40160408051601f198184030181529181526020820180516001600160e01b031663aec36c1f60e01b179052516001600160e01b031960e085901b16815261033c92919089906000906004016106dd565b6000604051808303816000875af115801561035b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526103839190810190610743565b9092509050816103cd5760405162461bcd60e51b815260206004820152601560248201527418dc99585d19515e18da185b99d94819985a5b1959605a1b6044820152606401610096565b6000818060200190518101906103e39190610803565b905086811461042b5760405162461bcd60e51b81526020600482015260146024820152731b9bdd081cd85b5948195e18da185b99d9481a5960621b6044820152606401610096565b610434816104fe565b604051636c525b1360e01b81526001600160a01b0386811660048301528a1690636c525b13906024016020604051808303816000875af115801561047c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104a0919061081c565b6104e35760405162461bcd60e51b81526020600482015260146024820152731d5b9c9959da5cdd195c9a5b99c819985a5b195960621b6044820152606401610096565b5050600080546001600160a01b031916905550505050505050565b6105438160405160240161051491815260200190565b60408051601f198184030181529190526020810180516001600160e01b03166327b7cf8560e01b179052610546565b50565b6105438160006a636f6e736f6c652e6c6f679050600080835160208501845afa505050565b6001600160a01b038116811461054357600080fd5b63ffffffff8116811461054357600080fd5b600080600080608085870312156105a857600080fd5b84356105b38161056b565b935060208501356105c38161056b565b92506040850135915060608501356105da81610580565b939692955090935050565b6000602082840312156105f757600080fd5b81516106028161056b565b9392505050565b634e487b7160e01b600052604160045260246000fd5b600060c0828403121561063157600080fd5b60405160c081016001600160401b038111828210171561065357610653610609565b60405282516106618161056b565b815260208301516106718161056b565b806020830152506040830151604082015260608301516060820152608083015161069a81610580565b608082015260a08301516106ad81610580565b60a08201529392505050565b60005b838110156106d45781810151838201526020016106bc565b50506000910152565b600060018060a01b03808716835260806020840152855180608085015261070b8160a0860160208a016106b9565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b8051801515811461073e57600080fd5b919050565b6000806040838503121561075657600080fd5b61075f8361072e565b60208401519092506001600160401b038082111561077c57600080fd5b818501915085601f83011261079057600080fd5b8151818111156107a2576107a2610609565b604051601f8201601f19908116603f011681019083821181831017156107ca576107ca610609565b816040528281528860208487010111156107e357600080fd5b6107f48360208301602088016106b9565b80955050505050509250929050565b60006020828403121561081557600080fd5b5051919050565b60006020828403121561082e57600080fd5b6106028261072e56fea26469706673582212200fce731fac65158d43214b3007af300c6df7bc0a05f1f9f971f545474e09566b64736f6c63430008130033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/contracts/IUniswapV3.sol

@@ -8,6 +8,8 @@ interface IUniswapV3Pool {
 
 	function token1() external view returns (address);
 
+	function fee() external view returns (uint24);
+
 	function slot0()
 		external
 		view

package/contracts/identity/IdentityV3.sol

@@ -35,6 +35,7 @@ contract IdentityV3 is
 	string public constant TYPED_STRUCTURE =
 		"ConnectIdentity(address whitelisted,address connected,uint256 deadline)";
 
+	/* @dev rough estimate of number of whitelisted addresses */
 	uint256 public whitelistedCount;
 	uint256 public whitelistedContracts;
 	uint256 public authenticationPeriod;
@@ -236,6 +237,7 @@ contract IdentityV3 is
 	function addBlacklisted(
 		address account
 	) public onlyRole(IDENTITY_ADMIN_ROLE) whenNotPaused {
+		_removeWhitelisted(account);
 		identities[account].status = 255;
 		emit BlacklistAdded(account);
 	}

package/contracts/mocks/GenericDistributionHelperTest.sol

@@ -0,0 +1,31 @@
+pragma solidity >=0.8;
+
+import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import "@openzeppelin/contracts-upgradeable/access/AccessControlEnumerableUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import "@openzeppelin/contracts/utils/math/Math.sol";
+
+import "../reserve/GenericDistributionHelper.sol";
+
+contract GenericDistributionHelperTest is GenericDistributionHelper {
+	function onDistribution(uint256 _amount) external override {
+		revert();
+	}
+}
+
+contract GenericDistributionHelperTestHelper is GenericDistributionHelper {
+	IMessagePassingBridge bridge;
+
+	function setOracle(IStaticOracle oracle) external {
+		STATIC_ORACLE = oracle;
+	}
+
+	function getBridge() public view override returns (IMessagePassingBridge) {
+		return bridge;
+	}
+
+	function setBridges(address _mpbBridge) external {
+		bridge = IMessagePassingBridge(_mpbBridge);
+	}
+}

package/contracts/reserve/GenericDistributionHelper.sol

@@ -9,6 +9,7 @@ import "@gooddollar/bridge-contracts/contracts/messagePassingBridge/IMessagePass
 import "@uniswap/v2-periphery/contracts/interfaces/IWETH.sol";
 
 import "../utils/DAOUpgradeableContract.sol";
+import "../IUniswapV3.sol";
 
 // import "hardhat/console.sol";
 
@@ -57,6 +58,8 @@ contract GenericDistributionHelper is
 
 	address public reserveToken;
 
+	uint256 private _status; //for reentrancy guard
+
 	event Distribution(
 		uint256 distributed,
 		uint256 startingBalance,
@@ -75,6 +78,18 @@ contract GenericDistributionHelper is
 
 	receive() external payable {}
 
+	modifier nonReentrant() {
+		// On the first call to nonReentrant, _status will be _NOT_ENTERED
+		require(_status != 1, "ReentrancyGuard: reentrant call");
+
+		// Any calls to nonReentrant after this point will fail
+		_status = 1;
+		_;
+		// By storing the original value once again, a refund is triggered (see
+		// https://eips.ethereum.org/EIPS/eip-2200)
+		_status = 0;
+	}
+
 	function initialize(
 		INameService _ns,
 		IStaticOracle _oracle,
@@ -94,7 +109,7 @@ contract GenericDistributionHelper is
 		_setReserveToken(_reserveToken);
 	}
 
-	function getBridge() public view returns (IMessagePassingBridge) {
+	function getBridge() public view virtual returns (IMessagePassingBridge) {
 		return IMessagePassingBridge(nameService.getAddress("MPBBRIDGE_CONTRACT"));
 	}
 
@@ -105,19 +120,15 @@ contract GenericDistributionHelper is
 	}
 
 	function _setReserveToken(address _reserveToken) internal {
-		uint24[] memory fees = new uint24[](1);
-		fees[0] = 100;
 		reserveToken = _reserveToken;
-		STATIC_ORACLE.prepareSpecificFeeTiersWithTimePeriod(
+		STATIC_ORACLE.prepareAllAvailablePoolsWithTimePeriod(
 			reserveToken,
 			address(nativeToken()),
-			fees,
 			60
 		);
-		STATIC_ORACLE.prepareSpecificFeeTiersWithTimePeriod(
+		STATIC_ORACLE.prepareAllAvailablePoolsWithTimePeriod(
 			reserveToken,
 			gasToken,
-			fees,
 			60
 		);
 	}
@@ -132,7 +143,7 @@ contract GenericDistributionHelper is
 	 * @notice this is usually called by reserve, but can be called by anyone anytime to trigger distribution
 	 * @param _amount how much was sent, informational only
 	 */
-	function onDistribution(uint256 _amount) external virtual {
+	function onDistribution(uint256 _amount) external virtual nonReentrant {
 		//we consider the actual balance and not _amount
 		uint256 toDistribute = nativeToken().balanceOf(address(this));
 		if (toDistribute == 0) return;
@@ -243,25 +254,21 @@ contract GenericDistributionHelper is
 	function calcGDToSell(
 		uint256 maxAmountToSell
 	) public view returns (uint256 gdToSell, uint256 minReceived) {
-		uint24[] memory fees = new uint24[](1);
-		fees[0] = 100;
 		uint256 nativeToBuy = feeSettings.minBalanceForFees *
 			3 -
 			address(this).balance;
 		(uint256 nativeValueInUSD, ) = STATIC_ORACLE
-			.quoteSpecificFeeTiersWithTimePeriod(
+			.quoteAllAvailablePoolsWithTimePeriod(
 				uint128(nativeToBuy),
 				gasToken,
 				reserveToken,
-				fees,
 				60 //last 1 minute
 			);
 
-		(gdToSell, ) = STATIC_ORACLE.quoteSpecificFeeTiersWithTimePeriod(
+		(gdToSell, ) = STATIC_ORACLE.quoteAllAvailablePoolsWithTimePeriod(
 			uint128(nativeValueInUSD),
 			reserveToken,
 			address(nativeToken()),
-			fees,
 			60 //last 1 minute
 		);
 
@@ -269,22 +276,19 @@ contract GenericDistributionHelper is
 		if (gdToSell > maxAmountToSell) {
 			gdToSell = maxAmountToSell;
 
-			fees[0] = 100;
 			// gdToSell = (nativeValueInUSD * 1e18) / gdPriceInUSD; // mul by 1e18 so result is in 18 decimals
 			(uint256 minReceivedCUSD, ) = STATIC_ORACLE
-				.quoteSpecificFeeTiersWithTimePeriod(
+				.quoteAllAvailablePoolsWithTimePeriod(
 					uint128(gdToSell),
 					address(nativeToken()),
 					reserveToken,
-					fees,
 					60 //last 1 minute
 				);
 
-			(minReceived, ) = STATIC_ORACLE.quoteSpecificFeeTiersWithTimePeriod(
+			(minReceived, ) = STATIC_ORACLE.quoteAllAvailablePoolsWithTimePeriod(
 				uint128(minReceivedCUSD),
 				reserveToken,
 				gasToken,
-				fees,
 				60 //last 1 minute
 			);
 		}
@@ -294,15 +298,33 @@ contract GenericDistributionHelper is
 		uint256 amountToSell,
 		uint256 minReceived
 	) internal returns (uint256 nativeBought) {
+		address[] memory gdPools = STATIC_ORACLE.getAllPoolsForPair(
+			reserveToken,
+			address(nativeToken())
+		);
+		address[] memory gasPools = STATIC_ORACLE.getAllPoolsForPair(
+			reserveToken,
+			gasToken
+		);
+		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;
+		}
+		for (uint i = 1; i < gdPools.length; i++) {
+			uint24 fee = IUniswapV3Pool(gdPools[i]).fee();
+			gdFee = gdFee < fee ? gdFee : fee;
+		}
 		ERC20(nativeToken()).approve(address(ROUTER), amountToSell);
 		uint256 amountOutMinimum = (minReceived * (100 - feeSettings.maxSlippage)) /
 			100; // 5% slippage
 		ISwapRouter.ExactInputParams memory params = ISwapRouter.ExactInputParams({
 			path: abi.encodePacked(
 				nativeToken(),
-				uint24(100),
+				gdFee,
 				reserveToken,
-				uint24(100),
+				gasFee,
 				gasToken
 			),
 			recipient: address(this),

package/contracts/utils/AdminWallet.sol

@@ -280,4 +280,31 @@ contract AdminWallet is
 		(success, returnValue) = _contract.call{ value: _value }(_data);
 		emit GenericCall(_contract, _data, _value, success);
 	}
+
+	/**
+	 * @dev perform a generic call to an arbitrary contract
+	 * @param _contracts  the contract's addresses to call
+	 * @param _datas ABI-encoded contract call to call `_contract` address.
+	 * @param _values value (ETH) to transfer with the transaction
+	 * @return success    success or fail
+	 *         bytes - the return bytes of the called contract's function.
+	 */
+	function genericCallBatch(
+		address[] memory _contracts,
+		bytes[] memory _datas,
+		uint256[] memory _values
+	)
+		public
+		onlyAdmin
+		reimburseGas
+		returns (bool success, bytes memory returnValue)
+	{
+		for (uint i = 0; i < _contracts.length; i++) {
+			// solhint-disable-next-line avoid-call-value
+			(success, returnValue) = _contracts[i].call{ value: _values[i] }(
+				_datas[i]
+			);
+			emit GenericCall(_contracts[i], _datas[i], _values[i], success);
+		}
+	}
 }

package/contracts/utils/AdminWalletFuse.sol

@@ -282,4 +282,31 @@ contract AdminWalletFuse is
 		(success, returnValue) = _contract.call{ value: _value }(_data);
 		emit GenericCall(_contract, _data, _value, success);
 	}
+
+	/**
+	 * @dev perform a generic call to an arbitrary contract
+	 * @param _contracts  the contract's addresses to call
+	 * @param _datas ABI-encoded contract call to call `_contract` address.
+	 * @param _values value (ETH) to transfer with the transaction
+	 * @return success    success or fail
+	 *         bytes - the return bytes of the called contract's function.
+	 */
+	function genericCallBatch(
+		address[] memory _contracts,
+		bytes[] memory _datas,
+		uint256[] memory _values
+	)
+		public
+		onlyAdmin
+		reimburseGas
+		returns (bool success, bytes memory returnValue)
+	{
+		for (uint i = 0; i < _contracts.length; i++) {
+			// solhint-disable-next-line avoid-call-value
+			(success, returnValue) = _contracts[i].call{ value: _values[i] }(
+				_datas[i]
+			);
+			emit GenericCall(_contracts[i], _datas[i], _values[i], success);
+		}
+	}
 }

package/contracts/utils/UpdateReserveRatioAfterXDC.sol

@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.0;
+
+import "../utils/NameService.sol";
+import "../Interfaces.sol";
+import "../MentoInterfaces.sol";
+
+import "hardhat/console.sol";
+
+interface MentoExchange {
+	function reserve() external view returns (address);
+}
+
+/**
+ * @notice set the new reserve ratio on Celo after xdc reserve deploy
+ */
+contract UpdateReserveRatioAfterXDC {
+	address owner;
+
+	constructor(address _owner) {
+		owner = _owner;
+	}
+
+	function upgrade(
+		Controller _controller,
+		address _mentoExchange,
+		bytes32 _exchangeId,
+		uint32 _reserveRatio
+	) external {
+		require(msg.sender == address(owner), "only owner can call this");
+		address avatar = IBancorExchangeProvider(_mentoExchange).AVATAR();
+
+		IBancorExchangeProvider.PoolExchange
+			memory _exchange = IBancorExchangeProvider(_mentoExchange)
+				.getPoolExchange(_exchangeId);
+
+		_exchange.reserveRatio = _reserveRatio;
+
+		// first destory existing exchange
+		(bool ok, bytes memory result) = _controller.genericCall(
+			address(_mentoExchange),
+			abi.encodeCall(IBancorExchangeProvider.destroyExchange, (_exchangeId, 0)),
+			address(avatar),
+			0
+		);
+		require(ok, "destroyExchange failed");
+
+		(ok, result) = _controller.genericCall(
+			address(_mentoExchange),
+			abi.encodeCall(IBancorExchangeProvider.createExchange, _exchange),
+			address(avatar),
+			0
+		);
+
+		require(ok, "createExchange failed");
+		bytes32 exchangeId = abi.decode(result, (bytes32));
+		require(exchangeId == _exchangeId, "not same exchange id");
+		console.logBytes32(exchangeId);
+
+		// prevent executing again
+		require(_controller.unregisterSelf(avatar), "unregistering failed");
+		owner = address(0);
+	}
+}

package/hardhat.config.ts

@@ -23,10 +23,13 @@ import { sumStakersGdRewards } from "./scripts/staking/stakersGdRewardsCalculati
 import { verify } from "./scripts/verify";
 import { ethers } from "ethers";
 import { fstat, readFileSync, writeFileSync } from "fs";
+import * as envEnc from "@chainlink/env-enc";
+envEnc.config();
+
 config();
 
 const mnemonic = process.env.MNEMONIC || "test test test test test test test test test test test junk";
-const deployerPrivateKey = process.env.PRIVATE_KEY || ethers.utils.hexZeroPad("0x11", 32);
+const deployerPrivateKey = process.env.ADMIN_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;
@@ -38,7 +41,7 @@ const MAINNET_URL = "https://mainnet.infura.io/v3/" + infura_api;
 
 const xdc = {
   accounts: { mnemonic },
-  url: "https://rpc.xdc.network",
+  url: "https://rpc.xdc.org",
   gas: 3000000,
   gasPrice: 12.5e9,
   chainId: 50
@@ -62,15 +65,7 @@ const hhconfig: HardhatUserConfig = {
     enabled: true
   },
   etherscan: {
-    apiKey: {
-      mainnet: etherscan_key,
-      txdc: etherscan_key,
-      xdc: etherscan_key,
-      celo: etherscan_key,
-      alfajores: celoscan_key,
-      base: basescan_key,
-      fuse: etherscan_key
-    },
+    apiKey: etherscan_key,
     customChains: [
       {
         network: "fuse",
@@ -130,7 +125,8 @@ 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,
@@ -152,6 +148,7 @@ const hhconfig: HardhatUserConfig = {
     },
     dapptest: {
       gasPrice: 1000000000, //1 gwei
+      blockGasLimit: 100000000429720,
       url: "http://127.0.0.1:8545/"
     },
     "dapptest-mainnet": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "GoodDollar Protocol",
   "engines": {
     "node": ">=16.x"
@@ -66,6 +66,7 @@
     "@babel/preset-env": "*",
     "@babel/register": "*",
     "@celo-tools/celo-ethers-wrapper": "^0.4.0",
+    "@chainlink/env-enc": "^1.0.5",
     "@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",
@@ -82,7 +83,7 @@
     "@openzeppelin/contracts": "^4.8.0",
     "@openzeppelin/contracts-upgradeable": "^4.8.0",
     "@openzeppelin/hardhat-upgrades": "^1.22.1",
-    "@safe-global/api-kit": "^3.0.1",
+    "@safe-global/api-kit": "^4.0.0",
     "@safe-global/protocol-kit": "^6.0.2",
     "@safe-global/types-kit": "^2.0.1",
     "@superfluid-finance/ethereum-contracts": "1.8.1",

package/releases/deployment.json

@@ -669,6 +669,7 @@
     "MentoProxyAdmin": "0x54f44fBE2943c2196D94831288E716cdeAF5657"
   },
   "production-xdc": {
+    "networkId": 50,
     "ProxyFactory": "0x5BE34022c26FA03a8d6926314a42414c7ca2dF51",
     "GuardiansSafe": "0xE0c5daa7CC6F88d29505f702a53bb5E67600e7Ec",
     "CUSD": "0xfA2958CB79b0491CC627c1557F441eF849Ca8eb1",
@@ -683,6 +684,8 @@
     "AdminWallet": "0x66fc1bE551f752706130b6f54d84141F8c2Ae8Bb",
     "Faucet": "0x7344Da1Be296f03fbb8082aDaC5696058B5a9bd9",
     "Invites": "0x6bd698566632bf2e81e2278f1656CB24aAF06D2e",
-    "UBIScheme": "0x22867567E2D80f2049200E25C6F31CB6Ec2F0faf"
+    "UBIScheme": "0x22867567E2D80f2049200E25C6F31CB6Ec2F0faf",
+    "MpbBridge": "0xa3247276DbCC76Dd7705273f766eB3E8a5ecF4a5",
+    "BulkWhitelist": "0xe8861A20452Db53dF685F1d9e6B7017de3DB0E46"
   }
 }

package/scripts/bulkWhitelist.ts

@@ -0,0 +1,31 @@
+import farmed from "../farming.json";
+import { ethers, network } from "hardhat";
+import { chunk } from "lodash";
+import contracts from "../releases/deployment.json";
+import { bulkIsWhitelisted } from "./utils";
+const main = async () => {
+  const signer = (await ethers.getSigners())[0];
+
+  console.log("signer", signer.address);
+  const whitelist = await ethers.getContractAt("BulkWhitelist", contracts[network.name].BulkWhitelist);
+  const chunks = chunk(farmed, 300);
+  for (let batch of chunks) {
+    console.log("whitelisting batch of", batch.length, batch[0], batch[batch.length - 1]);
+    const res = await (await whitelist.connect(signer).removeWhitelisted(batch, { gasLimit: 25000000 })).wait();
+    console.log("tx:", res.transactionHash);
+  }
+};
+
+const checkReVerified = async () => {
+  const chunks = chunk(farmed, 300);
+  let total = 0;
+  for (let batch of chunks) {
+    console.log("check whitelisting batch of", batch.length, batch[0], batch[batch.length - 1]);
+    const res = await bulkIsWhitelisted(batch);
+    console.log(`${res.length}/${batch.length}`);
+    total += res.length;
+  }
+  console.log(`total: ${total}/${farmed.length}`);
+};
+checkReVerified();
+// main().catch(console.log);

package/scripts/multichain-deploy/helpers.ts

@@ -5,7 +5,7 @@ import { TransactionResponse, TransactionReceipt } from "@ethersproject/provider
 import { getImplementationAddress } from "@openzeppelin/upgrades-core";
 
 import SafeApiKit from "@safe-global/api-kit";
-import Safe from "@safe-global/protocol-kit";
+import Safe, { SafeTransactionOptionalProps } from "@safe-global/protocol-kit";
 import { MetaTransactionData } from "@safe-global/types-kit";
 
 import util from "util";
@@ -357,6 +357,7 @@ export const executeViaSafe = async (
   functionInputs,
   safeAddress: string,
   safeSignerOrNetwork?: Signer | string,
+  safeOptions: SafeTransactionOptionalProps = {},
   isSimulation = false
 ) => {
   if (typeof safeSignerOrNetwork !== "object" && !process.env.SAFEOWNER_PRIVATE_KEY) {
@@ -368,7 +369,7 @@ export const executeViaSafe = async (
   //   new ethers.providers.JsonRpcProvider("https://rpc.flashbots.net")
   // );
   let chainId = 1;
-  let provider = "https://mainnet.infura.io";
+  let provider = "https://mainnet.gateway.tenderly.co";
   if (typeof safeSignerOrNetwork === "string") {
     switch (safeSignerOrNetwork) {
       case "mainnet":
@@ -387,6 +388,10 @@ export const executeViaSafe = async (
         //   new ethers.providers.JsonRpcProvider("https://rpc.fuse.io")
         // );
         break;
+      case "xdc":
+        chainId = 50;
+        provider = "https://rpc.xdcrpc.com";
+        break;
     }
   } else if (safeSignerOrNetwork) {
     // safeSigner = safeSignerOrNetwork as any;
@@ -396,18 +401,20 @@ export const executeViaSafe = async (
   let txServiceUrl;
   switch (chainId) {
     case 1:
-      txServiceUrl = "https://safe-transaction-mainnet.safe.global";
+      // txServiceUrl = "https://safe-transaction-mainnet.safe.global";
       break;
     case 122:
-      txServiceUrl = "https://transaction-fuse.safe.fuse.io";
+      txServiceUrl = "https://transaction-fuse.safe.fuse.io/api";
       break;
     case 42220:
-      txServiceUrl = "https://safe-transaction-celo.safe.global";
+      // txServiceUrl = "https://safe-transaction-celo.safe.global";
       break;
   }
   console.log("creating safe adapter", { txServiceUrl });
   const safeService = new SafeApiKit({
-    chainId: BigInt(chainId)
+    chainId: BigInt(chainId),
+    txServiceUrl,
+    apiKey: process.env.SAFE_TX_SERVICE_API_KEY || ""
   });
 
   const safeSdk = await Safe.init({