@gainsnetwork/sdk 0.2.33-rc4 → 0.2.35-rc1

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

@@ -112,11 +112,6 @@ const _abi = [
         name: "Paused",
         type: "error",
     },
-    {
-        inputs: [],
-        name: "UnsupportedChain",
-        type: "error",
-    },
     {
         inputs: [],
         name: "WrongAccess",
@@ -203,11 +198,6 @@ const _abi = [
                         name: "gnsStaking",
                         type: "address",
                     },
-                    {
-                        internalType: "address",
-                        name: "treasury",
-                        type: "address",
-                    },
                 ],
                 indexed: false,
                 internalType: "struct IAddressStore.Addresses",
@@ -217,7 +207,7 @@ const _abi = [
         ],
         name: "AddressesUpdated",
         type: "event",
-        signature: "0x7b2fde61973b60e9083bea5f934d31d97c530deecb02e158dfa0280c8bc3f71a",
+        signature: "0xe4f1f9461410dada4f4b49a4b363bdf35e6069fb5a0cea4b1147c32affbd954a",
     },
     {
         anonymous: false,
@@ -413,11 +403,6 @@ const _abi = [
                         name: "gnsStaking",
                         type: "address",
                     },
-                    {
-                        internalType: "address",
-                        name: "treasury",
-                        type: "address",
-                    },
                 ],
                 internalType: "struct IAddressStore.Addresses",
                 name: "",
