@gainsnetwork/sdk 0.2.67-rc6 → 0.2.67-rc8

package/lib/contracts/types/generated/GNSMultiCollatDiamond.d.ts

@@ -248,6 +248,22 @@ export declare namespace IFeeTiers {
     };
 }
 export declare namespace IPriceImpact {
+    type PairOiCollateralStruct = {
+        oiLongCollateral: PromiseOrValue<BigNumberish>;
+        oiShortCollateral: PromiseOrValue<BigNumberish>;
+    };
+    type PairOiCollateralStructOutput = [BigNumber, BigNumber] & {
+        oiLongCollateral: BigNumber;
+        oiShortCollateral: BigNumber;
+    };
+    type PairOiTokenStruct = {
+        oiLongToken: PromiseOrValue<BigNumberish>;
+        oiShortToken: PromiseOrValue<BigNumberish>;
+    };
+    type PairOiTokenStructOutput = [BigNumber, BigNumber] & {
+        oiLongToken: BigNumber;
+        oiShortToken: BigNumber;
+    };
     type PairOiStruct = {
         oiLongUsd: PromiseOrValue<BigNumberish>;
         oiShortUsd: PromiseOrValue<BigNumberish>;
@@ -362,6 +378,8 @@ export declare namespace ITradingStorage {
         openPrice: PromiseOrValue<BigNumberish>;
         tp: PromiseOrValue<BigNumberish>;
         sl: PromiseOrValue<BigNumberish>;
+        isCounterTrade: PromiseOrValue<boolean>;
+        positionSizeToken: PromiseOrValue<BigNumberish>;
         __placeholder: PromiseOrValue<BigNumberish>;
     };
     type TradeStructOutput = [
@@ -377,7 +395,9 @@ export declare namespace ITradingStorage {
         BigNumber,
         BigNumber,
         BigNumber,
-        BigNumber
+        boolean,
+        BigNumber,
+        number
     ] & {
         user: string;
         index: number;
@@ -391,7 +411,9 @@ export declare namespace ITradingStorage {
         openPrice: BigNumber;
         tp: BigNumber;
         sl: BigNumber;
-        __placeholder: BigNumber;
+        isCounterTrade: boolean;
+        positionSizeToken: BigNumber;
+        __placeholder: number;
     };
     type PendingOrderStruct = {
         trade: ITradingStorage.TradeStruct;
@@ -486,10 +508,18 @@ export declare namespace IUpdateLeverage {
     type UpdateLeverageValuesStruct = {
         newLeverage: PromiseOrValue<BigNumberish>;
         newCollateralAmount: PromiseOrValue<BigNumberish>;
-        liqPrice: PromiseOrValue<BigNumberish>;
+        existingLiqPrice: PromiseOrValue<BigNumberish>;
+        newLiqPrice: PromiseOrValue<BigNumberish>;
         govFeeCollateral: PromiseOrValue<BigNumberish>;
+        newEffectiveLeverage: PromiseOrValue<BigNumberish>;
+        totalTradeAvailableCollateralInDiamond: PromiseOrValue<BigNumberish>;
+        availableCollateralInDiamond: PromiseOrValue<BigNumberish>;
     };
     type UpdateLeverageValuesStructOutput = [
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
         BigNumber,
         BigNumber,
         BigNumber,
@@ -497,29 +527,68 @@ export declare namespace IUpdateLeverage {
     ] & {
         newLeverage: BigNumber;
         newCollateralAmount: BigNumber;
-        liqPrice: BigNumber;
+        existingLiqPrice: BigNumber;
+        newLiqPrice: BigNumber;
         govFeeCollateral: BigNumber;
+        newEffectiveLeverage: BigNumber;
+        totalTradeAvailableCollateralInDiamond: BigNumber;
+        availableCollateralInDiamond: BigNumber;
+    };
+}
+export declare namespace ITradingCommonUtils {
+    type TradePriceImpactStruct = {
+        positionSizeToken: PromiseOrValue<BigNumberish>;
+        fixedSpreadP: PromiseOrValue<BigNumberish>;
+        cumulVolPriceImpactP: PromiseOrValue<BigNumberish>;
+        skewPriceImpactP: PromiseOrValue<BigNumberish>;
+        totalPriceImpactP: PromiseOrValue<BigNumberish>;
+        priceAfterImpact: PromiseOrValue<BigNumberish>;
+    };
+    type TradePriceImpactStructOutput = [
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber
+    ] & {
+        positionSizeToken: BigNumber;
+        fixedSpreadP: BigNumber;
+        cumulVolPriceImpactP: BigNumber;
+        skewPriceImpactP: BigNumber;
+        totalPriceImpactP: BigNumber;
+        priceAfterImpact: BigNumber;
     };
 }
 export declare namespace IUpdatePositionSize {
     type DecreasePositionSizeValuesStruct = {
+        isLeverageUpdate: PromiseOrValue<boolean>;
         positionSizeCollateralDelta: PromiseOrValue<BigNumberish>;
         existingPositionSizeCollateral: PromiseOrValue<BigNumberish>;
         existingLiqPrice: PromiseOrValue<BigNumberish>;
-        priceAfterImpact: PromiseOrValue<BigNumberish>;
-        existingPnlCollateral: PromiseOrValue<BigNumberish>;
-        borrowingFeeCollateral: PromiseOrValue<BigNumberish>;
+        newLiqPrice: PromiseOrValue<BigNumberish>;
+        priceImpact: ITradingCommonUtils.TradePriceImpactStruct;
+        existingPnlPercent: PromiseOrValue<BigNumberish>;
+        partialRawPnlCollateral: PromiseOrValue<BigNumberish>;
+        partialNetPnlCollateral: PromiseOrValue<BigNumberish>;
+        pnlToRealizeCollateral: PromiseOrValue<BigNumberish>;
         closingFeeCollateral: PromiseOrValue<BigNumberish>;
+        totalAvailableCollateralInDiamond: PromiseOrValue<BigNumberish>;
         availableCollateralInDiamond: PromiseOrValue<BigNumberish>;
         collateralSentToTrader: PromiseOrValue<BigNumberish>;
         newCollateralAmount: PromiseOrValue<BigNumberish>;
         newLeverage: PromiseOrValue<BigNumberish>;
     };
     type DecreasePositionSizeValuesStructOutput = [
+        boolean,
         BigNumber,
         BigNumber,
         BigNumber,
         BigNumber,
+        ITradingCommonUtils.TradePriceImpactStructOutput,
+        BigNumber,
+        BigNumber,
+        BigNumber,
         BigNumber,
         BigNumber,
         BigNumber,
@@ -528,13 +597,18 @@ export declare namespace IUpdatePositionSize {
         BigNumber,
         number
     ] & {
+        isLeverageUpdate: boolean;
         positionSizeCollateralDelta: BigNumber;
         existingPositionSizeCollateral: BigNumber;
         existingLiqPrice: BigNumber;
-        priceAfterImpact: BigNumber;
-        existingPnlCollateral: BigNumber;
-        borrowingFeeCollateral: BigNumber;
+        newLiqPrice: BigNumber;
+        priceImpact: ITradingCommonUtils.TradePriceImpactStructOutput;
+        existingPnlPercent: BigNumber;
+        partialRawPnlCollateral: BigNumber;
+        partialNetPnlCollateral: BigNumber;
+        pnlToRealizeCollateral: BigNumber;
         closingFeeCollateral: BigNumber;
+        totalAvailableCollateralInDiamond: BigNumber;
         availableCollateralInDiamond: BigNumber;
         collateralSentToTrader: BigNumber;
         newCollateralAmount: BigNumber;
@@ -546,14 +620,17 @@ export declare namespace IUpdatePositionSize {
         newPositionSizeCollateral: PromiseOrValue<BigNumberish>;
         newCollateralAmount: PromiseOrValue<BigNumberish>;
         newLeverage: PromiseOrValue<BigNumberish>;
-        priceAfterImpact: PromiseOrValue<BigNumberish>;
+        priceImpact: ITradingCommonUtils.TradePriceImpactStruct;
         existingPnlCollateral: PromiseOrValue<BigNumberish>;
         oldPosSizePlusPnlCollateral: PromiseOrValue<BigNumberish>;
         newOpenPrice: PromiseOrValue<BigNumberish>;
-        borrowingFeeCollateral: PromiseOrValue<BigNumberish>;
         openingFeesCollateral: PromiseOrValue<BigNumberish>;
         existingLiqPrice: PromiseOrValue<BigNumberish>;
         newLiqPrice: PromiseOrValue<BigNumberish>;
+        isCounterTradeValidated: PromiseOrValue<boolean>;
+        exceedingPositionSizeCollateral: PromiseOrValue<BigNumberish>;
+        counterTradeCollateralToReturn: PromiseOrValue<BigNumberish>;
+        newEffectiveLeverage: PromiseOrValue<BigNumberish>;
     };
     type IncreasePositionSizeValuesStructOutput = [
         BigNumber,
@@ -561,11 +638,14 @@ export declare namespace IUpdatePositionSize {
         BigNumber,
         BigNumber,
         BigNumber,
+        ITradingCommonUtils.TradePriceImpactStructOutput,
+        BigNumber,
         BigNumber,
         BigNumber,
         BigNumber,
         BigNumber,
         BigNumber,
+        boolean,
         BigNumber,
         BigNumber,
         BigNumber
@@ -575,51 +655,56 @@ export declare namespace IUpdatePositionSize {
         newPositionSizeCollateral: BigNumber;
         newCollateralAmount: BigNumber;
         newLeverage: BigNumber;
-        priceAfterImpact: BigNumber;
+        priceImpact: ITradingCommonUtils.TradePriceImpactStructOutput;
         existingPnlCollateral: BigNumber;
         oldPosSizePlusPnlCollateral: BigNumber;
         newOpenPrice: BigNumber;
-        borrowingFeeCollateral: BigNumber;
         openingFeesCollateral: BigNumber;
         existingLiqPrice: BigNumber;
         newLiqPrice: BigNumber;
+        isCounterTradeValidated: boolean;
+        exceedingPositionSizeCollateral: BigNumber;
+        counterTradeCollateralToReturn: BigNumber;
+        newEffectiveLeverage: BigNumber;
     };
 }
 export declare namespace ITradingCallbacks {
     type AggregatorAnswerStruct = {
         orderId: ITradingStorage.IdStruct;
-        spreadP: PromiseOrValue<BigNumberish>;
-        price: PromiseOrValue<BigNumberish>;
         open: PromiseOrValue<BigNumberish>;
         high: PromiseOrValue<BigNumberish>;
         low: PromiseOrValue<BigNumberish>;
+        current: PromiseOrValue<BigNumberish>;
     };
     type AggregatorAnswerStructOutput = [
         ITradingStorage.IdStructOutput,
         BigNumber,
         BigNumber,
         BigNumber,
-        BigNumber,
         BigNumber
     ] & {
         orderId: ITradingStorage.IdStructOutput;
-        spreadP: BigNumber;
-        price: BigNumber;
         open: BigNumber;
         high: BigNumber;
         low: BigNumber;
+        current: BigNumber;
     };
     type ValuesStruct = {
         profitP: PromiseOrValue<BigNumberish>;
         executionPrice: PromiseOrValue<BigNumberish>;
+        executionPriceRaw: PromiseOrValue<BigNumberish>;
         liqPrice: PromiseOrValue<BigNumberish>;
         amountSentToTrader: PromiseOrValue<BigNumberish>;
         collateralPriceUsd: PromiseOrValue<BigNumberish>;
         exactExecution: PromiseOrValue<boolean>;
-        collateralLeftInStorage: PromiseOrValue<BigNumberish>;
-        oraclePrice: PromiseOrValue<BigNumberish>;
         limitIndex: PromiseOrValue<BigNumberish>;
-        priceImpactP: PromiseOrValue<BigNumberish>;
+        priceImpact: ITradingCommonUtils.TradePriceImpactStruct;
+        cancelReason: PromiseOrValue<BigNumberish>;
+        collateralToReturn: PromiseOrValue<BigNumberish>;
+        newCollateralAmount: PromiseOrValue<BigNumberish>;
+        newEffectiveLeverage: PromiseOrValue<BigNumberish>;
+        pnlWithdrawnCollateral: PromiseOrValue<BigNumberish>;
+        openingFeeCollateral: PromiseOrValue<BigNumberish>;
     };
     type ValuesStructOutput = [
         BigNumber,
@@ -627,22 +712,196 @@ export declare namespace ITradingCallbacks {
         BigNumber,
         BigNumber,
         BigNumber,
+        BigNumber,
         boolean,
+        number,
+        ITradingCommonUtils.TradePriceImpactStructOutput,
+        number,
+        BigNumber,
+        BigNumber,
         BigNumber,
         BigNumber,
-        number,
         BigNumber
     ] & {
         profitP: BigNumber;
         executionPrice: BigNumber;
+        executionPriceRaw: BigNumber;
         liqPrice: BigNumber;
         amountSentToTrader: BigNumber;
         collateralPriceUsd: BigNumber;
         exactExecution: boolean;
-        collateralLeftInStorage: BigNumber;
-        oraclePrice: BigNumber;
         limitIndex: number;
-        priceImpactP: BigNumber;
+        priceImpact: ITradingCommonUtils.TradePriceImpactStructOutput;
+        cancelReason: number;
+        collateralToReturn: BigNumber;
+        newCollateralAmount: BigNumber;
+        newEffectiveLeverage: BigNumber;
+        pnlWithdrawnCollateral: BigNumber;
+        openingFeeCollateral: BigNumber;
+    };
+}
+export declare namespace IFundingFees {
+    type PendingParamUpdateStruct = {
+        collateralIndex: PromiseOrValue<BigNumberish>;
+        pairIndex: PromiseOrValue<BigNumberish>;
+        updateType: PromiseOrValue<BigNumberish>;
+        newValue: PromiseOrValue<BigNumberish>;
+    };
+    type PendingParamUpdateStructOutput = [
+        number,
+        number,
+        number,
+        BigNumber
+    ] & {
+        collateralIndex: number;
+        pairIndex: number;
+        updateType: number;
+        newValue: BigNumber;
+    };
+    type TradeHoldingFeesStruct = {
+        fundingFeeCollateral: PromiseOrValue<BigNumberish>;
+        borrowingFeeCollateral: PromiseOrValue<BigNumberish>;
+        borrowingFeeCollateral_old: PromiseOrValue<BigNumberish>;
+        totalFeeCollateral: PromiseOrValue<BigNumberish>;
+    };
+    type TradeHoldingFeesStructOutput = [
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber
+    ] & {
+        fundingFeeCollateral: BigNumber;
+        borrowingFeeCollateral: BigNumber;
+        borrowingFeeCollateral_old: BigNumber;
+        totalFeeCollateral: BigNumber;
+    };
+    type PairBorrowingFeeDataStruct = {
+        accBorrowingFeeP: PromiseOrValue<BigNumberish>;
+        lastBorrowingUpdateTs: PromiseOrValue<BigNumberish>;
+        __placeholder: PromiseOrValue<BigNumberish>;
+    };
+    type PairBorrowingFeeDataStructOutput = [
+        BigNumber,
+        number,
+        BigNumber
+    ] & {
+        accBorrowingFeeP: BigNumber;
+        lastBorrowingUpdateTs: number;
+        __placeholder: BigNumber;
+    };
+    type PairFundingFeeDataStruct = {
+        accFundingFeeLongP: PromiseOrValue<BigNumberish>;
+        accFundingFeeShortP: PromiseOrValue<BigNumberish>;
+        lastFundingRatePerSecondP: PromiseOrValue<BigNumberish>;
+        lastFundingUpdateTs: PromiseOrValue<BigNumberish>;
+        __placeholder: PromiseOrValue<BigNumberish>;
+    };
+    type PairFundingFeeDataStructOutput = [
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        number,
+        BigNumber
+    ] & {
+        accFundingFeeLongP: BigNumber;
+        accFundingFeeShortP: BigNumber;
+        lastFundingRatePerSecondP: BigNumber;
+        lastFundingUpdateTs: number;
+        __placeholder: BigNumber;
+    };
+    type TradeFeesDataStruct = {
+        realizedTradingFeesCollateral: PromiseOrValue<BigNumberish>;
+        realizedPnlCollateral: PromiseOrValue<BigNumberish>;
+        manuallyRealizedNegativePnlCollateral: PromiseOrValue<BigNumberish>;
+        alreadyTransferredNegativePnlCollateral: PromiseOrValue<BigNumberish>;
+        virtualAvailableCollateralInDiamond: PromiseOrValue<BigNumberish>;
+        __placeholder: PromiseOrValue<BigNumberish>;
+        initialAccFundingFeeP: PromiseOrValue<BigNumberish>;
+        initialAccBorrowingFeeP: PromiseOrValue<BigNumberish>;
+    };
+    type TradeFeesDataStructOutput = [
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber
+    ] & {
+        realizedTradingFeesCollateral: BigNumber;
+        realizedPnlCollateral: BigNumber;
+        manuallyRealizedNegativePnlCollateral: BigNumber;
+        alreadyTransferredNegativePnlCollateral: BigNumber;
+        virtualAvailableCollateralInDiamond: BigNumber;
+        __placeholder: BigNumber;
+        initialAccFundingFeeP: BigNumber;
+        initialAccBorrowingFeeP: BigNumber;
+    };
+    type BorrowingFeeParamsStruct = {
+        borrowingRatePerSecondP: PromiseOrValue<BigNumberish>;
+        __placeholder: PromiseOrValue<BigNumberish>;
+    };
+    type BorrowingFeeParamsStructOutput = [number, BigNumber] & {
+        borrowingRatePerSecondP: number;
+        __placeholder: BigNumber;
+    };
+    type FundingFeeParamsStruct = {
+        skewCoefficientPerYear: PromiseOrValue<BigNumberish>;
+        absoluteVelocityPerYearCap: PromiseOrValue<BigNumberish>;
+        absoluteRatePerSecondCap: PromiseOrValue<BigNumberish>;
+        thetaThresholdUsd: PromiseOrValue<BigNumberish>;
+        fundingFeesEnabled: PromiseOrValue<boolean>;
+        aprMultiplierEnabled: PromiseOrValue<boolean>;
+        __placeholder: PromiseOrValue<BigNumberish>;
+    };
+    type FundingFeeParamsStructOutput = [
+        BigNumber,
+        number,
+        number,
+        number,
+        boolean,
+        boolean,
+        number
+    ] & {
+        skewCoefficientPerYear: BigNumber;
+        absoluteVelocityPerYearCap: number;
+        absoluteRatePerSecondCap: number;
+        thetaThresholdUsd: number;
+        fundingFeesEnabled: boolean;
+        aprMultiplierEnabled: boolean;
+        __placeholder: number;
+    };
+    type PairGlobalParamsStruct = {
+        maxSkewCollateral: PromiseOrValue<BigNumberish>;
+        __placeholder: PromiseOrValue<BigNumberish>;
+    };
+    type PairGlobalParamsStructOutput = [BigNumber, BigNumber] & {
+        maxSkewCollateral: BigNumber;
+        __placeholder: BigNumber;
+    };
+    type UiRealizedPnlDataStruct = {
+        realizedTradingFeesCollateral: PromiseOrValue<BigNumberish>;
+        realizedOldBorrowingFeesCollateral: PromiseOrValue<BigNumberish>;
+        realizedNewBorrowingFeesCollateral: PromiseOrValue<BigNumberish>;
+        realizedFundingFeesCollateral: PromiseOrValue<BigNumberish>;
+        realizedPnlPartialCloseCollateral: PromiseOrValue<BigNumberish>;
+        pnlWithdrawnCollateral: PromiseOrValue<BigNumberish>;
+    };
+    type UiRealizedPnlDataStructOutput = [
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber
+    ] & {
+        realizedTradingFeesCollateral: BigNumber;
+        realizedOldBorrowingFeesCollateral: BigNumber;
+        realizedNewBorrowingFeesCollateral: BigNumber;
+        realizedFundingFeesCollateral: BigNumber;
+        realizedPnlPartialCloseCollateral: BigNumber;
+        pnlWithdrawnCollateral: BigNumber;
     };
 }
 export declare namespace IBorrowingFees {
@@ -748,6 +1007,7 @@ export declare namespace IBorrowingFees {
         long: PromiseOrValue<boolean>;
         collateral: PromiseOrValue<BigNumberish>;
         leverage: PromiseOrValue<BigNumberish>;
+        currentPairPrice: PromiseOrValue<BigNumberish>;
     };
     type BorrowingFeeInputStructOutput = [
         number,
@@ -756,6 +1016,7 @@ export declare namespace IBorrowingFees {
         number,
         boolean,
         BigNumber,
+        BigNumber,
         BigNumber
     ] & {
         collateralIndex: number;
@@ -765,6 +1026,7 @@ export declare namespace IBorrowingFees {
         long: boolean;
         collateral: BigNumber;
         leverage: BigNumber;
+        currentPairPrice: BigNumber;
     };
     type LiqPriceInputStruct = {
         collateralIndex: PromiseOrValue<BigNumberish>;
@@ -775,8 +1037,12 @@ export declare namespace IBorrowingFees {
         long: PromiseOrValue<boolean>;
         collateral: PromiseOrValue<BigNumberish>;
         leverage: PromiseOrValue<BigNumberish>;
-        useBorrowingFees: PromiseOrValue<boolean>;
+        additionalFeeCollateral: PromiseOrValue<BigNumberish>;
         liquidationParams: IPairsStorage.GroupLiquidationParamsStruct;
+        currentPairPrice: PromiseOrValue<BigNumberish>;
+        isCounterTrade: PromiseOrValue<boolean>;
+        partialCloseMultiplier: PromiseOrValue<BigNumberish>;
+        beforeOpened: PromiseOrValue<boolean>;
     };
     type LiqPriceInputStructOutput = [
         number,
@@ -787,8 +1053,12 @@ export declare namespace IBorrowingFees {
         boolean,
         BigNumber,
         BigNumber,
+        BigNumber,
+        IPairsStorage.GroupLiquidationParamsStructOutput,
+        BigNumber,
         boolean,
-        IPairsStorage.GroupLiquidationParamsStructOutput
+        BigNumber,
+        boolean
     ] & {
         collateralIndex: number;
         trader: string;
@@ -798,8 +1068,12 @@ export declare namespace IBorrowingFees {
         long: boolean;
         collateral: BigNumber;
         leverage: BigNumber;
-        useBorrowingFees: boolean;
+        additionalFeeCollateral: BigNumber;
         liquidationParams: IPairsStorage.GroupLiquidationParamsStructOutput;
+        currentPairPrice: BigNumber;
+        isCounterTrade: boolean;
+        partialCloseMultiplier: BigNumber;
+        beforeOpened: boolean;
     };
     type BorrowingGroupParamsStruct = {
         feePerBlock: PromiseOrValue<BigNumberish>;
@@ -851,18 +1125,44 @@ export declare namespace IPriceAggregator {
         open: PromiseOrValue<BigNumberish>;
         high: PromiseOrValue<BigNumberish>;
         low: PromiseOrValue<BigNumberish>;
+        current: PromiseOrValue<BigNumberish>;
         ts: PromiseOrValue<BigNumberish>;
     };
     type OrderAnswerStructOutput = [
         BigNumber,
         BigNumber,
         BigNumber,
-        BigNumber
+        BigNumber,
+        number
     ] & {
         open: BigNumber;
         high: BigNumber;
         low: BigNumber;
-        ts: BigNumber;
+        current: BigNumber;
+        ts: number;
+    };
+    type GetPriceInputStruct = {
+        collateralIndex: PromiseOrValue<BigNumberish>;
+        pairIndex: PromiseOrValue<BigNumberish>;
+        pendingOrder: ITradingStorage.PendingOrderStruct;
+        positionSizeCollateral: PromiseOrValue<BigNumberish>;
+        fromBlock: PromiseOrValue<BigNumberish>;
+        isCounterTrade: PromiseOrValue<boolean>;
+    };
+    type GetPriceInputStructOutput = [
+        number,
+        number,
+        ITradingStorage.PendingOrderStructOutput,
+        BigNumber,
+        BigNumber,
+        boolean
+    ] & {
+        collateralIndex: number;
+        pairIndex: number;
+        pendingOrder: ITradingStorage.PendingOrderStructOutput;
+        positionSizeCollateral: BigNumber;
+        fromBlock: BigNumber;
+        isCounterTrade: boolean;
     };
     type OrderStruct = {
         user: PromiseOrValue<string>;
@@ -961,6 +1261,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "hasRole(address,uint8)": FunctionFragment;
         "hasRoles(address,uint8,uint8)": FunctionFragment;
         "initialize(address)": FunctionFragment;
+        "initializeGovEmergencyTimelock(address)": FunctionFragment;
         "setRoles(address[],uint8[],bool[])": FunctionFragment;
         "addFees((uint40,uint40,uint40,uint32,uint104)[])": FunctionFragment;
         "addGroups((string,bytes32,uint256,uint256)[])": FunctionFragment;
@@ -970,6 +1271,10 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "getAllPairsRestrictedMaxLeverage()": FunctionFragment;
         "getGlobalTradeFeeParams()": FunctionFragment;
         "getGroupLiquidationParams(uint256)": FunctionFragment;
+        "getPairCounterTradeFeeRateMultiplier(uint16)": FunctionFragment;
+        "getPairCounterTradeFeeRateMultipliers(uint16[])": FunctionFragment;
+        "getPairCounterTradeMaxLeverage(uint16)": FunctionFragment;
+        "getPairCounterTradeMaxLeverages(uint16[])": FunctionFragment;
         "getPairLiquidationParams(uint256)": FunctionFragment;
         "groups(uint256)": FunctionFragment;
         "groupsCount()": FunctionFragment;
@@ -993,6 +1298,8 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "pairsCount()": FunctionFragment;
         "setGlobalTradeFeeParams((uint24,uint24,uint24,uint24,uint24,uint136))": FunctionFragment;
         "setGroupLiquidationParams(uint256,(uint40,uint40,uint40,uint24,uint24))": FunctionFragment;
+        "setPairCounterTradeFeeRateMultipliers(uint16[],uint16[])": FunctionFragment;
+        "setPairCounterTradeMaxLeverages(uint16[],uint24[])": FunctionFragment;
         "setPairCustomMaxLeverages(uint256[],uint256[])": FunctionFragment;
         "updateFees(uint256[],(uint40,uint40,uint40,uint32,uint104)[])": FunctionFragment;
         "updateGroups(uint256[],(string,bytes32,uint256,uint256)[])": FunctionFragment;
@@ -1044,9 +1351,16 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "getPairDepth(uint256)": FunctionFragment;
         "getPairDepths(uint256[])": FunctionFragment;
         "getPairFactors(uint256[])": FunctionFragment;
+        "getPairOiAfterV10Collateral(uint8,uint16)": FunctionFragment;
+        "getPairOiAfterV10Token(uint8,uint16)": FunctionFragment;
+        "getPairOisAfterV10Collateral(uint8[],uint16[])": FunctionFragment;
+        "getPairOisAfterV10Token(uint8[],uint16[])": FunctionFragment;
+        "getPairSkewDepth(uint8,uint16)": FunctionFragment;
+        "getPairSkewDepths(uint8[],uint16[])": FunctionFragment;
         "getPriceImpactOi(uint256,bool)": FunctionFragment;
         "getProtectionCloseFactorWhitelist(address)": FunctionFragment;
-        "getTradePriceImpact(address,uint256,uint256,bool,uint256,bool,bool,uint256,uint8)": FunctionFragment;
+        "getTradeCumulVolPriceImpactP(address,uint16,bool,uint256,bool,bool,uint256)": FunctionFragment;
+        "getTradeSkewPriceImpactP(uint8,uint16,bool,uint256,bool)": FunctionFragment;
         "getUserPriceImpact(address,uint256)": FunctionFragment;
         "initializeNegPnlCumulVolMultiplier(uint40)": FunctionFragment;
         "initializePairFactors(uint16[],uint40[],uint32[],uint40[])": FunctionFragment;
@@ -1056,15 +1370,17 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "setExemptOnOpen(uint16[],bool[])": FunctionFragment;
         "setNegPnlCumulVolMultiplier(uint40)": FunctionFragment;
         "setPairDepths(uint256[],uint128[],uint128[])": FunctionFragment;
+        "setPairSkewDepths(uint8[],uint16[],uint256[])": FunctionFragment;
         "setPriceImpactWindowsCount(uint48)": FunctionFragment;
         "setPriceImpactWindowsDuration(uint48)": FunctionFragment;
         "setProtectionCloseFactorBlocks(uint16[],uint32[])": FunctionFragment;
         "setProtectionCloseFactorWhitelist(address[],bool[])": FunctionFragment;
         "setProtectionCloseFactors(uint16[],uint40[])": FunctionFragment;
         "setUserPriceImpact(address[],uint16[],uint16[],uint16[])": FunctionFragment;
+        "updatePairOiAfterV10(uint8,uint16,uint256,uint256,bool,bool)": FunctionFragment;
         "addCollateral(address,address)": FunctionFragment;
         "closePendingOrder((address,uint32))": FunctionFragment;
-        "closeTrade((address,uint32),bool)": FunctionFragment;
+        "closeTrade((address,uint32),bool,uint64)": FunctionFragment;
         "getAllPendingOrders(uint256,uint256)": FunctionFragment;
         "getAllPendingOrdersForTraders(address[],uint256,uint256)": FunctionFragment;
         "getAllTradeInfos(uint256,uint256)": FunctionFragment;
@@ -1085,6 +1401,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "getPendingOrder((address,uint32))": FunctionFragment;
         "getPendingOrders(address)": FunctionFragment;
         "getTrade(address,uint32)": FunctionFragment;
+        "getTradeContractsVersion(address,uint32)": FunctionFragment;
         "getTradeInfo(address,uint32)": FunctionFragment;
         "getTradeInfos(address)": FunctionFragment;
         "getTradeLiquidationParams(address,uint32)": FunctionFragment;
@@ -1099,14 +1416,13 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "isCollateralActive(uint8)": FunctionFragment;
         "isCollateralGns(uint8)": FunctionFragment;
         "isCollateralListed(uint8)": FunctionFragment;
-        "storePendingOrder(((address,uint32,uint16,uint24,bool,bool,uint8,uint8,uint120,uint64,uint64,uint64,uint192),address,uint32,bool,uint8,uint32,uint16))": FunctionFragment;
-        "storeTrade((address,uint32,uint16,uint24,bool,bool,uint8,uint8,uint120,uint64,uint64,uint64,uint192),(uint32,uint32,uint32,uint16,uint48,uint48,uint8,uint32,uint8))": FunctionFragment;
+        "storePendingOrder(((address,uint32,uint16,uint24,bool,bool,uint8,uint8,uint120,uint64,uint64,uint64,bool,uint160,uint24),address,uint32,bool,uint8,uint32,uint16))": FunctionFragment;
+        "storeTrade((address,uint32,uint16,uint24,bool,bool,uint8,uint8,uint120,uint64,uint64,uint64,bool,uint160,uint24),(uint32,uint32,uint32,uint16,uint48,uint48,uint8,uint32,uint8),uint64)": FunctionFragment;
         "toggleCollateralActiveState(uint8)": FunctionFragment;
         "updateGToken(address,address)": FunctionFragment;
         "updateOpenOrderDetails((address,uint32),uint64,uint64,uint64,uint16)": FunctionFragment;
-        "updateTradeCollateralAmount((address,uint32),uint120)": FunctionFragment;
         "updateTradeMaxClosingSlippageP((address,uint32),uint16)": FunctionFragment;
-        "updateTradePosition((address,uint32),uint120,uint24,uint64,bool,bool)": FunctionFragment;
+        "updateTradePosition((address,uint32),uint120,uint24,uint64,uint8,uint256,bool,uint64)": FunctionFragment;
         "updateTradeSl((address,uint32),uint64)": FunctionFragment;
         "updateTradeTp((address,uint32),uint64)": FunctionFragment;
         "updateTradingActivated(uint8)": FunctionFragment;
@@ -1129,9 +1445,10 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "increasePositionSize(uint32,uint120,uint24,uint64,uint16)": FunctionFragment;
         "increasePositionSizeNative(uint32,uint120,uint24,uint64,uint16)": FunctionFragment;
         "initializeTrading(uint16,address[])": FunctionFragment;
+        "initiateManualNegativePnlRealization(address,uint32,bool)": FunctionFragment;
         "isWrappedNativeToken(address)": FunctionFragment;
-        "openTrade((address,uint32,uint16,uint24,bool,bool,uint8,uint8,uint120,uint64,uint64,uint64,uint192),uint16,address)": FunctionFragment;
-        "openTradeNative((address,uint32,uint16,uint24,bool,bool,uint8,uint8,uint120,uint64,uint64,uint64,uint192),uint16,address)": FunctionFragment;
+        "openTrade((address,uint32,uint16,uint24,bool,bool,uint8,uint8,uint120,uint64,uint64,uint64,bool,uint160,uint24),uint16,address)": FunctionFragment;
+        "openTradeNative((address,uint32,uint16,uint24,bool,bool,uint8,uint8,uint120,uint64,uint64,uint64,bool,uint160,uint24),uint16,address)": FunctionFragment;
         "removeTradingDelegate()": FunctionFragment;
         "setTradingDelegate(address)": FunctionFragment;
         "triggerOrder(uint256)": FunctionFragment;
@@ -1143,22 +1460,27 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "updateOpenOrder(uint32,uint64,uint64,uint64,uint16)": FunctionFragment;
         "updateSl(uint32,uint64)": FunctionFragment;
         "updateTp(uint32,uint64)": FunctionFragment;
+        "withdrawPositivePnl(uint32,uint120)": FunctionFragment;
         "claimPendingGovFees()": FunctionFragment;
-        "closeTradeMarketCallback(((address,uint32),uint256,uint64,uint64,uint64,uint64))": FunctionFragment;
-        "decreasePositionSizeMarketCallback(((address,uint32),uint256,uint64,uint64,uint64,uint64))": FunctionFragment;
-        "executeTriggerCloseOrderCallback(((address,uint32),uint256,uint64,uint64,uint64,uint64))": FunctionFragment;
-        "executeTriggerOpenOrderCallback(((address,uint32),uint256,uint64,uint64,uint64,uint64))": FunctionFragment;
+        "closeTradeMarketCallback(((address,uint32),uint64,uint64,uint64,uint64))": FunctionFragment;
+        "decreasePositionSizeMarketCallback(((address,uint32),uint64,uint64,uint64,uint64))": FunctionFragment;
+        "executeTriggerCloseOrderCallback(((address,uint32),uint64,uint64,uint64,uint64))": FunctionFragment;
+        "executeTriggerOpenOrderCallback(((address,uint32),uint64,uint64,uint64,uint64))": FunctionFragment;
         "getPendingGovFeesCollateral(uint8)": FunctionFragment;
         "getVaultClosingFeeP()": FunctionFragment;
-        "increasePositionSizeMarketCallback(((address,uint32),uint256,uint64,uint64,uint64,uint64))": FunctionFragment;
+        "increasePositionSizeMarketCallback(((address,uint32),uint64,uint64,uint64,uint64))": FunctionFragment;
         "initializeCallbacks(uint8)": FunctionFragment;
         "initializeTreasuryAddress(address)": FunctionFragment;
-        "openTradeMarketCallback(((address,uint32),uint256,uint64,uint64,uint64,uint64))": FunctionFragment;
-        "updateLeverageCallback(((address,uint32),uint256,uint64,uint64,uint64,uint64))": FunctionFragment;
+        "manualHoldingFeesRealizationCallback(((address,uint32),uint64,uint64,uint64,uint64))": FunctionFragment;
+        "manualNegativePnlRealizationCallback(((address,uint32),uint64,uint64,uint64,uint64))": FunctionFragment;
+        "openTradeMarketCallback(((address,uint32),uint64,uint64,uint64,uint64))": FunctionFragment;
+        "pnlWithdrawalCallback(((address,uint32),uint64,uint64,uint64,uint64))": FunctionFragment;
+        "updateLeverageCallback(((address,uint32),uint64,uint64,uint64,uint64))": FunctionFragment;
         "updateTreasuryAddress(address)": FunctionFragment;
         "updateVaultClosingFeeP(uint8)": FunctionFragment;
-        "validateTriggerCloseOrderCallback((address,uint32),uint8,uint64,uint64,uint64)": FunctionFragment;
-        "validateTriggerOpenOrderCallback((address,uint32),uint8,uint64,uint64,uint64)": FunctionFragment;
+        "validateTriggerCloseOrderCallback((address,uint32),uint8,uint64,uint64,uint64,uint64)": FunctionFragment;
+        "validateTriggerOpenOrderCallback((address,uint32),uint8,uint64,uint64,uint64,uint64)": FunctionFragment;
+        "borrowingParamUpdateCallback((uint8,uint16,uint8,uint224),uint256)": FunctionFragment;
         "getAllBorrowingPairs(uint8)": FunctionFragment;
         "getBorrowingFeePerBlockCap()": FunctionFragment;
         "getBorrowingGroup(uint8,uint16)": FunctionFragment;
@@ -1171,23 +1493,24 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "getBorrowingPairFeePerBlockCaps(uint8,uint16[])": FunctionFragment;
         "getBorrowingPairGroupIndex(uint8,uint16)": FunctionFragment;
         "getBorrowingPairGroups(uint8,uint16)": FunctionFragment;
-        "getBorrowingPairOi(uint8,uint16)": FunctionFragment;
-        "getBorrowingPairPendingAccFees(uint8,uint16,uint256)": FunctionFragment;
+        "getBorrowingPairOiBeforeV10(uint8,uint16)": FunctionFragment;
+        "getBorrowingPairPendingAccFees(uint8,uint16,uint256,uint256)": FunctionFragment;
         "getPairMaxOi(uint8,uint16)": FunctionFragment;
         "getPairMaxOiCollateral(uint8,uint16)": FunctionFragment;
-        "getPairOiCollateral(uint8,uint16,bool)": FunctionFragment;
-        "getPairOisCollateral(uint8,uint16)": FunctionFragment;
-        "getTradeBorrowingFee((uint8,address,uint16,uint32,bool,uint256,uint256))": FunctionFragment;
-        "getTradeLiquidationPrice((uint8,address,uint16,uint32,uint64,bool,uint256,uint256,bool,(uint40,uint40,uint40,uint24,uint24)))": FunctionFragment;
-        "handleTradeBorrowingCallback(uint8,address,uint16,uint32,uint256,bool,bool)": FunctionFragment;
+        "getPairOiBeforeV10Collateral(uint8,uint16,bool)": FunctionFragment;
+        "getPairOisBeforeV10Collateral(uint8,uint16)": FunctionFragment;
+        "getTradeBorrowingFee((uint8,address,uint16,uint32,bool,uint256,uint256,uint256))": FunctionFragment;
+        "getTradeLiquidationPrice((uint8,address,uint16,uint32,uint64,bool,uint256,uint256,int256,(uint40,uint40,uint40,uint24,uint24),uint64,bool,uint256,bool))": FunctionFragment;
+        "handleTradeBorrowingCallback(uint8,address,uint16,uint32,uint256,bool,bool,uint256)": FunctionFragment;
         "initializeBorrowingFeePerBlockCap((uint32,uint32))": FunctionFragment;
-        "resetTradeBorrowingFees(uint8,address,uint16,uint32,bool)": FunctionFragment;
+        "resetTradeBorrowingFees(uint8,address,uint16,uint32,bool,uint256)": FunctionFragment;
         "setBorrowingFeePerBlockCap((uint32,uint32))": FunctionFragment;
         "setBorrowingGroupParams(uint8,uint16,(uint32,uint72,uint48))": FunctionFragment;
         "setBorrowingGroupParamsArray(uint8,uint16[],(uint32,uint72,uint48)[])": FunctionFragment;
         "setBorrowingPairFeePerBlockCapArray(uint8,uint16[],(uint32,uint32)[])": FunctionFragment;
         "setBorrowingPairParams(uint8,uint16,(uint16,uint32,uint48,uint72))": FunctionFragment;
         "setBorrowingPairParamsArray(uint8,uint16[],(uint16,uint32,uint48,uint72)[])": FunctionFragment;
+        "updatePairOiBeforeV10(uint8,uint16,bool,bool,uint256)": FunctionFragment;
         "withinMaxBorrowingGroupOi(uint8,uint16,bool,uint256)": FunctionFragment;
         "addOracle(address)": FunctionFragment;
         "claimBackLink()": FunctionFragment;
@@ -1203,7 +1526,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "getLimitJobCount()": FunctionFragment;
         "getLimitJobId()": FunctionFragment;
         "getLimitJobIndex()": FunctionFragment;
-        "getLinkFee(uint8,address,uint16,uint256)": FunctionFragment;
+        "getLinkFee(uint8,address,uint16,uint256,bool)": FunctionFragment;
         "getLinkUsdPriceFeed()": FunctionFragment;
         "getMarketJobId()": FunctionFragment;
         "getMaxLookbackDeviationP()": FunctionFragment;
@@ -1211,8 +1534,9 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "getMinAnswers()": FunctionFragment;
         "getOracle(uint256)": FunctionFragment;
         "getOracles()": FunctionFragment;
+        "getParamUpdateJobId()": FunctionFragment;
         "getPendingRequest(bytes32)": FunctionFragment;
-        "getPrice(uint8,uint16,((address,uint32,uint16,uint24,bool,bool,uint8,uint8,uint120,uint64,uint64,uint64,uint192),address,uint32,bool,uint8,uint32,uint16),uint256,uint256)": FunctionFragment;
+        "getPrice((uint8,uint16,((address,uint32,uint16,uint24,bool,bool,uint8,uint8,uint120,uint64,uint64,uint64,bool,uint160,uint24),address,uint32,bool,uint8,uint32,uint16),uint256,uint256,bool))": FunctionFragment;
         "getPriceAggregatorOrder(bytes32)": FunctionFragment;
         "getPriceAggregatorOrderAnswers((address,uint32))": FunctionFragment;
         "getRequestCount()": FunctionFragment;
@@ -1220,6 +1544,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "getUsdNormalizedValue(uint8,uint256)": FunctionFragment;
         "initializeLimitJobCount(uint8)": FunctionFragment;
         "initializeMaxDeviationsP(uint24,uint24)": FunctionFragment;
+        "initializeParamUpdateJobId(bytes32)": FunctionFragment;
         "initializePriceAggregator(address,address,uint24,uint8,address[],bytes32[2],uint8[],(address,uint8)[],address[])": FunctionFragment;
         "removeOracle(uint256)": FunctionFragment;
         "replaceOracle(uint256,address)": FunctionFragment;
@@ -1228,6 +1553,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "setMarketJobId(bytes32)": FunctionFragment;
         "setMaxLookbackDeviationP(uint24)": FunctionFragment;
         "setMaxMarketDeviationP(uint24)": FunctionFragment;
+        "setParamUpdateJobId(bytes32)": FunctionFragment;
         "updateCollateralGnsLiquidityPool(uint8,(address,uint8))": FunctionFragment;
         "updateCollateralUsdPriceFeed(uint8,address)": FunctionFragment;
         "updateLinkUsdPriceFeed(address)": FunctionFragment;
@@ -1247,8 +1573,46 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "initializeChainConfig(uint16,bool)": FunctionFragment;
         "updateNativeTransferEnabled(bool)": FunctionFragment;
         "updateNativeTransferGasLimit(uint16)": FunctionFragment;
+        "downscaleTradeFeesData(address,uint32,uint256,uint256,uint256)": FunctionFragment;
+        "getMaxSkewCollateral(uint8,uint16)": FunctionFragment;
+        "getPairBorrowingFeeData(uint8[],uint16[])": FunctionFragment;
+        "getPairBorrowingFeeParams(uint8[],uint16[])": FunctionFragment;
+        "getPairFundingFeeData(uint8[],uint16[])": FunctionFragment;
+        "getPairFundingFeeParams(uint8[],uint16[])": FunctionFragment;
+        "getPairGlobalParamsArray(uint8[],uint16[])": FunctionFragment;
+        "getPairPendingAccBorrowingFees(uint8,uint16,uint64)": FunctionFragment;
+        "getPairPendingAccFundingFees(uint8,uint16,uint64)": FunctionFragment;
+        "getPendingParamUpdates(uint32[])": FunctionFragment;
+        "getTradeBorrowingFeesCollateral(address,uint32,uint64)": FunctionFragment;
+        "getTradeFeesData(address,uint32)": FunctionFragment;
+        "getTradeFeesDataArray(address[],uint32[])": FunctionFragment;
+        "getTradeFundingFeesCollateral(address,uint32,uint64)": FunctionFragment;
+        "getTradeManuallyRealizedNegativePnlCollateral(address,uint32)": FunctionFragment;
+        "getTradePendingHoldingFeesCollateral(address,uint32,uint64)": FunctionFragment;
+        "getTradeRealizedPnlCollateral(address,uint32)": FunctionFragment;
+        "getTradeRealizedTradingFeesCollateral(address,uint32)": FunctionFragment;
+        "getTradeUiRealizedPnlDataArray(address[],uint32[])": FunctionFragment;
+        "pendingParamUpdateCallback(((address,uint32),uint64,uint64,uint64,uint64))": FunctionFragment;
+        "realizeHoldingFeesOnOpenTrade(address,uint32,uint64)": FunctionFragment;
+        "realizePnlOnOpenTrade(address,uint32,int256)": FunctionFragment;
+        "realizeTradingFeesOnOpenTrade(address,uint32,uint256,uint64)": FunctionFragment;
+        "requestParamUpdate(uint8,uint16,uint8,uint224)": FunctionFragment;
+        "setAbsoluteRatePerSecondCap(uint8[],uint16[],uint24[])": FunctionFragment;
+        "setAbsoluteVelocityPerYearCap(uint8[],uint16[],uint24[])": FunctionFragment;
+        "setAprMultiplierEnabled(uint8[],uint16[],bool[])": FunctionFragment;
+        "setBorrowingRatePerSecondP(uint8[],uint16[],uint24[])": FunctionFragment;
+        "setFundingFeesEnabled(uint8[],uint16[],bool[])": FunctionFragment;
+        "setMaxSkewCollateral(uint8[],uint16[],uint80[])": FunctionFragment;
+        "setSkewCoefficientPerYear(uint8[],uint16[],uint112[])": FunctionFragment;
+        "setThetaThresholdUsd(uint8[],uint16[],uint32[])": FunctionFragment;
+        "storeAlreadyTransferredNegativePnl(address,uint32,uint256)": FunctionFragment;
+        "storeManuallyRealizedNegativePnlCollateral(address,uint32,uint256)": FunctionFragment;
+        "storeTradeInitialAccFees(address,uint32,uint8,uint16,bool,uint64)": FunctionFragment;
+        "storeUiPnlWithdrawnCollateral(address,uint32,uint256)": FunctionFragment;
+        "storeUiRealizedPnlPartialCloseCollateral(address,uint32,int256)": FunctionFragment;
+        "storeVirtualAvailableCollateralInDiamond(address,uint32,uint256)": FunctionFragment;
     };
-    getFunction(nameOrSignatureOrTopic: "diamondCut" | "facetAddress" | "facetAddresses" | "facetFunctionSelectors" | "facets" | "getAddresses" | "hasRole" | "hasRoles" | "initialize" | "setRoles" | "addFees" | "addGroups" | "addPairs" | "fees" | "feesCount" | "getAllPairsRestrictedMaxLeverage" | "getGlobalTradeFeeParams" | "getGroupLiquidationParams" | "getPairLiquidationParams" | "groups" | "groupsCount" | "initializeGroupLiquidationParams" | "initializeNewFees" | "initializeReferralFeeChange" | "isPairIndexListed" | "isPairListed" | "pairCustomMaxLeverage" | "pairJob" | "pairMaxLeverage" | "pairMinFeeUsd" | "pairMinLeverage" | "pairMinPositionSizeUsd" | "pairOraclePositionSizeFeeP" | "pairSpreadP" | "pairSpreadPArray" | "pairTotalLiqCollateralFeeP" | "pairTotalPositionSizeFeeP" | "pairs" | "pairsCount" | "setGlobalTradeFeeParams" | "setGroupLiquidationParams" | "setPairCustomMaxLeverages" | "updateFees" | "updateGroups" | "updatePairs" | "claimAllyRewards" | "claimReferrerRewards" | "distributeReferralReward" | "getAllyDetails" | "getReferralSettingsOverrides" | "getReferralsAllyFeeP" | "getReferralsStartReferrerFeeP" | "getReferralsTargetVolumeUsd" | "getReferrerDetails" | "getReferrerFeeProgressP" | "getReferrersReferred" | "getTraderActiveReferrer" | "getTraderLastReferrer" | "getTradersReferred" | "initializeReferrals" | "overrideAllyFeeP" | "overrideReferralFeeP" | "registerPotentialReferrer" | "unwhitelistAllies" | "unwhitelistReferrers" | "updateAllyFeeP" | "updateReferralsTargetVolumeUsd" | "updateStartReferrerFeeP" | "whitelistAllies" | "whitelistReferrers" | "addTradersUnclaimedPoints" | "calculateFeeAmount" | "getFeeTier" | "getFeeTiersCount" | "getFeeTiersTraderDailyInfo" | "getFeeTiersTraderInfo" | "getGroupVolumeMultiplier" | "getTraderFeeTiersEnrollment" | "getTraderUnclaimedPoints" | "initializeFeeTiers" | "setFeeTiers" | "setGroupVolumeMultipliers" | "setTradersFeeTiersEnrollment" | "updateTraderPoints" | "addPriceImpactOpenInterest" | "getNegPnlCumulVolMultiplier" | "getOiWindow" | "getOiWindows" | "getOiWindowsSettings" | "getPairDepth" | "getPairDepths" | "getPairFactors" | "getPriceImpactOi" | "getProtectionCloseFactorWhitelist" | "getTradePriceImpact" | "getUserPriceImpact" | "initializeNegPnlCumulVolMultiplier" | "initializePairFactors" | "initializePriceImpact" | "setCumulativeFactors" | "setExemptAfterProtectionCloseFactor" | "setExemptOnOpen" | "setNegPnlCumulVolMultiplier" | "setPairDepths" | "setPriceImpactWindowsCount" | "setPriceImpactWindowsDuration" | "setProtectionCloseFactorBlocks" | "setProtectionCloseFactorWhitelist" | "setProtectionCloseFactors" | "setUserPriceImpact" | "addCollateral" | "closePendingOrder" | "closeTrade" | "getAllPendingOrders" | "getAllPendingOrdersForTraders" | "getAllTradeInfos" | "getAllTradeInfosForTraders" | "getAllTrades" | "getAllTradesForTraders" | "getAllTradesLiquidationParams" | "getAllTradesLiquidationParamsForTraders" | "getCollateral" | "getCollateralIndex" | "getCollaterals" | "getCollateralsCount" | "getCounters" | "getCountersForTraders" | "getCurrentContractsVersion" | "getGToken" | "getGnsCollateralIndex" | "getPendingOrder" | "getPendingOrders" | "getTrade" | "getTradeInfo" | "getTradeInfos" | "getTradeLiquidationParams" | "getTradePendingOrderBlock" | "getTraderStored" | "getTraders" | "getTradersCount" | "getTrades" | "getTradesLiquidationParams" | "getTradingActivated" | "initializeTradingStorage" | "isCollateralActive" | "isCollateralGns" | "isCollateralListed" | "storePendingOrder" | "storeTrade" | "toggleCollateralActiveState" | "updateGToken" | "updateOpenOrderDetails" | "updateTradeCollateralAmount" | "updateTradeMaxClosingSlippageP" | "updateTradePosition" | "updateTradeSl" | "updateTradeTp" | "updateTradingActivated" | "claimPendingTriggerRewards" | "distributeTriggerReward" | "getTriggerPendingRewardsGns" | "getTriggerTimeoutBlocks" | "hasActiveOrder" | "initializeTriggerRewards" | "updateTriggerTimeoutBlocks" | "cancelOpenOrder" | "cancelOrderAfterTimeout" | "closeTradeMarket" | "decreasePositionSize" | "delegatedTradingAction" | "getByPassTriggerLink" | "getMarketOrdersTimeoutBlocks" | "getTradingDelegate" | "getWrappedNativeToken" | "increasePositionSize" | "increasePositionSizeNative" | "initializeTrading" | "isWrappedNativeToken" | "openTrade" | "openTradeNative" | "removeTradingDelegate" | "setTradingDelegate" | "triggerOrder" | "updateByPassTriggerLink" | "updateLeverage" | "updateLeverageNative" | "updateMarketOrdersTimeoutBlocks" | "updateMaxClosingSlippageP" | "updateOpenOrder" | "updateSl" | "updateTp" | "claimPendingGovFees" | "closeTradeMarketCallback" | "decreasePositionSizeMarketCallback" | "executeTriggerCloseOrderCallback" | "executeTriggerOpenOrderCallback" | "getPendingGovFeesCollateral" | "getVaultClosingFeeP" | "increasePositionSizeMarketCallback" | "initializeCallbacks" | "initializeTreasuryAddress" | "openTradeMarketCallback" | "updateLeverageCallback" | "updateTreasuryAddress" | "updateVaultClosingFeeP" | "validateTriggerCloseOrderCallback" | "validateTriggerOpenOrderCallback" | "getAllBorrowingPairs" | "getBorrowingFeePerBlockCap" | "getBorrowingGroup" | "getBorrowingGroupOi" | "getBorrowingGroupPendingAccFees" | "getBorrowingGroups" | "getBorrowingInitialAccFees" | "getBorrowingPair" | "getBorrowingPairFeePerBlockCap" | "getBorrowingPairFeePerBlockCaps" | "getBorrowingPairGroupIndex" | "getBorrowingPairGroups" | "getBorrowingPairOi" | "getBorrowingPairPendingAccFees" | "getPairMaxOi" | "getPairMaxOiCollateral" | "getPairOiCollateral" | "getPairOisCollateral" | "getTradeBorrowingFee" | "getTradeLiquidationPrice" | "handleTradeBorrowingCallback" | "initializeBorrowingFeePerBlockCap" | "resetTradeBorrowingFees" | "setBorrowingFeePerBlockCap" | "setBorrowingGroupParams" | "setBorrowingGroupParamsArray" | "setBorrowingPairFeePerBlockCapArray" | "setBorrowingPairParams" | "setBorrowingPairParamsArray" | "withinMaxBorrowingGroupOi" | "addOracle" | "claimBackLink" | "fulfill" | "getChainlinkToken" | "getCollateralFromUsdNormalizedValue" | "getCollateralGnsLiquidityPool" | "getCollateralPriceUsd" | "getCollateralUsdPriceFeed" | "getGnsPriceCollateralAddress" | "getGnsPriceCollateralIndex" | "getGnsPriceUsd" | "getLimitJobCount" | "getLimitJobId" | "getLimitJobIndex" | "getLinkFee" | "getLinkUsdPriceFeed" | "getMarketJobId" | "getMaxLookbackDeviationP" | "getMaxMarketDeviationP" | "getMinAnswers" | "getOracle" | "getOracles" | "getPendingRequest" | "getPrice" | "getPriceAggregatorOrder" | "getPriceAggregatorOrderAnswers" | "getRequestCount" | "getTwapInterval" | "getUsdNormalizedValue" | "initializeLimitJobCount" | "initializeMaxDeviationsP" | "initializePriceAggregator" | "removeOracle" | "replaceOracle" | "setLimitJobCount" | "setLimitJobId" | "setMarketJobId" | "setMaxLookbackDeviationP" | "setMaxMarketDeviationP" | "updateCollateralGnsLiquidityPool" | "updateCollateralUsdPriceFeed" | "updateLinkUsdPriceFeed" | "updateMinAnswers" | "updateTwapInterval" | "addOtcCollateralBalance" | "getOtcBalance" | "getOtcConfig" | "getOtcRate" | "initializeOtc" | "sellGnsForCollateral" | "updateOtcConfig" | "multicall" | "getNativeTransferEnabled" | "getNativeTransferGasLimit" | "getReentrancyLock" | "initializeChainConfig" | "updateNativeTransferEnabled" | "updateNativeTransferGasLimit"): FunctionFragment;
+    getFunction(nameOrSignatureOrTopic: "diamondCut" | "facetAddress" | "facetAddresses" | "facetFunctionSelectors" | "facets" | "getAddresses" | "hasRole" | "hasRoles" | "initialize" | "initializeGovEmergencyTimelock" | "setRoles" | "addFees" | "addGroups" | "addPairs" | "fees" | "feesCount" | "getAllPairsRestrictedMaxLeverage" | "getGlobalTradeFeeParams" | "getGroupLiquidationParams" | "getPairCounterTradeFeeRateMultiplier" | "getPairCounterTradeFeeRateMultipliers" | "getPairCounterTradeMaxLeverage" | "getPairCounterTradeMaxLeverages" | "getPairLiquidationParams" | "groups" | "groupsCount" | "initializeGroupLiquidationParams" | "initializeNewFees" | "initializeReferralFeeChange" | "isPairIndexListed" | "isPairListed" | "pairCustomMaxLeverage" | "pairJob" | "pairMaxLeverage" | "pairMinFeeUsd" | "pairMinLeverage" | "pairMinPositionSizeUsd" | "pairOraclePositionSizeFeeP" | "pairSpreadP" | "pairSpreadPArray" | "pairTotalLiqCollateralFeeP" | "pairTotalPositionSizeFeeP" | "pairs" | "pairsCount" | "setGlobalTradeFeeParams" | "setGroupLiquidationParams" | "setPairCounterTradeFeeRateMultipliers" | "setPairCounterTradeMaxLeverages" | "setPairCustomMaxLeverages" | "updateFees" | "updateGroups" | "updatePairs" | "claimAllyRewards" | "claimReferrerRewards" | "distributeReferralReward" | "getAllyDetails" | "getReferralSettingsOverrides" | "getReferralsAllyFeeP" | "getReferralsStartReferrerFeeP" | "getReferralsTargetVolumeUsd" | "getReferrerDetails" | "getReferrerFeeProgressP" | "getReferrersReferred" | "getTraderActiveReferrer" | "getTraderLastReferrer" | "getTradersReferred" | "initializeReferrals" | "overrideAllyFeeP" | "overrideReferralFeeP" | "registerPotentialReferrer" | "unwhitelistAllies" | "unwhitelistReferrers" | "updateAllyFeeP" | "updateReferralsTargetVolumeUsd" | "updateStartReferrerFeeP" | "whitelistAllies" | "whitelistReferrers" | "addTradersUnclaimedPoints" | "calculateFeeAmount" | "getFeeTier" | "getFeeTiersCount" | "getFeeTiersTraderDailyInfo" | "getFeeTiersTraderInfo" | "getGroupVolumeMultiplier" | "getTraderFeeTiersEnrollment" | "getTraderUnclaimedPoints" | "initializeFeeTiers" | "setFeeTiers" | "setGroupVolumeMultipliers" | "setTradersFeeTiersEnrollment" | "updateTraderPoints" | "addPriceImpactOpenInterest" | "getNegPnlCumulVolMultiplier" | "getOiWindow" | "getOiWindows" | "getOiWindowsSettings" | "getPairDepth" | "getPairDepths" | "getPairFactors" | "getPairOiAfterV10Collateral" | "getPairOiAfterV10Token" | "getPairOisAfterV10Collateral" | "getPairOisAfterV10Token" | "getPairSkewDepth" | "getPairSkewDepths" | "getPriceImpactOi" | "getProtectionCloseFactorWhitelist" | "getTradeCumulVolPriceImpactP" | "getTradeSkewPriceImpactP" | "getUserPriceImpact" | "initializeNegPnlCumulVolMultiplier" | "initializePairFactors" | "initializePriceImpact" | "setCumulativeFactors" | "setExemptAfterProtectionCloseFactor" | "setExemptOnOpen" | "setNegPnlCumulVolMultiplier" | "setPairDepths" | "setPairSkewDepths" | "setPriceImpactWindowsCount" | "setPriceImpactWindowsDuration" | "setProtectionCloseFactorBlocks" | "setProtectionCloseFactorWhitelist" | "setProtectionCloseFactors" | "setUserPriceImpact" | "updatePairOiAfterV10" | "addCollateral" | "closePendingOrder" | "closeTrade" | "getAllPendingOrders" | "getAllPendingOrdersForTraders" | "getAllTradeInfos" | "getAllTradeInfosForTraders" | "getAllTrades" | "getAllTradesForTraders" | "getAllTradesLiquidationParams" | "getAllTradesLiquidationParamsForTraders" | "getCollateral" | "getCollateralIndex" | "getCollaterals" | "getCollateralsCount" | "getCounters" | "getCountersForTraders" | "getCurrentContractsVersion" | "getGToken" | "getGnsCollateralIndex" | "getPendingOrder" | "getPendingOrders" | "getTrade" | "getTradeContractsVersion" | "getTradeInfo" | "getTradeInfos" | "getTradeLiquidationParams" | "getTradePendingOrderBlock" | "getTraderStored" | "getTraders" | "getTradersCount" | "getTrades" | "getTradesLiquidationParams" | "getTradingActivated" | "initializeTradingStorage" | "isCollateralActive" | "isCollateralGns" | "isCollateralListed" | "storePendingOrder" | "storeTrade" | "toggleCollateralActiveState" | "updateGToken" | "updateOpenOrderDetails" | "updateTradeMaxClosingSlippageP" | "updateTradePosition" | "updateTradeSl" | "updateTradeTp" | "updateTradingActivated" | "claimPendingTriggerRewards" | "distributeTriggerReward" | "getTriggerPendingRewardsGns" | "getTriggerTimeoutBlocks" | "hasActiveOrder" | "initializeTriggerRewards" | "updateTriggerTimeoutBlocks" | "cancelOpenOrder" | "cancelOrderAfterTimeout" | "closeTradeMarket" | "decreasePositionSize" | "delegatedTradingAction" | "getByPassTriggerLink" | "getMarketOrdersTimeoutBlocks" | "getTradingDelegate" | "getWrappedNativeToken" | "increasePositionSize" | "increasePositionSizeNative" | "initializeTrading" | "initiateManualNegativePnlRealization" | "isWrappedNativeToken" | "openTrade" | "openTradeNative" | "removeTradingDelegate" | "setTradingDelegate" | "triggerOrder" | "updateByPassTriggerLink" | "updateLeverage" | "updateLeverageNative" | "updateMarketOrdersTimeoutBlocks" | "updateMaxClosingSlippageP" | "updateOpenOrder" | "updateSl" | "updateTp" | "withdrawPositivePnl" | "claimPendingGovFees" | "closeTradeMarketCallback" | "decreasePositionSizeMarketCallback" | "executeTriggerCloseOrderCallback" | "executeTriggerOpenOrderCallback" | "getPendingGovFeesCollateral" | "getVaultClosingFeeP" | "increasePositionSizeMarketCallback" | "initializeCallbacks" | "initializeTreasuryAddress" | "manualHoldingFeesRealizationCallback" | "manualNegativePnlRealizationCallback" | "openTradeMarketCallback" | "pnlWithdrawalCallback" | "updateLeverageCallback" | "updateTreasuryAddress" | "updateVaultClosingFeeP" | "validateTriggerCloseOrderCallback" | "validateTriggerOpenOrderCallback" | "borrowingParamUpdateCallback" | "getAllBorrowingPairs" | "getBorrowingFeePerBlockCap" | "getBorrowingGroup" | "getBorrowingGroupOi" | "getBorrowingGroupPendingAccFees" | "getBorrowingGroups" | "getBorrowingInitialAccFees" | "getBorrowingPair" | "getBorrowingPairFeePerBlockCap" | "getBorrowingPairFeePerBlockCaps" | "getBorrowingPairGroupIndex" | "getBorrowingPairGroups" | "getBorrowingPairOiBeforeV10" | "getBorrowingPairPendingAccFees" | "getPairMaxOi" | "getPairMaxOiCollateral" | "getPairOiBeforeV10Collateral" | "getPairOisBeforeV10Collateral" | "getTradeBorrowingFee" | "getTradeLiquidationPrice" | "handleTradeBorrowingCallback" | "initializeBorrowingFeePerBlockCap" | "resetTradeBorrowingFees" | "setBorrowingFeePerBlockCap" | "setBorrowingGroupParams" | "setBorrowingGroupParamsArray" | "setBorrowingPairFeePerBlockCapArray" | "setBorrowingPairParams" | "setBorrowingPairParamsArray" | "updatePairOiBeforeV10" | "withinMaxBorrowingGroupOi" | "addOracle" | "claimBackLink" | "fulfill" | "getChainlinkToken" | "getCollateralFromUsdNormalizedValue" | "getCollateralGnsLiquidityPool" | "getCollateralPriceUsd" | "getCollateralUsdPriceFeed" | "getGnsPriceCollateralAddress" | "getGnsPriceCollateralIndex" | "getGnsPriceUsd" | "getLimitJobCount" | "getLimitJobId" | "getLimitJobIndex" | "getLinkFee" | "getLinkUsdPriceFeed" | "getMarketJobId" | "getMaxLookbackDeviationP" | "getMaxMarketDeviationP" | "getMinAnswers" | "getOracle" | "getOracles" | "getParamUpdateJobId" | "getPendingRequest" | "getPrice" | "getPriceAggregatorOrder" | "getPriceAggregatorOrderAnswers" | "getRequestCount" | "getTwapInterval" | "getUsdNormalizedValue" | "initializeLimitJobCount" | "initializeMaxDeviationsP" | "initializeParamUpdateJobId" | "initializePriceAggregator" | "removeOracle" | "replaceOracle" | "setLimitJobCount" | "setLimitJobId" | "setMarketJobId" | "setMaxLookbackDeviationP" | "setMaxMarketDeviationP" | "setParamUpdateJobId" | "updateCollateralGnsLiquidityPool" | "updateCollateralUsdPriceFeed" | "updateLinkUsdPriceFeed" | "updateMinAnswers" | "updateTwapInterval" | "addOtcCollateralBalance" | "getOtcBalance" | "getOtcConfig" | "getOtcRate" | "initializeOtc" | "sellGnsForCollateral" | "updateOtcConfig" | "multicall" | "getNativeTransferEnabled" | "getNativeTransferGasLimit" | "getReentrancyLock" | "initializeChainConfig" | "updateNativeTransferEnabled" | "updateNativeTransferGasLimit" | "downscaleTradeFeesData" | "getMaxSkewCollateral" | "getPairBorrowingFeeData" | "getPairBorrowingFeeParams" | "getPairFundingFeeData" | "getPairFundingFeeParams" | "getPairGlobalParamsArray" | "getPairPendingAccBorrowingFees" | "getPairPendingAccFundingFees" | "getPendingParamUpdates" | "getTradeBorrowingFeesCollateral" | "getTradeFeesData" | "getTradeFeesDataArray" | "getTradeFundingFeesCollateral" | "getTradeManuallyRealizedNegativePnlCollateral" | "getTradePendingHoldingFeesCollateral" | "getTradeRealizedPnlCollateral" | "getTradeRealizedTradingFeesCollateral" | "getTradeUiRealizedPnlDataArray" | "pendingParamUpdateCallback" | "realizeHoldingFeesOnOpenTrade" | "realizePnlOnOpenTrade" | "realizeTradingFeesOnOpenTrade" | "requestParamUpdate" | "setAbsoluteRatePerSecondCap" | "setAbsoluteVelocityPerYearCap" | "setAprMultiplierEnabled" | "setBorrowingRatePerSecondP" | "setFundingFeesEnabled" | "setMaxSkewCollateral" | "setSkewCoefficientPerYear" | "setThetaThresholdUsd" | "storeAlreadyTransferredNegativePnl" | "storeManuallyRealizedNegativePnlCollateral" | "storeTradeInitialAccFees" | "storeUiPnlWithdrawnCollateral" | "storeUiRealizedPnlPartialCloseCollateral" | "storeVirtualAvailableCollateralInDiamond"): FunctionFragment;
     encodeFunctionData(functionFragment: "diamondCut", values: [
         IDiamondStorage.FacetCutStruct[],
         PromiseOrValue<string>,
@@ -1266,6 +1630,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<BigNumberish>
     ]): string;
     encodeFunctionData(functionFragment: "initialize", values: [PromiseOrValue<string>]): string;
+    encodeFunctionData(functionFragment: "initializeGovEmergencyTimelock", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "setRoles", values: [
         PromiseOrValue<string>[],
         PromiseOrValue<BigNumberish>[],
@@ -1279,6 +1644,10 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "getAllPairsRestrictedMaxLeverage", values?: undefined): string;
     encodeFunctionData(functionFragment: "getGlobalTradeFeeParams", values?: undefined): string;
     encodeFunctionData(functionFragment: "getGroupLiquidationParams", values: [PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getPairCounterTradeFeeRateMultiplier", values: [PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getPairCounterTradeFeeRateMultipliers", values: [PromiseOrValue<BigNumberish>[]]): string;
+    encodeFunctionData(functionFragment: "getPairCounterTradeMaxLeverage", values: [PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getPairCounterTradeMaxLeverages", values: [PromiseOrValue<BigNumberish>[]]): string;
     encodeFunctionData(functionFragment: "getPairLiquidationParams", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "groups", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "groupsCount", values?: undefined): string;
@@ -1305,6 +1674,8 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<BigNumberish>,
         IPairsStorage.GroupLiquidationParamsStruct
     ]): string;
+    encodeFunctionData(functionFragment: "setPairCounterTradeFeeRateMultipliers", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<BigNumberish>[]]): string;
+    encodeFunctionData(functionFragment: "setPairCounterTradeMaxLeverages", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<BigNumberish>[]]): string;
     encodeFunctionData(functionFragment: "setPairCustomMaxLeverages", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<BigNumberish>[]]): string;
     encodeFunctionData(functionFragment: "updateFees", values: [PromiseOrValue<BigNumberish>[], IPairsStorage.FeeGroupStruct[]]): string;
     encodeFunctionData(functionFragment: "updateGroups", values: [PromiseOrValue<BigNumberish>[], IPairsStorage.GroupStruct[]]): string;
@@ -1392,19 +1763,30 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "getPairDepth", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getPairDepths", values: [PromiseOrValue<BigNumberish>[]]): string;
     encodeFunctionData(functionFragment: "getPairFactors", values: [PromiseOrValue<BigNumberish>[]]): string;
+    encodeFunctionData(functionFragment: "getPairOiAfterV10Collateral", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getPairOiAfterV10Token", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getPairOisAfterV10Collateral", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<BigNumberish>[]]): string;
+    encodeFunctionData(functionFragment: "getPairOisAfterV10Token", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<BigNumberish>[]]): string;
+    encodeFunctionData(functionFragment: "getPairSkewDepth", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getPairSkewDepths", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<BigNumberish>[]]): string;
     encodeFunctionData(functionFragment: "getPriceImpactOi", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<boolean>]): string;
     encodeFunctionData(functionFragment: "getProtectionCloseFactorWhitelist", values: [PromiseOrValue<string>]): string;
-    encodeFunctionData(functionFragment: "getTradePriceImpact", values: [
+    encodeFunctionData(functionFragment: "getTradeCumulVolPriceImpactP", values: [
         PromiseOrValue<string>,
         PromiseOrValue<BigNumberish>,
-        PromiseOrValue<BigNumberish>,
         PromiseOrValue<boolean>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<boolean>,
         PromiseOrValue<boolean>,
-        PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>
     ]): string;
+    encodeFunctionData(functionFragment: "getTradeSkewPriceImpactP", values: [
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<boolean>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<boolean>
+    ]): string;
     encodeFunctionData(functionFragment: "getUserPriceImpact", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "initializeNegPnlCumulVolMultiplier", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "initializePairFactors", values: [
@@ -1423,6 +1805,11 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<BigNumberish>[],
         PromiseOrValue<BigNumberish>[]
     ]): string;
+    encodeFunctionData(functionFragment: "setPairSkewDepths", values: [
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[]
+    ]): string;
     encodeFunctionData(functionFragment: "setPriceImpactWindowsCount", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "setPriceImpactWindowsDuration", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "setProtectionCloseFactorBlocks", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<BigNumberish>[]]): string;
@@ -1434,9 +1821,21 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<BigNumberish>[],
         PromiseOrValue<BigNumberish>[]
     ]): string;
+    encodeFunctionData(functionFragment: "updatePairOiAfterV10", values: [
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<boolean>,
+        PromiseOrValue<boolean>
+    ]): string;
     encodeFunctionData(functionFragment: "addCollateral", values: [PromiseOrValue<string>, PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "closePendingOrder", values: [ITradingStorage.IdStruct]): string;
-    encodeFunctionData(functionFragment: "closeTrade", values: [ITradingStorage.IdStruct, PromiseOrValue<boolean>]): string;
+    encodeFunctionData(functionFragment: "closeTrade", values: [
+        ITradingStorage.IdStruct,
+        PromiseOrValue<boolean>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
     encodeFunctionData(functionFragment: "getAllPendingOrders", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getAllPendingOrdersForTraders", values: [
         PromiseOrValue<string>[],
@@ -1473,6 +1872,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "getPendingOrder", values: [ITradingStorage.IdStruct]): string;
     encodeFunctionData(functionFragment: "getPendingOrders", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "getTrade", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getTradeContractsVersion", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getTradeInfo", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getTradeInfos", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "getTradeLiquidationParams", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
@@ -1493,7 +1893,11 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "isCollateralGns", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "isCollateralListed", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "storePendingOrder", values: [ITradingStorage.PendingOrderStruct]): string;
-    encodeFunctionData(functionFragment: "storeTrade", values: [ITradingStorage.TradeStruct, ITradingStorage.TradeInfoStruct]): string;
+    encodeFunctionData(functionFragment: "storeTrade", values: [
+        ITradingStorage.TradeStruct,
+        ITradingStorage.TradeInfoStruct,
+        PromiseOrValue<BigNumberish>
+    ]): string;
     encodeFunctionData(functionFragment: "toggleCollateralActiveState", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "updateGToken", values: [PromiseOrValue<string>, PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "updateOpenOrderDetails", values: [
@@ -1503,15 +1907,16 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>
     ]): string;
-    encodeFunctionData(functionFragment: "updateTradeCollateralAmount", values: [ITradingStorage.IdStruct, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "updateTradeMaxClosingSlippageP", values: [ITradingStorage.IdStruct, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "updateTradePosition", values: [
         ITradingStorage.IdStruct,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
         PromiseOrValue<boolean>,
-        PromiseOrValue<boolean>
+        PromiseOrValue<BigNumberish>
     ]): string;
     encodeFunctionData(functionFragment: "updateTradeSl", values: [ITradingStorage.IdStruct, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "updateTradeTp", values: [ITradingStorage.IdStruct, PromiseOrValue<BigNumberish>]): string;
@@ -1552,6 +1957,11 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<BigNumberish>
     ]): string;
     encodeFunctionData(functionFragment: "initializeTrading", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<string>[]]): string;
+    encodeFunctionData(functionFragment: "initiateManualNegativePnlRealization", values: [
+        PromiseOrValue<string>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<boolean>
+    ]): string;
     encodeFunctionData(functionFragment: "isWrappedNativeToken", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "openTrade", values: [
         ITradingStorage.TradeStruct,
@@ -1580,6 +1990,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     ]): string;
     encodeFunctionData(functionFragment: "updateSl", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "updateTp", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "withdrawPositivePnl", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "claimPendingGovFees", values?: undefined): string;
     encodeFunctionData(functionFragment: "closeTradeMarketCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
     encodeFunctionData(functionFragment: "decreasePositionSizeMarketCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
@@ -1590,7 +2001,10 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "increasePositionSizeMarketCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
     encodeFunctionData(functionFragment: "initializeCallbacks", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "initializeTreasuryAddress", values: [PromiseOrValue<string>]): string;
+    encodeFunctionData(functionFragment: "manualHoldingFeesRealizationCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
+    encodeFunctionData(functionFragment: "manualNegativePnlRealizationCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
     encodeFunctionData(functionFragment: "openTradeMarketCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
+    encodeFunctionData(functionFragment: "pnlWithdrawalCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
     encodeFunctionData(functionFragment: "updateLeverageCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
     encodeFunctionData(functionFragment: "updateTreasuryAddress", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "updateVaultClosingFeeP", values: [PromiseOrValue<BigNumberish>]): string;
@@ -1599,6 +2013,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>
     ]): string;
     encodeFunctionData(functionFragment: "validateTriggerOpenOrderCallback", values: [
@@ -1606,6 +2021,11 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    encodeFunctionData(functionFragment: "borrowingParamUpdateCallback", values: [
+        IFundingFees.PendingParamUpdateStruct,
         PromiseOrValue<BigNumberish>
     ]): string;
     encodeFunctionData(functionFragment: "getAllBorrowingPairs", values: [PromiseOrValue<BigNumberish>]): string;
@@ -1628,20 +2048,21 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "getBorrowingPairFeePerBlockCaps", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>[]]): string;
     encodeFunctionData(functionFragment: "getBorrowingPairGroupIndex", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getBorrowingPairGroups", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "getBorrowingPairOi", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getBorrowingPairOiBeforeV10", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getBorrowingPairPendingAccFees", values: [
+        PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>
     ]): string;
     encodeFunctionData(functionFragment: "getPairMaxOi", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getPairMaxOiCollateral", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "getPairOiCollateral", values: [
+    encodeFunctionData(functionFragment: "getPairOiBeforeV10Collateral", values: [
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<boolean>
     ]): string;
-    encodeFunctionData(functionFragment: "getPairOisCollateral", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getPairOisBeforeV10Collateral", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getTradeBorrowingFee", values: [IBorrowingFees.BorrowingFeeInputStruct]): string;
     encodeFunctionData(functionFragment: "getTradeLiquidationPrice", values: [IBorrowingFees.LiqPriceInputStruct]): string;
     encodeFunctionData(functionFragment: "handleTradeBorrowingCallback", values: [
@@ -1651,7 +2072,8 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<boolean>,
-        PromiseOrValue<boolean>
+        PromiseOrValue<boolean>,
+        PromiseOrValue<BigNumberish>
     ]): string;
     encodeFunctionData(functionFragment: "initializeBorrowingFeePerBlockCap", values: [IBorrowingFees.BorrowingFeePerBlockCapStruct]): string;
     encodeFunctionData(functionFragment: "resetTradeBorrowingFees", values: [
@@ -1659,7 +2081,8 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<string>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
-        PromiseOrValue<boolean>
+        PromiseOrValue<boolean>,
+        PromiseOrValue<BigNumberish>
     ]): string;
     encodeFunctionData(functionFragment: "setBorrowingFeePerBlockCap", values: [IBorrowingFees.BorrowingFeePerBlockCapStruct]): string;
     encodeFunctionData(functionFragment: "setBorrowingGroupParams", values: [
@@ -1687,6 +2110,13 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<BigNumberish>[],
         IBorrowingFees.BorrowingPairParamsStruct[]
     ]): string;
+    encodeFunctionData(functionFragment: "updatePairOiBeforeV10", values: [
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<boolean>,
+        PromiseOrValue<boolean>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
     encodeFunctionData(functionFragment: "withinMaxBorrowingGroupOi", values: [
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
@@ -1711,7 +2141,8 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<string>,
         PromiseOrValue<BigNumberish>,
-        PromiseOrValue<BigNumberish>
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<boolean>
     ]): string;
     encodeFunctionData(functionFragment: "getLinkUsdPriceFeed", values?: undefined): string;
     encodeFunctionData(functionFragment: "getMarketJobId", values?: undefined): string;
@@ -1720,14 +2151,9 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "getMinAnswers", values?: undefined): string;
     encodeFunctionData(functionFragment: "getOracle", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getOracles", values?: undefined): string;
+    encodeFunctionData(functionFragment: "getParamUpdateJobId", values?: undefined): string;
     encodeFunctionData(functionFragment: "getPendingRequest", values: [PromiseOrValue<BytesLike>]): string;
-    encodeFunctionData(functionFragment: "getPrice", values: [
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<BigNumberish>,
-        ITradingStorage.PendingOrderStruct,
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<BigNumberish>
-    ]): string;
+    encodeFunctionData(functionFragment: "getPrice", values: [IPriceAggregator.GetPriceInputStruct]): string;
     encodeFunctionData(functionFragment: "getPriceAggregatorOrder", values: [PromiseOrValue<BytesLike>]): string;
     encodeFunctionData(functionFragment: "getPriceAggregatorOrderAnswers", values: [ITradingStorage.IdStruct]): string;
     encodeFunctionData(functionFragment: "getRequestCount", values?: undefined): string;
@@ -1735,6 +2161,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "getUsdNormalizedValue", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "initializeLimitJobCount", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "initializeMaxDeviationsP", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "initializeParamUpdateJobId", values: [PromiseOrValue<BytesLike>]): string;
     encodeFunctionData(functionFragment: "initializePriceAggregator", values: [
         PromiseOrValue<string>,
         PromiseOrValue<string>,
@@ -1756,6 +2183,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "setMarketJobId", values: [PromiseOrValue<BytesLike>]): string;
     encodeFunctionData(functionFragment: "setMaxLookbackDeviationP", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "setMaxMarketDeviationP", values: [PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "setParamUpdateJobId", values: [PromiseOrValue<BytesLike>]): string;
     encodeFunctionData(functionFragment: "updateCollateralGnsLiquidityPool", values: [
         PromiseOrValue<BigNumberish>,
         IPriceAggregator.LiquidityPoolInputStruct
@@ -1778,37 +2206,183 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "initializeChainConfig", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<boolean>]): string;
     encodeFunctionData(functionFragment: "updateNativeTransferEnabled", values: [PromiseOrValue<boolean>]): string;
     encodeFunctionData(functionFragment: "updateNativeTransferGasLimit", values: [PromiseOrValue<BigNumberish>]): string;
-    decodeFunctionResult(functionFragment: "diamondCut", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "facetAddress", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "facetAddresses", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "facetFunctionSelectors", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "facets", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getAddresses", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "hasRole", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "hasRoles", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "initialize", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "setRoles", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "addFees", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "addGroups", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "addPairs", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "fees", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "feesCount", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getAllPairsRestrictedMaxLeverage", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getGlobalTradeFeeParams", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getGroupLiquidationParams", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getPairLiquidationParams", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "groups", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "groupsCount", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "initializeGroupLiquidationParams", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "initializeNewFees", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "initializeReferralFeeChange", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "isPairIndexListed", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "isPairListed", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "pairCustomMaxLeverage", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "pairJob", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "pairMaxLeverage", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "pairMinFeeUsd", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "pairMinLeverage", data: BytesLike): Result;
+    encodeFunctionData(functionFragment: "downscaleTradeFeesData", values: [
+        PromiseOrValue<string>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    encodeFunctionData(functionFragment: "getMaxSkewCollateral", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getPairBorrowingFeeData", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<BigNumberish>[]]): string;
+    encodeFunctionData(functionFragment: "getPairBorrowingFeeParams", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<BigNumberish>[]]): string;
+    encodeFunctionData(functionFragment: "getPairFundingFeeData", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<BigNumberish>[]]): string;
+    encodeFunctionData(functionFragment: "getPairFundingFeeParams", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<BigNumberish>[]]): string;
+    encodeFunctionData(functionFragment: "getPairGlobalParamsArray", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<BigNumberish>[]]): string;
+    encodeFunctionData(functionFragment: "getPairPendingAccBorrowingFees", values: [
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    encodeFunctionData(functionFragment: "getPairPendingAccFundingFees", values: [
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    encodeFunctionData(functionFragment: "getPendingParamUpdates", values: [PromiseOrValue<BigNumberish>[]]): string;
+    encodeFunctionData(functionFragment: "getTradeBorrowingFeesCollateral", values: [
+        PromiseOrValue<string>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    encodeFunctionData(functionFragment: "getTradeFeesData", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getTradeFeesDataArray", values: [PromiseOrValue<string>[], PromiseOrValue<BigNumberish>[]]): string;
+    encodeFunctionData(functionFragment: "getTradeFundingFeesCollateral", values: [
+        PromiseOrValue<string>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    encodeFunctionData(functionFragment: "getTradeManuallyRealizedNegativePnlCollateral", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getTradePendingHoldingFeesCollateral", values: [
+        PromiseOrValue<string>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    encodeFunctionData(functionFragment: "getTradeRealizedPnlCollateral", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getTradeRealizedTradingFeesCollateral", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getTradeUiRealizedPnlDataArray", values: [PromiseOrValue<string>[], PromiseOrValue<BigNumberish>[]]): string;
+    encodeFunctionData(functionFragment: "pendingParamUpdateCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
+    encodeFunctionData(functionFragment: "realizeHoldingFeesOnOpenTrade", values: [
+        PromiseOrValue<string>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    encodeFunctionData(functionFragment: "realizePnlOnOpenTrade", values: [
+        PromiseOrValue<string>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    encodeFunctionData(functionFragment: "realizeTradingFeesOnOpenTrade", values: [
+        PromiseOrValue<string>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    encodeFunctionData(functionFragment: "requestParamUpdate", values: [
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    encodeFunctionData(functionFragment: "setAbsoluteRatePerSecondCap", values: [
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[]
+    ]): string;
+    encodeFunctionData(functionFragment: "setAbsoluteVelocityPerYearCap", values: [
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[]
+    ]): string;
+    encodeFunctionData(functionFragment: "setAprMultiplierEnabled", values: [
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<boolean>[]
+    ]): string;
+    encodeFunctionData(functionFragment: "setBorrowingRatePerSecondP", values: [
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[]
+    ]): string;
+    encodeFunctionData(functionFragment: "setFundingFeesEnabled", values: [
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<boolean>[]
+    ]): string;
+    encodeFunctionData(functionFragment: "setMaxSkewCollateral", values: [
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[]
+    ]): string;
+    encodeFunctionData(functionFragment: "setSkewCoefficientPerYear", values: [
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[]
+    ]): string;
+    encodeFunctionData(functionFragment: "setThetaThresholdUsd", values: [
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[]
+    ]): string;
+    encodeFunctionData(functionFragment: "storeAlreadyTransferredNegativePnl", values: [
+        PromiseOrValue<string>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    encodeFunctionData(functionFragment: "storeManuallyRealizedNegativePnlCollateral", values: [
+        PromiseOrValue<string>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    encodeFunctionData(functionFragment: "storeTradeInitialAccFees", values: [
+        PromiseOrValue<string>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<boolean>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    encodeFunctionData(functionFragment: "storeUiPnlWithdrawnCollateral", values: [
+        PromiseOrValue<string>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    encodeFunctionData(functionFragment: "storeUiRealizedPnlPartialCloseCollateral", values: [
+        PromiseOrValue<string>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    encodeFunctionData(functionFragment: "storeVirtualAvailableCollateralInDiamond", values: [
+        PromiseOrValue<string>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
+    decodeFunctionResult(functionFragment: "diamondCut", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "facetAddress", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "facetAddresses", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "facetFunctionSelectors", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "facets", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getAddresses", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "hasRole", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "hasRoles", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "initialize", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "initializeGovEmergencyTimelock", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setRoles", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "addFees", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "addGroups", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "addPairs", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "fees", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "feesCount", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getAllPairsRestrictedMaxLeverage", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getGlobalTradeFeeParams", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getGroupLiquidationParams", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairCounterTradeFeeRateMultiplier", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairCounterTradeFeeRateMultipliers", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairCounterTradeMaxLeverage", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairCounterTradeMaxLeverages", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairLiquidationParams", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "groups", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "groupsCount", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "initializeGroupLiquidationParams", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "initializeNewFees", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "initializeReferralFeeChange", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "isPairIndexListed", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "isPairListed", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "pairCustomMaxLeverage", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "pairJob", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "pairMaxLeverage", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "pairMinFeeUsd", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "pairMinLeverage", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "pairMinPositionSizeUsd", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "pairOraclePositionSizeFeeP", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "pairSpreadP", data: BytesLike): Result;
@@ -1819,6 +2393,8 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "pairsCount", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setGlobalTradeFeeParams", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setGroupLiquidationParams", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setPairCounterTradeFeeRateMultipliers", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setPairCounterTradeMaxLeverages", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setPairCustomMaxLeverages", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateFees", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateGroups", data: BytesLike): Result;
@@ -1870,9 +2446,16 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "getPairDepth", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPairDepths", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPairFactors", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairOiAfterV10Collateral", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairOiAfterV10Token", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairOisAfterV10Collateral", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairOisAfterV10Token", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairSkewDepth", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairSkewDepths", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPriceImpactOi", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getProtectionCloseFactorWhitelist", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getTradePriceImpact", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getTradeCumulVolPriceImpactP", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getTradeSkewPriceImpactP", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getUserPriceImpact", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "initializeNegPnlCumulVolMultiplier", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "initializePairFactors", data: BytesLike): Result;
@@ -1882,12 +2465,14 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "setExemptOnOpen", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setNegPnlCumulVolMultiplier", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setPairDepths", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setPairSkewDepths", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setPriceImpactWindowsCount", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setPriceImpactWindowsDuration", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setProtectionCloseFactorBlocks", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setProtectionCloseFactorWhitelist", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setProtectionCloseFactors", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setUserPriceImpact", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "updatePairOiAfterV10", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "addCollateral", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "closePendingOrder", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "closeTrade", data: BytesLike): Result;
@@ -1911,6 +2496,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "getPendingOrder", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPendingOrders", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTrade", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getTradeContractsVersion", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTradeInfo", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTradeInfos", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTradeLiquidationParams", data: BytesLike): Result;
@@ -1930,7 +2516,6 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "toggleCollateralActiveState", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateGToken", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateOpenOrderDetails", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "updateTradeCollateralAmount", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateTradeMaxClosingSlippageP", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateTradePosition", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateTradeSl", data: BytesLike): Result;
@@ -1955,6 +2540,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "increasePositionSize", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "increasePositionSizeNative", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "initializeTrading", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "initiateManualNegativePnlRealization", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "isWrappedNativeToken", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "openTrade", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "openTradeNative", data: BytesLike): Result;
@@ -1969,6 +2555,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "updateOpenOrder", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateSl", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateTp", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "withdrawPositivePnl", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "claimPendingGovFees", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "closeTradeMarketCallback", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "decreasePositionSizeMarketCallback", data: BytesLike): Result;
@@ -1979,12 +2566,16 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "increasePositionSizeMarketCallback", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "initializeCallbacks", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "initializeTreasuryAddress", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "manualHoldingFeesRealizationCallback", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "manualNegativePnlRealizationCallback", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "openTradeMarketCallback", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "pnlWithdrawalCallback", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateLeverageCallback", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateTreasuryAddress", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateVaultClosingFeeP", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "validateTriggerCloseOrderCallback", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "validateTriggerOpenOrderCallback", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "borrowingParamUpdateCallback", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getAllBorrowingPairs", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getBorrowingFeePerBlockCap", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getBorrowingGroup", data: BytesLike): Result;
@@ -1997,12 +2588,12 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "getBorrowingPairFeePerBlockCaps", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getBorrowingPairGroupIndex", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getBorrowingPairGroups", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getBorrowingPairOi", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getBorrowingPairOiBeforeV10", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getBorrowingPairPendingAccFees", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPairMaxOi", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPairMaxOiCollateral", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getPairOiCollateral", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getPairOisCollateral", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairOiBeforeV10Collateral", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairOisBeforeV10Collateral", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTradeBorrowingFee", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTradeLiquidationPrice", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "handleTradeBorrowingCallback", data: BytesLike): Result;
@@ -2014,6 +2605,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "setBorrowingPairFeePerBlockCapArray", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setBorrowingPairParams", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setBorrowingPairParamsArray", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "updatePairOiBeforeV10", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "withinMaxBorrowingGroupOi", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "addOracle", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "claimBackLink", data: BytesLike): Result;
@@ -2037,6 +2629,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "getMinAnswers", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getOracle", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getOracles", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getParamUpdateJobId", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPendingRequest", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPrice", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPriceAggregatorOrder", data: BytesLike): Result;
@@ -2046,6 +2639,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "getUsdNormalizedValue", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "initializeLimitJobCount", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "initializeMaxDeviationsP", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "initializeParamUpdateJobId", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "initializePriceAggregator", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "removeOracle", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "replaceOracle", data: BytesLike): Result;
@@ -2054,6 +2648,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "setMarketJobId", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setMaxLookbackDeviationP", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setMaxMarketDeviationP", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setParamUpdateJobId", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateCollateralGnsLiquidityPool", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateCollateralUsdPriceFeed", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateLinkUsdPriceFeed", data: BytesLike): Result;
@@ -2073,11 +2668,51 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "initializeChainConfig", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateNativeTransferEnabled", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateNativeTransferGasLimit", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "downscaleTradeFeesData", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getMaxSkewCollateral", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairBorrowingFeeData", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairBorrowingFeeParams", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairFundingFeeData", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairFundingFeeParams", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairGlobalParamsArray", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairPendingAccBorrowingFees", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPairPendingAccFundingFees", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPendingParamUpdates", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getTradeBorrowingFeesCollateral", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getTradeFeesData", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getTradeFeesDataArray", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getTradeFundingFeesCollateral", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getTradeManuallyRealizedNegativePnlCollateral", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getTradePendingHoldingFeesCollateral", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getTradeRealizedPnlCollateral", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getTradeRealizedTradingFeesCollateral", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getTradeUiRealizedPnlDataArray", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "pendingParamUpdateCallback", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "realizeHoldingFeesOnOpenTrade", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "realizePnlOnOpenTrade", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "realizeTradingFeesOnOpenTrade", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "requestParamUpdate", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setAbsoluteRatePerSecondCap", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setAbsoluteVelocityPerYearCap", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setAprMultiplierEnabled", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setBorrowingRatePerSecondP", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setFundingFeesEnabled", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setMaxSkewCollateral", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setSkewCoefficientPerYear", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setThetaThresholdUsd", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "storeAlreadyTransferredNegativePnl", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "storeManuallyRealizedNegativePnlCollateral", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "storeTradeInitialAccFees", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "storeUiPnlWithdrawnCollateral", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "storeUiRealizedPnlPartialCloseCollateral", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "storeVirtualAvailableCollateralInDiamond", data: BytesLike): Result;
     events: {
         "AccessControlUpdated(address,uint8,bool)": EventFragment;
         "AddressesUpdated(tuple)": EventFragment;
         "DiamondCut(tuple[],address,bytes)": EventFragment;
         "Initialized(uint8)": EventFragment;
+        "CounterTradeFeeRateMultiplierUpdated(uint16,uint16)": EventFragment;
+        "CounterTradeMaxLeverageUpdated(uint16,uint24)": EventFragment;
         "FeeAdded(uint256,tuple)": EventFragment;
         "FeeUpdated(uint256,tuple)": EventFragment;
         "GlobalTradeFeeParamsUpdated(tuple)": EventFragment;
@@ -2118,6 +2753,8 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "NegPnlCumulVolMultiplierUpdated(uint40)": EventFragment;
         "OiWindowsSettingsInitialized(uint48,uint48)": EventFragment;
         "OnePercentDepthUpdated(uint256,uint128,uint128)": EventFragment;
+        "OnePercentSkewDepthUpdated(uint8,uint16,uint256)": EventFragment;
+        "PairOiAfterV10Updated(uint8,uint16,uint256,uint256,bool,bool,tuple,tuple)": EventFragment;
         "PriceImpactOiTransferredPair(uint256,tuple)": EventFragment;
         "PriceImpactOiTransferredPairs(uint256,uint256,uint256,uint256)": EventFragment;
         "PriceImpactOpenInterestAdded(tuple)": EventFragment;
@@ -2137,7 +2774,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "TradeClosed(address,uint32,bool)": EventFragment;
         "TradeCollateralUpdated(address,uint32,uint120)": EventFragment;
         "TradeMaxClosingSlippagePUpdated(address,uint32,uint16)": EventFragment;
-        "TradePositionUpdated(address,uint32,uint120,uint24,uint64,uint64,uint64,bool,bool)": EventFragment;
+        "TradePositionUpdated(address,uint32,uint120,uint24,uint64,uint64,uint160,uint8,bool)": EventFragment;
         "TradeSlUpdated(address,uint32,uint64)": EventFragment;
         "TradeStored(address,uint32,tuple,tuple,tuple)": EventFragment;
         "TradeTpUpdated(address,uint32,uint64)": EventFragment;
@@ -2147,9 +2784,11 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "TriggerTimeoutBlocksUpdated(uint16)": EventFragment;
         "ByPassTriggerLinkUpdated(address,bool)": EventFragment;
         "ChainlinkCallbackTimeout(tuple,uint256)": EventFragment;
+        "CollateralReturnedAfterTimeout(tuple,uint8,address,uint256)": EventFragment;
         "CouldNotCloseTrade(address,uint16,uint32)": EventFragment;
         "LeverageUpdateExecuted(tuple,bool,uint8,uint8,address,uint256,uint256,uint256,uint256,tuple)": EventFragment;
         "LeverageUpdateInitiated(tuple,address,uint256,uint256,bool,uint256)": EventFragment;
+        "ManualNegativePnlRealizationInitiated(tuple,address,uint32,bool)": EventFragment;
         "MarketOrderInitiated(tuple,address,uint16,bool)": EventFragment;
         "MarketOrdersTimeoutBlocksUpdated(uint256)": EventFragment;
         "NativeTokenWrapped(address,uint256)": EventFragment;
@@ -2159,17 +2798,23 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "PositionSizeDecreaseExecuted(tuple,uint8,uint8,address,uint256,uint256,bool,uint256,uint256,uint256,uint256,tuple)": EventFragment;
         "PositionSizeIncreaseExecuted(tuple,uint8,uint8,address,uint256,uint256,bool,uint256,uint256,uint256,uint256,tuple)": EventFragment;
         "PositionSizeUpdateInitiated(tuple,address,uint256,uint256,bool,uint256,uint256)": EventFragment;
+        "PositivePnlWithdrawalInitiated(tuple,address,uint32,uint256)": EventFragment;
         "TriggerOrderInitiated(tuple,address,uint16,bool)": EventFragment;
-        "BorrowingFeeCharged(address,uint32,uint8,uint256)": EventFragment;
+        "CounterTradeCollateralReturned(tuple,uint8,address,uint256)": EventFragment;
+        "FeesProcessed(uint8,address,uint256,uint8,uint256)": EventFragment;
         "GTokenFeeCharged(address,uint8,uint256)": EventFragment;
         "GnsOtcFeeCharged(address,uint8,uint256)": EventFragment;
         "GovFeeCharged(address,uint8,uint256)": EventFragment;
-        "LimitExecuted(tuple,address,uint32,uint32,tuple,address,uint8,uint256,uint256,uint256,uint256,int256,uint256,uint256,bool)": EventFragment;
+        "LimitExecuted(tuple,address,uint32,uint32,tuple,address,uint8,uint256,uint256,uint256,tuple,int256,uint256,uint256,bool)": EventFragment;
         "MarketCloseCanceled(tuple,address,uint256,uint256,uint8)": EventFragment;
-        "MarketExecuted(tuple,address,uint32,tuple,bool,uint256,uint256,uint256,uint256,int256,uint256,uint256)": EventFragment;
-        "MarketOpenCanceled(tuple,address,uint256,uint8)": EventFragment;
+        "MarketExecuted(tuple,address,uint32,tuple,bool,uint256,uint256,uint256,tuple,int256,uint256,uint256)": EventFragment;
+        "MarketOpenCanceled(tuple,address,uint256,uint8,uint256)": EventFragment;
         "PendingGovFeesClaimed(uint8,uint256)": EventFragment;
         "ReferralFeeCharged(address,uint8,uint256)": EventFragment;
+        "TradeHoldingFeesManuallyRealized(tuple,uint8,address,uint32,uint256)": EventFragment;
+        "TradeNegativePnlManuallyRealized(tuple,uint8,address,uint32,uint256,uint256,uint256,uint256)": EventFragment;
+        "TradePositivePnlWithdrawn(tuple,uint8,address,uint32,tuple,int256,int256,uint256,uint256,uint256)": EventFragment;
+        "TradeValueTransferred(uint8,address,uint32,int256,int256)": EventFragment;
         "TriggerFeeCharged(address,uint8,uint256)": EventFragment;
         "TriggerOrderCanceled(tuple,address,uint8,uint8)": EventFragment;
         "VaultClosingFeePUpdated(uint8)": EventFragment;
@@ -2177,13 +2822,13 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "BorrowingGroupAccFeesUpdated(uint8,uint16,uint256,uint64,uint64)": EventFragment;
         "BorrowingGroupOiUpdated(uint8,uint16,bool,bool,uint72,uint72,uint72)": EventFragment;
         "BorrowingGroupUpdated(uint8,uint16,uint32,uint72,uint48)": EventFragment;
-        "BorrowingInitialAccFeesStored(uint8,address,uint16,uint32,bool,uint64,uint64)": EventFragment;
-        "BorrowingPairAccFeesUpdated(uint8,uint16,uint256,uint64,uint64)": EventFragment;
+        "BorrowingInitialAccFeesStored(uint8,address,uint16,uint32,bool,uint256,uint64,uint64)": EventFragment;
+        "BorrowingPairAccFeesUpdated(uint8,uint16,uint256,uint256,uint64,uint64)": EventFragment;
         "BorrowingPairFeePerBlockCapUpdated(uint8,uint16,uint32,uint32)": EventFragment;
         "BorrowingPairGroupUpdated(uint8,uint16,uint16,uint16)": EventFragment;
-        "BorrowingPairOiUpdated(uint8,uint16,bool,bool,uint72,uint72,uint72)": EventFragment;
+        "BorrowingPairOiBeforeV10Updated(uint8,uint16,bool,bool,uint72,uint72,uint72)": EventFragment;
         "BorrowingPairParamsUpdated(uint8,uint16,uint16,uint32,uint48,uint72)": EventFragment;
-        "TradeBorrowingCallbackHandled(uint8,address,uint16,uint32,bool,bool,uint256)": EventFragment;
+        "TradeBorrowingCallbackHandled(uint8,address,uint16,uint32,bool,bool,uint256,uint256)": EventFragment;
         "CollateralGnsLiquidityPoolUpdated(uint8,tuple)": EventFragment;
         "CollateralUsdPriceFeedUpdated(uint8,address)": EventFragment;
         "JobIdUpdated(uint256,bytes32)": EventFragment;
@@ -2197,8 +2842,9 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "OracleAdded(uint256,address)": EventFragment;
         "OracleRemoved(uint256,address)": EventFragment;
         "OracleReplaced(uint256,address,address)": EventFragment;
+        "ParamUpdateJobIdUpdated(bytes32)": EventFragment;
         "PriceReceived(tuple,uint16,bytes32,uint256,bool,bool,bool,bool,tuple[],tuple[])": EventFragment;
-        "PriceRequested(uint8,uint256,tuple,uint256,bool,bytes32,uint256,uint256)": EventFragment;
+        "PriceRequested(uint8,uint256,tuple,uint256,uint256,bool,bool,bytes32,uint256,uint256)": EventFragment;
         "TradingCallbackExecuted(tuple,uint8)": EventFragment;
         "TwapIntervalUpdated(uint32)": EventFragment;
         "OtcBalanceUpdated(uint8,uint256)": EventFragment;
@@ -2206,11 +2852,33 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "OtcExecuted(uint8,uint256,uint256,uint256,uint256,uint256)": EventFragment;
         "NativeTransferEnabledUpdated(bool)": EventFragment;
         "NativeTransferGasLimitUpdated(uint16)": EventFragment;
+        "AbsoluteRatePerSecondCapUpdated(uint8,uint16,uint24)": EventFragment;
+        "AbsoluteVelocityPerYearCapUpdated(uint8,uint16,uint24)": EventFragment;
+        "AlreadyTransferredNegativePnlStored(address,uint32,uint256,uint128)": EventFragment;
+        "AprMultiplierEnabledUpdated(uint8,uint16,bool)": EventFragment;
+        "BorrowingRatePerSecondPUpdated(uint8,uint16,uint24)": EventFragment;
+        "FundingFeesEnabledUpdated(uint8,uint16,bool)": EventFragment;
+        "HoldingFeesChargedOnTrade(uint8,address,uint32,uint64,tuple,uint256,uint256,uint256,int256)": EventFragment;
+        "HoldingFeesRealizedOnTrade(uint8,address,uint32,uint64,tuple,int256)": EventFragment;
+        "ManuallyRealizedNegativePnlCollateralStored(address,uint32,uint128)": EventFragment;
+        "MaxSkewCollateralUpdated(uint8,uint16,uint80)": EventFragment;
+        "ParamUpdateRequested(uint8,uint16,uint8,uint224)": EventFragment;
+        "PendingAccBorrowingFeesStored(uint8,uint16,tuple)": EventFragment;
+        "PendingAccFundingFeesStored(uint8,uint16,tuple)": EventFragment;
+        "PnlRealizedOnOpenTrade(address,uint32,int256,int256)": EventFragment;
+        "SkewCoefficientPerYearUpdated(uint8,uint16,uint112)": EventFragment;
+        "ThetaThresholdUsdUpdated(uint8,uint16,uint32)": EventFragment;
+        "TradeFeesDataDownscaled(address,uint32,uint256,uint256,uint256,tuple)": EventFragment;
+        "TradeInitialAccFeesStored(address,uint32,uint8,uint16,bool,uint64,int128,uint128)": EventFragment;
+        "TradingFeesRealized(uint8,address,uint32,uint256,uint256,uint256,int256,uint256)": EventFragment;
+        "VirtualAvailableCollateralInDiamondStored(address,uint32,uint256,uint256,bool,uint256,uint256)": EventFragment;
     };
     getEvent(nameOrSignatureOrTopic: "AccessControlUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "AddressesUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "DiamondCut"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "Initialized"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "CounterTradeFeeRateMultiplierUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "CounterTradeMaxLeverageUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "FeeAdded"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "FeeUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "GlobalTradeFeeParamsUpdated"): EventFragment;
@@ -2251,6 +2919,8 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "NegPnlCumulVolMultiplierUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "OiWindowsSettingsInitialized"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "OnePercentDepthUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "OnePercentSkewDepthUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "PairOiAfterV10Updated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "PriceImpactOiTransferredPair"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "PriceImpactOiTransferredPairs"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "PriceImpactOpenInterestAdded"): EventFragment;
@@ -2280,9 +2950,11 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "TriggerTimeoutBlocksUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "ByPassTriggerLinkUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "ChainlinkCallbackTimeout"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "CollateralReturnedAfterTimeout"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "CouldNotCloseTrade"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "LeverageUpdateExecuted"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "LeverageUpdateInitiated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "ManualNegativePnlRealizationInitiated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "MarketOrderInitiated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "MarketOrdersTimeoutBlocksUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "NativeTokenWrapped"): EventFragment;
@@ -2292,8 +2964,10 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "PositionSizeDecreaseExecuted"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "PositionSizeIncreaseExecuted"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "PositionSizeUpdateInitiated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "PositivePnlWithdrawalInitiated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "TriggerOrderInitiated"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "BorrowingFeeCharged"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "CounterTradeCollateralReturned"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "FeesProcessed"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "GTokenFeeCharged"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "GnsOtcFeeCharged"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "GovFeeCharged"): EventFragment;
@@ -2303,6 +2977,10 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "MarketOpenCanceled"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "PendingGovFeesClaimed"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "ReferralFeeCharged"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "TradeHoldingFeesManuallyRealized"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "TradeNegativePnlManuallyRealized"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "TradePositivePnlWithdrawn"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "TradeValueTransferred"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "TriggerFeeCharged"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "TriggerOrderCanceled"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "VaultClosingFeePUpdated"): EventFragment;
@@ -2314,7 +2992,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "BorrowingPairAccFeesUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "BorrowingPairFeePerBlockCapUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "BorrowingPairGroupUpdated"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "BorrowingPairOiUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "BorrowingPairOiBeforeV10Updated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "BorrowingPairParamsUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "TradeBorrowingCallbackHandled"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "CollateralGnsLiquidityPoolUpdated"): EventFragment;
@@ -2330,6 +3008,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "OracleAdded"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "OracleRemoved"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "OracleReplaced"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "ParamUpdateJobIdUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "PriceReceived"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "PriceRequested"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "TradingCallbackExecuted"): EventFragment;
@@ -2339,6 +3018,26 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "OtcExecuted"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "NativeTransferEnabledUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "NativeTransferGasLimitUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "AbsoluteRatePerSecondCapUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "AbsoluteVelocityPerYearCapUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "AlreadyTransferredNegativePnlStored"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "AprMultiplierEnabledUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "BorrowingRatePerSecondPUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "FundingFeesEnabledUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "HoldingFeesChargedOnTrade"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "HoldingFeesRealizedOnTrade"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "ManuallyRealizedNegativePnlCollateralStored"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "MaxSkewCollateralUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "ParamUpdateRequested"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "PendingAccBorrowingFeesStored"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "PendingAccFundingFeesStored"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "PnlRealizedOnOpenTrade"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "SkewCoefficientPerYearUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "ThetaThresholdUsdUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "TradeFeesDataDownscaled"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "TradeInitialAccFeesStored"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "TradingFeesRealized"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "VirtualAvailableCollateralInDiamondStored"): EventFragment;
 }
 export interface AccessControlUpdatedEventObject {
     target: string;
@@ -2374,6 +3073,24 @@ export interface InitializedEventObject {
 }
 export type InitializedEvent = TypedEvent<[number], InitializedEventObject>;
 export type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
+export interface CounterTradeFeeRateMultiplierUpdatedEventObject {
+    pairIndex: number;
+    newValue: number;
+}
+export type CounterTradeFeeRateMultiplierUpdatedEvent = TypedEvent<[
+    number,
+    number
+], CounterTradeFeeRateMultiplierUpdatedEventObject>;
+export type CounterTradeFeeRateMultiplierUpdatedEventFilter = TypedEventFilter<CounterTradeFeeRateMultiplierUpdatedEvent>;
+export interface CounterTradeMaxLeverageUpdatedEventObject {
+    pairIndex: number;
+    newValue: number;
+}
+export type CounterTradeMaxLeverageUpdatedEvent = TypedEvent<[
+    number,
+    number
+], CounterTradeMaxLeverageUpdatedEventObject>;
+export type CounterTradeMaxLeverageUpdatedEventFilter = TypedEventFilter<CounterTradeMaxLeverageUpdatedEvent>;
 export interface FeeAddedEventObject {
     index: BigNumber;
     feeGroup: IPairsStorage.FeeGroupStructOutput;
@@ -2740,6 +3457,38 @@ export type OnePercentDepthUpdatedEvent = TypedEvent<[
     BigNumber
 ], OnePercentDepthUpdatedEventObject>;
 export type OnePercentDepthUpdatedEventFilter = TypedEventFilter<OnePercentDepthUpdatedEvent>;
+export interface OnePercentSkewDepthUpdatedEventObject {
+    collateralIndex: number;
+    pairIndex: number;
+    newValue: BigNumber;
+}
+export type OnePercentSkewDepthUpdatedEvent = TypedEvent<[
+    number,
+    number,
+    BigNumber
+], OnePercentSkewDepthUpdatedEventObject>;
+export type OnePercentSkewDepthUpdatedEventFilter = TypedEventFilter<OnePercentSkewDepthUpdatedEvent>;
+export interface PairOiAfterV10UpdatedEventObject {
+    collateralIndex: number;
+    pairIndex: number;
+    oiDeltaCollateral: BigNumber;
+    oiDeltaToken: BigNumber;
+    open: boolean;
+    long: boolean;
+    newOiCollateral: IPriceImpact.PairOiCollateralStructOutput;
+    newOiToken: IPriceImpact.PairOiTokenStructOutput;
+}
+export type PairOiAfterV10UpdatedEvent = TypedEvent<[
+    number,
+    number,
+    BigNumber,
+    BigNumber,
+    boolean,
+    boolean,
+    IPriceImpact.PairOiCollateralStructOutput,
+    IPriceImpact.PairOiTokenStructOutput
+], PairOiAfterV10UpdatedEventObject>;
+export type PairOiAfterV10UpdatedEventFilter = TypedEventFilter<PairOiAfterV10UpdatedEvent>;
 export interface PriceImpactOiTransferredPairEventObject {
     pairIndex: BigNumber;
     totalPairOi: IPriceImpact.PairOiStructOutput;
@@ -2931,9 +3680,9 @@ export interface TradePositionUpdatedEventObject {
     collateralAmount: BigNumber;
     leverage: number;
     openPrice: BigNumber;
-    newTp: BigNumber;
     newSl: BigNumber;
-    isPartialIncrease: boolean;
+    newPositionSizeToken: BigNumber;
+    pendingOrderType: number;
     isPnlPositive: boolean;
 }
 export type TradePositionUpdatedEvent = TypedEvent<[
@@ -2944,7 +3693,7 @@ export type TradePositionUpdatedEvent = TypedEvent<[
     BigNumber,
     BigNumber,
     BigNumber,
-    boolean,
+    number,
     boolean
 ], TradePositionUpdatedEventObject>;
 export type TradePositionUpdatedEventFilter = TypedEventFilter<TradePositionUpdatedEvent>;
@@ -3035,6 +3784,19 @@ export type ChainlinkCallbackTimeoutEvent = TypedEvent<[
     BigNumber
 ], ChainlinkCallbackTimeoutEventObject>;
 export type ChainlinkCallbackTimeoutEventFilter = TypedEventFilter<ChainlinkCallbackTimeoutEvent>;
+export interface CollateralReturnedAfterTimeoutEventObject {
+    pendingOrderId: ITradingStorage.IdStructOutput;
+    collateralIndex: number;
+    trader: string;
+    collateralAmount: BigNumber;
+}
+export type CollateralReturnedAfterTimeoutEvent = TypedEvent<[
+    ITradingStorage.IdStructOutput,
+    number,
+    string,
+    BigNumber
+], CollateralReturnedAfterTimeoutEventObject>;
+export type CollateralReturnedAfterTimeoutEventFilter = TypedEventFilter<CollateralReturnedAfterTimeoutEvent>;
 export interface CouldNotCloseTradeEventObject {
     trader: string;
     pairIndex: number;
@@ -3088,6 +3850,19 @@ export type LeverageUpdateInitiatedEvent = TypedEvent<[
     BigNumber
 ], LeverageUpdateInitiatedEventObject>;
 export type LeverageUpdateInitiatedEventFilter = TypedEventFilter<LeverageUpdateInitiatedEvent>;
+export interface ManualNegativePnlRealizationInitiatedEventObject {
+    orderId: ITradingStorage.IdStructOutput;
+    trader: string;
+    index: number;
+    isHoldingFeesRealization: boolean;
+}
+export type ManualNegativePnlRealizationInitiatedEvent = TypedEvent<[
+    ITradingStorage.IdStructOutput,
+    string,
+    number,
+    boolean
+], ManualNegativePnlRealizationInitiatedEventObject>;
+export type ManualNegativePnlRealizationInitiatedEventFilter = TypedEventFilter<ManualNegativePnlRealizationInitiatedEvent>;
 export interface MarketOrderInitiatedEventObject {
     orderId: ITradingStorage.IdStructOutput;
     trader: string;
@@ -3235,6 +4010,19 @@ export type PositionSizeUpdateInitiatedEvent = TypedEvent<[
     BigNumber
 ], PositionSizeUpdateInitiatedEventObject>;
 export type PositionSizeUpdateInitiatedEventFilter = TypedEventFilter<PositionSizeUpdateInitiatedEvent>;
+export interface PositivePnlWithdrawalInitiatedEventObject {
+    orderId: ITradingStorage.IdStructOutput;
+    trader: string;
+    index: number;
+    amountCollateral: BigNumber;
+}
+export type PositivePnlWithdrawalInitiatedEvent = TypedEvent<[
+    ITradingStorage.IdStructOutput,
+    string,
+    number,
+    BigNumber
+], PositivePnlWithdrawalInitiatedEventObject>;
+export type PositivePnlWithdrawalInitiatedEventFilter = TypedEventFilter<PositivePnlWithdrawalInitiatedEvent>;
 export interface TriggerOrderInitiatedEventObject {
     orderId: ITradingStorage.IdStructOutput;
     trader: string;
@@ -3248,19 +4036,34 @@ export type TriggerOrderInitiatedEvent = TypedEvent<[
     boolean
 ], TriggerOrderInitiatedEventObject>;
 export type TriggerOrderInitiatedEventFilter = TypedEventFilter<TriggerOrderInitiatedEvent>;
-export interface BorrowingFeeChargedEventObject {
-    trader: string;
-    index: number;
+export interface CounterTradeCollateralReturnedEventObject {
+    orderId: ITradingStorage.IdStructOutput;
     collateralIndex: number;
-    amountCollateral: BigNumber;
+    trader: string;
+    collateralReturned: BigNumber;
 }
-export type BorrowingFeeChargedEvent = TypedEvent<[
+export type CounterTradeCollateralReturnedEvent = TypedEvent<[
+    ITradingStorage.IdStructOutput,
+    number,
     string,
+    BigNumber
+], CounterTradeCollateralReturnedEventObject>;
+export type CounterTradeCollateralReturnedEventFilter = TypedEventFilter<CounterTradeCollateralReturnedEvent>;
+export interface FeesProcessedEventObject {
+    collateralIndex: number;
+    trader: string;
+    positionSizeCollateral: BigNumber;
+    orderType: number;
+    totalFeesCollateral: BigNumber;
+}
+export type FeesProcessedEvent = TypedEvent<[
     number,
+    string,
+    BigNumber,
     number,
     BigNumber
-], BorrowingFeeChargedEventObject>;
-export type BorrowingFeeChargedEventFilter = TypedEventFilter<BorrowingFeeChargedEvent>;
+], FeesProcessedEventObject>;
+export type FeesProcessedEventFilter = TypedEventFilter<FeesProcessedEvent>;
 export interface GTokenFeeChargedEventObject {
     trader: string;
     collateralIndex: number;
@@ -3305,7 +4108,7 @@ export interface LimitExecutedEventObject {
     oraclePrice: BigNumber;
     marketPrice: BigNumber;
     liqPrice: BigNumber;
-    priceImpactP: BigNumber;
+    priceImpact: ITradingCommonUtils.TradePriceImpactStructOutput;
     percentProfit: BigNumber;
     amountSentToTrader: BigNumber;
     collateralPriceUsd: BigNumber;
@@ -3322,7 +4125,7 @@ export type LimitExecutedEvent = TypedEvent<[
     BigNumber,
     BigNumber,
     BigNumber,
-    BigNumber,
+    ITradingCommonUtils.TradePriceImpactStructOutput,
     BigNumber,
     BigNumber,
     BigNumber,
@@ -3353,7 +4156,7 @@ export interface MarketExecutedEventObject {
     oraclePrice: BigNumber;
     marketPrice: BigNumber;
     liqPrice: BigNumber;
-    priceImpactP: BigNumber;
+    priceImpact: ITradingCommonUtils.TradePriceImpactStructOutput;
     percentProfit: BigNumber;
     amountSentToTrader: BigNumber;
     collateralPriceUsd: BigNumber;
@@ -3367,7 +4170,7 @@ export type MarketExecutedEvent = TypedEvent<[
     BigNumber,
     BigNumber,
     BigNumber,
-    BigNumber,
+    ITradingCommonUtils.TradePriceImpactStructOutput,
     BigNumber,
     BigNumber,
     BigNumber
@@ -3378,12 +4181,14 @@ export interface MarketOpenCanceledEventObject {
     trader: string;
     pairIndex: BigNumber;
     cancelReason: number;
+    collateralReturned: BigNumber;
 }
 export type MarketOpenCanceledEvent = TypedEvent<[
     ITradingStorage.IdStructOutput,
     string,
     BigNumber,
-    number
+    number,
+    BigNumber
 ], MarketOpenCanceledEventObject>;
 export type MarketOpenCanceledEventFilter = TypedEventFilter<MarketOpenCanceledEvent>;
 export interface PendingGovFeesClaimedEventObject {
@@ -3406,6 +4211,82 @@ export type ReferralFeeChargedEvent = TypedEvent<[
     BigNumber
 ], ReferralFeeChargedEventObject>;
 export type ReferralFeeChargedEventFilter = TypedEventFilter<ReferralFeeChargedEvent>;
+export interface TradeHoldingFeesManuallyRealizedEventObject {
+    orderId: ITradingStorage.IdStructOutput;
+    collateralIndex: number;
+    trader: string;
+    index: number;
+    currentPairPrice: BigNumber;
+}
+export type TradeHoldingFeesManuallyRealizedEvent = TypedEvent<[
+    ITradingStorage.IdStructOutput,
+    number,
+    string,
+    number,
+    BigNumber
+], TradeHoldingFeesManuallyRealizedEventObject>;
+export type TradeHoldingFeesManuallyRealizedEventFilter = TypedEventFilter<TradeHoldingFeesManuallyRealizedEvent>;
+export interface TradeNegativePnlManuallyRealizedEventObject {
+    orderId: ITradingStorage.IdStructOutput;
+    collateralIndex: number;
+    trader: string;
+    index: number;
+    negativePnlCollateral: BigNumber;
+    existingManuallyRealizedNegativePnlCollateral: BigNumber;
+    newManuallyRealizedNegativePnlCollateral: BigNumber;
+    currentPairPrice: BigNumber;
+}
+export type TradeNegativePnlManuallyRealizedEvent = TypedEvent<[
+    ITradingStorage.IdStructOutput,
+    number,
+    string,
+    number,
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    BigNumber
+], TradeNegativePnlManuallyRealizedEventObject>;
+export type TradeNegativePnlManuallyRealizedEventFilter = TypedEventFilter<TradeNegativePnlManuallyRealizedEvent>;
+export interface TradePositivePnlWithdrawnEventObject {
+    orderId: ITradingStorage.IdStructOutput;
+    collateralIndex: number;
+    trader: string;
+    index: number;
+    priceImpact: ITradingCommonUtils.TradePriceImpactStructOutput;
+    pnlPercent: BigNumber;
+    withdrawablePositivePnlCollateral: BigNumber;
+    currentPairPrice: BigNumber;
+    pnlInputCollateral: BigNumber;
+    pnlWithdrawnCollateral: BigNumber;
+}
+export type TradePositivePnlWithdrawnEvent = TypedEvent<[
+    ITradingStorage.IdStructOutput,
+    number,
+    string,
+    number,
+    ITradingCommonUtils.TradePriceImpactStructOutput,
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    BigNumber
+], TradePositivePnlWithdrawnEventObject>;
+export type TradePositivePnlWithdrawnEventFilter = TypedEventFilter<TradePositivePnlWithdrawnEvent>;
+export interface TradeValueTransferredEventObject {
+    collateralIndex: number;
+    trader: string;
+    index: number;
+    collateralSentToTrader: BigNumber;
+    availableCollateralInDiamond: BigNumber;
+}
+export type TradeValueTransferredEvent = TypedEvent<[
+    number,
+    string,
+    number,
+    BigNumber,
+    BigNumber
+], TradeValueTransferredEventObject>;
+export type TradeValueTransferredEventFilter = TypedEventFilter<TradeValueTransferredEvent>;
 export interface TriggerFeeChargedEventObject {
     trader: string;
     collateralIndex: number;
@@ -3501,6 +4382,7 @@ export interface BorrowingInitialAccFeesStoredEventObject {
     pairIndex: number;
     index: number;
     long: boolean;
+    currentPairPrice: BigNumber;
     initialPairAccFee: BigNumber;
     initialGroupAccFee: BigNumber;
 }
@@ -3511,6 +4393,7 @@ export type BorrowingInitialAccFeesStoredEvent = TypedEvent<[
     number,
     boolean,
     BigNumber,
+    BigNumber,
     BigNumber
 ], BorrowingInitialAccFeesStoredEventObject>;
 export type BorrowingInitialAccFeesStoredEventFilter = TypedEventFilter<BorrowingInitialAccFeesStoredEvent>;
@@ -3518,6 +4401,7 @@ export interface BorrowingPairAccFeesUpdatedEventObject {
     collateralIndex: number;
     pairIndex: number;
     currentBlock: BigNumber;
+    currentPairPrice: BigNumber;
     accFeeLong: BigNumber;
     accFeeShort: BigNumber;
 }
@@ -3526,6 +4410,7 @@ export type BorrowingPairAccFeesUpdatedEvent = TypedEvent<[
     number,
     BigNumber,
     BigNumber,
+    BigNumber,
     BigNumber
 ], BorrowingPairAccFeesUpdatedEventObject>;
 export type BorrowingPairAccFeesUpdatedEventFilter = TypedEventFilter<BorrowingPairAccFeesUpdatedEvent>;
@@ -3555,7 +4440,7 @@ export type BorrowingPairGroupUpdatedEvent = TypedEvent<[
     number
 ], BorrowingPairGroupUpdatedEventObject>;
 export type BorrowingPairGroupUpdatedEventFilter = TypedEventFilter<BorrowingPairGroupUpdatedEvent>;
-export interface BorrowingPairOiUpdatedEventObject {
+export interface BorrowingPairOiBeforeV10UpdatedEventObject {
     collateralIndex: number;
     pairIndex: number;
     long: boolean;
@@ -3564,7 +4449,7 @@ export interface BorrowingPairOiUpdatedEventObject {
     newOiLong: BigNumber;
     newOiShort: BigNumber;
 }
-export type BorrowingPairOiUpdatedEvent = TypedEvent<[
+export type BorrowingPairOiBeforeV10UpdatedEvent = TypedEvent<[
     number,
     number,
     boolean,
@@ -3572,8 +4457,8 @@ export type BorrowingPairOiUpdatedEvent = TypedEvent<[
     BigNumber,
     BigNumber,
     BigNumber
-], BorrowingPairOiUpdatedEventObject>;
-export type BorrowingPairOiUpdatedEventFilter = TypedEventFilter<BorrowingPairOiUpdatedEvent>;
+], BorrowingPairOiBeforeV10UpdatedEventObject>;
+export type BorrowingPairOiBeforeV10UpdatedEventFilter = TypedEventFilter<BorrowingPairOiBeforeV10UpdatedEvent>;
 export interface BorrowingPairParamsUpdatedEventObject {
     collateralIndex: number;
     pairIndex: number;
@@ -3598,6 +4483,7 @@ export interface TradeBorrowingCallbackHandledEventObject {
     index: number;
     open: boolean;
     long: boolean;
+    currentPairPrice: BigNumber;
     positionSizeCollateral: BigNumber;
 }
 export type TradeBorrowingCallbackHandledEvent = TypedEvent<[
@@ -3607,6 +4493,7 @@ export type TradeBorrowingCallbackHandledEvent = TypedEvent<[
     number,
     boolean,
     boolean,
+    BigNumber,
     BigNumber
 ], TradeBorrowingCallbackHandledEventObject>;
 export type TradeBorrowingCallbackHandledEventFilter = TypedEventFilter<TradeBorrowingCallbackHandledEvent>;
@@ -3715,6 +4602,13 @@ export type OracleReplacedEvent = TypedEvent<[
     string
 ], OracleReplacedEventObject>;
 export type OracleReplacedEventFilter = TypedEventFilter<OracleReplacedEvent>;
+export interface ParamUpdateJobIdUpdatedEventObject {
+    jobId: string;
+}
+export type ParamUpdateJobIdUpdatedEvent = TypedEvent<[
+    string
+], ParamUpdateJobIdUpdatedEventObject>;
+export type ParamUpdateJobIdUpdatedEventFilter = TypedEventFilter<ParamUpdateJobIdUpdatedEvent>;
 export interface PriceReceivedEventObject {
     orderId: ITradingStorage.IdStructOutput;
     pairIndex: number;
@@ -3744,7 +4638,9 @@ export interface PriceRequestedEventObject {
     collateralIndex: number;
     pairIndex: BigNumber;
     pendingOrder: ITradingStorage.PendingOrderStructOutput;
+    positionSizeCollateral: BigNumber;
     fromBlock: BigNumber;
+    isCounterTrade: boolean;
     isLookback: boolean;
     job: string;
     linkFeePerNode: BigNumber;
@@ -3755,6 +4651,8 @@ export type PriceRequestedEvent = TypedEvent<[
     BigNumber,
     ITradingStorage.PendingOrderStructOutput,
     BigNumber,
+    BigNumber,
+    boolean,
     boolean,
     string,
     BigNumber,
@@ -3824,6 +4722,284 @@ export type NativeTransferGasLimitUpdatedEvent = TypedEvent<[
     number
 ], NativeTransferGasLimitUpdatedEventObject>;
 export type NativeTransferGasLimitUpdatedEventFilter = TypedEventFilter<NativeTransferGasLimitUpdatedEvent>;
+export interface AbsoluteRatePerSecondCapUpdatedEventObject {
+    collateralIndex: number;
+    pairIndex: number;
+    absoluteRatePerSecondCap: number;
+}
+export type AbsoluteRatePerSecondCapUpdatedEvent = TypedEvent<[
+    number,
+    number,
+    number
+], AbsoluteRatePerSecondCapUpdatedEventObject>;
+export type AbsoluteRatePerSecondCapUpdatedEventFilter = TypedEventFilter<AbsoluteRatePerSecondCapUpdatedEvent>;
+export interface AbsoluteVelocityPerYearCapUpdatedEventObject {
+    collateralIndex: number;
+    pairIndex: number;
+    absoluteVelocityPerYearCap: number;
+}
+export type AbsoluteVelocityPerYearCapUpdatedEvent = TypedEvent<[
+    number,
+    number,
+    number
+], AbsoluteVelocityPerYearCapUpdatedEventObject>;
+export type AbsoluteVelocityPerYearCapUpdatedEventFilter = TypedEventFilter<AbsoluteVelocityPerYearCapUpdatedEvent>;
+export interface AlreadyTransferredNegativePnlStoredEventObject {
+    trader: string;
+    index: number;
+    deltaCollateral: BigNumber;
+    newAlreadyTransferredNegativePnlCollateral: BigNumber;
+}
+export type AlreadyTransferredNegativePnlStoredEvent = TypedEvent<[
+    string,
+    number,
+    BigNumber,
+    BigNumber
+], AlreadyTransferredNegativePnlStoredEventObject>;
+export type AlreadyTransferredNegativePnlStoredEventFilter = TypedEventFilter<AlreadyTransferredNegativePnlStoredEvent>;
+export interface AprMultiplierEnabledUpdatedEventObject {
+    collateralIndex: number;
+    pairIndex: number;
+    aprMultiplierEnabled: boolean;
+}
+export type AprMultiplierEnabledUpdatedEvent = TypedEvent<[
+    number,
+    number,
+    boolean
+], AprMultiplierEnabledUpdatedEventObject>;
+export type AprMultiplierEnabledUpdatedEventFilter = TypedEventFilter<AprMultiplierEnabledUpdatedEvent>;
+export interface BorrowingRatePerSecondPUpdatedEventObject {
+    collateralIndex: number;
+    pairIndex: number;
+    borrowingRatePerSecondP: number;
+}
+export type BorrowingRatePerSecondPUpdatedEvent = TypedEvent<[
+    number,
+    number,
+    number
+], BorrowingRatePerSecondPUpdatedEventObject>;
+export type BorrowingRatePerSecondPUpdatedEventFilter = TypedEventFilter<BorrowingRatePerSecondPUpdatedEvent>;
+export interface FundingFeesEnabledUpdatedEventObject {
+    collateralIndex: number;
+    pairIndex: number;
+    fundingFeesEnabled: boolean;
+}
+export type FundingFeesEnabledUpdatedEvent = TypedEvent<[
+    number,
+    number,
+    boolean
+], FundingFeesEnabledUpdatedEventObject>;
+export type FundingFeesEnabledUpdatedEventFilter = TypedEventFilter<FundingFeesEnabledUpdatedEvent>;
+export interface HoldingFeesChargedOnTradeEventObject {
+    collateralIndex: number;
+    trader: string;
+    index: number;
+    currentPairPrice: BigNumber;
+    tradeHoldingFees: IFundingFees.TradeHoldingFeesStructOutput;
+    availableCollateralInDiamond: BigNumber;
+    amountSentToVaultCollateral: BigNumber;
+    newRealizedTradingFeesCollateral: BigNumber;
+    newRealizedPnlCollateral: BigNumber;
+}
+export type HoldingFeesChargedOnTradeEvent = TypedEvent<[
+    number,
+    string,
+    number,
+    BigNumber,
+    IFundingFees.TradeHoldingFeesStructOutput,
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    BigNumber
+], HoldingFeesChargedOnTradeEventObject>;
+export type HoldingFeesChargedOnTradeEventFilter = TypedEventFilter<HoldingFeesChargedOnTradeEvent>;
+export interface HoldingFeesRealizedOnTradeEventObject {
+    collateralIndex: number;
+    trader: string;
+    index: number;
+    currentPairPrice: BigNumber;
+    tradeHoldingFees: IFundingFees.TradeHoldingFeesStructOutput;
+    newRealizedPnlCollateral: BigNumber;
+}
+export type HoldingFeesRealizedOnTradeEvent = TypedEvent<[
+    number,
+    string,
+    number,
+    BigNumber,
+    IFundingFees.TradeHoldingFeesStructOutput,
+    BigNumber
+], HoldingFeesRealizedOnTradeEventObject>;
+export type HoldingFeesRealizedOnTradeEventFilter = TypedEventFilter<HoldingFeesRealizedOnTradeEvent>;
+export interface ManuallyRealizedNegativePnlCollateralStoredEventObject {
+    trader: string;
+    index: number;
+    newManuallyRealizedNegativePnlCollateral: BigNumber;
+}
+export type ManuallyRealizedNegativePnlCollateralStoredEvent = TypedEvent<[
+    string,
+    number,
+    BigNumber
+], ManuallyRealizedNegativePnlCollateralStoredEventObject>;
+export type ManuallyRealizedNegativePnlCollateralStoredEventFilter = TypedEventFilter<ManuallyRealizedNegativePnlCollateralStoredEvent>;
+export interface MaxSkewCollateralUpdatedEventObject {
+    collateralIndex: number;
+    pairIndex: number;
+    maxSkewCollateral: BigNumber;
+}
+export type MaxSkewCollateralUpdatedEvent = TypedEvent<[
+    number,
+    number,
+    BigNumber
+], MaxSkewCollateralUpdatedEventObject>;
+export type MaxSkewCollateralUpdatedEventFilter = TypedEventFilter<MaxSkewCollateralUpdatedEvent>;
+export interface ParamUpdateRequestedEventObject {
+    collateralIndex: number;
+    pairIndex: number;
+    updateType: number;
+    newValue: BigNumber;
+}
+export type ParamUpdateRequestedEvent = TypedEvent<[
+    number,
+    number,
+    number,
+    BigNumber
+], ParamUpdateRequestedEventObject>;
+export type ParamUpdateRequestedEventFilter = TypedEventFilter<ParamUpdateRequestedEvent>;
+export interface PendingAccBorrowingFeesStoredEventObject {
+    collateralIndex: number;
+    pairIndex: number;
+    data: IFundingFees.PairBorrowingFeeDataStructOutput;
+}
+export type PendingAccBorrowingFeesStoredEvent = TypedEvent<[
+    number,
+    number,
+    IFundingFees.PairBorrowingFeeDataStructOutput
+], PendingAccBorrowingFeesStoredEventObject>;
+export type PendingAccBorrowingFeesStoredEventFilter = TypedEventFilter<PendingAccBorrowingFeesStoredEvent>;
+export interface PendingAccFundingFeesStoredEventObject {
+    collateralIndex: number;
+    pairIndex: number;
+    data: IFundingFees.PairFundingFeeDataStructOutput;
+}
+export type PendingAccFundingFeesStoredEvent = TypedEvent<[
+    number,
+    number,
+    IFundingFees.PairFundingFeeDataStructOutput
+], PendingAccFundingFeesStoredEventObject>;
+export type PendingAccFundingFeesStoredEventFilter = TypedEventFilter<PendingAccFundingFeesStoredEvent>;
+export interface PnlRealizedOnOpenTradeEventObject {
+    trader: string;
+    index: number;
+    pnlCollateral: BigNumber;
+    newRealizedPnlCollateral: BigNumber;
+}
+export type PnlRealizedOnOpenTradeEvent = TypedEvent<[
+    string,
+    number,
+    BigNumber,
+    BigNumber
+], PnlRealizedOnOpenTradeEventObject>;
+export type PnlRealizedOnOpenTradeEventFilter = TypedEventFilter<PnlRealizedOnOpenTradeEvent>;
+export interface SkewCoefficientPerYearUpdatedEventObject {
+    collateralIndex: number;
+    pairIndex: number;
+    skewCoefficientPerYear: BigNumber;
+}
+export type SkewCoefficientPerYearUpdatedEvent = TypedEvent<[
+    number,
+    number,
+    BigNumber
+], SkewCoefficientPerYearUpdatedEventObject>;
+export type SkewCoefficientPerYearUpdatedEventFilter = TypedEventFilter<SkewCoefficientPerYearUpdatedEvent>;
+export interface ThetaThresholdUsdUpdatedEventObject {
+    collateralIndex: number;
+    pairIndex: number;
+    thetaThresholdUsd: number;
+}
+export type ThetaThresholdUsdUpdatedEvent = TypedEvent<[
+    number,
+    number,
+    number
+], ThetaThresholdUsdUpdatedEventObject>;
+export type ThetaThresholdUsdUpdatedEventFilter = TypedEventFilter<ThetaThresholdUsdUpdatedEvent>;
+export interface TradeFeesDataDownscaledEventObject {
+    trader: string;
+    index: number;
+    positionSizeCollateralDelta: BigNumber;
+    existingPositionSizeCollateral: BigNumber;
+    newCollateralAmount: BigNumber;
+    newTradeFeesData: IFundingFees.TradeFeesDataStructOutput;
+}
+export type TradeFeesDataDownscaledEvent = TypedEvent<[
+    string,
+    number,
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    IFundingFees.TradeFeesDataStructOutput
+], TradeFeesDataDownscaledEventObject>;
+export type TradeFeesDataDownscaledEventFilter = TypedEventFilter<TradeFeesDataDownscaledEvent>;
+export interface TradeInitialAccFeesStoredEventObject {
+    trader: string;
+    index: number;
+    collateralIndex: number;
+    pairIndex: number;
+    long: boolean;
+    currentPairPrice: BigNumber;
+    newInitialAccFundingFeeP: BigNumber;
+    newInitialAccBorrowingFeeP: BigNumber;
+}
+export type TradeInitialAccFeesStoredEvent = TypedEvent<[
+    string,
+    number,
+    number,
+    number,
+    boolean,
+    BigNumber,
+    BigNumber,
+    BigNumber
+], TradeInitialAccFeesStoredEventObject>;
+export type TradeInitialAccFeesStoredEventFilter = TypedEventFilter<TradeInitialAccFeesStoredEvent>;
+export interface TradingFeesRealizedEventObject {
+    collateralIndex: number;
+    trader: string;
+    index: number;
+    tradingFeesCollateral: BigNumber;
+    finalTradingFeesCollateral: BigNumber;
+    newRealizedFeesCollateral: BigNumber;
+    newRealizedPnlCollateral: BigNumber;
+    amountSentFromVaultCollateral: BigNumber;
+}
+export type TradingFeesRealizedEvent = TypedEvent<[
+    number,
+    string,
+    number,
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    BigNumber
+], TradingFeesRealizedEventObject>;
+export type TradingFeesRealizedEventFilter = TypedEventFilter<TradingFeesRealizedEvent>;
+export interface VirtualAvailableCollateralInDiamondStoredEventObject {
+    trader: string;
+    index: number;
+    newTradeCollateralAmount: BigNumber;
+    currentManuallyRealizedNegativePnlCollateral: BigNumber;
+    manuallyRealizedNegativePnlCollateralCapped: boolean;
+    virtualAvailableCollateralInDiamondDelta: BigNumber;
+    newVirtualAvailableCollateralInDiamond: BigNumber;
+}
+export type VirtualAvailableCollateralInDiamondStoredEvent = TypedEvent<[
+    string,
+    number,
+    BigNumber,
+    BigNumber,
+    boolean,
+    BigNumber,
+    BigNumber
+], VirtualAvailableCollateralInDiamondStoredEventObject>;
+export type VirtualAvailableCollateralInDiamondStoredEventFilter = TypedEventFilter<VirtualAvailableCollateralInDiamondStoredEvent>;
 export interface GNSMultiCollatDiamond extends BaseContract {
     connect(signerOrProvider: Signer | Provider | string): this;
     attach(addressOrName: string): this;
@@ -3862,6 +5038,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initialize(_govTimelock: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        initializeGovEmergencyTimelock(_govEmergencyTimelock: PromiseOrValue<string>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         setRoles(_accounts: PromiseOrValue<string>[], _roles: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<boolean>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -3879,6 +5058,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getAllPairsRestrictedMaxLeverage(overrides?: CallOverrides): Promise<[BigNumber[]]>;
         getGlobalTradeFeeParams(overrides?: CallOverrides): Promise<[IPairsStorage.GlobalTradeFeeParamsStructOutput]>;
         getGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPairsStorage.GroupLiquidationParamsStructOutput]>;
+        getPairCounterTradeFeeRateMultiplier(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[number]>;
+        getPairCounterTradeFeeRateMultipliers(_pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[number[]]>;
+        getPairCounterTradeMaxLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[number]>;
+        getPairCounterTradeMaxLeverages(_pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[number[]]>;
         getPairLiquidationParams(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPairsStorage.GroupLiquidationParamsStructOutput]>;
         groups(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPairsStorage.GroupStructOutput]>;
         groupsCount(overrides?: CallOverrides): Promise<[BigNumber]>;
@@ -3912,6 +5095,12 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, _params: IPairsStorage.GroupLiquidationParamsStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        setPairCounterTradeFeeRateMultipliers(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        setPairCounterTradeMaxLeverages(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         setPairCustomMaxLeverages(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -4013,16 +5202,21 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getPairDepth(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPriceImpact.PairDepthStructOutput]>;
         getPairDepths(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[IPriceImpact.PairDepthStructOutput[]]>;
         getPairFactors(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[IPriceImpact.PairFactorsStructOutput[]]>;
+        getPairOiAfterV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPriceImpact.PairOiCollateralStructOutput]>;
+        getPairOiAfterV10Token(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPriceImpact.PairOiTokenStructOutput]>;
+        getPairOisAfterV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[IPriceImpact.PairOiCollateralStructOutput[]]>;
+        getPairOisAfterV10Token(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[IPriceImpact.PairOiTokenStructOutput[]]>;
+        getPairSkewDepth(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
+        getPairSkewDepths(_collateralIndices: PromiseOrValue<BigNumberish>[], _pairIndices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[BigNumber[]]>;
         getPriceImpactOi(_pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<[BigNumber] & {
             activeOi: BigNumber;
         }>;
         getProtectionCloseFactorWhitelist(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[boolean]>;
-        getTradePriceImpact(_trader: PromiseOrValue<string>, _marketPrice: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _open: PromiseOrValue<boolean>, _lastPosIncreaseBlock: PromiseOrValue<BigNumberish>, _contractsVersion: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
-            BigNumber,
-            BigNumber
-        ] & {
+        getTradeCumulVolPriceImpactP(_trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _open: PromiseOrValue<boolean>, _lastPosIncreaseBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber] & {
+            priceImpactP: BigNumber;
+        }>;
+        getTradeSkewPriceImpactP(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _positionSizeToken: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<[BigNumber] & {
             priceImpactP: BigNumber;
-            priceAfterImpact: BigNumber;
         }>;
         getUserPriceImpact(_trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPriceImpact.UserPriceImpactStructOutput]>;
         initializeNegPnlCumulVolMultiplier(_negPnlCumulVolMultiplier: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -4049,6 +5243,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setPairDepths(_indices: PromiseOrValue<BigNumberish>[], _depthsAboveUsd: PromiseOrValue<BigNumberish>[], _depthsBelowUsd: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        setPairSkewDepths(_collateralIndices: PromiseOrValue<BigNumberish>[], _pairIndices: PromiseOrValue<BigNumberish>[], _depths: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         setPriceImpactWindowsCount(_newWindowsCount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -4067,13 +5264,16 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setUserPriceImpact(_traders: PromiseOrValue<string>[], _pairIndices: PromiseOrValue<BigNumberish>[], _cumulVolPriceImpactMultipliers: PromiseOrValue<BigNumberish>[], _fixedSpreadPs: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        updatePairOiAfterV10(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, _oiDeltaToken: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         addCollateral(_collateral: PromiseOrValue<string>, _gToken: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         closePendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        closeTrade(_tradeId: ITradingStorage.IdStruct, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
+        closeTrade(_tradeId: ITradingStorage.IdStruct, _isPnlPositive: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         getAllPendingOrders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[ITradingStorage.PendingOrderStructOutput[]]>;
@@ -4096,6 +5296,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getPendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<[ITradingStorage.PendingOrderStructOutput]>;
         getPendingOrders(_user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[ITradingStorage.PendingOrderStructOutput[]]>;
         getTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[ITradingStorage.TradeStructOutput]>;
+        getTradeContractsVersion(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[number]>;
         getTradeInfo(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[ITradingStorage.TradeInfoStructOutput]>;
         getTradeInfos(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[ITradingStorage.TradeInfoStructOutput[]]>;
         getTradeLiquidationParams(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPairsStorage.GroupLiquidationParamsStructOutput]>;
@@ -4115,7 +5316,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         storePendingOrder(_pendingOrder: ITradingStorage.PendingOrderStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        storeTrade(_trade: ITradingStorage.TradeStruct, _tradeInfo: ITradingStorage.TradeInfoStruct, overrides?: Overrides & {
+        storeTrade(_trade: ITradingStorage.TradeStruct, _tradeInfo: ITradingStorage.TradeInfoStruct, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         toggleCollateralActiveState(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -4127,13 +5328,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateOpenOrderDetails(_tradeId: ITradingStorage.IdStruct, _openPrice: PromiseOrValue<BigNumberish>, _tp: PromiseOrValue<BigNumberish>, _sl: PromiseOrValue<BigNumberish>, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        updateTradeCollateralAmount(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<ContractTransaction>;
         updateTradeMaxClosingSlippageP(_tradeId: ITradingStorage.IdStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, _isPartialIncrease: PromiseOrValue<boolean>, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
+        updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, _pendingOrderType: PromiseOrValue<BigNumberish>, _positionSizeTokenDelta: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         updateTradeSl(_tradeId: ITradingStorage.IdStruct, _newSl: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -4188,6 +5386,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeTrading(_marketOrdersTimeoutBlocks: PromiseOrValue<BigNumberish>, _usersByPassTriggerLink: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        initiateManualNegativePnlRealization(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _isHoldingFees: PromiseOrValue<boolean>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         isWrappedNativeToken(_token: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[boolean]>;
         openTrade(_trade: ITradingStorage.TradeStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, _referrer: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
@@ -4228,6 +5429,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateTp(_index: PromiseOrValue<BigNumberish>, _newTp: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        withdrawPositivePnl(_index: PromiseOrValue<BigNumberish>, _amountCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         claimPendingGovFees(overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -4254,9 +5458,18 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeTreasuryAddress(_treasury: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        manualHoldingFeesRealizationCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        manualNegativePnlRealizationCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         openTradeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        pnlWithdrawalCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         updateLeverageCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -4266,24 +5479,23 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateVaultClosingFeeP(_valueP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        validateTriggerCloseOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+        validateTriggerCloseOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             ITradingStorage.TradeStructOutput,
-            number,
             ITradingCallbacks.ValuesStructOutput
         ] & {
             t: ITradingStorage.TradeStructOutput;
-            cancelReason: number;
             v: ITradingCallbacks.ValuesStructOutput;
         }>;
-        validateTriggerOpenOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+        validateTriggerOpenOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             ITradingStorage.TradeStructOutput,
-            number,
             ITradingCallbacks.ValuesStructOutput
         ] & {
             t: ITradingStorage.TradeStructOutput;
-            cancelReason: number;
             v: ITradingCallbacks.ValuesStructOutput;
         }>;
+        borrowingParamUpdateCallback(_paramUpdate: IFundingFees.PendingParamUpdateStruct, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         getAllBorrowingPairs(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             IBorrowingFees.BorrowingDataStructOutput[],
             IBorrowingFees.OpenInterestStructOutput[],
@@ -4315,8 +5527,8 @@ export interface GNSMultiCollatDiamond extends BaseContract {
             groupIndex: number;
         }>;
         getBorrowingPairGroups(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IBorrowingFees.BorrowingPairGroupStructOutput[]]>;
-        getBorrowingPairOi(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IBorrowingFees.OpenInterestStructOutput]>;
-        getBorrowingPairPendingAccFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+        getBorrowingPairOiBeforeV10(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IBorrowingFees.OpenInterestStructOutput]>;
+        getBorrowingPairPendingAccFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentBlock: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             BigNumber,
             BigNumber,
             BigNumber,
@@ -4329,8 +5541,8 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         }>;
         getPairMaxOi(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         getPairMaxOiCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
-        getPairOiCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<[BigNumber]>;
-        getPairOisCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+        getPairOiBeforeV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<[BigNumber]>;
+        getPairOisBeforeV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             BigNumber,
             BigNumber
         ] & {
@@ -4341,13 +5553,13 @@ export interface GNSMultiCollatDiamond extends BaseContract {
             feeAmountCollateral: BigNumber;
         }>;
         getTradeLiquidationPrice(_input: IBorrowingFees.LiqPriceInputStruct, overrides?: CallOverrides): Promise<[BigNumber]>;
-        handleTradeBorrowingCallback(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
+        handleTradeBorrowingCallback(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         initializeBorrowingFeePerBlockCap(_feePerBlockCap: IBorrowingFees.BorrowingFeePerBlockCapStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        resetTradeBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
+        resetTradeBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         setBorrowingFeePerBlockCap(_feePerBlockCap: IBorrowingFees.BorrowingFeePerBlockCapStruct, overrides?: Overrides & {
@@ -4368,6 +5580,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setBorrowingPairParamsArray(_collateralIndex: PromiseOrValue<BigNumberish>, _indices: PromiseOrValue<BigNumberish>[], _values: IBorrowingFees.BorrowingPairParamsStruct[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        updatePairOiBeforeV10(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _increase: PromiseOrValue<boolean>, _amountCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         withinMaxBorrowingGroupOi(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[boolean]>;
         addOracle(_a: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
@@ -4389,7 +5604,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getLimitJobCount(overrides?: CallOverrides): Promise<[number]>;
         getLimitJobId(overrides?: CallOverrides): Promise<[string]>;
         getLimitJobIndex(overrides?: CallOverrides): Promise<[BigNumber]>;
-        getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
+        getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _isCounterTrade: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<[BigNumber]>;
         getLinkUsdPriceFeed(overrides?: CallOverrides): Promise<[string]>;
         getMarketJobId(overrides?: CallOverrides): Promise<[string]>;
         getMaxLookbackDeviationP(overrides?: CallOverrides): Promise<[number]>;
@@ -4397,8 +5612,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getMinAnswers(overrides?: CallOverrides): Promise<[number]>;
         getOracle(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[string]>;
         getOracles(overrides?: CallOverrides): Promise<[string[]]>;
+        getParamUpdateJobId(overrides?: CallOverrides): Promise<[string]>;
         getPendingRequest(_id: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<[string]>;
-        getPrice(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _pendingOrder: ITradingStorage.PendingOrderStruct, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _fromBlock: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        getPrice(_input: IPriceAggregator.GetPriceInputStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         getPriceAggregatorOrder(_requestId: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<[IPriceAggregator.OrderStructOutput]>;
@@ -4412,6 +5628,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeMaxDeviationsP(_maxMarketDeviationP: PromiseOrValue<BigNumberish>, _maxLookbackDeviationP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        initializeParamUpdateJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         initializePriceAggregator(_linkToken: PromiseOrValue<string>, _linkUsdPriceFeed: PromiseOrValue<string>, _twapInterval: PromiseOrValue<BigNumberish>, _minAnswers: PromiseOrValue<BigNumberish>, _nodes: PromiseOrValue<string>[], _jobIds: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>], _collateralIndices: PromiseOrValue<BigNumberish>[], _gnsCollateralLiquidityPools: IPriceAggregator.LiquidityPoolInputStruct[], _collateralUsdPriceFeeds: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -4436,6 +5655,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setMaxMarketDeviationP(_maxMarketDeviationP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        setParamUpdateJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         updateCollateralGnsLiquidityPool(_collateralIndex: PromiseOrValue<BigNumberish>, _liquidityPoolInput: IPriceAggregator.LiquidityPoolInputStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -4460,25 +5682,125 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeOtc(_config: IOtc.OtcConfigStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        sellGnsForCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        sellGnsForCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        updateOtcConfig(_config: IOtc.OtcConfigStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        multicall(data: PromiseOrValue<BytesLike>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        getNativeTransferEnabled(overrides?: CallOverrides): Promise<[boolean]>;
+        getNativeTransferGasLimit(overrides?: CallOverrides): Promise<[number]>;
+        getReentrancyLock(overrides?: CallOverrides): Promise<[BigNumber]>;
+        initializeChainConfig(_nativeTransferGasLimit: PromiseOrValue<BigNumberish>, _nativeTransferEnabled: PromiseOrValue<boolean>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        updateNativeTransferEnabled(_nativeTransferEnabled: PromiseOrValue<boolean>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        updateNativeTransferGasLimit(_nativeTransferGasLimit: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        downscaleTradeFeesData(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateralDelta: PromiseOrValue<BigNumberish>, _existingPositionSizeCollateral: PromiseOrValue<BigNumberish>, _newCollateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        getMaxSkewCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
+        getPairBorrowingFeeData(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[IFundingFees.PairBorrowingFeeDataStructOutput[]]>;
+        getPairBorrowingFeeParams(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[IFundingFees.BorrowingFeeParamsStructOutput[]]>;
+        getPairFundingFeeData(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[IFundingFees.PairFundingFeeDataStructOutput[]]>;
+        getPairFundingFeeParams(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[IFundingFees.FundingFeeParamsStructOutput[]]>;
+        getPairGlobalParamsArray(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[IFundingFees.PairGlobalParamsStructOutput[]]>;
+        getPairPendingAccBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber] & {
+            accBorrowingFeeP: BigNumber;
+        }>;
+        getPairPendingAccFundingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+            BigNumber,
+            BigNumber,
+            BigNumber
+        ] & {
+            accFundingFeeLongP: BigNumber;
+            accFundingFeeShortP: BigNumber;
+            currentFundingRatePerSecondP: BigNumber;
+        }>;
+        getPendingParamUpdates(_index: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[IFundingFees.PendingParamUpdateStructOutput[]]>;
+        getTradeBorrowingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
+        getTradeFeesData(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IFundingFees.TradeFeesDataStructOutput]>;
+        getTradeFeesDataArray(_trader: PromiseOrValue<string>[], _index: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[IFundingFees.TradeFeesDataStructOutput[]]>;
+        getTradeFundingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
+        getTradeManuallyRealizedNegativePnlCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
+        getTradePendingHoldingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+            IFundingFees.TradeHoldingFeesStructOutput
+        ] & {
+            tradeHoldingFees: IFundingFees.TradeHoldingFeesStructOutput;
+        }>;
+        getTradeRealizedPnlCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+            BigNumber,
+            BigNumber,
+            BigNumber
+        ] & {
+            realizedPnlCollateral: BigNumber;
+            realizedTradingFeesCollateral: BigNumber;
+            totalRealizedPnlCollateral: BigNumber;
+        }>;
+        getTradeRealizedTradingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
+        getTradeUiRealizedPnlDataArray(_trader: PromiseOrValue<string>[], _index: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[IFundingFees.UiRealizedPnlDataStructOutput[]]>;
+        pendingParamUpdateCallback(_answer: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        realizeHoldingFeesOnOpenTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        realizePnlOnOpenTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _pnlCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        realizeTradingFeesOnOpenTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _feesCollateral: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        requestParamUpdate(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _updateType: PromiseOrValue<BigNumberish>, _newValue: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        setAbsoluteRatePerSecondCap(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _absoluteRatePerSecondCap: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        setAbsoluteVelocityPerYearCap(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _absoluteVelocityPerYearCap: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        setAprMultiplierEnabled(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _aprMultiplierEnabled: PromiseOrValue<boolean>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        setBorrowingRatePerSecondP(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _borrowingRatePerSecondP: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        setFundingFeesEnabled(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _fundingFeesEnabled: PromiseOrValue<boolean>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        setMaxSkewCollateral(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _maxSkewCollateral: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        setSkewCoefficientPerYear(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _skewCoefficientPerYear: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        setThetaThresholdUsd(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _thetaThresholdUsd: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        updateOtcConfig(_config: IOtc.OtcConfigStruct, overrides?: Overrides & {
+        storeAlreadyTransferredNegativePnl(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _deltaCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        multicall(data: PromiseOrValue<BytesLike>[], overrides?: Overrides & {
+        storeManuallyRealizedNegativePnlCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _amountCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        getNativeTransferEnabled(overrides?: CallOverrides): Promise<[boolean]>;
-        getNativeTransferGasLimit(overrides?: CallOverrides): Promise<[number]>;
-        getReentrancyLock(overrides?: CallOverrides): Promise<[BigNumber]>;
-        initializeChainConfig(_nativeTransferGasLimit: PromiseOrValue<BigNumberish>, _nativeTransferEnabled: PromiseOrValue<boolean>, overrides?: Overrides & {
+        storeTradeInitialAccFees(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        updateNativeTransferEnabled(_nativeTransferEnabled: PromiseOrValue<boolean>, overrides?: Overrides & {
+        storeUiPnlWithdrawnCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _deltaCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        updateNativeTransferGasLimit(_nativeTransferGasLimit: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        storeUiRealizedPnlPartialCloseCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _deltaCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        storeVirtualAvailableCollateralInDiamond(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _newTradeCollateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
     };
@@ -4495,6 +5817,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     initialize(_govTimelock: PromiseOrValue<string>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    initializeGovEmergencyTimelock(_govEmergencyTimelock: PromiseOrValue<string>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     setRoles(_accounts: PromiseOrValue<string>[], _roles: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<boolean>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4512,6 +5837,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     getAllPairsRestrictedMaxLeverage(overrides?: CallOverrides): Promise<BigNumber[]>;
     getGlobalTradeFeeParams(overrides?: CallOverrides): Promise<IPairsStorage.GlobalTradeFeeParamsStructOutput>;
     getGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput>;
+    getPairCounterTradeFeeRateMultiplier(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<number>;
+    getPairCounterTradeFeeRateMultipliers(_pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<number[]>;
+    getPairCounterTradeMaxLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<number>;
+    getPairCounterTradeMaxLeverages(_pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<number[]>;
     getPairLiquidationParams(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput>;
     groups(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupStructOutput>;
     groupsCount(overrides?: CallOverrides): Promise<BigNumber>;
@@ -4545,6 +5874,12 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     setGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, _params: IPairsStorage.GroupLiquidationParamsStruct, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    setPairCounterTradeFeeRateMultipliers(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    setPairCounterTradeMaxLeverages(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     setPairCustomMaxLeverages(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4646,15 +5981,16 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     getPairDepth(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceImpact.PairDepthStructOutput>;
     getPairDepths(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IPriceImpact.PairDepthStructOutput[]>;
     getPairFactors(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IPriceImpact.PairFactorsStructOutput[]>;
+    getPairOiAfterV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceImpact.PairOiCollateralStructOutput>;
+    getPairOiAfterV10Token(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceImpact.PairOiTokenStructOutput>;
+    getPairOisAfterV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IPriceImpact.PairOiCollateralStructOutput[]>;
+    getPairOisAfterV10Token(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IPriceImpact.PairOiTokenStructOutput[]>;
+    getPairSkewDepth(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+    getPairSkewDepths(_collateralIndices: PromiseOrValue<BigNumberish>[], _pairIndices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber[]>;
     getPriceImpactOi(_pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
     getProtectionCloseFactorWhitelist(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<boolean>;
-    getTradePriceImpact(_trader: PromiseOrValue<string>, _marketPrice: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _open: PromiseOrValue<boolean>, _lastPosIncreaseBlock: PromiseOrValue<BigNumberish>, _contractsVersion: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
-        BigNumber,
-        BigNumber
-    ] & {
-        priceImpactP: BigNumber;
-        priceAfterImpact: BigNumber;
-    }>;
+    getTradeCumulVolPriceImpactP(_trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _open: PromiseOrValue<boolean>, _lastPosIncreaseBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+    getTradeSkewPriceImpactP(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _positionSizeToken: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
     getUserPriceImpact(_trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceImpact.UserPriceImpactStructOutput>;
     initializeNegPnlCumulVolMultiplier(_negPnlCumulVolMultiplier: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
@@ -4680,6 +6016,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     setPairDepths(_indices: PromiseOrValue<BigNumberish>[], _depthsAboveUsd: PromiseOrValue<BigNumberish>[], _depthsBelowUsd: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    setPairSkewDepths(_collateralIndices: PromiseOrValue<BigNumberish>[], _pairIndices: PromiseOrValue<BigNumberish>[], _depths: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     setPriceImpactWindowsCount(_newWindowsCount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4698,13 +6037,16 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     setUserPriceImpact(_traders: PromiseOrValue<string>[], _pairIndices: PromiseOrValue<BigNumberish>[], _cumulVolPriceImpactMultipliers: PromiseOrValue<BigNumberish>[], _fixedSpreadPs: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    updatePairOiAfterV10(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, _oiDeltaToken: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     addCollateral(_collateral: PromiseOrValue<string>, _gToken: PromiseOrValue<string>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     closePendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    closeTrade(_tradeId: ITradingStorage.IdStruct, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
+    closeTrade(_tradeId: ITradingStorage.IdStruct, _isPnlPositive: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     getAllPendingOrders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.PendingOrderStructOutput[]>;
@@ -4727,6 +6069,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     getPendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<ITradingStorage.PendingOrderStructOutput>;
     getPendingOrders(_user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<ITradingStorage.PendingOrderStructOutput[]>;
     getTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeStructOutput>;
+    getTradeContractsVersion(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<number>;
     getTradeInfo(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeInfoStructOutput>;
     getTradeInfos(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<ITradingStorage.TradeInfoStructOutput[]>;
     getTradeLiquidationParams(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput>;
@@ -4746,7 +6089,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     storePendingOrder(_pendingOrder: ITradingStorage.PendingOrderStruct, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    storeTrade(_trade: ITradingStorage.TradeStruct, _tradeInfo: ITradingStorage.TradeInfoStruct, overrides?: Overrides & {
+    storeTrade(_trade: ITradingStorage.TradeStruct, _tradeInfo: ITradingStorage.TradeInfoStruct, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     toggleCollateralActiveState(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -4758,13 +6101,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     updateOpenOrderDetails(_tradeId: ITradingStorage.IdStruct, _openPrice: PromiseOrValue<BigNumberish>, _tp: PromiseOrValue<BigNumberish>, _sl: PromiseOrValue<BigNumberish>, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    updateTradeCollateralAmount(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-        from?: PromiseOrValue<string>;
-    }): Promise<ContractTransaction>;
     updateTradeMaxClosingSlippageP(_tradeId: ITradingStorage.IdStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, _isPartialIncrease: PromiseOrValue<boolean>, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
+    updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, _pendingOrderType: PromiseOrValue<BigNumberish>, _positionSizeTokenDelta: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     updateTradeSl(_tradeId: ITradingStorage.IdStruct, _newSl: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -4819,6 +6159,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     initializeTrading(_marketOrdersTimeoutBlocks: PromiseOrValue<BigNumberish>, _usersByPassTriggerLink: PromiseOrValue<string>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    initiateManualNegativePnlRealization(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _isHoldingFees: PromiseOrValue<boolean>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     isWrappedNativeToken(_token: PromiseOrValue<string>, overrides?: CallOverrides): Promise<boolean>;
     openTrade(_trade: ITradingStorage.TradeStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, _referrer: PromiseOrValue<string>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
@@ -4859,6 +6202,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     updateTp(_index: PromiseOrValue<BigNumberish>, _newTp: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    withdrawPositivePnl(_index: PromiseOrValue<BigNumberish>, _amountCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     claimPendingGovFees(overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4885,9 +6231,18 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     initializeTreasuryAddress(_treasury: PromiseOrValue<string>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    manualHoldingFeesRealizationCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    manualNegativePnlRealizationCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     openTradeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    pnlWithdrawalCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     updateLeverageCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4897,24 +6252,23 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     updateVaultClosingFeeP(_valueP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    validateTriggerCloseOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+    validateTriggerCloseOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
         ITradingStorage.TradeStructOutput,
-        number,
         ITradingCallbacks.ValuesStructOutput
     ] & {
         t: ITradingStorage.TradeStructOutput;
-        cancelReason: number;
         v: ITradingCallbacks.ValuesStructOutput;
     }>;
-    validateTriggerOpenOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+    validateTriggerOpenOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
         ITradingStorage.TradeStructOutput,
-        number,
         ITradingCallbacks.ValuesStructOutput
     ] & {
         t: ITradingStorage.TradeStructOutput;
-        cancelReason: number;
         v: ITradingCallbacks.ValuesStructOutput;
     }>;
+    borrowingParamUpdateCallback(_paramUpdate: IFundingFees.PendingParamUpdateStruct, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     getAllBorrowingPairs(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
         IBorrowingFees.BorrowingDataStructOutput[],
         IBorrowingFees.OpenInterestStructOutput[],
@@ -4944,8 +6298,8 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     getBorrowingPairFeePerBlockCaps(_collateralIndex: PromiseOrValue<BigNumberish>, _indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IBorrowingFees.BorrowingFeePerBlockCapStructOutput[]>;
     getBorrowingPairGroupIndex(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<number>;
     getBorrowingPairGroups(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IBorrowingFees.BorrowingPairGroupStructOutput[]>;
-    getBorrowingPairOi(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IBorrowingFees.OpenInterestStructOutput>;
-    getBorrowingPairPendingAccFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+    getBorrowingPairOiBeforeV10(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IBorrowingFees.OpenInterestStructOutput>;
+    getBorrowingPairPendingAccFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentBlock: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
         BigNumber,
         BigNumber,
         BigNumber,
@@ -4958,8 +6312,8 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     }>;
     getPairMaxOi(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     getPairMaxOiCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-    getPairOiCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
-    getPairOisCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+    getPairOiBeforeV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
+    getPairOisBeforeV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
         BigNumber,
         BigNumber
     ] & {
@@ -4968,13 +6322,13 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     }>;
     getTradeBorrowingFee(_input: IBorrowingFees.BorrowingFeeInputStruct, overrides?: CallOverrides): Promise<BigNumber>;
     getTradeLiquidationPrice(_input: IBorrowingFees.LiqPriceInputStruct, overrides?: CallOverrides): Promise<BigNumber>;
-    handleTradeBorrowingCallback(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
+    handleTradeBorrowingCallback(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     initializeBorrowingFeePerBlockCap(_feePerBlockCap: IBorrowingFees.BorrowingFeePerBlockCapStruct, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    resetTradeBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
+    resetTradeBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     setBorrowingFeePerBlockCap(_feePerBlockCap: IBorrowingFees.BorrowingFeePerBlockCapStruct, overrides?: Overrides & {
@@ -4995,6 +6349,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     setBorrowingPairParamsArray(_collateralIndex: PromiseOrValue<BigNumberish>, _indices: PromiseOrValue<BigNumberish>[], _values: IBorrowingFees.BorrowingPairParamsStruct[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    updatePairOiBeforeV10(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _increase: PromiseOrValue<boolean>, _amountCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     withinMaxBorrowingGroupOi(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>;
     addOracle(_a: PromiseOrValue<string>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
@@ -5016,7 +6373,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     getLimitJobCount(overrides?: CallOverrides): Promise<number>;
     getLimitJobId(overrides?: CallOverrides): Promise<string>;
     getLimitJobIndex(overrides?: CallOverrides): Promise<BigNumber>;
-    getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+    getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _isCounterTrade: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
     getLinkUsdPriceFeed(overrides?: CallOverrides): Promise<string>;
     getMarketJobId(overrides?: CallOverrides): Promise<string>;
     getMaxLookbackDeviationP(overrides?: CallOverrides): Promise<number>;
@@ -5024,8 +6381,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     getMinAnswers(overrides?: CallOverrides): Promise<number>;
     getOracle(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>;
     getOracles(overrides?: CallOverrides): Promise<string[]>;
+    getParamUpdateJobId(overrides?: CallOverrides): Promise<string>;
     getPendingRequest(_id: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<string>;
-    getPrice(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _pendingOrder: ITradingStorage.PendingOrderStruct, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _fromBlock: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+    getPrice(_input: IPriceAggregator.GetPriceInputStruct, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     getPriceAggregatorOrder(_requestId: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<IPriceAggregator.OrderStructOutput>;
@@ -5039,6 +6397,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     initializeMaxDeviationsP(_maxMarketDeviationP: PromiseOrValue<BigNumberish>, _maxLookbackDeviationP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    initializeParamUpdateJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     initializePriceAggregator(_linkToken: PromiseOrValue<string>, _linkUsdPriceFeed: PromiseOrValue<string>, _twapInterval: PromiseOrValue<BigNumberish>, _minAnswers: PromiseOrValue<BigNumberish>, _nodes: PromiseOrValue<string>[], _jobIds: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>], _collateralIndices: PromiseOrValue<BigNumberish>[], _gnsCollateralLiquidityPools: IPriceAggregator.LiquidityPoolInputStruct[], _collateralUsdPriceFeeds: PromiseOrValue<string>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -5063,6 +6424,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     setMaxMarketDeviationP(_maxMarketDeviationP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    setParamUpdateJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     updateCollateralGnsLiquidityPool(_collateralIndex: PromiseOrValue<BigNumberish>, _liquidityPoolInput: IPriceAggregator.LiquidityPoolInputStruct, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -5108,6 +6472,100 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     updateNativeTransferGasLimit(_nativeTransferGasLimit: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    downscaleTradeFeesData(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateralDelta: PromiseOrValue<BigNumberish>, _existingPositionSizeCollateral: PromiseOrValue<BigNumberish>, _newCollateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    getMaxSkewCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+    getPairBorrowingFeeData(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IFundingFees.PairBorrowingFeeDataStructOutput[]>;
+    getPairBorrowingFeeParams(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IFundingFees.BorrowingFeeParamsStructOutput[]>;
+    getPairFundingFeeData(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IFundingFees.PairFundingFeeDataStructOutput[]>;
+    getPairFundingFeeParams(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IFundingFees.FundingFeeParamsStructOutput[]>;
+    getPairGlobalParamsArray(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IFundingFees.PairGlobalParamsStructOutput[]>;
+    getPairPendingAccBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+    getPairPendingAccFundingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+        BigNumber,
+        BigNumber,
+        BigNumber
+    ] & {
+        accFundingFeeLongP: BigNumber;
+        accFundingFeeShortP: BigNumber;
+        currentFundingRatePerSecondP: BigNumber;
+    }>;
+    getPendingParamUpdates(_index: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IFundingFees.PendingParamUpdateStructOutput[]>;
+    getTradeBorrowingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+    getTradeFeesData(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IFundingFees.TradeFeesDataStructOutput>;
+    getTradeFeesDataArray(_trader: PromiseOrValue<string>[], _index: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IFundingFees.TradeFeesDataStructOutput[]>;
+    getTradeFundingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+    getTradeManuallyRealizedNegativePnlCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+    getTradePendingHoldingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IFundingFees.TradeHoldingFeesStructOutput>;
+    getTradeRealizedPnlCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+        BigNumber,
+        BigNumber,
+        BigNumber
+    ] & {
+        realizedPnlCollateral: BigNumber;
+        realizedTradingFeesCollateral: BigNumber;
+        totalRealizedPnlCollateral: BigNumber;
+    }>;
+    getTradeRealizedTradingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+    getTradeUiRealizedPnlDataArray(_trader: PromiseOrValue<string>[], _index: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IFundingFees.UiRealizedPnlDataStructOutput[]>;
+    pendingParamUpdateCallback(_answer: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    realizeHoldingFeesOnOpenTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    realizePnlOnOpenTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _pnlCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    realizeTradingFeesOnOpenTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _feesCollateral: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    requestParamUpdate(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _updateType: PromiseOrValue<BigNumberish>, _newValue: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    setAbsoluteRatePerSecondCap(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _absoluteRatePerSecondCap: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    setAbsoluteVelocityPerYearCap(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _absoluteVelocityPerYearCap: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    setAprMultiplierEnabled(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _aprMultiplierEnabled: PromiseOrValue<boolean>[], overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    setBorrowingRatePerSecondP(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _borrowingRatePerSecondP: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    setFundingFeesEnabled(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _fundingFeesEnabled: PromiseOrValue<boolean>[], overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    setMaxSkewCollateral(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _maxSkewCollateral: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    setSkewCoefficientPerYear(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _skewCoefficientPerYear: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    setThetaThresholdUsd(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _thetaThresholdUsd: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    storeAlreadyTransferredNegativePnl(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _deltaCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    storeManuallyRealizedNegativePnlCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _amountCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    storeTradeInitialAccFees(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    storeUiPnlWithdrawnCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _deltaCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    storeUiRealizedPnlPartialCloseCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _deltaCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    storeVirtualAvailableCollateralInDiamond(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _newTradeCollateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     callStatic: {
         diamondCut(_faceCut: IDiamondStorage.FacetCutStruct[], _init: PromiseOrValue<string>, _calldata: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<void>;
         facetAddress(_functionSelector: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<string>;
@@ -5118,6 +6576,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         hasRole(_account: PromiseOrValue<string>, _role: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>;
         hasRoles(_account: PromiseOrValue<string>, _roleA: PromiseOrValue<BigNumberish>, _roleB: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>;
         initialize(_govTimelock: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
+        initializeGovEmergencyTimelock(_govEmergencyTimelock: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         setRoles(_accounts: PromiseOrValue<string>[], _roles: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<boolean>[], overrides?: CallOverrides): Promise<void>;
         addFees(_fees: IPairsStorage.FeeGroupStruct[], overrides?: CallOverrides): Promise<void>;
         addGroups(_groups: IPairsStorage.GroupStruct[], overrides?: CallOverrides): Promise<void>;
@@ -5127,6 +6586,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getAllPairsRestrictedMaxLeverage(overrides?: CallOverrides): Promise<BigNumber[]>;
         getGlobalTradeFeeParams(overrides?: CallOverrides): Promise<IPairsStorage.GlobalTradeFeeParamsStructOutput>;
         getGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput>;
+        getPairCounterTradeFeeRateMultiplier(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<number>;
+        getPairCounterTradeFeeRateMultipliers(_pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<number[]>;
+        getPairCounterTradeMaxLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<number>;
+        getPairCounterTradeMaxLeverages(_pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<number[]>;
         getPairLiquidationParams(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput>;
         groups(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupStructOutput>;
         groupsCount(overrides?: CallOverrides): Promise<BigNumber>;
@@ -5150,6 +6613,8 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         pairsCount(overrides?: CallOverrides): Promise<BigNumber>;
         setGlobalTradeFeeParams(_feeParams: IPairsStorage.GlobalTradeFeeParamsStruct, overrides?: CallOverrides): Promise<void>;
         setGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, _params: IPairsStorage.GroupLiquidationParamsStruct, overrides?: CallOverrides): Promise<void>;
+        setPairCounterTradeFeeRateMultipliers(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
+        setPairCounterTradeMaxLeverages(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
         setPairCustomMaxLeverages(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
         updateFees(_ids: PromiseOrValue<BigNumberish>[], _fees: IPairsStorage.FeeGroupStruct[], overrides?: CallOverrides): Promise<void>;
         updateGroups(_ids: PromiseOrValue<BigNumberish>[], _groups: IPairsStorage.GroupStruct[], overrides?: CallOverrides): Promise<void>;
@@ -5201,15 +6666,16 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getPairDepth(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceImpact.PairDepthStructOutput>;
         getPairDepths(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IPriceImpact.PairDepthStructOutput[]>;
         getPairFactors(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IPriceImpact.PairFactorsStructOutput[]>;
+        getPairOiAfterV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceImpact.PairOiCollateralStructOutput>;
+        getPairOiAfterV10Token(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceImpact.PairOiTokenStructOutput>;
+        getPairOisAfterV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IPriceImpact.PairOiCollateralStructOutput[]>;
+        getPairOisAfterV10Token(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IPriceImpact.PairOiTokenStructOutput[]>;
+        getPairSkewDepth(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPairSkewDepths(_collateralIndices: PromiseOrValue<BigNumberish>[], _pairIndices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber[]>;
         getPriceImpactOi(_pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
         getProtectionCloseFactorWhitelist(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<boolean>;
-        getTradePriceImpact(_trader: PromiseOrValue<string>, _marketPrice: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _open: PromiseOrValue<boolean>, _lastPosIncreaseBlock: PromiseOrValue<BigNumberish>, _contractsVersion: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
-            BigNumber,
-            BigNumber
-        ] & {
-            priceImpactP: BigNumber;
-            priceAfterImpact: BigNumber;
-        }>;
+        getTradeCumulVolPriceImpactP(_trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _open: PromiseOrValue<boolean>, _lastPosIncreaseBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradeSkewPriceImpactP(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _positionSizeToken: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
         getUserPriceImpact(_trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceImpact.UserPriceImpactStructOutput>;
         initializeNegPnlCumulVolMultiplier(_negPnlCumulVolMultiplier: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         initializePairFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactors: PromiseOrValue<BigNumberish>[], _protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>[], _cumulativeFactors: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
@@ -5219,15 +6685,17 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setExemptOnOpen(_pairIndices: PromiseOrValue<BigNumberish>[], _exemptOnOpen: PromiseOrValue<boolean>[], overrides?: CallOverrides): Promise<void>;
         setNegPnlCumulVolMultiplier(_negPnlCumulVolMultiplier: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         setPairDepths(_indices: PromiseOrValue<BigNumberish>[], _depthsAboveUsd: PromiseOrValue<BigNumberish>[], _depthsBelowUsd: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
+        setPairSkewDepths(_collateralIndices: PromiseOrValue<BigNumberish>[], _pairIndices: PromiseOrValue<BigNumberish>[], _depths: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
         setPriceImpactWindowsCount(_newWindowsCount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         setPriceImpactWindowsDuration(_newWindowsDuration: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         setProtectionCloseFactorBlocks(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
         setProtectionCloseFactorWhitelist(_traders: PromiseOrValue<string>[], _whitelisted: PromiseOrValue<boolean>[], overrides?: CallOverrides): Promise<void>;
         setProtectionCloseFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactors: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
         setUserPriceImpact(_traders: PromiseOrValue<string>[], _pairIndices: PromiseOrValue<BigNumberish>[], _cumulVolPriceImpactMultipliers: PromiseOrValue<BigNumberish>[], _fixedSpreadPs: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
+        updatePairOiAfterV10(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, _oiDeltaToken: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<void>;
         addCollateral(_collateral: PromiseOrValue<string>, _gToken: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         closePendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<void>;
-        closeTrade(_tradeId: ITradingStorage.IdStruct, _isPnlPositive: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<void>;
+        closeTrade(_tradeId: ITradingStorage.IdStruct, _isPnlPositive: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         getAllPendingOrders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.PendingOrderStructOutput[]>;
         getAllPendingOrdersForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.PendingOrderStructOutput[]>;
         getAllTradeInfos(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeInfoStructOutput[]>;
@@ -5248,6 +6716,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getPendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<ITradingStorage.PendingOrderStructOutput>;
         getPendingOrders(_user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<ITradingStorage.PendingOrderStructOutput[]>;
         getTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeStructOutput>;
+        getTradeContractsVersion(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<number>;
         getTradeInfo(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeInfoStructOutput>;
         getTradeInfos(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<ITradingStorage.TradeInfoStructOutput[]>;
         getTradeLiquidationParams(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput>;
@@ -5263,13 +6732,12 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         isCollateralGns(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>;
         isCollateralListed(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>;
         storePendingOrder(_pendingOrder: ITradingStorage.PendingOrderStruct, overrides?: CallOverrides): Promise<ITradingStorage.PendingOrderStructOutput>;
-        storeTrade(_trade: ITradingStorage.TradeStruct, _tradeInfo: ITradingStorage.TradeInfoStruct, overrides?: CallOverrides): Promise<ITradingStorage.TradeStructOutput>;
+        storeTrade(_trade: ITradingStorage.TradeStruct, _tradeInfo: ITradingStorage.TradeInfoStruct, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeStructOutput>;
         toggleCollateralActiveState(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateGToken(_collateral: PromiseOrValue<string>, _gToken: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         updateOpenOrderDetails(_tradeId: ITradingStorage.IdStruct, _openPrice: PromiseOrValue<BigNumberish>, _tp: PromiseOrValue<BigNumberish>, _sl: PromiseOrValue<BigNumberish>, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
-        updateTradeCollateralAmount(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateTradeMaxClosingSlippageP(_tradeId: ITradingStorage.IdStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
-        updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, _isPartialIncrease: PromiseOrValue<boolean>, _isPnlPositive: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<void>;
+        updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, _pendingOrderType: PromiseOrValue<BigNumberish>, _positionSizeTokenDelta: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateTradeSl(_tradeId: ITradingStorage.IdStruct, _newSl: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateTradeTp(_tradeId: ITradingStorage.IdStruct, _newTp: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateTradingActivated(_activated: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
@@ -5292,6 +6760,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         increasePositionSize(_index: PromiseOrValue<BigNumberish>, _collateralDelta: PromiseOrValue<BigNumberish>, _leverageDelta: PromiseOrValue<BigNumberish>, _expectedPrice: PromiseOrValue<BigNumberish>, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         increasePositionSizeNative(_index: PromiseOrValue<BigNumberish>, _collateralDelta: PromiseOrValue<BigNumberish>, _leverageDelta: PromiseOrValue<BigNumberish>, _expectedPrice: PromiseOrValue<BigNumberish>, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         initializeTrading(_marketOrdersTimeoutBlocks: PromiseOrValue<BigNumberish>, _usersByPassTriggerLink: PromiseOrValue<string>[], overrides?: CallOverrides): Promise<void>;
+        initiateManualNegativePnlRealization(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _isHoldingFees: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<void>;
         isWrappedNativeToken(_token: PromiseOrValue<string>, overrides?: CallOverrides): Promise<boolean>;
         openTrade(_trade: ITradingStorage.TradeStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, _referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         openTradeNative(_trade: ITradingStorage.TradeStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, _referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
@@ -5306,6 +6775,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateOpenOrder(_index: PromiseOrValue<BigNumberish>, _triggerPrice: PromiseOrValue<BigNumberish>, _tp: PromiseOrValue<BigNumberish>, _sl: PromiseOrValue<BigNumberish>, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateSl(_index: PromiseOrValue<BigNumberish>, _newSl: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateTp(_index: PromiseOrValue<BigNumberish>, _newTp: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        withdrawPositivePnl(_index: PromiseOrValue<BigNumberish>, _amountCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         claimPendingGovFees(overrides?: CallOverrides): Promise<void>;
         closeTradeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
         decreasePositionSizeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
@@ -5316,28 +6786,28 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         increasePositionSizeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
         initializeCallbacks(_vaultClosingFeeP: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         initializeTreasuryAddress(_treasury: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
+        manualHoldingFeesRealizationCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
+        manualNegativePnlRealizationCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
         openTradeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
+        pnlWithdrawalCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
         updateLeverageCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
         updateTreasuryAddress(_treasury: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         updateVaultClosingFeeP(_valueP: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
-        validateTriggerCloseOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+        validateTriggerCloseOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             ITradingStorage.TradeStructOutput,
-            number,
             ITradingCallbacks.ValuesStructOutput
         ] & {
             t: ITradingStorage.TradeStructOutput;
-            cancelReason: number;
             v: ITradingCallbacks.ValuesStructOutput;
         }>;
-        validateTriggerOpenOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+        validateTriggerOpenOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             ITradingStorage.TradeStructOutput,
-            number,
             ITradingCallbacks.ValuesStructOutput
         ] & {
             t: ITradingStorage.TradeStructOutput;
-            cancelReason: number;
             v: ITradingCallbacks.ValuesStructOutput;
         }>;
+        borrowingParamUpdateCallback(_paramUpdate: IFundingFees.PendingParamUpdateStruct, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         getAllBorrowingPairs(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             IBorrowingFees.BorrowingDataStructOutput[],
             IBorrowingFees.OpenInterestStructOutput[],
@@ -5367,8 +6837,8 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getBorrowingPairFeePerBlockCaps(_collateralIndex: PromiseOrValue<BigNumberish>, _indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IBorrowingFees.BorrowingFeePerBlockCapStructOutput[]>;
         getBorrowingPairGroupIndex(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<number>;
         getBorrowingPairGroups(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IBorrowingFees.BorrowingPairGroupStructOutput[]>;
-        getBorrowingPairOi(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IBorrowingFees.OpenInterestStructOutput>;
-        getBorrowingPairPendingAccFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+        getBorrowingPairOiBeforeV10(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IBorrowingFees.OpenInterestStructOutput>;
+        getBorrowingPairPendingAccFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentBlock: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             BigNumber,
             BigNumber,
             BigNumber,
@@ -5381,8 +6851,8 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         }>;
         getPairMaxOi(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getPairMaxOiCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        getPairOiCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
-        getPairOisCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+        getPairOiBeforeV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPairOisBeforeV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             BigNumber,
             BigNumber
         ] & {
@@ -5391,15 +6861,16 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         }>;
         getTradeBorrowingFee(_input: IBorrowingFees.BorrowingFeeInputStruct, overrides?: CallOverrides): Promise<BigNumber>;
         getTradeLiquidationPrice(_input: IBorrowingFees.LiqPriceInputStruct, overrides?: CallOverrides): Promise<BigNumber>;
-        handleTradeBorrowingCallback(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<void>;
+        handleTradeBorrowingCallback(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         initializeBorrowingFeePerBlockCap(_feePerBlockCap: IBorrowingFees.BorrowingFeePerBlockCapStruct, overrides?: CallOverrides): Promise<void>;
-        resetTradeBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<void>;
+        resetTradeBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         setBorrowingFeePerBlockCap(_feePerBlockCap: IBorrowingFees.BorrowingFeePerBlockCapStruct, overrides?: CallOverrides): Promise<void>;
         setBorrowingGroupParams(_collateralIndex: PromiseOrValue<BigNumberish>, _groupIndex: PromiseOrValue<BigNumberish>, _value: IBorrowingFees.BorrowingGroupParamsStruct, overrides?: CallOverrides): Promise<void>;
         setBorrowingGroupParamsArray(_collateralIndex: PromiseOrValue<BigNumberish>, _indices: PromiseOrValue<BigNumberish>[], _values: IBorrowingFees.BorrowingGroupParamsStruct[], overrides?: CallOverrides): Promise<void>;
         setBorrowingPairFeePerBlockCapArray(_collateralIndex: PromiseOrValue<BigNumberish>, _indices: PromiseOrValue<BigNumberish>[], _values: IBorrowingFees.BorrowingFeePerBlockCapStruct[], overrides?: CallOverrides): Promise<void>;
         setBorrowingPairParams(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _value: IBorrowingFees.BorrowingPairParamsStruct, overrides?: CallOverrides): Promise<void>;
         setBorrowingPairParamsArray(_collateralIndex: PromiseOrValue<BigNumberish>, _indices: PromiseOrValue<BigNumberish>[], _values: IBorrowingFees.BorrowingPairParamsStruct[], overrides?: CallOverrides): Promise<void>;
+        updatePairOiBeforeV10(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _increase: PromiseOrValue<boolean>, _amountCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         withinMaxBorrowingGroupOi(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>;
         addOracle(_a: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         claimBackLink(overrides?: CallOverrides): Promise<void>;
@@ -5415,7 +6886,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getLimitJobCount(overrides?: CallOverrides): Promise<number>;
         getLimitJobId(overrides?: CallOverrides): Promise<string>;
         getLimitJobIndex(overrides?: CallOverrides): Promise<BigNumber>;
-        getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _isCounterTrade: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
         getLinkUsdPriceFeed(overrides?: CallOverrides): Promise<string>;
         getMarketJobId(overrides?: CallOverrides): Promise<string>;
         getMaxLookbackDeviationP(overrides?: CallOverrides): Promise<number>;
@@ -5423,8 +6894,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getMinAnswers(overrides?: CallOverrides): Promise<number>;
         getOracle(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>;
         getOracles(overrides?: CallOverrides): Promise<string[]>;
+        getParamUpdateJobId(overrides?: CallOverrides): Promise<string>;
         getPendingRequest(_id: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<string>;
-        getPrice(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _pendingOrder: ITradingStorage.PendingOrderStruct, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _fromBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.IdStructOutput>;
+        getPrice(_input: IPriceAggregator.GetPriceInputStruct, overrides?: CallOverrides): Promise<ITradingStorage.IdStructOutput>;
         getPriceAggregatorOrder(_requestId: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<IPriceAggregator.OrderStructOutput>;
         getPriceAggregatorOrderAnswers(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<IPriceAggregator.OrderAnswerStructOutput[]>;
         getRequestCount(overrides?: CallOverrides): Promise<BigNumber>;
@@ -5432,6 +6904,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getUsdNormalizedValue(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralValue: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         initializeLimitJobCount(_limitJobCount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         initializeMaxDeviationsP(_maxMarketDeviationP: PromiseOrValue<BigNumberish>, _maxLookbackDeviationP: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        initializeParamUpdateJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<void>;
         initializePriceAggregator(_linkToken: PromiseOrValue<string>, _linkUsdPriceFeed: PromiseOrValue<string>, _twapInterval: PromiseOrValue<BigNumberish>, _minAnswers: PromiseOrValue<BigNumberish>, _nodes: PromiseOrValue<string>[], _jobIds: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>], _collateralIndices: PromiseOrValue<BigNumberish>[], _gnsCollateralLiquidityPools: IPriceAggregator.LiquidityPoolInputStruct[], _collateralUsdPriceFeeds: PromiseOrValue<string>[], overrides?: CallOverrides): Promise<void>;
         removeOracle(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         replaceOracle(_index: PromiseOrValue<BigNumberish>, _a: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
@@ -5440,6 +6913,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setMarketJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<void>;
         setMaxLookbackDeviationP(_maxLookbackDeviationP: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         setMaxMarketDeviationP(_maxMarketDeviationP: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        setParamUpdateJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<void>;
         updateCollateralGnsLiquidityPool(_collateralIndex: PromiseOrValue<BigNumberish>, _liquidityPoolInput: IPriceAggregator.LiquidityPoolInputStruct, overrides?: CallOverrides): Promise<void>;
         updateCollateralUsdPriceFeed(_collateralIndex: PromiseOrValue<BigNumberish>, _value: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         updateLinkUsdPriceFeed(_value: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
@@ -5459,6 +6933,60 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeChainConfig(_nativeTransferGasLimit: PromiseOrValue<BigNumberish>, _nativeTransferEnabled: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<void>;
         updateNativeTransferEnabled(_nativeTransferEnabled: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<void>;
         updateNativeTransferGasLimit(_nativeTransferGasLimit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        downscaleTradeFeesData(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateralDelta: PromiseOrValue<BigNumberish>, _existingPositionSizeCollateral: PromiseOrValue<BigNumberish>, _newCollateralAmount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        getMaxSkewCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPairBorrowingFeeData(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IFundingFees.PairBorrowingFeeDataStructOutput[]>;
+        getPairBorrowingFeeParams(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IFundingFees.BorrowingFeeParamsStructOutput[]>;
+        getPairFundingFeeData(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IFundingFees.PairFundingFeeDataStructOutput[]>;
+        getPairFundingFeeParams(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IFundingFees.FundingFeeParamsStructOutput[]>;
+        getPairGlobalParamsArray(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IFundingFees.PairGlobalParamsStructOutput[]>;
+        getPairPendingAccBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPairPendingAccFundingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+            BigNumber,
+            BigNumber,
+            BigNumber
+        ] & {
+            accFundingFeeLongP: BigNumber;
+            accFundingFeeShortP: BigNumber;
+            currentFundingRatePerSecondP: BigNumber;
+        }>;
+        getPendingParamUpdates(_index: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IFundingFees.PendingParamUpdateStructOutput[]>;
+        getTradeBorrowingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradeFeesData(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IFundingFees.TradeFeesDataStructOutput>;
+        getTradeFeesDataArray(_trader: PromiseOrValue<string>[], _index: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IFundingFees.TradeFeesDataStructOutput[]>;
+        getTradeFundingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradeManuallyRealizedNegativePnlCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradePendingHoldingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IFundingFees.TradeHoldingFeesStructOutput>;
+        getTradeRealizedPnlCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+            BigNumber,
+            BigNumber,
+            BigNumber
+        ] & {
+            realizedPnlCollateral: BigNumber;
+            realizedTradingFeesCollateral: BigNumber;
+            totalRealizedPnlCollateral: BigNumber;
+        }>;
+        getTradeRealizedTradingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradeUiRealizedPnlDataArray(_trader: PromiseOrValue<string>[], _index: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IFundingFees.UiRealizedPnlDataStructOutput[]>;
+        pendingParamUpdateCallback(_answer: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
+        realizeHoldingFeesOnOpenTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        realizePnlOnOpenTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _pnlCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        realizeTradingFeesOnOpenTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _feesCollateral: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        requestParamUpdate(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _updateType: PromiseOrValue<BigNumberish>, _newValue: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        setAbsoluteRatePerSecondCap(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _absoluteRatePerSecondCap: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
+        setAbsoluteVelocityPerYearCap(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _absoluteVelocityPerYearCap: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
+        setAprMultiplierEnabled(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _aprMultiplierEnabled: PromiseOrValue<boolean>[], overrides?: CallOverrides): Promise<void>;
+        setBorrowingRatePerSecondP(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _borrowingRatePerSecondP: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
+        setFundingFeesEnabled(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _fundingFeesEnabled: PromiseOrValue<boolean>[], overrides?: CallOverrides): Promise<void>;
+        setMaxSkewCollateral(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _maxSkewCollateral: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
+        setSkewCoefficientPerYear(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _skewCoefficientPerYear: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
+        setThetaThresholdUsd(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _thetaThresholdUsd: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
+        storeAlreadyTransferredNegativePnl(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _deltaCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        storeManuallyRealizedNegativePnlCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _amountCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        storeTradeInitialAccFees(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        storeUiPnlWithdrawnCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _deltaCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        storeUiRealizedPnlPartialCloseCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _deltaCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        storeVirtualAvailableCollateralInDiamond(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _newTradeCollateralAmount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
     };
     filters: {
         "AccessControlUpdated(address,uint8,bool)"(target?: null, role?: null, access?: null): AccessControlUpdatedEventFilter;
@@ -5469,6 +6997,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         DiamondCut(_diamondCut?: null, _init?: null, _calldata?: null): DiamondCutEventFilter;
         "Initialized(uint8)"(version?: null): InitializedEventFilter;
         Initialized(version?: null): InitializedEventFilter;
+        "CounterTradeFeeRateMultiplierUpdated(uint16,uint16)"(pairIndex?: PromiseOrValue<BigNumberish> | null, newValue?: null): CounterTradeFeeRateMultiplierUpdatedEventFilter;
+        CounterTradeFeeRateMultiplierUpdated(pairIndex?: PromiseOrValue<BigNumberish> | null, newValue?: null): CounterTradeFeeRateMultiplierUpdatedEventFilter;
+        "CounterTradeMaxLeverageUpdated(uint16,uint24)"(pairIndex?: PromiseOrValue<BigNumberish> | null, newValue?: null): CounterTradeMaxLeverageUpdatedEventFilter;
+        CounterTradeMaxLeverageUpdated(pairIndex?: PromiseOrValue<BigNumberish> | null, newValue?: null): CounterTradeMaxLeverageUpdatedEventFilter;
         "FeeAdded(uint256,tuple)"(index?: null, feeGroup?: null): FeeAddedEventFilter;
         FeeAdded(index?: null, feeGroup?: null): FeeAddedEventFilter;
         "FeeUpdated(uint256,tuple)"(index?: null, feeGroup?: null): FeeUpdatedEventFilter;
@@ -5549,6 +7081,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         OiWindowsSettingsInitialized(windowsDuration?: PromiseOrValue<BigNumberish> | null, windowsCount?: PromiseOrValue<BigNumberish> | null): OiWindowsSettingsInitializedEventFilter;
         "OnePercentDepthUpdated(uint256,uint128,uint128)"(pairIndex?: PromiseOrValue<BigNumberish> | null, valueAboveUsd?: null, valueBelowUsd?: null): OnePercentDepthUpdatedEventFilter;
         OnePercentDepthUpdated(pairIndex?: PromiseOrValue<BigNumberish> | null, valueAboveUsd?: null, valueBelowUsd?: null): OnePercentDepthUpdatedEventFilter;
+        "OnePercentSkewDepthUpdated(uint8,uint16,uint256)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, newValue?: null): OnePercentSkewDepthUpdatedEventFilter;
+        OnePercentSkewDepthUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, newValue?: null): OnePercentSkewDepthUpdatedEventFilter;
+        "PairOiAfterV10Updated(uint8,uint16,uint256,uint256,bool,bool,tuple,tuple)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, oiDeltaCollateral?: null, oiDeltaToken?: null, open?: null, long?: null, newOiCollateral?: null, newOiToken?: null): PairOiAfterV10UpdatedEventFilter;
+        PairOiAfterV10Updated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, oiDeltaCollateral?: null, oiDeltaToken?: null, open?: null, long?: null, newOiCollateral?: null, newOiToken?: null): PairOiAfterV10UpdatedEventFilter;
         "PriceImpactOiTransferredPair(uint256,tuple)"(pairIndex?: PromiseOrValue<BigNumberish> | null, totalPairOi?: null): PriceImpactOiTransferredPairEventFilter;
         PriceImpactOiTransferredPair(pairIndex?: PromiseOrValue<BigNumberish> | null, totalPairOi?: null): PriceImpactOiTransferredPairEventFilter;
         "PriceImpactOiTransferredPairs(uint256,uint256,uint256,uint256)"(pairsCount?: null, prevCurrentWindowId?: null, prevEarliestWindowId?: null, newCurrentWindowId?: null): PriceImpactOiTransferredPairsEventFilter;
@@ -5587,8 +7123,8 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         TradeCollateralUpdated(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, collateralAmount?: null): TradeCollateralUpdatedEventFilter;
         "TradeMaxClosingSlippagePUpdated(address,uint32,uint16)"(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, maxClosingSlippageP?: null): TradeMaxClosingSlippagePUpdatedEventFilter;
         TradeMaxClosingSlippagePUpdated(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, maxClosingSlippageP?: null): TradeMaxClosingSlippagePUpdatedEventFilter;
-        "TradePositionUpdated(address,uint32,uint120,uint24,uint64,uint64,uint64,bool,bool)"(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, collateralAmount?: null, leverage?: null, openPrice?: null, newTp?: null, newSl?: null, isPartialIncrease?: null, isPnlPositive?: null): TradePositionUpdatedEventFilter;
-        TradePositionUpdated(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, collateralAmount?: null, leverage?: null, openPrice?: null, newTp?: null, newSl?: null, isPartialIncrease?: null, isPnlPositive?: null): TradePositionUpdatedEventFilter;
+        "TradePositionUpdated(address,uint32,uint120,uint24,uint64,uint64,uint160,uint8,bool)"(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, collateralAmount?: null, leverage?: null, openPrice?: null, newSl?: null, newPositionSizeToken?: null, pendingOrderType?: null, isPnlPositive?: null): TradePositionUpdatedEventFilter;
+        TradePositionUpdated(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, collateralAmount?: null, leverage?: null, openPrice?: null, newSl?: null, newPositionSizeToken?: null, pendingOrderType?: null, isPnlPositive?: null): TradePositionUpdatedEventFilter;
         "TradeSlUpdated(address,uint32,uint64)"(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, newSl?: null): TradeSlUpdatedEventFilter;
         TradeSlUpdated(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, newSl?: null): TradeSlUpdatedEventFilter;
         "TradeStored(address,uint32,tuple,tuple,tuple)"(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, trade?: null, tradeInfo?: null, liquidationParams?: null): TradeStoredEventFilter;
@@ -5607,12 +7143,16 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         ByPassTriggerLinkUpdated(user?: PromiseOrValue<string> | null, bypass?: null): ByPassTriggerLinkUpdatedEventFilter;
         "ChainlinkCallbackTimeout(tuple,uint256)"(pendingOrderId?: null, pairIndex?: PromiseOrValue<BigNumberish> | null): ChainlinkCallbackTimeoutEventFilter;
         ChainlinkCallbackTimeout(pendingOrderId?: null, pairIndex?: PromiseOrValue<BigNumberish> | null): ChainlinkCallbackTimeoutEventFilter;
+        "CollateralReturnedAfterTimeout(tuple,uint8,address,uint256)"(pendingOrderId?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, collateralAmount?: null): CollateralReturnedAfterTimeoutEventFilter;
+        CollateralReturnedAfterTimeout(pendingOrderId?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, collateralAmount?: null): CollateralReturnedAfterTimeoutEventFilter;
         "CouldNotCloseTrade(address,uint16,uint32)"(trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: PromiseOrValue<BigNumberish> | null): CouldNotCloseTradeEventFilter;
         CouldNotCloseTrade(trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: PromiseOrValue<BigNumberish> | null): CouldNotCloseTradeEventFilter;
         "LeverageUpdateExecuted(tuple,bool,uint8,uint8,address,uint256,uint256,uint256,uint256,tuple)"(orderId?: null, isIncrease?: null, cancelReason?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: null, index?: PromiseOrValue<BigNumberish> | null, oraclePrice?: null, collateralDelta?: null, values?: null): LeverageUpdateExecutedEventFilter;
         LeverageUpdateExecuted(orderId?: null, isIncrease?: null, cancelReason?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: null, index?: PromiseOrValue<BigNumberish> | null, oraclePrice?: null, collateralDelta?: null, values?: null): LeverageUpdateExecutedEventFilter;
         "LeverageUpdateInitiated(tuple,address,uint256,uint256,bool,uint256)"(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: PromiseOrValue<BigNumberish> | null, isIncrease?: null, newLeverage?: null): LeverageUpdateInitiatedEventFilter;
         LeverageUpdateInitiated(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: PromiseOrValue<BigNumberish> | null, isIncrease?: null, newLeverage?: null): LeverageUpdateInitiatedEventFilter;
+        "ManualNegativePnlRealizationInitiated(tuple,address,uint32,bool)"(orderId?: null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, isHoldingFeesRealization?: null): ManualNegativePnlRealizationInitiatedEventFilter;
+        ManualNegativePnlRealizationInitiated(orderId?: null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, isHoldingFeesRealization?: null): ManualNegativePnlRealizationInitiatedEventFilter;
         "MarketOrderInitiated(tuple,address,uint16,bool)"(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, open?: null): MarketOrderInitiatedEventFilter;
         MarketOrderInitiated(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, open?: null): MarketOrderInitiatedEventFilter;
         "MarketOrdersTimeoutBlocksUpdated(uint256)"(newValueBlocks?: null): MarketOrdersTimeoutBlocksUpdatedEventFilter;
@@ -5631,28 +7171,40 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         PositionSizeIncreaseExecuted(orderId?: null, cancelReason?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: null, index?: PromiseOrValue<BigNumberish> | null, long?: null, oraclePrice?: null, collateralPriceUsd?: null, collateralDelta?: null, leverageDelta?: null, values?: null): PositionSizeIncreaseExecutedEventFilter;
         "PositionSizeUpdateInitiated(tuple,address,uint256,uint256,bool,uint256,uint256)"(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: PromiseOrValue<BigNumberish> | null, isIncrease?: null, collateralDelta?: null, leverageDelta?: null): PositionSizeUpdateInitiatedEventFilter;
         PositionSizeUpdateInitiated(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: PromiseOrValue<BigNumberish> | null, isIncrease?: null, collateralDelta?: null, leverageDelta?: null): PositionSizeUpdateInitiatedEventFilter;
+        "PositivePnlWithdrawalInitiated(tuple,address,uint32,uint256)"(orderId?: null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): PositivePnlWithdrawalInitiatedEventFilter;
+        PositivePnlWithdrawalInitiated(orderId?: null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): PositivePnlWithdrawalInitiatedEventFilter;
         "TriggerOrderInitiated(tuple,address,uint16,bool)"(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, byPassesLinkCost?: null): TriggerOrderInitiatedEventFilter;
         TriggerOrderInitiated(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, byPassesLinkCost?: null): TriggerOrderInitiatedEventFilter;
-        "BorrowingFeeCharged(address,uint32,uint8,uint256)"(trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, collateralIndex?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): BorrowingFeeChargedEventFilter;
-        BorrowingFeeCharged(trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, collateralIndex?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): BorrowingFeeChargedEventFilter;
+        "CounterTradeCollateralReturned(tuple,uint8,address,uint256)"(orderId?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, collateralReturned?: null): CounterTradeCollateralReturnedEventFilter;
+        CounterTradeCollateralReturned(orderId?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, collateralReturned?: null): CounterTradeCollateralReturnedEventFilter;
+        "FeesProcessed(uint8,address,uint256,uint8,uint256)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, positionSizeCollateral?: null, orderType?: null, totalFeesCollateral?: null): FeesProcessedEventFilter;
+        FeesProcessed(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, positionSizeCollateral?: null, orderType?: null, totalFeesCollateral?: null): FeesProcessedEventFilter;
         "GTokenFeeCharged(address,uint8,uint256)"(trader?: PromiseOrValue<string> | null, collateralIndex?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): GTokenFeeChargedEventFilter;
         GTokenFeeCharged(trader?: PromiseOrValue<string> | null, collateralIndex?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): GTokenFeeChargedEventFilter;
         "GnsOtcFeeCharged(address,uint8,uint256)"(trader?: PromiseOrValue<string> | null, collateralIndex?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): GnsOtcFeeChargedEventFilter;
         GnsOtcFeeCharged(trader?: PromiseOrValue<string> | null, collateralIndex?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): GnsOtcFeeChargedEventFilter;
         "GovFeeCharged(address,uint8,uint256)"(trader?: PromiseOrValue<string> | null, collateralIndex?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): GovFeeChargedEventFilter;
         GovFeeCharged(trader?: PromiseOrValue<string> | null, collateralIndex?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): GovFeeChargedEventFilter;
-        "LimitExecuted(tuple,address,uint32,uint32,tuple,address,uint8,uint256,uint256,uint256,uint256,int256,uint256,uint256,bool)"(orderId?: null, user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, limitIndex?: PromiseOrValue<BigNumberish> | null, t?: null, triggerCaller?: null, orderType?: null, oraclePrice?: null, marketPrice?: null, liqPrice?: null, priceImpactP?: null, percentProfit?: null, amountSentToTrader?: null, collateralPriceUsd?: null, exactExecution?: null): LimitExecutedEventFilter;
-        LimitExecuted(orderId?: null, user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, limitIndex?: PromiseOrValue<BigNumberish> | null, t?: null, triggerCaller?: null, orderType?: null, oraclePrice?: null, marketPrice?: null, liqPrice?: null, priceImpactP?: null, percentProfit?: null, amountSentToTrader?: null, collateralPriceUsd?: null, exactExecution?: null): LimitExecutedEventFilter;
+        "LimitExecuted(tuple,address,uint32,uint32,tuple,address,uint8,uint256,uint256,uint256,tuple,int256,uint256,uint256,bool)"(orderId?: null, user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, limitIndex?: PromiseOrValue<BigNumberish> | null, t?: null, triggerCaller?: null, orderType?: null, oraclePrice?: null, marketPrice?: null, liqPrice?: null, priceImpact?: null, percentProfit?: null, amountSentToTrader?: null, collateralPriceUsd?: null, exactExecution?: null): LimitExecutedEventFilter;
+        LimitExecuted(orderId?: null, user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, limitIndex?: PromiseOrValue<BigNumberish> | null, t?: null, triggerCaller?: null, orderType?: null, oraclePrice?: null, marketPrice?: null, liqPrice?: null, priceImpact?: null, percentProfit?: null, amountSentToTrader?: null, collateralPriceUsd?: null, exactExecution?: null): LimitExecutedEventFilter;
         "MarketCloseCanceled(tuple,address,uint256,uint256,uint8)"(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: PromiseOrValue<BigNumberish> | null, cancelReason?: null): MarketCloseCanceledEventFilter;
         MarketCloseCanceled(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: PromiseOrValue<BigNumberish> | null, cancelReason?: null): MarketCloseCanceledEventFilter;
-        "MarketExecuted(tuple,address,uint32,tuple,bool,uint256,uint256,uint256,uint256,int256,uint256,uint256)"(orderId?: null, user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, t?: null, open?: null, oraclePrice?: null, marketPrice?: null, liqPrice?: null, priceImpactP?: null, percentProfit?: null, amountSentToTrader?: null, collateralPriceUsd?: null): MarketExecutedEventFilter;
-        MarketExecuted(orderId?: null, user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, t?: null, open?: null, oraclePrice?: null, marketPrice?: null, liqPrice?: null, priceImpactP?: null, percentProfit?: null, amountSentToTrader?: null, collateralPriceUsd?: null): MarketExecutedEventFilter;
-        "MarketOpenCanceled(tuple,address,uint256,uint8)"(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, cancelReason?: null): MarketOpenCanceledEventFilter;
-        MarketOpenCanceled(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, cancelReason?: null): MarketOpenCanceledEventFilter;
+        "MarketExecuted(tuple,address,uint32,tuple,bool,uint256,uint256,uint256,tuple,int256,uint256,uint256)"(orderId?: null, user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, t?: null, open?: null, oraclePrice?: null, marketPrice?: null, liqPrice?: null, priceImpact?: null, percentProfit?: null, amountSentToTrader?: null, collateralPriceUsd?: null): MarketExecutedEventFilter;
+        MarketExecuted(orderId?: null, user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, t?: null, open?: null, oraclePrice?: null, marketPrice?: null, liqPrice?: null, priceImpact?: null, percentProfit?: null, amountSentToTrader?: null, collateralPriceUsd?: null): MarketExecutedEventFilter;
+        "MarketOpenCanceled(tuple,address,uint256,uint8,uint256)"(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, cancelReason?: null, collateralReturned?: null): MarketOpenCanceledEventFilter;
+        MarketOpenCanceled(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, cancelReason?: null, collateralReturned?: null): MarketOpenCanceledEventFilter;
         "PendingGovFeesClaimed(uint8,uint256)"(collateralIndex?: null, amountCollateral?: null): PendingGovFeesClaimedEventFilter;
         PendingGovFeesClaimed(collateralIndex?: null, amountCollateral?: null): PendingGovFeesClaimedEventFilter;
         "ReferralFeeCharged(address,uint8,uint256)"(trader?: PromiseOrValue<string> | null, collateralIndex?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): ReferralFeeChargedEventFilter;
         ReferralFeeCharged(trader?: PromiseOrValue<string> | null, collateralIndex?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): ReferralFeeChargedEventFilter;
+        "TradeHoldingFeesManuallyRealized(tuple,uint8,address,uint32,uint256)"(orderId?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, currentPairPrice?: null): TradeHoldingFeesManuallyRealizedEventFilter;
+        TradeHoldingFeesManuallyRealized(orderId?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, currentPairPrice?: null): TradeHoldingFeesManuallyRealizedEventFilter;
+        "TradeNegativePnlManuallyRealized(tuple,uint8,address,uint32,uint256,uint256,uint256,uint256)"(orderId?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, negativePnlCollateral?: null, existingManuallyRealizedNegativePnlCollateral?: null, newManuallyRealizedNegativePnlCollateral?: null, currentPairPrice?: null): TradeNegativePnlManuallyRealizedEventFilter;
+        TradeNegativePnlManuallyRealized(orderId?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, negativePnlCollateral?: null, existingManuallyRealizedNegativePnlCollateral?: null, newManuallyRealizedNegativePnlCollateral?: null, currentPairPrice?: null): TradeNegativePnlManuallyRealizedEventFilter;
+        "TradePositivePnlWithdrawn(tuple,uint8,address,uint32,tuple,int256,int256,uint256,uint256,uint256)"(orderId?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, priceImpact?: null, pnlPercent?: null, withdrawablePositivePnlCollateral?: null, currentPairPrice?: null, pnlInputCollateral?: null, pnlWithdrawnCollateral?: null): TradePositivePnlWithdrawnEventFilter;
+        TradePositivePnlWithdrawn(orderId?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, priceImpact?: null, pnlPercent?: null, withdrawablePositivePnlCollateral?: null, currentPairPrice?: null, pnlInputCollateral?: null, pnlWithdrawnCollateral?: null): TradePositivePnlWithdrawnEventFilter;
+        "TradeValueTransferred(uint8,address,uint32,int256,int256)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, collateralSentToTrader?: null, availableCollateralInDiamond?: null): TradeValueTransferredEventFilter;
+        TradeValueTransferred(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, collateralSentToTrader?: null, availableCollateralInDiamond?: null): TradeValueTransferredEventFilter;
         "TriggerFeeCharged(address,uint8,uint256)"(trader?: PromiseOrValue<string> | null, collateralIndex?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): TriggerFeeChargedEventFilter;
         TriggerFeeCharged(trader?: PromiseOrValue<string> | null, collateralIndex?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): TriggerFeeChargedEventFilter;
         "TriggerOrderCanceled(tuple,address,uint8,uint8)"(orderId?: null, triggerCaller?: PromiseOrValue<string> | null, orderType?: null, cancelReason?: null): TriggerOrderCanceledEventFilter;
@@ -5667,20 +7219,20 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         BorrowingGroupOiUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, groupIndex?: PromiseOrValue<BigNumberish> | null, long?: null, increase?: null, delta?: null, newOiLong?: null, newOiShort?: null): BorrowingGroupOiUpdatedEventFilter;
         "BorrowingGroupUpdated(uint8,uint16,uint32,uint72,uint48)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, groupIndex?: PromiseOrValue<BigNumberish> | null, feePerBlock?: null, maxOi?: null, feeExponent?: null): BorrowingGroupUpdatedEventFilter;
         BorrowingGroupUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, groupIndex?: PromiseOrValue<BigNumberish> | null, feePerBlock?: null, maxOi?: null, feeExponent?: null): BorrowingGroupUpdatedEventFilter;
-        "BorrowingInitialAccFeesStored(uint8,address,uint16,uint32,bool,uint64,uint64)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, long?: null, initialPairAccFee?: null, initialGroupAccFee?: null): BorrowingInitialAccFeesStoredEventFilter;
-        BorrowingInitialAccFeesStored(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, long?: null, initialPairAccFee?: null, initialGroupAccFee?: null): BorrowingInitialAccFeesStoredEventFilter;
-        "BorrowingPairAccFeesUpdated(uint8,uint16,uint256,uint64,uint64)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, currentBlock?: null, accFeeLong?: null, accFeeShort?: null): BorrowingPairAccFeesUpdatedEventFilter;
-        BorrowingPairAccFeesUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, currentBlock?: null, accFeeLong?: null, accFeeShort?: null): BorrowingPairAccFeesUpdatedEventFilter;
+        "BorrowingInitialAccFeesStored(uint8,address,uint16,uint32,bool,uint256,uint64,uint64)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, long?: null, currentPairPrice?: null, initialPairAccFee?: null, initialGroupAccFee?: null): BorrowingInitialAccFeesStoredEventFilter;
+        BorrowingInitialAccFeesStored(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, long?: null, currentPairPrice?: null, initialPairAccFee?: null, initialGroupAccFee?: null): BorrowingInitialAccFeesStoredEventFilter;
+        "BorrowingPairAccFeesUpdated(uint8,uint16,uint256,uint256,uint64,uint64)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, currentBlock?: null, currentPairPrice?: null, accFeeLong?: null, accFeeShort?: null): BorrowingPairAccFeesUpdatedEventFilter;
+        BorrowingPairAccFeesUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, currentBlock?: null, currentPairPrice?: null, accFeeLong?: null, accFeeShort?: null): BorrowingPairAccFeesUpdatedEventFilter;
         "BorrowingPairFeePerBlockCapUpdated(uint8,uint16,uint32,uint32)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, minP?: null, maxP?: null): BorrowingPairFeePerBlockCapUpdatedEventFilter;
         BorrowingPairFeePerBlockCapUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, minP?: null, maxP?: null): BorrowingPairFeePerBlockCapUpdatedEventFilter;
         "BorrowingPairGroupUpdated(uint8,uint16,uint16,uint16)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, prevGroupIndex?: null, newGroupIndex?: null): BorrowingPairGroupUpdatedEventFilter;
         BorrowingPairGroupUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, prevGroupIndex?: null, newGroupIndex?: null): BorrowingPairGroupUpdatedEventFilter;
-        "BorrowingPairOiUpdated(uint8,uint16,bool,bool,uint72,uint72,uint72)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, long?: null, increase?: null, delta?: null, newOiLong?: null, newOiShort?: null): BorrowingPairOiUpdatedEventFilter;
-        BorrowingPairOiUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, long?: null, increase?: null, delta?: null, newOiLong?: null, newOiShort?: null): BorrowingPairOiUpdatedEventFilter;
+        "BorrowingPairOiBeforeV10Updated(uint8,uint16,bool,bool,uint72,uint72,uint72)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, long?: null, increase?: null, delta?: null, newOiLong?: null, newOiShort?: null): BorrowingPairOiBeforeV10UpdatedEventFilter;
+        BorrowingPairOiBeforeV10Updated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, long?: null, increase?: null, delta?: null, newOiLong?: null, newOiShort?: null): BorrowingPairOiBeforeV10UpdatedEventFilter;
         "BorrowingPairParamsUpdated(uint8,uint16,uint16,uint32,uint48,uint72)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, groupIndex?: PromiseOrValue<BigNumberish> | null, feePerBlock?: null, feeExponent?: null, maxOi?: null): BorrowingPairParamsUpdatedEventFilter;
         BorrowingPairParamsUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, groupIndex?: PromiseOrValue<BigNumberish> | null, feePerBlock?: null, feeExponent?: null, maxOi?: null): BorrowingPairParamsUpdatedEventFilter;
-        "TradeBorrowingCallbackHandled(uint8,address,uint16,uint32,bool,bool,uint256)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, open?: null, long?: null, positionSizeCollateral?: null): TradeBorrowingCallbackHandledEventFilter;
-        TradeBorrowingCallbackHandled(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, open?: null, long?: null, positionSizeCollateral?: null): TradeBorrowingCallbackHandledEventFilter;
+        "TradeBorrowingCallbackHandled(uint8,address,uint16,uint32,bool,bool,uint256,uint256)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, open?: null, long?: null, currentPairPrice?: null, positionSizeCollateral?: null): TradeBorrowingCallbackHandledEventFilter;
+        TradeBorrowingCallbackHandled(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, open?: null, long?: null, currentPairPrice?: null, positionSizeCollateral?: null): TradeBorrowingCallbackHandledEventFilter;
         "CollateralGnsLiquidityPoolUpdated(uint8,tuple)"(collateralIndex?: null, newValue?: null): CollateralGnsLiquidityPoolUpdatedEventFilter;
         CollateralGnsLiquidityPoolUpdated(collateralIndex?: null, newValue?: null): CollateralGnsLiquidityPoolUpdatedEventFilter;
         "CollateralUsdPriceFeedUpdated(uint8,address)"(collateralIndex?: null, value?: null): CollateralUsdPriceFeedUpdatedEventFilter;
@@ -5707,10 +7259,12 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         OracleRemoved(index?: null, oldOracle?: null): OracleRemovedEventFilter;
         "OracleReplaced(uint256,address,address)"(index?: null, oldOracle?: null, newOracle?: null): OracleReplacedEventFilter;
         OracleReplaced(index?: null, oldOracle?: null, newOracle?: null): OracleReplacedEventFilter;
+        "ParamUpdateJobIdUpdated(bytes32)"(jobId?: null): ParamUpdateJobIdUpdatedEventFilter;
+        ParamUpdateJobIdUpdated(jobId?: null): ParamUpdateJobIdUpdatedEventFilter;
         "PriceReceived(tuple,uint16,bytes32,uint256,bool,bool,bool,bool,tuple[],tuple[])"(orderId?: null, pairIndex?: PromiseOrValue<BigNumberish> | null, request?: null, priceData?: null, isLookback?: null, usedInMedian?: null, minAnswersReached?: null, minFilteredAnswersReached?: null, unfilteredAnswers?: null, filteredAnswers?: null): PriceReceivedEventFilter;
         PriceReceived(orderId?: null, pairIndex?: PromiseOrValue<BigNumberish> | null, request?: null, priceData?: null, isLookback?: null, usedInMedian?: null, minAnswersReached?: null, minFilteredAnswersReached?: null, unfilteredAnswers?: null, filteredAnswers?: null): PriceReceivedEventFilter;
-        "PriceRequested(uint8,uint256,tuple,uint256,bool,bytes32,uint256,uint256)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, pendingOrder?: null, fromBlock?: null, isLookback?: null, job?: null, linkFeePerNode?: null, nodesCount?: null): PriceRequestedEventFilter;
-        PriceRequested(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, pendingOrder?: null, fromBlock?: null, isLookback?: null, job?: null, linkFeePerNode?: null, nodesCount?: null): PriceRequestedEventFilter;
+        "PriceRequested(uint8,uint256,tuple,uint256,uint256,bool,bool,bytes32,uint256,uint256)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, pendingOrder?: null, positionSizeCollateral?: null, fromBlock?: null, isCounterTrade?: null, isLookback?: null, job?: null, linkFeePerNode?: null, nodesCount?: null): PriceRequestedEventFilter;
+        PriceRequested(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, pendingOrder?: null, positionSizeCollateral?: null, fromBlock?: null, isCounterTrade?: null, isLookback?: null, job?: null, linkFeePerNode?: null, nodesCount?: null): PriceRequestedEventFilter;
         "TradingCallbackExecuted(tuple,uint8)"(a?: null, orderType?: null): TradingCallbackExecutedEventFilter;
         TradingCallbackExecuted(a?: null, orderType?: null): TradingCallbackExecutedEventFilter;
         "TwapIntervalUpdated(uint32)"(newValue?: null): TwapIntervalUpdatedEventFilter;
@@ -5725,6 +7279,46 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         NativeTransferEnabledUpdated(enabled?: null): NativeTransferEnabledUpdatedEventFilter;
         "NativeTransferGasLimitUpdated(uint16)"(newLimit?: null): NativeTransferGasLimitUpdatedEventFilter;
         NativeTransferGasLimitUpdated(newLimit?: null): NativeTransferGasLimitUpdatedEventFilter;
+        "AbsoluteRatePerSecondCapUpdated(uint8,uint16,uint24)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, absoluteRatePerSecondCap?: null): AbsoluteRatePerSecondCapUpdatedEventFilter;
+        AbsoluteRatePerSecondCapUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, absoluteRatePerSecondCap?: null): AbsoluteRatePerSecondCapUpdatedEventFilter;
+        "AbsoluteVelocityPerYearCapUpdated(uint8,uint16,uint24)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, absoluteVelocityPerYearCap?: null): AbsoluteVelocityPerYearCapUpdatedEventFilter;
+        AbsoluteVelocityPerYearCapUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, absoluteVelocityPerYearCap?: null): AbsoluteVelocityPerYearCapUpdatedEventFilter;
+        "AlreadyTransferredNegativePnlStored(address,uint32,uint256,uint128)"(trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, deltaCollateral?: null, newAlreadyTransferredNegativePnlCollateral?: null): AlreadyTransferredNegativePnlStoredEventFilter;
+        AlreadyTransferredNegativePnlStored(trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, deltaCollateral?: null, newAlreadyTransferredNegativePnlCollateral?: null): AlreadyTransferredNegativePnlStoredEventFilter;
+        "AprMultiplierEnabledUpdated(uint8,uint16,bool)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, aprMultiplierEnabled?: null): AprMultiplierEnabledUpdatedEventFilter;
+        AprMultiplierEnabledUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, aprMultiplierEnabled?: null): AprMultiplierEnabledUpdatedEventFilter;
+        "BorrowingRatePerSecondPUpdated(uint8,uint16,uint24)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, borrowingRatePerSecondP?: null): BorrowingRatePerSecondPUpdatedEventFilter;
+        BorrowingRatePerSecondPUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, borrowingRatePerSecondP?: null): BorrowingRatePerSecondPUpdatedEventFilter;
+        "FundingFeesEnabledUpdated(uint8,uint16,bool)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, fundingFeesEnabled?: null): FundingFeesEnabledUpdatedEventFilter;
+        FundingFeesEnabledUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, fundingFeesEnabled?: null): FundingFeesEnabledUpdatedEventFilter;
+        "HoldingFeesChargedOnTrade(uint8,address,uint32,uint64,tuple,uint256,uint256,uint256,int256)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, currentPairPrice?: null, tradeHoldingFees?: null, availableCollateralInDiamond?: null, amountSentToVaultCollateral?: null, newRealizedTradingFeesCollateral?: null, newRealizedPnlCollateral?: null): HoldingFeesChargedOnTradeEventFilter;
+        HoldingFeesChargedOnTrade(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, currentPairPrice?: null, tradeHoldingFees?: null, availableCollateralInDiamond?: null, amountSentToVaultCollateral?: null, newRealizedTradingFeesCollateral?: null, newRealizedPnlCollateral?: null): HoldingFeesChargedOnTradeEventFilter;
+        "HoldingFeesRealizedOnTrade(uint8,address,uint32,uint64,tuple,int256)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, currentPairPrice?: null, tradeHoldingFees?: null, newRealizedPnlCollateral?: null): HoldingFeesRealizedOnTradeEventFilter;
+        HoldingFeesRealizedOnTrade(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, currentPairPrice?: null, tradeHoldingFees?: null, newRealizedPnlCollateral?: null): HoldingFeesRealizedOnTradeEventFilter;
+        "ManuallyRealizedNegativePnlCollateralStored(address,uint32,uint128)"(trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, newManuallyRealizedNegativePnlCollateral?: null): ManuallyRealizedNegativePnlCollateralStoredEventFilter;
+        ManuallyRealizedNegativePnlCollateralStored(trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, newManuallyRealizedNegativePnlCollateral?: null): ManuallyRealizedNegativePnlCollateralStoredEventFilter;
+        "MaxSkewCollateralUpdated(uint8,uint16,uint80)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, maxSkewCollateral?: null): MaxSkewCollateralUpdatedEventFilter;
+        MaxSkewCollateralUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, maxSkewCollateral?: null): MaxSkewCollateralUpdatedEventFilter;
+        "ParamUpdateRequested(uint8,uint16,uint8,uint224)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, updateType?: null, newValue?: null): ParamUpdateRequestedEventFilter;
+        ParamUpdateRequested(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, updateType?: null, newValue?: null): ParamUpdateRequestedEventFilter;
+        "PendingAccBorrowingFeesStored(uint8,uint16,tuple)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, data?: null): PendingAccBorrowingFeesStoredEventFilter;
+        PendingAccBorrowingFeesStored(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, data?: null): PendingAccBorrowingFeesStoredEventFilter;
+        "PendingAccFundingFeesStored(uint8,uint16,tuple)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, data?: null): PendingAccFundingFeesStoredEventFilter;
+        PendingAccFundingFeesStored(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, data?: null): PendingAccFundingFeesStoredEventFilter;
+        "PnlRealizedOnOpenTrade(address,uint32,int256,int256)"(trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, pnlCollateral?: null, newRealizedPnlCollateral?: null): PnlRealizedOnOpenTradeEventFilter;
+        PnlRealizedOnOpenTrade(trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, pnlCollateral?: null, newRealizedPnlCollateral?: null): PnlRealizedOnOpenTradeEventFilter;
+        "SkewCoefficientPerYearUpdated(uint8,uint16,uint112)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, skewCoefficientPerYear?: null): SkewCoefficientPerYearUpdatedEventFilter;
+        SkewCoefficientPerYearUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, skewCoefficientPerYear?: null): SkewCoefficientPerYearUpdatedEventFilter;
+        "ThetaThresholdUsdUpdated(uint8,uint16,uint32)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, thetaThresholdUsd?: null): ThetaThresholdUsdUpdatedEventFilter;
+        ThetaThresholdUsdUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, thetaThresholdUsd?: null): ThetaThresholdUsdUpdatedEventFilter;
+        "TradeFeesDataDownscaled(address,uint32,uint256,uint256,uint256,tuple)"(trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, positionSizeCollateralDelta?: null, existingPositionSizeCollateral?: null, newCollateralAmount?: null, newTradeFeesData?: null): TradeFeesDataDownscaledEventFilter;
+        TradeFeesDataDownscaled(trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, positionSizeCollateralDelta?: null, existingPositionSizeCollateral?: null, newCollateralAmount?: null, newTradeFeesData?: null): TradeFeesDataDownscaledEventFilter;
+        "TradeInitialAccFeesStored(address,uint32,uint8,uint16,bool,uint64,int128,uint128)"(trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, collateralIndex?: null, pairIndex?: null, long?: null, currentPairPrice?: null, newInitialAccFundingFeeP?: null, newInitialAccBorrowingFeeP?: null): TradeInitialAccFeesStoredEventFilter;
+        TradeInitialAccFeesStored(trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, collateralIndex?: null, pairIndex?: null, long?: null, currentPairPrice?: null, newInitialAccFundingFeeP?: null, newInitialAccBorrowingFeeP?: null): TradeInitialAccFeesStoredEventFilter;
+        "TradingFeesRealized(uint8,address,uint32,uint256,uint256,uint256,int256,uint256)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, tradingFeesCollateral?: null, finalTradingFeesCollateral?: null, newRealizedFeesCollateral?: null, newRealizedPnlCollateral?: null, amountSentFromVaultCollateral?: null): TradingFeesRealizedEventFilter;
+        TradingFeesRealized(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, tradingFeesCollateral?: null, finalTradingFeesCollateral?: null, newRealizedFeesCollateral?: null, newRealizedPnlCollateral?: null, amountSentFromVaultCollateral?: null): TradingFeesRealizedEventFilter;
+        "VirtualAvailableCollateralInDiamondStored(address,uint32,uint256,uint256,bool,uint256,uint256)"(trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, newTradeCollateralAmount?: null, currentManuallyRealizedNegativePnlCollateral?: null, manuallyRealizedNegativePnlCollateralCapped?: null, virtualAvailableCollateralInDiamondDelta?: null, newVirtualAvailableCollateralInDiamond?: null): VirtualAvailableCollateralInDiamondStoredEventFilter;
+        VirtualAvailableCollateralInDiamondStored(trader?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, newTradeCollateralAmount?: null, currentManuallyRealizedNegativePnlCollateral?: null, manuallyRealizedNegativePnlCollateralCapped?: null, virtualAvailableCollateralInDiamondDelta?: null, newVirtualAvailableCollateralInDiamond?: null): VirtualAvailableCollateralInDiamondStoredEventFilter;
     };
     estimateGas: {
         diamondCut(_faceCut: IDiamondStorage.FacetCutStruct[], _init: PromiseOrValue<string>, _calldata: PromiseOrValue<BytesLike>, overrides?: Overrides & {
@@ -5740,6 +7334,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initialize(_govTimelock: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        initializeGovEmergencyTimelock(_govEmergencyTimelock: PromiseOrValue<string>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         setRoles(_accounts: PromiseOrValue<string>[], _roles: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<boolean>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -5757,6 +7354,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getAllPairsRestrictedMaxLeverage(overrides?: CallOverrides): Promise<BigNumber>;
         getGlobalTradeFeeParams(overrides?: CallOverrides): Promise<BigNumber>;
         getGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPairCounterTradeFeeRateMultiplier(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPairCounterTradeFeeRateMultipliers(_pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
+        getPairCounterTradeMaxLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPairCounterTradeMaxLeverages(_pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
         getPairLiquidationParams(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         groups(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         groupsCount(overrides?: CallOverrides): Promise<BigNumber>;
@@ -5790,6 +7391,12 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, _params: IPairsStorage.GroupLiquidationParamsStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        setPairCounterTradeFeeRateMultipliers(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        setPairCounterTradeMaxLeverages(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         setPairCustomMaxLeverages(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -5891,9 +7498,16 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getPairDepth(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getPairDepths(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
         getPairFactors(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
+        getPairOiAfterV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPairOiAfterV10Token(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPairOisAfterV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
+        getPairOisAfterV10Token(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
+        getPairSkewDepth(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPairSkewDepths(_collateralIndices: PromiseOrValue<BigNumberish>[], _pairIndices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
         getPriceImpactOi(_pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
         getProtectionCloseFactorWhitelist(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
-        getTradePriceImpact(_trader: PromiseOrValue<string>, _marketPrice: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _open: PromiseOrValue<boolean>, _lastPosIncreaseBlock: PromiseOrValue<BigNumberish>, _contractsVersion: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradeCumulVolPriceImpactP(_trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _open: PromiseOrValue<boolean>, _lastPosIncreaseBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradeSkewPriceImpactP(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _positionSizeToken: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
         getUserPriceImpact(_trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         initializeNegPnlCumulVolMultiplier(_negPnlCumulVolMultiplier: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
@@ -5919,6 +7533,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setPairDepths(_indices: PromiseOrValue<BigNumberish>[], _depthsAboveUsd: PromiseOrValue<BigNumberish>[], _depthsBelowUsd: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        setPairSkewDepths(_collateralIndices: PromiseOrValue<BigNumberish>[], _pairIndices: PromiseOrValue<BigNumberish>[], _depths: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         setPriceImpactWindowsCount(_newWindowsCount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -5937,13 +7554,16 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setUserPriceImpact(_traders: PromiseOrValue<string>[], _pairIndices: PromiseOrValue<BigNumberish>[], _cumulVolPriceImpactMultipliers: PromiseOrValue<BigNumberish>[], _fixedSpreadPs: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        updatePairOiAfterV10(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, _oiDeltaToken: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         addCollateral(_collateral: PromiseOrValue<string>, _gToken: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         closePendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        closeTrade(_tradeId: ITradingStorage.IdStruct, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
+        closeTrade(_tradeId: ITradingStorage.IdStruct, _isPnlPositive: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         getAllPendingOrders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
@@ -5966,6 +7586,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getPendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<BigNumber>;
         getPendingOrders(_user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradeContractsVersion(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getTradeInfo(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getTradeInfos(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getTradeLiquidationParams(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
@@ -5985,7 +7606,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         storePendingOrder(_pendingOrder: ITradingStorage.PendingOrderStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        storeTrade(_trade: ITradingStorage.TradeStruct, _tradeInfo: ITradingStorage.TradeInfoStruct, overrides?: Overrides & {
+        storeTrade(_trade: ITradingStorage.TradeStruct, _tradeInfo: ITradingStorage.TradeInfoStruct, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         toggleCollateralActiveState(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -5997,13 +7618,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateOpenOrderDetails(_tradeId: ITradingStorage.IdStruct, _openPrice: PromiseOrValue<BigNumberish>, _tp: PromiseOrValue<BigNumberish>, _sl: PromiseOrValue<BigNumberish>, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        updateTradeCollateralAmount(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<BigNumber>;
         updateTradeMaxClosingSlippageP(_tradeId: ITradingStorage.IdStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, _isPartialIncrease: PromiseOrValue<boolean>, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
+        updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, _pendingOrderType: PromiseOrValue<BigNumberish>, _positionSizeTokenDelta: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         updateTradeSl(_tradeId: ITradingStorage.IdStruct, _newSl: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -6058,6 +7676,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeTrading(_marketOrdersTimeoutBlocks: PromiseOrValue<BigNumberish>, _usersByPassTriggerLink: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        initiateManualNegativePnlRealization(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _isHoldingFees: PromiseOrValue<boolean>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         isWrappedNativeToken(_token: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         openTrade(_trade: ITradingStorage.TradeStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, _referrer: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
@@ -6098,6 +7719,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateTp(_index: PromiseOrValue<BigNumberish>, _newTp: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        withdrawPositivePnl(_index: PromiseOrValue<BigNumberish>, _amountCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         claimPendingGovFees(overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -6124,9 +7748,18 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeTreasuryAddress(_treasury: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        manualHoldingFeesRealizationCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        manualNegativePnlRealizationCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         openTradeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        pnlWithdrawalCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         updateLeverageCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -6136,8 +7769,11 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateVaultClosingFeeP(_valueP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        validateTriggerCloseOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        validateTriggerOpenOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        validateTriggerCloseOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        validateTriggerOpenOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        borrowingParamUpdateCallback(_paramUpdate: IFundingFees.PendingParamUpdateStruct, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         getAllBorrowingPairs(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getBorrowingFeePerBlockCap(overrides?: CallOverrides): Promise<BigNumber>;
         getBorrowingGroup(_collateralIndex: PromiseOrValue<BigNumberish>, _groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
@@ -6150,21 +7786,21 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getBorrowingPairFeePerBlockCaps(_collateralIndex: PromiseOrValue<BigNumberish>, _indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
         getBorrowingPairGroupIndex(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getBorrowingPairGroups(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        getBorrowingPairOi(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        getBorrowingPairPendingAccFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getBorrowingPairOiBeforeV10(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getBorrowingPairPendingAccFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentBlock: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getPairMaxOi(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getPairMaxOiCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        getPairOiCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
-        getPairOisCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPairOiBeforeV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPairOisBeforeV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getTradeBorrowingFee(_input: IBorrowingFees.BorrowingFeeInputStruct, overrides?: CallOverrides): Promise<BigNumber>;
         getTradeLiquidationPrice(_input: IBorrowingFees.LiqPriceInputStruct, overrides?: CallOverrides): Promise<BigNumber>;
-        handleTradeBorrowingCallback(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
+        handleTradeBorrowingCallback(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         initializeBorrowingFeePerBlockCap(_feePerBlockCap: IBorrowingFees.BorrowingFeePerBlockCapStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        resetTradeBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
+        resetTradeBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         setBorrowingFeePerBlockCap(_feePerBlockCap: IBorrowingFees.BorrowingFeePerBlockCapStruct, overrides?: Overrides & {
@@ -6185,6 +7821,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setBorrowingPairParamsArray(_collateralIndex: PromiseOrValue<BigNumberish>, _indices: PromiseOrValue<BigNumberish>[], _values: IBorrowingFees.BorrowingPairParamsStruct[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        updatePairOiBeforeV10(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _increase: PromiseOrValue<boolean>, _amountCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         withinMaxBorrowingGroupOi(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         addOracle(_a: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
@@ -6206,7 +7845,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getLimitJobCount(overrides?: CallOverrides): Promise<BigNumber>;
         getLimitJobId(overrides?: CallOverrides): Promise<BigNumber>;
         getLimitJobIndex(overrides?: CallOverrides): Promise<BigNumber>;
-        getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _isCounterTrade: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
         getLinkUsdPriceFeed(overrides?: CallOverrides): Promise<BigNumber>;
         getMarketJobId(overrides?: CallOverrides): Promise<BigNumber>;
         getMaxLookbackDeviationP(overrides?: CallOverrides): Promise<BigNumber>;
@@ -6214,8 +7853,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getMinAnswers(overrides?: CallOverrides): Promise<BigNumber>;
         getOracle(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getOracles(overrides?: CallOverrides): Promise<BigNumber>;
+        getParamUpdateJobId(overrides?: CallOverrides): Promise<BigNumber>;
         getPendingRequest(_id: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>;
-        getPrice(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _pendingOrder: ITradingStorage.PendingOrderStruct, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _fromBlock: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        getPrice(_input: IPriceAggregator.GetPriceInputStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         getPriceAggregatorOrder(_requestId: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>;
@@ -6229,6 +7869,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeMaxDeviationsP(_maxMarketDeviationP: PromiseOrValue<BigNumberish>, _maxLookbackDeviationP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        initializeParamUpdateJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         initializePriceAggregator(_linkToken: PromiseOrValue<string>, _linkUsdPriceFeed: PromiseOrValue<string>, _twapInterval: PromiseOrValue<BigNumberish>, _minAnswers: PromiseOrValue<BigNumberish>, _nodes: PromiseOrValue<string>[], _jobIds: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>], _collateralIndices: PromiseOrValue<BigNumberish>[], _gnsCollateralLiquidityPools: IPriceAggregator.LiquidityPoolInputStruct[], _collateralUsdPriceFeeds: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -6253,6 +7896,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setMaxMarketDeviationP(_maxMarketDeviationP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        setParamUpdateJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         updateCollateralGnsLiquidityPool(_collateralIndex: PromiseOrValue<BigNumberish>, _liquidityPoolInput: IPriceAggregator.LiquidityPoolInputStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -6298,6 +7944,84 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateNativeTransferGasLimit(_nativeTransferGasLimit: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        downscaleTradeFeesData(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateralDelta: PromiseOrValue<BigNumberish>, _existingPositionSizeCollateral: PromiseOrValue<BigNumberish>, _newCollateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        getMaxSkewCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPairBorrowingFeeData(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
+        getPairBorrowingFeeParams(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
+        getPairFundingFeeData(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
+        getPairFundingFeeParams(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
+        getPairGlobalParamsArray(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
+        getPairPendingAccBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPairPendingAccFundingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPendingParamUpdates(_index: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
+        getTradeBorrowingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradeFeesData(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradeFeesDataArray(_trader: PromiseOrValue<string>[], _index: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
+        getTradeFundingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradeManuallyRealizedNegativePnlCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradePendingHoldingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradeRealizedPnlCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradeRealizedTradingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradeUiRealizedPnlDataArray(_trader: PromiseOrValue<string>[], _index: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
+        pendingParamUpdateCallback(_answer: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        realizeHoldingFeesOnOpenTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        realizePnlOnOpenTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _pnlCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        realizeTradingFeesOnOpenTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _feesCollateral: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        requestParamUpdate(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _updateType: PromiseOrValue<BigNumberish>, _newValue: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        setAbsoluteRatePerSecondCap(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _absoluteRatePerSecondCap: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        setAbsoluteVelocityPerYearCap(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _absoluteVelocityPerYearCap: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        setAprMultiplierEnabled(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _aprMultiplierEnabled: PromiseOrValue<boolean>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        setBorrowingRatePerSecondP(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _borrowingRatePerSecondP: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        setFundingFeesEnabled(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _fundingFeesEnabled: PromiseOrValue<boolean>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        setMaxSkewCollateral(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _maxSkewCollateral: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        setSkewCoefficientPerYear(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _skewCoefficientPerYear: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        setThetaThresholdUsd(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _thetaThresholdUsd: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        storeAlreadyTransferredNegativePnl(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _deltaCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        storeManuallyRealizedNegativePnlCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _amountCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        storeTradeInitialAccFees(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        storeUiPnlWithdrawnCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _deltaCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        storeUiRealizedPnlPartialCloseCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _deltaCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        storeVirtualAvailableCollateralInDiamond(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _newTradeCollateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
     };
     populateTransaction: {
         diamondCut(_faceCut: IDiamondStorage.FacetCutStruct[], _init: PromiseOrValue<string>, _calldata: PromiseOrValue<BytesLike>, overrides?: Overrides & {
@@ -6313,6 +8037,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initialize(_govTimelock: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        initializeGovEmergencyTimelock(_govEmergencyTimelock: PromiseOrValue<string>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         setRoles(_accounts: PromiseOrValue<string>[], _roles: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<boolean>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -6330,6 +8057,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getAllPairsRestrictedMaxLeverage(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getGlobalTradeFeeParams(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairCounterTradeFeeRateMultiplier(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairCounterTradeFeeRateMultipliers(_pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairCounterTradeMaxLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairCounterTradeMaxLeverages(_pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPairLiquidationParams(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         groups(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         groupsCount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -6363,6 +8094,12 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, _params: IPairsStorage.GroupLiquidationParamsStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        setPairCounterTradeFeeRateMultipliers(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        setPairCounterTradeMaxLeverages(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         setPairCustomMaxLeverages(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -6464,9 +8201,16 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getPairDepth(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPairDepths(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPairFactors(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairOiAfterV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairOiAfterV10Token(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairOisAfterV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairOisAfterV10Token(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairSkewDepth(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairSkewDepths(_collateralIndices: PromiseOrValue<BigNumberish>[], _pairIndices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPriceImpactOi(_pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getProtectionCloseFactorWhitelist(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getTradePriceImpact(_trader: PromiseOrValue<string>, _marketPrice: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _open: PromiseOrValue<boolean>, _lastPosIncreaseBlock: PromiseOrValue<BigNumberish>, _contractsVersion: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getTradeCumulVolPriceImpactP(_trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _open: PromiseOrValue<boolean>, _lastPosIncreaseBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getTradeSkewPriceImpactP(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _positionSizeToken: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getUserPriceImpact(_trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         initializeNegPnlCumulVolMultiplier(_negPnlCumulVolMultiplier: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
@@ -6492,6 +8236,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setPairDepths(_indices: PromiseOrValue<BigNumberish>[], _depthsAboveUsd: PromiseOrValue<BigNumberish>[], _depthsBelowUsd: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        setPairSkewDepths(_collateralIndices: PromiseOrValue<BigNumberish>[], _pairIndices: PromiseOrValue<BigNumberish>[], _depths: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         setPriceImpactWindowsCount(_newWindowsCount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -6510,13 +8257,16 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setUserPriceImpact(_traders: PromiseOrValue<string>[], _pairIndices: PromiseOrValue<BigNumberish>[], _cumulVolPriceImpactMultipliers: PromiseOrValue<BigNumberish>[], _fixedSpreadPs: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        updatePairOiAfterV10(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, _oiDeltaToken: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         addCollateral(_collateral: PromiseOrValue<string>, _gToken: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         closePendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        closeTrade(_tradeId: ITradingStorage.IdStruct, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
+        closeTrade(_tradeId: ITradingStorage.IdStruct, _isPnlPositive: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         getAllPendingOrders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -6539,6 +8289,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getPendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPendingOrders(_user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getTradeContractsVersion(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTradeInfo(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTradeInfos(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTradeLiquidationParams(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -6558,7 +8309,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         storePendingOrder(_pendingOrder: ITradingStorage.PendingOrderStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        storeTrade(_trade: ITradingStorage.TradeStruct, _tradeInfo: ITradingStorage.TradeInfoStruct, overrides?: Overrides & {
+        storeTrade(_trade: ITradingStorage.TradeStruct, _tradeInfo: ITradingStorage.TradeInfoStruct, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         toggleCollateralActiveState(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -6570,13 +8321,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateOpenOrderDetails(_tradeId: ITradingStorage.IdStruct, _openPrice: PromiseOrValue<BigNumberish>, _tp: PromiseOrValue<BigNumberish>, _sl: PromiseOrValue<BigNumberish>, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        updateTradeCollateralAmount(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<PopulatedTransaction>;
         updateTradeMaxClosingSlippageP(_tradeId: ITradingStorage.IdStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, _isPartialIncrease: PromiseOrValue<boolean>, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
+        updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, _pendingOrderType: PromiseOrValue<BigNumberish>, _positionSizeTokenDelta: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         updateTradeSl(_tradeId: ITradingStorage.IdStruct, _newSl: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -6631,6 +8379,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeTrading(_marketOrdersTimeoutBlocks: PromiseOrValue<BigNumberish>, _usersByPassTriggerLink: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        initiateManualNegativePnlRealization(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _isHoldingFees: PromiseOrValue<boolean>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         isWrappedNativeToken(_token: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         openTrade(_trade: ITradingStorage.TradeStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, _referrer: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
@@ -6671,6 +8422,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateTp(_index: PromiseOrValue<BigNumberish>, _newTp: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        withdrawPositivePnl(_index: PromiseOrValue<BigNumberish>, _amountCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         claimPendingGovFees(overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -6697,9 +8451,18 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeTreasuryAddress(_treasury: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        manualHoldingFeesRealizationCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        manualNegativePnlRealizationCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         openTradeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        pnlWithdrawalCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         updateLeverageCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -6709,8 +8472,11 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateVaultClosingFeeP(_valueP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        validateTriggerCloseOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        validateTriggerOpenOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        validateTriggerCloseOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        validateTriggerOpenOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        borrowingParamUpdateCallback(_paramUpdate: IFundingFees.PendingParamUpdateStruct, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         getAllBorrowingPairs(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getBorrowingFeePerBlockCap(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getBorrowingGroup(_collateralIndex: PromiseOrValue<BigNumberish>, _groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -6723,21 +8489,21 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getBorrowingPairFeePerBlockCaps(_collateralIndex: PromiseOrValue<BigNumberish>, _indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getBorrowingPairGroupIndex(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getBorrowingPairGroups(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getBorrowingPairOi(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getBorrowingPairPendingAccFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getBorrowingPairOiBeforeV10(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getBorrowingPairPendingAccFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentBlock: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPairMaxOi(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPairMaxOiCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getPairOiCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getPairOisCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairOiBeforeV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairOisBeforeV10Collateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTradeBorrowingFee(_input: IBorrowingFees.BorrowingFeeInputStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTradeLiquidationPrice(_input: IBorrowingFees.LiqPriceInputStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        handleTradeBorrowingCallback(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
+        handleTradeBorrowingCallback(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         initializeBorrowingFeePerBlockCap(_feePerBlockCap: IBorrowingFees.BorrowingFeePerBlockCapStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        resetTradeBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
+        resetTradeBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         setBorrowingFeePerBlockCap(_feePerBlockCap: IBorrowingFees.BorrowingFeePerBlockCapStruct, overrides?: Overrides & {
@@ -6758,6 +8524,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setBorrowingPairParamsArray(_collateralIndex: PromiseOrValue<BigNumberish>, _indices: PromiseOrValue<BigNumberish>[], _values: IBorrowingFees.BorrowingPairParamsStruct[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        updatePairOiBeforeV10(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _increase: PromiseOrValue<boolean>, _amountCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         withinMaxBorrowingGroupOi(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         addOracle(_a: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
@@ -6779,7 +8548,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getLimitJobCount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getLimitJobId(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getLimitJobIndex(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _isCounterTrade: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getLinkUsdPriceFeed(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getMarketJobId(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getMaxLookbackDeviationP(overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -6787,8 +8556,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getMinAnswers(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getOracle(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getOracles(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getParamUpdateJobId(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPendingRequest(_id: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getPrice(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _pendingOrder: ITradingStorage.PendingOrderStruct, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _fromBlock: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        getPrice(_input: IPriceAggregator.GetPriceInputStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         getPriceAggregatorOrder(_requestId: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -6802,6 +8572,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeMaxDeviationsP(_maxMarketDeviationP: PromiseOrValue<BigNumberish>, _maxLookbackDeviationP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        initializeParamUpdateJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         initializePriceAggregator(_linkToken: PromiseOrValue<string>, _linkUsdPriceFeed: PromiseOrValue<string>, _twapInterval: PromiseOrValue<BigNumberish>, _minAnswers: PromiseOrValue<BigNumberish>, _nodes: PromiseOrValue<string>[], _jobIds: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>], _collateralIndices: PromiseOrValue<BigNumberish>[], _gnsCollateralLiquidityPools: IPriceAggregator.LiquidityPoolInputStruct[], _collateralUsdPriceFeeds: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -6826,6 +8599,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setMaxMarketDeviationP(_maxMarketDeviationP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        setParamUpdateJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         updateCollateralGnsLiquidityPool(_collateralIndex: PromiseOrValue<BigNumberish>, _liquidityPoolInput: IPriceAggregator.LiquidityPoolInputStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -6871,5 +8647,83 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateNativeTransferGasLimit(_nativeTransferGasLimit: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        downscaleTradeFeesData(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateralDelta: PromiseOrValue<BigNumberish>, _existingPositionSizeCollateral: PromiseOrValue<BigNumberish>, _newCollateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        getMaxSkewCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairBorrowingFeeData(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairBorrowingFeeParams(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairFundingFeeData(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairFundingFeeParams(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairGlobalParamsArray(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairPendingAccBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPairPendingAccFundingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPendingParamUpdates(_index: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getTradeBorrowingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getTradeFeesData(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getTradeFeesDataArray(_trader: PromiseOrValue<string>[], _index: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getTradeFundingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getTradeManuallyRealizedNegativePnlCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getTradePendingHoldingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getTradeRealizedPnlCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getTradeRealizedTradingFeesCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getTradeUiRealizedPnlDataArray(_trader: PromiseOrValue<string>[], _index: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        pendingParamUpdateCallback(_answer: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        realizeHoldingFeesOnOpenTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        realizePnlOnOpenTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _pnlCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        realizeTradingFeesOnOpenTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _feesCollateral: PromiseOrValue<BigNumberish>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        requestParamUpdate(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _updateType: PromiseOrValue<BigNumberish>, _newValue: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        setAbsoluteRatePerSecondCap(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _absoluteRatePerSecondCap: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        setAbsoluteVelocityPerYearCap(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _absoluteVelocityPerYearCap: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        setAprMultiplierEnabled(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _aprMultiplierEnabled: PromiseOrValue<boolean>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        setBorrowingRatePerSecondP(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _borrowingRatePerSecondP: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        setFundingFeesEnabled(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _fundingFeesEnabled: PromiseOrValue<boolean>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        setMaxSkewCollateral(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _maxSkewCollateral: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        setSkewCoefficientPerYear(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _skewCoefficientPerYear: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        setThetaThresholdUsd(_collateralIndex: PromiseOrValue<BigNumberish>[], _pairIndex: PromiseOrValue<BigNumberish>[], _thetaThresholdUsd: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        storeAlreadyTransferredNegativePnl(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _deltaCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        storeManuallyRealizedNegativePnlCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _amountCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        storeTradeInitialAccFees(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _currentPairPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        storeUiPnlWithdrawnCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _deltaCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        storeUiRealizedPnlPartialCloseCollateral(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _deltaCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        storeVirtualAvailableCollateralInDiamond(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _newTradeCollateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
     };
 }