@gainsnetwork/sdk 0.2.34-rc1 → 0.2.36

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

@@ -6,10 +6,12 @@ export declare namespace IAddressStore {
     type AddressesStruct = {
         gns: PromiseOrValue<string>;
         gnsStaking: PromiseOrValue<string>;
+        treasury: PromiseOrValue<string>;
     };
-    type AddressesStructOutput = [string, string] & {
+    type AddressesStructOutput = [string, string, string] & {
         gns: string;
         gnsStaking: string;
+        treasury: string;
     };
 }
 export declare namespace IDiamondStorage {
@@ -35,6 +37,49 @@ export declare namespace IGNSDiamondLoupe {
     };
 }
 export declare namespace IPairsStorage {
+    type FeeGroupStruct = {
+        totalPositionSizeFeeP: PromiseOrValue<BigNumberish>;
+        totalLiqCollateralFeeP: PromiseOrValue<BigNumberish>;
+        oraclePositionSizeFeeP: PromiseOrValue<BigNumberish>;
+        minPositionSizeUsd: PromiseOrValue<BigNumberish>;
+        __placeholder: PromiseOrValue<BigNumberish>;
+    };
+    type FeeGroupStructOutput = [
+        number,
+        number,
+        number,
+        number,
+        BigNumber
+    ] & {
+        totalPositionSizeFeeP: number;
+        totalLiqCollateralFeeP: number;
+        oraclePositionSizeFeeP: number;
+        minPositionSizeUsd: number;
+        __placeholder: BigNumber;
+    };
+    type GlobalTradeFeeParamsStruct = {
+        referralFeeP: PromiseOrValue<BigNumberish>;
+        govFeeP: PromiseOrValue<BigNumberish>;
+        triggerOrderFeeP: PromiseOrValue<BigNumberish>;
+        gnsOtcFeeP: PromiseOrValue<BigNumberish>;
+        gTokenFeeP: PromiseOrValue<BigNumberish>;
+        __placeholder: PromiseOrValue<BigNumberish>;
+    };
+    type GlobalTradeFeeParamsStructOutput = [
+        number,
+        number,
+        number,
+        number,
+        number,
+        BigNumber
+    ] & {
+        referralFeeP: number;
+        govFeeP: number;
+        triggerOrderFeeP: number;
+        gnsOtcFeeP: number;
+        gTokenFeeP: number;
+        __placeholder: BigNumber;
+    };
     type GroupLiquidationParamsStruct = {
         maxLiqSpreadP: PromiseOrValue<BigNumberish>;
         startLiqThresholdP: PromiseOrValue<BigNumberish>;
@@ -55,29 +100,6 @@ export declare namespace IPairsStorage {
         startLeverage: number;
         endLeverage: number;
     };
-    type FeeStruct = {
-        name: PromiseOrValue<string>;
-        openFeeP: PromiseOrValue<BigNumberish>;
-        closeFeeP: PromiseOrValue<BigNumberish>;
-        oracleFeeP: PromiseOrValue<BigNumberish>;
-        triggerOrderFeeP: PromiseOrValue<BigNumberish>;
-        minPositionSizeUsd: PromiseOrValue<BigNumberish>;
-    };
-    type FeeStructOutput = [
-        string,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber
-    ] & {
-        name: string;
-        openFeeP: BigNumber;
-        closeFeeP: BigNumber;
-        oracleFeeP: BigNumber;
-        triggerOrderFeeP: BigNumber;
-        minPositionSizeUsd: BigNumber;
-    };
     type GroupStruct = {
         name: PromiseOrValue<string>;
         job: PromiseOrValue<BytesLike>;
@@ -228,6 +250,7 @@ export declare namespace IPriceImpact {
         windowId: PromiseOrValue<BigNumberish>;
         long: PromiseOrValue<boolean>;
         open: PromiseOrValue<boolean>;
+        isPnlPositive: PromiseOrValue<boolean>;
         openInterestUsd: PromiseOrValue<BigNumberish>;
     };
     type OiWindowUpdateStructOutput = [
@@ -238,6 +261,7 @@ export declare namespace IPriceImpact {
         BigNumber,
         boolean,
         boolean,
+        boolean,
         BigNumber
     ] & {
         trader: string;
@@ -247,6 +271,7 @@ export declare namespace IPriceImpact {
         windowId: BigNumber;
         long: boolean;
         open: boolean;
+        isPnlPositive: boolean;
         openInterestUsd: BigNumber;
     };
     type OiWindowsSettingsStruct = {
@@ -271,12 +296,23 @@ export declare namespace IPriceImpact {
         protectionCloseFactor: PromiseOrValue<BigNumberish>;
         protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>;
         cumulativeFactor: PromiseOrValue<BigNumberish>;
+        exemptOnOpen: PromiseOrValue<boolean>;
+        exemptAfterProtectionCloseFactor: PromiseOrValue<boolean>;
         __placeholder: PromiseOrValue<BigNumberish>;
     };
-    type PairFactorsStructOutput = [number, number, number, BigNumber] & {
+    type PairFactorsStructOutput = [
+        number,
+        number,
+        number,
+        boolean,
+        boolean,
+        BigNumber
+    ] & {
         protectionCloseFactor: number;
         protectionCloseFactorBlocks: number;
         cumulativeFactor: number;
+        exemptOnOpen: boolean;
+        exemptAfterProtectionCloseFactor: boolean;
         __placeholder: BigNumber;
     };
 }
@@ -449,8 +485,7 @@ export declare namespace IUpdatePositionSize {
         priceAfterImpact: PromiseOrValue<BigNumberish>;
         existingPnlCollateral: PromiseOrValue<BigNumberish>;
         borrowingFeeCollateral: PromiseOrValue<BigNumberish>;
-        vaultFeeCollateral: PromiseOrValue<BigNumberish>;
-        gnsStakingFeeCollateral: PromiseOrValue<BigNumberish>;
+        closingFeeCollateral: PromiseOrValue<BigNumberish>;
         availableCollateralInDiamond: PromiseOrValue<BigNumberish>;
         collateralSentToTrader: PromiseOrValue<BigNumberish>;
         newCollateralAmount: PromiseOrValue<BigNumberish>;
@@ -467,7 +502,6 @@ export declare namespace IUpdatePositionSize {
         BigNumber,
         BigNumber,
         BigNumber,
-        BigNumber,
         number
     ] & {
         positionSizeCollateralDelta: BigNumber;
@@ -476,8 +510,7 @@ export declare namespace IUpdatePositionSize {
         priceAfterImpact: BigNumber;
         existingPnlCollateral: BigNumber;
         borrowingFeeCollateral: BigNumber;
-        vaultFeeCollateral: BigNumber;
-        gnsStakingFeeCollateral: BigNumber;
+        closingFeeCollateral: BigNumber;
         availableCollateralInDiamond: BigNumber;
         collateralSentToTrader: BigNumber;
         newCollateralAmount: BigNumber;
@@ -550,29 +583,18 @@ export declare namespace ITradingCallbacks {
         low: BigNumber;
     };
     type ValuesStruct = {
-        positionSizeCollateral: PromiseOrValue<BigNumberish>;
-        gnsPriceCollateral: PromiseOrValue<BigNumberish>;
         profitP: PromiseOrValue<BigNumberish>;
         executionPrice: PromiseOrValue<BigNumberish>;
         liqPrice: PromiseOrValue<BigNumberish>;
         amountSentToTrader: PromiseOrValue<BigNumberish>;
-        reward1: PromiseOrValue<BigNumberish>;
-        reward2: PromiseOrValue<BigNumberish>;
-        reward3: PromiseOrValue<BigNumberish>;
-        collateralPrecisionDelta: PromiseOrValue<BigNumberish>;
         collateralPriceUsd: PromiseOrValue<BigNumberish>;
         exactExecution: PromiseOrValue<boolean>;
-        closingFeeCollateral: PromiseOrValue<BigNumberish>;
-        triggerFeeCollateral: PromiseOrValue<BigNumberish>;
         collateralLeftInStorage: PromiseOrValue<BigNumberish>;
+        oraclePrice: PromiseOrValue<BigNumberish>;
+        limitIndex: PromiseOrValue<BigNumberish>;
+        priceImpactP: PromiseOrValue<BigNumberish>;
     };
     type ValuesStructOutput = [
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
         BigNumber,
         BigNumber,
         BigNumber,
@@ -581,23 +603,19 @@ export declare namespace ITradingCallbacks {
         boolean,
         BigNumber,
         BigNumber,
+        number,
         BigNumber
     ] & {
-        positionSizeCollateral: BigNumber;
-        gnsPriceCollateral: BigNumber;
         profitP: BigNumber;
         executionPrice: BigNumber;
         liqPrice: BigNumber;
         amountSentToTrader: BigNumber;
-        reward1: BigNumber;
-        reward2: BigNumber;
-        reward3: BigNumber;
-        collateralPrecisionDelta: BigNumber;
         collateralPriceUsd: BigNumber;
         exactExecution: boolean;
-        closingFeeCollateral: BigNumber;
-        triggerFeeCollateral: BigNumber;
         collateralLeftInStorage: BigNumber;
+        oraclePrice: BigNumber;
+        limitIndex: number;
+        priceImpactP: BigNumber;
     };
 }
 export declare namespace IBorrowingFees {
@@ -906,38 +924,40 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "facets()": FunctionFragment;
         "getAddresses()": FunctionFragment;
         "hasRole(address,uint8)": FunctionFragment;
+        "hasRoles(address,uint8,uint8)": FunctionFragment;
         "initialize(address)": FunctionFragment;
         "setRoles(address[],uint8[],bool[])": FunctionFragment;
-        "addFees((string,uint256,uint256,uint256,uint256,uint256)[])": FunctionFragment;
+        "addFees((uint40,uint40,uint40,uint32,uint104)[])": FunctionFragment;
         "addGroups((string,bytes32,uint256,uint256)[])": FunctionFragment;
         "addPairs((string,string,(address,address,uint8,uint256),uint256,uint256,uint256)[])": FunctionFragment;
         "fees(uint256)": FunctionFragment;
         "feesCount()": FunctionFragment;
         "getAllPairsRestrictedMaxLeverage()": FunctionFragment;
+        "getGlobalTradeFeeParams()": FunctionFragment;
         "getGroupLiquidationParams(uint256)": FunctionFragment;
         "getPairLiquidationParams(uint256)": FunctionFragment;
         "groups(uint256)": FunctionFragment;
         "groupsCount()": FunctionFragment;
         "initializeGroupLiquidationParams((uint40,uint40,uint40,uint24,uint24)[])": FunctionFragment;
+        "initializeNewFees((uint24,uint24,uint24,uint24,uint24,uint136))": FunctionFragment;
         "isPairIndexListed(uint256)": FunctionFragment;
         "isPairListed(string,string)": FunctionFragment;
-        "pairCloseFeeP(uint256)": FunctionFragment;
         "pairCustomMaxLeverage(uint256)": FunctionFragment;
         "pairJob(uint256)": FunctionFragment;
         "pairMaxLeverage(uint256)": FunctionFragment;
         "pairMinFeeUsd(uint256)": FunctionFragment;
         "pairMinLeverage(uint256)": FunctionFragment;
         "pairMinPositionSizeUsd(uint256)": FunctionFragment;
-        "pairOpenFeeP(uint256)": FunctionFragment;
-        "pairOracleFeeP(uint256)": FunctionFragment;
+        "pairOraclePositionSizeFeeP(uint256)": FunctionFragment;
         "pairSpreadP(uint256)": FunctionFragment;
-        "pairTriggerOrderFeeP(uint256)": FunctionFragment;
+        "pairTotalLiqCollateralFeeP(uint256)": FunctionFragment;
+        "pairTotalPositionSizeFeeP(uint256)": FunctionFragment;
         "pairs(uint256)": FunctionFragment;
-        "pairsBackend(uint256)": FunctionFragment;
         "pairsCount()": FunctionFragment;
+        "setGlobalTradeFeeParams((uint24,uint24,uint24,uint24,uint24,uint136))": FunctionFragment;
         "setGroupLiquidationParams(uint256,(uint40,uint40,uint40,uint24,uint24))": FunctionFragment;
         "setPairCustomMaxLeverages(uint256[],uint256[])": FunctionFragment;
-        "updateFees(uint256[],(string,uint256,uint256,uint256,uint256,uint256)[])": FunctionFragment;
+        "updateFees(uint256[],(uint40,uint40,uint40,uint32,uint104)[])": FunctionFragment;
         "updateGroups(uint256[],(string,bytes32,uint256,uint256)[])": FunctionFragment;
         "updatePairs(uint256[],(string,string,(address,address,uint8,uint256),uint256,uint256,uint256)[])": FunctionFragment;
         "claimAllyRewards()": FunctionFragment;
@@ -945,25 +965,24 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "distributeReferralReward(address,uint256,uint256,uint256)": FunctionFragment;
         "getAllyDetails(address)": FunctionFragment;
         "getReferralsAllyFeeP()": FunctionFragment;
-        "getReferralsOpenFeeP()": FunctionFragment;
         "getReferralsStartReferrerFeeP()": FunctionFragment;
         "getReferralsTargetVolumeUsd()": FunctionFragment;
         "getReferrerDetails(address)": FunctionFragment;
-        "getReferrerFeeP(uint256,uint256)": FunctionFragment;
+        "getReferrerFeeProgressP(address)": FunctionFragment;
         "getReferrersReferred(address)": FunctionFragment;
         "getTraderActiveReferrer(address)": FunctionFragment;
         "getTraderLastReferrer(address)": FunctionFragment;
         "getTradersReferred(address)": FunctionFragment;
-        "initializeReferrals(uint256,uint256,uint256,uint256)": FunctionFragment;
+        "initializeReferrals(uint256,uint256,uint256)": FunctionFragment;
         "registerPotentialReferrer(address,address)": FunctionFragment;
         "unwhitelistAllies(address[])": FunctionFragment;
         "unwhitelistReferrers(address[])": FunctionFragment;
         "updateAllyFeeP(uint256)": FunctionFragment;
-        "updateReferralsOpenFeeP(uint256)": FunctionFragment;
         "updateReferralsTargetVolumeUsd(uint256)": FunctionFragment;
         "updateStartReferrerFeeP(uint256)": FunctionFragment;
         "whitelistAllies(address[])": FunctionFragment;
         "whitelistReferrers(address[],address[])": FunctionFragment;
+        "addTradersUnclaimedPoints(address[],uint8[],uint224[])": FunctionFragment;
         "calculateFeeAmount(address,uint256)": FunctionFragment;
         "getFeeTier(uint256)": FunctionFragment;
         "getFeeTiersCount()": FunctionFragment;
@@ -971,12 +990,14 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "getFeeTiersTraderInfo(address)": FunctionFragment;
         "getGroupVolumeMultiplier(uint256)": FunctionFragment;
         "getTraderFeeTiersEnrollment(address)": FunctionFragment;
+        "getTraderUnclaimedPoints(address)": FunctionFragment;
         "initializeFeeTiers(uint256[],uint256[],uint256[],(uint32,uint32)[])": FunctionFragment;
         "setFeeTiers(uint256[],(uint32,uint32)[])": FunctionFragment;
         "setGroupVolumeMultipliers(uint256[],uint256[])": FunctionFragment;
         "setTradersFeeTiersEnrollment(address[],(uint8,uint248)[])": FunctionFragment;
         "updateTraderPoints(address,uint256,uint256)": FunctionFragment;
-        "addPriceImpactOpenInterest(address,uint32,uint256,bool)": FunctionFragment;
+        "addPriceImpactOpenInterest(address,uint32,uint256,bool,bool)": FunctionFragment;
+        "getNegPnlCumulVolMultiplier()": FunctionFragment;
         "getOiWindow(uint48,uint256,uint256)": FunctionFragment;
         "getOiWindows(uint48,uint256,uint256[])": FunctionFragment;
         "getOiWindowsSettings()": FunctionFragment;
@@ -984,27 +1005,38 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "getPairDepths(uint256[])": FunctionFragment;
         "getPairFactors(uint256[])": FunctionFragment;
         "getPriceImpactOi(uint256,bool)": FunctionFragment;
-        "getTradePriceImpact(uint256,uint256,bool,uint256,bool,bool,uint256,uint8)": FunctionFragment;
+        "getProtectionCloseFactorWhitelist(address)": FunctionFragment;
+        "getTradePriceImpact(address,uint256,uint256,bool,uint256,bool,bool,uint256,uint8)": FunctionFragment;
+        "initializeNegPnlCumulVolMultiplier(uint40)": FunctionFragment;
         "initializePairFactors(uint16[],uint40[],uint32[],uint40[])": FunctionFragment;
         "initializePriceImpact(uint48,uint48)": FunctionFragment;
         "setCumulativeFactors(uint16[],uint40[])": FunctionFragment;
+        "setExemptAfterProtectionCloseFactor(uint16[],bool[])": FunctionFragment;
+        "setExemptOnOpen(uint16[],bool[])": FunctionFragment;
+        "setNegPnlCumulVolMultiplier(uint40)": FunctionFragment;
         "setPairDepths(uint256[],uint128[],uint128[])": FunctionFragment;
         "setPriceImpactWindowsCount(uint48)": FunctionFragment;
         "setPriceImpactWindowsDuration(uint48)": FunctionFragment;
         "setProtectionCloseFactorBlocks(uint16[],uint32[])": FunctionFragment;
+        "setProtectionCloseFactorWhitelist(address[],bool[])": FunctionFragment;
         "setProtectionCloseFactors(uint16[],uint40[])": FunctionFragment;
         "addCollateral(address,address)": FunctionFragment;
         "closePendingOrder((address,uint32))": FunctionFragment;
-        "closeTrade((address,uint32))": FunctionFragment;
+        "closeTrade((address,uint32),bool)": FunctionFragment;
         "getAllPendingOrders(uint256,uint256)": FunctionFragment;
+        "getAllPendingOrdersForTraders(address[],uint256,uint256)": FunctionFragment;
         "getAllTradeInfos(uint256,uint256)": FunctionFragment;
+        "getAllTradeInfosForTraders(address[],uint256,uint256)": FunctionFragment;
         "getAllTrades(uint256,uint256)": FunctionFragment;
+        "getAllTradesForTraders(address[],uint256,uint256)": FunctionFragment;
         "getAllTradesLiquidationParams(uint256,uint256)": FunctionFragment;
+        "getAllTradesLiquidationParamsForTraders(address[],uint256,uint256)": FunctionFragment;
         "getCollateral(uint8)": FunctionFragment;
         "getCollateralIndex(address)": FunctionFragment;
         "getCollaterals()": FunctionFragment;
         "getCollateralsCount()": FunctionFragment;
         "getCounters(address,uint8)": FunctionFragment;
+        "getCountersForTraders(address[],uint8)": FunctionFragment;
         "getCurrentContractsVersion()": FunctionFragment;
         "getGToken(uint8)": FunctionFragment;
         "getPendingOrder((address,uint32))": FunctionFragment;
@@ -1016,6 +1048,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "getTradePendingOrderBlock((address,uint32),uint8)": FunctionFragment;
         "getTraderStored(address)": FunctionFragment;
         "getTraders(uint32,uint32)": FunctionFragment;
+        "getTradersCount()": FunctionFragment;
         "getTrades(address)": FunctionFragment;
         "getTradesLiquidationParams(address)": FunctionFragment;
         "getTradingActivated()": FunctionFragment;
@@ -1029,7 +1062,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "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)": FunctionFragment;
+        "updateTradePosition((address,uint32),uint120,uint24,uint64,bool,bool)": FunctionFragment;
         "updateTradeSl((address,uint32),uint64)": FunctionFragment;
         "updateTradeTp((address,uint32),uint64)": FunctionFragment;
         "updateTradingActivated(uint8)": FunctionFragment;
@@ -1073,8 +1106,10 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "getVaultClosingFeeP()": FunctionFragment;
         "increasePositionSizeMarketCallback(((address,uint32),uint256,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;
+        "updateTreasuryAddress(address)": FunctionFragment;
         "updateVaultClosingFeeP(uint8)": FunctionFragment;
         "validateTriggerCloseOrderCallback((address,uint32),uint8,uint64,uint64,uint64)": FunctionFragment;
         "validateTriggerOpenOrderCallback((address,uint32),uint8,uint64,uint64,uint64)": FunctionFragment;
@@ -1146,7 +1181,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "updateOtcConfig((address,uint64,uint64,uint64,uint64))": FunctionFragment;
         "multicall(bytes[])": FunctionFragment;
     };
-    getFunction(nameOrSignatureOrTopic: "diamondCut" | "facetAddress" | "facetAddresses" | "facetFunctionSelectors" | "facets" | "getAddresses" | "hasRole" | "initialize" | "setRoles" | "addFees" | "addGroups" | "addPairs" | "fees" | "feesCount" | "getAllPairsRestrictedMaxLeverage" | "getGroupLiquidationParams" | "getPairLiquidationParams" | "groups" | "groupsCount" | "initializeGroupLiquidationParams" | "isPairIndexListed" | "isPairListed" | "pairCloseFeeP" | "pairCustomMaxLeverage" | "pairJob" | "pairMaxLeverage" | "pairMinFeeUsd" | "pairMinLeverage" | "pairMinPositionSizeUsd" | "pairOpenFeeP" | "pairOracleFeeP" | "pairSpreadP" | "pairTriggerOrderFeeP" | "pairs" | "pairsBackend" | "pairsCount" | "setGroupLiquidationParams" | "setPairCustomMaxLeverages" | "updateFees" | "updateGroups" | "updatePairs" | "claimAllyRewards" | "claimReferrerRewards" | "distributeReferralReward" | "getAllyDetails" | "getReferralsAllyFeeP" | "getReferralsOpenFeeP" | "getReferralsStartReferrerFeeP" | "getReferralsTargetVolumeUsd" | "getReferrerDetails" | "getReferrerFeeP" | "getReferrersReferred" | "getTraderActiveReferrer" | "getTraderLastReferrer" | "getTradersReferred" | "initializeReferrals" | "registerPotentialReferrer" | "unwhitelistAllies" | "unwhitelistReferrers" | "updateAllyFeeP" | "updateReferralsOpenFeeP" | "updateReferralsTargetVolumeUsd" | "updateStartReferrerFeeP" | "whitelistAllies" | "whitelistReferrers" | "calculateFeeAmount" | "getFeeTier" | "getFeeTiersCount" | "getFeeTiersTraderDailyInfo" | "getFeeTiersTraderInfo" | "getGroupVolumeMultiplier" | "getTraderFeeTiersEnrollment" | "initializeFeeTiers" | "setFeeTiers" | "setGroupVolumeMultipliers" | "setTradersFeeTiersEnrollment" | "updateTraderPoints" | "addPriceImpactOpenInterest" | "getOiWindow" | "getOiWindows" | "getOiWindowsSettings" | "getPairDepth" | "getPairDepths" | "getPairFactors" | "getPriceImpactOi" | "getTradePriceImpact" | "initializePairFactors" | "initializePriceImpact" | "setCumulativeFactors" | "setPairDepths" | "setPriceImpactWindowsCount" | "setPriceImpactWindowsDuration" | "setProtectionCloseFactorBlocks" | "setProtectionCloseFactors" | "addCollateral" | "closePendingOrder" | "closeTrade" | "getAllPendingOrders" | "getAllTradeInfos" | "getAllTrades" | "getAllTradesLiquidationParams" | "getCollateral" | "getCollateralIndex" | "getCollaterals" | "getCollateralsCount" | "getCounters" | "getCurrentContractsVersion" | "getGToken" | "getPendingOrder" | "getPendingOrders" | "getTrade" | "getTradeInfo" | "getTradeInfos" | "getTradeLiquidationParams" | "getTradePendingOrderBlock" | "getTraderStored" | "getTraders" | "getTrades" | "getTradesLiquidationParams" | "getTradingActivated" | "initializeTradingStorage" | "isCollateralActive" | "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" | "initializeTrading" | "isWrappedNativeToken" | "openTrade" | "openTradeNative" | "removeTradingDelegate" | "setTradingDelegate" | "triggerOrder" | "updateByPassTriggerLink" | "updateLeverage" | "updateMarketOrdersTimeoutBlocks" | "updateMaxClosingSlippageP" | "updateOpenOrder" | "updateSl" | "updateTp" | "claimPendingGovFees" | "closeTradeMarketCallback" | "decreasePositionSizeMarketCallback" | "executeTriggerCloseOrderCallback" | "executeTriggerOpenOrderCallback" | "getPendingGovFeesCollateral" | "getVaultClosingFeeP" | "increasePositionSizeMarketCallback" | "initializeCallbacks" | "openTradeMarketCallback" | "updateLeverageCallback" | "updateVaultClosingFeeP" | "validateTriggerCloseOrderCallback" | "validateTriggerOpenOrderCallback" | "getAllBorrowingPairs" | "getBorrowingGroup" | "getBorrowingGroupOi" | "getBorrowingGroupPendingAccFees" | "getBorrowingGroups" | "getBorrowingInitialAccFees" | "getBorrowingPair" | "getBorrowingPairGroupIndex" | "getBorrowingPairGroups" | "getBorrowingPairOi" | "getBorrowingPairPendingAccFees" | "getPairMaxOi" | "getPairMaxOiCollateral" | "getPairOiCollateral" | "getPairOisCollateral" | "getTradeBorrowingFee" | "getTradeLiquidationPrice" | "handleTradeBorrowingCallback" | "resetTradeBorrowingFees" | "setBorrowingGroupParams" | "setBorrowingGroupParamsArray" | "setBorrowingPairParams" | "setBorrowingPairParamsArray" | "withinMaxBorrowingGroupOi" | "addOracle" | "claimBackLink" | "fulfill" | "getChainlinkToken" | "getCollateralFromUsdNormalizedValue" | "getCollateralGnsLiquidityPool" | "getCollateralPriceUsd" | "getCollateralUsdPriceFeed" | "getGnsPriceCollateralAddress" | "getGnsPriceCollateralIndex" | "getGnsPriceUsd" | "getLimitJobId" | "getLinkFee" | "getLinkUsdPriceFeed" | "getMarketJobId" | "getMinAnswers" | "getOracle" | "getOracles" | "getPendingRequest" | "getPrice" | "getPriceAggregatorOrder" | "getPriceAggregatorOrderAnswers" | "getRequestCount" | "getTwapInterval" | "getUsdNormalizedValue" | "initializePriceAggregator" | "removeOracle" | "replaceOracle" | "setLimitJobId" | "setMarketJobId" | "updateCollateralGnsLiquidityPool" | "updateCollateralUsdPriceFeed" | "updateLinkUsdPriceFeed" | "updateMinAnswers" | "updateTwapInterval" | "addOtcCollateralBalance" | "getOtcBalance" | "getOtcConfig" | "getOtcRate" | "initializeOtc" | "sellGnsForCollateral" | "updateOtcConfig" | "multicall"): 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" | "isPairIndexListed" | "isPairListed" | "pairCustomMaxLeverage" | "pairJob" | "pairMaxLeverage" | "pairMinFeeUsd" | "pairMinLeverage" | "pairMinPositionSizeUsd" | "pairOraclePositionSizeFeeP" | "pairSpreadP" | "pairTotalLiqCollateralFeeP" | "pairTotalPositionSizeFeeP" | "pairs" | "pairsCount" | "setGlobalTradeFeeParams" | "setGroupLiquidationParams" | "setPairCustomMaxLeverages" | "updateFees" | "updateGroups" | "updatePairs" | "claimAllyRewards" | "claimReferrerRewards" | "distributeReferralReward" | "getAllyDetails" | "getReferralsAllyFeeP" | "getReferralsStartReferrerFeeP" | "getReferralsTargetVolumeUsd" | "getReferrerDetails" | "getReferrerFeeProgressP" | "getReferrersReferred" | "getTraderActiveReferrer" | "getTraderLastReferrer" | "getTradersReferred" | "initializeReferrals" | "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" | "initializeNegPnlCumulVolMultiplier" | "initializePairFactors" | "initializePriceImpact" | "setCumulativeFactors" | "setExemptAfterProtectionCloseFactor" | "setExemptOnOpen" | "setNegPnlCumulVolMultiplier" | "setPairDepths" | "setPriceImpactWindowsCount" | "setPriceImpactWindowsDuration" | "setProtectionCloseFactorBlocks" | "setProtectionCloseFactorWhitelist" | "setProtectionCloseFactors" | "addCollateral" | "closePendingOrder" | "closeTrade" | "getAllPendingOrders" | "getAllPendingOrdersForTraders" | "getAllTradeInfos" | "getAllTradeInfosForTraders" | "getAllTrades" | "getAllTradesForTraders" | "getAllTradesLiquidationParams" | "getAllTradesLiquidationParamsForTraders" | "getCollateral" | "getCollateralIndex" | "getCollaterals" | "getCollateralsCount" | "getCounters" | "getCountersForTraders" | "getCurrentContractsVersion" | "getGToken" | "getPendingOrder" | "getPendingOrders" | "getTrade" | "getTradeInfo" | "getTradeInfos" | "getTradeLiquidationParams" | "getTradePendingOrderBlock" | "getTraderStored" | "getTraders" | "getTradersCount" | "getTrades" | "getTradesLiquidationParams" | "getTradingActivated" | "initializeTradingStorage" | "isCollateralActive" | "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" | "initializeTrading" | "isWrappedNativeToken" | "openTrade" | "openTradeNative" | "removeTradingDelegate" | "setTradingDelegate" | "triggerOrder" | "updateByPassTriggerLink" | "updateLeverage" | "updateMarketOrdersTimeoutBlocks" | "updateMaxClosingSlippageP" | "updateOpenOrder" | "updateSl" | "updateTp" | "claimPendingGovFees" | "closeTradeMarketCallback" | "decreasePositionSizeMarketCallback" | "executeTriggerCloseOrderCallback" | "executeTriggerOpenOrderCallback" | "getPendingGovFeesCollateral" | "getVaultClosingFeeP" | "increasePositionSizeMarketCallback" | "initializeCallbacks" | "initializeTreasuryAddress" | "openTradeMarketCallback" | "updateLeverageCallback" | "updateTreasuryAddress" | "updateVaultClosingFeeP" | "validateTriggerCloseOrderCallback" | "validateTriggerOpenOrderCallback" | "getAllBorrowingPairs" | "getBorrowingGroup" | "getBorrowingGroupOi" | "getBorrowingGroupPendingAccFees" | "getBorrowingGroups" | "getBorrowingInitialAccFees" | "getBorrowingPair" | "getBorrowingPairGroupIndex" | "getBorrowingPairGroups" | "getBorrowingPairOi" | "getBorrowingPairPendingAccFees" | "getPairMaxOi" | "getPairMaxOiCollateral" | "getPairOiCollateral" | "getPairOisCollateral" | "getTradeBorrowingFee" | "getTradeLiquidationPrice" | "handleTradeBorrowingCallback" | "resetTradeBorrowingFees" | "setBorrowingGroupParams" | "setBorrowingGroupParamsArray" | "setBorrowingPairParams" | "setBorrowingPairParamsArray" | "withinMaxBorrowingGroupOi" | "addOracle" | "claimBackLink" | "fulfill" | "getChainlinkToken" | "getCollateralFromUsdNormalizedValue" | "getCollateralGnsLiquidityPool" | "getCollateralPriceUsd" | "getCollateralUsdPriceFeed" | "getGnsPriceCollateralAddress" | "getGnsPriceCollateralIndex" | "getGnsPriceUsd" | "getLimitJobId" | "getLinkFee" | "getLinkUsdPriceFeed" | "getMarketJobId" | "getMinAnswers" | "getOracle" | "getOracles" | "getPendingRequest" | "getPrice" | "getPriceAggregatorOrder" | "getPriceAggregatorOrderAnswers" | "getRequestCount" | "getTwapInterval" | "getUsdNormalizedValue" | "initializePriceAggregator" | "removeOracle" | "replaceOracle" | "setLimitJobId" | "setMarketJobId" | "updateCollateralGnsLiquidityPool" | "updateCollateralUsdPriceFeed" | "updateLinkUsdPriceFeed" | "updateMinAnswers" | "updateTwapInterval" | "addOtcCollateralBalance" | "getOtcBalance" | "getOtcConfig" | "getOtcRate" | "initializeOtc" | "sellGnsForCollateral" | "updateOtcConfig" | "multicall"): FunctionFragment;
     encodeFunctionData(functionFragment: "diamondCut", values: [
         IDiamondStorage.FacetCutStruct[],
         PromiseOrValue<string>,
@@ -1158,45 +1193,51 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "facets", values?: undefined): string;
     encodeFunctionData(functionFragment: "getAddresses", values?: undefined): string;
     encodeFunctionData(functionFragment: "hasRole", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "hasRoles", values: [
+        PromiseOrValue<string>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
     encodeFunctionData(functionFragment: "initialize", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "setRoles", values: [
         PromiseOrValue<string>[],
         PromiseOrValue<BigNumberish>[],
         PromiseOrValue<boolean>[]
     ]): string;
-    encodeFunctionData(functionFragment: "addFees", values: [IPairsStorage.FeeStruct[]]): string;
+    encodeFunctionData(functionFragment: "addFees", values: [IPairsStorage.FeeGroupStruct[]]): string;
     encodeFunctionData(functionFragment: "addGroups", values: [IPairsStorage.GroupStruct[]]): string;
     encodeFunctionData(functionFragment: "addPairs", values: [IPairsStorage.PairStruct[]]): string;
     encodeFunctionData(functionFragment: "fees", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "feesCount", values?: undefined): string;
     encodeFunctionData(functionFragment: "getAllPairsRestrictedMaxLeverage", values?: undefined): string;
+    encodeFunctionData(functionFragment: "getGlobalTradeFeeParams", values?: undefined): string;
     encodeFunctionData(functionFragment: "getGroupLiquidationParams", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getPairLiquidationParams", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "groups", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "groupsCount", values?: undefined): string;
     encodeFunctionData(functionFragment: "initializeGroupLiquidationParams", values: [IPairsStorage.GroupLiquidationParamsStruct[]]): string;
+    encodeFunctionData(functionFragment: "initializeNewFees", values: [IPairsStorage.GlobalTradeFeeParamsStruct]): string;
     encodeFunctionData(functionFragment: "isPairIndexListed", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "isPairListed", values: [PromiseOrValue<string>, PromiseOrValue<string>]): string;
-    encodeFunctionData(functionFragment: "pairCloseFeeP", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "pairCustomMaxLeverage", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "pairJob", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "pairMaxLeverage", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "pairMinFeeUsd", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "pairMinLeverage", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "pairMinPositionSizeUsd", values: [PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "pairOpenFeeP", values: [PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "pairOracleFeeP", values: [PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "pairOraclePositionSizeFeeP", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "pairSpreadP", values: [PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "pairTriggerOrderFeeP", values: [PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "pairTotalLiqCollateralFeeP", values: [PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "pairTotalPositionSizeFeeP", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "pairs", values: [PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "pairsBackend", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "pairsCount", values?: undefined): string;
+    encodeFunctionData(functionFragment: "setGlobalTradeFeeParams", values: [IPairsStorage.GlobalTradeFeeParamsStruct]): string;
     encodeFunctionData(functionFragment: "setGroupLiquidationParams", values: [
         PromiseOrValue<BigNumberish>,
         IPairsStorage.GroupLiquidationParamsStruct
     ]): string;
     encodeFunctionData(functionFragment: "setPairCustomMaxLeverages", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<BigNumberish>[]]): string;
-    encodeFunctionData(functionFragment: "updateFees", values: [PromiseOrValue<BigNumberish>[], IPairsStorage.FeeStruct[]]): string;
+    encodeFunctionData(functionFragment: "updateFees", values: [PromiseOrValue<BigNumberish>[], IPairsStorage.FeeGroupStruct[]]): string;
     encodeFunctionData(functionFragment: "updateGroups", values: [PromiseOrValue<BigNumberish>[], IPairsStorage.GroupStruct[]]): string;
     encodeFunctionData(functionFragment: "updatePairs", values: [PromiseOrValue<BigNumberish>[], IPairsStorage.PairStruct[]]): string;
     encodeFunctionData(functionFragment: "claimAllyRewards", values?: undefined): string;
@@ -1209,17 +1250,15 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     ]): string;
     encodeFunctionData(functionFragment: "getAllyDetails", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "getReferralsAllyFeeP", values?: undefined): string;
-    encodeFunctionData(functionFragment: "getReferralsOpenFeeP", values?: undefined): string;
     encodeFunctionData(functionFragment: "getReferralsStartReferrerFeeP", values?: undefined): string;
     encodeFunctionData(functionFragment: "getReferralsTargetVolumeUsd", values?: undefined): string;
     encodeFunctionData(functionFragment: "getReferrerDetails", values: [PromiseOrValue<string>]): string;
-    encodeFunctionData(functionFragment: "getReferrerFeeP", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getReferrerFeeProgressP", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "getReferrersReferred", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "getTraderActiveReferrer", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "getTraderLastReferrer", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "getTradersReferred", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "initializeReferrals", values: [
-        PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>
@@ -1228,11 +1267,15 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "unwhitelistAllies", values: [PromiseOrValue<string>[]]): string;
     encodeFunctionData(functionFragment: "unwhitelistReferrers", values: [PromiseOrValue<string>[]]): string;
     encodeFunctionData(functionFragment: "updateAllyFeeP", values: [PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "updateReferralsOpenFeeP", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "updateReferralsTargetVolumeUsd", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "updateStartReferrerFeeP", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "whitelistAllies", values: [PromiseOrValue<string>[]]): string;
     encodeFunctionData(functionFragment: "whitelistReferrers", values: [PromiseOrValue<string>[], PromiseOrValue<string>[]]): string;
+    encodeFunctionData(functionFragment: "addTradersUnclaimedPoints", values: [
+        PromiseOrValue<string>[],
+        PromiseOrValue<BigNumberish>[],
+        PromiseOrValue<BigNumberish>[]
+    ]): string;
     encodeFunctionData(functionFragment: "calculateFeeAmount", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getFeeTier", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getFeeTiersCount", values?: undefined): string;
@@ -1240,6 +1283,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "getFeeTiersTraderInfo", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "getGroupVolumeMultiplier", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getTraderFeeTiersEnrollment", values: [PromiseOrValue<string>]): string;
+    encodeFunctionData(functionFragment: "getTraderUnclaimedPoints", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "initializeFeeTiers", values: [
         PromiseOrValue<BigNumberish>[],
         PromiseOrValue<BigNumberish>[],
@@ -1258,8 +1302,10 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<string>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
+        PromiseOrValue<boolean>,
         PromiseOrValue<boolean>
     ]): string;
+    encodeFunctionData(functionFragment: "getNegPnlCumulVolMultiplier", values?: undefined): string;
     encodeFunctionData(functionFragment: "getOiWindow", values: [
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
@@ -1275,7 +1321,9 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "getPairDepths", values: [PromiseOrValue<BigNumberish>[]]): string;
     encodeFunctionData(functionFragment: "getPairFactors", values: [PromiseOrValue<BigNumberish>[]]): string;
     encodeFunctionData(functionFragment: "getPriceImpactOi", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<boolean>]): string;
+    encodeFunctionData(functionFragment: "getProtectionCloseFactorWhitelist", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "getTradePriceImpact", values: [
+        PromiseOrValue<string>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<boolean>,
@@ -1285,6 +1333,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>
     ]): string;
+    encodeFunctionData(functionFragment: "initializeNegPnlCumulVolMultiplier", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "initializePairFactors", values: [
         PromiseOrValue<BigNumberish>[],
         PromiseOrValue<BigNumberish>[],
@@ -1293,6 +1342,9 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     ]): string;
     encodeFunctionData(functionFragment: "initializePriceImpact", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "setCumulativeFactors", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<BigNumberish>[]]): string;
+    encodeFunctionData(functionFragment: "setExemptAfterProtectionCloseFactor", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<boolean>[]]): string;
+    encodeFunctionData(functionFragment: "setExemptOnOpen", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<boolean>[]]): string;
+    encodeFunctionData(functionFragment: "setNegPnlCumulVolMultiplier", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "setPairDepths", values: [
         PromiseOrValue<BigNumberish>[],
         PromiseOrValue<BigNumberish>[],
@@ -1301,19 +1353,41 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "setPriceImpactWindowsCount", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "setPriceImpactWindowsDuration", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "setProtectionCloseFactorBlocks", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<BigNumberish>[]]): string;
+    encodeFunctionData(functionFragment: "setProtectionCloseFactorWhitelist", values: [PromiseOrValue<string>[], PromiseOrValue<boolean>[]]): string;
     encodeFunctionData(functionFragment: "setProtectionCloseFactors", values: [PromiseOrValue<BigNumberish>[], PromiseOrValue<BigNumberish>[]]): string;
     encodeFunctionData(functionFragment: "addCollateral", values: [PromiseOrValue<string>, PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "closePendingOrder", values: [ITradingStorage.IdStruct]): string;
-    encodeFunctionData(functionFragment: "closeTrade", values: [ITradingStorage.IdStruct]): string;
+    encodeFunctionData(functionFragment: "closeTrade", values: [ITradingStorage.IdStruct, PromiseOrValue<boolean>]): string;
     encodeFunctionData(functionFragment: "getAllPendingOrders", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getAllPendingOrdersForTraders", values: [
+        PromiseOrValue<string>[],
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
     encodeFunctionData(functionFragment: "getAllTradeInfos", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getAllTradeInfosForTraders", values: [
+        PromiseOrValue<string>[],
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
     encodeFunctionData(functionFragment: "getAllTrades", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getAllTradesForTraders", values: [
+        PromiseOrValue<string>[],
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
     encodeFunctionData(functionFragment: "getAllTradesLiquidationParams", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getAllTradesLiquidationParamsForTraders", values: [
+        PromiseOrValue<string>[],
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
     encodeFunctionData(functionFragment: "getCollateral", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getCollateralIndex", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "getCollaterals", values?: undefined): string;
     encodeFunctionData(functionFragment: "getCollateralsCount", values?: undefined): string;
     encodeFunctionData(functionFragment: "getCounters", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getCountersForTraders", values: [PromiseOrValue<string>[], PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getCurrentContractsVersion", values?: undefined): string;
     encodeFunctionData(functionFragment: "getGToken", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getPendingOrder", values: [ITradingStorage.IdStruct]): string;
@@ -1325,6 +1399,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "getTradePendingOrderBlock", values: [ITradingStorage.IdStruct, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getTraderStored", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "getTraders", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getTradersCount", values?: undefined): string;
     encodeFunctionData(functionFragment: "getTrades", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "getTradesLiquidationParams", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "getTradingActivated", values?: undefined): string;
@@ -1354,6 +1429,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
+        PromiseOrValue<boolean>,
         PromiseOrValue<boolean>
     ]): string;
     encodeFunctionData(functionFragment: "updateTradeSl", values: [ITradingStorage.IdStruct, PromiseOrValue<BigNumberish>]): string;
@@ -1424,8 +1500,10 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "getVaultClosingFeeP", values?: undefined): string;
     encodeFunctionData(functionFragment: "increasePositionSizeMarketCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
     encodeFunctionData(functionFragment: "initializeCallbacks", values: [PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "initializeTreasuryAddress", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "openTradeMarketCallback", 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;
     encodeFunctionData(functionFragment: "validateTriggerCloseOrderCallback", values: [
         ITradingStorage.IdStruct,
@@ -1595,6 +1673,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     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;
@@ -1603,27 +1682,28 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     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: "isPairIndexListed", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "isPairListed", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "pairCloseFeeP", 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: "pairOpenFeeP", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "pairOracleFeeP", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "pairOraclePositionSizeFeeP", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "pairSpreadP", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "pairTriggerOrderFeeP", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "pairTotalLiqCollateralFeeP", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "pairTotalPositionSizeFeeP", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "pairs", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "pairsBackend", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "pairsCount", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setGlobalTradeFeeParams", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setGroupLiquidationParams", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setPairCustomMaxLeverages", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateFees", data: BytesLike): Result;
@@ -1634,11 +1714,10 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "distributeReferralReward", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getAllyDetails", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getReferralsAllyFeeP", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getReferralsOpenFeeP", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getReferralsStartReferrerFeeP", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getReferralsTargetVolumeUsd", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getReferrerDetails", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getReferrerFeeP", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getReferrerFeeProgressP", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getReferrersReferred", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTraderActiveReferrer", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTraderLastReferrer", data: BytesLike): Result;
@@ -1648,11 +1727,11 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "unwhitelistAllies", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "unwhitelistReferrers", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateAllyFeeP", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "updateReferralsOpenFeeP", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateReferralsTargetVolumeUsd", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateStartReferrerFeeP", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "whitelistAllies", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "whitelistReferrers", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "addTradersUnclaimedPoints", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "calculateFeeAmount", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getFeeTier", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getFeeTiersCount", data: BytesLike): Result;
@@ -1660,12 +1739,14 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "getFeeTiersTraderInfo", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getGroupVolumeMultiplier", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTraderFeeTiersEnrollment", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getTraderUnclaimedPoints", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "initializeFeeTiers", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setFeeTiers", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setGroupVolumeMultipliers", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setTradersFeeTiersEnrollment", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateTraderPoints", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "addPriceImpactOpenInterest", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getNegPnlCumulVolMultiplier", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getOiWindow", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getOiWindows", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getOiWindowsSettings", data: BytesLike): Result;
@@ -1673,27 +1754,38 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "getPairDepths", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPairFactors", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPriceImpactOi", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getProtectionCloseFactorWhitelist", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTradePriceImpact", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "initializeNegPnlCumulVolMultiplier", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "initializePairFactors", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "initializePriceImpact", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setCumulativeFactors", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setExemptAfterProtectionCloseFactor", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setExemptOnOpen", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "setNegPnlCumulVolMultiplier", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setPairDepths", 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: "addCollateral", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "closePendingOrder", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "closeTrade", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getAllPendingOrders", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getAllPendingOrdersForTraders", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getAllTradeInfos", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getAllTradeInfosForTraders", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getAllTrades", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getAllTradesForTraders", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getAllTradesLiquidationParams", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getAllTradesLiquidationParamsForTraders", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getCollateral", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getCollateralIndex", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getCollaterals", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getCollateralsCount", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getCounters", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getCountersForTraders", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getCurrentContractsVersion", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getGToken", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPendingOrder", data: BytesLike): Result;
@@ -1705,6 +1797,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "getTradePendingOrderBlock", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTraderStored", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTraders", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getTradersCount", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTrades", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTradesLiquidationParams", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTradingActivated", data: BytesLike): Result;
@@ -1762,8 +1855,10 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "getVaultClosingFeeP", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "increasePositionSizeMarketCallback", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "initializeCallbacks", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "initializeTreasuryAddress", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "openTradeMarketCallback", 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;
@@ -1839,8 +1934,9 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "AddressesUpdated(tuple)": EventFragment;
         "DiamondCut(tuple[],address,bytes)": EventFragment;
         "Initialized(uint8)": EventFragment;
-        "FeeAdded(uint256,string)": EventFragment;
-        "FeeUpdated(uint256)": EventFragment;
+        "FeeAdded(uint256,tuple)": EventFragment;
+        "FeeUpdated(uint256,tuple)": EventFragment;
+        "GlobalTradeFeeParamsUpdated(tuple)": EventFragment;
         "GroupAdded(uint256,string)": EventFragment;
         "GroupLiquidationParamsUpdated(uint256,tuple)": EventFragment;
         "GroupUpdated(uint256)": EventFragment;
@@ -1867,8 +1963,13 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "TraderFeeMultiplierCached(address,uint32,uint32)": EventFragment;
         "TraderInfoFirstUpdate(address,uint32)": EventFragment;
         "TraderInfoUpdated(address,tuple)": EventFragment;
+        "TraderPointsCredited(address,uint32,uint8,uint224)": EventFragment;
         "TraderTrailingPointsExpired(address,uint32,uint32,uint224)": EventFragment;
+        "TraderUnclaimedPointsClaimed(address,uint32,uint224)": EventFragment;
         "CumulativeFactorUpdated(uint256,uint40)": EventFragment;
+        "ExemptAfterProtectionCloseFactorUpdated(uint256,bool)": EventFragment;
+        "ExemptOnOpenUpdated(uint256,bool)": EventFragment;
+        "NegPnlCumulVolMultiplierUpdated(uint40)": EventFragment;
         "OiWindowsSettingsInitialized(uint48,uint48)": EventFragment;
         "OnePercentDepthUpdated(uint256,uint128,uint128)": EventFragment;
         "PriceImpactOiTransferredPair(uint256,tuple)": EventFragment;
@@ -1878,20 +1979,21 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "PriceImpactWindowsDurationUpdated(uint48)": EventFragment;
         "ProtectionCloseFactorBlocksUpdated(uint256,uint32)": EventFragment;
         "ProtectionCloseFactorUpdated(uint256,uint40)": EventFragment;
+        "ProtectionCloseFactorWhitelistUpdated(address,bool)": EventFragment;
         "CollateralAdded(address,uint8,address)": EventFragment;
         "CollateralDisabled(uint8)": EventFragment;
         "CollateralUpdated(uint8,bool)": EventFragment;
         "GTokenUpdated(address,uint8,address)": EventFragment;
-        "OpenOrderDetailsUpdated(tuple,uint64,uint64,uint64,uint16)": EventFragment;
+        "OpenOrderDetailsUpdated(address,uint32,uint64,uint64,uint64,uint16)": EventFragment;
         "PendingOrderClosed(tuple)": EventFragment;
         "PendingOrderStored(tuple)": EventFragment;
-        "TradeClosed(tuple)": EventFragment;
-        "TradeCollateralUpdated(tuple,uint120)": EventFragment;
-        "TradeMaxClosingSlippagePUpdated(tuple,uint16)": EventFragment;
-        "TradePositionUpdated(tuple,uint120,uint24,uint64,uint64,uint64,bool)": EventFragment;
-        "TradeSlUpdated(tuple,uint64)": EventFragment;
-        "TradeStored(tuple,tuple,tuple)": EventFragment;
-        "TradeTpUpdated(tuple,uint64)": EventFragment;
+        "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;
+        "TradeSlUpdated(address,uint32,uint64)": EventFragment;
+        "TradeStored(address,uint32,tuple,tuple,tuple)": EventFragment;
+        "TradeTpUpdated(address,uint32,uint64)": EventFragment;
         "TradingActivatedUpdated(uint8)": EventFragment;
         "TriggerRewarded(uint256,uint256)": EventFragment;
         "TriggerRewardsClaimed(address,uint256)": EventFragment;
@@ -1911,13 +2013,13 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "PositionSizeIncreaseExecuted(tuple,uint8,uint8,address,uint256,uint256,bool,uint256,uint256,uint256,uint256,tuple)": EventFragment;
         "PositionSizeUpdateInitiated(tuple,address,uint256,uint256,bool,uint256,uint256)": EventFragment;
         "TriggerOrderInitiated(tuple,address,uint16,bool)": EventFragment;
-        "BorrowingFeeCharged(address,uint8,uint256)": EventFragment;
+        "BorrowingFeeCharged(address,uint32,uint8,uint256)": EventFragment;
         "GTokenFeeCharged(address,uint8,uint256)": EventFragment;
-        "GnsStakingFeeCharged(address,uint8,uint256)": EventFragment;
+        "GnsOtcFeeCharged(address,uint8,uint256)": EventFragment;
         "GovFeeCharged(address,uint8,uint256)": EventFragment;
-        "LimitExecuted(tuple,tuple,address,uint8,uint256,uint256,int256,uint256,uint256,bool)": EventFragment;
+        "LimitExecuted(tuple,address,uint32,uint32,tuple,address,uint8,uint256,uint256,uint256,uint256,int256,uint256,uint256,bool)": EventFragment;
         "MarketCloseCanceled(tuple,address,uint256,uint256,uint8)": EventFragment;
-        "MarketExecuted(tuple,tuple,bool,uint64,uint256,int256,uint256,uint256)": EventFragment;
+        "MarketExecuted(tuple,address,uint32,tuple,bool,uint256,uint256,uint256,uint256,int256,uint256,uint256)": EventFragment;
         "MarketOpenCanceled(tuple,address,uint256,uint8)": EventFragment;
         "PendingGovFeesClaimed(uint8,uint256)": EventFragment;
         "ReferralFeeCharged(address,uint8,uint256)": EventFragment;
@@ -1957,6 +2059,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "Initialized"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "FeeAdded"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "FeeUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "GlobalTradeFeeParamsUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "GroupAdded"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "GroupLiquidationParamsUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "GroupUpdated"): EventFragment;
@@ -1983,8 +2086,13 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "TraderFeeMultiplierCached"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "TraderInfoFirstUpdate"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "TraderInfoUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "TraderPointsCredited"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "TraderTrailingPointsExpired"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "TraderUnclaimedPointsClaimed"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "CumulativeFactorUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "ExemptAfterProtectionCloseFactorUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "ExemptOnOpenUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "NegPnlCumulVolMultiplierUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "OiWindowsSettingsInitialized"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "OnePercentDepthUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "PriceImpactOiTransferredPair"): EventFragment;
@@ -1994,6 +2102,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "PriceImpactWindowsDurationUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "ProtectionCloseFactorBlocksUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "ProtectionCloseFactorUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "ProtectionCloseFactorWhitelistUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "CollateralAdded"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "CollateralDisabled"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "CollateralUpdated"): EventFragment;
@@ -2029,7 +2138,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "TriggerOrderInitiated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "BorrowingFeeCharged"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "GTokenFeeCharged"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "GnsStakingFeeCharged"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "GnsOtcFeeCharged"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "GovFeeCharged"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "LimitExecuted"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "MarketCloseCanceled"): EventFragment;
@@ -2103,18 +2212,29 @@ export type InitializedEvent = TypedEvent<[number], InitializedEventObject>;
 export type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
 export interface FeeAddedEventObject {
     index: BigNumber;
-    name: string;
+    feeGroup: IPairsStorage.FeeGroupStructOutput;
 }
 export type FeeAddedEvent = TypedEvent<[
     BigNumber,
-    string
+    IPairsStorage.FeeGroupStructOutput
 ], FeeAddedEventObject>;
 export type FeeAddedEventFilter = TypedEventFilter<FeeAddedEvent>;
 export interface FeeUpdatedEventObject {
     index: BigNumber;
+    feeGroup: IPairsStorage.FeeGroupStructOutput;
 }
-export type FeeUpdatedEvent = TypedEvent<[BigNumber], FeeUpdatedEventObject>;
+export type FeeUpdatedEvent = TypedEvent<[
+    BigNumber,
+    IPairsStorage.FeeGroupStructOutput
+], FeeUpdatedEventObject>;
 export type FeeUpdatedEventFilter = TypedEventFilter<FeeUpdatedEvent>;
+export interface GlobalTradeFeeParamsUpdatedEventObject {
+    feeParams: IPairsStorage.GlobalTradeFeeParamsStructOutput;
+}
+export type GlobalTradeFeeParamsUpdatedEvent = TypedEvent<[
+    IPairsStorage.GlobalTradeFeeParamsStructOutput
+], GlobalTradeFeeParamsUpdatedEventObject>;
+export type GlobalTradeFeeParamsUpdatedEventFilter = TypedEventFilter<GlobalTradeFeeParamsUpdatedEvent>;
 export interface GroupAddedEventObject {
     index: BigNumber;
     name: string;
@@ -2347,6 +2467,19 @@ export type TraderInfoUpdatedEvent = TypedEvent<[
     IFeeTiers.TraderInfoStructOutput
 ], TraderInfoUpdatedEventObject>;
 export type TraderInfoUpdatedEventFilter = TypedEventFilter<TraderInfoUpdatedEvent>;
+export interface TraderPointsCreditedEventObject {
+    trader: string;
+    day: number;
+    creditType: number;
+    points: BigNumber;
+}
+export type TraderPointsCreditedEvent = TypedEvent<[
+    string,
+    number,
+    number,
+    BigNumber
+], TraderPointsCreditedEventObject>;
+export type TraderPointsCreditedEventFilter = TypedEventFilter<TraderPointsCreditedEvent>;
 export interface TraderTrailingPointsExpiredEventObject {
     trader: string;
     fromDay: number;
@@ -2360,6 +2493,17 @@ export type TraderTrailingPointsExpiredEvent = TypedEvent<[
     BigNumber
 ], TraderTrailingPointsExpiredEventObject>;
 export type TraderTrailingPointsExpiredEventFilter = TypedEventFilter<TraderTrailingPointsExpiredEvent>;
+export interface TraderUnclaimedPointsClaimedEventObject {
+    trader: string;
+    day: number;
+    points: BigNumber;
+}
+export type TraderUnclaimedPointsClaimedEvent = TypedEvent<[
+    string,
+    number,
+    BigNumber
+], TraderUnclaimedPointsClaimedEventObject>;
+export type TraderUnclaimedPointsClaimedEventFilter = TypedEventFilter<TraderUnclaimedPointsClaimedEvent>;
 export interface CumulativeFactorUpdatedEventObject {
     pairIndex: BigNumber;
     cumulativeFactor: number;
@@ -2369,6 +2513,31 @@ export type CumulativeFactorUpdatedEvent = TypedEvent<[
     number
 ], CumulativeFactorUpdatedEventObject>;
 export type CumulativeFactorUpdatedEventFilter = TypedEventFilter<CumulativeFactorUpdatedEvent>;
+export interface ExemptAfterProtectionCloseFactorUpdatedEventObject {
+    pairIndex: BigNumber;
+    exemptAfterProtectionCloseFactor: boolean;
+}
+export type ExemptAfterProtectionCloseFactorUpdatedEvent = TypedEvent<[
+    BigNumber,
+    boolean
+], ExemptAfterProtectionCloseFactorUpdatedEventObject>;
+export type ExemptAfterProtectionCloseFactorUpdatedEventFilter = TypedEventFilter<ExemptAfterProtectionCloseFactorUpdatedEvent>;
+export interface ExemptOnOpenUpdatedEventObject {
+    pairIndex: BigNumber;
+    exemptOnOpen: boolean;
+}
+export type ExemptOnOpenUpdatedEvent = TypedEvent<[
+    BigNumber,
+    boolean
+], ExemptOnOpenUpdatedEventObject>;
+export type ExemptOnOpenUpdatedEventFilter = TypedEventFilter<ExemptOnOpenUpdatedEvent>;
+export interface NegPnlCumulVolMultiplierUpdatedEventObject {
+    negPnlCumulVolMultiplier: number;
+}
+export type NegPnlCumulVolMultiplierUpdatedEvent = TypedEvent<[
+    number
+], NegPnlCumulVolMultiplierUpdatedEventObject>;
+export type NegPnlCumulVolMultiplierUpdatedEventFilter = TypedEventFilter<NegPnlCumulVolMultiplierUpdatedEvent>;
 export interface OiWindowsSettingsInitializedEventObject {
     windowsDuration: number;
     windowsCount: number;
@@ -2450,6 +2619,15 @@ export type ProtectionCloseFactorUpdatedEvent = TypedEvent<[
     number
 ], ProtectionCloseFactorUpdatedEventObject>;
 export type ProtectionCloseFactorUpdatedEventFilter = TypedEventFilter<ProtectionCloseFactorUpdatedEvent>;
+export interface ProtectionCloseFactorWhitelistUpdatedEventObject {
+    trader: string;
+    whitelisted: boolean;
+}
+export type ProtectionCloseFactorWhitelistUpdatedEvent = TypedEvent<[
+    string,
+    boolean
+], ProtectionCloseFactorWhitelistUpdatedEventObject>;
+export type ProtectionCloseFactorWhitelistUpdatedEventFilter = TypedEventFilter<ProtectionCloseFactorWhitelistUpdatedEvent>;
 export interface CollateralAddedEventObject {
     collateral: string;
     index: number;
@@ -2489,14 +2667,16 @@ export type GTokenUpdatedEvent = TypedEvent<[
 ], GTokenUpdatedEventObject>;
 export type GTokenUpdatedEventFilter = TypedEventFilter<GTokenUpdatedEvent>;
 export interface OpenOrderDetailsUpdatedEventObject {
-    tradeId: ITradingStorage.IdStructOutput;
+    user: string;
+    index: number;
     openPrice: BigNumber;
     tp: BigNumber;
     sl: BigNumber;
     maxSlippageP: number;
 }
 export type OpenOrderDetailsUpdatedEvent = TypedEvent<[
-    ITradingStorage.IdStructOutput,
+    string,
+    number,
     BigNumber,
     BigNumber,
     BigNumber,
@@ -2518,75 +2698,95 @@ export type PendingOrderStoredEvent = TypedEvent<[
 ], PendingOrderStoredEventObject>;
 export type PendingOrderStoredEventFilter = TypedEventFilter<PendingOrderStoredEvent>;
 export interface TradeClosedEventObject {
-    tradeId: ITradingStorage.IdStructOutput;
+    user: string;
+    index: number;
+    isPnlPositive: boolean;
 }
 export type TradeClosedEvent = TypedEvent<[
-    ITradingStorage.IdStructOutput
+    string,
+    number,
+    boolean
 ], TradeClosedEventObject>;
 export type TradeClosedEventFilter = TypedEventFilter<TradeClosedEvent>;
 export interface TradeCollateralUpdatedEventObject {
-    tradeId: ITradingStorage.IdStructOutput;
+    user: string;
+    index: number;
     collateralAmount: BigNumber;
 }
 export type TradeCollateralUpdatedEvent = TypedEvent<[
-    ITradingStorage.IdStructOutput,
+    string,
+    number,
     BigNumber
 ], TradeCollateralUpdatedEventObject>;
 export type TradeCollateralUpdatedEventFilter = TypedEventFilter<TradeCollateralUpdatedEvent>;
 export interface TradeMaxClosingSlippagePUpdatedEventObject {
-    tradeId: ITradingStorage.IdStructOutput;
+    user: string;
+    index: number;
     maxClosingSlippageP: number;
 }
 export type TradeMaxClosingSlippagePUpdatedEvent = TypedEvent<[
-    ITradingStorage.IdStructOutput,
+    string,
+    number,
     number
 ], TradeMaxClosingSlippagePUpdatedEventObject>;
 export type TradeMaxClosingSlippagePUpdatedEventFilter = TypedEventFilter<TradeMaxClosingSlippagePUpdatedEvent>;
 export interface TradePositionUpdatedEventObject {
-    tradeId: ITradingStorage.IdStructOutput;
+    user: string;
+    index: number;
     collateralAmount: BigNumber;
     leverage: number;
     openPrice: BigNumber;
     newTp: BigNumber;
     newSl: BigNumber;
     isPartialIncrease: boolean;
+    isPnlPositive: boolean;
 }
 export type TradePositionUpdatedEvent = TypedEvent<[
-    ITradingStorage.IdStructOutput,
+    string,
+    number,
     BigNumber,
     number,
     BigNumber,
     BigNumber,
     BigNumber,
+    boolean,
     boolean
 ], TradePositionUpdatedEventObject>;
 export type TradePositionUpdatedEventFilter = TypedEventFilter<TradePositionUpdatedEvent>;
 export interface TradeSlUpdatedEventObject {
-    tradeId: ITradingStorage.IdStructOutput;
+    user: string;
+    index: number;
     newSl: BigNumber;
 }
 export type TradeSlUpdatedEvent = TypedEvent<[
-    ITradingStorage.IdStructOutput,
+    string,
+    number,
     BigNumber
 ], TradeSlUpdatedEventObject>;
 export type TradeSlUpdatedEventFilter = TypedEventFilter<TradeSlUpdatedEvent>;
 export interface TradeStoredEventObject {
+    user: string;
+    index: number;
     trade: ITradingStorage.TradeStructOutput;
     tradeInfo: ITradingStorage.TradeInfoStructOutput;
     liquidationParams: IPairsStorage.GroupLiquidationParamsStructOutput;
 }
 export type TradeStoredEvent = TypedEvent<[
+    string,
+    number,
     ITradingStorage.TradeStructOutput,
     ITradingStorage.TradeInfoStructOutput,
     IPairsStorage.GroupLiquidationParamsStructOutput
 ], TradeStoredEventObject>;
 export type TradeStoredEventFilter = TypedEventFilter<TradeStoredEvent>;
 export interface TradeTpUpdatedEventObject {
-    tradeId: ITradingStorage.IdStructOutput;
+    user: string;
+    index: number;
     newTp: BigNumber;
 }
 export type TradeTpUpdatedEvent = TypedEvent<[
-    ITradingStorage.IdStructOutput,
+    string,
+    number,
     BigNumber
 ], TradeTpUpdatedEventObject>;
 export type TradeTpUpdatedEventFilter = TypedEventFilter<TradeTpUpdatedEvent>;
@@ -2659,7 +2859,7 @@ export interface LeverageUpdateExecutedEventObject {
     trader: string;
     pairIndex: BigNumber;
     index: BigNumber;
-    marketPrice: BigNumber;
+    oraclePrice: BigNumber;
     collateralDelta: BigNumber;
     values: IUpdateLeverage.UpdateLeverageValuesStructOutput;
 }
@@ -2771,7 +2971,7 @@ export interface PositionSizeDecreaseExecutedEventObject {
     pairIndex: BigNumber;
     index: BigNumber;
     long: boolean;
-    marketPrice: BigNumber;
+    oraclePrice: BigNumber;
     collateralPriceUsd: BigNumber;
     collateralDelta: BigNumber;
     leverageDelta: BigNumber;
@@ -2800,7 +3000,7 @@ export interface PositionSizeIncreaseExecutedEventObject {
     pairIndex: BigNumber;
     index: BigNumber;
     long: boolean;
-    marketPrice: BigNumber;
+    oraclePrice: BigNumber;
     collateralPriceUsd: BigNumber;
     collateralDelta: BigNumber;
     leverageDelta: BigNumber;
@@ -2855,12 +3055,14 @@ export type TriggerOrderInitiatedEvent = TypedEvent<[
 export type TriggerOrderInitiatedEventFilter = TypedEventFilter<TriggerOrderInitiatedEvent>;
 export interface BorrowingFeeChargedEventObject {
     trader: string;
+    index: number;
     collateralIndex: number;
     amountCollateral: BigNumber;
 }
 export type BorrowingFeeChargedEvent = TypedEvent<[
     string,
     number,
+    number,
     BigNumber
 ], BorrowingFeeChargedEventObject>;
 export type BorrowingFeeChargedEventFilter = TypedEventFilter<BorrowingFeeChargedEvent>;
@@ -2875,17 +3077,17 @@ export type GTokenFeeChargedEvent = TypedEvent<[
     BigNumber
 ], GTokenFeeChargedEventObject>;
 export type GTokenFeeChargedEventFilter = TypedEventFilter<GTokenFeeChargedEvent>;
-export interface GnsStakingFeeChargedEventObject {
+export interface GnsOtcFeeChargedEventObject {
     trader: string;
     collateralIndex: number;
     amountCollateral: BigNumber;
 }
-export type GnsStakingFeeChargedEvent = TypedEvent<[
+export type GnsOtcFeeChargedEvent = TypedEvent<[
     string,
     number,
     BigNumber
-], GnsStakingFeeChargedEventObject>;
-export type GnsStakingFeeChargedEventFilter = TypedEventFilter<GnsStakingFeeChargedEvent>;
+], GnsOtcFeeChargedEventObject>;
+export type GnsOtcFeeChargedEventFilter = TypedEventFilter<GnsOtcFeeChargedEvent>;
 export interface GovFeeChargedEventObject {
     trader: string;
     collateralIndex: number;
@@ -2899,10 +3101,15 @@ export type GovFeeChargedEvent = TypedEvent<[
 export type GovFeeChargedEventFilter = TypedEventFilter<GovFeeChargedEvent>;
 export interface LimitExecutedEventObject {
     orderId: ITradingStorage.IdStructOutput;
+    user: string;
+    index: number;
+    limitIndex: number;
     t: ITradingStorage.TradeStructOutput;
     triggerCaller: string;
     orderType: number;
-    price: BigNumber;
+    oraclePrice: BigNumber;
+    marketPrice: BigNumber;
+    liqPrice: BigNumber;
     priceImpactP: BigNumber;
     percentProfit: BigNumber;
     amountSentToTrader: BigNumber;
@@ -2911,6 +3118,9 @@ export interface LimitExecutedEventObject {
 }
 export type LimitExecutedEvent = TypedEvent<[
     ITradingStorage.IdStructOutput,
+    string,
+    number,
+    number,
     ITradingStorage.TradeStructOutput,
     string,
     number,
@@ -2919,6 +3129,8 @@ export type LimitExecutedEvent = TypedEvent<[
     BigNumber,
     BigNumber,
     BigNumber,
+    BigNumber,
+    BigNumber,
     boolean
 ], LimitExecutedEventObject>;
 export type LimitExecutedEventFilter = TypedEventFilter<LimitExecutedEvent>;
@@ -2939,9 +3151,13 @@ export type MarketCloseCanceledEvent = TypedEvent<[
 export type MarketCloseCanceledEventFilter = TypedEventFilter<MarketCloseCanceledEvent>;
 export interface MarketExecutedEventObject {
     orderId: ITradingStorage.IdStructOutput;
+    user: string;
+    index: number;
     t: ITradingStorage.TradeStructOutput;
     open: boolean;
-    price: BigNumber;
+    oraclePrice: BigNumber;
+    marketPrice: BigNumber;
+    liqPrice: BigNumber;
     priceImpactP: BigNumber;
     percentProfit: BigNumber;
     amountSentToTrader: BigNumber;
@@ -2949,12 +3165,16 @@ export interface MarketExecutedEventObject {
 }
 export type MarketExecutedEvent = TypedEvent<[
     ITradingStorage.IdStructOutput,
+    string,
+    number,
     ITradingStorage.TradeStructOutput,
     boolean,
     BigNumber,
     BigNumber,
     BigNumber,
     BigNumber,
+    BigNumber,
+    BigNumber,
     BigNumber
 ], MarketExecutedEventObject>;
 export type MarketExecutedEventFilter = TypedEventFilter<MarketExecutedEvent>;
@@ -3382,13 +3602,14 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         }>;
         getAddresses(overrides?: CallOverrides): Promise<[IAddressStore.AddressesStructOutput]>;
         hasRole(_account: PromiseOrValue<string>, _role: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[boolean]>;
-        initialize(_rolesManager: PromiseOrValue<string>, overrides?: Overrides & {
+        hasRoles(_account: PromiseOrValue<string>, _roleA: PromiseOrValue<BigNumberish>, _roleB: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[boolean]>;
+        initialize(_govTimelock: 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>;
-        addFees(_fees: IPairsStorage.FeeStruct[], overrides?: Overrides & {
+        addFees(_fees: IPairsStorage.FeeGroupStruct[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         addGroups(_groups: IPairsStorage.GroupStruct[], overrides?: Overrides & {
@@ -3397,9 +3618,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         addPairs(_pairs: IPairsStorage.PairStruct[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        fees(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPairsStorage.FeeStructOutput]>;
+        fees(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPairsStorage.FeeGroupStructOutput]>;
         feesCount(overrides?: CallOverrides): Promise<[BigNumber]>;
         getAllPairsRestrictedMaxLeverage(overrides?: CallOverrides): Promise<[BigNumber[]]>;
+        getGlobalTradeFeeParams(overrides?: CallOverrides): Promise<[IPairsStorage.GlobalTradeFeeParamsStructOutput]>;
         getGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPairsStorage.GroupLiquidationParamsStructOutput]>;
         getPairLiquidationParams(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPairsStorage.GroupLiquidationParamsStructOutput]>;
         groups(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPairsStorage.GroupStructOutput]>;
@@ -3407,33 +3629,33 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeGroupLiquidationParams(_groupLiquidationParams: IPairsStorage.GroupLiquidationParamsStruct[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        initializeNewFees(_tradeFeeParams: IPairsStorage.GlobalTradeFeeParamsStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         isPairIndexListed(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[boolean]>;
         isPairListed(_from: PromiseOrValue<string>, _to: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[boolean]>;
-        pairCloseFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         pairCustomMaxLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         pairJob(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[string, string]>;
         pairMaxLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         pairMinFeeUsd(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         pairMinLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         pairMinPositionSizeUsd(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
-        pairOpenFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
-        pairOracleFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
+        pairOraclePositionSizeFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         pairSpreadP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
-        pairTriggerOrderFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
+        pairTotalLiqCollateralFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
+        pairTotalPositionSizeFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         pairs(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPairsStorage.PairStructOutput]>;
-        pairsBackend(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
-            IPairsStorage.PairStructOutput,
-            IPairsStorage.GroupStructOutput,
-            IPairsStorage.FeeStructOutput
-        ]>;
         pairsCount(overrides?: CallOverrides): Promise<[BigNumber]>;
+        setGlobalTradeFeeParams(_feeParams: IPairsStorage.GlobalTradeFeeParamsStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         setGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, _params: IPairsStorage.GroupLiquidationParamsStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         setPairCustomMaxLeverages(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        updateFees(_ids: PromiseOrValue<BigNumberish>[], _fees: IPairsStorage.FeeStruct[], overrides?: Overrides & {
+        updateFees(_ids: PromiseOrValue<BigNumberish>[], _fees: IPairsStorage.FeeGroupStruct[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         updateGroups(_ids: PromiseOrValue<BigNumberish>[], _groups: IPairsStorage.GroupStruct[], overrides?: Overrides & {
@@ -3448,21 +3670,20 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         claimReferrerRewards(overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        distributeReferralReward(_trader: PromiseOrValue<string>, _volumeUsd: PromiseOrValue<BigNumberish>, _pairOpenFeeP: PromiseOrValue<BigNumberish>, _gnsPriceUsd: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        distributeReferralReward(_trader: PromiseOrValue<string>, _volumeUsd: PromiseOrValue<BigNumberish>, _referrerFeeUsd: PromiseOrValue<BigNumberish>, _gnsPriceUsd: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         getAllyDetails(_ally: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[IReferrals.AllyDetailsStructOutput]>;
         getReferralsAllyFeeP(overrides?: CallOverrides): Promise<[BigNumber]>;
-        getReferralsOpenFeeP(overrides?: CallOverrides): Promise<[BigNumber]>;
         getReferralsStartReferrerFeeP(overrides?: CallOverrides): Promise<[BigNumber]>;
         getReferralsTargetVolumeUsd(overrides?: CallOverrides): Promise<[BigNumber]>;
         getReferrerDetails(_referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[IReferrals.ReferrerDetailsStructOutput]>;
-        getReferrerFeeP(_pairOpenFeeP: PromiseOrValue<BigNumberish>, _volumeReferredUsd: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
+        getReferrerFeeProgressP(_referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[BigNumber]>;
         getReferrersReferred(_ally: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[string[]]>;
         getTraderActiveReferrer(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[string]>;
         getTraderLastReferrer(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[string]>;
         getTradersReferred(_referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[string[]]>;
-        initializeReferrals(_allyFeeP: PromiseOrValue<BigNumberish>, _startReferrerFeeP: PromiseOrValue<BigNumberish>, _openFeeP: PromiseOrValue<BigNumberish>, _targetVolumeUsd: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        initializeReferrals(_allyFeeP: PromiseOrValue<BigNumberish>, _startReferrerFeeP: PromiseOrValue<BigNumberish>, _targetVolumeUsd: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         registerPotentialReferrer(_trader: PromiseOrValue<string>, _referrer: PromiseOrValue<string>, overrides?: Overrides & {
@@ -3477,9 +3698,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateAllyFeeP(_value: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        updateReferralsOpenFeeP(_value: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<ContractTransaction>;
         updateReferralsTargetVolumeUsd(_value: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -3492,6 +3710,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         whitelistReferrers(_referrers: PromiseOrValue<string>[], _allies: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        addTradersUnclaimedPoints(_traders: PromiseOrValue<string>[], _creditTypes: PromiseOrValue<BigNumberish>[], _points: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         calculateFeeAmount(_trader: PromiseOrValue<string>, _normalFeeAmountCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         getFeeTier(_feeTierIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IFeeTiers.FeeTierStructOutput]>;
         getFeeTiersCount(overrides?: CallOverrides): Promise<[BigNumber]>;
@@ -3499,6 +3720,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getFeeTiersTraderInfo(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[IFeeTiers.TraderInfoStructOutput]>;
         getGroupVolumeMultiplier(_groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         getTraderFeeTiersEnrollment(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[IFeeTiers.TraderEnrollmentStructOutput]>;
+        getTraderUnclaimedPoints(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[BigNumber]>;
         initializeFeeTiers(_groupIndices: PromiseOrValue<BigNumberish>[], _groupVolumeMultipliers: PromiseOrValue<BigNumberish>[], _feeTiersIndices: PromiseOrValue<BigNumberish>[], _feeTiers: IFeeTiers.FeeTierStruct[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -3514,9 +3736,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateTraderPoints(_trader: PromiseOrValue<string>, _volumeUsd: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        addPriceImpactOpenInterest(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, overrides?: Overrides & {
+        addPriceImpactOpenInterest(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        getNegPnlCumulVolMultiplier(overrides?: CallOverrides): Promise<[number]>;
         getOiWindow(_windowsDuration: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _windowId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPriceImpact.PairOiStructOutput]>;
         getOiWindows(_windowsDuration: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _windowIds: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[IPriceImpact.PairOiStructOutput[]]>;
         getOiWindowsSettings(overrides?: CallOverrides): Promise<[IPriceImpact.OiWindowsSettingsStructOutput]>;
@@ -3526,13 +3749,17 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getPriceImpactOi(_pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<[BigNumber] & {
             activeOi: BigNumber;
         }>;
-        getTradePriceImpact(_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<[
+        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;
         }>;
+        initializeNegPnlCumulVolMultiplier(_negPnlCumulVolMultiplier: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         initializePairFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactors: PromiseOrValue<BigNumberish>[], _protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>[], _cumulativeFactors: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -3542,6 +3769,15 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setCumulativeFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _cumulativeFactors: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        setExemptAfterProtectionCloseFactor(_pairIndices: PromiseOrValue<BigNumberish>[], _exemptAfterProtectionCloseFactor: PromiseOrValue<boolean>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        setExemptOnOpen(_pairIndices: PromiseOrValue<BigNumberish>[], _exemptOnOpen: PromiseOrValue<boolean>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        setNegPnlCumulVolMultiplier(_negPnlCumulVolMultiplier: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         setPairDepths(_indices: PromiseOrValue<BigNumberish>[], _depthsAboveUsd: PromiseOrValue<BigNumberish>[], _depthsBelowUsd: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -3554,6 +3790,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setProtectionCloseFactorBlocks(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        setProtectionCloseFactorWhitelist(_traders: PromiseOrValue<string>[], _whitelisted: PromiseOrValue<boolean>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         setProtectionCloseFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactors: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -3563,18 +3802,23 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         closePendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        closeTrade(_tradeId: ITradingStorage.IdStruct, overrides?: Overrides & {
+        closeTrade(_tradeId: ITradingStorage.IdStruct, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         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[]]>;
+        getAllTradeInfosForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[ITradingStorage.TradeInfoStructOutput[]]>;
         getAllTrades(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[ITradingStorage.TradeStructOutput[]]>;
+        getAllTradesForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[ITradingStorage.TradeStructOutput[]]>;
         getAllTradesLiquidationParams(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPairsStorage.GroupLiquidationParamsStructOutput[]]>;
+        getAllTradesLiquidationParamsForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPairsStorage.GroupLiquidationParamsStructOutput[]]>;
         getCollateral(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[ITradingStorage.CollateralStructOutput]>;
         getCollateralIndex(_collateral: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[number]>;
         getCollaterals(overrides?: CallOverrides): Promise<[ITradingStorage.CollateralStructOutput[]]>;
         getCollateralsCount(overrides?: CallOverrides): Promise<[number]>;
         getCounters(_trader: PromiseOrValue<string>, _type: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[ITradingStorage.CounterStructOutput]>;
+        getCountersForTraders(_traders: PromiseOrValue<string>[], _type: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[ITradingStorage.CounterStructOutput[]]>;
         getCurrentContractsVersion(overrides?: CallOverrides): Promise<[number]>;
         getGToken(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[string]>;
         getPendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<[ITradingStorage.PendingOrderStructOutput]>;
@@ -3586,6 +3830,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getTradePendingOrderBlock(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         getTraderStored(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[boolean]>;
         getTraders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[string[]]>;
+        getTradersCount(overrides?: CallOverrides): Promise<[BigNumber]>;
         getTrades(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[ITradingStorage.TradeStructOutput[]]>;
         getTradesLiquidationParams(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[IPairsStorage.GroupLiquidationParamsStructOutput[]]>;
         getTradingActivated(overrides?: CallOverrides): Promise<[number]>;
@@ -3615,7 +3860,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         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>, overrides?: Overrides & {
+        updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, _isPartialIncrease: PromiseOrValue<boolean>, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         updateTradeSl(_tradeId: ITradingStorage.IdStruct, _newSl: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -3727,38 +3972,38 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeCallbacks(_vaultClosingFeeP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        initializeTreasuryAddress(_treasury: PromiseOrValue<string>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         openTradeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         updateLeverageCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        updateTreasuryAddress(_treasury: PromiseOrValue<string>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         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<[
             ITradingStorage.TradeStructOutput,
             number,
-            ITradingCallbacks.ValuesStructOutput,
-            BigNumber
+            ITradingCallbacks.ValuesStructOutput
         ] & {
             t: ITradingStorage.TradeStructOutput;
             cancelReason: number;
             v: ITradingCallbacks.ValuesStructOutput;
-            priceImpactP: BigNumber;
         }>;
         validateTriggerOpenOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             ITradingStorage.TradeStructOutput,
             number,
-            BigNumber,
-            BigNumber,
-            boolean
+            ITradingCallbacks.ValuesStructOutput
         ] & {
             t: ITradingStorage.TradeStructOutput;
             cancelReason: number;
-            priceImpactP: BigNumber;
-            priceAfterImpact: BigNumber;
-            exactExecution: boolean;
+            v: ITradingCallbacks.ValuesStructOutput;
         }>;
         getAllBorrowingPairs(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             IBorrowingFees.BorrowingDataStructOutput[],
@@ -3920,13 +4165,14 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     facets(overrides?: CallOverrides): Promise<IGNSDiamondLoupe.FacetStructOutput[]>;
     getAddresses(overrides?: CallOverrides): Promise<IAddressStore.AddressesStructOutput>;
     hasRole(_account: PromiseOrValue<string>, _role: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>;
-    initialize(_rolesManager: PromiseOrValue<string>, overrides?: Overrides & {
+    hasRoles(_account: PromiseOrValue<string>, _roleA: PromiseOrValue<BigNumberish>, _roleB: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>;
+    initialize(_govTimelock: 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>;
-    addFees(_fees: IPairsStorage.FeeStruct[], overrides?: Overrides & {
+    addFees(_fees: IPairsStorage.FeeGroupStruct[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     addGroups(_groups: IPairsStorage.GroupStruct[], overrides?: Overrides & {
@@ -3935,9 +4181,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     addPairs(_pairs: IPairsStorage.PairStruct[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    fees(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.FeeStructOutput>;
+    fees(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.FeeGroupStructOutput>;
     feesCount(overrides?: CallOverrides): Promise<BigNumber>;
     getAllPairsRestrictedMaxLeverage(overrides?: CallOverrides): Promise<BigNumber[]>;
+    getGlobalTradeFeeParams(overrides?: CallOverrides): Promise<IPairsStorage.GlobalTradeFeeParamsStructOutput>;
     getGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput>;
     getPairLiquidationParams(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput>;
     groups(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupStructOutput>;
@@ -3945,33 +4192,33 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     initializeGroupLiquidationParams(_groupLiquidationParams: IPairsStorage.GroupLiquidationParamsStruct[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    initializeNewFees(_tradeFeeParams: IPairsStorage.GlobalTradeFeeParamsStruct, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     isPairIndexListed(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>;
     isPairListed(_from: PromiseOrValue<string>, _to: PromiseOrValue<string>, overrides?: CallOverrides): Promise<boolean>;
-    pairCloseFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     pairCustomMaxLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     pairJob(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[string, string]>;
     pairMaxLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     pairMinFeeUsd(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     pairMinLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     pairMinPositionSizeUsd(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-    pairOpenFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-    pairOracleFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+    pairOraclePositionSizeFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     pairSpreadP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-    pairTriggerOrderFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+    pairTotalLiqCollateralFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+    pairTotalPositionSizeFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     pairs(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.PairStructOutput>;
-    pairsBackend(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
-        IPairsStorage.PairStructOutput,
-        IPairsStorage.GroupStructOutput,
-        IPairsStorage.FeeStructOutput
-    ]>;
     pairsCount(overrides?: CallOverrides): Promise<BigNumber>;
+    setGlobalTradeFeeParams(_feeParams: IPairsStorage.GlobalTradeFeeParamsStruct, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     setGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, _params: IPairsStorage.GroupLiquidationParamsStruct, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     setPairCustomMaxLeverages(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    updateFees(_ids: PromiseOrValue<BigNumberish>[], _fees: IPairsStorage.FeeStruct[], overrides?: Overrides & {
+    updateFees(_ids: PromiseOrValue<BigNumberish>[], _fees: IPairsStorage.FeeGroupStruct[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     updateGroups(_ids: PromiseOrValue<BigNumberish>[], _groups: IPairsStorage.GroupStruct[], overrides?: Overrides & {
@@ -3986,21 +4233,20 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     claimReferrerRewards(overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    distributeReferralReward(_trader: PromiseOrValue<string>, _volumeUsd: PromiseOrValue<BigNumberish>, _pairOpenFeeP: PromiseOrValue<BigNumberish>, _gnsPriceUsd: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+    distributeReferralReward(_trader: PromiseOrValue<string>, _volumeUsd: PromiseOrValue<BigNumberish>, _referrerFeeUsd: PromiseOrValue<BigNumberish>, _gnsPriceUsd: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     getAllyDetails(_ally: PromiseOrValue<string>, overrides?: CallOverrides): Promise<IReferrals.AllyDetailsStructOutput>;
     getReferralsAllyFeeP(overrides?: CallOverrides): Promise<BigNumber>;
-    getReferralsOpenFeeP(overrides?: CallOverrides): Promise<BigNumber>;
     getReferralsStartReferrerFeeP(overrides?: CallOverrides): Promise<BigNumber>;
     getReferralsTargetVolumeUsd(overrides?: CallOverrides): Promise<BigNumber>;
     getReferrerDetails(_referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<IReferrals.ReferrerDetailsStructOutput>;
-    getReferrerFeeP(_pairOpenFeeP: PromiseOrValue<BigNumberish>, _volumeReferredUsd: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+    getReferrerFeeProgressP(_referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
     getReferrersReferred(_ally: PromiseOrValue<string>, overrides?: CallOverrides): Promise<string[]>;
     getTraderActiveReferrer(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<string>;
     getTraderLastReferrer(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<string>;
     getTradersReferred(_referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<string[]>;
-    initializeReferrals(_allyFeeP: PromiseOrValue<BigNumberish>, _startReferrerFeeP: PromiseOrValue<BigNumberish>, _openFeeP: PromiseOrValue<BigNumberish>, _targetVolumeUsd: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+    initializeReferrals(_allyFeeP: PromiseOrValue<BigNumberish>, _startReferrerFeeP: PromiseOrValue<BigNumberish>, _targetVolumeUsd: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     registerPotentialReferrer(_trader: PromiseOrValue<string>, _referrer: PromiseOrValue<string>, overrides?: Overrides & {
@@ -4015,9 +4261,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     updateAllyFeeP(_value: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    updateReferralsOpenFeeP(_value: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-        from?: PromiseOrValue<string>;
-    }): Promise<ContractTransaction>;
     updateReferralsTargetVolumeUsd(_value: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4030,6 +4273,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     whitelistReferrers(_referrers: PromiseOrValue<string>[], _allies: PromiseOrValue<string>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    addTradersUnclaimedPoints(_traders: PromiseOrValue<string>[], _creditTypes: PromiseOrValue<BigNumberish>[], _points: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     calculateFeeAmount(_trader: PromiseOrValue<string>, _normalFeeAmountCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     getFeeTier(_feeTierIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IFeeTiers.FeeTierStructOutput>;
     getFeeTiersCount(overrides?: CallOverrides): Promise<BigNumber>;
@@ -4037,6 +4283,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     getFeeTiersTraderInfo(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<IFeeTiers.TraderInfoStructOutput>;
     getGroupVolumeMultiplier(_groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     getTraderFeeTiersEnrollment(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<IFeeTiers.TraderEnrollmentStructOutput>;
+    getTraderUnclaimedPoints(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
     initializeFeeTiers(_groupIndices: PromiseOrValue<BigNumberish>[], _groupVolumeMultipliers: PromiseOrValue<BigNumberish>[], _feeTiersIndices: PromiseOrValue<BigNumberish>[], _feeTiers: IFeeTiers.FeeTierStruct[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4052,9 +4299,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     updateTraderPoints(_trader: PromiseOrValue<string>, _volumeUsd: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    addPriceImpactOpenInterest(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, overrides?: Overrides & {
+    addPriceImpactOpenInterest(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    getNegPnlCumulVolMultiplier(overrides?: CallOverrides): Promise<number>;
     getOiWindow(_windowsDuration: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _windowId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceImpact.PairOiStructOutput>;
     getOiWindows(_windowsDuration: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _windowIds: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IPriceImpact.PairOiStructOutput[]>;
     getOiWindowsSettings(overrides?: CallOverrides): Promise<IPriceImpact.OiWindowsSettingsStructOutput>;
@@ -4062,13 +4310,17 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     getPairDepths(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IPriceImpact.PairDepthStructOutput[]>;
     getPairFactors(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IPriceImpact.PairFactorsStructOutput[]>;
     getPriceImpactOi(_pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
-    getTradePriceImpact(_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<[
+    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;
     }>;
+    initializeNegPnlCumulVolMultiplier(_negPnlCumulVolMultiplier: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     initializePairFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactors: PromiseOrValue<BigNumberish>[], _protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>[], _cumulativeFactors: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4078,6 +4330,15 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     setCumulativeFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _cumulativeFactors: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    setExemptAfterProtectionCloseFactor(_pairIndices: PromiseOrValue<BigNumberish>[], _exemptAfterProtectionCloseFactor: PromiseOrValue<boolean>[], overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    setExemptOnOpen(_pairIndices: PromiseOrValue<BigNumberish>[], _exemptOnOpen: PromiseOrValue<boolean>[], overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    setNegPnlCumulVolMultiplier(_negPnlCumulVolMultiplier: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     setPairDepths(_indices: PromiseOrValue<BigNumberish>[], _depthsAboveUsd: PromiseOrValue<BigNumberish>[], _depthsBelowUsd: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4090,6 +4351,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     setProtectionCloseFactorBlocks(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    setProtectionCloseFactorWhitelist(_traders: PromiseOrValue<string>[], _whitelisted: PromiseOrValue<boolean>[], overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     setProtectionCloseFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactors: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4099,18 +4363,23 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     closePendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    closeTrade(_tradeId: ITradingStorage.IdStruct, overrides?: Overrides & {
+    closeTrade(_tradeId: ITradingStorage.IdStruct, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     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[]>;
+    getAllTradeInfosForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeInfoStructOutput[]>;
     getAllTrades(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeStructOutput[]>;
+    getAllTradesForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeStructOutput[]>;
     getAllTradesLiquidationParams(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput[]>;
+    getAllTradesLiquidationParamsForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput[]>;
     getCollateral(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.CollateralStructOutput>;
     getCollateralIndex(_collateral: PromiseOrValue<string>, overrides?: CallOverrides): Promise<number>;
     getCollaterals(overrides?: CallOverrides): Promise<ITradingStorage.CollateralStructOutput[]>;
     getCollateralsCount(overrides?: CallOverrides): Promise<number>;
     getCounters(_trader: PromiseOrValue<string>, _type: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.CounterStructOutput>;
+    getCountersForTraders(_traders: PromiseOrValue<string>[], _type: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.CounterStructOutput[]>;
     getCurrentContractsVersion(overrides?: CallOverrides): Promise<number>;
     getGToken(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>;
     getPendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<ITradingStorage.PendingOrderStructOutput>;
@@ -4122,6 +4391,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     getTradePendingOrderBlock(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     getTraderStored(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<boolean>;
     getTraders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string[]>;
+    getTradersCount(overrides?: CallOverrides): Promise<BigNumber>;
     getTrades(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<ITradingStorage.TradeStructOutput[]>;
     getTradesLiquidationParams(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput[]>;
     getTradingActivated(overrides?: CallOverrides): Promise<number>;
@@ -4151,7 +4421,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     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>, overrides?: Overrides & {
+    updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, _isPartialIncrease: PromiseOrValue<boolean>, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     updateTradeSl(_tradeId: ITradingStorage.IdStruct, _newSl: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -4263,38 +4533,38 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     initializeCallbacks(_vaultClosingFeeP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    initializeTreasuryAddress(_treasury: PromiseOrValue<string>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     openTradeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     updateLeverageCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    updateTreasuryAddress(_treasury: PromiseOrValue<string>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     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<[
         ITradingStorage.TradeStructOutput,
         number,
-        ITradingCallbacks.ValuesStructOutput,
-        BigNumber
+        ITradingCallbacks.ValuesStructOutput
     ] & {
         t: ITradingStorage.TradeStructOutput;
         cancelReason: number;
         v: ITradingCallbacks.ValuesStructOutput;
-        priceImpactP: BigNumber;
     }>;
     validateTriggerOpenOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
         ITradingStorage.TradeStructOutput,
         number,
-        BigNumber,
-        BigNumber,
-        boolean
+        ITradingCallbacks.ValuesStructOutput
     ] & {
         t: ITradingStorage.TradeStructOutput;
         cancelReason: number;
-        priceImpactP: BigNumber;
-        priceAfterImpact: BigNumber;
-        exactExecution: boolean;
+        v: ITradingCallbacks.ValuesStructOutput;
     }>;
     getAllBorrowingPairs(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
         IBorrowingFees.BorrowingDataStructOutput[],
@@ -4450,68 +4720,65 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         facets(overrides?: CallOverrides): Promise<IGNSDiamondLoupe.FacetStructOutput[]>;
         getAddresses(overrides?: CallOverrides): Promise<IAddressStore.AddressesStructOutput>;
         hasRole(_account: PromiseOrValue<string>, _role: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>;
-        initialize(_rolesManager: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
+        hasRoles(_account: PromiseOrValue<string>, _roleA: PromiseOrValue<BigNumberish>, _roleB: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>;
+        initialize(_govTimelock: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         setRoles(_accounts: PromiseOrValue<string>[], _roles: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<boolean>[], overrides?: CallOverrides): Promise<void>;
-        addFees(_fees: IPairsStorage.FeeStruct[], overrides?: CallOverrides): Promise<void>;
+        addFees(_fees: IPairsStorage.FeeGroupStruct[], overrides?: CallOverrides): Promise<void>;
         addGroups(_groups: IPairsStorage.GroupStruct[], overrides?: CallOverrides): Promise<void>;
         addPairs(_pairs: IPairsStorage.PairStruct[], overrides?: CallOverrides): Promise<void>;
-        fees(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.FeeStructOutput>;
+        fees(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.FeeGroupStructOutput>;
         feesCount(overrides?: CallOverrides): Promise<BigNumber>;
         getAllPairsRestrictedMaxLeverage(overrides?: CallOverrides): Promise<BigNumber[]>;
+        getGlobalTradeFeeParams(overrides?: CallOverrides): Promise<IPairsStorage.GlobalTradeFeeParamsStructOutput>;
         getGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput>;
         getPairLiquidationParams(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput>;
         groups(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupStructOutput>;
         groupsCount(overrides?: CallOverrides): Promise<BigNumber>;
         initializeGroupLiquidationParams(_groupLiquidationParams: IPairsStorage.GroupLiquidationParamsStruct[], overrides?: CallOverrides): Promise<void>;
+        initializeNewFees(_tradeFeeParams: IPairsStorage.GlobalTradeFeeParamsStruct, overrides?: CallOverrides): Promise<void>;
         isPairIndexListed(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>;
         isPairListed(_from: PromiseOrValue<string>, _to: PromiseOrValue<string>, overrides?: CallOverrides): Promise<boolean>;
-        pairCloseFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairCustomMaxLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairJob(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[string, string]>;
         pairMaxLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairMinFeeUsd(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairMinLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairMinPositionSizeUsd(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        pairOpenFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        pairOracleFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        pairOraclePositionSizeFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairSpreadP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        pairTriggerOrderFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        pairTotalLiqCollateralFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        pairTotalPositionSizeFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairs(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.PairStructOutput>;
-        pairsBackend(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
-            IPairsStorage.PairStructOutput,
-            IPairsStorage.GroupStructOutput,
-            IPairsStorage.FeeStructOutput
-        ]>;
         pairsCount(overrides?: CallOverrides): Promise<BigNumber>;
+        setGlobalTradeFeeParams(_feeParams: IPairsStorage.GlobalTradeFeeParamsStruct, overrides?: CallOverrides): Promise<void>;
         setGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, _params: IPairsStorage.GroupLiquidationParamsStruct, overrides?: CallOverrides): Promise<void>;
         setPairCustomMaxLeverages(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
-        updateFees(_ids: PromiseOrValue<BigNumberish>[], _fees: IPairsStorage.FeeStruct[], 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>;
         updatePairs(_pairIndices: PromiseOrValue<BigNumberish>[], _pairs: IPairsStorage.PairStruct[], overrides?: CallOverrides): Promise<void>;
         claimAllyRewards(overrides?: CallOverrides): Promise<void>;
         claimReferrerRewards(overrides?: CallOverrides): Promise<void>;
-        distributeReferralReward(_trader: PromiseOrValue<string>, _volumeUsd: PromiseOrValue<BigNumberish>, _pairOpenFeeP: PromiseOrValue<BigNumberish>, _gnsPriceUsd: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        distributeReferralReward(_trader: PromiseOrValue<string>, _volumeUsd: PromiseOrValue<BigNumberish>, _referrerFeeUsd: PromiseOrValue<BigNumberish>, _gnsPriceUsd: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         getAllyDetails(_ally: PromiseOrValue<string>, overrides?: CallOverrides): Promise<IReferrals.AllyDetailsStructOutput>;
         getReferralsAllyFeeP(overrides?: CallOverrides): Promise<BigNumber>;
-        getReferralsOpenFeeP(overrides?: CallOverrides): Promise<BigNumber>;
         getReferralsStartReferrerFeeP(overrides?: CallOverrides): Promise<BigNumber>;
         getReferralsTargetVolumeUsd(overrides?: CallOverrides): Promise<BigNumber>;
         getReferrerDetails(_referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<IReferrals.ReferrerDetailsStructOutput>;
-        getReferrerFeeP(_pairOpenFeeP: PromiseOrValue<BigNumberish>, _volumeReferredUsd: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getReferrerFeeProgressP(_referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getReferrersReferred(_ally: PromiseOrValue<string>, overrides?: CallOverrides): Promise<string[]>;
         getTraderActiveReferrer(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<string>;
         getTraderLastReferrer(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<string>;
         getTradersReferred(_referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<string[]>;
-        initializeReferrals(_allyFeeP: PromiseOrValue<BigNumberish>, _startReferrerFeeP: PromiseOrValue<BigNumberish>, _openFeeP: PromiseOrValue<BigNumberish>, _targetVolumeUsd: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        initializeReferrals(_allyFeeP: PromiseOrValue<BigNumberish>, _startReferrerFeeP: PromiseOrValue<BigNumberish>, _targetVolumeUsd: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         registerPotentialReferrer(_trader: PromiseOrValue<string>, _referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         unwhitelistAllies(_allies: PromiseOrValue<string>[], overrides?: CallOverrides): Promise<void>;
         unwhitelistReferrers(_referrers: PromiseOrValue<string>[], overrides?: CallOverrides): Promise<void>;
         updateAllyFeeP(_value: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
-        updateReferralsOpenFeeP(_value: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateReferralsTargetVolumeUsd(_value: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateStartReferrerFeeP(_value: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         whitelistAllies(_allies: PromiseOrValue<string>[], overrides?: CallOverrides): Promise<void>;
         whitelistReferrers(_referrers: PromiseOrValue<string>[], _allies: PromiseOrValue<string>[], overrides?: CallOverrides): Promise<void>;
+        addTradersUnclaimedPoints(_traders: PromiseOrValue<string>[], _creditTypes: PromiseOrValue<BigNumberish>[], _points: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
         calculateFeeAmount(_trader: PromiseOrValue<string>, _normalFeeAmountCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getFeeTier(_feeTierIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IFeeTiers.FeeTierStructOutput>;
         getFeeTiersCount(overrides?: CallOverrides): Promise<BigNumber>;
@@ -4519,12 +4786,14 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getFeeTiersTraderInfo(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<IFeeTiers.TraderInfoStructOutput>;
         getGroupVolumeMultiplier(_groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getTraderFeeTiersEnrollment(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<IFeeTiers.TraderEnrollmentStructOutput>;
+        getTraderUnclaimedPoints(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         initializeFeeTiers(_groupIndices: PromiseOrValue<BigNumberish>[], _groupVolumeMultipliers: PromiseOrValue<BigNumberish>[], _feeTiersIndices: PromiseOrValue<BigNumberish>[], _feeTiers: IFeeTiers.FeeTierStruct[], overrides?: CallOverrides): Promise<void>;
         setFeeTiers(_feeTiersIndices: PromiseOrValue<BigNumberish>[], _feeTiers: IFeeTiers.FeeTierStruct[], overrides?: CallOverrides): Promise<void>;
         setGroupVolumeMultipliers(_groupIndices: PromiseOrValue<BigNumberish>[], _groupVolumeMultipliers: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
         setTradersFeeTiersEnrollment(_traders: PromiseOrValue<string>[], _values: IFeeTiers.TraderEnrollmentStruct[], overrides?: CallOverrides): Promise<void>;
         updateTraderPoints(_trader: PromiseOrValue<string>, _volumeUsd: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
-        addPriceImpactOpenInterest(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<void>;
+        addPriceImpactOpenInterest(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _isPnlPositive: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<void>;
+        getNegPnlCumulVolMultiplier(overrides?: CallOverrides): Promise<number>;
         getOiWindow(_windowsDuration: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _windowId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceImpact.PairOiStructOutput>;
         getOiWindows(_windowsDuration: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _windowIds: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IPriceImpact.PairOiStructOutput[]>;
         getOiWindowsSettings(overrides?: CallOverrides): Promise<IPriceImpact.OiWindowsSettingsStructOutput>;
@@ -4532,33 +4801,44 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getPairDepths(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IPriceImpact.PairDepthStructOutput[]>;
         getPairFactors(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IPriceImpact.PairFactorsStructOutput[]>;
         getPriceImpactOi(_pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
-        getTradePriceImpact(_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<[
+        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;
         }>;
+        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>;
         initializePriceImpact(_windowsDuration: PromiseOrValue<BigNumberish>, _windowsCount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         setCumulativeFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _cumulativeFactors: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<void>;
+        setExemptAfterProtectionCloseFactor(_pairIndices: PromiseOrValue<BigNumberish>[], _exemptAfterProtectionCloseFactor: PromiseOrValue<boolean>[], overrides?: CallOverrides): Promise<void>;
+        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>;
         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>;
         addCollateral(_collateral: PromiseOrValue<string>, _gToken: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         closePendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<void>;
-        closeTrade(_tradeId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<void>;
+        closeTrade(_tradeId: ITradingStorage.IdStruct, _isPnlPositive: PromiseOrValue<boolean>, 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[]>;
+        getAllTradeInfosForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeInfoStructOutput[]>;
         getAllTrades(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeStructOutput[]>;
+        getAllTradesForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeStructOutput[]>;
         getAllTradesLiquidationParams(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput[]>;
+        getAllTradesLiquidationParamsForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput[]>;
         getCollateral(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.CollateralStructOutput>;
         getCollateralIndex(_collateral: PromiseOrValue<string>, overrides?: CallOverrides): Promise<number>;
         getCollaterals(overrides?: CallOverrides): Promise<ITradingStorage.CollateralStructOutput[]>;
         getCollateralsCount(overrides?: CallOverrides): Promise<number>;
         getCounters(_trader: PromiseOrValue<string>, _type: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.CounterStructOutput>;
+        getCountersForTraders(_traders: PromiseOrValue<string>[], _type: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.CounterStructOutput[]>;
         getCurrentContractsVersion(overrides?: CallOverrides): Promise<number>;
         getGToken(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>;
         getPendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<ITradingStorage.PendingOrderStructOutput>;
@@ -4570,6 +4850,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getTradePendingOrderBlock(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getTraderStored(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<boolean>;
         getTraders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string[]>;
+        getTradersCount(overrides?: CallOverrides): Promise<BigNumber>;
         getTrades(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<ITradingStorage.TradeStructOutput[]>;
         getTradesLiquidationParams(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput[]>;
         getTradingActivated(overrides?: CallOverrides): Promise<number>;
@@ -4583,7 +4864,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         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>, 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>;
         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>;
@@ -4627,32 +4908,28 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getVaultClosingFeeP(overrides?: CallOverrides): Promise<number>;
         increasePositionSizeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
         initializeCallbacks(_vaultClosingFeeP: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        initializeTreasuryAddress(_treasury: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         openTradeMarketCallback(_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<[
             ITradingStorage.TradeStructOutput,
             number,
-            ITradingCallbacks.ValuesStructOutput,
-            BigNumber
+            ITradingCallbacks.ValuesStructOutput
         ] & {
             t: ITradingStorage.TradeStructOutput;
             cancelReason: number;
             v: ITradingCallbacks.ValuesStructOutput;
-            priceImpactP: BigNumber;
         }>;
         validateTriggerOpenOrderCallback(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<BigNumberish>, _high: PromiseOrValue<BigNumberish>, _low: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             ITradingStorage.TradeStructOutput,
             number,
-            BigNumber,
-            BigNumber,
-            boolean
+            ITradingCallbacks.ValuesStructOutput
         ] & {
             t: ITradingStorage.TradeStructOutput;
             cancelReason: number;
-            priceImpactP: BigNumber;
-            priceAfterImpact: BigNumber;
-            exactExecution: boolean;
+            v: ITradingCallbacks.ValuesStructOutput;
         }>;
         getAllBorrowingPairs(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             IBorrowingFees.BorrowingDataStructOutput[],
@@ -4760,10 +5037,12 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         DiamondCut(_diamondCut?: null, _init?: null, _calldata?: null): DiamondCutEventFilter;
         "Initialized(uint8)"(version?: null): InitializedEventFilter;
         Initialized(version?: null): InitializedEventFilter;
-        "FeeAdded(uint256,string)"(index?: null, name?: null): FeeAddedEventFilter;
-        FeeAdded(index?: null, name?: null): FeeAddedEventFilter;
-        "FeeUpdated(uint256)"(index?: null): FeeUpdatedEventFilter;
-        FeeUpdated(index?: null): FeeUpdatedEventFilter;
+        "FeeAdded(uint256,tuple)"(index?: null, feeGroup?: null): FeeAddedEventFilter;
+        FeeAdded(index?: null, feeGroup?: null): FeeAddedEventFilter;
+        "FeeUpdated(uint256,tuple)"(index?: null, feeGroup?: null): FeeUpdatedEventFilter;
+        FeeUpdated(index?: null, feeGroup?: null): FeeUpdatedEventFilter;
+        "GlobalTradeFeeParamsUpdated(tuple)"(feeParams?: null): GlobalTradeFeeParamsUpdatedEventFilter;
+        GlobalTradeFeeParamsUpdated(feeParams?: null): GlobalTradeFeeParamsUpdatedEventFilter;
         "GroupAdded(uint256,string)"(index?: null, name?: null): GroupAddedEventFilter;
         GroupAdded(index?: null, name?: null): GroupAddedEventFilter;
         "GroupLiquidationParamsUpdated(uint256,tuple)"(index?: null, params?: null): GroupLiquidationParamsUpdatedEventFilter;
@@ -4816,10 +5095,20 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         TraderInfoFirstUpdate(trader?: PromiseOrValue<string> | null, day?: null): TraderInfoFirstUpdateEventFilter;
         "TraderInfoUpdated(address,tuple)"(trader?: PromiseOrValue<string> | null, traderInfo?: null): TraderInfoUpdatedEventFilter;
         TraderInfoUpdated(trader?: PromiseOrValue<string> | null, traderInfo?: null): TraderInfoUpdatedEventFilter;
+        "TraderPointsCredited(address,uint32,uint8,uint224)"(trader?: PromiseOrValue<string> | null, day?: PromiseOrValue<BigNumberish> | null, creditType?: null, points?: null): TraderPointsCreditedEventFilter;
+        TraderPointsCredited(trader?: PromiseOrValue<string> | null, day?: PromiseOrValue<BigNumberish> | null, creditType?: null, points?: null): TraderPointsCreditedEventFilter;
         "TraderTrailingPointsExpired(address,uint32,uint32,uint224)"(trader?: PromiseOrValue<string> | null, fromDay?: null, toDay?: null, expiredPoints?: null): TraderTrailingPointsExpiredEventFilter;
         TraderTrailingPointsExpired(trader?: PromiseOrValue<string> | null, fromDay?: null, toDay?: null, expiredPoints?: null): TraderTrailingPointsExpiredEventFilter;
+        "TraderUnclaimedPointsClaimed(address,uint32,uint224)"(trader?: PromiseOrValue<string> | null, day?: PromiseOrValue<BigNumberish> | null, points?: null): TraderUnclaimedPointsClaimedEventFilter;
+        TraderUnclaimedPointsClaimed(trader?: PromiseOrValue<string> | null, day?: PromiseOrValue<BigNumberish> | null, points?: null): TraderUnclaimedPointsClaimedEventFilter;
         "CumulativeFactorUpdated(uint256,uint40)"(pairIndex?: PromiseOrValue<BigNumberish> | null, cumulativeFactor?: null): CumulativeFactorUpdatedEventFilter;
         CumulativeFactorUpdated(pairIndex?: PromiseOrValue<BigNumberish> | null, cumulativeFactor?: null): CumulativeFactorUpdatedEventFilter;
+        "ExemptAfterProtectionCloseFactorUpdated(uint256,bool)"(pairIndex?: PromiseOrValue<BigNumberish> | null, exemptAfterProtectionCloseFactor?: null): ExemptAfterProtectionCloseFactorUpdatedEventFilter;
+        ExemptAfterProtectionCloseFactorUpdated(pairIndex?: PromiseOrValue<BigNumberish> | null, exemptAfterProtectionCloseFactor?: null): ExemptAfterProtectionCloseFactorUpdatedEventFilter;
+        "ExemptOnOpenUpdated(uint256,bool)"(pairIndex?: PromiseOrValue<BigNumberish> | null, exemptOnOpen?: null): ExemptOnOpenUpdatedEventFilter;
+        ExemptOnOpenUpdated(pairIndex?: PromiseOrValue<BigNumberish> | null, exemptOnOpen?: null): ExemptOnOpenUpdatedEventFilter;
+        "NegPnlCumulVolMultiplierUpdated(uint40)"(negPnlCumulVolMultiplier?: PromiseOrValue<BigNumberish> | null): NegPnlCumulVolMultiplierUpdatedEventFilter;
+        NegPnlCumulVolMultiplierUpdated(negPnlCumulVolMultiplier?: PromiseOrValue<BigNumberish> | null): NegPnlCumulVolMultiplierUpdatedEventFilter;
         "OiWindowsSettingsInitialized(uint48,uint48)"(windowsDuration?: PromiseOrValue<BigNumberish> | null, windowsCount?: PromiseOrValue<BigNumberish> | null): OiWindowsSettingsInitializedEventFilter;
         OiWindowsSettingsInitialized(windowsDuration?: PromiseOrValue<BigNumberish> | null, windowsCount?: PromiseOrValue<BigNumberish> | null): OiWindowsSettingsInitializedEventFilter;
         "OnePercentDepthUpdated(uint256,uint128,uint128)"(pairIndex?: PromiseOrValue<BigNumberish> | null, valueAboveUsd?: null, valueBelowUsd?: null): OnePercentDepthUpdatedEventFilter;
@@ -4838,6 +5127,8 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         ProtectionCloseFactorBlocksUpdated(pairIndex?: PromiseOrValue<BigNumberish> | null, protectionCloseFactorBlocks?: null): ProtectionCloseFactorBlocksUpdatedEventFilter;
         "ProtectionCloseFactorUpdated(uint256,uint40)"(pairIndex?: PromiseOrValue<BigNumberish> | null, protectionCloseFactor?: null): ProtectionCloseFactorUpdatedEventFilter;
         ProtectionCloseFactorUpdated(pairIndex?: PromiseOrValue<BigNumberish> | null, protectionCloseFactor?: null): ProtectionCloseFactorUpdatedEventFilter;
+        "ProtectionCloseFactorWhitelistUpdated(address,bool)"(trader?: null, whitelisted?: null): ProtectionCloseFactorWhitelistUpdatedEventFilter;
+        ProtectionCloseFactorWhitelistUpdated(trader?: null, whitelisted?: null): ProtectionCloseFactorWhitelistUpdatedEventFilter;
         "CollateralAdded(address,uint8,address)"(collateral?: null, index?: null, gToken?: null): CollateralAddedEventFilter;
         CollateralAdded(collateral?: null, index?: null, gToken?: null): CollateralAddedEventFilter;
         "CollateralDisabled(uint8)"(index?: null): CollateralDisabledEventFilter;
@@ -4846,26 +5137,26 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         CollateralUpdated(index?: PromiseOrValue<BigNumberish> | null, isActive?: null): CollateralUpdatedEventFilter;
         "GTokenUpdated(address,uint8,address)"(collateral?: null, index?: null, gToken?: null): GTokenUpdatedEventFilter;
         GTokenUpdated(collateral?: null, index?: null, gToken?: null): GTokenUpdatedEventFilter;
-        "OpenOrderDetailsUpdated(tuple,uint64,uint64,uint64,uint16)"(tradeId?: null, openPrice?: null, tp?: null, sl?: null, maxSlippageP?: null): OpenOrderDetailsUpdatedEventFilter;
-        OpenOrderDetailsUpdated(tradeId?: null, openPrice?: null, tp?: null, sl?: null, maxSlippageP?: null): OpenOrderDetailsUpdatedEventFilter;
+        "OpenOrderDetailsUpdated(address,uint32,uint64,uint64,uint64,uint16)"(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, openPrice?: null, tp?: null, sl?: null, maxSlippageP?: null): OpenOrderDetailsUpdatedEventFilter;
+        OpenOrderDetailsUpdated(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, openPrice?: null, tp?: null, sl?: null, maxSlippageP?: null): OpenOrderDetailsUpdatedEventFilter;
         "PendingOrderClosed(tuple)"(orderId?: null): PendingOrderClosedEventFilter;
         PendingOrderClosed(orderId?: null): PendingOrderClosedEventFilter;
         "PendingOrderStored(tuple)"(pendingOrder?: null): PendingOrderStoredEventFilter;
         PendingOrderStored(pendingOrder?: null): PendingOrderStoredEventFilter;
-        "TradeClosed(tuple)"(tradeId?: null): TradeClosedEventFilter;
-        TradeClosed(tradeId?: null): TradeClosedEventFilter;
-        "TradeCollateralUpdated(tuple,uint120)"(tradeId?: null, collateralAmount?: null): TradeCollateralUpdatedEventFilter;
-        TradeCollateralUpdated(tradeId?: null, collateralAmount?: null): TradeCollateralUpdatedEventFilter;
-        "TradeMaxClosingSlippagePUpdated(tuple,uint16)"(tradeId?: null, maxClosingSlippageP?: null): TradeMaxClosingSlippagePUpdatedEventFilter;
-        TradeMaxClosingSlippagePUpdated(tradeId?: null, maxClosingSlippageP?: null): TradeMaxClosingSlippagePUpdatedEventFilter;
-        "TradePositionUpdated(tuple,uint120,uint24,uint64,uint64,uint64,bool)"(tradeId?: null, collateralAmount?: null, leverage?: null, openPrice?: null, newTp?: null, newSl?: null, isPartialIncrease?: null): TradePositionUpdatedEventFilter;
-        TradePositionUpdated(tradeId?: null, collateralAmount?: null, leverage?: null, openPrice?: null, newTp?: null, newSl?: null, isPartialIncrease?: null): TradePositionUpdatedEventFilter;
-        "TradeSlUpdated(tuple,uint64)"(tradeId?: null, newSl?: null): TradeSlUpdatedEventFilter;
-        TradeSlUpdated(tradeId?: null, newSl?: null): TradeSlUpdatedEventFilter;
-        "TradeStored(tuple,tuple,tuple)"(trade?: null, tradeInfo?: null, liquidationParams?: null): TradeStoredEventFilter;
-        TradeStored(trade?: null, tradeInfo?: null, liquidationParams?: null): TradeStoredEventFilter;
-        "TradeTpUpdated(tuple,uint64)"(tradeId?: null, newTp?: null): TradeTpUpdatedEventFilter;
-        TradeTpUpdated(tradeId?: null, newTp?: null): TradeTpUpdatedEventFilter;
+        "TradeClosed(address,uint32,bool)"(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, isPnlPositive?: null): TradeClosedEventFilter;
+        TradeClosed(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, isPnlPositive?: null): TradeClosedEventFilter;
+        "TradeCollateralUpdated(address,uint32,uint120)"(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, collateralAmount?: null): TradeCollateralUpdatedEventFilter;
+        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;
+        "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;
+        TradeStored(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, trade?: null, tradeInfo?: null, liquidationParams?: null): TradeStoredEventFilter;
+        "TradeTpUpdated(address,uint32,uint64)"(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, newTp?: null): TradeTpUpdatedEventFilter;
+        TradeTpUpdated(user?: PromiseOrValue<string> | null, index?: PromiseOrValue<BigNumberish> | null, newTp?: null): TradeTpUpdatedEventFilter;
         "TradingActivatedUpdated(uint8)"(activated?: null): TradingActivatedUpdatedEventFilter;
         TradingActivatedUpdated(activated?: null): TradingActivatedUpdatedEventFilter;
         "TriggerRewarded(uint256,uint256)"(rewardsPerOracleGns?: null, oraclesCount?: null): TriggerRewardedEventFilter;
@@ -4878,46 +5169,46 @@ 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;
-        "CouldNotCloseTrade(address,uint16,uint32)"(trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null): CouldNotCloseTradeEventFilter;
-        CouldNotCloseTrade(trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: 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?: PromiseOrValue<BigNumberish> | null, index?: null, marketPrice?: null, collateralDelta?: null, values?: null): LeverageUpdateExecutedEventFilter;
-        LeverageUpdateExecuted(orderId?: null, isIncrease?: null, cancelReason?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, marketPrice?: null, collateralDelta?: null, values?: null): LeverageUpdateExecutedEventFilter;
-        "LeverageUpdateInitiated(tuple,address,uint256,uint256,bool,uint256)"(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, isIncrease?: null, newLeverage?: null): LeverageUpdateInitiatedEventFilter;
-        LeverageUpdateInitiated(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, isIncrease?: null, newLeverage?: null): LeverageUpdateInitiatedEventFilter;
+        "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;
         "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;
         MarketOrdersTimeoutBlocksUpdated(newValueBlocks?: null): MarketOrdersTimeoutBlocksUpdatedEventFilter;
         "NativeTokenWrapped(address,uint256)"(trader?: PromiseOrValue<string> | null, nativeTokenAmount?: null): NativeTokenWrappedEventFilter;
         NativeTokenWrapped(trader?: PromiseOrValue<string> | null, nativeTokenAmount?: null): NativeTokenWrappedEventFilter;
-        "OpenLimitCanceled(address,uint16,uint32)"(trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null): OpenLimitCanceledEventFilter;
-        OpenLimitCanceled(trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null): OpenLimitCanceledEventFilter;
-        "OpenLimitUpdated(address,uint16,uint32,uint64,uint64,uint64,uint64)"(trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, newPrice?: null, newTp?: null, newSl?: null, maxSlippageP?: null): OpenLimitUpdatedEventFilter;
-        OpenLimitUpdated(trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, newPrice?: null, newTp?: null, newSl?: null, maxSlippageP?: null): OpenLimitUpdatedEventFilter;
-        "OpenOrderPlaced(address,uint16,uint32)"(trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null): OpenOrderPlacedEventFilter;
-        OpenOrderPlaced(trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null): OpenOrderPlacedEventFilter;
-        "PositionSizeDecreaseExecuted(tuple,uint8,uint8,address,uint256,uint256,bool,uint256,uint256,uint256,uint256,tuple)"(orderId?: null, cancelReason?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, long?: null, marketPrice?: null, collateralPriceUsd?: null, collateralDelta?: null, leverageDelta?: null, values?: null): PositionSizeDecreaseExecutedEventFilter;
-        PositionSizeDecreaseExecuted(orderId?: null, cancelReason?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, long?: null, marketPrice?: null, collateralPriceUsd?: null, collateralDelta?: null, leverageDelta?: null, values?: null): PositionSizeDecreaseExecutedEventFilter;
-        "PositionSizeIncreaseExecuted(tuple,uint8,uint8,address,uint256,uint256,bool,uint256,uint256,uint256,uint256,tuple)"(orderId?: null, cancelReason?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, long?: null, marketPrice?: null, collateralPriceUsd?: null, collateralDelta?: null, leverageDelta?: null, values?: null): PositionSizeIncreaseExecutedEventFilter;
-        PositionSizeIncreaseExecuted(orderId?: null, cancelReason?: null, collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, long?: null, marketPrice?: 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?: null, isIncrease?: null, collateralDelta?: null, leverageDelta?: null): PositionSizeUpdateInitiatedEventFilter;
-        PositionSizeUpdateInitiated(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, isIncrease?: null, collateralDelta?: null, leverageDelta?: null): PositionSizeUpdateInitiatedEventFilter;
+        "OpenLimitCanceled(address,uint16,uint32)"(trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: PromiseOrValue<BigNumberish> | null): OpenLimitCanceledEventFilter;
+        OpenLimitCanceled(trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: PromiseOrValue<BigNumberish> | null): OpenLimitCanceledEventFilter;
+        "OpenLimitUpdated(address,uint16,uint32,uint64,uint64,uint64,uint64)"(trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: PromiseOrValue<BigNumberish> | null, newPrice?: null, newTp?: null, newSl?: null, maxSlippageP?: null): OpenLimitUpdatedEventFilter;
+        OpenLimitUpdated(trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: PromiseOrValue<BigNumberish> | null, newPrice?: null, newTp?: null, newSl?: null, maxSlippageP?: null): OpenLimitUpdatedEventFilter;
+        "OpenOrderPlaced(address,uint16,uint32)"(trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: PromiseOrValue<BigNumberish> | null): OpenOrderPlacedEventFilter;
+        OpenOrderPlaced(trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: PromiseOrValue<BigNumberish> | null): OpenOrderPlacedEventFilter;
+        "PositionSizeDecreaseExecuted(tuple,uint8,uint8,address,uint256,uint256,bool,uint256,uint256,uint256,uint256,tuple)"(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): PositionSizeDecreaseExecutedEventFilter;
+        PositionSizeDecreaseExecuted(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): PositionSizeDecreaseExecutedEventFilter;
+        "PositionSizeIncreaseExecuted(tuple,uint8,uint8,address,uint256,uint256,bool,uint256,uint256,uint256,uint256,tuple)"(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;
+        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;
         "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,uint8,uint256)"(trader?: PromiseOrValue<string> | null, collateralIndex?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): BorrowingFeeChargedEventFilter;
-        BorrowingFeeCharged(trader?: PromiseOrValue<string> | null, collateralIndex?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): BorrowingFeeChargedEventFilter;
+        "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;
         "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;
-        "GnsStakingFeeCharged(address,uint8,uint256)"(trader?: PromiseOrValue<string> | null, collateralIndex?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): GnsStakingFeeChargedEventFilter;
-        GnsStakingFeeCharged(trader?: PromiseOrValue<string> | null, collateralIndex?: PromiseOrValue<BigNumberish> | null, amountCollateral?: null): GnsStakingFeeChargedEventFilter;
+        "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,tuple,address,uint8,uint256,uint256,int256,uint256,uint256,bool)"(orderId?: null, t?: null, triggerCaller?: PromiseOrValue<string> | null, orderType?: null, price?: null, priceImpactP?: null, percentProfit?: null, amountSentToTrader?: null, collateralPriceUsd?: null, exactExecution?: null): LimitExecutedEventFilter;
-        LimitExecuted(orderId?: null, t?: null, triggerCaller?: PromiseOrValue<string> | null, orderType?: null, price?: null, priceImpactP?: 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?: null, cancelReason?: null): MarketCloseCanceledEventFilter;
-        MarketCloseCanceled(orderId?: null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, cancelReason?: null): MarketCloseCanceledEventFilter;
-        "MarketExecuted(tuple,tuple,bool,uint64,uint256,int256,uint256,uint256)"(orderId?: null, t?: null, open?: null, price?: null, priceImpactP?: null, percentProfit?: null, amountSentToTrader?: null, collateralPriceUsd?: null): MarketExecutedEventFilter;
-        MarketExecuted(orderId?: null, t?: null, open?: null, price?: null, priceImpactP?: null, percentProfit?: null, amountSentToTrader?: null, collateralPriceUsd?: null): MarketExecutedEventFilter;
+        "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;
+        "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;
         "PendingGovFeesClaimed(uint8,uint256)"(collateralIndex?: null, amountCollateral?: null): PendingGovFeesClaimedEventFilter;
@@ -4993,13 +5284,14 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         facets(overrides?: CallOverrides): Promise<BigNumber>;
         getAddresses(overrides?: CallOverrides): Promise<BigNumber>;
         hasRole(_account: PromiseOrValue<string>, _role: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        initialize(_rolesManager: PromiseOrValue<string>, overrides?: Overrides & {
+        hasRoles(_account: PromiseOrValue<string>, _roleA: PromiseOrValue<BigNumberish>, _roleB: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        initialize(_govTimelock: 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>;
-        addFees(_fees: IPairsStorage.FeeStruct[], overrides?: Overrides & {
+        addFees(_fees: IPairsStorage.FeeGroupStruct[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         addGroups(_groups: IPairsStorage.GroupStruct[], overrides?: Overrides & {
@@ -5011,6 +5303,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         fees(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         feesCount(overrides?: CallOverrides): Promise<BigNumber>;
         getAllPairsRestrictedMaxLeverage(overrides?: CallOverrides): Promise<BigNumber>;
+        getGlobalTradeFeeParams(overrides?: CallOverrides): Promise<BigNumber>;
         getGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getPairLiquidationParams(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         groups(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
@@ -5018,29 +5311,33 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeGroupLiquidationParams(_groupLiquidationParams: IPairsStorage.GroupLiquidationParamsStruct[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        initializeNewFees(_tradeFeeParams: IPairsStorage.GlobalTradeFeeParamsStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         isPairIndexListed(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         isPairListed(_from: PromiseOrValue<string>, _to: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
-        pairCloseFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairCustomMaxLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairJob(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairMaxLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairMinFeeUsd(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairMinLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairMinPositionSizeUsd(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        pairOpenFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        pairOracleFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        pairOraclePositionSizeFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairSpreadP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        pairTriggerOrderFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        pairTotalLiqCollateralFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        pairTotalPositionSizeFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairs(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        pairsBackend(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairsCount(overrides?: CallOverrides): Promise<BigNumber>;
+        setGlobalTradeFeeParams(_feeParams: IPairsStorage.GlobalTradeFeeParamsStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         setGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, _params: IPairsStorage.GroupLiquidationParamsStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         setPairCustomMaxLeverages(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        updateFees(_ids: PromiseOrValue<BigNumberish>[], _fees: IPairsStorage.FeeStruct[], overrides?: Overrides & {
+        updateFees(_ids: PromiseOrValue<BigNumberish>[], _fees: IPairsStorage.FeeGroupStruct[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         updateGroups(_ids: PromiseOrValue<BigNumberish>[], _groups: IPairsStorage.GroupStruct[], overrides?: Overrides & {
@@ -5055,21 +5352,20 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         claimReferrerRewards(overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        distributeReferralReward(_trader: PromiseOrValue<string>, _volumeUsd: PromiseOrValue<BigNumberish>, _pairOpenFeeP: PromiseOrValue<BigNumberish>, _gnsPriceUsd: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        distributeReferralReward(_trader: PromiseOrValue<string>, _volumeUsd: PromiseOrValue<BigNumberish>, _referrerFeeUsd: PromiseOrValue<BigNumberish>, _gnsPriceUsd: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         getAllyDetails(_ally: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getReferralsAllyFeeP(overrides?: CallOverrides): Promise<BigNumber>;
-        getReferralsOpenFeeP(overrides?: CallOverrides): Promise<BigNumber>;
         getReferralsStartReferrerFeeP(overrides?: CallOverrides): Promise<BigNumber>;
         getReferralsTargetVolumeUsd(overrides?: CallOverrides): Promise<BigNumber>;
         getReferrerDetails(_referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
-        getReferrerFeeP(_pairOpenFeeP: PromiseOrValue<BigNumberish>, _volumeReferredUsd: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getReferrerFeeProgressP(_referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getReferrersReferred(_ally: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getTraderActiveReferrer(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getTraderLastReferrer(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getTradersReferred(_referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
-        initializeReferrals(_allyFeeP: PromiseOrValue<BigNumberish>, _startReferrerFeeP: PromiseOrValue<BigNumberish>, _openFeeP: PromiseOrValue<BigNumberish>, _targetVolumeUsd: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        initializeReferrals(_allyFeeP: PromiseOrValue<BigNumberish>, _startReferrerFeeP: PromiseOrValue<BigNumberish>, _targetVolumeUsd: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         registerPotentialReferrer(_trader: PromiseOrValue<string>, _referrer: PromiseOrValue<string>, overrides?: Overrides & {
@@ -5084,9 +5380,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateAllyFeeP(_value: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        updateReferralsOpenFeeP(_value: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<BigNumber>;
         updateReferralsTargetVolumeUsd(_value: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -5099,6 +5392,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         whitelistReferrers(_referrers: PromiseOrValue<string>[], _allies: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        addTradersUnclaimedPoints(_traders: PromiseOrValue<string>[], _creditTypes: PromiseOrValue<BigNumberish>[], _points: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         calculateFeeAmount(_trader: PromiseOrValue<string>, _normalFeeAmountCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getFeeTier(_feeTierIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getFeeTiersCount(overrides?: CallOverrides): Promise<BigNumber>;
@@ -5106,6 +5402,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getFeeTiersTraderInfo(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getGroupVolumeMultiplier(_groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getTraderFeeTiersEnrollment(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTraderUnclaimedPoints(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         initializeFeeTiers(_groupIndices: PromiseOrValue<BigNumberish>[], _groupVolumeMultipliers: PromiseOrValue<BigNumberish>[], _feeTiersIndices: PromiseOrValue<BigNumberish>[], _feeTiers: IFeeTiers.FeeTierStruct[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -5121,9 +5418,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateTraderPoints(_trader: PromiseOrValue<string>, _volumeUsd: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        addPriceImpactOpenInterest(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, overrides?: Overrides & {
+        addPriceImpactOpenInterest(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        getNegPnlCumulVolMultiplier(overrides?: CallOverrides): Promise<BigNumber>;
         getOiWindow(_windowsDuration: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _windowId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getOiWindows(_windowsDuration: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _windowIds: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
         getOiWindowsSettings(overrides?: CallOverrides): Promise<BigNumber>;
@@ -5131,7 +5429,11 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getPairDepths(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
         getPairFactors(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
         getPriceImpactOi(_pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
-        getTradePriceImpact(_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>;
+        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>;
+        initializeNegPnlCumulVolMultiplier(_negPnlCumulVolMultiplier: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         initializePairFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactors: PromiseOrValue<BigNumberish>[], _protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>[], _cumulativeFactors: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -5141,6 +5443,15 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setCumulativeFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _cumulativeFactors: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        setExemptAfterProtectionCloseFactor(_pairIndices: PromiseOrValue<BigNumberish>[], _exemptAfterProtectionCloseFactor: PromiseOrValue<boolean>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        setExemptOnOpen(_pairIndices: PromiseOrValue<BigNumberish>[], _exemptOnOpen: PromiseOrValue<boolean>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        setNegPnlCumulVolMultiplier(_negPnlCumulVolMultiplier: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         setPairDepths(_indices: PromiseOrValue<BigNumberish>[], _depthsAboveUsd: PromiseOrValue<BigNumberish>[], _depthsBelowUsd: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -5153,6 +5464,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setProtectionCloseFactorBlocks(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        setProtectionCloseFactorWhitelist(_traders: PromiseOrValue<string>[], _whitelisted: PromiseOrValue<boolean>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         setProtectionCloseFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactors: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -5162,18 +5476,23 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         closePendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        closeTrade(_tradeId: ITradingStorage.IdStruct, overrides?: Overrides & {
+        closeTrade(_tradeId: ITradingStorage.IdStruct, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         getAllPendingOrders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getAllPendingOrdersForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getAllTradeInfos(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getAllTradeInfosForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getAllTrades(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getAllTradesForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getAllTradesLiquidationParams(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getAllTradesLiquidationParamsForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getCollateral(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getCollateralIndex(_collateral: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getCollaterals(overrides?: CallOverrides): Promise<BigNumber>;
         getCollateralsCount(overrides?: CallOverrides): Promise<BigNumber>;
         getCounters(_trader: PromiseOrValue<string>, _type: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getCountersForTraders(_traders: PromiseOrValue<string>[], _type: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getCurrentContractsVersion(overrides?: CallOverrides): Promise<BigNumber>;
         getGToken(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getPendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<BigNumber>;
@@ -5185,6 +5504,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getTradePendingOrderBlock(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getTraderStored(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getTraders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradersCount(overrides?: CallOverrides): Promise<BigNumber>;
         getTrades(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getTradesLiquidationParams(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getTradingActivated(overrides?: CallOverrides): Promise<BigNumber>;
@@ -5214,7 +5534,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         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>, overrides?: Overrides & {
+        updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, _isPartialIncrease: PromiseOrValue<boolean>, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         updateTradeSl(_tradeId: ITradingStorage.IdStruct, _newSl: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -5326,12 +5646,18 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeCallbacks(_vaultClosingFeeP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        initializeTreasuryAddress(_treasury: PromiseOrValue<string>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         openTradeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         updateLeverageCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        updateTreasuryAddress(_treasury: PromiseOrValue<string>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         updateVaultClosingFeeP(_valueP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -5465,13 +5791,14 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         facets(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getAddresses(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         hasRole(_account: PromiseOrValue<string>, _role: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        initialize(_rolesManager: PromiseOrValue<string>, overrides?: Overrides & {
+        hasRoles(_account: PromiseOrValue<string>, _roleA: PromiseOrValue<BigNumberish>, _roleB: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        initialize(_govTimelock: 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>;
-        addFees(_fees: IPairsStorage.FeeStruct[], overrides?: Overrides & {
+        addFees(_fees: IPairsStorage.FeeGroupStruct[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         addGroups(_groups: IPairsStorage.GroupStruct[], overrides?: Overrides & {
@@ -5483,6 +5810,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         fees(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         feesCount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getAllPairsRestrictedMaxLeverage(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getGlobalTradeFeeParams(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPairLiquidationParams(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         groups(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -5490,29 +5818,33 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeGroupLiquidationParams(_groupLiquidationParams: IPairsStorage.GroupLiquidationParamsStruct[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        initializeNewFees(_tradeFeeParams: IPairsStorage.GlobalTradeFeeParamsStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         isPairIndexListed(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         isPairListed(_from: PromiseOrValue<string>, _to: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        pairCloseFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         pairCustomMaxLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         pairJob(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         pairMaxLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         pairMinFeeUsd(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         pairMinLeverage(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         pairMinPositionSizeUsd(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        pairOpenFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        pairOracleFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        pairOraclePositionSizeFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         pairSpreadP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        pairTriggerOrderFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        pairTotalLiqCollateralFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        pairTotalPositionSizeFeeP(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         pairs(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        pairsBackend(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         pairsCount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        setGlobalTradeFeeParams(_feeParams: IPairsStorage.GlobalTradeFeeParamsStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         setGroupLiquidationParams(_groupIndex: PromiseOrValue<BigNumberish>, _params: IPairsStorage.GroupLiquidationParamsStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         setPairCustomMaxLeverages(_indices: PromiseOrValue<BigNumberish>[], _values: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        updateFees(_ids: PromiseOrValue<BigNumberish>[], _fees: IPairsStorage.FeeStruct[], overrides?: Overrides & {
+        updateFees(_ids: PromiseOrValue<BigNumberish>[], _fees: IPairsStorage.FeeGroupStruct[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         updateGroups(_ids: PromiseOrValue<BigNumberish>[], _groups: IPairsStorage.GroupStruct[], overrides?: Overrides & {
@@ -5527,21 +5859,20 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         claimReferrerRewards(overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        distributeReferralReward(_trader: PromiseOrValue<string>, _volumeUsd: PromiseOrValue<BigNumberish>, _pairOpenFeeP: PromiseOrValue<BigNumberish>, _gnsPriceUsd: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        distributeReferralReward(_trader: PromiseOrValue<string>, _volumeUsd: PromiseOrValue<BigNumberish>, _referrerFeeUsd: PromiseOrValue<BigNumberish>, _gnsPriceUsd: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         getAllyDetails(_ally: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getReferralsAllyFeeP(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getReferralsOpenFeeP(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getReferralsStartReferrerFeeP(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getReferralsTargetVolumeUsd(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getReferrerDetails(_referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getReferrerFeeP(_pairOpenFeeP: PromiseOrValue<BigNumberish>, _volumeReferredUsd: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getReferrerFeeProgressP(_referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getReferrersReferred(_ally: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTraderActiveReferrer(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTraderLastReferrer(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTradersReferred(_referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        initializeReferrals(_allyFeeP: PromiseOrValue<BigNumberish>, _startReferrerFeeP: PromiseOrValue<BigNumberish>, _openFeeP: PromiseOrValue<BigNumberish>, _targetVolumeUsd: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        initializeReferrals(_allyFeeP: PromiseOrValue<BigNumberish>, _startReferrerFeeP: PromiseOrValue<BigNumberish>, _targetVolumeUsd: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         registerPotentialReferrer(_trader: PromiseOrValue<string>, _referrer: PromiseOrValue<string>, overrides?: Overrides & {
@@ -5556,9 +5887,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateAllyFeeP(_value: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        updateReferralsOpenFeeP(_value: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<PopulatedTransaction>;
         updateReferralsTargetVolumeUsd(_value: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -5571,6 +5899,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         whitelistReferrers(_referrers: PromiseOrValue<string>[], _allies: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        addTradersUnclaimedPoints(_traders: PromiseOrValue<string>[], _creditTypes: PromiseOrValue<BigNumberish>[], _points: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         calculateFeeAmount(_trader: PromiseOrValue<string>, _normalFeeAmountCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getFeeTier(_feeTierIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getFeeTiersCount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -5578,6 +5909,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getFeeTiersTraderInfo(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getGroupVolumeMultiplier(_groupIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTraderFeeTiersEnrollment(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getTraderUnclaimedPoints(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         initializeFeeTiers(_groupIndices: PromiseOrValue<BigNumberish>[], _groupVolumeMultipliers: PromiseOrValue<BigNumberish>[], _feeTiersIndices: PromiseOrValue<BigNumberish>[], _feeTiers: IFeeTiers.FeeTierStruct[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -5593,9 +5925,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateTraderPoints(_trader: PromiseOrValue<string>, _volumeUsd: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        addPriceImpactOpenInterest(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, overrides?: Overrides & {
+        addPriceImpactOpenInterest(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        getNegPnlCumulVolMultiplier(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getOiWindow(_windowsDuration: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _windowId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getOiWindows(_windowsDuration: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _windowIds: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getOiWindowsSettings(overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -5603,7 +5936,11 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getPairDepths(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPairFactors(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPriceImpactOi(_pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getTradePriceImpact(_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>;
+        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>;
+        initializeNegPnlCumulVolMultiplier(_negPnlCumulVolMultiplier: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         initializePairFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactors: PromiseOrValue<BigNumberish>[], _protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>[], _cumulativeFactors: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -5613,6 +5950,15 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setCumulativeFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _cumulativeFactors: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        setExemptAfterProtectionCloseFactor(_pairIndices: PromiseOrValue<BigNumberish>[], _exemptAfterProtectionCloseFactor: PromiseOrValue<boolean>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        setExemptOnOpen(_pairIndices: PromiseOrValue<BigNumberish>[], _exemptOnOpen: PromiseOrValue<boolean>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        setNegPnlCumulVolMultiplier(_negPnlCumulVolMultiplier: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         setPairDepths(_indices: PromiseOrValue<BigNumberish>[], _depthsAboveUsd: PromiseOrValue<BigNumberish>[], _depthsBelowUsd: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -5625,6 +5971,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setProtectionCloseFactorBlocks(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        setProtectionCloseFactorWhitelist(_traders: PromiseOrValue<string>[], _whitelisted: PromiseOrValue<boolean>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         setProtectionCloseFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactors: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -5634,18 +5983,23 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         closePendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        closeTrade(_tradeId: ITradingStorage.IdStruct, overrides?: Overrides & {
+        closeTrade(_tradeId: ITradingStorage.IdStruct, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         getAllPendingOrders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getAllPendingOrdersForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getAllTradeInfos(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getAllTradeInfosForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getAllTrades(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getAllTradesForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getAllTradesLiquidationParams(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getAllTradesLiquidationParamsForTraders(_traders: PromiseOrValue<string>[], _offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getCollateral(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getCollateralIndex(_collateral: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getCollaterals(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getCollateralsCount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getCounters(_trader: PromiseOrValue<string>, _type: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getCountersForTraders(_traders: PromiseOrValue<string>[], _type: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getCurrentContractsVersion(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getGToken(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -5657,6 +6011,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getTradePendingOrderBlock(_tradeId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTraderStored(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTraders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getTradersCount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTrades(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTradesLiquidationParams(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTradingActivated(overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -5686,7 +6041,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         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>, overrides?: Overrides & {
+        updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, _isPartialIncrease: PromiseOrValue<boolean>, _isPnlPositive: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         updateTradeSl(_tradeId: ITradingStorage.IdStruct, _newSl: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -5798,12 +6153,18 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeCallbacks(_vaultClosingFeeP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        initializeTreasuryAddress(_treasury: PromiseOrValue<string>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         openTradeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         updateLeverageCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        updateTreasuryAddress(_treasury: PromiseOrValue<string>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         updateVaultClosingFeeP(_valueP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;