increases pool TWAP in autoredemption, and uses amount of USDs out of…

… swap, rather than contract balance
the-standard · Jan 2, 2025 · a8cdc77 · a8cdc77
1 parent 3c5e136
commit a8cdc77
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/contracts/AutoRedemption.sol b/contracts/AutoRedemption.sol
@@ -21,7 +21,7 @@ contract AutoRedemption is AutomationCompatibleInterface, FunctionsClient, Confi
 
     uint32 private constant MAX_REQ_GAS = 300000;
     uint160 private constant TARGET_PRICE = 79228162514264337593543;
-    uint32 private constant TWAP_INTERVAL = 300;
+    uint32 private constant TWAP_INTERVAL = 1800;
 
     bytes32 private lastRequestId;
     bytes32 private immutable donID;

diff --git a/contracts/SmartVaultV4.sol b/contracts/SmartVaultV4.sol
@@ -315,10 +315,10 @@ contract SmartVaultV4 is ISmartVault, IRedeemable {
         address _collateralToken,
         bytes memory _swapPath,
         uint256 _USDsTargetAmount
-    ) private {
+    ) private returns (uint256 _amountOut) {
         uint256 _amountIn = calculateAmountIn(_quoterAddress, _collateralToken, _swapPath, _USDsTargetAmount);
         IERC20(_collateralToken).safeIncreaseAllowance(_swapRouterAddress, _amountIn);
-        ISwapRouter(_swapRouterAddress).exactInput(
+        _amountOut = ISwapRouter(_swapRouterAddress).exactInput(
             ISwapRouter.ExactInputParams({
                 path: _swapPath,
                 recipient: address(this),
@@ -366,8 +366,7 @@ contract SmartVaultV4 is ISmartVault, IRedeemable {
             _collateralToken = ISmartVaultManager(manager).weth();
             IWETH(_collateralToken).deposit{value: address(this).balance}();
         }
-        swapCollateral(_swapRouterAddress, _quoterAddress, _collateralToken, _swapPath, _USDsTargetAmount);
-        _redeemed = USDs.balanceOf(address(this));
+        uint256 _redeemed = swapCollateral(_swapRouterAddress, _quoterAddress, _collateralToken, _swapPath, _USDsTargetAmount);
         minted -= _redeemed;
         USDs.burn(address(this), _redeemed);
         if (_hypervisor != address(0) && _withdrawn > 0) {