Skip to content

Commit

Permalink
fix: caching
Browse files Browse the repository at this point in the history
  • Loading branch information
@Schlagonia
Schlagonia committed Aug 9, 2023
1 parent 6bab751 commit 42960da
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 70 deletions.
115 changes: 49 additions & 66 deletions src/Strategy.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ contract Strategy is BaseTokenizedStrategy, UniswapV3Swapper {
bool public leaveDebtBehind;

// This is the address of the main V3 pool
Comet public comet;
Comet public immutable comet;
// This is the token we will be borrowing/supplying
address public baseToken;
address public immutable baseToken;
// The contract to get Comp rewards from
CometRewards public constant rewardsContract =
CometRewards(0x1B0e765F6224C21223AeA2af16c1C46E38885a40);

// The Contract that will deposit the baseToken back into Compound
Depositer public depositer;
Depositer public immutable depositer;

// The reward Token
address internal constant comp = 0xc00e94Cb662C3520282E6f5717214004A7f26888;
Expand Down Expand Up @@ -64,7 +64,41 @@ contract Strategy is BaseTokenizedStrategy, UniswapV3Swapper {
uint24 _ethToAssetFee,
address _depositer
) BaseTokenizedStrategy(_asset, _name) {
initializeCompV3LenderBorrower(_comet, _ethToAssetFee, _depositer);
comet = Comet(_comet);

//Get the baseToken we wil borrow and the min
baseToken = comet.baseToken();
minThreshold = comet.baseBorrowMin();

depositer = Depositer(_depositer);
require(baseToken == address(depositer.baseToken()), "!base");

// to supply asset as collateral
ERC20(asset).safeApprove(_comet, type(uint256).max);
// to repay debt
ERC20(baseToken).safeApprove(_comet, type(uint256).max);
// for depositer to pull funds to deposit
ERC20(baseToken).safeApprove(_depositer, type(uint256).max);
// to sell reward tokens
ERC20(comp).safeApprove(address(router), type(uint256).max);

// Set the needed variables for the Uni Swapper
// Base will be weth.
base = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
// UniV3 mainnet router.
router = 0xE592427A0AEce92De3Edee1F18E0157C05861564;
// Set the min amount for the swapper to sell
minAmountToSell = 1e12;

//Default to .3% pool for comp/eth and to .05% pool for eth/baseToken
_setFees(3000, 500, _ethToAssetFee);

// set default price feeds
priceFeeds[baseToken] = comet.baseTokenPriceFeed();
// default to COMP/USD
priceFeeds[comp] = 0xdbd020CAeF83eFd542f4De03e3cF0C28A4428bd5;
// default to given feed for asset
priceFeeds[asset] = comet.getAssetInfoByAddress(asset).priceFeed;
}

// ----------------- SETTERS -----------------
Expand Down Expand Up @@ -115,50 +149,6 @@ contract Strategy is BaseTokenizedStrategy, UniswapV3Swapper {
_setUniFees(asset, _weth, _ethToAssetFee);
}

function initializeCompV3LenderBorrower(
address _comet,
uint24 _ethToAssetFee,
address _depositer
) public {
// Make sure we only initialize one time
require(address(comet) == address(0));
comet = Comet(_comet);

//Get the baseToken we wil borrow and the min
baseToken = comet.baseToken();
minThreshold = comet.baseBorrowMin();

depositer = Depositer(_depositer);
require(baseToken == address(depositer.baseToken()), "!base");

// to supply asset as collateral
ERC20(asset).safeApprove(_comet, type(uint256).max);
// to repay debt
ERC20(baseToken).safeApprove(_comet, type(uint256).max);
// for depositer to pull funds to deposit
ERC20(baseToken).safeApprove(_depositer, type(uint256).max);
// to sell reward tokens
//ERC20(comp).safeApprove(address(router), type(uint256).max);

// Set the needed variables for the Uni Swapper
// Base will be weth.
base = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
// UniV3 mainnet router.
router = 0xE592427A0AEce92De3Edee1F18E0157C05861564;
// Set the min amount for the swapper to sell
minAmountToSell = 1e12;

//Default to .3% pool for comp/eth and to .05% pool for eth/baseToken
_setFees(3000, 500, _ethToAssetFee);

// set default price feeds
priceFeeds[baseToken] = comet.baseTokenPriceFeed();
// default to COMP/USD
priceFeeds[comp] = 0xdbd020CAeF83eFd542f4De03e3cF0C28A4428bd5;
// default to given feed for asset
priceFeeds[asset] = comet.getAssetInfoByAddress(asset).priceFeed;
}


/*//////////////////////////////////////////////////////////////
NEEDED TO BE OVERRIDEN BY STRATEGIST
Expand Down Expand Up @@ -368,20 +358,16 @@ contract Strategy is BaseTokenizedStrategy, UniswapV3Swapper {
// ----------------- INTERNAL FUNCTIONS SUPPORT ----------------- \\

function _leveragePosition(uint256 _amount) internal {
// Cache variables
address _asset = asset;
address _baseToken = baseToken;

// Could be 0 n tends.
if (_amount > 0) {
_supply(_asset, _amount);
_supply(asset, _amount);
}

// NOTE: debt + collateral calcs are done in USD
uint256 collateralInUsd = _toUsd(balanceOfCollateral(), _asset);
uint256 collateralInUsd = _toUsd(balanceOfCollateral(), asset);

// convert debt to USD
uint256 debtInUsd = _toUsd(balanceOfDebt(), _baseToken);
uint256 debtInUsd = _toUsd(balanceOfDebt(), baseToken);

// LTV numbers are always in 1e18
uint256 currentLTV = (debtInUsd * 1e18) / collateralInUsd;
Expand All @@ -401,7 +387,7 @@ contract Strategy is BaseTokenizedStrategy, UniswapV3Swapper {

uint256 amountToBorrowUsd = targetDebtUsd - debtInUsd; // safe bc we checked ratios
// convert to BaseToken
uint256 amountToBorrowBT = _fromUsd(amountToBorrowUsd, _baseToken);
uint256 amountToBorrowBT = _fromUsd(amountToBorrowUsd, baseToken);

// We want to make sure that the reward apr > borrow apr so we dont reprot a loss
// Borrowing will cause the borrow apr to go up and the rewards apr to go down
Expand All @@ -424,7 +410,7 @@ contract Strategy is BaseTokenizedStrategy, UniswapV3Swapper {

// Withdraw the difference from the Depositer
_withdrawFromDepositer(
_fromUsd(debtInUsd - targetDebtUsd, _baseToken)
_fromUsd(debtInUsd - targetDebtUsd, baseToken)
); // we withdraw from BaseToken depositer
_repayTokenDebt(); // we repay the BaseToken debt with compound
}
Expand Down Expand Up @@ -711,29 +697,26 @@ contract Strategy is BaseTokenizedStrategy, UniswapV3Swapper {
function _claimAndSellRewards() internal {
_claimRewards();

address _comp = comp;

uint256 compBalance = ERC20(_comp).balanceOf(address(this));
uint256 compBalance = ERC20(comp).balanceOf(address(this));

uint256 baseNeeded = baseTokenOwedBalance();

if (baseNeeded > 0) {
address _baseToken = baseToken;
// We estimate how much we will need in order to get the amount of base
// Accounts for slippage and diff from oracle price, just to assure no horrible sandwhich
uint256 maxComp = (_fromUsd(_toUsd(baseNeeded, _baseToken), _comp) *
uint256 maxComp = (_fromUsd(_toUsd(baseNeeded, baseToken), comp) *
10_500) / MAX_BPS;
if (maxComp < compBalance) {
// If we have enough swap and exact amount out
_swapTo(_comp, _baseToken, baseNeeded, maxComp);
_swapTo(comp, baseToken, baseNeeded, maxComp);
} else {
// if not swap everything we have
_swapFrom(_comp, _baseToken, compBalance, 0);
_swapFrom(comp, baseToken, compBalance, 0);
}
}

compBalance = ERC20(_comp).balanceOf(address(this));
_swapFrom(_comp, asset, compBalance, 0);
compBalance = ERC20(comp).balanceOf(address(this));
_swapFrom(comp, asset, compBalance, 0);
}

// This should only ever get called when withdrawing all funds from the strategy if there is debt left over.
Expand Down
3 changes: 0 additions & 3 deletions src/TokenizedCompV3LenderBorrowerFactory.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {IStrategyInterface} from "./interfaces/IStrategyInterface.sol";

contract TokenizedCompV3LenderBorrowerFactory {

address public immutable originalDepositer;
address public immutable managment;
address public immutable rewards;
address public immutable keeper;
Expand All @@ -23,8 +22,6 @@ contract TokenizedCompV3LenderBorrowerFactory {
managment = _managment;
rewards = _rewards;
keeper = _keeper;

originalDepositer = address(new Depositer());
}

function name() external pure returns (string memory) {
Expand Down
3 changes: 2 additions & 1 deletion src/test/Operation.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ contract OperationTest is Setup {
"!perf fee out"
);
}

/**
function test_tendTrigger(uint256 _amount) public {
vm.assume(_amount > minFuzzAmount && _amount < maxFuzzAmount);
Expand Down Expand Up @@ -190,4 +190,5 @@ contract OperationTest is Setup {
assertTrue(!strategy.tendTrigger());
}
*/
}

0 comments on commit 42960da

Please sign in to comment.