From 452da5ad875a27f70e0fd4f4a6e79c6fed4cf887 Mon Sep 17 00:00:00 2001 From: Dmitriy Pavlov Date: Thu, 10 Aug 2023 14:19:04 +0300 Subject: [PATCH 1/6] add eps field to swap --- package-lock.json | 4 ++-- package.json | 2 +- src/services/Aggregator/ws/schemas/swapInfoSchema.ts | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 281bb66..20d7a15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.19.46", + "version": "0.19.48-dev.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.19.46", + "version": "0.19.48-dev.1", "license": "ISC", "dependencies": { "@babel/runtime": "^7.21.0", diff --git a/package.json b/package.json index 8994810..bd43adb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.19.48-dev.1", + "version": "0.19.48-dev.1-rc-0", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/services/Aggregator/ws/schemas/swapInfoSchema.ts b/src/services/Aggregator/ws/schemas/swapInfoSchema.ts index 7cc8e35..9c383e6 100644 --- a/src/services/Aggregator/ws/schemas/swapInfoSchema.ts +++ b/src/services/Aggregator/ws/schemas/swapInfoSchema.ts @@ -34,6 +34,12 @@ const swapInfoSchemaBase = baseMessageSchema.extend({ }).optional(), as: alternativeSchema.array(), anm: z.record(z.string()).optional(), // address to ERC20 names + eps: z.array(z.object({ + p: z.string(), + ai: z.string().toUpperCase(), + ao: z.string().toUpperCase(), + f: z.string().toUpperCase(), + })) }); const swapInfoSchemaByAmountIn = swapInfoSchemaBase.extend({ From 4af3da4bf58f307c2a5bf4371a778706a11a2f9b Mon Sep 17 00:00:00 2001 From: Dmitriy Pavlov Date: Thu, 10 Aug 2023 14:34:24 +0300 Subject: [PATCH 2/6] add field comments --- src/services/Aggregator/ws/schemas/swapInfoSchema.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/services/Aggregator/ws/schemas/swapInfoSchema.ts b/src/services/Aggregator/ws/schemas/swapInfoSchema.ts index 9c383e6..9607cb2 100644 --- a/src/services/Aggregator/ws/schemas/swapInfoSchema.ts +++ b/src/services/Aggregator/ws/schemas/swapInfoSchema.ts @@ -35,10 +35,10 @@ const swapInfoSchemaBase = baseMessageSchema.extend({ as: alternativeSchema.array(), anm: z.record(z.string()).optional(), // address to ERC20 names eps: z.array(z.object({ - p: z.string(), - ai: z.string().toUpperCase(), - ao: z.string().toUpperCase(), - f: z.string().toUpperCase(), + p: z.string(), // pool address + ai: z.string().toUpperCase(), // asset in + ao: z.string().toUpperCase(), // asset out + f: z.string().toUpperCase(), // factory })) }); From df38bfdc2cf3cdd89e6f34f060c19b4d9937bcd8 Mon Sep 17 00:00:00 2001 From: Dmitriy Pavlov Date: Thu, 10 Aug 2023 18:46:10 +0300 Subject: [PATCH 3/6] 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 From 12bd1bc069a77d3989e41f86f81aead967c10e51 Mon Sep 17 00:00:00 2001 From: Dmitriy Pavlov Date: Thu, 10 Aug 2023 19:05:40 +0300 Subject: [PATCH 4/6] change type names --- package.json | 2 +- src/services/Aggregator/ws/index.ts | 2 +- src/types.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 8cc0e0a..1303923 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.19.48-dev.2-rc-1", + "version": "0.19.48-dev.2-rc-2", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/services/Aggregator/ws/index.ts b/src/services/Aggregator/ws/index.ts index 9aed556..f6e6729 100644 --- a/src/services/Aggregator/ws/index.ts +++ b/src/services/Aggregator/ws/index.ts @@ -501,7 +501,7 @@ class AggregatorWS { path: json.ps, exchanges: json.e, exchangeContractPath: json.eps.map((path) => ({ - poolAddress: path.p, + pool: path.p, assetIn: path.ai, assetOut: path.ao, factory: path.f, diff --git a/src/types.ts b/src/types.ts index 3d8e434..78c6f8b 100644 --- a/src/types.ts +++ b/src/types.ts @@ -165,7 +165,7 @@ export type SwapInfoAlternative = { } type ExchangeContractPath = { - poolAddress: string + pool: string assetIn: string assetOut: string factory: string From 64b61db6a96486b0689f911f225b65db9b40ebbc Mon Sep 17 00:00:00 2001 From: Dmitriy Pavlov Date: Thu, 24 Aug 2023 10:36:48 +0300 Subject: [PATCH 5/6] update deps --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index bba9579..ccf76bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.19.48-dev.5-rc0", + "version": "0.19.48-dev.6-rc-0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.19.48-dev.5-rc0", + "version": "0.19.48-dev.6-rc-0", "hasInstallScript": true, "license": "ISC", "dependencies": { From d9a08eabb3098f7d6cd728955c7c37eca8b93142 Mon Sep 17 00:00:00 2001 From: lomonoshka Date: Thu, 24 Aug 2023 12:39:18 +0300 Subject: [PATCH 6/6] version update --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 702a92c..b84bfcd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.19.48-dev.6-rc-0", + "version": "0.19.48-dev.6-rc-1", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js",