From 90b92dcfd2242902496a4dc6c4c4becd1f934164 Mon Sep 17 00:00:00 2001 From: Nicolas Lecouflet Date: Tue, 6 Aug 2024 18:35:03 +0200 Subject: [PATCH] refactor: use share token directly --- scripts/WithdrawPayloadScript.s.sol | 2 +- utils/Withdraw.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/WithdrawPayloadScript.s.sol b/scripts/WithdrawPayloadScript.s.sol index 1210224..8d818d1 100644 --- a/scripts/WithdrawPayloadScript.s.sol +++ b/scripts/WithdrawPayloadScript.s.sol @@ -23,7 +23,7 @@ contract WithdrawPayloadScript is Script { ROUTER_ADDRESS = routerAddress; ERC4626Strategy stUSDStrat = ERC4626Strategy(strategyAddress); - stUSDStrat.approve(ROUTER_ADDRESS, stUSDStrat.convertToShares(inputTokenAmount) + 1); + stUSDStrat.approve(ROUTER_ADDRESS, inputTokenAmount); (bool success, ) = ROUTER_ADDRESS.call(data); require(success, "Withdraw - mixer() call failed"); diff --git a/utils/Withdraw.sh b/utils/Withdraw.sh index df959ce..957f0b1 100755 --- a/utils/Withdraw.sh +++ b/utils/Withdraw.sh @@ -57,14 +57,14 @@ case $env in ;; esac -# Execute the cast call and store the full result -FULL_RESULT=$(cast call $strategyAddress "maxWithdraw(address)(uint256)" $userAddress --rpc-url fork) +# # Execute the cast call and store the full result +# FULL_RESULT=$(cast call $strategyAddress "maxRedeem(address)(uint256)" $userAddress --rpc-url fork) -# Extract only the numeric part before the space -WITHDRAW_AMOUNT=$(echo $FULL_RESULT | awk '{print $1}') +# # Extract only the numeric part before the space +# WITHDRAW_AMOUNT=$(echo $FULL_RESULT | awk '{print $1}') # Construct the URL -url="${base_url}/v1/integrators/payload/withdraw?chainId=$chainId&outputTokenAddress=$outputTokenAddress&inputTokenAmount=$WITHDRAW_AMOUNT&strategyAddress=$strategyAddress&userAddress=$userAddress&slippage=$slippage&ipAddress=none" +url="${base_url}/v1/integrators/payload/withdraw?chainId=$chainId&outputTokenAddress=$outputTokenAddress&inputTokenAmount=$inputTokenAmount&strategyAddress=$strategyAddress&userAddress=$userAddress&slippage=$slippage&ipAddress=none" echo $url @@ -88,4 +88,4 @@ forge script scripts/WithdrawPayloadScript.s.sol \ --evm-version shanghai \ --broadcast \ -vvvv \ - --sig "run(bytes,address,uint256,address,address)" "$data" "$outputTokenAddress" "$WITHDRAW_AMOUNT" "$strategyAddress" "$routerAddress" \ No newline at end of file + --sig "run(bytes,address,uint256,address,address)" "$data" "$outputTokenAddress" "$inputTokenAmount" "$strategyAddress" "$routerAddress" \ No newline at end of file