@gainsnetwork/sdk 0.2.67-rc8 → 0.2.69

package/lib/contracts/types/generated/factories/GToken__factory.js

@@ -260,12 +260,6 @@ const _abi = [
                 name: "assetsLessDeplete",
                 type: "uint256",
             },
-            {
-                indexed: false,
-                internalType: "bool",
-                name: "burn",
-                type: "bool",
-            },
         ],
         name: "AssetsReceived",
         type: "event",
@@ -314,6 +308,31 @@ const _abi = [
         name: "DailyAccPnlDeltaReset",
         type: "event",
     },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: true,
+                internalType: "address",
+                name: "asset",
+                type: "address",
+            },
+            {
+                indexed: true,
+                internalType: "address",
+                name: "delegatee",
+                type: "address",
+            },
+            {
+                indexed: false,
+                internalType: "bool",
+                name: "success",
+                type: "bool",
+            },
+        ],
+        name: "Delegated",
+        type: "event",
+    },
     {
         anonymous: false,
         inputs: [
@@ -914,6 +933,32 @@ const _abi = [
         stateMutability: "view",
         type: "function",
     },
+    {
+        inputs: [],
+        name: "accBlockWeightedMarketCap",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "accBlockWeightedMarketCapLastStored",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
     {
         inputs: [],
         name: "accPnlPerToken",
@@ -1409,60 +1454,6 @@ const _abi = [
         stateMutability: "view",
         type: "function",
     },
-    {
-        inputs: [],
-        name: "getTotalDepleted",
-        outputs: [
-            {
-                internalType: "uint256",
-                name: "assets",
-                type: "uint256",
-            },
-            {
-                internalType: "uint256",
-                name: "gns",
-                type: "uint256",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-    },
-    {
-        inputs: [],
-        name: "getTotalDiscounts",
-        outputs: [
-            {
-                internalType: "uint256",
-                name: "unlocked",
-                type: "uint256",
-            },
-            {
-                internalType: "uint256",
-                name: "locked",
-                type: "uint256",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-    },
-    {
-        inputs: [],
-        name: "getTotalRefilled",
-        outputs: [
-            {
-                internalType: "uint256",
-                name: "assets",
-                type: "uint256",
-            },
-            {
-                internalType: "uint256",
-                name: "gns",
-                type: "uint256",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-    },
     {
         inputs: [],
         name: "gnsPriceProvider",
@@ -2222,11 +2213,6 @@ const _abi = [
                 name: "user",
                 type: "address",
             },
-            {
-                internalType: "bool",
-                name: "_burn",
-                type: "bool",
-            },
         ],
         name: "receiveAssets",
         outputs: [],
@@ -2352,6 +2338,32 @@ const _abi = [
         stateMutability: "view",
         type: "function",
     },
+    {
+        inputs: [],
+        name: "totalDepleted",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "totalDepletedGns",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
     {
         inputs: [],
         name: "totalDeposited",
@@ -2365,6 +2377,19 @@ const _abi = [
         stateMutability: "view",
         type: "function",
     },
+    {
+        inputs: [],
+        name: "totalDiscounts",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
     {
         inputs: [],
         name: "totalLiability",
@@ -2378,6 +2403,45 @@ const _abi = [
         stateMutability: "view",
         type: "function",
     },
+    {
+        inputs: [],
+        name: "totalLockedDiscounts",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "totalRefilled",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "totalRefilledGns",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
     {
         inputs: [],
         name: "totalRewards",
@@ -2578,6 +2642,19 @@ const _abi = [
         stateMutability: "nonpayable",
         type: "function",
     },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "_delegatee",
+                type: "address",
+            },
+        ],
+        name: "updateDelegatee",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
     {
         inputs: [
             {

package/lib/contracts/types/index.d.ts

@@ -16,7 +16,8 @@ export declare enum CollateralTypes {
     ARB = "ARB",
     USDC = "USDC",
     APE = "APE",
-    GNS = "GNS"
+    GNS = "GNS",
+    BTCUSD = "BTCUSD"
 }
 export declare enum ContractsVersion {
     BEFORE_V9_2 = 0,

package/lib/contracts/types/index.js

@@ -9,6 +9,7 @@ var CollateralTypes;
     CollateralTypes["USDC"] = "USDC";
     CollateralTypes["APE"] = "APE";
     CollateralTypes["GNS"] = "GNS";
+    CollateralTypes["BTCUSD"] = "BTCUSD";
 })(CollateralTypes = exports.CollateralTypes || (exports.CollateralTypes = {}));
 var ContractsVersion;
 (function (ContractsVersion) {

package/lib/trade/fees/borrowingV2/converter.d.ts

@@ -38,13 +38,14 @@ export declare const convertTradeInitialAccFees: (contractTradeData: IFundingFee
 export declare const convertTradeInitialAccFeesArray: (contractTradeDataArray: IFundingFees.TradeFeesDataStructOutput[]) => BorrowingFeeV2.TradeInitialAccFees[];
 /**
  * @dev Creates a context object from contract data arrays
+ * @param collateralIndices Array of collateral indices
  * @param pairIndices Array of pair indices
  * @param borrowingParams Array of borrowing fee params from contract
  * @param borrowingData Array of pair borrowing fee data from contract
  * @param currentTimestamp Optional current timestamp
- * @returns Complete SDK context for borrowing v2 calculations (collateral-scoped)
+ * @returns Complete SDK context for borrowing v2 calculations
  */
-export declare const createBorrowingV2Context: (pairIndices: number[], borrowingParams: IFundingFees.BorrowingFeeParamsStructOutput[], borrowingData: IFundingFees.PairBorrowingFeeDataStructOutput[], currentTimestamp?: number) => BorrowingFeeV2.GetBorrowingFeeV2Context;
+export declare const createBorrowingV2Context: (collateralIndices: number[], pairIndices: number[], borrowingParams: IFundingFees.BorrowingFeeParamsStructOutput[], borrowingData: IFundingFees.PairBorrowingFeeDataStructOutput[], currentTimestamp?: number) => BorrowingFeeV2.GetBorrowingFeeV2Context;
 /**
  * @dev Helper function to validate borrowing rate per second
  * @param borrowingRatePerSecondP Borrowing rate per second (normalized float)
@@ -63,13 +64,3 @@ export declare const borrowingRateToAPR: (borrowingRatePerSecondP: number) => nu
  * @returns Borrowing rate per second (normalized float)
  */
 export declare const aprToBorrowingRate: (aprPercentage: number) => number;
-/**
- * @dev Creates a collateral-scoped context from frontend data structure
- * @param collateralBorrowingData Data structure from frontend (params and data arrays)
- * @param currentTimestamp Optional current timestamp
- * @returns Collateral-scoped borrowing fee v2 context
- */
-export declare const createCollateralScopedBorrowingContext: (collateralBorrowingData: {
-    params: BorrowingFeeV2.BorrowingFeeParams[];
-    data: BorrowingFeeV2.PairBorrowingFeeData[];
-}, currentTimestamp?: number) => BorrowingFeeV2.GetBorrowingFeeV2Context;

package/lib/trade/fees/borrowingV2/converter.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCollateralScopedBorrowingContext = exports.aprToBorrowingRate = exports.borrowingRateToAPR = exports.isValidBorrowingRate = exports.createBorrowingV2Context = exports.convertTradeInitialAccFeesArray = exports.convertTradeInitialAccFees = exports.convertPairBorrowingFeeDataArray = exports.convertPairBorrowingFeeData = exports.convertBorrowingFeeParamsArray = exports.convertBorrowingFeeParams = void 0;
+exports.aprToBorrowingRate = exports.borrowingRateToAPR = exports.isValidBorrowingRate = exports.createBorrowingV2Context = exports.convertTradeInitialAccFeesArray = exports.convertTradeInitialAccFees = exports.convertPairBorrowingFeeDataArray = exports.convertPairBorrowingFeeData = exports.convertBorrowingFeeParamsArray = exports.convertBorrowingFeeParams = void 0;
 const index_1 = require("./index");
 /**
  * @dev Converts contract BorrowingFeeParams to SDK type
@@ -56,24 +56,35 @@ const convertTradeInitialAccFeesArray = (contractTradeDataArray) => contractTrad
 exports.convertTradeInitialAccFeesArray = convertTradeInitialAccFeesArray;
 /**
  * @dev Creates a context object from contract data arrays
+ * @param collateralIndices Array of collateral indices
  * @param pairIndices Array of pair indices
  * @param borrowingParams Array of borrowing fee params from contract
  * @param borrowingData Array of pair borrowing fee data from contract
  * @param currentTimestamp Optional current timestamp
- * @returns Complete SDK context for borrowing v2 calculations (collateral-scoped)
+ * @returns Complete SDK context for borrowing v2 calculations
  */
-const createBorrowingV2Context = (pairIndices, borrowingParams, borrowingData, currentTimestamp) => {
+const createBorrowingV2Context = (collateralIndices, pairIndices, borrowingParams, borrowingData, currentTimestamp) => {
     const context = {
         currentTimestamp,
         borrowingParams: {},
         borrowingData: {},
     };
-    // Build objects indexed by pairIndex
-    for (let i = 0; i < pairIndices.length; i++) {
+    // Build nested objects indexed by collateralIndex and pairIndex
+    for (let i = 0; i < collateralIndices.length; i++) {
+        const collateralIndex = collateralIndices[i];
         const pairIndex = pairIndices[i];
+        // Initialize collateral index objects if they don't exist
+        if (!context.borrowingParams[collateralIndex]) {
+            context.borrowingParams[collateralIndex] = {};
+        }
+        if (!context.borrowingData[collateralIndex]) {
+            context.borrowingData[collateralIndex] = {};
+        }
         // Store converted data
-        context.borrowingParams[pairIndex] = (0, exports.convertBorrowingFeeParams)(borrowingParams[i]);
-        context.borrowingData[pairIndex] = (0, exports.convertPairBorrowingFeeData)(borrowingData[i]);
+        context.borrowingParams[collateralIndex][pairIndex] =
+            (0, exports.convertBorrowingFeeParams)(borrowingParams[i]);
+        context.borrowingData[collateralIndex][pairIndex] =
+            (0, exports.convertPairBorrowingFeeData)(borrowingData[i]);
     }
     return context;
 };
@@ -108,25 +119,3 @@ const aprToBorrowingRate = (aprPercentage) => {
     return aprPercentage / SECONDS_PER_YEAR;
 };
 exports.aprToBorrowingRate = aprToBorrowingRate;
-/**
- * @dev Creates a collateral-scoped context from frontend data structure
- * @param collateralBorrowingData Data structure from frontend (params and data arrays)
- * @param currentTimestamp Optional current timestamp
- * @returns Collateral-scoped borrowing fee v2 context
- */
-const createCollateralScopedBorrowingContext = (collateralBorrowingData, currentTimestamp) => {
-    const context = {
-        currentTimestamp: currentTimestamp !== null && currentTimestamp !== void 0 ? currentTimestamp : Math.floor(Date.now() / 1000),
-        borrowingParams: {},
-        borrowingData: {},
-    };
-    // Map arrays to objects indexed by array position (pairIndex)
-    collateralBorrowingData.params.forEach((param, index) => {
-        context.borrowingParams[index] = param;
-    });
-    collateralBorrowingData.data.forEach((data, index) => {
-        context.borrowingData[index] = data;
-    });
-    return context;
-};
-exports.createCollateralScopedBorrowingContext = createCollateralScopedBorrowingContext;

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

@@ -22,11 +22,23 @@ export declare const BORROWING_V2_PRECISION: {
 export declare const getPairPendingAccBorrowingFees: (params: BorrowingFeeV2.BorrowingFeeParams, data: BorrowingFeeV2.PairBorrowingFeeData, currentPairPrice: number, currentTimestamp?: number) => number;
 /**
  * @dev Calculates borrowing fees owed by a specific trade
- * @param input Trade borrowing fee calculation input (without pairIndex)
- * @param context Pair-specific borrowing context
+ * @param input Trade borrowing fee calculation input
+ * @param context Context containing borrowing parameters and data
+ * @returns Borrowing fees in collateral tokens
+ */
+export declare const getTradeBorrowingFeesCollateral: (input: BorrowingFeeV2.TradeBorrowingFeeInput, context: BorrowingFeeV2.GetBorrowingFeeV2Context) => number;
+/**
+ * @dev Convenience function to calculate borrowing fees for a trade using individual parameters
+ * @param positionSizeCollateral Position size in collateral tokens
+ * @param pairIndex Index of the trading pair
+ * @param collateralIndex Index of the collateral
+ * @param openPrice Price at which the trade was opened
+ * @param currentPairPrice Current price of the trading pair
+ * @param initialAccBorrowingFeeP Initial accumulated borrowing fee when trade was opened
+ * @param context Context containing borrowing parameters and data
  * @returns Borrowing fees in collateral tokens
  */
-export declare const getTradeBorrowingFeesCollateral: (input: Omit<BorrowingFeeV2.TradeBorrowingFeeInput, "pairIndex">, context: BorrowingFeeV2.GetPairBorrowingFeeV2Context) => number;
+export declare const getBorrowingFee: (positionSizeCollateral: number, pairIndex: number, collateralIndex: number, openPrice: number, currentPairPrice: number, initialAccBorrowingFeeP: number, context: BorrowingFeeV2.GetBorrowingFeeV2Context) => number;
 /**
  * @dev Utility function to get pending accumulated borrowing fees for a pair using context
  * @param input Pair borrowing fee calculation input
@@ -39,10 +51,9 @@ export declare const getPairBorrowingFees: (input: BorrowingFeeV2.PairBorrowingF
  */
 export declare const borrowingFeeV2Utils: {
     getPairPendingAccBorrowingFees: (params: BorrowingFeeV2.BorrowingFeeParams, data: BorrowingFeeV2.PairBorrowingFeeData, currentPairPrice: number, currentTimestamp?: number) => number;
-    getTradeBorrowingFeesCollateral: (input: Omit<BorrowingFeeV2.TradeBorrowingFeeInput, "pairIndex">, context: BorrowingFeeV2.GetPairBorrowingFeeV2Context) => number;
+    getTradeBorrowingFeesCollateral: (input: BorrowingFeeV2.TradeBorrowingFeeInput, context: BorrowingFeeV2.GetBorrowingFeeV2Context) => number;
     getPairBorrowingFees: (input: BorrowingFeeV2.PairBorrowingFeeInput, context: BorrowingFeeV2.GetBorrowingFeeV2Context) => number;
+    getBorrowingFee: (positionSizeCollateral: number, pairIndex: number, collateralIndex: number, openPrice: number, currentPairPrice: number, initialAccBorrowingFeeP: number, context: BorrowingFeeV2.GetBorrowingFeeV2Context) => number;
 };
 export * as BorrowingFeeV2 from "./types";
-export { GetPairBorrowingFeeV2Context } from "./types";
 export * from "./converter";
-export * from "./fetcher";

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

@@ -26,7 +26,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BorrowingFeeV2 = exports.borrowingFeeV2Utils = exports.getPairBorrowingFees = exports.getTradeBorrowingFeesCollateral = exports.getPairPendingAccBorrowingFees = exports.BORROWING_V2_PRECISION = exports.MAX_BORROWING_RATE_PER_SECOND = void 0;
+exports.BorrowingFeeV2 = exports.borrowingFeeV2Utils = exports.getPairBorrowingFees = exports.getBorrowingFee = exports.getTradeBorrowingFeesCollateral = exports.getPairPendingAccBorrowingFees = exports.BORROWING_V2_PRECISION = exports.MAX_BORROWING_RATE_PER_SECOND = void 0;
 /**
  * @dev Maximum borrowing rate per second (1,000% APR)
  */
@@ -63,18 +63,21 @@ const getPairPendingAccBorrowingFees = (params, data, currentPairPrice, currentT
 exports.getPairPendingAccBorrowingFees = getPairPendingAccBorrowingFees;
 /**
  * @dev Calculates borrowing fees owed by a specific trade
- * @param input Trade borrowing fee calculation input (without pairIndex)
- * @param context Pair-specific borrowing context
+ * @param input Trade borrowing fee calculation input
+ * @param context Context containing borrowing parameters and data
  * @returns Borrowing fees in collateral tokens
  */
 const getTradeBorrowingFeesCollateral = (input, context) => {
-    const { positionSizeCollateral, openPrice, currentPairPrice, initialAccBorrowingFeeP, currentTimestamp, } = input;
-    const { params, data } = context;
+    var _a, _b;
+    const { positionSizeCollateral, openPrice, collateralIndex, pairIndex, currentPairPrice, initialAccBorrowingFeeP, currentTimestamp, } = input;
+    // Get borrowing parameters and data for the pair
+    const params = (_a = context.borrowingParams[collateralIndex]) === null || _a === void 0 ? void 0 : _a[pairIndex];
+    const data = (_b = context.borrowingData[collateralIndex]) === null || _b === void 0 ? void 0 : _b[pairIndex];
     if (!params || !data) {
         return 0;
     }
     // Calculate current accumulated borrowing fees
-    const currentAccBorrowingFeeP = (0, exports.getPairPendingAccBorrowingFees)(params, data, currentPairPrice, currentTimestamp !== null && currentTimestamp !== void 0 ? currentTimestamp : context.currentTimestamp);
+    const currentAccBorrowingFeeP = (0, exports.getPairPendingAccBorrowingFees)(params, data, currentPairPrice, currentTimestamp);
     // Calculate borrowing fees for this trade
     // Formula: (positionSizeCollateral * (currentAccFee - initialAccFee)) / openPrice / 100
     const feeDeltaP = currentAccBorrowingFeeP - initialAccBorrowingFeeP;
@@ -83,6 +86,29 @@ const getTradeBorrowingFeesCollateral = (input, context) => {
         exports.BORROWING_V2_PRECISION.PERCENTAGE);
 };
 exports.getTradeBorrowingFeesCollateral = getTradeBorrowingFeesCollateral;
+/**
+ * @dev Convenience function to calculate borrowing fees for a trade using individual parameters
+ * @param positionSizeCollateral Position size in collateral tokens
+ * @param pairIndex Index of the trading pair
+ * @param collateralIndex Index of the collateral
+ * @param openPrice Price at which the trade was opened
+ * @param currentPairPrice Current price of the trading pair
+ * @param initialAccBorrowingFeeP Initial accumulated borrowing fee when trade was opened
+ * @param context Context containing borrowing parameters and data
+ * @returns Borrowing fees in collateral tokens
+ */
+const getBorrowingFee = (positionSizeCollateral, pairIndex, collateralIndex, openPrice, currentPairPrice, initialAccBorrowingFeeP, context) => {
+    return (0, exports.getTradeBorrowingFeesCollateral)({
+        positionSizeCollateral,
+        openPrice,
+        collateralIndex,
+        pairIndex,
+        currentPairPrice,
+        initialAccBorrowingFeeP,
+        currentTimestamp: context.currentTimestamp,
+    }, context);
+};
+exports.getBorrowingFee = getBorrowingFee;
 /**
  * @dev Utility function to get pending accumulated borrowing fees for a pair using context
  * @param input Pair borrowing fee calculation input
@@ -90,9 +116,10 @@ exports.getTradeBorrowingFeesCollateral = getTradeBorrowingFeesCollateral;
  * @returns Updated accumulated borrowing fee (1e20 precision)
  */
 const getPairBorrowingFees = (input, context) => {
-    const { pairIndex, currentPairPrice, currentTimestamp } = input;
-    const params = context.borrowingParams[pairIndex];
-    const data = context.borrowingData[pairIndex];
+    var _a, _b;
+    const { collateralIndex, pairIndex, currentPairPrice, currentTimestamp } = input;
+    const params = (_a = context.borrowingParams[collateralIndex]) === null || _a === void 0 ? void 0 : _a[pairIndex];
+    const data = (_b = context.borrowingData[collateralIndex]) === null || _b === void 0 ? void 0 : _b[pairIndex];
     if (!params || !data) {
         return 0;
     }
@@ -106,7 +133,7 @@ exports.borrowingFeeV2Utils = {
     getPairPendingAccBorrowingFees: exports.getPairPendingAccBorrowingFees,
     getTradeBorrowingFeesCollateral: exports.getTradeBorrowingFeesCollateral,
     getPairBorrowingFees: exports.getPairBorrowingFees,
+    getBorrowingFee: exports.getBorrowingFee,
 };
 exports.BorrowingFeeV2 = __importStar(require("./types"));
 __exportStar(require("./converter"), exports);
-__exportStar(require("./fetcher"), exports);

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

@@ -39,7 +39,6 @@ export type TradeInitialAccFees = {
 };
 /**
  * @dev Context required for borrowing v2 fee calculations
- * @dev Context is already scoped to a specific collateral
  */
 export type GetBorrowingFeeV2Context = {
     /**
@@ -48,36 +47,20 @@ export type GetBorrowingFeeV2Context = {
     currentTimestamp?: number;
     /**
      * @dev Borrowing fee parameters for pairs
-     * @dev Indexed by: params[pairIndex]
+     * @dev Indexed by: params[collateralIndex][pairIndex]
      */
-    borrowingParams: Record<number, BorrowingFeeParams>;
+    borrowingParams: Record<number, Record<number, BorrowingFeeParams>>;
     /**
      * @dev Borrowing fee data for pairs
-     * @dev Indexed by: data[pairIndex]
+     * @dev Indexed by: data[collateralIndex][pairIndex]
      */
-    borrowingData: Record<number, PairBorrowingFeeData>;
-};
-/**
- * @dev Context for pair-specific borrowing v2 fee calculations
- */
-export type GetPairBorrowingFeeV2Context = {
-    /**
-     * @dev Current timestamp (defaults to Date.now() / 1000)
-     */
-    currentTimestamp?: number;
-    /**
-     * @dev Borrowing fee parameters for this specific pair
-     */
-    params: BorrowingFeeParams;
-    /**
-     * @dev Borrowing fee data for this specific pair
-     */
-    data: PairBorrowingFeeData;
+    borrowingData: Record<number, Record<number, PairBorrowingFeeData>>;
 };
 /**
  * @dev Input for calculating pending borrowing fees for a pair
  */
 export type PairBorrowingFeeInput = {
+    collateralIndex: number;
     pairIndex: number;
     currentPairPrice: number;
     currentTimestamp?: number;
@@ -88,6 +71,7 @@ export type PairBorrowingFeeInput = {
 export type TradeBorrowingFeeInput = {
     positionSizeCollateral: number;
     openPrice: number;
+    collateralIndex: number;
     pairIndex: number;
     currentPairPrice: number;
     initialAccBorrowingFeeP: number;

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

@@ -62,7 +62,7 @@ export declare const getPairPendingAccFundingFees: (params: FundingFeeParams, da
  * @param tradeInfo Trade info (contracts version)
  * @param tradeFeesData Trade fees data containing initial acc funding fee
  * @param currentPairPrice Current pair price
- * @param context Optional context with funding fee data (full or pair-specific)
+ * @param context Optional context with funding fee data (if not provided, uses simple calculation)
  * @returns Funding fee in collateral tokens
  */
 export declare const getTradeFundingFeesCollateral: (trade: {
@@ -92,14 +92,7 @@ export declare const getTradeFundingFeesCollateral: (trade: {
             [pairIndex: number]: number;
         };
     } | undefined;
-}) | {
-    currentTimestamp: number;
-    params: FundingFeeParams;
-    data: PairFundingFeeData;
-    pairOi?: PairOiAfterV10 | undefined;
-    netExposureToken?: number | undefined;
-    netExposureUsd?: number | undefined;
-} | undefined) => number;
+}) | undefined) => number;
 /**
  * @dev Main function to calculate funding fees for a trade within context
  * @param context Funding fee context with params and data
@@ -140,7 +133,3 @@ export declare const getTradeFundingFeesCollateralSimple: (trade: {
 }, initialAccFundingFeeP: number, currentAccFundingFeeP: number) => number;
 export * as FundingFees from "./types";
 export type { FundingFeeParams, PairFundingFeeData, PairGlobalParams, TradeInitialAccFundingFees, PairOiAfterV10, FundingRateCalculation, GetFundingFeeContext, TradeFundingFeeResult, PairPendingAccFundingFeesResult, PairAccumulatedFees, TradeInitialAccFees, } from "./types";
-export type { GetPairFundingFeeContext } from "./pairContext";
-export * from "./fetcher";
-export * from "./pairContext";
-export * from "./builder";

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

@@ -26,9 +26,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FundingFees = exports.getTradeFundingFeesCollateralSimple = exports.getTradeFundingFees = exports.getTradeFundingFeesCollateral = exports.getPairPendingAccFundingFees = exports.getLongShortAprMultiplier = exports.getAvgFundingRatePerSecondP = exports.getSecondsToReachZeroRate = exports.getCurrentFundingVelocityPerYear = void 0;
 // Constants from contract
@@ -230,7 +227,7 @@ exports.getPairPendingAccFundingFees = getPairPendingAccFundingFees;
  * @param tradeInfo Trade info (contracts version)
  * @param tradeFeesData Trade fees data containing initial acc funding fee
  * @param currentPairPrice Current pair price
- * @param context Optional context with funding fee data (full or pair-specific)
+ * @param context Optional context with funding fee data (if not provided, uses simple calculation)
  * @returns Funding fee in collateral tokens
  */
 const getTradeFundingFeesCollateral = (trade, tradeInfo, tradeFeesData, currentPairPrice, context) => {
@@ -240,26 +237,8 @@ const getTradeFundingFeesCollateral = (trade, tradeInfo, tradeFeesData, currentP
         return 0;
     }
     const positionSizeCollateral = trade.collateralAmount * trade.leverage;
-    if (!context) {
-        return 0; // Cannot calculate without context
-    }
-    // Check if we have a pair-specific context
-    if ("params" in context && "data" in context) {
-        // Pair-specific context
-        const { params, data, pairOi, netExposureToken, netExposureUsd } = context;
-        if (!params.fundingFeesEnabled) {
-            return 0;
-        }
-        // Calculate pending accumulated fees
-        const { accFundingFeeLongP, accFundingFeeShortP } = (0, exports.getPairPendingAccFundingFees)(params, data, currentPairPrice, pairOi || { oiLongToken: 0, oiShortToken: 0 }, netExposureToken || 0, netExposureUsd || 0, context.currentTimestamp);
-        const currentAccFundingFeeP = trade.long
-            ? accFundingFeeLongP
-            : accFundingFeeShortP;
-        const fundingFeeDelta = currentAccFundingFeeP - tradeFeesData.initialAccFundingFeeP;
-        return (positionSizeCollateral * fundingFeeDelta) / trade.openPrice;
-    }
-    // Full context - original logic
-    if ("fundingParams" in context &&
+    // If we have full context, calculate current accumulated funding fee
+    if (context &&
         trade.collateralIndex !== undefined &&
         trade.pairIndex !== undefined) {
         const params = (_a = context.fundingParams[trade.collateralIndex]) === null || _a === void 0 ? void 0 : _a[trade.pairIndex];
@@ -341,6 +320,3 @@ const getTradeFundingFeesCollateralSimple = (trade, tradeInfo, initialAccFunding
 exports.getTradeFundingFeesCollateralSimple = getTradeFundingFeesCollateralSimple;
 // Export namespace for types
 exports.FundingFees = __importStar(require("./types"));
-__exportStar(require("./fetcher"), exports);
-__exportStar(require("./pairContext"), exports);
-__exportStar(require("./builder"), exports);