mirror of
https://github.com/orionprotocol/sdk.git
synced 2026-03-27 16:17:47 +03:00
feat: updated generateSwapCalldata with custom fee from the path
This commit is contained in:
@@ -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",
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -181,6 +181,7 @@ export type SingleSwap = {
|
||||
factory: Factory
|
||||
assetAddressIn: string
|
||||
assetAddressOut: string
|
||||
fee?: number
|
||||
}
|
||||
|
||||
export type SwapInfoBase = {
|
||||
|
||||
Reference in New Issue
Block a user