diff --git a/package-lock.json b/package-lock.json index 52dd706..6c6e969 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.19.92-rc0", + "version": "0.19.92-rc1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.19.92-rc0", + "version": "0.19.92-rc1", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index a99395b..0a22621 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.19.92-rc0", + "version": "0.19.92-rc1", "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 1664a03..76e9fe3 100644 --- a/src/Unit/Exchange/generateSwapCalldata.ts +++ b/src/Unit/Exchange/generateSwapCalldata.ts @@ -45,8 +45,8 @@ export default async function generateSwapCalldata({ const curveRegistryAddress = safeGet(unit.contracts, 'curveRegistry') const { assetToAddress, swapExecutorContractAddress, exchangeContractAddress } = await simpleFetch(unit.blockchainService.getInfo)(); let path = SafeArray.from(path_).map((swapInfo) => { - swapInfo.assetIn = safeGet(assetToAddress, swapInfo.assetIn); - swapInfo.assetOut = safeGet(assetToAddress, swapInfo.assetOut); + swapInfo.assetIn = assetToAddress[swapInfo.assetIn] ?? swapInfo.assetIn.toLowerCase(); + swapInfo.assetOut = assetToAddress[swapInfo.assetOut] ?? swapInfo.assetOut.toLowerCase(); return swapInfo; }) const factory = path.first().factory diff --git a/src/services/BlockchainService/index.ts b/src/services/BlockchainService/index.ts index 8ac862e..6c43a0a 100644 --- a/src/services/BlockchainService/index.ts +++ b/src/services/BlockchainService/index.ts @@ -59,6 +59,13 @@ type AtomicSwapHistoryTargetQuery = AtomicSwapHistoryBaseQuery & { expiredRedeem?: 0 | 1 state?: 'REDEEMED' | 'BEFORE-REDEEM' } + +type PlatformFees = { + assetIn: string + assetOut: string + walletAddress?: string | undefined + fromWidget?: string | undefined +} class BlockchainService { private readonly apiUrl: string; @@ -231,23 +238,17 @@ class BlockchainService { { headers: this.basicAuthHeaders } ); - getPlatformFees = ( - { assetIn, assetOut, walletAddress, fromWidget }: { - assetIn?: string | undefined, - assetOut?: string | undefined, - walletAddress?: string | undefined, - fromWidget?: string | undefined - } + getPlatformFees = ({ + assetIn, + assetOut, + walletAddress, + fromWidget + }: PlatformFees ) => { const url = new URL(`${this.apiUrl}/api/platform-fees`); - if (assetIn !== undefined) { - url.searchParams.append('assetIn', assetIn); - } - - if (assetOut !== undefined) { - url.searchParams.append('assetOut', assetOut); - } + url.searchParams.append('assetIn', assetIn); + url.searchParams.append('assetOut', assetOut); if (walletAddress !== undefined) { url.searchParams.append('walletAddress', walletAddress);