@gooddollar/goodprotocol 1.0.9 → 1.0.13-beta.0

package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/432071a069fa44ffd3a7f92eee83d72e.json"
+  "buildInfo": "../../../build-info/78fe23216a2e71b0745d62e12899dde9.json"
 }

package/artifacts/contracts/unaudited-foundation/FuseFaucet.sol/FuseFaucet.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/432071a069fa44ffd3a7f92eee83d72e.json"
+  "buildInfo": "../../../build-info/78fe23216a2e71b0745d62e12899dde9.json"
 }

package/artifacts/contracts/unaudited-foundation/InvitesV1.sol/InvitesV1.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/432071a069fa44ffd3a7f92eee83d72e.json"
+  "buildInfo": "../../../build-info/78fe23216a2e71b0745d62e12899dde9.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/432071a069fa44ffd3a7f92eee83d72e.json"
+  "buildInfo": "../../../build-info/78fe23216a2e71b0745d62e12899dde9.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/432071a069fa44ffd3a7f92eee83d72e.json"
+  "buildInfo": "../../../build-info/78fe23216a2e71b0745d62e12899dde9.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/432071a069fa44ffd3a7f92eee83d72e.json"
+  "buildInfo": "../../../build-info/78fe23216a2e71b0745d62e12899dde9.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/432071a069fa44ffd3a7f92eee83d72e.json"
+  "buildInfo": "../../../build-info/78fe23216a2e71b0745d62e12899dde9.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/432071a069fa44ffd3a7f92eee83d72e.json"
+  "buildInfo": "../../../build-info/78fe23216a2e71b0745d62e12899dde9.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/432071a069fa44ffd3a7f92eee83d72e.json"
+  "buildInfo": "../../../build-info/78fe23216a2e71b0745d62e12899dde9.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/432071a069fa44ffd3a7f92eee83d72e.json"
+  "buildInfo": "../../../build-info/78fe23216a2e71b0745d62e12899dde9.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/432071a069fa44ffd3a7f92eee83d72e.json"
+  "buildInfo": "../../../build-info/78fe23216a2e71b0745d62e12899dde9.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/432071a069fa44ffd3a7f92eee83d72e.json"
+  "buildInfo": "../../../build-info/78fe23216a2e71b0745d62e12899dde9.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/432071a069fa44ffd3a7f92eee83d72e.json"
+  "buildInfo": "../../../build-info/78fe23216a2e71b0745d62e12899dde9.json"
 }

package/contracts/staking/BaseShareFieldV2.sol

@@ -1,26 +1,25 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0;
 import "../Interfaces.sol";
-import "openzeppelin-solidity/contracts/utils/math/Math.sol";
-import "../utils/DSMath.sol";
 
