@gainsnetwork/sdk 0.1.19-rc1 → 0.1.19-rc3

package/lib/trade/fees/tiers/index.d.ts

@@ -1,7 +1,11 @@
-import { FeeTier, TraderDailyInfo, TraderInfo } from "./types";
+import { FeeTiers, TraderFeeTiers } from "../../types";
+import { FeeTier } from "./types";
 export declare const TRAILING_PERIOD_DAYS = 30;
 export declare const FEE_MULTIPLIER_SCALE = 1;
 export declare const MAX_FEE_TIERS = 8;
 export declare const getCurrentDay: () => number;
 export declare const getFeeTiersCount: (feeTiers: FeeTier[]) => number;
-export declare const computeFeeMulitplier: (traderInfo: TraderInfo, traderDailyInfo: Record<number, TraderDailyInfo>, feeTiers: FeeTier[]) => number;
+export declare const computeFeeMulitplier: (feeTiers: FeeTiers, traderFeeTiers: TraderFeeTiers) => {
+    feeMultiplier: number;
+    trailingPoints: number;
+};

package/lib/trade/fees/tiers/index.js

@@ -15,33 +15,34 @@ const getFeeTiersCount = (feeTiers) => {
     return 0;
 };
 exports.getFeeTiersCount = getFeeTiersCount;
-const computeFeeMulitplier = (traderInfo, traderDailyInfo, feeTiers) => {
-    const currentDay = (0, exports.getCurrentDay)();
-    if (currentDay > traderInfo.lastDayUpdated) {
+const computeFeeMulitplier = (feeTiers, traderFeeTiers) => {
+    const { currentDay, tiers } = feeTiers;
+    const { traderInfo, expiredPoints, lastDayUpdatedPoints } = traderFeeTiers;
+    const { lastDayUpdated, trailingPoints } = traderInfo;
+    if (currentDay > lastDayUpdated) {
         let curTrailingPoints = 0;
         const earliestActiveDay = currentDay - exports.TRAILING_PERIOD_DAYS;
-        if (traderInfo.lastDayUpdated >= earliestActiveDay) {
-            curTrailingPoints =
-                traderInfo.trailingPoints +
-                    traderDailyInfo[traderInfo.lastDayUpdated].points;
-            const earliestOutdatedDay = traderInfo.lastDayUpdated - exports.TRAILING_PERIOD_DAYS;
-            const lastOutdatedDay = earliestActiveDay - 1;
-            let expiredTrailingPoints = 0;
-            for (let i = earliestOutdatedDay; i <= lastOutdatedDay; ++i) {
-                expiredTrailingPoints += traderDailyInfo[i].points;
-            }
+        if (lastDayUpdated >= earliestActiveDay) {
+            curTrailingPoints = trailingPoints + lastDayUpdatedPoints;
+            const expiredTrailingPoints = expiredPoints.reduce((acc, points) => acc + points, 0);
             curTrailingPoints -= expiredTrailingPoints;
         }
         let newFeeMultiplier = exports.FEE_MULTIPLIER_SCALE;
-        for (let i = (0, exports.getFeeTiersCount)(feeTiers); i > 0; --i) {
-            const feeTier = feeTiers[i - 1];
+        for (let i = (0, exports.getFeeTiersCount)(tiers); i > 0; --i) {
+            const feeTier = tiers[i - 1];
             if (curTrailingPoints >= feeTier.pointsThreshold) {
                 newFeeMultiplier = feeTier.feeMultiplier;
                 break;
             }
         }
-        return newFeeMultiplier;
+        return {
+            feeMultiplier: newFeeMultiplier,
+            trailingPoints: curTrailingPoints,
+        };
     }
-    return exports.FEE_MULTIPLIER_SCALE;
+    return {
+        feeMultiplier: exports.FEE_MULTIPLIER_SCALE,
+        trailingPoints,
+    };
 };
 exports.computeFeeMulitplier = computeFeeMulitplier;

package/lib/trade/fees/tiers/types.d.ts

@@ -6,7 +6,3 @@ export type TraderInfo = {
     lastDayUpdated: number;
     trailingPoints: number;
 };
-export type TraderDailyInfo = {
-    feeMultiplierCache: number;
-    points: number;
-};

package/lib/trade/types.d.ts

@@ -190,6 +190,7 @@ export type TraderFeeTiers = {
     traderInfo: TraderInfo;
     inboundPoints: number;
     outboundPoints: number;
+    lastDayUpdatedPoints: number;
     expiredPoints: number[];
 };
 export declare enum PairIndex {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gainsnetwork/sdk",
-  "version": "0.1.19-rc1",
+  "version": "0.1.19-rc3",
   "description": "Gains Network SDK",
   "main": "./lib/index.js",
   "files": [