@@ -457,37 +442,7 @@ const _abi = [
         inputs: [
             {
                 internalType: "address",
-                name: "_account",
-                type: "address",
-            },
-            {
-                internalType: "enum IAddressStore.Role",
-                name: "_roleA",
-                type: "uint8",
-            },
-            {
-                internalType: "enum IAddressStore.Role",
-                name: "_roleB",
-                type: "uint8",
-            },
-        ],
-        name: "hasRoles",
-        outputs: [
-            {
-                internalType: "bool",
-                name: "",
-                type: "bool",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0xb9c97229",
-    },
-    {
-        inputs: [
-            {
-                internalType: "address",
-                name: "_govTimelock",
+                name: "_rolesManager",
                 type: "address",
             },
         ],
@@ -596,42 +551,15 @@ const _abi = [
                 type: "uint256",
             },
             {
-                components: [
-                    {
-                        internalType: "uint40",
-                        name: "totalPositionSizeFeeP",
-                        type: "uint40",
-                    },
-                    {
-                        internalType: "uint40",
-                        name: "totalLiqCollateralFeeP",
-                        type: "uint40",
-                    },
-                    {
-                        internalType: "uint40",
-                        name: "oraclePositionSizeFeeP",
-                        type: "uint40",
-                    },
-                    {
-                        internalType: "uint32",
-                        name: "minPositionSizeUsd",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint104",
-                        name: "__placeholder",
-                        type: "uint104",
-                    },
-                ],
                 indexed: false,
-                internalType: "struct IPairsStorage.FeeGroup",
-                name: "feeGroup",
-                type: "tuple",
+                internalType: "string",
+                name: "name",
+                type: "string",
             },
         ],
         name: "FeeAdded",
         type: "event",
-        signature: "0x13b1e39f208d3f600b2dfd43c294bc9fb9518d7b57f027fdb0572d8a84cee278",
+        signature: "0x482049823c85e038e099fe4f2b901487c4800def71c9a3f5bae2de8381ec54f6",
     },
     {
         anonymous: false,
@@ -642,89 +570,10 @@ const _abi = [
                 name: "index",
                 type: "uint256",
             },
-            {
-                components: [
-                    {
-                        internalType: "uint40",
-                        name: "totalPositionSizeFeeP",
-                        type: "uint40",
-                    },
-                    {
-                        internalType: "uint40",
-                        name: "totalLiqCollateralFeeP",
-                        type: "uint40",
-                    },
-                    {
-                        internalType: "uint40",
-                        name: "oraclePositionSizeFeeP",
-                        type: "uint40",
-                    },
-                    {
-                        internalType: "uint32",
-                        name: "minPositionSizeUsd",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint104",
-                        name: "__placeholder",
-                        type: "uint104",
-                    },
-                ],
-                indexed: false,
-                internalType: "struct IPairsStorage.FeeGroup",
-                name: "feeGroup",
-                type: "tuple",
-            },
         ],
         name: "FeeUpdated",
         type: "event",
-        signature: "0xb38258bbe4602eb8456888a284ddf8f9f9acc06f4699fce677ddd34941ed35cb",
-    },
-    {
-        anonymous: false,
-        inputs: [
-            {
-                components: [
-                    {
-                        internalType: "uint24",
-                        name: "referralFeeP",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "uint24",
-                        name: "govFeeP",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "uint24",
-                        name: "triggerOrderFeeP",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "uint24",
-                        name: "gnsOtcFeeP",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "uint24",
-                        name: "gTokenFeeP",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "uint136",
-                        name: "__placeholder",
-                        type: "uint136",
-                    },
-                ],
-                indexed: false,
-                internalType: "struct IPairsStorage.GlobalTradeFeeParams",
-                name: "feeParams",
-                type: "tuple",
-            },
-        ],
-        name: "GlobalTradeFeeParamsUpdated",
-        type: "event",
-        signature: "0xbbd4d37e525bc0d0bf80d0c56879b81ebcccbe7bfd22e484e19eb0f369c011a4",
+        signature: "0x8c4d35e54a3f2ef1134138fd8ea3daee6a3c89e10d2665996babdf70261e2c76",
     },
     {
         anonymous: false,
@@ -872,32 +721,37 @@ const _abi = [
             {
                 components: [
                     {
-                        internalType: "uint40",
-                        name: "totalPositionSizeFeeP",
-                        type: "uint40",
+                        internalType: "string",
+                        name: "name",
+                        type: "string",
                     },
                     {
-                        internalType: "uint40",
-                        name: "totalLiqCollateralFeeP",
-                        type: "uint40",
+                        internalType: "uint256",
+                        name: "openFeeP",
+                        type: "uint256",
                     },
                     {
-                        internalType: "uint40",
-                        name: "oraclePositionSizeFeeP",
-                        type: "uint40",
+                        internalType: "uint256",
+                        name: "closeFeeP",
+                        type: "uint256",
                     },
                     {
-                        internalType: "uint32",
-                        name: "minPositionSizeUsd",
-                        type: "uint32",
+                        internalType: "uint256",
+                        name: "oracleFeeP",
+                        type: "uint256",
                     },
                     {
-                        internalType: "uint104",
-                        name: "__placeholder",
-                        type: "uint104",
+                        internalType: "uint256",
+                        name: "triggerOrderFeeP",
+                        type: "uint256",
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "minPositionSizeUsd",
+                        type: "uint256",
                     },
                 ],
-                internalType: "struct IPairsStorage.FeeGroup[]",
+                internalType: "struct IPairsStorage.Fee[]",
                 name: "_fees",
                 type: "tuple[]",
             },
@@ -906,7 +760,7 @@ const _abi = [
         outputs: [],
         stateMutability: "nonpayable",
         type: "function",
-        signature: "0x0e5c75af",
+        signature: "0x0c00b94a",
     },
     {
         inputs: [
@@ -1025,32 +879,37 @@ const _abi = [
             {
                 components: [
                     {
-                        internalType: "uint40",
-                        name: "totalPositionSizeFeeP",
-                        type: "uint40",
+                        internalType: "string",
+                        name: "name",
+                        type: "string",
                     },
                     {
-                        internalType: "uint40",
-                        name: "totalLiqCollateralFeeP",
-                        type: "uint40",
+                        internalType: "uint256",
+                        name: "openFeeP",
+                        type: "uint256",
                     },
                     {
-                        internalType: "uint40",
-                        name: "oraclePositionSizeFeeP",
-                        type: "uint40",
+                        internalType: "uint256",
+                        name: "closeFeeP",
+                        type: "uint256",
                     },
                     {
-                        internalType: "uint32",
-                        name: "minPositionSizeUsd",
-                        type: "uint32",
+                        internalType: "uint256",
+                        name: "oracleFeeP",
+                        type: "uint256",
                     },
                     {
-                        internalType: "uint104",
-                        name: "__placeholder",
-                        type: "uint104",
+                        internalType: "uint256",
+                        name: "triggerOrderFeeP",
+                        type: "uint256",
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "minPositionSizeUsd",
+                        type: "uint256",
                     },
                 ],
-                internalType: "struct IPairsStorage.FeeGroup",
+                internalType: "struct IPairsStorage.Fee",
                 name: "",
                 type: "tuple",
             },
@@ -1087,52 +946,6 @@ const _abi = [
         type: "function",
         signature: "0x678b3fb0",
     },
-    {
-        inputs: [],
-        name: "getGlobalTradeFeeParams",
-        outputs: [
-            {
-                components: [
-                    {
-                        internalType: "uint24",
-                        name: "referralFeeP",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "uint24",
-                        name: "govFeeP",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "uint24",
-                        name: "triggerOrderFeeP",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "uint24",
-                        name: "gnsOtcFeeP",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "uint24",
-                        name: "gTokenFeeP",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "uint136",
-                        name: "__placeholder",
-                        type: "uint136",
-                    },
-                ],
-                internalType: "struct IPairsStorage.GlobalTradeFeeParams",
-                name: "",
-                type: "tuple",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0x48fc3ef3",
-    },
     {
         inputs: [
             {
@@ -1324,52 +1137,6 @@ const _abi = [
         type: "function",
         signature: "0x85d4390e",
     },
-    {
-        inputs: [
-            {
-                components: [
-                    {
-                        internalType: "uint24",
-                        name: "referralFeeP",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "uint24",
-                        name: "govFeeP",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "uint24",
-                        name: "triggerOrderFeeP",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "uint24",
-                        name: "gnsOtcFeeP",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "uint24",
-                        name: "gTokenFeeP",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "uint136",
-                        name: "__placeholder",
-                        type: "uint136",
-                    },
-                ],
-                internalType: "struct IPairsStorage.GlobalTradeFeeParams",
-                name: "_tradeFeeParams",
-                type: "tuple",
-            },
-        ],
-        name: "initializeNewFees",
-        outputs: [],
-        stateMutability: "nonpayable",
-        type: "function",
-        signature: "0xc85ac748",
-    },
     {
         inputs: [
             {
@@ -1423,7 +1190,7 @@ const _abi = [
                 type: "uint256",
             },
         ],
-        name: "pairCustomMaxLeverage",
+        name: "pairCloseFeeP",
         outputs: [
             {
                 internalType: "uint256",
@@ -1433,7 +1200,7 @@ const _abi = [
         ],
         stateMutability: "view",
         type: "function",
-        signature: "0x24a96865",
+        signature: "0x836a341a",
     },
     {
         inputs: [
@@ -1443,7 +1210,27 @@ const _abi = [
                 type: "uint256",
             },
         ],
-        name: "pairJob",
+        name: "pairCustomMaxLeverage",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+        signature: "0x24a96865",
+    },
+    {
+        inputs: [
+            {
+                internalType: "uint256",
+                name: "_pairIndex",
+                type: "uint256",
+            },
+        ],
+        name: "pairJob",
         outputs: [
             {
                 internalType: "string",
@@ -1548,7 +1335,7 @@ const _abi = [
                 type: "uint256",
             },
         ],
-        name: "pairOraclePositionSizeFeeP",
+        name: "pairOpenFeeP",
         outputs: [
             {
                 internalType: "uint256",
@@ -1558,7 +1345,7 @@ const _abi = [
         ],
         stateMutability: "view",
         type: "function",
-        signature: "0x0cf34255",
+        signature: "0x8251135b",
     },
     {
         inputs: [
@@ -1568,7 +1355,7 @@ const _abi = [
                 type: "uint256",
             },
         ],
-        name: "pairSpreadP",
+        name: "pairOracleFeeP",
         outputs: [
             {
                 internalType: "uint256",
@@ -1578,7 +1365,7 @@ const _abi = [
         ],
         stateMutability: "view",
         type: "function",
-        signature: "0xa1d54e9b",
+        signature: "0xf7acbabd",
     },
     {
         inputs: [
@@ -1588,7 +1375,7 @@ const _abi = [
                 type: "uint256",
             },
         ],
-        name: "pairTotalLiqCollateralFeeP",
+        name: "pairSpreadP",
         outputs: [
             {
                 internalType: "uint256",
@@ -1598,7 +1385,7 @@ const _abi = [
         ],
         stateMutability: "view",
         type: "function",
-        signature: "0xfbf3f911",
+        signature: "0xa1d54e9b",
     },
     {
         inputs: [
@@ -1608,7 +1395,7 @@ const _abi = [
                 type: "uint256",
             },
         ],
-        name: "pairTotalPositionSizeFeeP",
+        name: "pairTriggerOrderFeeP",
         outputs: [
             {
                 internalType: "uint256",
@@ -1618,7 +1405,7 @@ const _abi = [
         ],
         stateMutability: "view",
         type: "function",
-        signature: "0xc927b4b6",
+        signature: "0xe74aff72",
     },
     {
         inputs: [
@@ -1695,64 +1482,156 @@ const _abi = [
         signature: "0xb91ac788",
     },
     {
-        inputs: [],
-        name: "pairsCount",
-        outputs: [
+        inputs: [
             {
                 internalType: "uint256",
-                name: "",
+                name: "_index",
                 type: "uint256",
             },
         ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0xb81b2b71",
-    },
-    {
-        inputs: [
+        name: "pairsBackend",
+        outputs: [
             {
                 components: [
                     {
-                        internalType: "uint24",
-                        name: "referralFeeP",
-                        type: "uint24",
+                        internalType: "string",
+                        name: "from",
+                        type: "string",
                     },
                     {
-                        internalType: "uint24",
-                        name: "govFeeP",
-                        type: "uint24",
+                        internalType: "string",
+                        name: "to",
+                        type: "string",
                     },
                     {
-                        internalType: "uint24",
-                        name: "triggerOrderFeeP",
-                        type: "uint24",
+                        components: [
+                            {
+                                internalType: "address",
+                                name: "feed1",
+                                type: "address",
+                            },
+                            {
+                                internalType: "address",
+                                name: "feed2",
+                                type: "address",
+                            },
+                            {
+                                internalType: "enum IPairsStorage.FeedCalculation",
+                                name: "feedCalculation",
+                                type: "uint8",
+                            },
+                            {
+                                internalType: "uint256",
+                                name: "maxDeviationP",
+                                type: "uint256",
+                            },
+                        ],
+                        internalType: "struct IPairsStorage.Feed",
+                        name: "feed",
+                        type: "tuple",
                     },
                     {
-                        internalType: "uint24",
-                        name: "gnsOtcFeeP",
-                        type: "uint24",
+                        internalType: "uint256",
+                        name: "spreadP",
+                        type: "uint256",
                     },
                     {
-                        internalType: "uint24",
-                        name: "gTokenFeeP",
-                        type: "uint24",
+                        internalType: "uint256",
+                        name: "groupIndex",
+                        type: "uint256",
                     },
                     {
-                        internalType: "uint136",
-                        name: "__placeholder",
-                        type: "uint136",
+                        internalType: "uint256",
+                        name: "feeIndex",
+                        type: "uint256",
+                    },
+                ],
+                internalType: "struct IPairsStorage.Pair",
+                name: "",
+                type: "tuple",
+            },
+            {
+                components: [
+                    {
+                        internalType: "string",
+                        name: "name",
+                        type: "string",
+                    },
+                    {
+                        internalType: "bytes32",
+                        name: "job",
+                        type: "bytes32",
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "minLeverage",
+                        type: "uint256",
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "maxLeverage",
+                        type: "uint256",
+                    },
+                ],
+                internalType: "struct IPairsStorage.Group",
+                name: "",
+                type: "tuple",
+            },
+            {
+                components: [
+                    {
+                        internalType: "string",
+                        name: "name",
+                        type: "string",
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "openFeeP",
+                        type: "uint256",
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "closeFeeP",
+                        type: "uint256",
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "oracleFeeP",
+                        type: "uint256",
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "triggerOrderFeeP",
+                        type: "uint256",
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "minPositionSizeUsd",
+                        type: "uint256",
                     },
                 ],
-                internalType: "struct IPairsStorage.GlobalTradeFeeParams",
-                name: "_feeParams",
+                internalType: "struct IPairsStorage.Fee",
+                name: "",
                 type: "tuple",
             },
         ],
-        name: "setGlobalTradeFeeParams",
-        outputs: [],
-        stateMutability: "nonpayable",
+        stateMutability: "view",
+        type: "function",
+        signature: "0x9567dccf",
+    },
+    {
+        inputs: [],
+        name: "pairsCount",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
         type: "function",
-        signature: "0x5f57a073",
+        signature: "0xb81b2b71",
     },
     {
         inputs: [
@@ -1829,32 +1708,37 @@ const _abi = [
             {
                 components: [
                     {
-                        internalType: "uint40",
-                        name: "totalPositionSizeFeeP",
-                        type: "uint40",
+                        internalType: "string",
+                        name: "name",
+                        type: "string",
                     },
                     {
-                        internalType: "uint40",
-                        name: "totalLiqCollateralFeeP",
-                        type: "uint40",
+                        internalType: "uint256",
+                        name: "openFeeP",
+                        type: "uint256",
                     },
                     {
-                        internalType: "uint40",
-                        name: "oraclePositionSizeFeeP",
-                        type: "uint40",
+                        internalType: "uint256",
+                        name: "closeFeeP",
+                        type: "uint256",
                     },
                     {
-                        internalType: "uint32",
-                        name: "minPositionSizeUsd",
-                        type: "uint32",
+                        internalType: "uint256",
+                        name: "oracleFeeP",
+                        type: "uint256",
                     },
                     {
-                        internalType: "uint104",
-                        name: "__placeholder",
-                        type: "uint104",
+                        internalType: "uint256",
+                        name: "triggerOrderFeeP",
+                        type: "uint256",
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "minPositionSizeUsd",
+                        type: "uint256",
                     },
                 ],
-                internalType: "struct IPairsStorage.FeeGroup[]",
+                internalType: "struct IPairsStorage.Fee[]",
                 name: "_fees",
                 type: "tuple[]",
             },
@@ -1863,7 +1747,7 @@ const _abi = [
         outputs: [],
         stateMutability: "nonpayable",
         type: "function",
-        signature: "0x1cf71b9b",
+        signature: "0xe57f6759",
     },
     {
         inputs: [
@@ -2283,7 +2167,7 @@ const _abi = [
             },
             {
                 internalType: "uint256",
-                name: "_referrerFeeUsd",
+                name: "_pairOpenFeeP",
                 type: "uint256",
             },
             {
@@ -2293,7 +2177,13 @@ const _abi = [
             },
         ],
         name: "distributeReferralReward",
-        outputs: [],
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
         stateMutability: "nonpayable",
         type: "function",
         signature: "0xfa3c8dbf",
@@ -2364,6 +2254,20 @@ const _abi = [
         type: "function",
         signature: "0x97436b5f",
     },
+    {
+        inputs: [],
+        name: "getReferralsOpenFeeP",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+        signature: "0x06350917",
+    },
     {
         inputs: [],
         name: "getReferralsStartReferrerFeeP",
@@ -2452,12 +2356,17 @@ const _abi = [
     {
         inputs: [
             {
-                internalType: "address",
-                name: "_referrer",
-                type: "address",
+                internalType: "uint256",
+                name: "_pairOpenFeeP",
+                type: "uint256",
+            },
+            {
+                internalType: "uint256",
+                name: "_volumeReferredUsd",
+                type: "uint256",
             },
         ],
-        name: "getReferrerFeeProgressP",
+        name: "getReferrerFeeP",
         outputs: [
             {
                 internalType: "uint256",
@@ -2467,7 +2376,7 @@ const _abi = [
         ],
         stateMutability: "view",
         type: "function",
-        signature: "0x5d19b5d3",
+        signature: "0x4e583b31",
     },
     {
         inputs: [
@@ -2561,6 +2470,11 @@ const _abi = [
                 name: "_startReferrerFeeP",
                 type: "uint256",
             },
+            {
+                internalType: "uint256",
+                name: "_openFeeP",
+                type: "uint256",
+            },
             {
                 internalType: "uint256",
                 name: "_targetVolumeUsd",
@@ -2571,7 +2485,7 @@ const _abi = [
         outputs: [],
         stateMutability: "nonpayable",
         type: "function",
-        signature: "0x38fb18c7",
+        signature: "0xc8b0d710",
     },
     {
         inputs: [
@@ -2634,6 +2548,20 @@ const _abi = [
         type: "function",
         signature: "0x97365b74",
     },
+    {
+        inputs: [
+            {
+                internalType: "uint256",
+                name: "_value",
+                type: "uint256",
+            },
+        ],
+        name: "updateReferralsOpenFeeP",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function",
+        signature: "0xdfed4fcb",
+    },
     {
         inputs: [
             {
@@ -2695,11 +2623,6 @@ const _abi = [
         type: "function",
         signature: "0x507cd8de",
     },
-    {
-        inputs: [],
-        name: "PointsOverflow",
-        type: "error",
-    },
     {
         inputs: [],
         name: "WrongFeeTier",
@@ -2903,110 +2826,28 @@ const _abi = [
                 type: "address",
             },
             {
-                indexed: true,
+                indexed: false,
                 internalType: "uint32",
-                name: "day",
+                name: "fromDay",
                 type: "uint32",
             },
             {
                 indexed: false,
-                internalType: "enum IFeeTiers.CreditType",
-                name: "creditType",
-                type: "uint8",
+                internalType: "uint32",
+                name: "toDay",
+                type: "uint32",
             },
             {
                 indexed: false,
                 internalType: "uint224",
-                name: "points",
+                name: "expiredPoints",
                 type: "uint224",
             },
         ],
-        name: "TraderPointsCredited",
-        type: "event",
-        signature: "0xf050ee240db213d72ebabd2f46c0d3270c8206c02d51e074d447c4ca20bd7a6f",
-    },
-    {
-        anonymous: false,
-        inputs: [
-            {
-                indexed: true,
-                internalType: "address",
-                name: "trader",
-                type: "address",
-            },
-            {
-                indexed: false,
-                internalType: "uint32",
-                name: "fromDay",
-                type: "uint32",
-            },
-            {
-                indexed: false,
-                internalType: "uint32",
-                name: "toDay",
-                type: "uint32",
-            },
-            {
-                indexed: false,
-                internalType: "uint224",
-                name: "expiredPoints",
-                type: "uint224",
-            },
-        ],
-        name: "TraderTrailingPointsExpired",
+        name: "TraderTrailingPointsExpired",
         type: "event",
         signature: "0x964f0f6a92f6d7eedbff7670a2e850f5511e59321724a9dbef638c8068b7527b",
     },
-    {
-        anonymous: false,
-        inputs: [
-            {
-                indexed: true,
-                internalType: "address",
-                name: "trader",
-                type: "address",
-            },
-            {
-                indexed: true,
-                internalType: "uint32",
-                name: "day",
-                type: "uint32",
-            },
-            {
-                indexed: false,
-                internalType: "uint224",
-                name: "points",
-                type: "uint224",
-            },
-        ],
-        name: "TraderUnclaimedPointsClaimed",
-        type: "event",
-        signature: "0x8b1dd1669c243ea81885b90c31d292a58996045d48bd261b3aea98a09cd66f1e",
-    },
-    {
-        inputs: [
-            {
-                internalType: "address[]",
-                name: "_traders",
-                type: "address[]",
-            },
-            {
-                internalType: "enum IFeeTiers.CreditType[]",
-                name: "_creditTypes",
-                type: "uint8[]",
-            },
-            {
-                internalType: "uint224[]",
-                name: "_points",
-                type: "uint224[]",
-            },
-        ],
-        name: "addTradersUnclaimedPoints",
-        outputs: [],
-        stateMutability: "nonpayable",
-        type: "function",
-        signature: "0xb61ce13b",
-    },
     {
         inputs: [
             {
@@ -3199,26 +3040,6 @@ const _abi = [
         type: "function",
         signature: "0x508cbfbe",
     },
-    {
-        inputs: [
-            {
-                internalType: "address",
-                name: "_trader",
-                type: "address",
-            },
-        ],
-        name: "getTraderUnclaimedPoints",
-        outputs: [
-            {
-                internalType: "uint224",
-                name: "",
-                type: "uint224",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0x84e3ebe2",
-    },
     {
         inputs: [
             {
@@ -3395,60 +3216,6 @@ const _abi = [
         type: "event",
         signature: "0x2742ec28d0252b4477106a77a10b04e1c1ecd2b568c7168d56c3a3154d3a3122",
     },
-    {
-        anonymous: false,
-        inputs: [
-            {
-                indexed: true,
-                internalType: "uint256",
-                name: "pairIndex",
-                type: "uint256",
-            },
-            {
-                indexed: false,
-                internalType: "bool",
-                name: "exemptAfterProtectionCloseFactor",
-                type: "bool",
-            },
-        ],
-        name: "ExemptAfterProtectionCloseFactorUpdated",
-        type: "event",
-        signature: "0xd5c6c8f00fcf1cd1dcccec431caee897386371cb8c3ec99d177b49ca8b38de7a",
-    },
-    {
-        anonymous: false,
-        inputs: [
-            {
-                indexed: true,
-                internalType: "uint256",
-                name: "pairIndex",
-                type: "uint256",
-            },
-            {
-                indexed: false,
-                internalType: "bool",
-                name: "exemptOnOpen",
-                type: "bool",
-            },
-        ],
-        name: "ExemptOnOpenUpdated",
-        type: "event",
-        signature: "0x194d4896e74b7ec72619871dc3ed535210aa9f76fa7b42822b6980a8585938ca",
-    },
-    {
-        anonymous: false,
-        inputs: [
-            {
-                indexed: true,
-                internalType: "uint40",
-                name: "negPnlCumulVolMultiplier",
-                type: "uint40",
-            },
-        ],
-        name: "NegPnlCumulVolMultiplierUpdated",
-        type: "event",
-        signature: "0x6d53c6510943113652968162063328b13689dc76c9927ac79a6706ae6eaf8212",
-    },
     {
         anonymous: false,
         inputs: [
@@ -3599,11 +3366,6 @@ const _abi = [
                         name: "open",
                         type: "bool",
                     },
-                    {
-                        internalType: "bool",
-                        name: "isPnlPositive",
-                        type: "bool",
-                    },
                     {
                         internalType: "uint128",
                         name: "openInterestUsd",
@@ -3618,7 +3380,7 @@ const _abi = [
         ],
         name: "PriceImpactOpenInterestAdded",
         type: "event",
-        signature: "0xf9cf8994f1c8e16af56d311d1ebb387a7a3c37cc847edbd2155ad32c5cc9a2fe",
+        signature: "0xcca5358ade10271036cf22898f07ad681f9dd7fc3e861da5fc31319c4b890ad4",
     },
     {
         anonymous: false,
@@ -3688,26 +3450,6 @@ const _abi = [
         type: "event",
         signature: "0x471eb2788149a10519cea684f0149db7c6af0e5fa1182f06b50c5420fe95d12a",
     },
-    {
-        anonymous: false,
-        inputs: [
-            {
-                indexed: false,
-                internalType: "address",
-                name: "trader",
-                type: "address",
-            },
-            {
-                indexed: false,
-                internalType: "bool",
-                name: "whitelisted",
-                type: "bool",
-            },
-        ],
-        name: "ProtectionCloseFactorWhitelistUpdated",
-        type: "event",
-        signature: "0xb97e27f523fc23750f9d24f12010b9c513c301db9022d0ce8e27a50d9f426383",
-    },
     {
         inputs: [
             {
@@ -3730,31 +3472,12 @@ const _abi = [
                 name: "_open",
                 type: "bool",
             },
-            {
-                internalType: "bool",
-                name: "_isPnlPositive",
-                type: "bool",
-            },
         ],
         name: "addPriceImpactOpenInterest",
         outputs: [],
         stateMutability: "nonpayable",
         type: "function",
-        signature: "0x81688f7b",
-    },
-    {
-        inputs: [],
-        name: "getNegPnlCumulVolMultiplier",
-        outputs: [
-            {
-                internalType: "uint48",
-                name: "",
-                type: "uint48",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0xc1681679",
+        signature: "0x23ce624b",
     },
     {
         inputs: [
@@ -3963,19 +3686,9 @@ const _abi = [
                         type: "uint40",
                     },
                     {
-                        internalType: "bool",
-                        name: "exemptOnOpen",
-                        type: "bool",
-                    },
-                    {
-                        internalType: "bool",
-                        name: "exemptAfterProtectionCloseFactor",
-                        type: "bool",
-                    },
-                    {
-                        internalType: "uint128",
+                        internalType: "uint144",
                         name: "__placeholder",
-                        type: "uint128",
+                        type: "uint144",
                     },
                 ],
                 internalType: "struct IPriceImpact.PairFactors[]",
@@ -4014,31 +3727,6 @@ const _abi = [
     },
     {
         inputs: [
-            {
-                internalType: "address",
-                name: "_trader",
-                type: "address",
-            },
-        ],
-        name: "getProtectionCloseFactorWhitelist",
-        outputs: [
-            {
-                internalType: "bool",
-                name: "",
-                type: "bool",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0x2aa8f882",
-    },
-    {
-        inputs: [
-            {
-                internalType: "address",
-                name: "_trader",
-                type: "address",
-            },
             {
                 internalType: "uint256",
                 name: "_marketPrice",
@@ -4095,21 +3783,7 @@ const _abi = [
         ],
         stateMutability: "view",
         type: "function",
-        signature: "0xae0d3a07",
-    },
-    {
-        inputs: [
-            {
-                internalType: "uint40",
-                name: "_negPnlCumulVolMultiplier",
-                type: "uint40",
-            },
-        ],
-        name: "initializeNegPnlCumulVolMultiplier",
-        outputs: [],
-        stateMutability: "nonpayable",
-        type: "function",
-        signature: "0xe551bcbf",
+        signature: "0xdd5ef6f1",
     },
     {
         inputs: [
@@ -4181,106 +3855,54 @@ const _abi = [
     {
         inputs: [
             {
-                internalType: "uint16[]",
-                name: "_pairIndices",
-                type: "uint16[]",
+                internalType: "uint256[]",
+                name: "_indices",
+                type: "uint256[]",
             },
             {
-                internalType: "bool[]",
-                name: "_exemptAfterProtectionCloseFactor",
-                type: "bool[]",
+                internalType: "uint128[]",
+                name: "_depthsAboveUsd",
+                type: "uint128[]",
+            },
+            {
+                internalType: "uint128[]",
+                name: "_depthsBelowUsd",
+                type: "uint128[]",
             },
         ],
-        name: "setExemptAfterProtectionCloseFactor",
+        name: "setPairDepths",
         outputs: [],
         stateMutability: "nonpayable",
         type: "function",
-        signature: "0x212d8a1e",
+        signature: "0x6474b399",
     },
     {
         inputs: [
             {
-                internalType: "uint16[]",
-                name: "_pairIndices",
-                type: "uint16[]",
-            },
-            {
-                internalType: "bool[]",
-                name: "_exemptOnOpen",
-                type: "bool[]",
+                internalType: "uint48",
+                name: "_newWindowsCount",
+                type: "uint48",
             },
         ],
-        name: "setExemptOnOpen",
+        name: "setPriceImpactWindowsCount",
         outputs: [],
         stateMutability: "nonpayable",
         type: "function",
-        signature: "0xdded895a",
+        signature: "0x10751b4f",
     },
     {
         inputs: [
             {
-                internalType: "uint40",
-                name: "_negPnlCumulVolMultiplier",
-                type: "uint40",
+                internalType: "uint48",
+                name: "_newWindowsDuration",
+                type: "uint48",
             },
         ],
-        name: "setNegPnlCumulVolMultiplier",
+        name: "setPriceImpactWindowsDuration",
         outputs: [],
         stateMutability: "nonpayable",
         type: "function",
-        signature: "0x302e88f8",
-    },
-    {
-        inputs: [
-            {
-                internalType: "uint256[]",
-                name: "_indices",
-                type: "uint256[]",
-            },
-            {
-                internalType: "uint128[]",
-                name: "_depthsAboveUsd",
-                type: "uint128[]",
-            },
-            {
-                internalType: "uint128[]",
-                name: "_depthsBelowUsd",
-                type: "uint128[]",
-            },
-        ],
-        name: "setPairDepths",
-        outputs: [],
-        stateMutability: "nonpayable",
-        type: "function",
-        signature: "0x6474b399",
-    },
-    {
-        inputs: [
-            {
-                internalType: "uint48",
-                name: "_newWindowsCount",
-                type: "uint48",
-            },
-        ],
-        name: "setPriceImpactWindowsCount",
-        outputs: [],
-        stateMutability: "nonpayable",
-        type: "function",
-        signature: "0x10751b4f",
-    },
-    {
-        inputs: [
-            {
-                internalType: "uint48",
-                name: "_newWindowsDuration",
-                type: "uint48",
-            },
-        ],
-        name: "setPriceImpactWindowsDuration",
-        outputs: [],
-        stateMutability: "nonpayable",
-        type: "function",
-        signature: "0x39b0fc82",
+        signature: "0x39b0fc82",
     },
     {
         inputs: [
@@ -4301,25 +3923,6 @@ const _abi = [
         type: "function",
         signature: "0x2a4cde4a",
     },
-    {
-        inputs: [
-            {
-                internalType: "address[]",
-                name: "_traders",
-                type: "address[]",
-            },
-            {
-                internalType: "bool[]",
-                name: "_whitelisted",
-                type: "bool[]",
-            },
-        ],
-        name: "setProtectionCloseFactorWhitelist",
-        outputs: [],
-        stateMutability: "nonpayable",
-        type: "function",
-        signature: "0xd8762abb",
-    },
     {
         inputs: [
             {
@@ -4479,16 +4082,22 @@ const _abi = [
         anonymous: false,
         inputs: [
             {
-                indexed: true,
-                internalType: "address",
-                name: "user",
-                type: "address",
-            },
-            {
-                indexed: true,
-                internalType: "uint32",
-                name: "index",
-                type: "uint32",
+                components: [
+                    {
+                        internalType: "address",
+                        name: "user",
+                        type: "address",
+                    },
+                    {
+                        internalType: "uint32",
+                        name: "index",
+                        type: "uint32",
+                    },
+                ],
+                indexed: false,
+                internalType: "struct ITradingStorage.Id",
+                name: "tradeId",
+                type: "tuple",
             },
             {
                 indexed: false,
@@ -4517,7 +4126,7 @@ const _abi = [
         ],
         name: "OpenOrderDetailsUpdated",
         type: "event",
-        signature: "0x1db0f5e6d7fd465827f67d8349f32499863715a690a2e33a77cf3d1b53b5ba1a",
+        signature: "0x57166866105b85933cf7d2f84637e524028a4ca84133309f14b2ce0dfc113498",
     },
     {
         anonymous: false,
@@ -4667,42 +4276,48 @@ const _abi = [
         anonymous: false,
         inputs: [
             {
-                indexed: true,
-                internalType: "address",
-                name: "user",
-                type: "address",
-            },
-            {
-                indexed: true,
-                internalType: "uint32",
-                name: "index",
-                type: "uint32",
-            },
-            {
+                components: [
+                    {
+                        internalType: "address",
+                        name: "user",
+                        type: "address",
+                    },
+                    {
+                        internalType: "uint32",
+                        name: "index",
+                        type: "uint32",
+                    },
+                ],
                 indexed: false,
-                internalType: "bool",
-                name: "isPnlPositive",
-                type: "bool",
+                internalType: "struct ITradingStorage.Id",
+                name: "tradeId",
+                type: "tuple",
             },
         ],
         name: "TradeClosed",
         type: "event",
-        signature: "0xa518dc0f204e7b9dcb9655590f084b91940be34dd66e174c2b29f4a81d99d5df",
+        signature: "0xedf2f9a86d6e2127c61aaaeb10a282ee4e0aa89ea19c7db37df80fece027a493",
     },
     {
         anonymous: false,
         inputs: [
             {
-                indexed: true,
-                internalType: "address",
-                name: "user",
-                type: "address",
-            },
-            {
-                indexed: true,
-                internalType: "uint32",
-                name: "index",
-                type: "uint32",
+                components: [
+                    {
+                        internalType: "address",
+                        name: "user",
+                        type: "address",
+                    },
+                    {
+                        internalType: "uint32",
+                        name: "index",
+                        type: "uint32",
+                    },
+                ],
+                indexed: false,
+                internalType: "struct ITradingStorage.Id",
+                name: "tradeId",
+                type: "tuple",
             },
             {
                 indexed: false,
@@ -4713,22 +4328,28 @@ const _abi = [
         ],
         name: "TradeCollateralUpdated",
         type: "event",
-        signature: "0x48a630649f549ef031330c87af1da1f77164d2f664b9044c7e95bc01d27999e5",
+        signature: "0xce228a7b1b8e239798e94cb2ba581d57501692fc1d29719a891125f1f393826d",
     },
     {
         anonymous: false,
         inputs: [
             {
-                indexed: true,
-                internalType: "address",
-                name: "user",
-                type: "address",
-            },
-            {
-                indexed: true,
-                internalType: "uint32",
-                name: "index",
-                type: "uint32",
+                components: [
+                    {
+                        internalType: "address",
+                        name: "user",
+                        type: "address",
+                    },
+                    {
+                        internalType: "uint32",
+                        name: "index",
+                        type: "uint32",
+                    },
+                ],
+                indexed: false,
+                internalType: "struct ITradingStorage.Id",
+                name: "tradeId",
+                type: "tuple",
             },
             {
                 indexed: false,
@@ -4739,22 +4360,28 @@ const _abi = [
         ],
         name: "TradeMaxClosingSlippagePUpdated",
         type: "event",
-        signature: "0x3a303c8e1d22ea7e3b98451d472573daeaa2bedb6db17838cb23c0d8b506d89e",
+        signature: "0xb34e0065c48018b4a48b78c4729fd9ffd1968c59d6532e600c4afb42ce093da1",
     },
     {
         anonymous: false,
         inputs: [
             {
-                indexed: true,
-                internalType: "address",
-                name: "user",
-                type: "address",
-            },
-            {
-                indexed: true,
-                internalType: "uint32",
-                name: "index",
-                type: "uint32",
+                components: [
+                    {
+                        internalType: "address",
+                        name: "user",
+                        type: "address",
+                    },
+                    {
+                        internalType: "uint32",
+                        name: "index",
+                        type: "uint32",
+                    },
+                ],
+                indexed: false,
+                internalType: "struct ITradingStorage.Id",
+                name: "tradeId",
+                type: "tuple",
             },
             {
                 indexed: false,
@@ -4792,31 +4419,31 @@ const _abi = [
                 name: "isPartialIncrease",
                 type: "bool",
             },
-            {
-                indexed: false,
-                internalType: "bool",
-                name: "isPnlPositive",
-                type: "bool",
-            },
         ],
         name: "TradePositionUpdated",
         type: "event",
-        signature: "0xd44377bc88226583e82782aec12182dbe38e1b796330892e34a21a9558611a70",
+        signature: "0x3890801c6f1ea37e9eb6aaae6cb1e57eeb8fe67e3af47b2533ff1fc4d1031ede",
     },
     {
         anonymous: false,
         inputs: [
             {
-                indexed: true,
-                internalType: "address",
-                name: "user",
-                type: "address",
-            },
-            {
-                indexed: true,
-                internalType: "uint32",
-                name: "index",
-                type: "uint32",
+                components: [
+                    {
+                        internalType: "address",
+                        name: "user",
+                        type: "address",
+                    },
+                    {
+                        internalType: "uint32",
+                        name: "index",
+                        type: "uint32",
+                    },
+                ],
+                indexed: false,
+                internalType: "struct ITradingStorage.Id",
+                name: "tradeId",
+                type: "tuple",
             },
             {
                 indexed: false,
@@ -4827,23 +4454,11 @@ const _abi = [
         ],
         name: "TradeSlUpdated",
         type: "event",
-        signature: "0xbb058b3eaaea5c2a669a057939f688156d50b5e092969eae671e583635192ead",
+        signature: "0x38f5d5d40d9c4a41aa03d21461f1b07aa6b4ef035fb9d21f02d53a82c712a002",
     },
     {
         anonymous: false,
         inputs: [
-            {
-                indexed: true,
-                internalType: "address",
-                name: "user",
-                type: "address",
-            },
-            {
-                indexed: true,
-                internalType: "uint32",
-                name: "index",
-                type: "uint32",
-            },
             {
                 components: [
                     {
@@ -5006,33 +4621,39 @@ const _abi = [
         ],
         name: "TradeStored",
         type: "event",
-        signature: "0x1a540c278c1838afbb56bb7659257d49132e43ff5e7687a333f8b47327db38ff",
+        signature: "0xb4c8599e992aeeb8f86e02eaee1061646ddf10a354b91f1daa776eb4595387a3",
     },
     {
         anonymous: false,
         inputs: [
             {
-                indexed: true,
-                internalType: "address",
-                name: "user",
-                type: "address",
-            },
-            {
-                indexed: true,
-                internalType: "uint32",
-                name: "index",
-                type: "uint32",
-            },
-            {
-                indexed: false,
-                internalType: "uint64",
+                components: [
+                    {
+                        internalType: "address",
+                        name: "user",
+                        type: "address",
+                    },
+                    {
+                        internalType: "uint32",
+                        name: "index",
+                        type: "uint32",
+                    },
+                ],
+                indexed: false,
+                internalType: "struct ITradingStorage.Id",
+                name: "tradeId",
+                type: "tuple",
+            },
+            {
+                indexed: false,
+                internalType: "uint64",
                 name: "newTp",
                 type: "uint64",
             },
         ],
         name: "TradeTpUpdated",
         type: "event",
-        signature: "0x67ddba1ecd6f73c7d78db146108dbd4e4cc0cea77597d2709de42ff4a603bb22",
+        signature: "0x3d045f25e6a6757ae5ca79ce5d28d84d69713804353a02c521d6a5352c0f9e20",
     },
     {
         anonymous: false,
@@ -5112,17 +4733,12 @@ const _abi = [
                 name: "_tradeId",
                 type: "tuple",
             },
-            {
-                internalType: "bool",
-                name: "_isPnlPositive",
-                type: "bool",
-            },
         ],
         name: "closeTrade",
         outputs: [],
         stateMutability: "nonpayable",
         type: "function",
-        signature: "0x221d25f4",
+        signature: "0x8583909b",
     },
     {
         inputs: [
@@ -5253,140 +4869,6 @@ const _abi = [
         type: "function",
         signature: "0x2d11445f",
     },
-    {
-        inputs: [
-            {
-                internalType: "address[]",
-                name: "_traders",
-                type: "address[]",
-            },
-            {
-                internalType: "uint256",
-                name: "_offset",
-                type: "uint256",
-            },
-            {
-                internalType: "uint256",
-                name: "_limit",
-                type: "uint256",
-            },
-        ],
-        name: "getAllPendingOrdersForTraders",
-        outputs: [
-            {
-                components: [
-                    {
-                        components: [
-                            {
-                                internalType: "address",
-                                name: "user",
-                                type: "address",
-                            },
-                            {
-                                internalType: "uint32",
-                                name: "index",
-                                type: "uint32",
-                            },
-                            {
-                                internalType: "uint16",
-                                name: "pairIndex",
-                                type: "uint16",
-                            },
-                            {
-                                internalType: "uint24",
-                                name: "leverage",
-                                type: "uint24",
-                            },
-                            {
-                                internalType: "bool",
-                                name: "long",
-                                type: "bool",
-                            },
-                            {
-                                internalType: "bool",
-                                name: "isOpen",
-                                type: "bool",
-                            },
-                            {
-                                internalType: "uint8",
-                                name: "collateralIndex",
-                                type: "uint8",
-                            },
-                            {
-                                internalType: "enum ITradingStorage.TradeType",
-                                name: "tradeType",
-                                type: "uint8",
-                            },
-                            {
-                                internalType: "uint120",
-                                name: "collateralAmount",
-                                type: "uint120",
-                            },
-                            {
-                                internalType: "uint64",
-                                name: "openPrice",
-                                type: "uint64",
-                            },
-                            {
-                                internalType: "uint64",
-                                name: "tp",
-                                type: "uint64",
-                            },
-                            {
-                                internalType: "uint64",
-                                name: "sl",
-                                type: "uint64",
-                            },
-                            {
-                                internalType: "uint192",
-                                name: "__placeholder",
-                                type: "uint192",
-                            },
-                        ],
-                        internalType: "struct ITradingStorage.Trade",
-                        name: "trade",
-                        type: "tuple",
-                    },
-                    {
-                        internalType: "address",
-                        name: "user",
-                        type: "address",
-                    },
-                    {
-                        internalType: "uint32",
-                        name: "index",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "bool",
-                        name: "isOpen",
-                        type: "bool",
-                    },
-                    {
-                        internalType: "enum ITradingStorage.PendingOrderType",
-                        name: "orderType",
-                        type: "uint8",
-                    },
-                    {
-                        internalType: "uint32",
-                        name: "createdBlock",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint16",
-                        name: "maxSlippageP",
-                        type: "uint16",
-                    },
-                ],
-                internalType: "struct ITradingStorage.PendingOrder[]",
-                name: "",
-                type: "tuple[]",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0x28eb002f",
-    },
     {
         inputs: [
             {
@@ -5459,83 +4941,6 @@ const _abi = [
         type: "function",
         signature: "0xeb50287f",
     },
-    {
-        inputs: [
-            {
-                internalType: "address[]",
-                name: "_traders",
-                type: "address[]",
-            },
-            {
-                internalType: "uint256",
-                name: "_offset",
-                type: "uint256",
-            },
-            {
-                internalType: "uint256",
-                name: "_limit",
-                type: "uint256",
-            },
-        ],
-        name: "getAllTradeInfosForTraders",
-        outputs: [
-            {
-                components: [
-                    {
-                        internalType: "uint32",
-                        name: "createdBlock",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint32",
-                        name: "tpLastUpdatedBlock",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint32",
-                        name: "slLastUpdatedBlock",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint16",
-                        name: "maxSlippageP",
-                        type: "uint16",
-                    },
-                    {
-                        internalType: "uint48",
-                        name: "lastOiUpdateTs",
-                        type: "uint48",
-                    },
-                    {
-                        internalType: "uint48",
-                        name: "collateralPriceUsd",
-                        type: "uint48",
-                    },
-                    {
-                        internalType: "enum ITradingStorage.ContractsVersion",
-                        name: "contractsVersion",
-                        type: "uint8",
-                    },
-                    {
-                        internalType: "uint32",
-                        name: "lastPosIncreaseBlock",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint8",
-                        name: "__placeholder",
-                        type: "uint8",
-                    },
-                ],
-                internalType: "struct ITradingStorage.TradeInfo[]",
-                name: "",
-                type: "tuple[]",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0x01e87cb0",
-    },
     {
         inputs: [
             {
@@ -5628,103 +5033,6 @@ const _abi = [
         type: "function",
         signature: "0xdffd8a1f",
     },
-    {
-        inputs: [
-            {
-                internalType: "address[]",
-                name: "_traders",
-                type: "address[]",
-            },
-            {
-                internalType: "uint256",
-                name: "_offset",
-                type: "uint256",
-            },
-            {
-                internalType: "uint256",
-                name: "_limit",
-                type: "uint256",
-            },
-        ],
-        name: "getAllTradesForTraders",
-        outputs: [
-            {
-                components: [
-                    {
-                        internalType: "address",
-                        name: "user",
-                        type: "address",
-                    },
-                    {
-                        internalType: "uint32",
-                        name: "index",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint16",
-                        name: "pairIndex",
-                        type: "uint16",
-                    },
-                    {
-                        internalType: "uint24",
-                        name: "leverage",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "bool",
-                        name: "long",
-                        type: "bool",
-                    },
-                    {
-                        internalType: "bool",
-                        name: "isOpen",
-                        type: "bool",
-                    },
-                    {
-                        internalType: "uint8",
-                        name: "collateralIndex",
-                        type: "uint8",
-                    },
-                    {
-                        internalType: "enum ITradingStorage.TradeType",
-                        name: "tradeType",
-                        type: "uint8",
-                    },
-                    {
-                        internalType: "uint120",
-                        name: "collateralAmount",
-                        type: "uint120",
-                    },
-                    {
-                        internalType: "uint64",
-                        name: "openPrice",
-                        type: "uint64",
-                    },
-                    {
-                        internalType: "uint64",
-                        name: "tp",
-                        type: "uint64",
-                    },
-                    {
-                        internalType: "uint64",
-                        name: "sl",
-                        type: "uint64",
-                    },
-                    {
-                        internalType: "uint192",
-                        name: "__placeholder",
-                        type: "uint192",
-                    },
-                ],
-                internalType: "struct ITradingStorage.Trade[]",
-                name: "",
-                type: "tuple[]",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0x33ea7f74",
-    },
     {
         inputs: [
             {
@@ -5777,63 +5085,6 @@ const _abi = [
         type: "function",
         signature: "0xc2b96e65",
     },
-    {
-        inputs: [
-            {
-                internalType: "address[]",
-                name: "_traders",
-                type: "address[]",
-            },
-            {
-                internalType: "uint256",
-                name: "_offset",
-                type: "uint256",
-            },
-            {
-                internalType: "uint256",
-                name: "_limit",
-                type: "uint256",
-            },
-        ],
-        name: "getAllTradesLiquidationParamsForTraders",
-        outputs: [
-            {
-                components: [
-                    {
-                        internalType: "uint40",
-                        name: "maxLiqSpreadP",
-                        type: "uint40",
-                    },
-                    {
-                        internalType: "uint40",
-                        name: "startLiqThresholdP",
-                        type: "uint40",
-                    },
-                    {
-                        internalType: "uint40",
-                        name: "endLiqThresholdP",
-                        type: "uint40",
-                    },
-                    {
-                        internalType: "uint24",
-                        name: "startLeverage",
-                        type: "uint24",
-                    },
-                    {
-                        internalType: "uint24",
-                        name: "endLeverage",
-                        type: "uint24",
-                    },
-                ],
-                internalType: "struct IPairsStorage.GroupLiquidationParams[]",
-                name: "",
-                type: "tuple[]",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0x556e838f",
-    },
     {
         inputs: [
             {
@@ -5944,66 +5195,24 @@ const _abi = [
     },
     {
         inputs: [],
-        name: "getCollateralsCount",
-        outputs: [
-            {
-                internalType: "uint8",
-                name: "",
-                type: "uint8",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0xa3e15d09",
-    },
-    {
-        inputs: [
-            {
-                internalType: "address",
-                name: "_trader",
-                type: "address",
-            },
-            {
-                internalType: "enum ITradingStorage.CounterType",
-                name: "_type",
-                type: "uint8",
-            },
-        ],
-        name: "getCounters",
-        outputs: [
-            {
-                components: [
-                    {
-                        internalType: "uint32",
-                        name: "currentIndex",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint32",
-                        name: "openCount",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint192",
-                        name: "__placeholder",
-                        type: "uint192",
-                    },
-                ],
-                internalType: "struct ITradingStorage.Counter",
+        name: "getCollateralsCount",
+        outputs: [
+            {
+                internalType: "uint8",
                 name: "",
-                type: "tuple",
+                type: "uint8",
             },
         ],
         stateMutability: "view",
         type: "function",
-        signature: "0x0212f0d6",
+        signature: "0xa3e15d09",
     },
     {
         inputs: [
             {
-                internalType: "address[]",
-                name: "_traders",
-                type: "address[]",
+                internalType: "address",
+                name: "_trader",
+                type: "address",
             },
             {
                 internalType: "enum ITradingStorage.CounterType",
@@ -6011,7 +5220,7 @@ const _abi = [
                 type: "uint8",
             },
         ],
-        name: "getCountersForTraders",
+        name: "getCounters",
         outputs: [
             {
                 components: [
@@ -6031,14 +5240,14 @@ const _abi = [
                         type: "uint192",
                     },
                 ],
-                internalType: "struct ITradingStorage.Counter[]",
+                internalType: "struct ITradingStorage.Counter",
                 name: "",
-                type: "tuple[]",
+                type: "tuple",
             },
         ],
         stateMutability: "view",
         type: "function",
-        signature: "0xc1ee6f78",
+        signature: "0x0212f0d6",
     },
     {
         inputs: [],
@@ -6699,20 +5908,6 @@ const _abi = [
         type: "function",
         signature: "0x0e503724",
     },
-    {
-        inputs: [],
-        name: "getTradersCount",
-        outputs: [
-            {
-                internalType: "uint256",
-                name: "",
-                type: "uint256",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0x32080d60",
-    },
     {
         inputs: [
             {
@@ -7544,17 +6739,12 @@ const _abi = [
                 name: "_isPartialIncrease",
                 type: "bool",
             },
-            {
-                internalType: "bool",
-                name: "_isPnlPositive",
-                type: "bool",
-            },
         ],
         name: "updateTradePosition",
         outputs: [],
         stateMutability: "nonpayable",
         type: "function",
-        signature: "0xbb7af8de",
+        signature: "0x72570e24",
     },
     {
         inputs: [
@@ -7995,7 +7185,7 @@ const _abi = [
                 type: "uint16",
             },
             {
-                indexed: true,
+                indexed: false,
                 internalType: "uint32",
                 name: "index",
                 type: "uint32",
@@ -8051,13 +7241,13 @@ const _abi = [
                 type: "address",
             },
             {
-                indexed: false,
+                indexed: true,
                 internalType: "uint256",
                 name: "pairIndex",
                 type: "uint256",
             },
             {
-                indexed: true,
+                indexed: false,
                 internalType: "uint256",
                 name: "index",
                 type: "uint256",
@@ -8065,7 +7255,7 @@ const _abi = [
             {
                 indexed: false,
                 internalType: "uint256",
-                name: "oraclePrice",
+                name: "marketPrice",
                 type: "uint256",
             },
             {
@@ -8141,7 +7331,7 @@ const _abi = [
                 type: "uint256",
             },
             {
-                indexed: true,
+                indexed: false,
                 internalType: "uint256",
                 name: "index",
                 type: "uint256",
@@ -8257,7 +7447,7 @@ const _abi = [
                 type: "uint16",
             },
             {
-                indexed: true,
+                indexed: false,
                 internalType: "uint32",
                 name: "index",
                 type: "uint32",
@@ -8283,7 +7473,7 @@ const _abi = [
                 type: "uint16",
             },
             {
-                indexed: true,
+                indexed: false,
                 internalType: "uint32",
                 name: "index",
                 type: "uint32",
@@ -8333,7 +7523,7 @@ const _abi = [
                 type: "uint16",
             },
             {
-                indexed: true,
+                indexed: false,
                 internalType: "uint32",
                 name: "index",
                 type: "uint32",
@@ -8383,13 +7573,13 @@ const _abi = [
                 type: "address",
             },
             {
-                indexed: false,
+                indexed: true,
                 internalType: "uint256",
                 name: "pairIndex",
                 type: "uint256",
             },
             {
-                indexed: true,
+                indexed: false,
                 internalType: "uint256",
                 name: "index",
                 type: "uint256",
@@ -8403,7 +7593,7 @@ const _abi = [
             {
                 indexed: false,
                 internalType: "uint256",
-                name: "oraclePrice",
+                name: "marketPrice",
                 type: "uint256",
             },
             {
@@ -8458,7 +7648,12 @@ const _abi = [
                     },
                     {
                         internalType: "uint256",
-                        name: "closingFeeCollateral",
+                        name: "vaultFeeCollateral",
+                        type: "uint256",
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "gnsStakingFeeCollateral",
                         type: "uint256",
                     },
                     {
@@ -8490,7 +7685,7 @@ const _abi = [
         ],
         name: "PositionSizeDecreaseExecuted",
         type: "event",
-        signature: "0xd994d286871fe96525f071a7c54e68b1183a4d88ccbf0aef2c527c7374d3d130",
+        signature: "0xe74b50af866d7f8e3577bc959bf73a2690841f0abce22ab0cfb1b1c84122a7d7",
     },
     {
         anonymous: false,
@@ -8532,13 +7727,13 @@ const _abi = [
                 type: "address",
             },
             {
-                indexed: false,
+                indexed: true,
                 internalType: "uint256",
                 name: "pairIndex",
                 type: "uint256",
             },
             {
-                indexed: true,
+                indexed: false,
                 internalType: "uint256",
                 name: "index",
                 type: "uint256",
@@ -8552,7 +7747,7 @@ const _abi = [
             {
                 indexed: false,
                 internalType: "uint256",
-                name: "oraclePrice",
+                name: "marketPrice",
                 type: "uint256",
             },
             {
@@ -8680,7 +7875,7 @@ const _abi = [
                 type: "uint256",
             },
             {
-                indexed: true,
+                indexed: false,
                 internalType: "uint256",
                 name: "index",
                 type: "uint256",
@@ -9364,12 +8559,6 @@ const _abi = [
                 name: "trader",
                 type: "address",
             },
-            {
-                indexed: true,
-                internalType: "uint32",
-                name: "index",
-                type: "uint32",
-            },
             {
                 indexed: true,
                 internalType: "uint8",
@@ -9385,7 +8574,7 @@ const _abi = [
         ],
         name: "BorrowingFeeCharged",
         type: "event",
-        signature: "0xe51bd3297a1287c8baca0874d5647413ea766784f1ae76f8519801bb9f1a14fd",
+        signature: "0x2aac04047becf1d92defe3c1ee644bdd7b50ae634a7e5ebfca84c2be3fc63344",
     },
     {
         anonymous: false,
@@ -9435,9 +8624,9 @@ const _abi = [
                 type: "uint256",
             },
         ],
-        name: "GnsOtcFeeCharged",
+        name: "GnsStakingFeeCharged",
         type: "event",
-        signature: "0x5c36283cfd2f38afd723e604b61c6c61b55515e5cb93e863fbe4df53bf81d4ac",
+        signature: "0x8e4c272f039ef17bb8cb5a5bc5d6f0cebf9c5037dceae9528bb05b0c4f5a7b80",
     },
     {
         anonymous: false,
@@ -9486,24 +8675,6 @@ const _abi = [
                 name: "orderId",
                 type: "tuple",
             },
-            {
-                indexed: true,
-                internalType: "address",
-                name: "user",
-                type: "address",
-            },
-            {
-                indexed: true,
-                internalType: "uint32",
-                name: "index",
-                type: "uint32",
-            },
-            {
-                indexed: true,
-                internalType: "uint32",
-                name: "limitIndex",
-                type: "uint32",
-            },
             {
                 components: [
                     {
@@ -9578,7 +8749,7 @@ const _abi = [
                 type: "tuple",
             },
             {
-                indexed: false,
+                indexed: true,
                 internalType: "address",
                 name: "triggerCaller",
                 type: "address",
@@ -9592,19 +8763,7 @@ const _abi = [
             {
                 indexed: false,
                 internalType: "uint256",
-                name: "oraclePrice",
-                type: "uint256",
-            },
-            {
-                indexed: false,
-                internalType: "uint256",
-                name: "marketPrice",
-                type: "uint256",
-            },
-            {
-                indexed: false,
-                internalType: "uint256",
-                name: "liqPrice",
+                name: "price",
                 type: "uint256",
             },
             {
@@ -9640,7 +8799,7 @@ const _abi = [
         ],
         name: "LimitExecuted",
         type: "event",
-        signature: "0x33b71dccfeb2f3e0f4ed2a9f7c05255d8c5aa57936b542245a5e63c938301597",
+        signature: "0xc10f67c0e22c53149183a414c16a62334103432a2c48b839a057cd9bd5fdeb99",
     },
     {
         anonymous: false,
@@ -9676,7 +8835,7 @@ const _abi = [
                 type: "uint256",
             },
             {
-                indexed: true,
+                indexed: false,
                 internalType: "uint256",
                 name: "index",
                 type: "uint256",
@@ -9713,18 +8872,6 @@ const _abi = [
                 name: "orderId",
                 type: "tuple",
             },
-            {
-                indexed: true,
-                internalType: "address",
-                name: "user",
-                type: "address",
-            },
-            {
-                indexed: true,
-                internalType: "uint32",
-                name: "index",
-                type: "uint32",
-            },
             {
                 components: [
                     {
@@ -9806,21 +8953,9 @@ const _abi = [
             },
             {
                 indexed: false,
-                internalType: "uint256",
-                name: "oraclePrice",
-                type: "uint256",
-            },
-            {
-                indexed: false,
-                internalType: "uint256",
-                name: "marketPrice",
-                type: "uint256",
-            },
-            {
-                indexed: false,
-                internalType: "uint256",
-                name: "liqPrice",
-                type: "uint256",
+                internalType: "uint64",
+                name: "price",
+                type: "uint64",
             },
             {
                 indexed: false,
@@ -9849,7 +8984,7 @@ const _abi = [
         ],
         name: "MarketExecuted",
         type: "event",
-        signature: "0x26d428c63a1c5161a75dbe15e1e65bc7bf932acb203db2a47df55b16a60d35b1",
+        signature: "0xbbd5cfa7b4ec0d44d4155fcaad32af9cf7e65799d6b8b08f233b930de7bcd9a8",
     },
     {
         anonymous: false,
@@ -10371,20 +9506,6 @@ const _abi = [
         type: "function",
         signature: "0xec98ec83",
     },
-    {
-        inputs: [
-            {
-                internalType: "address",
-                name: "_treasury",
-                type: "address",
-            },
-        ],
-        name: "initializeTreasuryAddress",
-        outputs: [],
-        stateMutability: "nonpayable",
-        type: "function",
-        signature: "0x63a21e54",
-    },
     {
         inputs: [
             {
@@ -10501,20 +9622,6 @@ const _abi = [
         type: "function",
         signature: "0x92dd2940",
     },
-    {
-        inputs: [
-            {
-                internalType: "address",
-                name: "_treasury",
-                type: "address",
-            },
-        ],
-        name: "updateTreasuryAddress",
-        outputs: [],
-        stateMutability: "nonpayable",
-        type: "function",
-        signature: "0x841e4561",
-    },
     {
         inputs: [
             {
@@ -10650,6 +9757,16 @@ const _abi = [
             },
             {
                 components: [
+                    {
+                        internalType: "uint256",
+                        name: "positionSizeCollateral",
+                        type: "uint256",
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "gnsPriceCollateral",
+                        type: "uint256",
+                    },
                     {
                         internalType: "int256",
                         name: "profitP",
@@ -10670,6 +9787,26 @@ const _abi = [
                         name: "amountSentToTrader",
                         type: "uint256",
                     },
+                    {
+                        internalType: "uint256",
+                        name: "reward1",
+                        type: "uint256",
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "reward2",
+                        type: "uint256",
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "reward3",
+                        type: "uint256",
+                    },
+                    {
+                        internalType: "uint128",
+                        name: "collateralPrecisionDelta",
+                        type: "uint128",
+                    },
                     {
                         internalType: "uint256",
                         name: "collateralPriceUsd",
@@ -10682,22 +9819,17 @@ const _abi = [
                     },
                     {
                         internalType: "uint256",
-                        name: "collateralLeftInStorage",
+                        name: "closingFeeCollateral",
                         type: "uint256",
                     },
                     {
                         internalType: "uint256",
-                        name: "oraclePrice",
+                        name: "triggerFeeCollateral",
                         type: "uint256",
                     },
-                    {
-                        internalType: "uint32",
-                        name: "limitIndex",
-                        type: "uint32",
-                    },
                     {
                         internalType: "uint256",
-                        name: "priceImpactP",
+                        name: "collateralLeftInStorage",
                         type: "uint256",
                     },
                 ],
@@ -10705,6 +9837,11 @@ const _abi = [
                 name: "v",
                 type: "tuple",
             },
+            {
+                internalType: "uint256",
+                name: "priceImpactP",
+                type: "uint256",
+            },
         ],
         stateMutability: "view",
         type: "function",
@@ -10830,61 +9967,19 @@ const _abi = [
                 type: "uint8",
             },
             {
-                components: [
-                    {
-                        internalType: "int256",
-                        name: "profitP",
-                        type: "int256",
-                    },
-                    {
-                        internalType: "uint256",
-                        name: "executionPrice",
-                        type: "uint256",
-                    },
-                    {
-                        internalType: "uint256",
-                        name: "liqPrice",
-                        type: "uint256",
-                    },
-                    {
-                        internalType: "uint256",
-                        name: "amountSentToTrader",
-                        type: "uint256",
-                    },
-                    {
-                        internalType: "uint256",
-                        name: "collateralPriceUsd",
-                        type: "uint256",
-                    },
-                    {
-                        internalType: "bool",
-                        name: "exactExecution",
-                        type: "bool",
-                    },
-                    {
-                        internalType: "uint256",
-                        name: "collateralLeftInStorage",
-                        type: "uint256",
-                    },
-                    {
-                        internalType: "uint256",
-                        name: "oraclePrice",
-                        type: "uint256",
-                    },
-                    {
-                        internalType: "uint32",
-                        name: "limitIndex",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint256",
-                        name: "priceImpactP",
-                        type: "uint256",
-                    },
-                ],
-                internalType: "struct ITradingCallbacks.Values",
-                name: "v",
-                type: "tuple",
+                internalType: "uint256",
+                name: "priceImpactP",
+                type: "uint256",
+            },
+            {
+                internalType: "uint256",
+                name: "priceAfterImpact",
+                type: "uint256",
+            },
+            {
+                internalType: "bool",
+                name: "exactExecution",
+                type: "bool",
             },
         ],
         stateMutability: "view",