@gainsnetwork/sdk 0.2.9-rc1 → 0.2.10-rc1

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

@@ -35,26 +35,6 @@ export declare namespace IGNSDiamondLoupe {
     };
 }
 export declare namespace IPairsStorage {
-    type GroupLiquidationParamsStruct = {
-        maxLiqSpreadP: PromiseOrValue<BigNumberish>;
-        startLiqThresholdP: PromiseOrValue<BigNumberish>;
-        endLiqThresholdP: PromiseOrValue<BigNumberish>;
-        startLeverage: PromiseOrValue<BigNumberish>;
-        endLeverage: PromiseOrValue<BigNumberish>;
-    };
-    type GroupLiquidationParamsStructOutput = [
-        number,
-        BigNumber,
-        BigNumber,
-        number,
-        number
-    ] & {
-        maxLiqSpreadP: number;
-        startLiqThresholdP: BigNumber;
-        endLiqThresholdP: BigNumber;
-        startLeverage: number;
-        endLeverage: number;
-    };
     type FeeStruct = {
         name: PromiseOrValue<string>;
         openFeeP: PromiseOrValue<BigNumberish>;
@@ -213,8 +193,6 @@ export declare namespace IPriceImpact {
         oiShortUsd: BigNumber;
     };
     type OiWindowUpdateStruct = {
-        trader: PromiseOrValue<string>;
-        index: PromiseOrValue<BigNumberish>;
         windowsDuration: PromiseOrValue<BigNumberish>;
         pairIndex: PromiseOrValue<BigNumberish>;
         windowId: PromiseOrValue<BigNumberish>;
@@ -222,16 +200,12 @@ export declare namespace IPriceImpact {
         openInterestUsd: PromiseOrValue<BigNumberish>;
     };
     type OiWindowUpdateStructOutput = [
-        string,
-        number,
         number,
         BigNumber,
         BigNumber,
         boolean,
         BigNumber
     ] & {
-        trader: string;
-        index: number;
         windowsDuration: number;
         pairIndex: BigNumber;
         windowId: BigNumber;
@@ -256,14 +230,6 @@ export declare namespace IPriceImpact {
         onePercentDepthAboveUsd: BigNumber;
         onePercentDepthBelowUsd: BigNumber;
     };
-    type TradePriceImpactInfoStruct = {
-        lastWindowOiUsd: PromiseOrValue<BigNumberish>;
-        __placeholder: PromiseOrValue<BigNumberish>;
-    };
-    type TradePriceImpactInfoStructOutput = [BigNumber, BigNumber] & {
-        lastWindowOiUsd: BigNumber;
-        __placeholder: BigNumber;
-    };
 }
 export declare namespace ITradingStorage {
     type IdStruct = {
@@ -401,109 +367,6 @@ export declare namespace ITradingStorage {
         __placeholder: BigNumber;
     };
 }
-export declare namespace IUpdateLeverage {
-    type UpdateLeverageValuesStruct = {
-        newLeverage: PromiseOrValue<BigNumberish>;
-        newCollateralAmount: PromiseOrValue<BigNumberish>;
-        liqPrice: PromiseOrValue<BigNumberish>;
-        govFeeCollateral: PromiseOrValue<BigNumberish>;
-    };
-    type UpdateLeverageValuesStructOutput = [
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber
-    ] & {
-        newLeverage: BigNumber;
-        newCollateralAmount: BigNumber;
-        liqPrice: BigNumber;
-        govFeeCollateral: BigNumber;
-    };
-}
-export declare namespace IUpdatePositionSize {
-    type DecreasePositionSizeValuesStruct = {
-        positionSizeCollateralDelta: PromiseOrValue<BigNumberish>;
-        existingPositionSizeCollateral: PromiseOrValue<BigNumberish>;
-        existingLiqPrice: PromiseOrValue<BigNumberish>;
-        priceAfterImpact: PromiseOrValue<BigNumberish>;
-        existingPnlCollateral: PromiseOrValue<BigNumberish>;
-        borrowingFeeCollateral: PromiseOrValue<BigNumberish>;
-        vaultFeeCollateral: PromiseOrValue<BigNumberish>;
-        gnsStakingFeeCollateral: PromiseOrValue<BigNumberish>;
-        availableCollateralInDiamond: PromiseOrValue<BigNumberish>;
-        collateralSentToTrader: PromiseOrValue<BigNumberish>;
-        newCollateralAmount: PromiseOrValue<BigNumberish>;
-        newLeverage: PromiseOrValue<BigNumberish>;
-    };
-    type DecreasePositionSizeValuesStructOutput = [
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        number
-    ] & {
-        positionSizeCollateralDelta: BigNumber;
-        existingPositionSizeCollateral: BigNumber;
-        existingLiqPrice: BigNumber;
-        priceAfterImpact: BigNumber;
-        existingPnlCollateral: BigNumber;
-        borrowingFeeCollateral: BigNumber;
-        vaultFeeCollateral: BigNumber;
-        gnsStakingFeeCollateral: BigNumber;
-        availableCollateralInDiamond: BigNumber;
-        collateralSentToTrader: BigNumber;
-        newCollateralAmount: BigNumber;
-        newLeverage: number;
-    };
-    type IncreasePositionSizeValuesStruct = {
-        positionSizeCollateralDelta: PromiseOrValue<BigNumberish>;
-        existingPositionSizeCollateral: PromiseOrValue<BigNumberish>;
-        newPositionSizeCollateral: PromiseOrValue<BigNumberish>;
-        newCollateralAmount: PromiseOrValue<BigNumberish>;
-        newLeverage: PromiseOrValue<BigNumberish>;
-        priceAfterImpact: PromiseOrValue<BigNumberish>;
-        existingPnlCollateral: PromiseOrValue<BigNumberish>;
-        newOpenPrice: PromiseOrValue<BigNumberish>;
-        borrowingFeeCollateral: PromiseOrValue<BigNumberish>;
-        openingFeesCollateral: PromiseOrValue<BigNumberish>;
-        existingLiqPrice: PromiseOrValue<BigNumberish>;
-        newLiqPrice: PromiseOrValue<BigNumberish>;
-    };
-    type IncreasePositionSizeValuesStructOutput = [
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber
-    ] & {
-        positionSizeCollateralDelta: BigNumber;
-        existingPositionSizeCollateral: BigNumber;
-        newPositionSizeCollateral: BigNumber;
-        newCollateralAmount: BigNumber;
-        newLeverage: BigNumber;
-        priceAfterImpact: BigNumber;
-        existingPnlCollateral: BigNumber;
-        newOpenPrice: BigNumber;
-        borrowingFeeCollateral: BigNumber;
-        openingFeesCollateral: BigNumber;
-        existingLiqPrice: BigNumber;
-        newLiqPrice: BigNumber;
-    };
-}
 export declare namespace ITradingCallbacks {
     type AggregatorAnswerStruct = {
         orderId: ITradingStorage.IdStruct;
@@ -651,7 +514,6 @@ export declare namespace IBorrowingFees {
         long: PromiseOrValue<boolean>;
         collateral: PromiseOrValue<BigNumberish>;
         leverage: PromiseOrValue<BigNumberish>;
-        useBorrowingFees: PromiseOrValue<boolean>;
     };
     type LiqPriceInputStructOutput = [
         number,
@@ -661,8 +523,7 @@ export declare namespace IBorrowingFees {
         BigNumber,
         boolean,
         BigNumber,
-        BigNumber,
-        boolean
+        number
     ] & {
         collateralIndex: number;
         trader: string;
@@ -671,8 +532,7 @@ export declare namespace IBorrowingFees {
         openPrice: BigNumber;
         long: boolean;
         collateral: BigNumber;
-        leverage: BigNumber;
-        useBorrowingFees: boolean;
+        leverage: number;
     };
     type BorrowingGroupParamsStruct = {
         feePerBlock: PromiseOrValue<BigNumberish>;
@@ -703,21 +563,14 @@ export declare namespace IBorrowingFees {
     };
 }
 export declare namespace IPriceAggregator {
-    type LiquidityPoolInfoStruct = {
+    type UniV3PoolInfoStruct = {
         pool: PromiseOrValue<string>;
         isGnsToken0InLp: PromiseOrValue<boolean>;
-        poolType: PromiseOrValue<BigNumberish>;
         __placeholder: PromiseOrValue<BigNumberish>;
     };
-    type LiquidityPoolInfoStructOutput = [
-        string,
-        boolean,
-        number,
-        BigNumber
-    ] & {
+    type UniV3PoolInfoStructOutput = [string, boolean, BigNumber] & {
         pool: string;
         isGnsToken0InLp: boolean;
-        poolType: number;
         __placeholder: BigNumber;
     };
     type OrderStruct = {
@@ -760,14 +613,6 @@ export declare namespace IPriceAggregator {
         low: BigNumber;
         ts: BigNumber;
     };
-    type LiquidityPoolInputStruct = {
-        pool: PromiseOrValue<string>;
-        poolType: PromiseOrValue<BigNumberish>;
-    };
-    type LiquidityPoolInputStructOutput = [string, number] & {
-        pool: string;
-        poolType: number;
-    };
 }
 export declare namespace BufferChainlink {
     type BufferStruct = {
@@ -801,28 +646,6 @@ export declare namespace Chainlink {
         buf: BufferChainlink.BufferStructOutput;
     };
 }
-export declare namespace IOtc {
-    type OtcConfigStruct = {
-        gnsTreasury: PromiseOrValue<string>;
-        treasuryShareP: PromiseOrValue<BigNumberish>;
-        stakingShareP: PromiseOrValue<BigNumberish>;
-        burnShareP: PromiseOrValue<BigNumberish>;
-        premiumP: PromiseOrValue<BigNumberish>;
-    };
-    type OtcConfigStructOutput = [
-        string,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber
-    ] & {
-        gnsTreasury: string;
-        treasuryShareP: BigNumber;
-        stakingShareP: BigNumber;
-        burnShareP: BigNumber;
-        premiumP: BigNumber;
-    };
-}
 export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     functions: {
         "diamondCut((address,uint8,bytes4[])[],address,bytes)": FunctionFragment;
@@ -840,18 +663,14 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "fees(uint256)": FunctionFragment;
         "feesCount()": FunctionFragment;
         "getAllPairsRestrictedMaxLeverage()": FunctionFragment;
-        "getGroupLiquidationParams(uint256)": FunctionFragment;
-        "getPairLiquidationParams(uint256)": FunctionFragment;
         "groups(uint256)": FunctionFragment;
         "groupsCount()": FunctionFragment;
-        "initializeGroupLiquidationParams((uint40,uint64,uint64,uint24,uint24)[])": 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;
@@ -861,7 +680,6 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "pairs(uint256)": FunctionFragment;
         "pairsBackend(uint256)": FunctionFragment;
         "pairsCount()": FunctionFragment;
-        "setGroupLiquidationParams(uint256,(uint40,uint64,uint64,uint24,uint24))": FunctionFragment;
         "setPairCustomMaxLeverages(uint256[],uint256[])": FunctionFragment;
         "updateFees(uint256[],(string,uint256,uint256,uint256,uint256,uint256)[])": FunctionFragment;
         "updateGroups(uint256[],(string,bytes32,uint256,uint256)[])": FunctionFragment;
@@ -900,50 +718,42 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "setFeeTiers(uint256[],(uint32,uint32)[])": FunctionFragment;
         "setGroupVolumeMultipliers(uint256[],uint256[])": FunctionFragment;
         "updateTraderPoints(address,uint256,uint256)": FunctionFragment;
-        "addPriceImpactOpenInterest(address,uint32,uint256)": FunctionFragment;
+        "addPriceImpactOpenInterest(uint256,uint256,bool)": FunctionFragment;
         "getOiWindow(uint48,uint256,uint256)": FunctionFragment;
         "getOiWindows(uint48,uint256,uint256[])": FunctionFragment;
         "getOiWindowsSettings()": FunctionFragment;
         "getPairDepth(uint256)": FunctionFragment;
         "getPairDepths(uint256[])": FunctionFragment;
         "getPriceImpactOi(uint256,bool)": FunctionFragment;
-        "getProtectionCloseFactorBlocks()": FunctionFragment;
-        "getProtectionCloseFactors(uint256[])": FunctionFragment;
-        "getTradeLastWindowOiUsd(address,uint32)": FunctionFragment;
-        "getTradePriceImpact(uint256,uint256,bool,uint256,bool,bool,uint256)": FunctionFragment;
-        "getTradePriceImpactInfo(address,uint32)": FunctionFragment;
+        "getTradePriceImpact(uint256,uint256,bool,uint256)": FunctionFragment;
         "initializePriceImpact(uint48,uint48)": FunctionFragment;
-        "initializeProtectionCloseFactorBlocks(uint24)": FunctionFragment;
-        "removePriceImpactOpenInterest(address,uint32,uint256)": FunctionFragment;
+        "removePriceImpactOpenInterest(uint256,uint256,bool,uint48)": FunctionFragment;
         "setPairDepths(uint256[],uint128[],uint128[])": FunctionFragment;
         "setPriceImpactWindowsCount(uint48)": FunctionFragment;
         "setPriceImpactWindowsDuration(uint48)": FunctionFragment;
-        "setProtectionCloseFactorBlocks(uint24)": FunctionFragment;
-        "setProtectionCloseFactors(uint16[],uint256[])": FunctionFragment;
         "addCollateral(address,address)": FunctionFragment;
         "closePendingOrder((address,uint32))": FunctionFragment;
         "closeTrade((address,uint32))": FunctionFragment;
         "getAllPendingOrders(uint256,uint256)": FunctionFragment;
         "getAllTradeInfos(uint256,uint256)": FunctionFragment;
         "getAllTrades(uint256,uint256)": FunctionFragment;
-        "getAllTradesLiquidationParams(uint256,uint256)": FunctionFragment;
         "getCollateral(uint8)": FunctionFragment;
         "getCollateralIndex(address)": FunctionFragment;
         "getCollaterals()": FunctionFragment;
         "getCollateralsCount()": FunctionFragment;
         "getCounters(address,uint8)": FunctionFragment;
         "getGToken(uint8)": FunctionFragment;
+        "getPendingOpenOrderType(uint8)": FunctionFragment;
         "getPendingOrder((address,uint32))": FunctionFragment;
         "getPendingOrders(address)": FunctionFragment;
+        "getPnlPercent(uint64,uint64,bool,uint24)": FunctionFragment;
         "getTrade(address,uint32)": FunctionFragment;
         "getTradeInfo(address,uint32)": FunctionFragment;
         "getTradeInfos(address)": FunctionFragment;
-        "getTradeLiquidationParams(address,uint32)": FunctionFragment;
         "getTradePendingOrderBlock((address,uint32),uint8)": FunctionFragment;
         "getTraderStored(address)": FunctionFragment;
         "getTraders(uint32,uint32)": FunctionFragment;
         "getTrades(address)": FunctionFragment;
-        "getTradesLiquidationParams(address)": FunctionFragment;
         "getTradingActivated()": FunctionFragment;
         "initializeTradingStorage(address,address,address[],address[])": FunctionFragment;
         "isCollateralActive(uint8)": FunctionFragment;
@@ -954,7 +764,6 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "updateGToken(address,address)": FunctionFragment;
         "updateOpenOrderDetails((address,uint32),uint64,uint64,uint64,uint16)": FunctionFragment;
         "updateTradeCollateralAmount((address,uint32),uint120)": FunctionFragment;
-        "updateTradePosition((address,uint32),uint120,uint24,uint64)": FunctionFragment;
         "updateTradeSl((address,uint32),uint64)": FunctionFragment;
         "updateTradeTp((address,uint32),uint64)": FunctionFragment;
         "updateTradingActivated(uint8)": FunctionFragment;
@@ -966,39 +775,34 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "initializeTriggerRewards(uint16)": FunctionFragment;
         "updateTriggerTimeoutBlocks(uint16)": FunctionFragment;
         "cancelOpenOrder(uint32)": FunctionFragment;
-        "cancelOrderAfterTimeout(uint32)": FunctionFragment;
         "closeTradeMarket(uint32)": FunctionFragment;
-        "decreasePositionSize(uint32,uint120,uint24)": FunctionFragment;
+        "closeTradeMarketTimeout((address,uint32))": FunctionFragment;
         "delegatedTradingAction(address,bytes)": FunctionFragment;
         "getByPassTriggerLink(address)": FunctionFragment;
         "getMarketOrdersTimeoutBlocks()": FunctionFragment;
         "getTradingDelegate(address)": FunctionFragment;
         "getWrappedNativeToken()": FunctionFragment;
-        "increasePositionSize(uint32,uint120,uint24,uint64,uint16)": FunctionFragment;
         "initializeTrading(uint16,address[])": FunctionFragment;
         "isWrappedNativeToken(address)": FunctionFragment;
         "openTrade((address,uint32,uint16,uint24,bool,bool,uint8,uint8,uint120,uint64,uint64,uint64,uint192),uint16,address)": FunctionFragment;
+        "openTradeMarketTimeout((address,uint32))": FunctionFragment;
         "openTradeNative((address,uint32,uint16,uint24,bool,bool,uint8,uint8,uint120,uint64,uint64,uint64,uint192),uint16,address)": FunctionFragment;
         "removeTradingDelegate()": FunctionFragment;
         "setTradingDelegate(address)": FunctionFragment;
         "triggerOrder(uint256)": FunctionFragment;
         "updateByPassTriggerLink(address[],bool[])": FunctionFragment;
-        "updateLeverage(uint32,uint24)": FunctionFragment;
         "updateMarketOrdersTimeoutBlocks(uint16)": FunctionFragment;
         "updateOpenOrder(uint32,uint64,uint64,uint64,uint16)": FunctionFragment;
         "updateSl(uint32,uint64)": FunctionFragment;
         "updateTp(uint32,uint64)": FunctionFragment;
         "claimPendingGovFees()": FunctionFragment;
         "closeTradeMarketCallback(((address,uint32),uint256,uint64,uint64,uint64,uint64))": FunctionFragment;
-        "decreasePositionSizeMarketCallback(((address,uint32),uint256,uint64,uint64,uint64,uint64))": FunctionFragment;
         "executeTriggerCloseOrderCallback(((address,uint32),uint256,uint64,uint64,uint64,uint64))": FunctionFragment;
         "executeTriggerOpenOrderCallback(((address,uint32),uint256,uint64,uint64,uint64,uint64))": FunctionFragment;
         "getPendingGovFeesCollateral(uint8)": FunctionFragment;
         "getVaultClosingFeeP()": FunctionFragment;
-        "increasePositionSizeMarketCallback(((address,uint32),uint256,uint64,uint64,uint64,uint64))": FunctionFragment;
         "initializeCallbacks(uint8)": FunctionFragment;
         "openTradeMarketCallback(((address,uint32),uint256,uint64,uint64,uint64,uint64))": FunctionFragment;
-        "updateLeverageCallback(((address,uint32),uint256,uint64,uint64,uint64,uint64))": FunctionFragment;
         "updateVaultClosingFeeP(uint8)": FunctionFragment;
         "getAllBorrowingPairs(uint8)": FunctionFragment;
         "getBorrowingGroup(uint8,uint16)": FunctionFragment;
@@ -1016,9 +820,8 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "getPairOiCollateral(uint8,uint16,bool)": FunctionFragment;
         "getPairOisCollateral(uint8,uint16)": FunctionFragment;
         "getTradeBorrowingFee((uint8,address,uint16,uint32,bool,uint256,uint256))": FunctionFragment;
-        "getTradeLiquidationPrice((uint8,address,uint16,uint32,uint64,bool,uint256,uint256,bool))": FunctionFragment;
+        "getTradeLiquidationPrice((uint8,address,uint16,uint32,uint64,bool,uint256,uint24))": FunctionFragment;
         "handleTradeBorrowingCallback(uint8,address,uint16,uint32,uint256,bool,bool)": FunctionFragment;
-        "resetTradeBorrowingFees(uint8,address,uint16,uint32,bool)": FunctionFragment;
         "setBorrowingGroupParams(uint8,uint16,(uint32,uint72,uint48))": FunctionFragment;
         "setBorrowingGroupParamsArray(uint8,uint16[],(uint32,uint72,uint48)[])": FunctionFragment;
         "setBorrowingPairParams(uint8,uint16,(uint16,uint32,uint48,uint72))": FunctionFragment;
@@ -1029,45 +832,49 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "fulfill(bytes32,uint256)": FunctionFragment;
         "getChainlinkToken()": FunctionFragment;
         "getCollateralFromUsdNormalizedValue(uint8,uint256)": FunctionFragment;
-        "getCollateralGnsLiquidityPool(uint8)": FunctionFragment;
+        "getCollateralGnsUniV3Pool(uint8)": FunctionFragment;
         "getCollateralPriceUsd(uint8)": FunctionFragment;
         "getCollateralUsdPriceFeed(uint8)": FunctionFragment;
         "getGnsPriceCollateralAddress(address)": FunctionFragment;
         "getGnsPriceCollateralIndex(uint8)": FunctionFragment;
         "getGnsPriceUsd(uint8)": FunctionFragment;
         "getLimitJobId()": FunctionFragment;
-        "getLinkFee(uint8,address,uint16,uint256)": FunctionFragment;
+        "getLinkFee(uint8,uint16,uint256)": FunctionFragment;
         "getLinkUsdPriceFeed()": FunctionFragment;
         "getMarketJobId()": FunctionFragment;
         "getMinAnswers()": FunctionFragment;
         "getOracle(uint256)": FunctionFragment;
         "getOracles()": FunctionFragment;
         "getPendingRequest(bytes32)": FunctionFragment;
-        "getPrice(uint8,address,uint16,(address,uint32),uint8,uint256,uint256)": FunctionFragment;
+        "getPrice(uint8,uint16,(address,uint32),uint8,uint256,uint256)": FunctionFragment;
         "getPriceAggregatorOrder(bytes32)": FunctionFragment;
         "getPriceAggregatorOrderAnswers((address,uint32))": FunctionFragment;
         "getRequestCount()": FunctionFragment;
         "getTwapInterval()": FunctionFragment;
         "getUsdNormalizedValue(uint8,uint256)": FunctionFragment;
-        "initializePriceAggregator(address,address,uint24,uint8,address[],bytes32[2],uint8[],(address,uint8)[],address[])": FunctionFragment;
+        "initializePriceAggregator(address,address,uint24,uint8,address[],bytes32[2],uint8[],address[],address[])": FunctionFragment;
         "removeOracle(uint256)": FunctionFragment;
         "replaceOracle(uint256,address)": FunctionFragment;
         "setLimitJobId(bytes32)": FunctionFragment;
         "setMarketJobId(bytes32)": FunctionFragment;
-        "updateCollateralGnsLiquidityPool(uint8,(address,uint8))": FunctionFragment;
+        "updateCollateralGnsUniV3Pool(uint8,address)": FunctionFragment;
         "updateCollateralUsdPriceFeed(uint8,address)": FunctionFragment;
         "updateLinkUsdPriceFeed(address)": FunctionFragment;
         "updateMinAnswers(uint8)": FunctionFragment;
         "updateTwapInterval(uint24)": FunctionFragment;
-        "addOtcCollateralBalance(uint8,uint256)": FunctionFragment;
-        "getOtcBalance(uint8)": FunctionFragment;
-        "getOtcConfig()": FunctionFragment;
-        "getOtcRate(uint8)": FunctionFragment;
-        "initializeOtc((address,uint64,uint64,uint64,uint64))": FunctionFragment;
-        "sellGnsForCollateral(uint8,uint256)": FunctionFragment;
-        "updateOtcConfig((address,uint64,uint64,uint64,uint64))": FunctionFragment;
+        "copyAllState(uint8,address[])": FunctionFragment;
+        "copyBorrowingFeesGroups(uint8)": FunctionFragment;
+        "copyBorrowingFeesPairs(uint8)": FunctionFragment;
+        "copyLimits(uint8,uint256)": FunctionFragment;
+        "copyPairOis(uint8)": FunctionFragment;
+        "copyTraderDelegations(uint8,address[])": FunctionFragment;
+        "copyTrades(uint8,uint16)": FunctionFragment;
+        "getCollateralStageState(uint8,uint8)": FunctionFragment;
+        "getCollateralState(uint8)": FunctionFragment;
+        "markAsDone(uint8)": FunctionFragment;
+        "transferBalance(uint8)": 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" | "initializeFeeTiers" | "setFeeTiers" | "setGroupVolumeMultipliers" | "updateTraderPoints" | "addPriceImpactOpenInterest" | "getOiWindow" | "getOiWindows" | "getOiWindowsSettings" | "getPairDepth" | "getPairDepths" | "getPriceImpactOi" | "getProtectionCloseFactorBlocks" | "getProtectionCloseFactors" | "getTradeLastWindowOiUsd" | "getTradePriceImpact" | "getTradePriceImpactInfo" | "initializePriceImpact" | "initializeProtectionCloseFactorBlocks" | "removePriceImpactOpenInterest" | "setPairDepths" | "setPriceImpactWindowsCount" | "setPriceImpactWindowsDuration" | "setProtectionCloseFactorBlocks" | "setProtectionCloseFactors" | "addCollateral" | "closePendingOrder" | "closeTrade" | "getAllPendingOrders" | "getAllTradeInfos" | "getAllTrades" | "getAllTradesLiquidationParams" | "getCollateral" | "getCollateralIndex" | "getCollaterals" | "getCollateralsCount" | "getCounters" | "getGToken" | "getPendingOrder" | "getPendingOrders" | "getTrade" | "getTradeInfo" | "getTradeInfos" | "getTradeLiquidationParams" | "getTradePendingOrderBlock" | "getTraderStored" | "getTraders" | "getTrades" | "getTradesLiquidationParams" | "getTradingActivated" | "initializeTradingStorage" | "isCollateralActive" | "isCollateralListed" | "storePendingOrder" | "storeTrade" | "toggleCollateralActiveState" | "updateGToken" | "updateOpenOrderDetails" | "updateTradeCollateralAmount" | "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" | "updateOpenOrder" | "updateSl" | "updateTp" | "claimPendingGovFees" | "closeTradeMarketCallback" | "decreasePositionSizeMarketCallback" | "executeTriggerCloseOrderCallback" | "executeTriggerOpenOrderCallback" | "getPendingGovFeesCollateral" | "getVaultClosingFeeP" | "increasePositionSizeMarketCallback" | "initializeCallbacks" | "openTradeMarketCallback" | "updateLeverageCallback" | "updateVaultClosingFeeP" | "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"): FunctionFragment;
+    getFunction(nameOrSignatureOrTopic: "diamondCut" | "facetAddress" | "facetAddresses" | "facetFunctionSelectors" | "facets" | "getAddresses" | "hasRole" | "initialize" | "setRoles" | "addFees" | "addGroups" | "addPairs" | "fees" | "feesCount" | "getAllPairsRestrictedMaxLeverage" | "groups" | "groupsCount" | "isPairIndexListed" | "isPairListed" | "pairCloseFeeP" | "pairCustomMaxLeverage" | "pairJob" | "pairMaxLeverage" | "pairMinLeverage" | "pairMinPositionSizeUsd" | "pairOpenFeeP" | "pairOracleFeeP" | "pairSpreadP" | "pairTriggerOrderFeeP" | "pairs" | "pairsBackend" | "pairsCount" | "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" | "initializeFeeTiers" | "setFeeTiers" | "setGroupVolumeMultipliers" | "updateTraderPoints" | "addPriceImpactOpenInterest" | "getOiWindow" | "getOiWindows" | "getOiWindowsSettings" | "getPairDepth" | "getPairDepths" | "getPriceImpactOi" | "getTradePriceImpact" | "initializePriceImpact" | "removePriceImpactOpenInterest" | "setPairDepths" | "setPriceImpactWindowsCount" | "setPriceImpactWindowsDuration" | "addCollateral" | "closePendingOrder" | "closeTrade" | "getAllPendingOrders" | "getAllTradeInfos" | "getAllTrades" | "getCollateral" | "getCollateralIndex" | "getCollaterals" | "getCollateralsCount" | "getCounters" | "getGToken" | "getPendingOpenOrderType" | "getPendingOrder" | "getPendingOrders" | "getPnlPercent" | "getTrade" | "getTradeInfo" | "getTradeInfos" | "getTradePendingOrderBlock" | "getTraderStored" | "getTraders" | "getTrades" | "getTradingActivated" | "initializeTradingStorage" | "isCollateralActive" | "isCollateralListed" | "storePendingOrder" | "storeTrade" | "toggleCollateralActiveState" | "updateGToken" | "updateOpenOrderDetails" | "updateTradeCollateralAmount" | "updateTradeSl" | "updateTradeTp" | "updateTradingActivated" | "claimPendingTriggerRewards" | "distributeTriggerReward" | "getTriggerPendingRewardsGns" | "getTriggerTimeoutBlocks" | "hasActiveOrder" | "initializeTriggerRewards" | "updateTriggerTimeoutBlocks" | "cancelOpenOrder" | "closeTradeMarket" | "closeTradeMarketTimeout" | "delegatedTradingAction" | "getByPassTriggerLink" | "getMarketOrdersTimeoutBlocks" | "getTradingDelegate" | "getWrappedNativeToken" | "initializeTrading" | "isWrappedNativeToken" | "openTrade" | "openTradeMarketTimeout" | "openTradeNative" | "removeTradingDelegate" | "setTradingDelegate" | "triggerOrder" | "updateByPassTriggerLink" | "updateMarketOrdersTimeoutBlocks" | "updateOpenOrder" | "updateSl" | "updateTp" | "claimPendingGovFees" | "closeTradeMarketCallback" | "executeTriggerCloseOrderCallback" | "executeTriggerOpenOrderCallback" | "getPendingGovFeesCollateral" | "getVaultClosingFeeP" | "initializeCallbacks" | "openTradeMarketCallback" | "updateVaultClosingFeeP" | "getAllBorrowingPairs" | "getBorrowingGroup" | "getBorrowingGroupOi" | "getBorrowingGroupPendingAccFees" | "getBorrowingGroups" | "getBorrowingInitialAccFees" | "getBorrowingPair" | "getBorrowingPairGroupIndex" | "getBorrowingPairGroups" | "getBorrowingPairOi" | "getBorrowingPairPendingAccFees" | "getPairMaxOi" | "getPairMaxOiCollateral" | "getPairOiCollateral" | "getPairOisCollateral" | "getTradeBorrowingFee" | "getTradeLiquidationPrice" | "handleTradeBorrowingCallback" | "setBorrowingGroupParams" | "setBorrowingGroupParamsArray" | "setBorrowingPairParams" | "setBorrowingPairParamsArray" | "withinMaxBorrowingGroupOi" | "addOracle" | "claimBackLink" | "fulfill" | "getChainlinkToken" | "getCollateralFromUsdNormalizedValue" | "getCollateralGnsUniV3Pool" | "getCollateralPriceUsd" | "getCollateralUsdPriceFeed" | "getGnsPriceCollateralAddress" | "getGnsPriceCollateralIndex" | "getGnsPriceUsd" | "getLimitJobId" | "getLinkFee" | "getLinkUsdPriceFeed" | "getMarketJobId" | "getMinAnswers" | "getOracle" | "getOracles" | "getPendingRequest" | "getPrice" | "getPriceAggregatorOrder" | "getPriceAggregatorOrderAnswers" | "getRequestCount" | "getTwapInterval" | "getUsdNormalizedValue" | "initializePriceAggregator" | "removeOracle" | "replaceOracle" | "setLimitJobId" | "setMarketJobId" | "updateCollateralGnsUniV3Pool" | "updateCollateralUsdPriceFeed" | "updateLinkUsdPriceFeed" | "updateMinAnswers" | "updateTwapInterval" | "copyAllState" | "copyBorrowingFeesGroups" | "copyBorrowingFeesPairs" | "copyLimits" | "copyPairOis" | "copyTraderDelegations" | "copyTrades" | "getCollateralStageState" | "getCollateralState" | "markAsDone" | "transferBalance"): FunctionFragment;
     encodeFunctionData(functionFragment: "diamondCut", values: [
         IDiamondStorage.FacetCutStruct[],
         PromiseOrValue<string>,
@@ -1091,18 +898,14 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "fees", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "feesCount", values?: undefined): string;
     encodeFunctionData(functionFragment: "getAllPairsRestrictedMaxLeverage", 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: "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;
@@ -1112,10 +915,6 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "pairs", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "pairsBackend", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "pairsCount", values?: undefined): 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: "updateGroups", values: [PromiseOrValue<BigNumberish>[], IPairsStorage.GroupStruct[]]): string;
@@ -1174,9 +973,9 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<BigNumberish>
     ]): string;
     encodeFunctionData(functionFragment: "addPriceImpactOpenInterest", values: [
-        PromiseOrValue<string>,
         PromiseOrValue<BigNumberish>,
-        PromiseOrValue<BigNumberish>
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<boolean>
     ]): string;
     encodeFunctionData(functionFragment: "getOiWindow", values: [
         PromiseOrValue<BigNumberish>,
@@ -1192,24 +991,17 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "getPairDepth", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getPairDepths", values: [PromiseOrValue<BigNumberish>[]]): string;
     encodeFunctionData(functionFragment: "getPriceImpactOi", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<boolean>]): string;
-    encodeFunctionData(functionFragment: "getProtectionCloseFactorBlocks", values?: undefined): string;
-    encodeFunctionData(functionFragment: "getProtectionCloseFactors", values: [PromiseOrValue<BigNumberish>[]]): string;
-    encodeFunctionData(functionFragment: "getTradeLastWindowOiUsd", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getTradePriceImpact", values: [
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<boolean>,
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<boolean>,
-        PromiseOrValue<boolean>,
         PromiseOrValue<BigNumberish>
     ]): string;
-    encodeFunctionData(functionFragment: "getTradePriceImpactInfo", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "initializePriceImpact", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "initializeProtectionCloseFactorBlocks", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "removePriceImpactOpenInterest", values: [
-        PromiseOrValue<string>,
         PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<boolean>,
         PromiseOrValue<BigNumberish>
     ]): string;
     encodeFunctionData(functionFragment: "setPairDepths", values: [
@@ -1219,32 +1011,34 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     ]): string;
     encodeFunctionData(functionFragment: "setPriceImpactWindowsCount", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "setPriceImpactWindowsDuration", values: [PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "setProtectionCloseFactorBlocks", values: [PromiseOrValue<BigNumberish>]): 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: "getAllPendingOrders", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getAllTradeInfos", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getAllTrades", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "getAllTradesLiquidationParams", values: [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: "getGToken", values: [PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getPendingOpenOrderType", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getPendingOrder", values: [ITradingStorage.IdStruct]): string;
     encodeFunctionData(functionFragment: "getPendingOrders", values: [PromiseOrValue<string>]): string;
+    encodeFunctionData(functionFragment: "getPnlPercent", values: [
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<BigNumberish>,
+        PromiseOrValue<boolean>,
+        PromiseOrValue<BigNumberish>
+    ]): string;
     encodeFunctionData(functionFragment: "getTrade", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getTradeInfo", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getTradeInfos", values: [PromiseOrValue<string>]): string;
-    encodeFunctionData(functionFragment: "getTradeLiquidationParams", values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]): string;
     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: "getTrades", values: [PromiseOrValue<string>]): string;
-    encodeFunctionData(functionFragment: "getTradesLiquidationParams", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "getTradingActivated", values?: undefined): string;
     encodeFunctionData(functionFragment: "initializeTradingStorage", values: [
         PromiseOrValue<string>,
@@ -1266,12 +1060,6 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<BigNumberish>
     ]): string;
     encodeFunctionData(functionFragment: "updateTradeCollateralAmount", values: [ITradingStorage.IdStruct, PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "updateTradePosition", values: [
-        ITradingStorage.IdStruct,
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<BigNumberish>
-    ]): string;
     encodeFunctionData(functionFragment: "updateTradeSl", values: [ITradingStorage.IdStruct, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "updateTradeTp", values: [ITradingStorage.IdStruct, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "updateTradingActivated", values: [PromiseOrValue<BigNumberish>]): string;
@@ -1283,25 +1071,13 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "initializeTriggerRewards", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "updateTriggerTimeoutBlocks", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "cancelOpenOrder", values: [PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "cancelOrderAfterTimeout", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "closeTradeMarket", values: [PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "decreasePositionSize", values: [
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<BigNumberish>
-    ]): string;
+    encodeFunctionData(functionFragment: "closeTradeMarketTimeout", values: [ITradingStorage.IdStruct]): string;
     encodeFunctionData(functionFragment: "delegatedTradingAction", values: [PromiseOrValue<string>, PromiseOrValue<BytesLike>]): string;
     encodeFunctionData(functionFragment: "getByPassTriggerLink", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "getMarketOrdersTimeoutBlocks", values?: undefined): string;
     encodeFunctionData(functionFragment: "getTradingDelegate", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "getWrappedNativeToken", values?: undefined): string;
-    encodeFunctionData(functionFragment: "increasePositionSize", values: [
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<BigNumberish>
-    ]): string;
     encodeFunctionData(functionFragment: "initializeTrading", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<string>[]]): string;
     encodeFunctionData(functionFragment: "isWrappedNativeToken", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "openTrade", values: [
@@ -1309,6 +1085,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<string>
     ]): string;
+    encodeFunctionData(functionFragment: "openTradeMarketTimeout", values: [ITradingStorage.IdStruct]): string;
     encodeFunctionData(functionFragment: "openTradeNative", values: [
         ITradingStorage.TradeStruct,
         PromiseOrValue<BigNumberish>,
@@ -1318,7 +1095,6 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "setTradingDelegate", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "triggerOrder", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "updateByPassTriggerLink", values: [PromiseOrValue<string>[], PromiseOrValue<boolean>[]]): string;
-    encodeFunctionData(functionFragment: "updateLeverage", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "updateMarketOrdersTimeoutBlocks", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "updateOpenOrder", values: [
         PromiseOrValue<BigNumberish>,
@@ -1331,15 +1107,12 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "updateTp", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "claimPendingGovFees", values?: undefined): string;
     encodeFunctionData(functionFragment: "closeTradeMarketCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
-    encodeFunctionData(functionFragment: "decreasePositionSizeMarketCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
     encodeFunctionData(functionFragment: "executeTriggerCloseOrderCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
     encodeFunctionData(functionFragment: "executeTriggerOpenOrderCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
     encodeFunctionData(functionFragment: "getPendingGovFeesCollateral", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getVaultClosingFeeP", values?: undefined): string;
-    encodeFunctionData(functionFragment: "increasePositionSizeMarketCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
     encodeFunctionData(functionFragment: "initializeCallbacks", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "openTradeMarketCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
-    encodeFunctionData(functionFragment: "updateLeverageCallback", values: [ITradingCallbacks.AggregatorAnswerStruct]): string;
     encodeFunctionData(functionFragment: "updateVaultClosingFeeP", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getAllBorrowingPairs", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getBorrowingGroup", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
@@ -1383,13 +1156,6 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         PromiseOrValue<boolean>,
         PromiseOrValue<boolean>
     ]): string;
-    encodeFunctionData(functionFragment: "resetTradeBorrowingFees", values: [
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<string>,
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<boolean>
-    ]): string;
     encodeFunctionData(functionFragment: "setBorrowingGroupParams", values: [
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>,
@@ -1421,7 +1187,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "fulfill", values: [PromiseOrValue<BytesLike>, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getChainlinkToken", values?: undefined): string;
     encodeFunctionData(functionFragment: "getCollateralFromUsdNormalizedValue", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "getCollateralGnsLiquidityPool", values: [PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getCollateralGnsUniV3Pool", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getCollateralPriceUsd", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getCollateralUsdPriceFeed", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "getGnsPriceCollateralAddress", values: [PromiseOrValue<string>]): string;
@@ -1430,7 +1196,6 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "getLimitJobId", values?: undefined): string;
     encodeFunctionData(functionFragment: "getLinkFee", values: [
         PromiseOrValue<BigNumberish>,
-        PromiseOrValue<string>,
         PromiseOrValue<BigNumberish>,
         PromiseOrValue<BigNumberish>
     ]): string;
@@ -1442,7 +1207,6 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "getPendingRequest", values: [PromiseOrValue<BytesLike>]): string;
     encodeFunctionData(functionFragment: "getPrice", values: [
         PromiseOrValue<BigNumberish>,
-        PromiseOrValue<string>,
         PromiseOrValue<BigNumberish>,
         ITradingStorage.IdStruct,
         PromiseOrValue<BigNumberish>,
@@ -1465,28 +1229,29 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
             PromiseOrValue<BytesLike>
         ],
         PromiseOrValue<BigNumberish>[],
-        IPriceAggregator.LiquidityPoolInputStruct[],
+        PromiseOrValue<string>[],
         PromiseOrValue<string>[]
     ]): string;
     encodeFunctionData(functionFragment: "removeOracle", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "replaceOracle", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "setLimitJobId", values: [PromiseOrValue<BytesLike>]): string;
     encodeFunctionData(functionFragment: "setMarketJobId", values: [PromiseOrValue<BytesLike>]): string;
-    encodeFunctionData(functionFragment: "updateCollateralGnsLiquidityPool", values: [
-        PromiseOrValue<BigNumberish>,
-        IPriceAggregator.LiquidityPoolInputStruct
-    ]): string;
+    encodeFunctionData(functionFragment: "updateCollateralGnsUniV3Pool", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "updateCollateralUsdPriceFeed", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "updateLinkUsdPriceFeed", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "updateMinAnswers", values: [PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "updateTwapInterval", values: [PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "addOtcCollateralBalance", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "getOtcBalance", values: [PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "getOtcConfig", values?: undefined): string;
-    encodeFunctionData(functionFragment: "getOtcRate", values: [PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "initializeOtc", values: [IOtc.OtcConfigStruct]): string;
-    encodeFunctionData(functionFragment: "sellGnsForCollateral", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "updateOtcConfig", values: [IOtc.OtcConfigStruct]): string;
+    encodeFunctionData(functionFragment: "copyAllState", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<string>[]]): string;
+    encodeFunctionData(functionFragment: "copyBorrowingFeesGroups", values: [PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "copyBorrowingFeesPairs", values: [PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "copyLimits", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "copyPairOis", values: [PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "copyTraderDelegations", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<string>[]]): string;
+    encodeFunctionData(functionFragment: "copyTrades", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getCollateralStageState", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "getCollateralState", values: [PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "markAsDone", values: [PromiseOrValue<BigNumberish>]): string;
+    encodeFunctionData(functionFragment: "transferBalance", values: [PromiseOrValue<BigNumberish>]): string;
     decodeFunctionResult(functionFragment: "diamondCut", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "facetAddress", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "facetAddresses", data: BytesLike): Result;
@@ -1502,18 +1267,14 @@ 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: "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: "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;
@@ -1523,7 +1284,6 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "pairs", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "pairsBackend", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "pairsCount", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "setGroupLiquidationParams", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setPairCustomMaxLeverages", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateFees", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateGroups", data: BytesLike): Result;
@@ -1569,43 +1329,35 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "getPairDepth", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPairDepths", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPriceImpactOi", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getProtectionCloseFactorBlocks", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getProtectionCloseFactors", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getTradeLastWindowOiUsd", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTradePriceImpact", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getTradePriceImpactInfo", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "initializePriceImpact", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "initializeProtectionCloseFactorBlocks", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "removePriceImpactOpenInterest", 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: "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: "getAllTradeInfos", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getAllTrades", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getAllTradesLiquidationParams", 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: "getGToken", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPendingOpenOrderType", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPendingOrder", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPendingOrders", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getPnlPercent", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTrade", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTradeInfo", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTradeInfos", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getTradeLiquidationParams", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTradePendingOrderBlock", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTraderStored", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTraders", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTrades", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getTradesLiquidationParams", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTradingActivated", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "initializeTradingStorage", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "isCollateralActive", data: BytesLike): Result;
@@ -1616,7 +1368,6 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "updateGToken", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateOpenOrderDetails", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateTradeCollateralAmount", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "updateTradePosition", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateTradeSl", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateTradeTp", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateTradingActivated", data: BytesLike): Result;
@@ -1628,39 +1379,34 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "initializeTriggerRewards", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateTriggerTimeoutBlocks", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "cancelOpenOrder", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "cancelOrderAfterTimeout", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "closeTradeMarket", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "decreasePositionSize", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "closeTradeMarketTimeout", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "delegatedTradingAction", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getByPassTriggerLink", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getMarketOrdersTimeoutBlocks", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTradingDelegate", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getWrappedNativeToken", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "increasePositionSize", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "initializeTrading", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "isWrappedNativeToken", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "openTrade", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "openTradeMarketTimeout", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "openTradeNative", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "removeTradingDelegate", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setTradingDelegate", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "triggerOrder", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateByPassTriggerLink", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "updateLeverage", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateMarketOrdersTimeoutBlocks", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateOpenOrder", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateSl", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateTp", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "claimPendingGovFees", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "closeTradeMarketCallback", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "decreasePositionSizeMarketCallback", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "executeTriggerCloseOrderCallback", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "executeTriggerOpenOrderCallback", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getPendingGovFeesCollateral", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getVaultClosingFeeP", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "increasePositionSizeMarketCallback", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "initializeCallbacks", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "openTradeMarketCallback", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "updateLeverageCallback", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateVaultClosingFeeP", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getAllBorrowingPairs", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getBorrowingGroup", data: BytesLike): Result;
@@ -1680,7 +1426,6 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "getTradeBorrowingFee", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getTradeLiquidationPrice", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "handleTradeBorrowingCallback", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "resetTradeBorrowingFees", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setBorrowingGroupParams", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setBorrowingGroupParamsArray", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setBorrowingPairParams", data: BytesLike): Result;
@@ -1691,7 +1436,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "fulfill", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getChainlinkToken", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getCollateralFromUsdNormalizedValue", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getCollateralGnsLiquidityPool", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getCollateralGnsUniV3Pool", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getCollateralPriceUsd", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getCollateralUsdPriceFeed", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getGnsPriceCollateralAddress", data: BytesLike): Result;
@@ -1716,18 +1461,22 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "replaceOracle", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setLimitJobId", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "setMarketJobId", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "updateCollateralGnsLiquidityPool", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "updateCollateralGnsUniV3Pool", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateCollateralUsdPriceFeed", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateLinkUsdPriceFeed", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateMinAnswers", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "updateTwapInterval", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "addOtcCollateralBalance", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getOtcBalance", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getOtcConfig", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getOtcRate", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "initializeOtc", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "sellGnsForCollateral", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "updateOtcConfig", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "copyAllState", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "copyBorrowingFeesGroups", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "copyBorrowingFeesPairs", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "copyLimits", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "copyPairOis", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "copyTraderDelegations", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "copyTrades", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getCollateralStageState", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getCollateralState", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "markAsDone", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "transferBalance", data: BytesLike): Result;
     events: {
         "AccessControlUpdated(address,uint8,bool)": EventFragment;
         "AddressesUpdated(tuple)": EventFragment;
@@ -1736,7 +1485,6 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "FeeAdded(uint256,string)": EventFragment;
         "FeeUpdated(uint256)": EventFragment;
         "GroupAdded(uint256,string)": EventFragment;
-        "GroupLiquidationParamsUpdated(uint256,tuple)": EventFragment;
         "GroupUpdated(uint256)": EventFragment;
         "PairAdded(uint256,string,string)": EventFragment;
         "PairCustomMaxLeverageUpdated(uint256,uint256)": EventFragment;
@@ -1765,12 +1513,10 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "OnePercentDepthUpdated(uint256,uint128,uint128)": EventFragment;
         "PriceImpactOiTransferredPair(uint256,tuple)": EventFragment;
         "PriceImpactOiTransferredPairs(uint256,uint256,uint256,uint256)": EventFragment;
-        "PriceImpactOpenInterestAdded(tuple,bool)": EventFragment;
+        "PriceImpactOpenInterestAdded(tuple)": EventFragment;
         "PriceImpactOpenInterestRemoved(tuple,bool)": EventFragment;
         "PriceImpactWindowsCountUpdated(uint48)": EventFragment;
         "PriceImpactWindowsDurationUpdated(uint48)": EventFragment;
-        "ProtectionCloseFactorBlocksUpdated(uint24)": EventFragment;
-        "ProtectionCloseFactorUpdated(uint256,uint256)": EventFragment;
         "CollateralAdded(address,uint8,address)": EventFragment;
         "CollateralDisabled(uint8)": EventFragment;
         "CollateralUpdated(uint8,bool)": EventFragment;
@@ -1780,9 +1526,8 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "PendingOrderStored(tuple)": EventFragment;
         "TradeClosed(tuple)": EventFragment;
         "TradeCollateralUpdated(tuple,uint120)": EventFragment;
-        "TradePositionUpdated(tuple,uint120,uint24,uint64,uint64,uint64)": EventFragment;
         "TradeSlUpdated(tuple,uint64)": EventFragment;
-        "TradeStored(tuple,tuple,tuple)": EventFragment;
+        "TradeStored(tuple,tuple)": EventFragment;
         "TradeTpUpdated(tuple,uint64)": EventFragment;
         "TradingActivatedUpdated(uint8)": EventFragment;
         "TriggerRewarded(uint256,uint256)": EventFragment;
@@ -1791,17 +1536,12 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "ByPassTriggerLinkUpdated(address,bool)": EventFragment;
         "ChainlinkCallbackTimeout(tuple,uint256)": EventFragment;
         "CouldNotCloseTrade(address,uint16,uint32)": EventFragment;
-        "LeverageUpdateExecuted(tuple,bool,uint8,uint8,address,uint256,uint256,uint256,uint256,tuple)": EventFragment;
-        "LeverageUpdateInitiated(tuple,address,uint256,uint256,bool,uint256)": EventFragment;
         "MarketOrderInitiated(tuple,address,uint16,bool)": EventFragment;
         "MarketOrdersTimeoutBlocksUpdated(uint256)": EventFragment;
         "NativeTokenWrapped(address,uint256)": EventFragment;
         "OpenLimitCanceled(address,uint16,uint32)": EventFragment;
         "OpenLimitUpdated(address,uint16,uint32,uint64,uint64,uint64,uint64)": EventFragment;
         "OpenOrderPlaced(address,uint16,uint32)": EventFragment;
-        "PositionSizeDecreaseExecuted(tuple,uint8,uint8,address,uint256,uint256,bool,uint256,uint256,uint256,uint256,tuple)": EventFragment;
-        "PositionSizeIncreaseExecuted(tuple,uint8,uint8,address,uint256,uint256,bool,uint256,uint256,uint256,uint256,tuple)": EventFragment;
-        "PositionSizeUpdateInitiated(tuple,address,uint256,uint256,bool,uint256,uint256)": EventFragment;
         "TriggerOrderInitiated(tuple,address,uint16,bool)": EventFragment;
         "BorrowingFeeCharged(address,uint8,uint256)": EventFragment;
         "GTokenFeeCharged(address,uint8,uint256)": EventFragment;
@@ -1819,7 +1559,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "BorrowingGroupAccFeesUpdated(uint8,uint16,uint256,uint64,uint64)": EventFragment;
         "BorrowingGroupOiUpdated(uint8,uint16,bool,bool,uint72,uint72,uint72)": EventFragment;
         "BorrowingGroupUpdated(uint8,uint16,uint32,uint72,uint48)": EventFragment;
-        "BorrowingInitialAccFeesStored(uint8,address,uint16,uint32,bool,uint64,uint64)": EventFragment;
+        "BorrowingInitialAccFeesStored(uint8,address,uint16,uint32,uint64,uint64)": EventFragment;
         "BorrowingPairAccFeesUpdated(uint8,uint16,uint256,uint64,uint64)": EventFragment;
         "BorrowingPairGroupUpdated(uint8,uint16,uint16,uint16)": EventFragment;
         "BorrowingPairOiUpdated(uint8,uint16,bool,bool,uint72,uint72,uint72)": EventFragment;
@@ -1827,7 +1567,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "TradeBorrowingCallbackHandled(uint8,address,uint16,uint32,bool,bool,uint256)": EventFragment;
         "ChainlinkFulfilled(bytes32)": EventFragment;
         "ChainlinkRequested(bytes32)": EventFragment;
-        "CollateralGnsLiquidityPoolUpdated(uint8,tuple)": EventFragment;
+        "CollateralGnsUniV3PoolUpdated(uint8,tuple)": EventFragment;
         "CollateralUsdPriceFeedUpdated(uint8,address)": EventFragment;
         "JobIdUpdated(uint256,bytes32)": EventFragment;
         "LinkClaimedBack(uint256)": EventFragment;
@@ -1838,12 +1578,20 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
         "OracleRemoved(uint256,address)": EventFragment;
         "OracleReplaced(uint256,address,address)": EventFragment;
         "PriceReceived(tuple,uint16,bytes32,uint256,bool,bool)": EventFragment;
-        "PriceRequested(uint8,address,uint256,tuple,uint8,uint256,bool,bytes32,uint256,uint256)": EventFragment;
+        "PriceRequested(uint8,tuple,uint8,uint256,bytes32,uint256,uint256,uint256,bool)": EventFragment;
         "TradingCallbackExecuted(tuple,uint8)": EventFragment;
         "TwapIntervalUpdated(uint32)": EventFragment;
-        "OtcBalanceUpdated(uint8,uint256)": EventFragment;
-        "OtcConfigUpdated(tuple)": EventFragment;
-        "OtcExecuted(uint8,uint256,uint256,uint256,uint256,uint256)": EventFragment;
+        "BorrowingFeesGroupsCopied(uint8,uint16)": EventFragment;
+        "BorrowingFeesPairOisCopied(uint8,uint256)": EventFragment;
+        "BorrowingFeesPairsCopied(uint8,uint256)": EventFragment;
+        "CollateralTransferred(uint8,uint256,uint256)": EventFragment;
+        "LegacyLimitOrderSkipped(uint8,address,uint256,uint256)": EventFragment;
+        "LimitsCopied(uint8,uint256,uint256)": EventFragment;
+        "MarkedAsDone(uint8)": EventFragment;
+        "PairTradesCopied(uint8,uint256,uint256)": EventFragment;
+        "TradeCopied(uint8,address,uint256,uint256,uint256)": EventFragment;
+        "TraderDelegationsCopied(uint8,uint256)": EventFragment;
+        "TradesCopied(uint8,uint16,uint16)": EventFragment;
     };
     getEvent(nameOrSignatureOrTopic: "AccessControlUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "AddressesUpdated"): EventFragment;
@@ -1852,7 +1600,6 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "FeeAdded"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "FeeUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "GroupAdded"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "GroupLiquidationParamsUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "GroupUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "PairAdded"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "PairCustomMaxLeverageUpdated"): EventFragment;
@@ -1885,8 +1632,6 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "PriceImpactOpenInterestRemoved"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "PriceImpactWindowsCountUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "PriceImpactWindowsDurationUpdated"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "ProtectionCloseFactorBlocksUpdated"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "ProtectionCloseFactorUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "CollateralAdded"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "CollateralDisabled"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "CollateralUpdated"): EventFragment;
@@ -1896,7 +1641,6 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "PendingOrderStored"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "TradeClosed"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "TradeCollateralUpdated"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "TradePositionUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "TradeSlUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "TradeStored"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "TradeTpUpdated"): EventFragment;
@@ -1907,17 +1651,12 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "ByPassTriggerLinkUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "ChainlinkCallbackTimeout"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "CouldNotCloseTrade"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "LeverageUpdateExecuted"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "LeverageUpdateInitiated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "MarketOrderInitiated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "MarketOrdersTimeoutBlocksUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "NativeTokenWrapped"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "OpenLimitCanceled"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "OpenLimitUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "OpenOrderPlaced"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "PositionSizeDecreaseExecuted"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "PositionSizeIncreaseExecuted"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "PositionSizeUpdateInitiated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "TriggerOrderInitiated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "BorrowingFeeCharged"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "GTokenFeeCharged"): EventFragment;
@@ -1943,7 +1682,7 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "TradeBorrowingCallbackHandled"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "ChainlinkFulfilled"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "ChainlinkRequested"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "CollateralGnsLiquidityPoolUpdated"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "CollateralGnsUniV3PoolUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "CollateralUsdPriceFeedUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "JobIdUpdated"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "LinkClaimedBack"): EventFragment;
@@ -1957,9 +1696,17 @@ export interface GNSMultiCollatDiamondInterface extends utils.Interface {
     getEvent(nameOrSignatureOrTopic: "PriceRequested"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "TradingCallbackExecuted"): EventFragment;
     getEvent(nameOrSignatureOrTopic: "TwapIntervalUpdated"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "OtcBalanceUpdated"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "OtcConfigUpdated"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "OtcExecuted"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "BorrowingFeesGroupsCopied"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "BorrowingFeesPairOisCopied"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "BorrowingFeesPairsCopied"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "CollateralTransferred"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "LegacyLimitOrderSkipped"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "LimitsCopied"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "MarkedAsDone"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "PairTradesCopied"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "TradeCopied"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "TraderDelegationsCopied"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "TradesCopied"): EventFragment;
 }
 export interface AccessControlUpdatedEventObject {
     target: string;
@@ -2018,15 +1765,6 @@ export type GroupAddedEvent = TypedEvent<[
     string
 ], GroupAddedEventObject>;
 export type GroupAddedEventFilter = TypedEventFilter<GroupAddedEvent>;
-export interface GroupLiquidationParamsUpdatedEventObject {
-    index: BigNumber;
-    params: IPairsStorage.GroupLiquidationParamsStructOutput;
-}
-export type GroupLiquidationParamsUpdatedEvent = TypedEvent<[
-    BigNumber,
-    IPairsStorage.GroupLiquidationParamsStructOutput
-], GroupLiquidationParamsUpdatedEventObject>;
-export type GroupLiquidationParamsUpdatedEventFilter = TypedEventFilter<GroupLiquidationParamsUpdatedEvent>;
 export interface GroupUpdatedEventObject {
     index: BigNumber;
 }
@@ -2289,11 +2027,9 @@ export type PriceImpactOiTransferredPairsEvent = TypedEvent<[
 export type PriceImpactOiTransferredPairsEventFilter = TypedEventFilter<PriceImpactOiTransferredPairsEvent>;
 export interface PriceImpactOpenInterestAddedEventObject {
     oiWindowUpdate: IPriceImpact.OiWindowUpdateStructOutput;
-    isPartial: boolean;
 }
 export type PriceImpactOpenInterestAddedEvent = TypedEvent<[
-    IPriceImpact.OiWindowUpdateStructOutput,
-    boolean
+    IPriceImpact.OiWindowUpdateStructOutput
 ], PriceImpactOpenInterestAddedEventObject>;
 export type PriceImpactOpenInterestAddedEventFilter = TypedEventFilter<PriceImpactOpenInterestAddedEvent>;
 export interface PriceImpactOpenInterestRemovedEventObject {
@@ -2319,22 +2055,6 @@ export type PriceImpactWindowsDurationUpdatedEvent = TypedEvent<[
     number
 ], PriceImpactWindowsDurationUpdatedEventObject>;
 export type PriceImpactWindowsDurationUpdatedEventFilter = TypedEventFilter<PriceImpactWindowsDurationUpdatedEvent>;
-export interface ProtectionCloseFactorBlocksUpdatedEventObject {
-    protectionCloseFactorBlocks: number;
-}
-export type ProtectionCloseFactorBlocksUpdatedEvent = TypedEvent<[
-    number
-], ProtectionCloseFactorBlocksUpdatedEventObject>;
-export type ProtectionCloseFactorBlocksUpdatedEventFilter = TypedEventFilter<ProtectionCloseFactorBlocksUpdatedEvent>;
-export interface ProtectionCloseFactorUpdatedEventObject {
-    pairIndex: BigNumber;
-    protectionCloseFactor: BigNumber;
-}
-export type ProtectionCloseFactorUpdatedEvent = TypedEvent<[
-    BigNumber,
-    BigNumber
-], ProtectionCloseFactorUpdatedEventObject>;
-export type ProtectionCloseFactorUpdatedEventFilter = TypedEventFilter<ProtectionCloseFactorUpdatedEvent>;
 export interface CollateralAddedEventObject {
     collateral: string;
     index: number;
@@ -2418,23 +2138,6 @@ export type TradeCollateralUpdatedEvent = TypedEvent<[
     BigNumber
 ], TradeCollateralUpdatedEventObject>;
 export type TradeCollateralUpdatedEventFilter = TypedEventFilter<TradeCollateralUpdatedEvent>;
-export interface TradePositionUpdatedEventObject {
-    tradeId: ITradingStorage.IdStructOutput;
-    collateralAmount: BigNumber;
-    leverage: number;
-    openPrice: BigNumber;
-    newTp: BigNumber;
-    newSl: BigNumber;
-}
-export type TradePositionUpdatedEvent = TypedEvent<[
-    ITradingStorage.IdStructOutput,
-    BigNumber,
-    number,
-    BigNumber,
-    BigNumber,
-    BigNumber
-], TradePositionUpdatedEventObject>;
-export type TradePositionUpdatedEventFilter = TypedEventFilter<TradePositionUpdatedEvent>;
 export interface TradeSlUpdatedEventObject {
     tradeId: ITradingStorage.IdStructOutput;
     newSl: BigNumber;
@@ -2447,12 +2150,10 @@ export type TradeSlUpdatedEventFilter = TypedEventFilter<TradeSlUpdatedEvent>;
 export interface TradeStoredEventObject {
     trade: ITradingStorage.TradeStructOutput;
     tradeInfo: ITradingStorage.TradeInfoStructOutput;
-    liquidationParams: IPairsStorage.GroupLiquidationParamsStructOutput;
 }
 export type TradeStoredEvent = TypedEvent<[
     ITradingStorage.TradeStructOutput,
-    ITradingStorage.TradeInfoStructOutput,
-    IPairsStorage.GroupLiquidationParamsStructOutput
+    ITradingStorage.TradeInfoStructOutput
 ], TradeStoredEventObject>;
 export type TradeStoredEventFilter = TypedEventFilter<TradeStoredEvent>;
 export interface TradeTpUpdatedEventObject {
@@ -2525,48 +2226,6 @@ export type CouldNotCloseTradeEvent = TypedEvent<[
     number
 ], CouldNotCloseTradeEventObject>;
 export type CouldNotCloseTradeEventFilter = TypedEventFilter<CouldNotCloseTradeEvent>;
-export interface LeverageUpdateExecutedEventObject {
-    orderId: ITradingStorage.IdStructOutput;
-    isIncrease: boolean;
-    cancelReason: number;
-    collateralIndex: number;
-    trader: string;
-    pairIndex: BigNumber;
-    index: BigNumber;
-    marketPrice: BigNumber;
-    collateralDelta: BigNumber;
-    values: IUpdateLeverage.UpdateLeverageValuesStructOutput;
-}
-export type LeverageUpdateExecutedEvent = TypedEvent<[
-    ITradingStorage.IdStructOutput,
-    boolean,
-    number,
-    number,
-    string,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    IUpdateLeverage.UpdateLeverageValuesStructOutput
-], LeverageUpdateExecutedEventObject>;
-export type LeverageUpdateExecutedEventFilter = TypedEventFilter<LeverageUpdateExecutedEvent>;
-export interface LeverageUpdateInitiatedEventObject {
-    orderId: ITradingStorage.IdStructOutput;
-    trader: string;
-    pairIndex: BigNumber;
-    index: BigNumber;
-    isIncrease: boolean;
-    newLeverage: BigNumber;
-}
-export type LeverageUpdateInitiatedEvent = TypedEvent<[
-    ITradingStorage.IdStructOutput,
-    string,
-    BigNumber,
-    BigNumber,
-    boolean,
-    BigNumber
-], LeverageUpdateInitiatedEventObject>;
-export type LeverageUpdateInitiatedEventFilter = TypedEventFilter<LeverageUpdateInitiatedEvent>;
 export interface MarketOrderInitiatedEventObject {
     orderId: ITradingStorage.IdStructOutput;
     trader: string;
@@ -2637,83 +2296,6 @@ export type OpenOrderPlacedEvent = TypedEvent<[
     number
 ], OpenOrderPlacedEventObject>;
 export type OpenOrderPlacedEventFilter = TypedEventFilter<OpenOrderPlacedEvent>;
-export interface PositionSizeDecreaseExecutedEventObject {
-    orderId: ITradingStorage.IdStructOutput;
-    cancelReason: number;
-    collateralIndex: number;
-    trader: string;
-    pairIndex: BigNumber;
-    index: BigNumber;
-    long: boolean;
-    marketPrice: BigNumber;
-    collateralPriceUsd: BigNumber;
-    collateralDelta: BigNumber;
-    leverageDelta: BigNumber;
-    values: IUpdatePositionSize.DecreasePositionSizeValuesStructOutput;
-}
-export type PositionSizeDecreaseExecutedEvent = TypedEvent<[
-    ITradingStorage.IdStructOutput,
-    number,
-    number,
-    string,
-    BigNumber,
-    BigNumber,
-    boolean,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    IUpdatePositionSize.DecreasePositionSizeValuesStructOutput
-], PositionSizeDecreaseExecutedEventObject>;
-export type PositionSizeDecreaseExecutedEventFilter = TypedEventFilter<PositionSizeDecreaseExecutedEvent>;
-export interface PositionSizeIncreaseExecutedEventObject {
-    orderId: ITradingStorage.IdStructOutput;
-    cancelReason: number;
-    collateralIndex: number;
-    trader: string;
-    pairIndex: BigNumber;
-    index: BigNumber;
-    long: boolean;
-    marketPrice: BigNumber;
-    collateralPriceUsd: BigNumber;
-    collateralDelta: BigNumber;
-    leverageDelta: BigNumber;
-    values: IUpdatePositionSize.IncreasePositionSizeValuesStructOutput;
-}
-export type PositionSizeIncreaseExecutedEvent = TypedEvent<[
-    ITradingStorage.IdStructOutput,
-    number,
-    number,
-    string,
-    BigNumber,
-    BigNumber,
-    boolean,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    IUpdatePositionSize.IncreasePositionSizeValuesStructOutput
-], PositionSizeIncreaseExecutedEventObject>;
-export type PositionSizeIncreaseExecutedEventFilter = TypedEventFilter<PositionSizeIncreaseExecutedEvent>;
-export interface PositionSizeUpdateInitiatedEventObject {
-    orderId: ITradingStorage.IdStructOutput;
-    trader: string;
-    pairIndex: BigNumber;
-    index: BigNumber;
-    isIncrease: boolean;
-    collateralDelta: BigNumber;
-    leverageDelta: BigNumber;
-}
-export type PositionSizeUpdateInitiatedEvent = TypedEvent<[
-    ITradingStorage.IdStructOutput,
-    string,
-    BigNumber,
-    BigNumber,
-    boolean,
-    BigNumber,
-    BigNumber
-], PositionSizeUpdateInitiatedEventObject>;
-export type PositionSizeUpdateInitiatedEventFilter = TypedEventFilter<PositionSizeUpdateInitiatedEvent>;
 export interface TriggerOrderInitiatedEventObject {
     orderId: ITradingStorage.IdStructOutput;
     trader: string;
@@ -2950,7 +2532,6 @@ export interface BorrowingInitialAccFeesStoredEventObject {
     trader: string;
     pairIndex: number;
     index: number;
-    long: boolean;
     initialPairAccFee: BigNumber;
     initialGroupAccFee: BigNumber;
 }
@@ -2959,7 +2540,6 @@ export type BorrowingInitialAccFeesStoredEvent = TypedEvent<[
     string,
     number,
     number,
-    boolean,
     BigNumber,
     BigNumber
 ], BorrowingInitialAccFeesStoredEventObject>;
@@ -3061,15 +2641,15 @@ export type ChainlinkRequestedEvent = TypedEvent<[
     string
 ], ChainlinkRequestedEventObject>;
 export type ChainlinkRequestedEventFilter = TypedEventFilter<ChainlinkRequestedEvent>;
-export interface CollateralGnsLiquidityPoolUpdatedEventObject {
+export interface CollateralGnsUniV3PoolUpdatedEventObject {
     collateralIndex: number;
-    newValue: IPriceAggregator.LiquidityPoolInfoStructOutput;
+    newValue: IPriceAggregator.UniV3PoolInfoStructOutput;
 }
-export type CollateralGnsLiquidityPoolUpdatedEvent = TypedEvent<[
+export type CollateralGnsUniV3PoolUpdatedEvent = TypedEvent<[
     number,
-    IPriceAggregator.LiquidityPoolInfoStructOutput
-], CollateralGnsLiquidityPoolUpdatedEventObject>;
-export type CollateralGnsLiquidityPoolUpdatedEventFilter = TypedEventFilter<CollateralGnsLiquidityPoolUpdatedEvent>;
+    IPriceAggregator.UniV3PoolInfoStructOutput
+], CollateralGnsUniV3PoolUpdatedEventObject>;
+export type CollateralGnsUniV3PoolUpdatedEventFilter = TypedEventFilter<CollateralGnsUniV3PoolUpdatedEvent>;
 export interface CollateralUsdPriceFeedUpdatedEventObject {
     collateralIndex: number;
     value: string;
@@ -3164,27 +2744,25 @@ export type PriceReceivedEvent = TypedEvent<[
 export type PriceReceivedEventFilter = TypedEventFilter<PriceReceivedEvent>;
 export interface PriceRequestedEventObject {
     collateralIndex: number;
-    trader: string;
-    pairIndex: BigNumber;
     pendingOrderId: ITradingStorage.IdStructOutput;
     orderType: number;
-    fromBlock: BigNumber;
-    isLookback: boolean;
+    pairIndex: BigNumber;
     job: string;
-    linkFeePerNode: BigNumber;
     nodesCount: BigNumber;
+    linkFeePerNode: BigNumber;
+    fromBlock: BigNumber;
+    isLookback: boolean;
 }
 export type PriceRequestedEvent = TypedEvent<[
     number,
-    string,
-    BigNumber,
     ITradingStorage.IdStructOutput,
     number,
     BigNumber,
-    boolean,
     string,
     BigNumber,
-    BigNumber
+    BigNumber,
+    BigNumber,
+    boolean
 ], PriceRequestedEventObject>;
 export type PriceRequestedEventFilter = TypedEventFilter<PriceRequestedEvent>;
 export interface TradingCallbackExecutedEventObject {
@@ -3203,39 +2781,119 @@ export type TwapIntervalUpdatedEvent = TypedEvent<[
     number
 ], TwapIntervalUpdatedEventObject>;
 export type TwapIntervalUpdatedEventFilter = TypedEventFilter<TwapIntervalUpdatedEvent>;
-export interface OtcBalanceUpdatedEventObject {
+export interface BorrowingFeesGroupsCopiedEventObject {
     collateralIndex: number;
-    balanceCollateral: BigNumber;
+    groupsCount: number;
 }
-export type OtcBalanceUpdatedEvent = TypedEvent<[
+export type BorrowingFeesGroupsCopiedEvent = TypedEvent<[
+    number,
+    number
+], BorrowingFeesGroupsCopiedEventObject>;
+export type BorrowingFeesGroupsCopiedEventFilter = TypedEventFilter<BorrowingFeesGroupsCopiedEvent>;
+export interface BorrowingFeesPairOisCopiedEventObject {
+    collateralIndex: number;
+    pairsCount: BigNumber;
+}
+export type BorrowingFeesPairOisCopiedEvent = TypedEvent<[
     number,
     BigNumber
-], OtcBalanceUpdatedEventObject>;
-export type OtcBalanceUpdatedEventFilter = TypedEventFilter<OtcBalanceUpdatedEvent>;
-export interface OtcConfigUpdatedEventObject {
-    config: IOtc.OtcConfigStructOutput;
-}
-export type OtcConfigUpdatedEvent = TypedEvent<[
-    IOtc.OtcConfigStructOutput
-], OtcConfigUpdatedEventObject>;
-export type OtcConfigUpdatedEventFilter = TypedEventFilter<OtcConfigUpdatedEvent>;
-export interface OtcExecutedEventObject {
+], BorrowingFeesPairOisCopiedEventObject>;
+export type BorrowingFeesPairOisCopiedEventFilter = TypedEventFilter<BorrowingFeesPairOisCopiedEvent>;
+export interface BorrowingFeesPairsCopiedEventObject {
     collateralIndex: number;
-    collateralAmount: BigNumber;
-    gnsPriceCollateral: BigNumber;
-    treasuryAmountGns: BigNumber;
-    stakingAmountGns: BigNumber;
-    burnAmountGns: BigNumber;
+    pairsCount: BigNumber;
 }
-export type OtcExecutedEvent = TypedEvent<[
+export type BorrowingFeesPairsCopiedEvent = TypedEvent<[
+    number,
+    BigNumber
+], BorrowingFeesPairsCopiedEventObject>;
+export type BorrowingFeesPairsCopiedEventFilter = TypedEventFilter<BorrowingFeesPairsCopiedEvent>;
+export interface CollateralTransferredEventObject {
+    collateralIndex: number;
+    balance: BigNumber;
+    govFees: BigNumber;
+}
+export type CollateralTransferredEvent = TypedEvent<[
     number,
     BigNumber,
+    BigNumber
+], CollateralTransferredEventObject>;
+export type CollateralTransferredEventFilter = TypedEventFilter<CollateralTransferredEvent>;
+export interface LegacyLimitOrderSkippedEventObject {
+    collateralIndex: number;
+    trader: string;
+    pairIndex: BigNumber;
+    index: BigNumber;
+}
+export type LegacyLimitOrderSkippedEvent = TypedEvent<[
+    number,
+    string,
     BigNumber,
+    BigNumber
+], LegacyLimitOrderSkippedEventObject>;
+export type LegacyLimitOrderSkippedEventFilter = TypedEventFilter<LegacyLimitOrderSkippedEvent>;
+export interface LimitsCopiedEventObject {
+    collateralIndex: number;
+    fromIndex: BigNumber;
+    toIndex: BigNumber;
+}
+export type LimitsCopiedEvent = TypedEvent<[
+    number,
     BigNumber,
+    BigNumber
+], LimitsCopiedEventObject>;
+export type LimitsCopiedEventFilter = TypedEventFilter<LimitsCopiedEvent>;
+export interface MarkedAsDoneEventObject {
+    collateralIndex: number;
+}
+export type MarkedAsDoneEvent = TypedEvent<[number], MarkedAsDoneEventObject>;
+export type MarkedAsDoneEventFilter = TypedEventFilter<MarkedAsDoneEvent>;
+export interface PairTradesCopiedEventObject {
+    collateralIndex: number;
+    pairIndex: BigNumber;
+    tradersCount: BigNumber;
+}
+export type PairTradesCopiedEvent = TypedEvent<[
+    number,
     BigNumber,
     BigNumber
-], OtcExecutedEventObject>;
-export type OtcExecutedEventFilter = TypedEventFilter<OtcExecutedEvent>;
+], PairTradesCopiedEventObject>;
+export type PairTradesCopiedEventFilter = TypedEventFilter<PairTradesCopiedEvent>;
+export interface TradeCopiedEventObject {
+    collateralIndex: number;
+    trader: string;
+    pairIndex: BigNumber;
+    prevIndex: BigNumber;
+    newIndex: BigNumber;
+}
+export type TradeCopiedEvent = TypedEvent<[
+    number,
+    string,
+    BigNumber,
+    BigNumber,
+    BigNumber
+], TradeCopiedEventObject>;
+export type TradeCopiedEventFilter = TypedEventFilter<TradeCopiedEvent>;
+export interface TraderDelegationsCopiedEventObject {
+    collateralIndex: number;
+    tradersCount: BigNumber;
+}
+export type TraderDelegationsCopiedEvent = TypedEvent<[
+    number,
+    BigNumber
+], TraderDelegationsCopiedEventObject>;
+export type TraderDelegationsCopiedEventFilter = TypedEventFilter<TraderDelegationsCopiedEvent>;
+export interface TradesCopiedEventObject {
+    collateralIndex: number;
+    fromPairIndex: number;
+    toPairIndex: number;
+}
+export type TradesCopiedEvent = TypedEvent<[
+    number,
+    number,
+    number
+], TradesCopiedEventObject>;
+export type TradesCopiedEventFilter = TypedEventFilter<TradesCopiedEvent>;
 export interface GNSMultiCollatDiamond extends BaseContract {
     connect(signerOrProvider: Signer | Provider | string): this;
     attach(addressOrName: string): this;
@@ -3288,20 +2946,14 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         fees(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPairsStorage.FeeStructOutput]>;
         feesCount(overrides?: CallOverrides): Promise<[BigNumber]>;
         getAllPairsRestrictedMaxLeverage(overrides?: CallOverrides): Promise<[BigNumber[]]>;
-        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?: 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]>;
@@ -3315,9 +2967,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
             IPairsStorage.FeeStructOutput
         ]>;
         pairsCount(overrides?: CallOverrides): Promise<[BigNumber]>;
-        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>;
@@ -3398,7 +3047,7 @@ 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>, overrides?: Overrides & {
+        addPriceImpactOpenInterest(_openInterestUsd: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         getOiWindow(_windowsDuration: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _windowId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPriceImpact.PairOiStructOutput]>;
@@ -3409,24 +3058,17 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getPriceImpactOi(_pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<[BigNumber] & {
             activeOi: BigNumber;
         }>;
-        getProtectionCloseFactorBlocks(overrides?: CallOverrides): Promise<[number]>;
-        getProtectionCloseFactors(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<[BigNumber[]]>;
-        getTradeLastWindowOiUsd(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
-        getTradePriceImpact(_marketPrice: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _open: PromiseOrValue<boolean>, _createdBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+        getTradePriceImpact(_openPrice: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             BigNumber,
             BigNumber
         ] & {
             priceImpactP: BigNumber;
             priceAfterImpact: BigNumber;
         }>;
-        getTradePriceImpactInfo(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPriceImpact.TradePriceImpactInfoStructOutput]>;
         initializePriceImpact(_windowsDuration: PromiseOrValue<BigNumberish>, _windowsCount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        initializeProtectionCloseFactorBlocks(_protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<ContractTransaction>;
-        removePriceImpactOpenInterest(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        removePriceImpactOpenInterest(_openInterestUsd: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _addTs: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         setPairDepths(_indices: PromiseOrValue<BigNumberish>[], _depthsAboveUsd: PromiseOrValue<BigNumberish>[], _depthsBelowUsd: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
@@ -3438,12 +3080,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setPriceImpactWindowsDuration(_newWindowsDuration: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        setProtectionCloseFactorBlocks(_protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<ContractTransaction>;
-        setProtectionCloseFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactors: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<ContractTransaction>;
         addCollateral(_collateral: PromiseOrValue<string>, _gToken: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -3456,24 +3092,23 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getAllPendingOrders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[ITradingStorage.PendingOrderStructOutput[]]>;
         getAllTradeInfos(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[ITradingStorage.TradeInfoStructOutput[]]>;
         getAllTrades(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[ITradingStorage.TradeStructOutput[]]>;
-        getAllTradesLiquidationParams(_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]>;
         getGToken(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[string]>;
+        getPendingOpenOrderType(_tradeType: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[number]>;
         getPendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<[ITradingStorage.PendingOrderStructOutput]>;
         getPendingOrders(_user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[ITradingStorage.PendingOrderStructOutput[]]>;
+        getPnlPercent(_openPrice: PromiseOrValue<BigNumberish>, _currentPrice: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _leverage: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         getTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[ITradingStorage.TradeStructOutput]>;
         getTradeInfo(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[ITradingStorage.TradeInfoStructOutput]>;
         getTradeInfos(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[ITradingStorage.TradeInfoStructOutput[]]>;
-        getTradeLiquidationParams(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPairsStorage.GroupLiquidationParamsStructOutput]>;
         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[]]>;
         getTrades(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[ITradingStorage.TradeStructOutput[]]>;
-        getTradesLiquidationParams(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[IPairsStorage.GroupLiquidationParamsStructOutput[]]>;
         getTradingActivated(overrides?: CallOverrides): Promise<[number]>;
         initializeTradingStorage(_gns: PromiseOrValue<string>, _gnsStaking: PromiseOrValue<string>, _collaterals: PromiseOrValue<string>[], _gTokens: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
@@ -3498,9 +3133,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateTradeCollateralAmount(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<ContractTransaction>;
         updateTradeSl(_tradeId: ITradingStorage.IdStruct, _newSl: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -3528,13 +3160,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         cancelOpenOrder(_index: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        cancelOrderAfterTimeout(_orderIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<ContractTransaction>;
         closeTradeMarket(_index: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        decreasePositionSize(_index: PromiseOrValue<BigNumberish>, _collateralDelta: PromiseOrValue<BigNumberish>, _leverageDelta: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        closeTradeMarketTimeout(_orderId: ITradingStorage.IdStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         delegatedTradingAction(_trader: PromiseOrValue<string>, _callData: PromiseOrValue<BytesLike>, overrides?: Overrides & {
@@ -3544,9 +3173,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getMarketOrdersTimeoutBlocks(overrides?: CallOverrides): Promise<[number]>;
         getTradingDelegate(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[string]>;
         getWrappedNativeToken(overrides?: CallOverrides): Promise<[string]>;
-        increasePositionSize(_index: PromiseOrValue<BigNumberish>, _collateralDelta: PromiseOrValue<BigNumberish>, _leverageDelta: PromiseOrValue<BigNumberish>, _expectedPrice: PromiseOrValue<BigNumberish>, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<ContractTransaction>;
         initializeTrading(_marketOrdersTimeoutBlocks: PromiseOrValue<BigNumberish>, _usersByPassTriggerLink: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -3554,6 +3180,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         openTrade(_trade: ITradingStorage.TradeStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, _referrer: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        openTradeMarketTimeout(_orderId: ITradingStorage.IdStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
         openTradeNative(_trade: ITradingStorage.TradeStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, _referrer: PromiseOrValue<string>, overrides?: PayableOverrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -3569,9 +3198,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateByPassTriggerLink(_users: PromiseOrValue<string>[], _shouldByPass: PromiseOrValue<boolean>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        updateLeverage(_index: PromiseOrValue<BigNumberish>, _newLeverage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<ContractTransaction>;
         updateMarketOrdersTimeoutBlocks(_valueBlocks: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -3590,9 +3216,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         closeTradeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        decreasePositionSizeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<ContractTransaction>;
         executeTriggerCloseOrderCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -3601,18 +3224,12 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         }): Promise<ContractTransaction>;
         getPendingGovFeesCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         getVaultClosingFeeP(overrides?: CallOverrides): Promise<[number]>;
-        increasePositionSizeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<ContractTransaction>;
         initializeCallbacks(_vaultClosingFeeP: PromiseOrValue<BigNumberish>, 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>;
         updateVaultClosingFeeP(_valueP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -3669,9 +3286,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         handleTradeBorrowingCallback(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        resetTradeBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<ContractTransaction>;
         setBorrowingGroupParams(_collateralIndex: PromiseOrValue<BigNumberish>, _groupIndex: PromiseOrValue<BigNumberish>, _value: IBorrowingFees.BorrowingGroupParamsStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
@@ -3696,21 +3310,21 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         }): Promise<ContractTransaction>;
         getChainlinkToken(overrides?: CallOverrides): Promise<[string]>;
         getCollateralFromUsdNormalizedValue(_collateralIndex: PromiseOrValue<BigNumberish>, _normalizedValue: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
-        getCollateralGnsLiquidityPool(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPriceAggregator.LiquidityPoolInfoStructOutput]>;
+        getCollateralGnsUniV3Pool(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[IPriceAggregator.UniV3PoolInfoStructOutput]>;
         getCollateralPriceUsd(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         getCollateralUsdPriceFeed(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[string]>;
         getGnsPriceCollateralAddress(_collateral: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[BigNumber]>;
         getGnsPriceCollateralIndex(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         getGnsPriceUsd(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         getLimitJobId(overrides?: CallOverrides): Promise<[string]>;
-        getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
+        getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
         getLinkUsdPriceFeed(overrides?: CallOverrides): Promise<[string]>;
         getMarketJobId(overrides?: CallOverrides): Promise<[string]>;
         getMinAnswers(overrides?: CallOverrides): Promise<[number]>;
         getOracle(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[string]>;
         getOracles(overrides?: CallOverrides): Promise<[string[]]>;
         getPendingRequest(_id: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<[string]>;
-        getPrice(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _orderId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _fromBlock: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        getPrice(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _orderId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _fromBlock: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         getPriceAggregatorOrder(_requestId: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<[IPriceAggregator.OrderStructOutput]>;
@@ -3718,7 +3332,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getRequestCount(overrides?: CallOverrides): Promise<[BigNumber]>;
         getTwapInterval(overrides?: CallOverrides): Promise<[number]>;
         getUsdNormalizedValue(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralValue: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
-        initializePriceAggregator(_linkToken: PromiseOrValue<string>, _linkUsdPriceFeed: PromiseOrValue<string>, _twapInterval: PromiseOrValue<BigNumberish>, _minAnswers: PromiseOrValue<BigNumberish>, _nodes: PromiseOrValue<string>[], _jobIds: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>], _collateralIndices: PromiseOrValue<BigNumberish>[], _gnsCollateralLiquidityPools: IPriceAggregator.LiquidityPoolInputStruct[], _collateralUsdPriceFeeds: PromiseOrValue<string>[], overrides?: Overrides & {
+        initializePriceAggregator(_linkToken: PromiseOrValue<string>, _linkUsdPriceFeed: PromiseOrValue<string>, _twapInterval: PromiseOrValue<BigNumberish>, _minAnswers: PromiseOrValue<BigNumberish>, _nodes: PromiseOrValue<string>[], _jobIds: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>], _collateralIndices: PromiseOrValue<BigNumberish>[], _gnsCollateralUniV3Pools: PromiseOrValue<string>[], _collateralUsdPriceFeeds: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         removeOracle(_index: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -3733,7 +3347,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setMarketJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        updateCollateralGnsLiquidityPool(_collateralIndex: PromiseOrValue<BigNumberish>, _liquidityPoolInput: IPriceAggregator.LiquidityPoolInputStruct, overrides?: Overrides & {
+        updateCollateralGnsUniV3Pool(_collateralIndex: PromiseOrValue<BigNumberish>, _uniV3Pool: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         updateCollateralUsdPriceFeed(_collateralIndex: PromiseOrValue<BigNumberish>, _value: PromiseOrValue<string>, overrides?: Overrides & {
@@ -3748,19 +3362,33 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateTwapInterval(_twapInterval: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        addOtcCollateralBalance(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        copyAllState(_collateralIndex: PromiseOrValue<BigNumberish>, _traders: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        getOtcBalance(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
-        getOtcConfig(overrides?: CallOverrides): Promise<[IOtc.OtcConfigStructOutput]>;
-        getOtcRate(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber]>;
-        initializeOtc(_config: IOtc.OtcConfigStruct, overrides?: Overrides & {
+        copyBorrowingFeesGroups(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        sellGnsForCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        copyBorrowingFeesPairs(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        updateOtcConfig(_config: IOtc.OtcConfigStruct, overrides?: Overrides & {
+        copyLimits(_collateralIndex: PromiseOrValue<BigNumberish>, _maxIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        copyPairOis(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        copyTraderDelegations(_collateralIndex: PromiseOrValue<BigNumberish>, _traders: PromiseOrValue<string>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        copyTrades(_collateralIndex: PromiseOrValue<BigNumberish>, _maxPairIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        getCollateralStageState(_collateralIndex: PromiseOrValue<BigNumberish>, _stage: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[boolean]>;
+        getCollateralState(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[number, BigNumber, number]>;
+        markAsDone(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<ContractTransaction>;
+        transferBalance(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
     };
@@ -3791,20 +3419,14 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     fees(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.FeeStructOutput>;
     feesCount(overrides?: CallOverrides): Promise<BigNumber>;
     getAllPairsRestrictedMaxLeverage(overrides?: CallOverrides): Promise<BigNumber[]>;
-    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?: 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>;
@@ -3818,9 +3440,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         IPairsStorage.FeeStructOutput
     ]>;
     pairsCount(overrides?: CallOverrides): Promise<BigNumber>;
-    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>;
@@ -3901,7 +3520,7 @@ 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>, overrides?: Overrides & {
+    addPriceImpactOpenInterest(_openInterestUsd: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     getOiWindow(_windowsDuration: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _windowId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceImpact.PairOiStructOutput>;
@@ -3910,24 +3529,17 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     getPairDepth(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceImpact.PairDepthStructOutput>;
     getPairDepths(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IPriceImpact.PairDepthStructOutput[]>;
     getPriceImpactOi(_pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
-    getProtectionCloseFactorBlocks(overrides?: CallOverrides): Promise<number>;
-    getProtectionCloseFactors(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber[]>;
-    getTradeLastWindowOiUsd(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-    getTradePriceImpact(_marketPrice: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _open: PromiseOrValue<boolean>, _createdBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+    getTradePriceImpact(_openPrice: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
         BigNumber,
         BigNumber
     ] & {
         priceImpactP: BigNumber;
         priceAfterImpact: BigNumber;
     }>;
-    getTradePriceImpactInfo(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceImpact.TradePriceImpactInfoStructOutput>;
     initializePriceImpact(_windowsDuration: PromiseOrValue<BigNumberish>, _windowsCount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    initializeProtectionCloseFactorBlocks(_protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-        from?: PromiseOrValue<string>;
-    }): Promise<ContractTransaction>;
-    removePriceImpactOpenInterest(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+    removePriceImpactOpenInterest(_openInterestUsd: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _addTs: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     setPairDepths(_indices: PromiseOrValue<BigNumberish>[], _depthsAboveUsd: PromiseOrValue<BigNumberish>[], _depthsBelowUsd: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
@@ -3939,12 +3551,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     setPriceImpactWindowsDuration(_newWindowsDuration: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    setProtectionCloseFactorBlocks(_protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-        from?: PromiseOrValue<string>;
-    }): Promise<ContractTransaction>;
-    setProtectionCloseFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactors: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
-        from?: PromiseOrValue<string>;
-    }): Promise<ContractTransaction>;
     addCollateral(_collateral: PromiseOrValue<string>, _gToken: PromiseOrValue<string>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -3957,24 +3563,23 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     getAllPendingOrders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.PendingOrderStructOutput[]>;
     getAllTradeInfos(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeInfoStructOutput[]>;
     getAllTrades(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeStructOutput[]>;
-    getAllTradesLiquidationParams(_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>;
     getGToken(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>;
+    getPendingOpenOrderType(_tradeType: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<number>;
     getPendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<ITradingStorage.PendingOrderStructOutput>;
     getPendingOrders(_user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<ITradingStorage.PendingOrderStructOutput[]>;
+    getPnlPercent(_openPrice: PromiseOrValue<BigNumberish>, _currentPrice: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _leverage: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     getTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeStructOutput>;
     getTradeInfo(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeInfoStructOutput>;
     getTradeInfos(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<ITradingStorage.TradeInfoStructOutput[]>;
-    getTradeLiquidationParams(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput>;
     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[]>;
     getTrades(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<ITradingStorage.TradeStructOutput[]>;
-    getTradesLiquidationParams(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput[]>;
     getTradingActivated(overrides?: CallOverrides): Promise<number>;
     initializeTradingStorage(_gns: PromiseOrValue<string>, _gnsStaking: PromiseOrValue<string>, _collaterals: PromiseOrValue<string>[], _gTokens: PromiseOrValue<string>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
@@ -3999,9 +3604,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     updateTradeCollateralAmount(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-        from?: PromiseOrValue<string>;
-    }): Promise<ContractTransaction>;
     updateTradeSl(_tradeId: ITradingStorage.IdStruct, _newSl: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4029,13 +3631,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     cancelOpenOrder(_index: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    cancelOrderAfterTimeout(_orderIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-        from?: PromiseOrValue<string>;
-    }): Promise<ContractTransaction>;
     closeTradeMarket(_index: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    decreasePositionSize(_index: PromiseOrValue<BigNumberish>, _collateralDelta: PromiseOrValue<BigNumberish>, _leverageDelta: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+    closeTradeMarketTimeout(_orderId: ITradingStorage.IdStruct, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     delegatedTradingAction(_trader: PromiseOrValue<string>, _callData: PromiseOrValue<BytesLike>, overrides?: Overrides & {
@@ -4045,9 +3644,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     getMarketOrdersTimeoutBlocks(overrides?: CallOverrides): Promise<number>;
     getTradingDelegate(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<string>;
     getWrappedNativeToken(overrides?: CallOverrides): Promise<string>;
-    increasePositionSize(_index: PromiseOrValue<BigNumberish>, _collateralDelta: PromiseOrValue<BigNumberish>, _leverageDelta: PromiseOrValue<BigNumberish>, _expectedPrice: PromiseOrValue<BigNumberish>, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-        from?: PromiseOrValue<string>;
-    }): Promise<ContractTransaction>;
     initializeTrading(_marketOrdersTimeoutBlocks: PromiseOrValue<BigNumberish>, _usersByPassTriggerLink: PromiseOrValue<string>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4055,6 +3651,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     openTrade(_trade: ITradingStorage.TradeStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, _referrer: PromiseOrValue<string>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    openTradeMarketTimeout(_orderId: ITradingStorage.IdStruct, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
     openTradeNative(_trade: ITradingStorage.TradeStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, _referrer: PromiseOrValue<string>, overrides?: PayableOverrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4070,9 +3669,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     updateByPassTriggerLink(_users: PromiseOrValue<string>[], _shouldByPass: PromiseOrValue<boolean>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    updateLeverage(_index: PromiseOrValue<BigNumberish>, _newLeverage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-        from?: PromiseOrValue<string>;
-    }): Promise<ContractTransaction>;
     updateMarketOrdersTimeoutBlocks(_valueBlocks: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4091,9 +3687,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     closeTradeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    decreasePositionSizeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
-        from?: PromiseOrValue<string>;
-    }): Promise<ContractTransaction>;
     executeTriggerCloseOrderCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4102,18 +3695,12 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     }): Promise<ContractTransaction>;
     getPendingGovFeesCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     getVaultClosingFeeP(overrides?: CallOverrides): Promise<number>;
-    increasePositionSizeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
-        from?: PromiseOrValue<string>;
-    }): Promise<ContractTransaction>;
     initializeCallbacks(_vaultClosingFeeP: PromiseOrValue<BigNumberish>, 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>;
     updateVaultClosingFeeP(_valueP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4166,9 +3753,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     handleTradeBorrowingCallback(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    resetTradeBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
-        from?: PromiseOrValue<string>;
-    }): Promise<ContractTransaction>;
     setBorrowingGroupParams(_collateralIndex: PromiseOrValue<BigNumberish>, _groupIndex: PromiseOrValue<BigNumberish>, _value: IBorrowingFees.BorrowingGroupParamsStruct, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
@@ -4193,21 +3777,21 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     }): Promise<ContractTransaction>;
     getChainlinkToken(overrides?: CallOverrides): Promise<string>;
     getCollateralFromUsdNormalizedValue(_collateralIndex: PromiseOrValue<BigNumberish>, _normalizedValue: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-    getCollateralGnsLiquidityPool(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceAggregator.LiquidityPoolInfoStructOutput>;
+    getCollateralGnsUniV3Pool(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceAggregator.UniV3PoolInfoStructOutput>;
     getCollateralPriceUsd(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     getCollateralUsdPriceFeed(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>;
     getGnsPriceCollateralAddress(_collateral: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
     getGnsPriceCollateralIndex(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     getGnsPriceUsd(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     getLimitJobId(overrides?: CallOverrides): Promise<string>;
-    getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+    getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
     getLinkUsdPriceFeed(overrides?: CallOverrides): Promise<string>;
     getMarketJobId(overrides?: CallOverrides): Promise<string>;
     getMinAnswers(overrides?: CallOverrides): Promise<number>;
     getOracle(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>;
     getOracles(overrides?: CallOverrides): Promise<string[]>;
     getPendingRequest(_id: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<string>;
-    getPrice(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _orderId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _fromBlock: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+    getPrice(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _orderId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _fromBlock: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     getPriceAggregatorOrder(_requestId: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<IPriceAggregator.OrderStructOutput>;
@@ -4215,7 +3799,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     getRequestCount(overrides?: CallOverrides): Promise<BigNumber>;
     getTwapInterval(overrides?: CallOverrides): Promise<number>;
     getUsdNormalizedValue(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralValue: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-    initializePriceAggregator(_linkToken: PromiseOrValue<string>, _linkUsdPriceFeed: PromiseOrValue<string>, _twapInterval: PromiseOrValue<BigNumberish>, _minAnswers: PromiseOrValue<BigNumberish>, _nodes: PromiseOrValue<string>[], _jobIds: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>], _collateralIndices: PromiseOrValue<BigNumberish>[], _gnsCollateralLiquidityPools: IPriceAggregator.LiquidityPoolInputStruct[], _collateralUsdPriceFeeds: PromiseOrValue<string>[], overrides?: Overrides & {
+    initializePriceAggregator(_linkToken: PromiseOrValue<string>, _linkUsdPriceFeed: PromiseOrValue<string>, _twapInterval: PromiseOrValue<BigNumberish>, _minAnswers: PromiseOrValue<BigNumberish>, _nodes: PromiseOrValue<string>[], _jobIds: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>], _collateralIndices: PromiseOrValue<BigNumberish>[], _gnsCollateralUniV3Pools: PromiseOrValue<string>[], _collateralUsdPriceFeeds: PromiseOrValue<string>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     removeOracle(_index: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -4230,7 +3814,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     setMarketJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    updateCollateralGnsLiquidityPool(_collateralIndex: PromiseOrValue<BigNumberish>, _liquidityPoolInput: IPriceAggregator.LiquidityPoolInputStruct, overrides?: Overrides & {
+    updateCollateralGnsUniV3Pool(_collateralIndex: PromiseOrValue<BigNumberish>, _uniV3Pool: PromiseOrValue<string>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     updateCollateralUsdPriceFeed(_collateralIndex: PromiseOrValue<BigNumberish>, _value: PromiseOrValue<string>, overrides?: Overrides & {
@@ -4245,19 +3829,33 @@ export interface GNSMultiCollatDiamond extends BaseContract {
     updateTwapInterval(_twapInterval: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    addOtcCollateralBalance(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+    copyAllState(_collateralIndex: PromiseOrValue<BigNumberish>, _traders: PromiseOrValue<string>[], overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    copyBorrowingFeesGroups(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    copyBorrowingFeesPairs(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    copyLimits(_collateralIndex: PromiseOrValue<BigNumberish>, _maxIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    copyPairOis(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        from?: PromiseOrValue<string>;
+    }): Promise<ContractTransaction>;
+    copyTraderDelegations(_collateralIndex: PromiseOrValue<BigNumberish>, _traders: PromiseOrValue<string>[], overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    getOtcBalance(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-    getOtcConfig(overrides?: CallOverrides): Promise<IOtc.OtcConfigStructOutput>;
-    getOtcRate(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-    initializeOtc(_config: IOtc.OtcConfigStruct, overrides?: Overrides & {
+    copyTrades(_collateralIndex: PromiseOrValue<BigNumberish>, _maxPairIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    sellGnsForCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+    getCollateralStageState(_collateralIndex: PromiseOrValue<BigNumberish>, _stage: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>;
+    getCollateralState(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[number, BigNumber, number]>;
+    markAsDone(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    updateOtcConfig(_config: IOtc.OtcConfigStruct, overrides?: Overrides & {
+    transferBalance(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     callStatic: {
@@ -4276,18 +3874,14 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         fees(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.FeeStructOutput>;
         feesCount(overrides?: CallOverrides): Promise<BigNumber>;
         getAllPairsRestrictedMaxLeverage(overrides?: CallOverrides): Promise<BigNumber[]>;
-        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>;
         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>;
@@ -4301,7 +3895,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
             IPairsStorage.FeeStructOutput
         ]>;
         pairsCount(overrides?: CallOverrides): Promise<BigNumber>;
-        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>;
         updateGroups(_ids: PromiseOrValue<BigNumberish>[], _groups: IPairsStorage.GroupStruct[], overrides?: CallOverrides): Promise<void>;
@@ -4340,56 +3933,48 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setFeeTiers(_feeTiersIndices: PromiseOrValue<BigNumberish>[], _feeTiers: IFeeTiers.FeeTierStruct[], overrides?: CallOverrides): Promise<void>;
         setGroupVolumeMultipliers(_groupIndices: PromiseOrValue<BigNumberish>[], _groupVolumeMultipliers: PromiseOrValue<BigNumberish>[], 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>, overrides?: CallOverrides): Promise<void>;
+        addPriceImpactOpenInterest(_openInterestUsd: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<void>;
         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>;
         getPairDepth(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceImpact.PairDepthStructOutput>;
         getPairDepths(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<IPriceImpact.PairDepthStructOutput[]>;
         getPriceImpactOi(_pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
-        getProtectionCloseFactorBlocks(overrides?: CallOverrides): Promise<number>;
-        getProtectionCloseFactors(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber[]>;
-        getTradeLastWindowOiUsd(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        getTradePriceImpact(_marketPrice: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _open: PromiseOrValue<boolean>, _createdBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
+        getTradePriceImpact(_openPrice: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             BigNumber,
             BigNumber
         ] & {
             priceImpactP: BigNumber;
             priceAfterImpact: BigNumber;
         }>;
-        getTradePriceImpactInfo(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceImpact.TradePriceImpactInfoStructOutput>;
         initializePriceImpact(_windowsDuration: PromiseOrValue<BigNumberish>, _windowsCount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
-        initializeProtectionCloseFactorBlocks(_protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
-        removePriceImpactOpenInterest(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        removePriceImpactOpenInterest(_openInterestUsd: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _addTs: 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(_protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>, 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>;
         getAllPendingOrders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.PendingOrderStructOutput[]>;
         getAllTradeInfos(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeInfoStructOutput[]>;
         getAllTrades(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeStructOutput[]>;
-        getAllTradesLiquidationParams(_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>;
         getGToken(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>;
+        getPendingOpenOrderType(_tradeType: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<number>;
         getPendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<ITradingStorage.PendingOrderStructOutput>;
         getPendingOrders(_user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<ITradingStorage.PendingOrderStructOutput[]>;
+        getPnlPercent(_openPrice: PromiseOrValue<BigNumberish>, _currentPrice: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _leverage: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeStructOutput>;
         getTradeInfo(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<ITradingStorage.TradeInfoStructOutput>;
         getTradeInfos(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<ITradingStorage.TradeInfoStructOutput[]>;
-        getTradeLiquidationParams(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput>;
         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[]>;
         getTrades(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<ITradingStorage.TradeStructOutput[]>;
-        getTradesLiquidationParams(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<IPairsStorage.GroupLiquidationParamsStructOutput[]>;
         getTradingActivated(overrides?: CallOverrides): Promise<number>;
         initializeTradingStorage(_gns: PromiseOrValue<string>, _gnsStaking: PromiseOrValue<string>, _collaterals: PromiseOrValue<string>[], _gTokens: PromiseOrValue<string>[], overrides?: CallOverrides): Promise<void>;
         isCollateralActive(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>;
@@ -4400,7 +3985,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateGToken(_collateral: PromiseOrValue<string>, _gToken: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         updateOpenOrderDetails(_tradeId: ITradingStorage.IdStruct, _openPrice: PromiseOrValue<BigNumberish>, _tp: PromiseOrValue<BigNumberish>, _sl: PromiseOrValue<BigNumberish>, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateTradeCollateralAmount(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
-        updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateTradeSl(_tradeId: ITradingStorage.IdStruct, _newSl: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateTradeTp(_tradeId: ITradingStorage.IdStruct, _newTp: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateTradingActivated(_activated: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
@@ -4412,39 +3996,34 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         initializeTriggerRewards(_timeoutBlocks: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateTriggerTimeoutBlocks(_timeoutBlocks: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         cancelOpenOrder(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
-        cancelOrderAfterTimeout(_orderIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         closeTradeMarket(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
-        decreasePositionSize(_index: PromiseOrValue<BigNumberish>, _collateralDelta: PromiseOrValue<BigNumberish>, _leverageDelta: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        closeTradeMarketTimeout(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<void>;
         delegatedTradingAction(_trader: PromiseOrValue<string>, _callData: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<string>;
         getByPassTriggerLink(_user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<boolean>;
         getMarketOrdersTimeoutBlocks(overrides?: CallOverrides): Promise<number>;
         getTradingDelegate(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<string>;
         getWrappedNativeToken(overrides?: CallOverrides): Promise<string>;
-        increasePositionSize(_index: PromiseOrValue<BigNumberish>, _collateralDelta: PromiseOrValue<BigNumberish>, _leverageDelta: PromiseOrValue<BigNumberish>, _expectedPrice: PromiseOrValue<BigNumberish>, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         initializeTrading(_marketOrdersTimeoutBlocks: PromiseOrValue<BigNumberish>, _usersByPassTriggerLink: PromiseOrValue<string>[], overrides?: CallOverrides): Promise<void>;
         isWrappedNativeToken(_token: PromiseOrValue<string>, overrides?: CallOverrides): Promise<boolean>;
         openTrade(_trade: ITradingStorage.TradeStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, _referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
+        openTradeMarketTimeout(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<void>;
         openTradeNative(_trade: ITradingStorage.TradeStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, _referrer: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         removeTradingDelegate(overrides?: CallOverrides): Promise<void>;
         setTradingDelegate(_delegate: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         triggerOrder(_packed: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateByPassTriggerLink(_users: PromiseOrValue<string>[], _shouldByPass: PromiseOrValue<boolean>[], overrides?: CallOverrides): Promise<void>;
-        updateLeverage(_index: PromiseOrValue<BigNumberish>, _newLeverage: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateMarketOrdersTimeoutBlocks(_valueBlocks: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateOpenOrder(_index: PromiseOrValue<BigNumberish>, _triggerPrice: PromiseOrValue<BigNumberish>, _tp: PromiseOrValue<BigNumberish>, _sl: PromiseOrValue<BigNumberish>, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateSl(_index: PromiseOrValue<BigNumberish>, _newSl: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateTp(_index: PromiseOrValue<BigNumberish>, _newTp: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         claimPendingGovFees(overrides?: CallOverrides): Promise<void>;
         closeTradeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
-        decreasePositionSizeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
         executeTriggerCloseOrderCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
         executeTriggerOpenOrderCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
         getPendingGovFeesCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getVaultClosingFeeP(overrides?: CallOverrides): Promise<number>;
-        increasePositionSizeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
         initializeCallbacks(_vaultClosingFeeP: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         openTradeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
-        updateLeverageCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: CallOverrides): Promise<void>;
         updateVaultClosingFeeP(_valueP: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         getAllBorrowingPairs(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[
             IBorrowingFees.BorrowingDataStructOutput[],
@@ -4493,7 +4072,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getTradeBorrowingFee(_input: IBorrowingFees.BorrowingFeeInputStruct, overrides?: CallOverrides): Promise<BigNumber>;
         getTradeLiquidationPrice(_input: IBorrowingFees.LiqPriceInputStruct, overrides?: CallOverrides): Promise<BigNumber>;
         handleTradeBorrowingCallback(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<void>;
-        resetTradeBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<void>;
         setBorrowingGroupParams(_collateralIndex: PromiseOrValue<BigNumberish>, _groupIndex: PromiseOrValue<BigNumberish>, _value: IBorrowingFees.BorrowingGroupParamsStruct, overrides?: CallOverrides): Promise<void>;
         setBorrowingGroupParamsArray(_collateralIndex: PromiseOrValue<BigNumberish>, _indices: PromiseOrValue<BigNumberish>[], _values: IBorrowingFees.BorrowingGroupParamsStruct[], overrides?: CallOverrides): Promise<void>;
         setBorrowingPairParams(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _value: IBorrowingFees.BorrowingPairParamsStruct, overrides?: CallOverrides): Promise<void>;
@@ -4504,43 +4082,47 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         fulfill(_requestId: PromiseOrValue<BytesLike>, _priceData: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         getChainlinkToken(overrides?: CallOverrides): Promise<string>;
         getCollateralFromUsdNormalizedValue(_collateralIndex: PromiseOrValue<BigNumberish>, _normalizedValue: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        getCollateralGnsLiquidityPool(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceAggregator.LiquidityPoolInfoStructOutput>;
+        getCollateralGnsUniV3Pool(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<IPriceAggregator.UniV3PoolInfoStructOutput>;
         getCollateralPriceUsd(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getCollateralUsdPriceFeed(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>;
         getGnsPriceCollateralAddress(_collateral: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getGnsPriceCollateralIndex(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getGnsPriceUsd(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getLimitJobId(overrides?: CallOverrides): Promise<string>;
-        getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getLinkUsdPriceFeed(overrides?: CallOverrides): Promise<string>;
         getMarketJobId(overrides?: CallOverrides): Promise<string>;
         getMinAnswers(overrides?: CallOverrides): Promise<number>;
         getOracle(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>;
         getOracles(overrides?: CallOverrides): Promise<string[]>;
         getPendingRequest(_id: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<string>;
-        getPrice(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _orderId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _fromBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        getPrice(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _orderId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _fromBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         getPriceAggregatorOrder(_requestId: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<IPriceAggregator.OrderStructOutput>;
         getPriceAggregatorOrderAnswers(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<IPriceAggregator.OrderAnswerStructOutput[]>;
         getRequestCount(overrides?: CallOverrides): Promise<BigNumber>;
         getTwapInterval(overrides?: CallOverrides): Promise<number>;
         getUsdNormalizedValue(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralValue: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        initializePriceAggregator(_linkToken: PromiseOrValue<string>, _linkUsdPriceFeed: PromiseOrValue<string>, _twapInterval: PromiseOrValue<BigNumberish>, _minAnswers: PromiseOrValue<BigNumberish>, _nodes: PromiseOrValue<string>[], _jobIds: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>], _collateralIndices: PromiseOrValue<BigNumberish>[], _gnsCollateralLiquidityPools: IPriceAggregator.LiquidityPoolInputStruct[], _collateralUsdPriceFeeds: PromiseOrValue<string>[], overrides?: CallOverrides): Promise<void>;
+        initializePriceAggregator(_linkToken: PromiseOrValue<string>, _linkUsdPriceFeed: PromiseOrValue<string>, _twapInterval: PromiseOrValue<BigNumberish>, _minAnswers: PromiseOrValue<BigNumberish>, _nodes: PromiseOrValue<string>[], _jobIds: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>], _collateralIndices: PromiseOrValue<BigNumberish>[], _gnsCollateralUniV3Pools: PromiseOrValue<string>[], _collateralUsdPriceFeeds: PromiseOrValue<string>[], overrides?: CallOverrides): Promise<void>;
         removeOracle(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         replaceOracle(_index: PromiseOrValue<BigNumberish>, _a: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         setLimitJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<void>;
         setMarketJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<void>;
-        updateCollateralGnsLiquidityPool(_collateralIndex: PromiseOrValue<BigNumberish>, _liquidityPoolInput: IPriceAggregator.LiquidityPoolInputStruct, overrides?: CallOverrides): Promise<void>;
+        updateCollateralGnsUniV3Pool(_collateralIndex: PromiseOrValue<BigNumberish>, _uniV3Pool: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         updateCollateralUsdPriceFeed(_collateralIndex: PromiseOrValue<BigNumberish>, _value: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         updateLinkUsdPriceFeed(_value: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>;
         updateMinAnswers(_value: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
         updateTwapInterval(_twapInterval: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
-        addOtcCollateralBalance(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
-        getOtcBalance(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        getOtcConfig(overrides?: CallOverrides): Promise<IOtc.OtcConfigStructOutput>;
-        getOtcRate(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        initializeOtc(_config: IOtc.OtcConfigStruct, overrides?: CallOverrides): Promise<void>;
-        sellGnsForCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
-        updateOtcConfig(_config: IOtc.OtcConfigStruct, overrides?: CallOverrides): Promise<void>;
+        copyAllState(_collateralIndex: PromiseOrValue<BigNumberish>, _traders: PromiseOrValue<string>[], overrides?: CallOverrides): Promise<void>;
+        copyBorrowingFeesGroups(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        copyBorrowingFeesPairs(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        copyLimits(_collateralIndex: PromiseOrValue<BigNumberish>, _maxIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        copyPairOis(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        copyTraderDelegations(_collateralIndex: PromiseOrValue<BigNumberish>, _traders: PromiseOrValue<string>[], overrides?: CallOverrides): Promise<void>;
+        copyTrades(_collateralIndex: PromiseOrValue<BigNumberish>, _maxPairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        getCollateralStageState(_collateralIndex: PromiseOrValue<BigNumberish>, _stage: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>;
+        getCollateralState(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[number, BigNumber, number]>;
+        markAsDone(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
+        transferBalance(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>;
     };
     filters: {
         "AccessControlUpdated(address,uint8,bool)"(target?: null, role?: null, access?: null): AccessControlUpdatedEventFilter;
@@ -4557,8 +4139,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         FeeUpdated(index?: null): FeeUpdatedEventFilter;
         "GroupAdded(uint256,string)"(index?: null, name?: null): GroupAddedEventFilter;
         GroupAdded(index?: null, name?: null): GroupAddedEventFilter;
-        "GroupLiquidationParamsUpdated(uint256,tuple)"(index?: null, params?: null): GroupLiquidationParamsUpdatedEventFilter;
-        GroupLiquidationParamsUpdated(index?: null, params?: null): GroupLiquidationParamsUpdatedEventFilter;
         "GroupUpdated(uint256)"(index?: null): GroupUpdatedEventFilter;
         GroupUpdated(index?: null): GroupUpdatedEventFilter;
         "PairAdded(uint256,string,string)"(index?: null, from?: null, to?: null): PairAddedEventFilter;
@@ -4615,18 +4195,14 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         PriceImpactOiTransferredPair(pairIndex?: PromiseOrValue<BigNumberish> | null, totalPairOi?: null): PriceImpactOiTransferredPairEventFilter;
         "PriceImpactOiTransferredPairs(uint256,uint256,uint256,uint256)"(pairsCount?: null, prevCurrentWindowId?: null, prevEarliestWindowId?: null, newCurrentWindowId?: null): PriceImpactOiTransferredPairsEventFilter;
         PriceImpactOiTransferredPairs(pairsCount?: null, prevCurrentWindowId?: null, prevEarliestWindowId?: null, newCurrentWindowId?: null): PriceImpactOiTransferredPairsEventFilter;
-        "PriceImpactOpenInterestAdded(tuple,bool)"(oiWindowUpdate?: null, isPartial?: null): PriceImpactOpenInterestAddedEventFilter;
-        PriceImpactOpenInterestAdded(oiWindowUpdate?: null, isPartial?: null): PriceImpactOpenInterestAddedEventFilter;
+        "PriceImpactOpenInterestAdded(tuple)"(oiWindowUpdate?: null): PriceImpactOpenInterestAddedEventFilter;
+        PriceImpactOpenInterestAdded(oiWindowUpdate?: null): PriceImpactOpenInterestAddedEventFilter;
         "PriceImpactOpenInterestRemoved(tuple,bool)"(oiWindowUpdate?: null, notOutdated?: null): PriceImpactOpenInterestRemovedEventFilter;
         PriceImpactOpenInterestRemoved(oiWindowUpdate?: null, notOutdated?: null): PriceImpactOpenInterestRemovedEventFilter;
         "PriceImpactWindowsCountUpdated(uint48)"(windowsCount?: PromiseOrValue<BigNumberish> | null): PriceImpactWindowsCountUpdatedEventFilter;
         PriceImpactWindowsCountUpdated(windowsCount?: PromiseOrValue<BigNumberish> | null): PriceImpactWindowsCountUpdatedEventFilter;
         "PriceImpactWindowsDurationUpdated(uint48)"(windowsDuration?: PromiseOrValue<BigNumberish> | null): PriceImpactWindowsDurationUpdatedEventFilter;
         PriceImpactWindowsDurationUpdated(windowsDuration?: PromiseOrValue<BigNumberish> | null): PriceImpactWindowsDurationUpdatedEventFilter;
-        "ProtectionCloseFactorBlocksUpdated(uint24)"(protectionCloseFactorBlocks?: null): ProtectionCloseFactorBlocksUpdatedEventFilter;
-        ProtectionCloseFactorBlocksUpdated(protectionCloseFactorBlocks?: null): ProtectionCloseFactorBlocksUpdatedEventFilter;
-        "ProtectionCloseFactorUpdated(uint256,uint256)"(pairIndex?: PromiseOrValue<BigNumberish> | null, protectionCloseFactor?: null): ProtectionCloseFactorUpdatedEventFilter;
-        ProtectionCloseFactorUpdated(pairIndex?: PromiseOrValue<BigNumberish> | null, protectionCloseFactor?: null): ProtectionCloseFactorUpdatedEventFilter;
         "CollateralAdded(address,uint8,address)"(collateral?: null, index?: null, gToken?: null): CollateralAddedEventFilter;
         CollateralAdded(collateral?: null, index?: null, gToken?: null): CollateralAddedEventFilter;
         "CollateralDisabled(uint8)"(index?: null): CollateralDisabledEventFilter;
@@ -4645,12 +4221,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         TradeClosed(tradeId?: null): TradeClosedEventFilter;
         "TradeCollateralUpdated(tuple,uint120)"(tradeId?: null, collateralAmount?: null): TradeCollateralUpdatedEventFilter;
         TradeCollateralUpdated(tradeId?: null, collateralAmount?: null): TradeCollateralUpdatedEventFilter;
-        "TradePositionUpdated(tuple,uint120,uint24,uint64,uint64,uint64)"(tradeId?: null, collateralAmount?: null, leverage?: null, openPrice?: null, newTp?: null, newSl?: null): TradePositionUpdatedEventFilter;
-        TradePositionUpdated(tradeId?: null, collateralAmount?: null, leverage?: null, openPrice?: null, newTp?: null, newSl?: 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;
+        "TradeStored(tuple,tuple)"(trade?: null, tradeInfo?: null): TradeStoredEventFilter;
+        TradeStored(trade?: null, tradeInfo?: null): TradeStoredEventFilter;
         "TradeTpUpdated(tuple,uint64)"(tradeId?: null, newTp?: null): TradeTpUpdatedEventFilter;
         TradeTpUpdated(tradeId?: null, newTp?: null): TradeTpUpdatedEventFilter;
         "TradingActivatedUpdated(uint8)"(activated?: null): TradingActivatedUpdatedEventFilter;
@@ -4667,10 +4241,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         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;
         "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;
@@ -4683,12 +4253,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         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;
         "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;
@@ -4723,8 +4287,8 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         BorrowingGroupOiUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, groupIndex?: PromiseOrValue<BigNumberish> | null, long?: null, increase?: null, delta?: null, newOiLong?: null, newOiShort?: null): BorrowingGroupOiUpdatedEventFilter;
         "BorrowingGroupUpdated(uint8,uint16,uint32,uint72,uint48)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, groupIndex?: PromiseOrValue<BigNumberish> | null, feePerBlock?: null, maxOi?: null, feeExponent?: null): BorrowingGroupUpdatedEventFilter;
         BorrowingGroupUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, groupIndex?: PromiseOrValue<BigNumberish> | null, feePerBlock?: null, maxOi?: null, feeExponent?: null): BorrowingGroupUpdatedEventFilter;
-        "BorrowingInitialAccFeesStored(uint8,address,uint16,uint32,bool,uint64,uint64)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, long?: null, initialPairAccFee?: null, initialGroupAccFee?: null): BorrowingInitialAccFeesStoredEventFilter;
-        BorrowingInitialAccFeesStored(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, long?: null, initialPairAccFee?: null, initialGroupAccFee?: null): BorrowingInitialAccFeesStoredEventFilter;
+        "BorrowingInitialAccFeesStored(uint8,address,uint16,uint32,uint64,uint64)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, initialPairAccFee?: null, initialGroupAccFee?: null): BorrowingInitialAccFeesStoredEventFilter;
+        BorrowingInitialAccFeesStored(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, index?: null, initialPairAccFee?: null, initialGroupAccFee?: null): BorrowingInitialAccFeesStoredEventFilter;
         "BorrowingPairAccFeesUpdated(uint8,uint16,uint256,uint64,uint64)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, currentBlock?: null, accFeeLong?: null, accFeeShort?: null): BorrowingPairAccFeesUpdatedEventFilter;
         BorrowingPairAccFeesUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, currentBlock?: null, accFeeLong?: null, accFeeShort?: null): BorrowingPairAccFeesUpdatedEventFilter;
         "BorrowingPairGroupUpdated(uint8,uint16,uint16,uint16)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, prevGroupIndex?: null, newGroupIndex?: null): BorrowingPairGroupUpdatedEventFilter;
@@ -4739,8 +4303,8 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         ChainlinkFulfilled(id?: PromiseOrValue<BytesLike> | null): ChainlinkFulfilledEventFilter;
         "ChainlinkRequested(bytes32)"(id?: PromiseOrValue<BytesLike> | null): ChainlinkRequestedEventFilter;
         ChainlinkRequested(id?: PromiseOrValue<BytesLike> | null): ChainlinkRequestedEventFilter;
-        "CollateralGnsLiquidityPoolUpdated(uint8,tuple)"(collateralIndex?: null, newValue?: null): CollateralGnsLiquidityPoolUpdatedEventFilter;
-        CollateralGnsLiquidityPoolUpdated(collateralIndex?: null, newValue?: null): CollateralGnsLiquidityPoolUpdatedEventFilter;
+        "CollateralGnsUniV3PoolUpdated(uint8,tuple)"(collateralIndex?: null, newValue?: null): CollateralGnsUniV3PoolUpdatedEventFilter;
+        CollateralGnsUniV3PoolUpdated(collateralIndex?: null, newValue?: null): CollateralGnsUniV3PoolUpdatedEventFilter;
         "CollateralUsdPriceFeedUpdated(uint8,address)"(collateralIndex?: null, value?: null): CollateralUsdPriceFeedUpdatedEventFilter;
         CollateralUsdPriceFeedUpdated(collateralIndex?: null, value?: null): CollateralUsdPriceFeedUpdatedEventFilter;
         "JobIdUpdated(uint256,bytes32)"(index?: null, jobId?: null): JobIdUpdatedEventFilter;
@@ -4761,18 +4325,34 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         OracleReplaced(index?: null, oldOracle?: null, newOracle?: null): OracleReplacedEventFilter;
         "PriceReceived(tuple,uint16,bytes32,uint256,bool,bool)"(orderId?: null, pairIndex?: PromiseOrValue<BigNumberish> | null, request?: null, priceData?: null, isLookback?: null, usedInMedian?: null): PriceReceivedEventFilter;
         PriceReceived(orderId?: null, pairIndex?: PromiseOrValue<BigNumberish> | null, request?: null, priceData?: null, isLookback?: null, usedInMedian?: null): PriceReceivedEventFilter;
-        "PriceRequested(uint8,address,uint256,tuple,uint8,uint256,bool,bytes32,uint256,uint256)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, pendingOrderId?: null, orderType?: null, fromBlock?: null, isLookback?: null, job?: null, linkFeePerNode?: null, nodesCount?: null): PriceRequestedEventFilter;
-        PriceRequested(collateralIndex?: PromiseOrValue<BigNumberish> | null, trader?: PromiseOrValue<string> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, pendingOrderId?: null, orderType?: null, fromBlock?: null, isLookback?: null, job?: null, linkFeePerNode?: null, nodesCount?: null): PriceRequestedEventFilter;
+        "PriceRequested(uint8,tuple,uint8,uint256,bytes32,uint256,uint256,uint256,bool)"(collateralIndex?: null, pendingOrderId?: null, orderType?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, job?: PromiseOrValue<BytesLike> | null, nodesCount?: null, linkFeePerNode?: null, fromBlock?: null, isLookback?: null): PriceRequestedEventFilter;
+        PriceRequested(collateralIndex?: null, pendingOrderId?: null, orderType?: PromiseOrValue<BigNumberish> | null, pairIndex?: PromiseOrValue<BigNumberish> | null, job?: PromiseOrValue<BytesLike> | null, nodesCount?: null, linkFeePerNode?: null, fromBlock?: null, isLookback?: null): PriceRequestedEventFilter;
         "TradingCallbackExecuted(tuple,uint8)"(a?: null, orderType?: null): TradingCallbackExecutedEventFilter;
         TradingCallbackExecuted(a?: null, orderType?: null): TradingCallbackExecutedEventFilter;
         "TwapIntervalUpdated(uint32)"(newValue?: null): TwapIntervalUpdatedEventFilter;
         TwapIntervalUpdated(newValue?: null): TwapIntervalUpdatedEventFilter;
-        "OtcBalanceUpdated(uint8,uint256)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, balanceCollateral?: null): OtcBalanceUpdatedEventFilter;
-        OtcBalanceUpdated(collateralIndex?: PromiseOrValue<BigNumberish> | null, balanceCollateral?: null): OtcBalanceUpdatedEventFilter;
-        "OtcConfigUpdated(tuple)"(config?: null): OtcConfigUpdatedEventFilter;
-        OtcConfigUpdated(config?: null): OtcConfigUpdatedEventFilter;
-        "OtcExecuted(uint8,uint256,uint256,uint256,uint256,uint256)"(collateralIndex?: PromiseOrValue<BigNumberish> | null, collateralAmount?: null, gnsPriceCollateral?: null, treasuryAmountGns?: null, stakingAmountGns?: null, burnAmountGns?: null): OtcExecutedEventFilter;
-        OtcExecuted(collateralIndex?: PromiseOrValue<BigNumberish> | null, collateralAmount?: null, gnsPriceCollateral?: null, treasuryAmountGns?: null, stakingAmountGns?: null, burnAmountGns?: null): OtcExecutedEventFilter;
+        "BorrowingFeesGroupsCopied(uint8,uint16)"(collateralIndex?: null, groupsCount?: null): BorrowingFeesGroupsCopiedEventFilter;
+        BorrowingFeesGroupsCopied(collateralIndex?: null, groupsCount?: null): BorrowingFeesGroupsCopiedEventFilter;
+        "BorrowingFeesPairOisCopied(uint8,uint256)"(collateralIndex?: null, pairsCount?: null): BorrowingFeesPairOisCopiedEventFilter;
+        BorrowingFeesPairOisCopied(collateralIndex?: null, pairsCount?: null): BorrowingFeesPairOisCopiedEventFilter;
+        "BorrowingFeesPairsCopied(uint8,uint256)"(collateralIndex?: null, pairsCount?: null): BorrowingFeesPairsCopiedEventFilter;
+        BorrowingFeesPairsCopied(collateralIndex?: null, pairsCount?: null): BorrowingFeesPairsCopiedEventFilter;
+        "CollateralTransferred(uint8,uint256,uint256)"(collateralIndex?: null, balance?: null, govFees?: null): CollateralTransferredEventFilter;
+        CollateralTransferred(collateralIndex?: null, balance?: null, govFees?: null): CollateralTransferredEventFilter;
+        "LegacyLimitOrderSkipped(uint8,address,uint256,uint256)"(collateralIndex?: null, trader?: null, pairIndex?: null, index?: null): LegacyLimitOrderSkippedEventFilter;
+        LegacyLimitOrderSkipped(collateralIndex?: null, trader?: null, pairIndex?: null, index?: null): LegacyLimitOrderSkippedEventFilter;
+        "LimitsCopied(uint8,uint256,uint256)"(collateralIndex?: null, fromIndex?: null, toIndex?: null): LimitsCopiedEventFilter;
+        LimitsCopied(collateralIndex?: null, fromIndex?: null, toIndex?: null): LimitsCopiedEventFilter;
+        "MarkedAsDone(uint8)"(collateralIndex?: null): MarkedAsDoneEventFilter;
+        MarkedAsDone(collateralIndex?: null): MarkedAsDoneEventFilter;
+        "PairTradesCopied(uint8,uint256,uint256)"(collateralIndex?: null, pairIndex?: null, tradersCount?: null): PairTradesCopiedEventFilter;
+        PairTradesCopied(collateralIndex?: null, pairIndex?: null, tradersCount?: null): PairTradesCopiedEventFilter;
+        "TradeCopied(uint8,address,uint256,uint256,uint256)"(collateralIndex?: null, trader?: null, pairIndex?: null, prevIndex?: null, newIndex?: null): TradeCopiedEventFilter;
+        TradeCopied(collateralIndex?: null, trader?: null, pairIndex?: null, prevIndex?: null, newIndex?: null): TradeCopiedEventFilter;
+        "TraderDelegationsCopied(uint8,uint256)"(collateralIndex?: null, tradersCount?: null): TraderDelegationsCopiedEventFilter;
+        TraderDelegationsCopied(collateralIndex?: null, tradersCount?: null): TraderDelegationsCopiedEventFilter;
+        "TradesCopied(uint8,uint16,uint16)"(collateralIndex?: null, fromPairIndex?: null, toPairIndex?: null): TradesCopiedEventFilter;
+        TradesCopied(collateralIndex?: null, fromPairIndex?: null, toPairIndex?: null): TradesCopiedEventFilter;
     };
     estimateGas: {
         diamondCut(_faceCut: IDiamondStorage.FacetCutStruct[], _init: PromiseOrValue<string>, _calldata: PromiseOrValue<BytesLike>, overrides?: Overrides & {
@@ -4802,20 +4382,14 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         fees(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         feesCount(overrides?: CallOverrides): Promise<BigNumber>;
         getAllPairsRestrictedMaxLeverage(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>;
         groupsCount(overrides?: CallOverrides): Promise<BigNumber>;
-        initializeGroupLiquidationParams(_groupLiquidationParams: IPairsStorage.GroupLiquidationParamsStruct[], 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>;
@@ -4825,9 +4399,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         pairs(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairsBackend(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         pairsCount(overrides?: CallOverrides): 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>;
@@ -4908,7 +4479,7 @@ 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>, overrides?: Overrides & {
+        addPriceImpactOpenInterest(_openInterestUsd: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         getOiWindow(_windowsDuration: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _windowId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
@@ -4917,18 +4488,11 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getPairDepth(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getPairDepths(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
         getPriceImpactOi(_pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<BigNumber>;
-        getProtectionCloseFactorBlocks(overrides?: CallOverrides): Promise<BigNumber>;
-        getProtectionCloseFactors(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<BigNumber>;
-        getTradeLastWindowOiUsd(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        getTradePriceImpact(_marketPrice: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _open: PromiseOrValue<boolean>, _createdBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        getTradePriceImpactInfo(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getTradePriceImpact(_openPrice: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         initializePriceImpact(_windowsDuration: PromiseOrValue<BigNumberish>, _windowsCount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        initializeProtectionCloseFactorBlocks(_protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<BigNumber>;
-        removePriceImpactOpenInterest(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        removePriceImpactOpenInterest(_openInterestUsd: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _addTs: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         setPairDepths(_indices: PromiseOrValue<BigNumberish>[], _depthsAboveUsd: PromiseOrValue<BigNumberish>[], _depthsBelowUsd: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
@@ -4940,12 +4504,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setPriceImpactWindowsDuration(_newWindowsDuration: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        setProtectionCloseFactorBlocks(_protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<BigNumber>;
-        setProtectionCloseFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactors: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<BigNumber>;
         addCollateral(_collateral: PromiseOrValue<string>, _gToken: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -4958,24 +4516,23 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getAllPendingOrders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getAllTradeInfos(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getAllTrades(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        getAllTradesLiquidationParams(_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>;
         getGToken(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPendingOpenOrderType(_tradeType: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getPendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<BigNumber>;
         getPendingOrders(_user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
+        getPnlPercent(_openPrice: PromiseOrValue<BigNumberish>, _currentPrice: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _leverage: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getTradeInfo(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getTradeInfos(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
-        getTradeLiquidationParams(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         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>;
         getTrades(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
-        getTradesLiquidationParams(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getTradingActivated(overrides?: CallOverrides): Promise<BigNumber>;
         initializeTradingStorage(_gns: PromiseOrValue<string>, _gnsStaking: PromiseOrValue<string>, _collaterals: PromiseOrValue<string>[], _gTokens: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
@@ -5000,9 +4557,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateTradeCollateralAmount(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<BigNumber>;
         updateTradeSl(_tradeId: ITradingStorage.IdStruct, _newSl: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -5030,13 +4584,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         cancelOpenOrder(_index: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        cancelOrderAfterTimeout(_orderIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<BigNumber>;
         closeTradeMarket(_index: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        decreasePositionSize(_index: PromiseOrValue<BigNumberish>, _collateralDelta: PromiseOrValue<BigNumberish>, _leverageDelta: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        closeTradeMarketTimeout(_orderId: ITradingStorage.IdStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         delegatedTradingAction(_trader: PromiseOrValue<string>, _callData: PromiseOrValue<BytesLike>, overrides?: Overrides & {
@@ -5046,9 +4597,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getMarketOrdersTimeoutBlocks(overrides?: CallOverrides): Promise<BigNumber>;
         getTradingDelegate(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getWrappedNativeToken(overrides?: CallOverrides): Promise<BigNumber>;
-        increasePositionSize(_index: PromiseOrValue<BigNumberish>, _collateralDelta: PromiseOrValue<BigNumberish>, _leverageDelta: PromiseOrValue<BigNumberish>, _expectedPrice: PromiseOrValue<BigNumberish>, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<BigNumber>;
         initializeTrading(_marketOrdersTimeoutBlocks: PromiseOrValue<BigNumberish>, _usersByPassTriggerLink: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -5056,6 +4604,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         openTrade(_trade: ITradingStorage.TradeStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, _referrer: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        openTradeMarketTimeout(_orderId: ITradingStorage.IdStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
         openTradeNative(_trade: ITradingStorage.TradeStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, _referrer: PromiseOrValue<string>, overrides?: PayableOverrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -5071,9 +4622,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateByPassTriggerLink(_users: PromiseOrValue<string>[], _shouldByPass: PromiseOrValue<boolean>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        updateLeverage(_index: PromiseOrValue<BigNumberish>, _newLeverage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<BigNumber>;
         updateMarketOrdersTimeoutBlocks(_valueBlocks: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -5092,9 +4640,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         closeTradeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        decreasePositionSizeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<BigNumber>;
         executeTriggerCloseOrderCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -5103,18 +4648,12 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         }): Promise<BigNumber>;
         getPendingGovFeesCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getVaultClosingFeeP(overrides?: CallOverrides): Promise<BigNumber>;
-        increasePositionSizeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<BigNumber>;
         initializeCallbacks(_vaultClosingFeeP: PromiseOrValue<BigNumberish>, 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>;
         updateVaultClosingFeeP(_valueP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -5138,9 +4677,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         handleTradeBorrowingCallback(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        resetTradeBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<BigNumber>;
         setBorrowingGroupParams(_collateralIndex: PromiseOrValue<BigNumberish>, _groupIndex: PromiseOrValue<BigNumberish>, _value: IBorrowingFees.BorrowingGroupParamsStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
@@ -5165,21 +4701,21 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         }): Promise<BigNumber>;
         getChainlinkToken(overrides?: CallOverrides): Promise<BigNumber>;
         getCollateralFromUsdNormalizedValue(_collateralIndex: PromiseOrValue<BigNumberish>, _normalizedValue: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        getCollateralGnsLiquidityPool(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getCollateralGnsUniV3Pool(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getCollateralPriceUsd(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getCollateralUsdPriceFeed(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getGnsPriceCollateralAddress(_collateral: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         getGnsPriceCollateralIndex(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getGnsPriceUsd(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getLimitJobId(overrides?: CallOverrides): Promise<BigNumber>;
-        getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getLinkUsdPriceFeed(overrides?: CallOverrides): Promise<BigNumber>;
         getMarketJobId(overrides?: CallOverrides): Promise<BigNumber>;
         getMinAnswers(overrides?: CallOverrides): Promise<BigNumber>;
         getOracle(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
         getOracles(overrides?: CallOverrides): Promise<BigNumber>;
         getPendingRequest(_id: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>;
-        getPrice(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _orderId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _fromBlock: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        getPrice(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _orderId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _fromBlock: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         getPriceAggregatorOrder(_requestId: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>;
@@ -5187,7 +4723,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getRequestCount(overrides?: CallOverrides): Promise<BigNumber>;
         getTwapInterval(overrides?: CallOverrides): Promise<BigNumber>;
         getUsdNormalizedValue(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralValue: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        initializePriceAggregator(_linkToken: PromiseOrValue<string>, _linkUsdPriceFeed: PromiseOrValue<string>, _twapInterval: PromiseOrValue<BigNumberish>, _minAnswers: PromiseOrValue<BigNumberish>, _nodes: PromiseOrValue<string>[], _jobIds: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>], _collateralIndices: PromiseOrValue<BigNumberish>[], _gnsCollateralLiquidityPools: IPriceAggregator.LiquidityPoolInputStruct[], _collateralUsdPriceFeeds: PromiseOrValue<string>[], overrides?: Overrides & {
+        initializePriceAggregator(_linkToken: PromiseOrValue<string>, _linkUsdPriceFeed: PromiseOrValue<string>, _twapInterval: PromiseOrValue<BigNumberish>, _minAnswers: PromiseOrValue<BigNumberish>, _nodes: PromiseOrValue<string>[], _jobIds: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>], _collateralIndices: PromiseOrValue<BigNumberish>[], _gnsCollateralUniV3Pools: PromiseOrValue<string>[], _collateralUsdPriceFeeds: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         removeOracle(_index: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -5202,7 +4738,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setMarketJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        updateCollateralGnsLiquidityPool(_collateralIndex: PromiseOrValue<BigNumberish>, _liquidityPoolInput: IPriceAggregator.LiquidityPoolInputStruct, overrides?: Overrides & {
+        updateCollateralGnsUniV3Pool(_collateralIndex: PromiseOrValue<BigNumberish>, _uniV3Pool: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         updateCollateralUsdPriceFeed(_collateralIndex: PromiseOrValue<BigNumberish>, _value: PromiseOrValue<string>, overrides?: Overrides & {
@@ -5217,19 +4753,33 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateTwapInterval(_twapInterval: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        addOtcCollateralBalance(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        copyAllState(_collateralIndex: PromiseOrValue<BigNumberish>, _traders: PromiseOrValue<string>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        copyBorrowingFeesGroups(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        copyBorrowingFeesPairs(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        copyLimits(_collateralIndex: PromiseOrValue<BigNumberish>, _maxIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        copyPairOis(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<BigNumber>;
+        copyTraderDelegations(_collateralIndex: PromiseOrValue<BigNumberish>, _traders: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        getOtcBalance(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        getOtcConfig(overrides?: CallOverrides): Promise<BigNumber>;
-        getOtcRate(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        initializeOtc(_config: IOtc.OtcConfigStruct, overrides?: Overrides & {
+        copyTrades(_collateralIndex: PromiseOrValue<BigNumberish>, _maxPairIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        sellGnsForCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        getCollateralStageState(_collateralIndex: PromiseOrValue<BigNumberish>, _stage: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        getCollateralState(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
+        markAsDone(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        updateOtcConfig(_config: IOtc.OtcConfigStruct, overrides?: Overrides & {
+        transferBalance(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
     };
@@ -5261,20 +4811,14 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         fees(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         feesCount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getAllPairsRestrictedMaxLeverage(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>;
         groupsCount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        initializeGroupLiquidationParams(_groupLiquidationParams: IPairsStorage.GroupLiquidationParamsStruct[], 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>;
@@ -5284,9 +4828,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         pairs(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         pairsBackend(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         pairsCount(overrides?: CallOverrides): 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>;
@@ -5367,7 +4908,7 @@ 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>, overrides?: Overrides & {
+        addPriceImpactOpenInterest(_openInterestUsd: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         getOiWindow(_windowsDuration: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _windowId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -5376,18 +4917,11 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getPairDepth(_pairIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPairDepths(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPriceImpactOi(_pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getProtectionCloseFactorBlocks(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getProtectionCloseFactors(_indices: PromiseOrValue<BigNumberish>[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getTradeLastWindowOiUsd(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getTradePriceImpact(_marketPrice: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, _isPnlPositive: PromiseOrValue<boolean>, _open: PromiseOrValue<boolean>, _createdBlock: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getTradePriceImpactInfo(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getTradePriceImpact(_openPrice: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _tradeOpenInterestUsd: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         initializePriceImpact(_windowsDuration: PromiseOrValue<BigNumberish>, _windowsCount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        initializeProtectionCloseFactorBlocks(_protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<PopulatedTransaction>;
-        removePriceImpactOpenInterest(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, _oiDeltaCollateral: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        removePriceImpactOpenInterest(_openInterestUsd: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _addTs: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         setPairDepths(_indices: PromiseOrValue<BigNumberish>[], _depthsAboveUsd: PromiseOrValue<BigNumberish>[], _depthsBelowUsd: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
@@ -5399,12 +4933,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setPriceImpactWindowsDuration(_newWindowsDuration: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        setProtectionCloseFactorBlocks(_protectionCloseFactorBlocks: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<PopulatedTransaction>;
-        setProtectionCloseFactors(_pairIndices: PromiseOrValue<BigNumberish>[], _protectionCloseFactors: PromiseOrValue<BigNumberish>[], overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<PopulatedTransaction>;
         addCollateral(_collateral: PromiseOrValue<string>, _gToken: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -5417,24 +4945,23 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getAllPendingOrders(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getAllTradeInfos(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getAllTrades(_offset: PromiseOrValue<BigNumberish>, _limit: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getAllTradesLiquidationParams(_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>;
         getGToken(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPendingOpenOrderType(_tradeType: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPendingOrder(_orderId: ITradingStorage.IdStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPendingOrders(_user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getPnlPercent(_openPrice: PromiseOrValue<BigNumberish>, _currentPrice: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, _leverage: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTrade(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTradeInfo(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTradeInfos(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getTradeLiquidationParams(_trader: PromiseOrValue<string>, _index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         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>;
         getTrades(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getTradesLiquidationParams(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTradingActivated(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         initializeTradingStorage(_gns: PromiseOrValue<string>, _gnsStaking: PromiseOrValue<string>, _collaterals: PromiseOrValue<string>[], _gTokens: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
@@ -5459,9 +4986,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateTradeCollateralAmount(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        updateTradePosition(_tradeId: ITradingStorage.IdStruct, _collateralAmount: PromiseOrValue<BigNumberish>, _leverage: PromiseOrValue<BigNumberish>, _openPrice: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<PopulatedTransaction>;
         updateTradeSl(_tradeId: ITradingStorage.IdStruct, _newSl: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -5489,13 +5013,10 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         cancelOpenOrder(_index: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        cancelOrderAfterTimeout(_orderIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<PopulatedTransaction>;
         closeTradeMarket(_index: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        decreasePositionSize(_index: PromiseOrValue<BigNumberish>, _collateralDelta: PromiseOrValue<BigNumberish>, _leverageDelta: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        closeTradeMarketTimeout(_orderId: ITradingStorage.IdStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         delegatedTradingAction(_trader: PromiseOrValue<string>, _callData: PromiseOrValue<BytesLike>, overrides?: Overrides & {
@@ -5505,9 +5026,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getMarketOrdersTimeoutBlocks(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTradingDelegate(_trader: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getWrappedNativeToken(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        increasePositionSize(_index: PromiseOrValue<BigNumberish>, _collateralDelta: PromiseOrValue<BigNumberish>, _leverageDelta: PromiseOrValue<BigNumberish>, _expectedPrice: PromiseOrValue<BigNumberish>, _maxSlippageP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<PopulatedTransaction>;
         initializeTrading(_marketOrdersTimeoutBlocks: PromiseOrValue<BigNumberish>, _usersByPassTriggerLink: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -5515,6 +5033,9 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         openTrade(_trade: ITradingStorage.TradeStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, _referrer: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        openTradeMarketTimeout(_orderId: ITradingStorage.IdStruct, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
         openTradeNative(_trade: ITradingStorage.TradeStruct, _maxSlippageP: PromiseOrValue<BigNumberish>, _referrer: PromiseOrValue<string>, overrides?: PayableOverrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -5530,9 +5051,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateByPassTriggerLink(_users: PromiseOrValue<string>[], _shouldByPass: PromiseOrValue<boolean>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        updateLeverage(_index: PromiseOrValue<BigNumberish>, _newLeverage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<PopulatedTransaction>;
         updateMarketOrdersTimeoutBlocks(_valueBlocks: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -5551,9 +5069,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         closeTradeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        decreasePositionSizeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<PopulatedTransaction>;
         executeTriggerCloseOrderCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -5562,18 +5077,12 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         }): Promise<PopulatedTransaction>;
         getPendingGovFeesCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getVaultClosingFeeP(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        increasePositionSizeMarketCallback(_a: ITradingCallbacks.AggregatorAnswerStruct, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<PopulatedTransaction>;
         initializeCallbacks(_vaultClosingFeeP: PromiseOrValue<BigNumberish>, 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>;
         updateVaultClosingFeeP(_valueP: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -5597,9 +5106,6 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         handleTradeBorrowingCallback(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _open: PromiseOrValue<boolean>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        resetTradeBorrowingFees(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _index: PromiseOrValue<BigNumberish>, _long: PromiseOrValue<boolean>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<PopulatedTransaction>;
         setBorrowingGroupParams(_collateralIndex: PromiseOrValue<BigNumberish>, _groupIndex: PromiseOrValue<BigNumberish>, _value: IBorrowingFees.BorrowingGroupParamsStruct, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
@@ -5624,21 +5130,21 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         }): Promise<PopulatedTransaction>;
         getChainlinkToken(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getCollateralFromUsdNormalizedValue(_collateralIndex: PromiseOrValue<BigNumberish>, _normalizedValue: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getCollateralGnsLiquidityPool(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getCollateralGnsUniV3Pool(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getCollateralPriceUsd(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getCollateralUsdPriceFeed(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getGnsPriceCollateralAddress(_collateral: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getGnsPriceCollateralIndex(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getGnsPriceUsd(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getLimitJobId(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getLinkFee(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getLinkUsdPriceFeed(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getMarketJobId(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getMinAnswers(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getOracle(_index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getOracles(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getPendingRequest(_id: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getPrice(_collateralIndex: PromiseOrValue<BigNumberish>, _trader: PromiseOrValue<string>, _pairIndex: PromiseOrValue<BigNumberish>, _orderId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _fromBlock: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        getPrice(_collateralIndex: PromiseOrValue<BigNumberish>, _pairIndex: PromiseOrValue<BigNumberish>, _orderId: ITradingStorage.IdStruct, _orderType: PromiseOrValue<BigNumberish>, _positionSizeCollateral: PromiseOrValue<BigNumberish>, _fromBlock: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         getPriceAggregatorOrder(_requestId: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -5646,7 +5152,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         getRequestCount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getTwapInterval(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getUsdNormalizedValue(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralValue: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        initializePriceAggregator(_linkToken: PromiseOrValue<string>, _linkUsdPriceFeed: PromiseOrValue<string>, _twapInterval: PromiseOrValue<BigNumberish>, _minAnswers: PromiseOrValue<BigNumberish>, _nodes: PromiseOrValue<string>[], _jobIds: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>], _collateralIndices: PromiseOrValue<BigNumberish>[], _gnsCollateralLiquidityPools: IPriceAggregator.LiquidityPoolInputStruct[], _collateralUsdPriceFeeds: PromiseOrValue<string>[], overrides?: Overrides & {
+        initializePriceAggregator(_linkToken: PromiseOrValue<string>, _linkUsdPriceFeed: PromiseOrValue<string>, _twapInterval: PromiseOrValue<BigNumberish>, _minAnswers: PromiseOrValue<BigNumberish>, _nodes: PromiseOrValue<string>[], _jobIds: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>], _collateralIndices: PromiseOrValue<BigNumberish>[], _gnsCollateralUniV3Pools: PromiseOrValue<string>[], _collateralUsdPriceFeeds: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         removeOracle(_index: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
@@ -5661,7 +5167,7 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         setMarketJobId(_jobId: PromiseOrValue<BytesLike>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        updateCollateralGnsLiquidityPool(_collateralIndex: PromiseOrValue<BigNumberish>, _liquidityPoolInput: IPriceAggregator.LiquidityPoolInputStruct, overrides?: Overrides & {
+        updateCollateralGnsUniV3Pool(_collateralIndex: PromiseOrValue<BigNumberish>, _uniV3Pool: PromiseOrValue<string>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         updateCollateralUsdPriceFeed(_collateralIndex: PromiseOrValue<BigNumberish>, _value: PromiseOrValue<string>, overrides?: Overrides & {
@@ -5676,19 +5182,33 @@ export interface GNSMultiCollatDiamond extends BaseContract {
         updateTwapInterval(_twapInterval: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        addOtcCollateralBalance(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        copyAllState(_collateralIndex: PromiseOrValue<BigNumberish>, _traders: PromiseOrValue<string>[], overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        copyBorrowingFeesGroups(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        copyBorrowingFeesPairs(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        copyLimits(_collateralIndex: PromiseOrValue<BigNumberish>, _maxIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        copyPairOis(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+            from?: PromiseOrValue<string>;
+        }): Promise<PopulatedTransaction>;
+        copyTraderDelegations(_collateralIndex: PromiseOrValue<BigNumberish>, _traders: PromiseOrValue<string>[], overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        getOtcBalance(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getOtcConfig(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        getOtcRate(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        initializeOtc(_config: IOtc.OtcConfigStruct, overrides?: Overrides & {
+        copyTrades(_collateralIndex: PromiseOrValue<BigNumberish>, _maxPairIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        sellGnsForCollateral(_collateralIndex: PromiseOrValue<BigNumberish>, _collateralAmount: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        getCollateralStageState(_collateralIndex: PromiseOrValue<BigNumberish>, _stage: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        getCollateralState(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        markAsDone(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        updateOtcConfig(_config: IOtc.OtcConfigStruct, overrides?: Overrides & {
+        transferBalance(_collateralIndex: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
     };