From df38bfdc2cf3cdd89e6f34f060c19b4d9937bcd8 Mon Sep 17 00:00:00 2001 From: Dmitriy Pavlov Date: Thu, 10 Aug 2023 18:46:10 +0300 Subject: [PATCH] add eps types to services --- package.json | 2 +- src/Unit/Exchange/generateSwapCalldata.ts | 4 +--- src/services/Aggregator/ws/index.ts | 6 ++++++ src/types.ts | 8 ++++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 1f69f76..8cc0e0a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.19.48-dev.2-rc-0", + "version": "0.19.48-dev.2-rc-1", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/Unit/Exchange/generateSwapCalldata.ts b/src/Unit/Exchange/generateSwapCalldata.ts index 15f7399..b525e12 100644 --- a/src/Unit/Exchange/generateSwapCalldata.ts +++ b/src/Unit/Exchange/generateSwapCalldata.ts @@ -125,8 +125,6 @@ export default async function generateSwapCalldata({ return { swapDescription, calldata } } - - export async function generateUni2Calls( exchangeAddress: string, path: SafeArray @@ -306,4 +304,4 @@ function addCallParams( async function generateCalls(calls: BytesLike[]) { const executorInterface = SwapExecutor__factory.createInterface() return "0x" + executorInterface.encodeFunctionData(EXECUTOR_SWAP_FUNCTION, [ethers.constants.AddressZero, calls]).slice(74) -} \ No newline at end of file +} diff --git a/src/services/Aggregator/ws/index.ts b/src/services/Aggregator/ws/index.ts index c014e6c..9aed556 100644 --- a/src/services/Aggregator/ws/index.ts +++ b/src/services/Aggregator/ws/index.ts @@ -500,6 +500,12 @@ class AggregatorWS { minAmountIn: json.ma, path: json.ps, exchanges: json.e, + exchangeContractPath: json.eps.map((path) => ({ + poolAddress: path.p, + assetIn: path.ai, + assetOut: path.ao, + factory: path.f, + })), poolOptimal: json.po, ...(json.oi) && { orderInfo: { diff --git a/src/types.ts b/src/types.ts index 0c19b6c..3d8e434 100644 --- a/src/types.ts +++ b/src/types.ts @@ -164,6 +164,13 @@ export type SwapInfoAlternative = { availableAmountOut?: number | undefined } +type ExchangeContractPath = { + poolAddress: string + assetIn: string + assetOut: string + factory: string +} + export type SwapInfoBase = { swapRequestId: string assetIn: string @@ -174,6 +181,7 @@ export type SwapInfoBase = { minAmountOut: number path: string[] + exchangeContractPath: ExchangeContractPath[] exchanges?: string[] | undefined poolOptimal: boolean