From 627e6f70be017c5d30a5ca3ca90f22fda547d984 Mon Sep 17 00:00:00 2001 From: Kirill Litvinov Date: Tue, 16 Jan 2024 11:06:24 +0300 Subject: [PATCH 1/3] update x-source --- package-lock.json | 4 ++-- package.json | 2 +- src/services/Aggregator/index.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 685e05c..30b438e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.20.42", + "version": "0.20.43", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.20.42", + "version": "0.20.43", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 90d430e..6a52d8c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.20.42", + "version": "0.20.43", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/services/Aggregator/index.ts b/src/services/Aggregator/index.ts index 82c3b2a..3d52508 100644 --- a/src/services/Aggregator/index.ts +++ b/src/services/Aggregator/index.ts @@ -197,7 +197,7 @@ class Aggregator { isReversedOrder?: boolean, partnerId?: string, fromWidget?: boolean, - source?: 'TERMINAL' | 'SWAP_UI', + source?: 'TERMINAL_MARKET' | 'TERMINAL_LIMIT' | 'SWAP_UI', rawExchangeRestrictions?: string | undefined, ) => { const headers = { From 769719293fd9f0d9042ff29e4a0450fcd7349bc6 Mon Sep 17 00:00:00 2001 From: Steam Deck User <0xlomonoshka@gmail.com> Date: Tue, 16 Jan 2024 19:32:26 +0400 Subject: [PATCH 2/3] fix: make matcher, feeAsset, fee fields of BaseGenerateSwapCalldata optional --- package.json | 2 +- src/Unit/Exchange/generateSwapCalldata.ts | 25 ++++++++--------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 6a52d8c..e2a7870 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.20.43", + "version": "0.20.44", "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 f0ac04c..91f3fe6 100644 --- a/src/Unit/Exchange/generateSwapCalldata.ts +++ b/src/Unit/Exchange/generateSwapCalldata.ts @@ -23,27 +23,22 @@ import { generateFeePaymentCall } from "./callGenerators/feePayment.js"; export type Factory = "UniswapV2" | "UniswapV3" | "Curve" | "OrionV2" | "OrionV3"; -export type GenerateSwapCalldataWithUnitParams = { +type BaseGenerateSwapCalldataParams = { amount: BigNumberish; minReturnAmount: BigNumberish; initiatorAddress: string; receiverAddress: string; - matcher: AddressLike, - feeToken: AddressLike, - fee: BigNumberish; path: ArrayLike; + matcher?: AddressLike, + feeToken?: AddressLike, + fee?: BigNumberish; +} + +export type GenerateSwapCalldataWithUnitParams = BaseGenerateSwapCalldataParams & { unit: Unit; }; -export type GenerateSwapCalldataParams = { - amount: BigNumberish; - minReturnAmount: BigNumberish; - initiatorAddress: string; - receiverAddress: string; - path: ArrayLike; - matcher: AddressLike, - feeToken: AddressLike, - fee: BigNumberish; +export type GenerateSwapCalldataParams = BaseGenerateSwapCalldataParams & { exchangeContractAddress: AddressLike; wethAddress: AddressLike; curveRegistryAddress: AddressLike; @@ -347,10 +342,6 @@ async function payFeeToMatcher( calls: BytesLike[], swapDescription: LibValidator.SwapDescriptionStruct, ) { - console.log(matcher) - console.log(feeAmount) - console.log(feeToken) - console.log(swapDescription.dstToken) if (BigInt(feeAmount) !== 0n && feeToken === swapDescription.dstToken) { const feePaymentCall = generateFeePaymentCall(matcher, feeToken, feeAmount) calls.push(feePaymentCall) From a8a11184ef7673692e3801389199f09162afe98e Mon Sep 17 00:00:00 2001 From: Kirill Litvinov Date: Mon, 22 Jan 2024 19:10:51 +0300 Subject: [PATCH 3/3] update OrderSource type --- package-lock.json | 4 ++-- package.json | 2 +- src/services/Aggregator/index.ts | 6 ++---- src/types.ts | 2 ++ 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 30b438e..01ec2eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.20.43", + "version": "0.20.45", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.20.43", + "version": "0.20.45", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index e2a7870..577092e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.20.44", + "version": "0.20.45", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/services/Aggregator/index.ts b/src/services/Aggregator/index.ts index 3d52508..64cdc45 100644 --- a/src/services/Aggregator/index.ts +++ b/src/services/Aggregator/index.ts @@ -8,7 +8,7 @@ import errorSchema from './schemas/errorSchema.js'; import placeAtomicSwapSchema from './schemas/placeAtomicSwapSchema.js'; import { AggregatorWS } from './ws/index.js'; import { atomicSwapHistorySchema } from './schemas/atomicSwapHistorySchema.js'; -import type { BasicAuthCredentials, SignedCancelOrderRequest, SignedOrder } from '../../types.js'; +import type { BasicAuthCredentials, OrderSource, SignedCancelOrderRequest, SignedOrder } from '../../types.js'; import { pairConfigSchema, aggregatedOrderbookSchema, exchangeOrderbookSchema, poolReservesSchema, @@ -196,8 +196,7 @@ class Aggregator { isCreateInternalOrder: boolean, isReversedOrder?: boolean, partnerId?: string, - fromWidget?: boolean, - source?: 'TERMINAL_MARKET' | 'TERMINAL_LIMIT' | 'SWAP_UI', + source?: OrderSource, rawExchangeRestrictions?: string | undefined, ) => { const headers = { @@ -207,7 +206,6 @@ class Aggregator { 'X-Reverse-Order': isReversedOrder ? 'true' : 'false', }, ...(partnerId !== undefined) && { 'X-Partner-Id': partnerId }, - ...(fromWidget !== undefined) && { 'X-From-Widget': fromWidget ? 'true' : 'false' }, ...(source !== undefined) && { 'X-Source': source }, ...this.basicAuthHeaders, }; diff --git a/src/types.ts b/src/types.ts index 7511476..930c150 100644 --- a/src/types.ts +++ b/src/types.ts @@ -452,3 +452,5 @@ export type AtomicSwap = Partial< refundTx?: TransactionInfo | undefined liquidityMigrationTx?: TransactionInfo | undefined } + +export type OrderSource = 'TERMINAL_MARKET' | 'TERMINAL_LIMIT' | 'SWAP_UI' | 'WIDGET';