-contract BaseShareFieldV2 is DSMath {
+contract BaseShareFieldV2 {
 	// rewards claimed by users
-	uint128 public mintedRewards;
-	// number of blocks before reaching the max rewards multiplier (starting at 0.5 reaching 1 after maxMultiplierThreshold)
-	uint64 public maxMultiplierThreshold;
-	// Staking contracts accepts Tokens with max 18 decimals so this variable holds decimal difference between 18 and Token's decimal in order to make calculations
-	uint8 public tokenDecimalDifference;
+	uint128 mintedRewards;
 	// total staked for shares calculation
-	uint128 public totalProductivity;
+	uint128 totalProductivity;
 	// total staked that earns rewards (some stakers can donate their rewards)
-	uint128 public totalEffectiveStakes;
+	uint128 totalEffectiveStakes;
 	// rewards accumulated for distribution
-	uint128 public accumulatedRewards;
+	uint128 accumulatedRewards;
 	// block of last rewards accumulation
-	uint128 public lastRewardBlock;
+	uint128 lastRewardBlock;
+	// number of blocks before reaching the max rewards multiplier (starting at 0.5 reaching 1 after maxMultiplierThreshold)
+	uint64 maxMultiplierThreshold;
+	// Staking contracts accepts Tokens with max 18 decimals so this variable holds decimal difference between 18 and Token's decimal in order to make calculations
+	uint8 tokenDecimalDifference;
+
 	// accumulated rewards per share in 27 decimals precision
-	uint256 public accAmountPerShare;
+	uint256 accAmountPerShare;
 
 	//status of user rewards. everything is in 18 decimals
 	struct UserInfo {
@@ -34,6 +33,32 @@ contract BaseShareFieldV2 is DSMath {
 	}
 	mapping(address => UserInfo) public users;
 
+	function getStats()
+		external
+		view
+		returns (
+			uint256 _accAmountPerShare,
+			uint128 _mintedRewards,
+			uint128 _totalProductivity,
+			uint128 _totalEffectiveStakes,
+			uint128 _accumulatedRewards,
+			uint128 _lastRewardBlock,
+			uint64 _maxMultiplierThreshold,
+			uint8 _tokenDecimalDifference
+		)
+	{
+		return (
+			accAmountPerShare,
+			mintedRewards,
+			totalProductivity,
+			totalEffectiveStakes,
+			accumulatedRewards,
+			lastRewardBlock,
+			maxMultiplierThreshold,
+			tokenDecimalDifference
+		);
+	}
+
 	/**
 	 * @dev Helper function to check if caller is fund manager
 	 */
@@ -159,10 +184,10 @@ contract BaseShareFieldV2 is DSMath {
 	{
 		uint256 blocksPaid = _userInfo.lastRewardTime -
 			_userInfo.multiplierResetTime; // lastRewardTime is always >= multiplierResetTime
-		uint256 blocksPassedFirstMonth = Math.min(
-			maxMultiplierThreshold,
+		uint256 blocksPassedFirstMonth = maxMultiplierThreshold <
 			block.number - _userInfo.multiplierResetTime
-		);
+			? maxMultiplierThreshold
+			: block.number - _userInfo.multiplierResetTime;
 		// blocks which is after first month
 		uint256 blocksToPay = block.number - _userInfo.lastRewardTime; // blocks passed since last payment
 		uint256 firstMonthBlocksToPay = blocksPaid >= maxMultiplierThreshold
@@ -292,13 +317,12 @@ contract BaseShareFieldV2 is DSMath {
 		uint256 blockStart,
 		uint256 blockEnd
 	) public returns (uint256) {
-		UserInfo storage userInfo = users[user];
 		_canMintRewards();
 		_update(rewardsPerBlock, blockStart, blockEnd);
-		_audit(user, userInfo.amount, 1); // donationPer variable should be something different than zero so called with 1
-		uint128 amount = userInfo.rewardEarn;
-		userInfo.rewardEarn = 0;
-		userInfo.rewardMinted += amount;
+		_audit(user, users[user].amount, 1); // donationPer variable should be something different than zero so called with 1
+		uint128 amount = users[user].rewardEarn;
+		users[user].rewardEarn = 0;
+		users[user].rewardMinted += amount;
 		mintedRewards = mintedRewards + amount;
 		amount = amount / 1e16; // change decimal of mint amount to GD decimals
 		return amount;

package/contracts/staking/SimpleStaking.sol

@@ -174,11 +174,6 @@ abstract contract SimpleStaking is
 			uint256
 		);
 
-	/**
-	 * @dev Approve infinite tokens to defi protocols in order to save gas
-	 */
-	function _approveTokens() internal virtual;
-
 	/**
 	 * @dev Allows a staker to deposit Tokens. Notice that `approve` is
 	 * needed to be executed before the execution of this method.
@@ -368,8 +363,6 @@ abstract contract SimpleStaking is
 		);
 
 		if (address(sd) != address(0)) {
-			address[] memory contracts;
-			contracts[0] = (address(this));
 			sd.userWithdraw(_from, _value);
 			sd.userStaked(_to, _value);
 		}

package/contracts/staking/SimpleStakingV2.sol

@@ -83,10 +83,7 @@ abstract contract SimpleStakingV2 is
 		token = ERC20(_token);
 		iToken = ERC20(_iToken);
 		__ERC20_init(_tokenName, _tokenSymbol);
-		require(
-			token.decimals() <= 18,
-			"Token decimals should be less than 18 decimals"
-		);
+		require(token.decimals() <= 18, "decimals");
 		tokenDecimalDifference = 18 - token.decimals();
 		maxMultiplierThreshold = _maxRewardThreshold;
 	}
@@ -102,7 +99,7 @@ abstract contract SimpleStakingV2 is
 	 * @return Worth of given amount of iToken in Token
 	 */
 	function iTokenWorthInToken(uint256 _amount)
-		public
+		internal
 		view
 		virtual
 		returns (uint256);
@@ -174,11 +171,6 @@ abstract contract SimpleStakingV2 is
 			uint256
 		);
 
-	/**
-	 * @dev Approve infinite tokens to defi protocols in order to save gas
-	 */
-	function _approveTokens() internal virtual;
-
 	/**
 	 * @dev Allows a staker to deposit Tokens. Notice that `approve` is
 	 * needed to be executed before the execution of this method.
@@ -193,18 +185,15 @@ abstract contract SimpleStakingV2 is
 		bool _inInterestToken
 	) external virtual nonReentrant {
 		require(isPaused == false, "Staking is paused");
-		require(
-			_donationPer == 0 || _donationPer == 100,
-			"Donation percentage should be 0 or 100"
-		);
-		require(_amount > 0, "You need to stake a positive token amount");
+		require(_donationPer == 0 || _donationPer == 100, "donationPer");
+		require(_amount > 0, "amount");
 		require(
 			(_inInterestToken ? iToken : token).transferFrom(
 				_msgSender(),
 				address(this),
 				_amount
 			),
-			"transferFrom failed, make sure you approved token transfer"
+			"approve"
 		);
 		_amount = _inInterestToken ? iTokenWorthInToken(_amount) : _amount;
 		if (_inInterestToken == false) {
@@ -255,10 +244,7 @@ abstract contract SimpleStakingV2 is
 
 		if (_inInterestToken) {
 			uint256 tokenWorth = iTokenWorthInToken(_amount);
-			require(
-				iToken.transfer(_msgSender(), _amount),
-				"withdraw transfer failed"
-			);
+			require(iToken.transfer(_msgSender(), _amount), "iWithdraw");
 			tokenWithdraw = _amount = tokenWorth;
 		} else {
 			tokenWithdraw = _amount;
@@ -269,10 +255,7 @@ abstract contract SimpleStakingV2 is
 			if (tokenActual < tokenWithdraw) {
 				tokenWithdraw = tokenActual;
 			}
-			require(
-				token.transfer(_msgSender(), tokenWithdraw),
-				"withdraw transfer failed"
-			);
+			require(token.transfer(_msgSender(), tokenWithdraw), "withdraw");
 		}
 
 		GoodFundManager fm = GoodFundManager(
@@ -344,7 +327,6 @@ abstract contract SimpleStakingV2 is
 		uint256 _value
 	) internal override {
 		super._transfer(_from, _to, _value);
-
 		StakersDistribution sd = StakersDistribution(
 			nameService.getAddress("GDAO_STAKERS")
 		);
@@ -368,8 +350,6 @@ abstract contract SimpleStakingV2 is
 		);
 
 		if (address(sd) != address(0)) {
-			address[] memory contracts;
-			contracts[0] = (address(this));
 			sd.userWithdraw(_from, _value);
 			sd.userStaked(_to, _value);
 		}
@@ -403,11 +383,6 @@ abstract contract SimpleStakingV2 is
 		)
 	{
 		_canMintRewards();
-		// otherwise fund manager has to wait for the next interval
-		require(
-			_recipient != address(this),
-			"Recipient cannot be the staking contract"
-		);
 
 		(uint256 iTokenGains, uint256 tokenGains, , , ) = currentGains(
 			false,
@@ -449,15 +424,9 @@ abstract contract SimpleStakingV2 is
 
 		// recover left iToken(stakers token) only when all stakes have been withdrawn
 		if (address(_token) == address(iToken)) {
-			require(
-				totalProductivity == 0 && isPaused,
-				"can recover iToken only when stakes have been withdrawn"
-			);
+			require(totalProductivity == 0 && isPaused, "recover");
 		}
-		require(
-			_token.transfer(address(avatar), toWithdraw),
-			"recover transfer failed"
-		);
+		require(_token.transfer(address(avatar), toWithdraw), "transfer");
 	}
 
 	/**
@@ -478,10 +447,7 @@ abstract contract SimpleStakingV2 is
 	}
 
 	function _canMintRewards() internal view override {
-		require(
-			_msgSender() == nameService.getAddress("FUND_MANAGER"),
-			"Only FundManager can call this method"
-		);
+		require(_msgSender() == nameService.getAddress("FUND_MANAGER"), "fund");
 	}
 
 	function decimals() public view virtual override returns (uint8) {

package/contracts/staking/aave/AaveStakingFactory.sol

@@ -2,7 +2,7 @@
 
 pragma solidity >=0.8.0;
 import "@openzeppelin/contracts-upgradeable/proxy/ClonesUpgradeable.sol";
-import "./GoodAaveStaking.sol";
+import "./GoodAaveStakingV2.sol";
 import "../../Interfaces.sol";
 
 /**
@@ -14,19 +14,43 @@ import "../../Interfaces.sol";
 contract AaveStakingFactory {
 	using ClonesUpgradeable for address;
 
-	address impl = address(new GoodAaveStaking());
+	address public impl = address(new GoodAaveStakingV2());
 
-	event Deployed(address proxy, address token);
+	event Deployed(address proxy, address token, address impl);
 
-	function clone(ERC20 token, bytes32 paramsHash)
-		public
-		returns (GoodAaveStaking)
-	{
-		address deployed = address(impl).cloneDeterministic(
+	function clone(
+		address _impl,
+		ERC20 token,
+		bytes32 paramsHash
+	) internal returns (GoodAaveStakingV2) {
+		address deployed = address(_impl).cloneDeterministic(
 			keccak256(abi.encodePacked(address(token), paramsHash))
 		);
-		emit Deployed(deployed, address(token));
-		return GoodAaveStaking(deployed);
+		emit Deployed(deployed, address(token), _impl);
+		return GoodAaveStakingV2(deployed);
+	}
+
+	function cloneAndInit(
+		ERC20 token,
+		address _lendingPool,
+		INameService _ns,
+		uint64 _maxRewardThreshold,
+		address _tokenUsdOracle,
+		IAaveIncentivesController _incentiveController,
+		address _aaveUSDOracle,
+		address[] memory _tokenToDaiSwapPath
+	) public {
+		cloneAndInit(
+			impl,
+			token,
+			_lendingPool,
+			_ns,
+			_maxRewardThreshold,
+			_tokenUsdOracle,
+			_incentiveController,
+			_aaveUSDOracle,
+			_tokenToDaiSwapPath
+		);
 	}
 
 	/**
@@ -40,6 +64,7 @@ contract AaveStakingFactory {
 	@param _aaveUSDOracle address of the AAVE/USD oracle
 	 */
 	function cloneAndInit(
+		address _impl,
 		ERC20 token,
 		address _lendingPool,
 		INameService _ns,
@@ -49,7 +74,8 @@ contract AaveStakingFactory {
 		address _aaveUSDOracle,
 		address[] memory _tokenToDaiSwapPath
 	) public {
-		GoodAaveStaking deployed = clone(
+		GoodAaveStakingV2 deployed = clone(
+			_impl,
 			token,
 			keccak256(
 				abi.encodePacked(
@@ -67,8 +93,8 @@ contract AaveStakingFactory {
 			address(token),
 			address(_lendingPool),
 			_ns,
-			string(abi.encodePacked("GoodAaveStaking ", token.name())),
-			string(abi.encodePacked("g", token.symbol())),
+			string(abi.encodePacked("GoodAaveStakingV2 ", token.name())),
+			string(abi.encodePacked("ga", token.symbol())),
 			_maxRewardThreshold,
 			_tokenUsdOracle,
 			_incentiveController,
@@ -77,13 +103,13 @@ contract AaveStakingFactory {
 		);
 	}
 
-	function predictAddress(ERC20 token, bytes32 paramsHash)
-		public
-		view
-		returns (address)
-	{
+	function predictAddress(
+		address _impl,
+		ERC20 token,
+		bytes32 paramsHash
+	) public view returns (address) {
 		return
-			address(impl).predictDeterministicAddress(
+			address(_impl).predictDeterministicAddress(
 				keccak256(abi.encodePacked(address(token), paramsHash))
 			);
 	}

package/contracts/staking/aave/GoodAaveStaking.sol

@@ -262,7 +262,7 @@ contract GoodAaveStaking is SimpleStaking {
 		return _amount; // since aToken is peg to Token 1:1 return exact amount
 	}
 
-	function _approveTokens() internal override {
+	function _approveTokens() internal {
 		address uniswapRouter = nameService.getAddress("UNISWAP_ROUTER");
 		token.approve(uniswapRouter, type(uint256).max);
 		token.approve(address(lendingPool), type(uint256).max); // approve the transfers to defi protocol as much as possible in order to save gas

package/contracts/staking/aave/GoodAaveStakingV2.sol

@@ -247,7 +247,7 @@ contract GoodAaveStakingV2 is SimpleStakingV2 {
 	 * @return Worth of given amount of token in Token
 	 */
 	function iTokenWorthInToken(uint256 _amount)
-		public
+		internal
 		view
 		override
 		returns (uint256)
@@ -255,7 +255,7 @@ contract GoodAaveStakingV2 is SimpleStakingV2 {
 		return _amount; // since aToken is peg to Token 1:1 return exact amount
 	}
 
-	function _approveTokens() internal override {
+	function _approveTokens() internal {
 		address uniswapRouter = nameService.getAddress("UNISWAP_ROUTER");
 		token.approve(uniswapRouter, type(uint256).max);
 		token.approve(address(lendingPool), type(uint256).max); // approve the transfers to defi protocol as much as possible in order to save gas

package/contracts/staking/compound/CompoundStakingFactory.sol

@@ -2,7 +2,7 @@
 
 pragma solidity >=0.8.0;
 import "@openzeppelin/contracts-upgradeable/proxy/ClonesUpgradeable.sol";
-import "./GoodCompoundStaking.sol";
+import "./GoodCompoundStakingV2.sol";
 import "../../Interfaces.sol";
 
 /**
@@ -14,23 +14,44 @@ import "../../Interfaces.sol";
 contract CompoundStakingFactory {
 	using ClonesUpgradeable for address;
 
-	address impl = address(new GoodCompoundStaking());
+	address public impl = address(new GoodCompoundStakingV2());
 
-	event Deployed(address proxy, address cToken);
+	event Deployed(address proxy, address cToken, address impl);
 
-	function clone(cERC20 cToken, bytes32 paramsHash)
-		public
-		returns (GoodCompoundStaking)
-	{
-		address deployed = address(impl).cloneDeterministic(
+	function clone(
+		address _impl,
+		cERC20 cToken,
+		bytes32 paramsHash
+	) internal returns (GoodCompoundStakingV2) {
+		address deployed = address(_impl).cloneDeterministic(
 			keccak256(abi.encodePacked(address(cToken), paramsHash))
 		);
-		emit Deployed(deployed, address(cToken));
-		return GoodCompoundStaking(deployed);
+		emit Deployed(deployed, address(cToken), _impl);
+		return GoodCompoundStakingV2(deployed);
+	}
+
+	function cloneAndInit(
+		cERC20 _cToken,
+		INameService _ns,
+		uint64 _maxRewardThreshold,
+		address _tokenUsdOracle,
+		address _compUsdOracle,
+		address[] memory _tokenToDaiSwapPath
+	) public {
+		cloneAndInit(
+			impl,
+			_cToken,
+			_ns,
+			_maxRewardThreshold,
+			_tokenUsdOracle,
+			_compUsdOracle,
+			_tokenToDaiSwapPath
+		);
 	}
 
 	/**
 	@dev Function to clone Staking contract and initialize new one with new ctoken
+	@param _impl address of contract to clone
 	@param cToken Staking cToken to use in staking contract
 	@param _ns NameService that holds whole necessary addresses
 	@param _maxRewardThreshold Block numbers that need to pass in order to user would get their rewards with 1x multiplier instead of 0.5x
@@ -38,6 +59,7 @@ contract CompoundStakingFactory {
 	@param _compUsdOracle address of the AAVE/USD oracle
 	 */
 	function cloneAndInit(
+		address _impl,
 		cERC20 cToken,
 		INameService _ns,
 		uint64 _maxRewardThreshold,
@@ -45,7 +67,8 @@ contract CompoundStakingFactory {
 		address _compUsdOracle,
 		address[] memory _tokenToDaiSwapPath
 	) public {
-		GoodCompoundStaking deployed = clone(
+		GoodCompoundStakingV2 deployed = clone(
+			_impl,
 			cToken,
 			keccak256(
 				abi.encodePacked(
@@ -60,7 +83,7 @@ contract CompoundStakingFactory {
 			cToken.underlying(),
 			address(cToken),
 			_ns,
-			string(abi.encodePacked("GoodCompoundStaking ", cToken.name())),
+			string(abi.encodePacked("GoodCompoundStakingV2 ", cToken.name())),
 			string(abi.encodePacked("g", cToken.symbol())),
 			_maxRewardThreshold,
 			_tokenUsdOracle,
@@ -69,13 +92,13 @@ contract CompoundStakingFactory {
 		);
 	}
 
-	function predictAddress(cERC20 cToken, bytes32 paramsHash)
-		public
-		view
-		returns (address)
-	{
+	function predictAddress(
+		address _impl,
+		cERC20 cToken,
+		bytes32 paramsHash
+	) public view returns (address) {
 		return
-			address(impl).predictDeterministicAddress(
+			address(_impl).predictDeterministicAddress(
 				keccak256(abi.encodePacked(address(cToken), paramsHash))
 			);
 	}

package/contracts/staking/compound/GoodCompoundStaking.sol

@@ -315,7 +315,7 @@ contract GoodCompoundStaking is SimpleStaking {
 		compCollectGasCost = _rewardTokenCollectCost;
 	}
 
-	function _approveTokens() internal override {
+	function _approveTokens() internal {
 		address uniswapRouter = address(uniswapContract);
 		comp.approve(uniswapRouter, type(uint256).max);
 		token.approve(uniswapRouter, type(uint256).max);