@reyaxyz/common 0.155.2 → 0.155.4

package/README.md

@@ -6,5 +6,5 @@
 
 | Statements                  | Branches                | Functions                 | Lines             |
 | --------------------------- | ----------------------- | ------------------------- | ----------------- |
-| ![Statements](https://img.shields.io/badge/statements-15.24%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-14.03%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-9.09%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-15.84%25-red.svg?style=flat) |
+| ![Statements](https://img.shields.io/badge/statements-15.11%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-14.85%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-9.45%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-15.69%25-red.svg?style=flat) |
 

package/dist/transactions/abis/CoreProxy.json

@@ -5595,6 +5595,56 @@
             "type": "error",
             "name": "NoCounterpartiesInMatchOrder",
             "inputs": []
+        },
+        {
+            "type": "function",
+            "name": "grantAccountPermissionBySig",
+            "inputs": [
+                {
+                    "name": "accountId",
+                    "type": "uint128",
+                    "internalType": "uint128"
+                },
+                {
+                    "name": "permission",
+                    "type": "bytes32",
+                    "internalType": "bytes32"
+                },
+                {
+                    "name": "user",
+                    "type": "address",
+                    "internalType": "address"
+                },
+                {
+                    "name": "sig",
+                    "type": "tuple",
+                    "internalType": "struct EIP712Signature",
+                    "components": [
+                        {
+                            "name": "v",
+                            "type": "uint8",
+                            "internalType": "uint8"
+                        },
+                        {
+                            "name": "r",
+                            "type": "bytes32",
+                            "internalType": "bytes32"
+                        },
+                        {
+                            "name": "s",
+                            "type": "bytes32",
+                            "internalType": "bytes32"
+                        },
+                        {
+                            "name": "deadline",
+                            "type": "uint256",
+                            "internalType": "uint256"
+                        }
+                    ]
+                }
+            ],
+            "outputs": [],
+            "stateMutability": "nonpayable"
         }
     ]
 }

package/dist/transactions/contractAddresses.js

