From d0eb2288c040b8fd9fca0903ab03d6976b88e406 Mon Sep 17 00:00:00 2001 From: TheJuze Date: Sun, 1 Oct 2023 17:42:36 +0300 Subject: [PATCH] update formulas --- package-lock.json | 4 ++-- package.json | 2 +- src/constants/timings.ts | 1 + src/services/Integrator/index.ts | 12 ++++++------ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 542573d..2fa1e5e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.19.89-rc13", + "version": "0.19.89-rc14", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.19.89-rc13", + "version": "0.19.89-rc14", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index c84fa96..5d5157e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.19.89-rc13", + "version": "0.19.89-rc14", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/constants/timings.ts b/src/constants/timings.ts index a5ee04b..471091e 100644 --- a/src/constants/timings.ts +++ b/src/constants/timings.ts @@ -1,2 +1,3 @@ export const DAY = 86400 +export const WEEK_DAYS = 7; export const YEAR = 365 * DAY diff --git a/src/services/Integrator/index.ts b/src/services/Integrator/index.ts index 01e27e5..2c00111 100644 --- a/src/services/Integrator/index.ts +++ b/src/services/Integrator/index.ts @@ -9,8 +9,8 @@ import { } from './schemas/index.js'; import { fetchWithValidation } from 'simple-typed-fetch'; import { BigNumber } from 'bignumber.js'; -import { DAY, YEAR } from '../../constants/index.js'; -import { INITIAL_VEORN_ADJUSTMENT_FACTOR, LOCK_START_TIME } from './constants.js'; +import { DAY, WEEK_DAYS, YEAR } from '../../constants/index.js'; +import { LOCK_START_TIME } from './constants.js'; type BasePayload = { chainId: number @@ -110,7 +110,7 @@ class IntegratorService { }) } - getAmountAtCurrent = (amount: number) => { + getAmountAtCurrent = (amount: number): BigNumber => { const timestamp = Date.now() / 1000; // sqrt @@ -176,11 +176,11 @@ class IntegratorService { }); } - private readonly getK = (time: number) => { + private readonly getK = (time: number): BigNumber => { const currentTime = time < LOCK_START_TIME ? LOCK_START_TIME : time; const deltaYears = BigNumber(currentTime).minus(LOCK_START_TIME).dividedBy(YEAR); - return BigNumber(2).pow(BigNumber(deltaYears).pow(2)); + return BigNumber(2).pow(BigNumber(deltaYears).multipliedBy(2)); } private readonly getAmountByORN = (amountToken: number, timeLock: number) => { @@ -192,7 +192,7 @@ class IntegratorService { } // sqrt - return BigNumber(amountToken).multipliedBy(BigNumber(deltaDays).sqrt()).dividedBy(INITIAL_VEORN_ADJUSTMENT_FACTOR); + return BigNumber(amountToken).multipliedBy(BigNumber(deltaDays).sqrt()).dividedBy(BigNumber(WEEK_DAYS).sqrt()); } private readonly getVotingInfo = (userAddress: number) => {