Skip to content

fix: [macro-m4] native asset lost on swapAndXcall #26

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
merged 3 commits into from
Jun 29, 2023
Merged

fix: [macro-m4] native asset lost on swapAndXcall #26

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
520b5ce
fix: native asset lost on swapAndXcall
liu-zhipeng Jun 1, 2023
d06e99c
fix: minor issue
liu-zhipeng Jun 1, 2023
00725bb
doc: address(0) treatment for swapAndXcall
liu-zhipeng Jun 2, 2023
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
22 changes: 15 additions & 7 deletions contracts/origin/Swap/SwapAndXCall.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ contract SwapAndXCall is SwapAdapter {
* @notice Calls a swapper contract and then calls xcall on connext
* @dev Data for the swap is generated offchain to call to the appropriate swapper contract
* Function is payable since it uses the relayer fee in native asset
* @param _fromAsset Address of the asset to swap from
* @param _toAsset Address of the asset to swap to
* @param _fromAsset Address of the asset to swap from. fromAsset can be both of ETH and ERC20
* @param _toAsset Address of the asset to swap to. toAsset can't be ETH. because connext doesn't support xcall with ETH
* @param _amountIn Amount of the asset to swap from
* @param _swapper Address of the swapper contract
* @param _swapData Data to call the swapper contract with
Expand All @@ -43,11 +43,14 @@ contract SwapAndXCall is SwapAdapter {
uint256 _slippage,
bytes calldata _callData
) external payable {
uint256 amountOut = _fromAsset == address(0)
require(_toAsset != address(0), "connext not support");

bool isNative = _fromAsset == address(0);
uint256 amountOut = isNative
? _setupAndSwapETH(_toAsset, _amountIn, _swapper, _swapData)
: _setupAndSwap(_fromAsset, _toAsset, _amountIn, _swapper, _swapData);

connext.xcall{value: _fromAsset == address(0) ? msg.value - _amountIn : msg.value}(
connext.xcall{value: isNative ? msg.value - _amountIn : msg.value}(
_destination,
_to,
_toAsset,
Expand All @@ -62,8 +65,8 @@ contract SwapAndXCall is SwapAdapter {
* @notice Calls a swapper contract and then calls xcall on connext
* @dev Data for the swap is generated offchain to call to the appropriate swapper contract
* Pays relayer fee from the input asset
* @param _fromAsset Address of the asset to swap from
* @param _toAsset Address of the asset to swap to
* @param _fromAsset Address of the asset to swap from. fromAsset can be both of ETH and ERC20
* @param _toAsset Address of the asset to swap to. toAsset can't be ETH. because connext doesn't support xcall with ETH
* @param _amountIn Amount of the asset to swap from
* @param _swapper Address of the swapper contract
* @param _swapData Data to call the swapper contract with
Expand All @@ -87,7 +90,12 @@ contract SwapAndXCall is SwapAdapter {
bytes calldata _callData,
uint256 _relayerFee
) external payable {
uint256 amountOut = _fromAsset == address(0)
require(_toAsset != address(0), "connext not support");

bool isNative = _fromAsset == address(0);
require(msg.value == (isNative ? _amountIn : 0), "!value");

uint256 amountOut = isNative
? _setupAndSwapETH(_toAsset, _amountIn, _swapper, _swapData)
: _setupAndSwap(_fromAsset, _toAsset, _amountIn, _swapper, _swapData);

Expand Down