@@ -15,13 +15,13 @@ var addresses = (_a = {},
         _b[ContractType.CORE_PROXY] = '0x20da8f7aa44f858a3a3e3f03ba6ffad039d1eb28',
         _b[ContractType.PASSIVE_POOL_PROXY] = '0x9afc30bed29d636e566fd9d7dd89d51773724be6',
         _b[ContractType.PERIPHERY_PROXY] = '0xa45d0566144956b6012d461ad509dad2bacacaaf',
-        _b[ContractType.CONDITIONAL_ORDERS_PROXY] = '',
+        _b[ContractType.CONDITIONAL_ORDERS_PROXY] = '0x0000000000000000000000000000000000000000',
         _b),
     _a[types_1.ReyaChainId.reyaNetwork] = (_c = {},
         _c[ContractType.CORE_PROXY] = '0xa763b6a5e09378434406c003dae6487fbbdc1a80',
         _c[ContractType.PASSIVE_POOL_PROXY] = '0xb4b77d6180cc14472a9a7bdff01cc2459368d413',
         _c[ContractType.PERIPHERY_PROXY] = '0xcd2869d1eb1bc8991bc55de9e9b779e912faf736',
-        _c[ContractType.CONDITIONAL_ORDERS_PROXY] = '',
+        _c[ContractType.CONDITIONAL_ORDERS_PROXY] = '0x0000000000000000000000000000000000000000',
         _c),
     _a);
 var getAddress = function (chainId, contractName) {

package/dist/transactions/contractAddresses.js.map

@@ -1 +1 @@
-{"version":3,"file":"contractAddresses.js","sourceRoot":"/","sources":["transactions/contractAddresses.ts"],"names":[],"mappings":";;;;AAAA,kCAAgD;AAEhD,IAAY,YAKX;AALD,WAAY,YAAY;IACtB,yCAAyB,CAAA;IACzB,yDAAyC,CAAA;IACzC,mDAAmC,CAAA;IACnC,qEAAqD,CAAA;AACvD,CAAC,EALW,YAAY,4BAAZ,YAAY,QAKvB;AAED,IAAM,SAAS;IACb,GAAC,mBAAW,CAAC,UAAU;QACrB,GAAC,YAAY,CAAC,UAAU,IAAG,4CAA4C;QACvE,GAAC,YAAY,CAAC,kBAAkB,IAC9B,4CAA4C;QAC9C,GAAC,YAAY,CAAC,eAAe,IAC3B,4CAA4C;QAC9C,GAAC,YAAY,CAAC,wBAAwB,IAAG,EAAE;WAC5C;IACD,GAAC,mBAAW,CAAC,WAAW;QACtB,GAAC,YAAY,CAAC,UAAU,IAAG,4CAA4C;QACvE,GAAC,YAAY,CAAC,kBAAkB,IAC9B,4CAA4C;QAC9C,GAAC,YAAY,CAAC,eAAe,IAC3B,4CAA4C;QAC9C,GAAC,YAAY,CAAC,wBAAwB,IAAG,EAAE;WAC5C;OACF,CAAC;AACK,IAAM,UAAU,GAAG,UACxB,OAAe,EACf,YAA0B;IAE1B,IAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAEtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,6CAAsC,UAAU,CAAE,CAAC,CAAC;IACtE,CAAC;IAED,IAAM,gBAAgB,GAAG,SAAS,CAAC,OAAsB,CAAC,CAAC;IAC3D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,kCAA2B,YAAY,cAAW,CAAC,CAAC;IACtE,CAAC;IAED,OAAO,gBAAgB,CAAC,YAAY,CAAC,CAAC;AACxC,CAAC,CAAC;AAhBW,QAAA,UAAU,cAgBrB","sourcesContent":["import { Address, ReyaChainId } from '../types';\n\nexport enum ContractType {\n  CORE_PROXY = 'core_proxy',\n  PASSIVE_POOL_PROXY = 'passive_pool_proxy',\n  PERIPHERY_PROXY = 'periphery_proxy',\n  CONDITIONAL_ORDERS_PROXY = 'conditional_orders_proxy',\n}\n\nconst addresses: Record<ReyaChainId, Record<ContractType, Address>> = {\n  [ReyaChainId.reyaCronos]: {\n    [ContractType.CORE_PROXY]: '0x20da8f7aa44f858a3a3e3f03ba6ffad039d1eb28',\n    [ContractType.PASSIVE_POOL_PROXY]:\n      '0x9afc30bed29d636e566fd9d7dd89d51773724be6',\n    [ContractType.PERIPHERY_PROXY]:\n      '0xa45d0566144956b6012d461ad509dad2bacacaaf',\n    [ContractType.CONDITIONAL_ORDERS_PROXY]: '',\n  },\n  [ReyaChainId.reyaNetwork]: {\n    [ContractType.CORE_PROXY]: '0xa763b6a5e09378434406c003dae6487fbbdc1a80',\n    [ContractType.PASSIVE_POOL_PROXY]:\n      '0xb4b77d6180cc14472a9a7bdff01cc2459368d413',\n    [ContractType.PERIPHERY_PROXY]:\n      '0xcd2869d1eb1bc8991bc55de9e9b779e912faf736',\n    [ContractType.CONDITIONAL_ORDERS_PROXY]: '',\n  },\n};\nexport const getAddress = (\n  chainId: number,\n  contractName: ContractType,\n): Address => {\n  const keyChainId = chainId.toString();\n\n  if (!Object.keys(addresses).includes(keyChainId)) {\n    throw new Error(`Unspecified addresses for chain id ${keyChainId}`);\n  }\n\n  const networkAddresses = addresses[chainId as ReyaChainId];\n  if (!Object.keys(networkAddresses).includes(contractName)) {\n    throw new Error(`Unspecified address for ${contractName} contract`);\n  }\n\n  return networkAddresses[contractName];\n};\n"]}
+{"version":3,"file":"contractAddresses.js","sourceRoot":"/","sources":["transactions/contractAddresses.ts"],"names":[],"mappings":";;;;AAAA,kCAAgD;AAEhD,IAAY,YAKX;AALD,WAAY,YAAY;IACtB,yCAAyB,CAAA;IACzB,yDAAyC,CAAA;IACzC,mDAAmC,CAAA;IACnC,qEAAqD,CAAA;AACvD,CAAC,EALW,YAAY,4BAAZ,YAAY,QAKvB;AAED,IAAM,SAAS;IACb,GAAC,mBAAW,CAAC,UAAU;QACrB,GAAC,YAAY,CAAC,UAAU,IAAG,4CAA4C;QACvE,GAAC,YAAY,CAAC,kBAAkB,IAC9B,4CAA4C;QAC9C,GAAC,YAAY,CAAC,eAAe,IAC3B,4CAA4C;QAC9C,GAAC,YAAY,CAAC,wBAAwB,IACpC,4CAA4C;WAC/C;IACD,GAAC,mBAAW,CAAC,WAAW;QACtB,GAAC,YAAY,CAAC,UAAU,IAAG,4CAA4C;QACvE,GAAC,YAAY,CAAC,kBAAkB,IAC9B,4CAA4C;QAC9C,GAAC,YAAY,CAAC,eAAe,IAC3B,4CAA4C;QAC9C,GAAC,YAAY,CAAC,wBAAwB,IACpC,4CAA4C;WAC/C;OACF,CAAC;AACK,IAAM,UAAU,GAAG,UACxB,OAAe,EACf,YAA0B;IAE1B,IAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAEtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,6CAAsC,UAAU,CAAE,CAAC,CAAC;IACtE,CAAC;IAED,IAAM,gBAAgB,GAAG,SAAS,CAAC,OAAsB,CAAC,CAAC;IAC3D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,kCAA2B,YAAY,cAAW,CAAC,CAAC;IACtE,CAAC;IAED,OAAO,gBAAgB,CAAC,YAAY,CAAC,CAAC;AACxC,CAAC,CAAC;AAhBW,QAAA,UAAU,cAgBrB","sourcesContent":["import { Address, ReyaChainId } from '../types';\n\nexport enum ContractType {\n  CORE_PROXY = 'core_proxy',\n  PASSIVE_POOL_PROXY = 'passive_pool_proxy',\n  PERIPHERY_PROXY = 'periphery_proxy',\n  CONDITIONAL_ORDERS_PROXY = 'conditional_orders_proxy',\n}\n\nconst addresses: Record<ReyaChainId, Record<ContractType, Address>> = {\n  [ReyaChainId.reyaCronos]: {\n    [ContractType.CORE_PROXY]: '0x20da8f7aa44f858a3a3e3f03ba6ffad039d1eb28',\n    [ContractType.PASSIVE_POOL_PROXY]:\n      '0x9afc30bed29d636e566fd9d7dd89d51773724be6',\n    [ContractType.PERIPHERY_PROXY]:\n      '0xa45d0566144956b6012d461ad509dad2bacacaaf',\n    [ContractType.CONDITIONAL_ORDERS_PROXY]:\n      '0x0000000000000000000000000000000000000000',\n  },\n  [ReyaChainId.reyaNetwork]: {\n    [ContractType.CORE_PROXY]: '0xa763b6a5e09378434406c003dae6487fbbdc1a80',\n    [ContractType.PASSIVE_POOL_PROXY]:\n      '0xb4b77d6180cc14472a9a7bdff01cc2459368d413',\n    [ContractType.PERIPHERY_PROXY]:\n      '0xcd2869d1eb1bc8991bc55de9e9b779e912faf736',\n    [ContractType.CONDITIONAL_ORDERS_PROXY]:\n      '0x0000000000000000000000000000000000000000',\n  },\n};\nexport const getAddress = (\n  chainId: number,\n  contractName: ContractType,\n): Address => {\n  const keyChainId = chainId.toString();\n\n  if (!Object.keys(addresses).includes(keyChainId)) {\n    throw new Error(`Unspecified addresses for chain id ${keyChainId}`);\n  }\n\n  const networkAddresses = addresses[chainId as ReyaChainId];\n  if (!Object.keys(networkAddresses).includes(contractName)) {\n    throw new Error(`Unspecified address for ${contractName} contract`);\n  }\n\n  return networkAddresses[contractName];\n};\n"]}

package/dist/transactions/index.js

@@ -14,14 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Socket_VaultWithPayloadAbi = exports.ConditionalOrdersAbi = exports.PeripheryAbi = exports.CoreAbi = void 0;
+exports.Socket_VaultWithPayloadAbi = exports.PeripheryAbi = exports.CoreAbi = void 0;
 __exportStar(require("./action"), exports);
 var CoreProxy_json_1 = require("./abis/CoreProxy.json");
 Object.defineProperty(exports, "CoreAbi", { enumerable: true, get: function () { return CoreProxy_json_1.abi; } });
 var Periphery_json_1 = require("./abis/Periphery.json");
 Object.defineProperty(exports, "PeripheryAbi", { enumerable: true, get: function () { return Periphery_json_1.abi; } });
-var ConditionalOrdersGateway_json_1 = require("./abis/ConditionalOrdersGateway.json");
-Object.defineProperty(exports, "ConditionalOrdersAbi", { enumerable: true, get: function () { return ConditionalOrdersGateway_json_1.abi; } });
 var VaultWithPayload_json_1 = require("./abis/socket/VaultWithPayload.json");
 Object.defineProperty(exports, "Socket_VaultWithPayloadAbi", { enumerable: true, get: function () { return VaultWithPayload_json_1.abi; } });
 __exportStar(require("./contractAddresses"), exports);

package/dist/transactions/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["transactions/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,wDAAuD;AAA9C,yGAAA,GAAG,OAAW;AACvB,wDAA4D;AAAnD,8GAAA,GAAG,OAAgB;AAC5B,sFAAmF;AAA1E,qIAAA,GAAG,OAAwB;AACpC,6EAAwF;AAA/E,mIAAA,GAAG,OAA8B;AAC1C,sDAAoC;AACpC,mDAAiC;AACjC,yCAAuB;AACvB,0CAAwB;AACxB,8CAA4B;AAC5B,2CAAyB;AACzB,uDAAqC;AACrC,gDAA8B","sourcesContent":["export * from './action';\nexport { abi as CoreAbi } from './abis/CoreProxy.json';\nexport { abi as PeripheryAbi } from './abis/Periphery.json';\nexport { abi as ConditionalOrdersAbi } from './abis/ConditionalOrdersGateway.json';\nexport { abi as Socket_VaultWithPayloadAbi } from './abis/socket/VaultWithPayload.json';\nexport * from './contractAddresses';\nexport * from './routerCommands';\nexport * from './sign';\nexport * from './trade';\nexport * from './txHelpers';\nexport * from './consts';\nexport * from './executeTransaction';\nexport * from './permissions';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["transactions/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,wDAAuD;AAA9C,yGAAA,GAAG,OAAW;AACvB,wDAA4D;AAAnD,8GAAA,GAAG,OAAgB;AAC5B,6EAAwF;AAA/E,mIAAA,GAAG,OAA8B;AAC1C,sDAAoC;AACpC,mDAAiC;AACjC,yCAAuB;AACvB,0CAAwB;AACxB,8CAA4B;AAC5B,2CAAyB;AACzB,uDAAqC;AACrC,gDAA8B","sourcesContent":["export * from './action';\nexport { abi as CoreAbi } from './abis/CoreProxy.json';\nexport { abi as PeripheryAbi } from './abis/Periphery.json';\nexport { abi as Socket_VaultWithPayloadAbi } from './abis/socket/VaultWithPayload.json';\nexport * from './contractAddresses';\nexport * from './routerCommands';\nexport * from './sign';\nexport * from './trade';\nexport * from './txHelpers';\nexport * from './consts';\nexport * from './executeTransaction';\nexport * from './permissions';\n"]}

package/dist/transactions/sign.js

@@ -36,10 +36,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.signGrantPermission = exports.signConditionalOrder = exports.signPoolRemoveLiquidity = exports.signCoreCommands = void 0;
+exports.signGrantPermission = exports.signCancelConditionalOrder = exports.isConditionalOrderSignatureValid = exports.signConditionalOrder = exports.signPoolRemoveLiquidity = exports.signCoreCommands = void 0;
 var ethers_1 = require("ethers");
 var contractAddresses_1 = require("./contractAddresses");
 var ethers_2 = require("ethers");
+var types_1 = require("../types");
 function convertEthersSignatureToEIP712Signature(signature, deadline) {
     return {
         v: signature.v,
@@ -130,11 +131,7 @@ value) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    domain = {
-                        name: 'Reya',
-                        version: '1',
-                        verifyingContract: verifyingContract,
-                    };
+                    domain = getReyaDomain(verifyingContract);
                     return [4 /*yield*/, signer.signTypedData(domain, types, value)];
                 case 1:
                     signatureString = _a.sent();
@@ -143,29 +140,46 @@ value) {
         });
     });
 }
