diff --git a/package-lock.json b/package-lock.json index b16089f..74382d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.19.89-rc11", + "version": "0.19.89-rc12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.19.89-rc11", + "version": "0.19.89-rc12", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index dc30e31..ab14ecd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.19.89-rc11", + "version": "0.19.89-rc12", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/constants/index.ts b/src/constants/index.ts index efe47f0..1651be1 100644 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -12,3 +12,4 @@ export * from './gasLimits.js'; export * from './timings.js'; export const SERVICE_TOKEN = 'ORN'; +export const INITIAL_VEORN_ADJUSTMENT_FACTOR = 5; diff --git a/src/services/BlockchainService/index.ts b/src/services/BlockchainService/index.ts index 6c43a0a..e301615 100644 --- a/src/services/BlockchainService/index.ts +++ b/src/services/BlockchainService/index.ts @@ -61,8 +61,8 @@ type AtomicSwapHistoryTargetQuery = AtomicSwapHistoryBaseQuery & { } type PlatformFees = { - assetIn: string - assetOut: string + assetIn?: string // TODO: return types from main branch + assetOut?: string walletAddress?: string | undefined fromWidget?: string | undefined } @@ -247,8 +247,13 @@ class BlockchainService { ) => { const url = new URL(`${this.apiUrl}/api/platform-fees`); - url.searchParams.append('assetIn', assetIn); - url.searchParams.append('assetOut', assetOut); + if (assetIn !== undefined) { // TODO: make same as in main branch + url.searchParams.append('assetIn', assetIn); + } + + if (assetOut !== undefined) { + url.searchParams.append('assetOut', assetOut); + } if (walletAddress !== undefined) { url.searchParams.append('walletAddress', walletAddress); diff --git a/src/services/Integrator/index.ts b/src/services/Integrator/index.ts index 8f06bfd..4b050ed 100644 --- a/src/services/Integrator/index.ts +++ b/src/services/Integrator/index.ts @@ -9,7 +9,7 @@ import { } from './schemas/index.js'; import { fetchWithValidation } from 'simple-typed-fetch'; import { BigNumber } from 'bignumber.js'; -import { DAY, LOCK_START_TIME, YEAR } from '../../constants/index.js'; +import { DAY, INITIAL_VEORN_ADJUSTMENT_FACTOR, LOCK_START_TIME, YEAR } from '../../constants/index.js'; type BasePayload = { chainId: number @@ -109,7 +109,7 @@ class IntegratorService { }) } - getAmountAtCurrent = (amount: number) => { + getAmountAtCurrent = async (amount: number) => { const timestamp = Date.now() / 1000; // sqrt @@ -191,7 +191,7 @@ class IntegratorService { } // sqrt - return BigNumber(amountToken).multipliedBy(BigNumber(deltaDays).sqrt()).dividedBy(5); + return BigNumber(amountToken).multipliedBy(BigNumber(deltaDays).sqrt()).dividedBy(INITIAL_VEORN_ADJUSTMENT_FACTOR); } private readonly getVotingInfo = (userAddress: number) => {