Mirror/orionprotocol-sdk
1
0
Fork 0
mirror of https://github.com/orionprotocol/sdk.git synced 2026-03-14 06:02:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add final transfer from executor in any case

Browse Source
This commit is contained in:
lomonoshka
2023-10-30 20:24:58 +04:00
parent 43e0fa0abe
commit 4d9f09bc21
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@orionprotocol/sdk",
"version": "0.20.10-rc103",
"version": "0.20.10-rc104",
"description": "Orion Protocol SDK",
"main": "./lib/index.cjs",
"module": "./lib/index.js",

8
src/Unit/Exchange/generateSwapCalldata.ts
View File

@@ -131,7 +131,7 @@ export async function generateSwapCalldata({
));
}
calls = wrapOrUnwrapIfNeeded(amountNativeDecimals, swapDescription, calls);
calls = await wrapOrUnwrapIfNeeded(amountNativeDecimals, swapDescription, calls);
const calldata = generateCalls(calls);
return { swapDescription, calldata };
}
@@ -247,7 +247,7 @@ async function processMultiFactorySwaps(
return { swapDescription, calls };
}
function wrapOrUnwrapIfNeeded(amount: BigNumberish, swapDescription: LibValidator.SwapDescriptionStruct, calls: BytesLike[]): BytesLike[] {
async function wrapOrUnwrapIfNeeded(amount: BigNumberish, swapDescription: LibValidator.SwapDescriptionStruct, calls: BytesLike[]): Promise<BytesLike[]> {
if (swapDescription.srcToken === ZeroAddress) {
const wrapCall = generateWrapAndTransferCall(swapDescription.dstReceiver, { value: amount });
calls = ([wrapCall] as BytesLike[]).concat(calls);
@@ -256,6 +256,10 @@ function wrapOrUnwrapIfNeeded(amount: BigNumberish, swapDescription: LibValidato
let unwrapCall = generateUnwrapAndTransferCall(swapDescription.dstReceiver, 0);
unwrapCall = pathCallWithBalance(unwrapCall, swapDescription.dstToken);
calls.push(unwrapCall);
} else {
let transferCall = await generateTransferCall(swapDescription.dstToken, swapDescription.dstReceiver, 0);
transferCall = pathCallWithBalance(transferCall, swapDescription.dstToken);
calls.push(transferCall);
}
return calls;
}