Skip to content

simplify _withdraw #2741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sparrowDom merged 2 commits into from
Jan 13, 2026
Merged

simplify _withdraw #2741

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
015bd56
simplify _withdraw
sparrowDom Jan 9, 2026
659c3b8
Merge remote-tracking branch 'origin/shah/cross-chain-strategy-cctpv2…
sparrowDom Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions contracts/contracts/strategies/crosschain/CrossChainMasterStrategy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ contract CrossChainMasterStrategy is
uint256 _amount
) external override onlyVault nonReentrant {
require(_recipient == vaultAddress, "Only Vault can withdraw");

_withdraw(_asset, _recipient, _amount);
_withdraw(_asset, _amount);
}

/// @inheritdoc InitializableAbstractStrategy
Expand All @@ -121,8 +120,6 @@ contract CrossChainMasterStrategy is

_withdraw(
usdcToken,
vaultAddress,
// Withdraw at most the max transfer amount
_remoteBalance > MAX_TRANSFER_AMOUNT
? MAX_TRANSFER_AMOUNT
: _remoteBalance
Expand Down Expand Up @@ -264,18 +261,17 @@ contract CrossChainMasterStrategy is
/**
* @dev Send a withdraw request to the remote strategy
* @param _asset Address of the asset to withdraw
* @param _recipient Address to receive the withdrawn asset
* @param _amount Amount of the asset to withdraw
*/
function _withdraw(
address _asset,
address _recipient,
uint256 _amount
) internal virtual {
function _withdraw(address _asset, uint256 _amount) internal virtual {
require(_asset == usdcToken, "Unsupported asset");
// Withdraw at least 1 USDC
<<<<<<< HEAD
Copy link
Member Author

@sparrowDom sparrowDom Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I force pushed this fix and github hasn't picked up on it. This didn't land into the base branch

require(_amount > 1e6, "Withdraw amount too small");
=======
require(_amount >= 1e6, "Withdraw amount too small");
require(_recipient == vaultAddress, "Only Vault can withdraw");
>>>>>>> origin/shah/cross-chain-strategy-cctpv2
require(
_amount <= remoteStrategyBalance,
"Withdraw amount exceeds remote strategy balance"
Expand Down
Loading