feat: updated generateSwapCalldata with custom fee from the path

This commit is contained in:
Mikhail Gladchenko
2024-05-23 10:42:11 +01:00
parent 495313546d
commit eed05bd830
5 changed files with 8 additions and 6 deletions

View File

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

View File

@@ -19,7 +19,8 @@ export async function generateUni2Calls(
currentSwap.pool,
currentSwap.assetIn,
currentSwap.assetOut,
nextSwap.pool
nextSwap.pool,
nextSwap.fee
)
calls.push(call)
}
@@ -51,4 +52,4 @@ export function generateUni2Call(
ethers.AbiCoder.defaultAbiCoder().encode(['uint256'], [concat([toBeHex(fee), recipient])]),
])
return addCallParams(calldata)
}
}

View File

@@ -311,14 +311,14 @@ async function processMultiFactorySwaps(
case 'OrionV2': {
let transferCall = generateTransferCall(swap.assetIn, swap.pool, 0);
transferCall = pathCallWithBalance(transferCall, swap.assetIn);
const uni2Call = generateUni2Call(swap.pool, swap.assetIn, swap.assetOut, swapExecutorContractAddress);
const uni2Call = generateUni2Call(swap.pool, swap.assetIn, swap.assetOut, swapExecutorContractAddress, swap.fee);
calls.push(transferCall, uni2Call);
break;
}
case 'UniswapV2': {
let transferCall = generateTransferCall(swap.assetIn, swap.pool, 0);
transferCall = pathCallWithBalance(transferCall, swap.assetIn);
const uni2Call = generateUni2Call(swap.pool, swap.assetIn, swap.assetOut, swapExecutorContractAddress);
const uni2Call = generateUni2Call(swap.pool, swap.assetIn, swap.assetOut, swapExecutorContractAddress, swap.fee);
calls.push(transferCall, uni2Call);
break;
}

View File

@@ -42,7 +42,7 @@ const swapInfoSchemaBase = baseMessageSchema.extend({
f: factorySchema, // factory
aai: z.string(), // asset address in
aao: z.string(), // asset address out
fee: z.number(), // fee
fee: z.number().optional(), // fee
})),
usd: z.object({ // USD info of this swap, nullable
aa: z.number().optional(), // available amount in, USD

View File

@@ -181,6 +181,7 @@ export type SingleSwap = {
factory: Factory
assetAddressIn: string
assetAddressOut: string
fee?: number
}
export type SwapInfoBase = {