+function getReyaDomain(verifyingContract) {
+    return {
+        name: 'Reya',
+        version: '1',
+        verifyingContract: verifyingContract,
+    };
+}
+var conditionalOrderTypes = {
+    ConditionalOrder: [
+        { name: 'verifyingChainId', type: 'uint256' },
+        { name: 'deadline', type: 'uint256' },
+        { name: 'order', type: 'ConditionalOrderDetails' },
+    ],
+    ConditionalOrderDetails: [
+        { name: 'accountId', type: 'uint128' },
+        { name: 'marketId', type: 'uint128' },
+        { name: 'exchangeId', type: 'uint128' },
+        { name: 'counterpartyAccountIds', type: 'uint128[]' },
+        { name: 'orderType', type: 'uint8' },
+        { name: 'inputs', type: 'bytes' },
+        { name: 'signer', type: 'address' },
+        { name: 'nonce', type: 'uint256' },
+    ],
+};
 function signConditionalOrder(signer, reyaChainId, accountId, marketId, exchangeId, counterpartyAccountIds, orderType, inputs, nonce, deadline) {
     return __awaiter(this, void 0, void 0, function () {
         var signature, _a, _b;
-        var _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
                     _a = signReyaTypedData;
                     _b = [signer,
                         (0, contractAddresses_1.getAddress)(reyaChainId, contractAddresses_1.ContractType.CONDITIONAL_ORDERS_PROXY),
-                        {
-                            ConditionalOrderDetails: [
-                                { name: 'accountId', type: 'uint128' },
-                                { name: 'marketId', type: 'uint128' },
-                                { name: 'exchangeId', type: 'uint128' },
-                                { name: 'counterpartyAccountIds', type: 'uint128[]' },
-                                { name: 'orderType', type: 'uint8' },
-                                { name: 'inputs', type: 'bytes' },
-                                { name: 'signer', type: 'address' },
-                                { name: 'nonce', type: 'uint256' },
-                            ],
-                        }];
+                        conditionalOrderTypes];
                     _c = {
+                        verifyingChainId: reyaChainId,
+                        deadline: BigInt(deadline)
+                    };
+                    _d = {
                         accountId: accountId,
                         marketId: marketId,
                         exchangeId: exchangeId,
@@ -174,51 +188,82 @@ function signConditionalOrder(signer, reyaChainId, accountId, marketId, exchange
                         inputs: inputs
                     };
                     return [4 /*yield*/, signer.getAddress()];
-                case 1: return [4 /*yield*/, _a.apply(void 0, _b.concat([(_c.signer = _d.sent(),
-                            _c.nonce = nonce,
+                case 1: return [4 /*yield*/, _a.apply(void 0, _b.concat([(_c.order = (_d.signer = _e.sent(),
+                            _d.nonce = nonce,
+                            _d),
                             _c)]))];
                 case 2:
-                    signature = _d.sent();
-                    return [2 /*return*/, convertEthersSignatureToEIP712Signature(signature, deadline)];
+                    signature = _e.sent();
+                    return [2 /*return*/, signature.serialized];
             }
         });
     });
 }
 exports.signConditionalOrder = signConditionalOrder;
-function signGrantPermission(signer, reyaChainId, accountId, permission, user, nonce, deadline) {
+function isConditionalOrderSignatureValid(signerAddress, signature, reyaChainId, accountId, marketId, exchangeId, counterpartyAccountIds, orderType, inputs, nonce, deadline) {
+    // Encode the data for recovering the address
+    var domain = getReyaDomain((0, contractAddresses_1.getAddress)(reyaChainId, contractAddresses_1.ContractType.CONDITIONAL_ORDERS_PROXY));
+    var value = {
+        verifyingChainId: reyaChainId,
+        deadline: BigInt(deadline),
+        order: {
+            accountId: accountId,
+            marketId: marketId,
+            exchangeId: exchangeId,
+            counterpartyAccountIds: counterpartyAccountIds,
+            orderType: orderType,
+            inputs: inputs,
+            signer: signerAddress,
+            nonce: nonce,
+        },
+    };
+    // Recover the address
+    var recoveredAddress = (0, ethers_1.verifyTypedData)(domain, conditionalOrderTypes, value, signature);
+    return recoveredAddress === signerAddress;
+}
+exports.isConditionalOrderSignatureValid = isConditionalOrderSignatureValid;
+function signCancelConditionalOrder(signer, orderId) {
     return __awaiter(this, void 0, void 0, function () {
-        var signature, _a, _b;
-        var _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var message;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
-                    _a = signReyaTypedData;
-                    _b = [signer,
-                        (0, contractAddresses_1.getAddress)(reyaChainId, contractAddresses_1.ContractType.CORE_PROXY),
-                        {
-                            GrantAccountPermissionBySig: [
-                                { name: 'verifyingChainId', type: 'uint256' },
-                                { name: 'caller', type: 'address' },
-                                { name: 'accountId', type: 'uint128' },
-                                { name: 'permission', type: 'bytes32' },
-                                { name: 'user', type: 'address' },
-                                { name: 'nonce', type: 'uint256' },
-                                { name: 'deadline', type: 'uint256' },
-                            ],
-                        }];
-                    _c = {
-                        verifyingChainId: reyaChainId
+                    message = {
+                        orderId: orderId,
+                        status: types_1.StopLossOrderStatus.CANCELLED,
+                        actionType: 'changeStatus',
                     };
-                    return [4 /*yield*/, signer.getAddress()];
-                case 1: return [4 /*yield*/, _a.apply(void 0, _b.concat([(_c.caller = _d.sent(),
-                            _c.accountId = accountId,
-                            _c.permission = permission,
-                            _c.user = user,
-                            _c.nonce = nonce,
-                            _c.deadline = deadline,
-                            _c)]))];
-                case 2:
-                    signature = _d.sent();
+                    return [4 /*yield*/, signer.signMessage(JSON.stringify(message))];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        });
+    });
+}
+exports.signCancelConditionalOrder = signCancelConditionalOrder;
+function signGrantPermission(signer, reyaChainId, accountId, permission, user, nonce, deadline) {
+    return __awaiter(this, void 0, void 0, function () {
+        var signature;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, signReyaTypedData(signer, (0, contractAddresses_1.getAddress)(reyaChainId, contractAddresses_1.ContractType.CORE_PROXY), {
+                        GrantAccountPermissionBySig: [
+                            { name: 'verifyingChainId', type: 'uint256' },
+                            { name: 'accountId', type: 'uint128' },
+                            { name: 'permission', type: 'bytes32' },
+                            { name: 'user', type: 'address' },
+                            { name: 'nonce', type: 'uint256' },
+                            { name: 'deadline', type: 'uint256' },
+                        ],
+                    }, {
+                        verifyingChainId: reyaChainId,
+                        accountId: accountId,
+                        permission: permission,
+                        user: user,
+                        nonce: nonce,
+                        deadline: deadline,
+                    })];
+                case 1:
+                    signature = _a.sent();
                     return [2 /*return*/, convertEthersSignatureToEIP712Signature(signature, deadline)];
             }
         });

package/dist/transactions/sign.js.map

@@ -1 +1 @@
-{"version":3,"file":"sign.js","sourceRoot":"/","sources":["transactions/sign.ts"],"names":[],"mappings":"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","sourcesContent":["import { JsonRpcSigner, Signature, Signer, TypedDataField } from 'ethers';\nimport { ContractType, getAddress } from './contractAddresses';\nimport { Command } from './action';\nimport { ethers } from 'ethers';\nimport { Address, ReyaChainId } from '../types';\n\nexport type EIP712Signature = {\n  v: number;\n  r: string;\n  s: string;\n  deadline: number;\n};\n\nfunction convertEthersSignatureToEIP712Signature(\n  signature: Signature,\n  deadline: number,\n): EIP712Signature {\n  return {\n    v: signature.v,\n    r: signature.r,\n    s: signature.s,\n    deadline: deadline,\n  };\n}\n\nexport async function signCoreCommands(\n  signer: Signer | JsonRpcSigner,\n  reyaChainId: ReyaChainId,\n  caller: Address,\n  accountId: number,\n  commands: Command[],\n  nonce: number,\n  deadline: number,\n  extraSignatureData: string,\n): Promise<EIP712Signature> {\n  const signature = await signReyaTypedData(\n    signer,\n    getAddress(reyaChainId, ContractType.CORE_PROXY),\n    {\n      ExecuteBySig: [\n        { name: 'verifyingChainId', type: 'uint256' },\n        { name: 'caller', type: 'address' },\n        { name: 'accountId', type: 'uint128' },\n        { name: 'commands', type: 'Command[]' },\n        { name: 'nonce', type: 'uint256' },\n        { name: 'deadline', type: 'uint256' },\n        { name: 'extraSignatureData', type: 'bytes' },\n      ],\n      Command: [\n        { name: 'commandType', type: 'uint8' },\n        { name: 'inputs', type: 'bytes' },\n        { name: 'marketId', type: 'uint128' },\n        { name: 'exchangeId', type: 'uint128' },\n      ],\n    },\n    {\n      verifyingChainId: reyaChainId,\n      caller: caller,\n      accountId: accountId,\n      commands: commands,\n      nonce: nonce,\n      deadline: deadline,\n      extraSignatureData: extraSignatureData,\n    },\n  );\n\n  return convertEthersSignatureToEIP712Signature(signature, deadline);\n}\n\nexport async function signPoolRemoveLiquidity(\n  signer: Signer | JsonRpcSigner,\n  reyaChainId: ReyaChainId,\n  caller: Address,\n  owner: Address,\n  poolId: number,\n  sharesAmount: bigint,\n  minOut: bigint,\n  nonce: number,\n  deadline: number,\n  socketMsgGasLimit: bigint,\n  chainId: number,\n  receiver: string,\n): Promise<EIP712Signature> {\n  const signature = await signReyaTypedData(\n    signer,\n    getAddress(reyaChainId, ContractType.PASSIVE_POOL_PROXY),\n    {\n      RemoveLiquidityBySig: [\n        { name: 'verifyingChainId', type: 'uint256' },\n        { name: 'caller', type: 'address' },\n        { name: 'owner', type: 'address' },\n        { name: 'poolId', type: 'uint128' },\n        { name: 'sharesAmount', type: 'uint256' },\n        { name: 'minOut', type: 'uint256' },\n        { name: 'nonce', type: 'uint256' },\n        { name: 'deadline', type: 'uint256' },\n        { name: 'extraSignatureData', type: 'bytes' },\n      ],\n    },\n    {\n      verifyingChainId: reyaChainId,\n      caller: caller,\n      owner: owner,\n      poolId: poolId,\n      sharesAmount: sharesAmount,\n      minOut: minOut,\n      nonce: nonce,\n      deadline: deadline,\n      extraSignatureData: ethers.AbiCoder.defaultAbiCoder().encode(\n        ['address', 'uint256', 'uint256'],\n        [receiver, chainId, socketMsgGasLimit],\n      ),\n    },\n  );\n\n  return convertEthersSignatureToEIP712Signature(signature, deadline);\n}\n\nasync function signReyaTypedData(\n  signer: Signer | JsonRpcSigner,\n  verifyingContract: string,\n  types: Record<string, Array<TypedDataField>>,\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  value: Record<string, any>,\n): Promise<Signature> {\n  const domain = {\n    name: 'Reya',\n    version: '1',\n    verifyingContract: verifyingContract,\n  };\n\n  const signatureString = await signer.signTypedData(domain, types, value);\n\n  return Signature.from(signatureString);\n}\n\nexport async function signConditionalOrder(\n  signer: Signer | JsonRpcSigner,\n  reyaChainId: ReyaChainId,\n  accountId: number,\n  marketId: number,\n  exchangeId: number,\n  counterpartyAccountIds: number[],\n  orderType: number,\n  inputs: string,\n  nonce: number,\n  deadline: number,\n): Promise<EIP712Signature> {\n  // todo: add deadline to encoded sig\n  const signature = await signReyaTypedData(\n    signer,\n    getAddress(reyaChainId, ContractType.CONDITIONAL_ORDERS_PROXY),\n    {\n      ConditionalOrderDetails: [\n        { name: 'accountId', type: 'uint128' },\n        { name: 'marketId', type: 'uint128' },\n        { name: 'exchangeId', type: 'uint128' },\n        { name: 'counterpartyAccountIds', type: 'uint128[]' },\n        { name: 'orderType', type: 'uint8' },\n        { name: 'inputs', type: 'bytes' },\n        { name: 'signer', type: 'address' },\n        { name: 'nonce', type: 'uint256' },\n      ],\n    },\n    {\n      accountId: accountId,\n      marketId: marketId,\n      exchangeId: exchangeId,\n      counterpartyAccountIds: counterpartyAccountIds,\n      orderType: orderType,\n      inputs: inputs,\n      signer: await signer.getAddress(),\n      nonce: nonce,\n    },\n  );\n\n  return convertEthersSignatureToEIP712Signature(signature, deadline);\n}\n\nexport async function signGrantPermission(\n  signer: Signer | JsonRpcSigner,\n  reyaChainId: ReyaChainId,\n  accountId: number,\n  permission: string,\n  user: string,\n  nonce: number,\n  deadline: number,\n): Promise<EIP712Signature> {\n  const signature = await signReyaTypedData(\n    signer,\n    getAddress(reyaChainId, ContractType.CORE_PROXY),\n    {\n      GrantAccountPermissionBySig: [\n        { name: 'verifyingChainId', type: 'uint256' },\n        { name: 'caller', type: 'address' },\n        { name: 'accountId', type: 'uint128' },\n        { name: 'permission', type: 'bytes32' },\n        { name: 'user', type: 'address' },\n        { name: 'nonce', type: 'uint256' },\n        { name: 'deadline', type: 'uint256' },\n      ],\n    },\n    {\n      verifyingChainId: reyaChainId,\n      caller: await signer.getAddress(),\n      accountId: accountId,\n      permission: permission,\n      user: user,\n      nonce: nonce,\n      deadline: deadline,\n    },\n  );\n\n  return convertEthersSignatureToEIP712Signature(signature, deadline);\n}\n"]}
+{"version":3,"file":"sign.js","sourceRoot":"/","sources":["transactions/sign.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  JsonRpcSigner,\n  Signature,\n  Signer,\n  TypedDataField,\n  verifyTypedData,\n} from 'ethers';\nimport { ContractType, getAddress } from './contractAddresses';\nimport { Command } from './action';\nimport { ethers } from 'ethers';\nimport { Address, ReyaChainId, StopLossOrderStatus } from '../types';\n\nexport type EIP712Signature = {\n  v: number;\n  r: string;\n  s: string;\n  deadline: number;\n};\n\nfunction convertEthersSignatureToEIP712Signature(\n  signature: Signature,\n  deadline: number,\n): EIP712Signature {\n  return {\n    v: signature.v,\n    r: signature.r,\n    s: signature.s,\n    deadline: deadline,\n  };\n}\n\nexport async function signCoreCommands(\n  signer: Signer | JsonRpcSigner,\n  reyaChainId: ReyaChainId,\n  caller: Address,\n  accountId: number,\n  commands: Command[],\n  nonce: number,\n  deadline: number,\n  extraSignatureData: string,\n): Promise<EIP712Signature> {\n  const signature = await signReyaTypedData(\n    signer,\n    getAddress(reyaChainId, ContractType.CORE_PROXY),\n    {\n      ExecuteBySig: [\n        { name: 'verifyingChainId', type: 'uint256' },\n        { name: 'caller', type: 'address' },\n        { name: 'accountId', type: 'uint128' },\n        { name: 'commands', type: 'Command[]' },\n        { name: 'nonce', type: 'uint256' },\n        { name: 'deadline', type: 'uint256' },\n        { name: 'extraSignatureData', type: 'bytes' },\n      ],\n      Command: [\n        { name: 'commandType', type: 'uint8' },\n        { name: 'inputs', type: 'bytes' },\n        { name: 'marketId', type: 'uint128' },\n        { name: 'exchangeId', type: 'uint128' },\n      ],\n    },\n    {\n      verifyingChainId: reyaChainId,\n      caller: caller,\n      accountId: accountId,\n      commands: commands,\n      nonce: nonce,\n      deadline: deadline,\n      extraSignatureData: extraSignatureData,\n    },\n  );\n\n  return convertEthersSignatureToEIP712Signature(signature, deadline);\n}\n\nexport async function signPoolRemoveLiquidity(\n  signer: Signer | JsonRpcSigner,\n  reyaChainId: ReyaChainId,\n  caller: Address,\n  owner: Address,\n  poolId: number,\n  sharesAmount: bigint,\n  minOut: bigint,\n  nonce: number,\n  deadline: number,\n  socketMsgGasLimit: bigint,\n  chainId: number,\n  receiver: string,\n): Promise<EIP712Signature> {\n  const signature = await signReyaTypedData(\n    signer,\n    getAddress(reyaChainId, ContractType.PASSIVE_POOL_PROXY),\n    {\n      RemoveLiquidityBySig: [\n        { name: 'verifyingChainId', type: 'uint256' },\n        { name: 'caller', type: 'address' },\n        { name: 'owner', type: 'address' },\n        { name: 'poolId', type: 'uint128' },\n        { name: 'sharesAmount', type: 'uint256' },\n        { name: 'minOut', type: 'uint256' },\n        { name: 'nonce', type: 'uint256' },\n        { name: 'deadline', type: 'uint256' },\n        { name: 'extraSignatureData', type: 'bytes' },\n      ],\n    },\n    {\n      verifyingChainId: reyaChainId,\n      caller: caller,\n      owner: owner,\n      poolId: poolId,\n      sharesAmount: sharesAmount,\n      minOut: minOut,\n      nonce: nonce,\n      deadline: deadline,\n      extraSignatureData: ethers.AbiCoder.defaultAbiCoder().encode(\n        ['address', 'uint256', 'uint256'],\n        [receiver, chainId, socketMsgGasLimit],\n      ),\n    },\n  );\n\n  return convertEthersSignatureToEIP712Signature(signature, deadline);\n}\n\nasync function signReyaTypedData(\n  signer: Signer | JsonRpcSigner,\n  verifyingContract: string,\n  types: Record<string, Array<TypedDataField>>,\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  value: Record<string, any>,\n): Promise<Signature> {\n  const domain = getReyaDomain(verifyingContract);\n\n  const signatureString = await signer.signTypedData(domain, types, value);\n\n  return Signature.from(signatureString);\n}\n\nfunction getReyaDomain(verifyingContract: string) {\n  return {\n    name: 'Reya',\n    version: '1',\n    verifyingContract: verifyingContract,\n  };\n}\n\nconst conditionalOrderTypes = {\n  ConditionalOrder: [\n    { name: 'verifyingChainId', type: 'uint256' },\n    { name: 'deadline', type: 'uint256' },\n    { name: 'order', type: 'ConditionalOrderDetails' },\n  ],\n  ConditionalOrderDetails: [\n    { name: 'accountId', type: 'uint128' },\n    { name: 'marketId', type: 'uint128' },\n    { name: 'exchangeId', type: 'uint128' },\n    { name: 'counterpartyAccountIds', type: 'uint128[]' },\n    { name: 'orderType', type: 'uint8' },\n    { name: 'inputs', type: 'bytes' },\n    { name: 'signer', type: 'address' },\n    { name: 'nonce', type: 'uint256' },\n  ],\n};\n\nexport async function signConditionalOrder(\n  signer: Signer | JsonRpcSigner,\n  reyaChainId: ReyaChainId,\n  accountId: number,\n  marketId: number,\n  exchangeId: number,\n  counterpartyAccountIds: number[],\n  orderType: number,\n  inputs: string,\n  nonce: bigint,\n  deadline: number,\n): Promise<string> {\n  const signature = await signReyaTypedData(\n    signer,\n    getAddress(reyaChainId, ContractType.CONDITIONAL_ORDERS_PROXY),\n    conditionalOrderTypes,\n    {\n      verifyingChainId: reyaChainId,\n      deadline: BigInt(deadline),\n      order: {\n        accountId: accountId,\n        marketId: marketId,\n        exchangeId: exchangeId,\n        counterpartyAccountIds: counterpartyAccountIds,\n        orderType: orderType,\n        inputs: inputs,\n        signer: await signer.getAddress(),\n        nonce: nonce,\n      },\n    },\n  );\n\n  return signature.serialized;\n}\n\nexport function isConditionalOrderSignatureValid(\n  signerAddress: string,\n  signature: string,\n  reyaChainId: ReyaChainId,\n  accountId: number,\n  marketId: number,\n  exchangeId: number,\n  counterpartyAccountIds: number[],\n  orderType: number,\n  inputs: string,\n  nonce: bigint,\n  deadline: number,\n): boolean {\n  // Encode the data for recovering the address\n  const domain = getReyaDomain(\n    getAddress(reyaChainId, ContractType.CONDITIONAL_ORDERS_PROXY),\n  );\n  const value = {\n    verifyingChainId: reyaChainId,\n    deadline: BigInt(deadline),\n    order: {\n      accountId: accountId,\n      marketId: marketId,\n      exchangeId: exchangeId,\n      counterpartyAccountIds: counterpartyAccountIds,\n      orderType: orderType,\n      inputs: inputs,\n      signer: signerAddress,\n      nonce: nonce,\n    },\n  };\n\n  // Recover the address\n  const recoveredAddress = verifyTypedData(\n    domain,\n    conditionalOrderTypes,\n    value,\n    signature,\n  );\n\n  return recoveredAddress === signerAddress;\n}\n\nexport async function signCancelConditionalOrder(\n  signer: Signer | JsonRpcSigner,\n  orderId: string,\n): Promise<string> {\n  const message = {\n    orderId: orderId,\n    status: StopLossOrderStatus.CANCELLED,\n    actionType: 'changeStatus',\n  };\n  return await signer.signMessage(JSON.stringify(message));\n}\n\nexport async function signGrantPermission(\n  signer: Signer | JsonRpcSigner,\n  reyaChainId: ReyaChainId,\n  accountId: number,\n  permission: string,\n  user: string,\n  nonce: number,\n  deadline: number,\n): Promise<EIP712Signature> {\n  const signature = await signReyaTypedData(\n    signer,\n    getAddress(reyaChainId, ContractType.CORE_PROXY),\n    {\n      GrantAccountPermissionBySig: [\n        { name: 'verifyingChainId', type: 'uint256' },\n        { name: 'accountId', type: 'uint128' },\n        { name: 'permission', type: 'bytes32' },\n        { name: 'user', type: 'address' },\n        { name: 'nonce', type: 'uint256' },\n        { name: 'deadline', type: 'uint256' },\n      ],\n    },\n    {\n      verifyingChainId: reyaChainId,\n      accountId: accountId,\n      permission: permission,\n      user: user,\n      nonce: nonce,\n      deadline: deadline,\n    },\n  );\n\n  return convertEthersSignatureToEIP712Signature(signature, deadline);\n}\n"]}

package/dist/transactions/trade.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculatePriceLimitForTrade = void 0;
+exports.calculateMaxPriceLimit = exports.calculatePriceLimitForTrade = void 0;
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
+var ethers_1 = require("ethers");
 // todo: need the ability to supply custom slippage or use a more conservative default for the slippage tolerance
 function calculatePriceLimitForTrade(orderPrice, amount) {
     // Ensure orderPrice is BigInt
@@ -21,4 +22,14 @@ function calculatePriceLimitForTrade(orderPrice, amount) {
     }
 }
 exports.calculatePriceLimitForTrade = calculatePriceLimitForTrade;
+function calculateMaxPriceLimit(isLong) {
+    // Determine if the amount is positive or negative and adjust the price accordingly
+    if (isLong) {
+        return ethers_1.MaxUint256;
+    }
+    else {
+        return BigInt(0);
+    }
+}
+exports.calculateMaxPriceLimit = calculateMaxPriceLimit;
 //# sourceMappingURL=trade.js.map

package/dist/transactions/trade.js.map

@@ -1 +1 @@
-{"version":3,"file":"trade.js","sourceRoot":"/","sources":["transactions/trade.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAqC;AAErC,iHAAiH;AACjH,SAAgB,2BAA2B,CACzC,UAAkB,EAClB,MAAc;IAEd,8BAA8B;IAC9B,IAAM,gBAAgB,GAAG,IAAA,sBAAS,EAAC,UAAU,CAAC,CAAC;IAE/C,kCAAkC;IAClC,IAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEzC,mFAAmF;IACnF,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;QACf,wBAAwB;QACxB,OAAO,MAAM,CACX,IAAA,sBAAS,EAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAChE,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CACX,IAAA,sBAAS,EAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CACjE,CAAC;IACJ,CAAC;AACH,CAAC;AArBD,kEAqBC","sourcesContent":["import BigNumber from 'bignumber.js';\n\n// todo: need the ability to supply custom slippage or use a more conservative default for the slippage tolerance\nexport function calculatePriceLimitForTrade(\n  orderPrice: number,\n  amount: number,\n): bigint {\n  // Ensure orderPrice is BigInt\n  const orderPriceBigInt = BigNumber(orderPrice);\n\n  // Calculate 1% of the order price\n  const offset = orderPriceBigInt.div(100);\n\n  // Determine if the amount is positive or negative and adjust the price accordingly\n  if (amount > 0) {\n    // Trade is long, so add\n    return BigInt(\n      BigNumber(orderPriceBigInt).plus(offset).times(1e18).toFixed(0),\n    );\n  } else {\n    return BigInt(\n      BigNumber(orderPriceBigInt).minus(offset).times(1e18).toFixed(0),\n    );\n  }\n}\n"]}
+{"version":3,"file":"trade.js","sourceRoot":"/","sources":["transactions/trade.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAqC;AACrC,iCAAoC;AAEpC,iHAAiH;AACjH,SAAgB,2BAA2B,CACzC,UAAkB,EAClB,MAAc;IAEd,8BAA8B;IAC9B,IAAM,gBAAgB,GAAG,IAAA,sBAAS,EAAC,UAAU,CAAC,CAAC;IAE/C,kCAAkC;IAClC,IAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEzC,mFAAmF;IACnF,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;QACf,wBAAwB;QACxB,OAAO,MAAM,CACX,IAAA,sBAAS,EAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAChE,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CACX,IAAA,sBAAS,EAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CACjE,CAAC;IACJ,CAAC;AACH,CAAC;AArBD,kEAqBC;AAED,SAAgB,sBAAsB,CAAC,MAAe;IACpD,mFAAmF;IACnF,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,mBAAU,CAAC;IACpB,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;AACH,CAAC;AAPD,wDAOC","sourcesContent":["import BigNumber from 'bignumber.js';\nimport { MaxUint256 } from 'ethers';\n\n// todo: need the ability to supply custom slippage or use a more conservative default for the slippage tolerance\nexport function calculatePriceLimitForTrade(\n  orderPrice: number,\n  amount: number,\n): bigint {\n  // Ensure orderPrice is BigInt\n  const orderPriceBigInt = BigNumber(orderPrice);\n\n  // Calculate 1% of the order price\n  const offset = orderPriceBigInt.div(100);\n\n  // Determine if the amount is positive or negative and adjust the price accordingly\n  if (amount > 0) {\n    // Trade is long, so add\n    return BigInt(\n      BigNumber(orderPriceBigInt).plus(offset).times(1e18).toFixed(0),\n    );\n  } else {\n    return BigInt(\n      BigNumber(orderPriceBigInt).minus(offset).times(1e18).toFixed(0),\n    );\n  }\n}\n\nexport function calculateMaxPriceLimit(isLong: boolean): bigint {\n  // Determine if the amount is positive or negative and adjust the price accordingly\n  if (isLong) {\n    return MaxUint256;\n  } else {\n    return BigInt(0);\n  }\n}\n"]}

package/dist/types/transactions/contractAddresses.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contractAddresses.d.ts","sourceRoot":"/","sources":["transactions/contractAddresses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAe,MAAM,UAAU,CAAC;AAEhD,oBAAY,YAAY;IACtB,UAAU,eAAe;IACzB,kBAAkB,uBAAuB;IACzC,eAAe,oBAAoB;IACnC,wBAAwB,6BAA6B;CACtD;AAoBD,eAAO,MAAM,UAAU,YACZ,MAAM,gBACD,YAAY,KACzB,OAaF,CAAC"}
+{"version":3,"file":"contractAddresses.d.ts","sourceRoot":"/","sources":["transactions/contractAddresses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAe,MAAM,UAAU,CAAC;AAEhD,oBAAY,YAAY;IACtB,UAAU,eAAe;IACzB,kBAAkB,uBAAuB;IACzC,eAAe,oBAAoB;IACnC,wBAAwB,6BAA6B;CACtD;AAsBD,eAAO,MAAM,UAAU,YACZ,MAAM,gBACD,YAAY,KACzB,OAaF,CAAC"}

package/dist/types/transactions/index.d.ts

@@ -1,7 +1,6 @@
 export * from './action';
 export { abi as CoreAbi } from './abis/CoreProxy.json';
 export { abi as PeripheryAbi } from './abis/Periphery.json';
-export { abi as ConditionalOrdersAbi } from './abis/ConditionalOrdersGateway.json';
 export { abi as Socket_VaultWithPayloadAbi } from './abis/socket/VaultWithPayload.json';
 export * from './contractAddresses';
 export * from './routerCommands';

package/dist/types/transactions/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["transactions/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,GAAG,IAAI,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,GAAG,IAAI,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,GAAG,IAAI,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACnF,OAAO,EAAE,GAAG,IAAI,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACxF,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["transactions/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,GAAG,IAAI,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,GAAG,IAAI,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,GAAG,IAAI,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACxF,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC"}

package/dist/types/transactions/sign.d.ts

@@ -9,6 +9,8 @@ export type EIP712Signature = {
 };
 export declare function signCoreCommands(signer: Signer | JsonRpcSigner, reyaChainId: ReyaChainId, caller: Address, accountId: number, commands: Command[], nonce: number, deadline: number, extraSignatureData: string): Promise<EIP712Signature>;
 export declare function signPoolRemoveLiquidity(signer: Signer | JsonRpcSigner, reyaChainId: ReyaChainId, caller: Address, owner: Address, poolId: number, sharesAmount: bigint, minOut: bigint, nonce: number, deadline: number, socketMsgGasLimit: bigint, chainId: number, receiver: string): Promise<EIP712Signature>;
-export declare function signConditionalOrder(signer: Signer | JsonRpcSigner, reyaChainId: ReyaChainId, accountId: number, marketId: number, exchangeId: number, counterpartyAccountIds: number[], orderType: number, inputs: string, nonce: number, deadline: number): Promise<EIP712Signature>;
+export declare function signConditionalOrder(signer: Signer | JsonRpcSigner, reyaChainId: ReyaChainId, accountId: number, marketId: number, exchangeId: number, counterpartyAccountIds: number[], orderType: number, inputs: string, nonce: bigint, deadline: number): Promise<string>;
+export declare function isConditionalOrderSignatureValid(signerAddress: string, signature: string, reyaChainId: ReyaChainId, accountId: number, marketId: number, exchangeId: number, counterpartyAccountIds: number[], orderType: number, inputs: string, nonce: bigint, deadline: number): boolean;
+export declare function signCancelConditionalOrder(signer: Signer | JsonRpcSigner, orderId: string): Promise<string>;
 export declare function signGrantPermission(signer: Signer | JsonRpcSigner, reyaChainId: ReyaChainId, accountId: number, permission: string, user: string, nonce: number, deadline: number): Promise<EIP712Signature>;
 //# sourceMappingURL=sign.d.ts.map

package/dist/types/transactions/sign.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sign.d.ts","sourceRoot":"/","sources":["transactions/sign.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAa,MAAM,EAAkB,MAAM,QAAQ,CAAC;AAE1E,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG;IAC5B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAcF,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,eAAe,CAAC,CAiC1B;AAED,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,MAAM,EACzB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC,CAkC1B;AAoBD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,sBAAsB,EAAE,MAAM,EAAE,EAChC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC,CA8B1B;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC,CA2B1B"}
+{"version":3,"file":"sign.d.ts","sourceRoot":"/","sources":["transactions/sign.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,MAAM,EAGP,MAAM,QAAQ,CAAC;AAEhB,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAuB,MAAM,UAAU,CAAC;AAErE,MAAM,MAAM,eAAe,GAAG;IAC5B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAcF,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,eAAe,CAAC,CAiC1B;AAED,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,MAAM,EACzB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC,CAkC1B;AA0CD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,sBAAsB,EAAE,MAAM,EAAE,EAChC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAsBjB;AAED,wBAAgB,gCAAgC,CAC9C,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,sBAAsB,EAAE,MAAM,EAAE,EAChC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CA6BT;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC,CAyB1B"}

package/dist/types/transactions/trade.d.ts

@@ -1,2 +1,3 @@
 export declare function calculatePriceLimitForTrade(orderPrice: number, amount: number): bigint;
+export declare function calculateMaxPriceLimit(isLong: boolean): bigint;
 //# sourceMappingURL=trade.d.ts.map

package/dist/types/transactions/trade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trade.d.ts","sourceRoot":"/","sources":["transactions/trade.ts"],"names":[],"mappings":"AAGA,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,MAAM,CAkBR"}
+{"version":3,"file":"trade.d.ts","sourceRoot":"/","sources":["transactions/trade.ts"],"names":[],"mappings":"AAIA,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,MAAM,CAkBR;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAO9D"}

package/dist/types/types.d.ts

@@ -94,13 +94,19 @@ export type MarginAccountEntity = {
     collaterals: CollateralEntity[];
     positions: PositionEntity[];
 };
+export type ConditionalOrdersInfo = {
+    stopLoss?: {
+        stopLossPrice: number;
+        orderId: string;
+    };
+};
 export type PositionEntity = {
     id: number;
     side: Side;
     size: number;
     base: number;
     price: number;
-    stopLossPrice?: number;
+    conditionalOrdersInfo?: ConditionalOrdersInfo;
     markPrice: number;
     orderStatus: Status;
     realisedPnl: number;
@@ -711,23 +717,27 @@ type ReadyWithdrawalStatus = {
 export type PendingWithdrawal = {
     tokenAmount: number;
 } & (PendingWithdrawalStatus | ReadyWithdrawalStatus);
+export declare enum ConditionalOrderType {
+    STOP_LOSS = 0
+}
 export declare enum StopLossOrderStatus {
-    NEW = "new",
+    PENDING = "pending",
     FILLED = "filled",
     CANCELLED = "cancelled",
     REJECTED = "rejected"
 }
 export type StopLossOrder = {
-    orderId: number;
+    orderId: string;
     accountId: number;
     marketId: number;
     isLong: boolean;
     stopPrice: number;
     signerWallet: string;
-    nonce: number;
+    nonce: string;
     signature: string;
     status: StopLossOrderStatus;
-    timestampMs: number;
+    creationTimestampMs: number;
+    lastUpdateTimestampMs: number;
 };
 export {};
 //# sourceMappingURL=types.d.ts.map