Skip to content

Commit

Permalink
remove _hypervisor arg from yieldmanager::quickdeposit
Browse files Browse the repository at this point in the history
  • Loading branch information
ewansheldon committed Dec 20, 2024
1 parent 9883d6e commit 6f943c5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
8 changes: 3 additions & 5 deletions contracts/SmartVaultV4.sol
Original file line number Diff line number Diff line change
Expand Up @@ -333,13 +333,11 @@ contract SmartVaultV4 is ISmartVault, IRedeemable {
IERC20(_collateralToken).forceApprove(_swapRouterAddress, 0);
}

function redeposit(uint256 _withdrawn, uint256 _collateralBalance, address _hypervisor, address _collateralToken)
private
{
function redeposit(uint256 _withdrawn, uint256 _collateralBalance, address _collateralToken) private {
uint256 _redeposit = _withdrawn > _collateralBalance ? _collateralBalance : _withdrawn;
address _yieldManager = ISmartVaultManager(manager).yieldManager();
IERC20(_collateralToken).safeIncreaseAllowance(_yieldManager, _redeposit);
ISmartVaultYieldManager(_yieldManager).quickDeposit(_hypervisor, _collateralToken, _redeposit);
ISmartVaultYieldManager(_yieldManager).quickDeposit(_collateralToken, _redeposit);
IERC20(_collateralToken).forceApprove(_yieldManager, 0);
}

Expand Down Expand Up @@ -371,7 +369,7 @@ contract SmartVaultV4 is ISmartVault, IRedeemable {
if (_collateralBalance == 0) {
removeHypervisor(_hypervisor);
} else {
redeposit(_withdrawn, _collateralBalance, _hypervisor, _collateralToken);
redeposit(_withdrawn, _collateralBalance, _collateralToken);
}
}
if (undercollateralised()) revert Undercollateralised();
Expand Down
2 changes: 1 addition & 1 deletion contracts/SmartVaultYieldManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ contract SmartVaultYieldManager is ISmartVaultYieldManager, Ownable {
emit Withdraw(msg.sender, _token, _hypervisor, _withdrawn);
}

function quickDeposit(address _hypervisor, address _collateralToken, uint256 _deposit) external {
function quickDeposit(address _collateralToken, uint256 _deposit) external {
IERC20(_collateralToken).safeTransferFrom(msg.sender, address(this), _deposit);
HypervisorData memory _hypervisorData = hypervisorData[_collateralToken];
_otherDeposit(_collateralToken, _hypervisorData);
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/ISmartVaultYieldManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ interface ISmartVaultYieldManager {
external
returns (address vault0, address vault1);
function withdraw(address _hypervisor, address _token) external;
function quickDeposit(address _hypervisor, address _token, uint256 _deposit) external;
function quickDeposit(address _token, uint256 _deposit) external;
function quickWithdraw(address _hypervisor, address _token) external returns (uint256 _withdrawn);
}

0 comments on commit 6f943c5

Please sign in to comment.