@reyaxyz/sdk 0.2.0 → 0.2.1

package/dist/index.js

@@ -14,5 +14,8 @@ 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 });
-__exportStar(require("./utils/action"), exports);
+__exportStar(require("./services/lp"), exports);
+__exportStar(require("./services/margin-accounts"), exports);
+__exportStar(require("./services/orders"), exports);
+__exportStar(require("./services/token"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B","sourcesContent":["export * from './utils/action';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,6DAA2C;AAC3C,oDAAkC;AAClC,mDAAiC","sourcesContent":["export * from './services/lp';\nexport * from './services/margin-accounts';\nexport * from './services/orders';\nexport * from './services/token';\n"]}

package/dist/services/executeTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"executeTransaction.js","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAkD;AAClD,gEAAwD;AACxD,0CAAkD;AASlD,SAAsB,WAAW,CAC/B,MAAc,EACd,IAAY,EACZ,KAAa,EACb,OAAe,EACf,eAAgC;;;;;wBAET,qBAAM,MAAM,CAAC,UAAU,EAAE,EAAA;;oBAA1C,cAAc,GAAG,SAAyB;oBAC1C,eAAe,GACnB,eAAe,KAAK,wBAAe,CAAC,EAAE;wBACpC,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,oBAAoB,CAAC;wBAC3C,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;oBAClC,EAAE,cACN,IAAI,EAAE,cAAc,EACpB,EAAE,EAAE,eAAe,EACnB,IAAI,MAAA,IACD,CAAC,KAAK,IAAI,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACpD,CAAC;;;;oBAKoB,qBAAM,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,EAAA;;oBAA1C,WAAW,GAAG,SAA4B;oBAChD,QAAQ,GAAG,IAAA,wBAAY,EAAC,WAAW,CAAC,CAAC;;;;oBAErC,OAAO,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,OAAe,CAAC,CAAC;wBAEnC,4CAAY,EAAE,KAAE,QAAQ,UAAA,KAAG;;;;CAC5B;AA7BD,kCA6BC;AAED,SAAsB,kBAAkB,CACtC,MAAc,EACd,IAAY,EACZ,KAAa,EACb,OAAe,EACf,eAAgC;;;;;wBAEjB,qBAAM,WAAW,CAC9B,MAAM,EACN,IAAI,EACJ,KAAK,EACL,OAAO,EACP,eAAe,CAChB,EAAA;;oBANK,MAAM,GAAG,SAMd;;;;oBAEoB,qBAAM,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,EAAA;;oBAAjD,UAAU,GAAG,SAAoC;oBACrC,qBAAM,UAAU,CAAC,IAAI,EAAE,EAAA;;oBAAnC,SAAS,GAAG,SAAuB;oBACzC,sBAAO,SAAS,EAAC;;;oBAEjB,OAAO,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;;;;;CAElD;AAtBD,gDAsBC","sourcesContent":["import { Signer } from 'ethers';\nimport { getGasBuffer } from '../utils/txHelpers';\nimport { getAddress } from '../utils/contractAddresses';\nimport { TransactionType } from '../utils/consts';\n\nexport type Transaction = {\n  from: string;\n  to: string;\n  data: string;\n  value?: string;\n};\n\nexport async function estimateGas(\n  signer: Signer,\n  data: string,\n  value: string,\n  chainId: number,\n  transactionType: TransactionType,\n): Promise<Transaction & { gasLimit: bigint }> {\n  const accountAddress = await signer.getAddress();\n  const contractAddress =\n    transactionType === TransactionType.LP\n      ? getAddress(chainId, 'passive_pool_proxy')\n      : getAddress(chainId, 'core_proxy');\n  const tx = {\n    from: accountAddress,\n    to: contractAddress,\n    data,\n    ...(value && value !== '0' ? { value: value } : {}),\n  };\n\n  let gasLimit: bigint;\n\n  try {\n    const gasEstimate = await signer.estimateGas(tx);\n    gasLimit = getGasBuffer(gasEstimate);\n  } catch (error) {\n    console.warn(error);\n    throw new Error(error as string);\n  }\n  return { ...tx, gasLimit };\n}\n\nexport async function executeTransaction(\n  signer: Signer,\n  data: string,\n  value: string,\n  chainId: number,\n  transactionType: TransactionType,\n) {\n  const txData = await estimateGas(\n    signer,\n    data,\n    value,\n    chainId,\n    transactionType,\n  );\n  try {\n    const txResponse = await signer.sendTransaction(txData);\n    const txReceipt = await txResponse.wait(); // @todo Check what was reasoning behind this since this function waits until transaction is minted\n    return txReceipt;\n  } catch (error) {\n    console.warn(error);\n    throw new Error('Transaction Execution Error');\n  }\n}\n"]}
+{"version":3,"file":"executeTransaction.js","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAkD;AAClD,gEAAwD;AACxD,0CAAkD;AASlD,SAAsB,WAAW,CAC/B,MAA8B,EAC9B,IAAY,EACZ,KAAa,EACb,OAAe,EACf,eAAgC;;;;;wBAET,qBAAM,MAAM,CAAC,UAAU,EAAE,EAAA;;oBAA1C,cAAc,GAAG,SAAyB;oBAC1C,eAAe,GACnB,eAAe,KAAK,wBAAe,CAAC,EAAE;wBACpC,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,oBAAoB,CAAC;wBAC3C,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;oBAClC,EAAE,cACN,IAAI,EAAE,cAAc,EACpB,EAAE,EAAE,eAAe,EACnB,IAAI,MAAA,IACD,CAAC,KAAK,IAAI,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACpD,CAAC;;;;oBAKoB,qBAAM,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,EAAA;;oBAA1C,WAAW,GAAG,SAA4B;oBAChD,QAAQ,GAAG,IAAA,wBAAY,EAAC,WAAW,CAAC,CAAC;;;;oBAErC,OAAO,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,OAAe,CAAC,CAAC;wBAEnC,4CAAY,EAAE,KAAE,QAAQ,UAAA,KAAG;;;;CAC5B;AA7BD,kCA6BC;AAED,SAAsB,kBAAkB,CACtC,MAA8B,EAC9B,IAAY,EACZ,KAAa,EACb,OAAe,EACf,eAAgC;;;;;wBAEjB,qBAAM,WAAW,CAC9B,MAAM,EACN,IAAI,EACJ,KAAK,EACL,OAAO,EACP,eAAe,CAChB,EAAA;;oBANK,MAAM,GAAG,SAMd;;;;oBAEoB,qBAAM,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,EAAA;;oBAAjD,UAAU,GAAG,SAAoC;oBACrC,qBAAM,UAAU,CAAC,IAAI,EAAE,EAAA;;oBAAnC,SAAS,GAAG,SAAuB;oBACzC,sBAAO,SAAS,EAAC;;;oBAEjB,OAAO,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;;;;;CAElD;AAtBD,gDAsBC","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { getGasBuffer } from '../utils/txHelpers';\nimport { getAddress } from '../utils/contractAddresses';\nimport { TransactionType } from '../utils/consts';\n\nexport type Transaction = {\n  from: string;\n  to: string;\n  data: string;\n  value?: string;\n};\n\nexport async function estimateGas(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  transactionType: TransactionType,\n): Promise<Transaction & { gasLimit: bigint }> {\n  const accountAddress = await signer.getAddress();\n  const contractAddress =\n    transactionType === TransactionType.LP\n      ? getAddress(chainId, 'passive_pool_proxy')\n      : getAddress(chainId, 'core_proxy');\n  const tx = {\n    from: accountAddress,\n    to: contractAddress,\n    data,\n    ...(value && value !== '0' ? { value: value } : {}),\n  };\n\n  let gasLimit: bigint;\n\n  try {\n    const gasEstimate = await signer.estimateGas(tx);\n    gasLimit = getGasBuffer(gasEstimate);\n  } catch (error) {\n    console.warn(error);\n    throw new Error(error as string);\n  }\n  return { ...tx, gasLimit };\n}\n\nexport async function executeTransaction(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  transactionType: TransactionType,\n) {\n  const txData = await estimateGas(\n    signer,\n    data,\n    value,\n    chainId,\n    transactionType,\n  );\n  try {\n    const txResponse = await signer.sendTransaction(txData);\n    const txReceipt = await txResponse.wait(); // @todo Check what was reasoning behind this since this function waits until transaction is minted\n    return txReceipt;\n  } catch (error) {\n    console.warn(error);\n    throw new Error('Transaction Execution Error');\n  }\n}\n"]}

package/dist/services/lp/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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 });
+__exportStar(require("./types"), exports);
+__exportStar(require("./lp"), exports);
+//# sourceMappingURL=index.js.map

package/dist/services/lp/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/lp/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,uCAAqB","sourcesContent":["export * from './types';\nexport * from './lp';\n"]}

package/dist/services/lp/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Signer } from 'ethers';\n\nexport type ProvideLiquidityArgs = {\n  signer: Signer;\n  chainId: number;\n  poolId: number;\n  owner: string;\n  amount: number;\n  minShares: number;\n};\n\nexport type RemoveLiquidityArgs = {\n  signer: Signer;\n  chainId: number;\n  poolId: number;\n  sharesAmount: number;\n  minOut: number;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\n\nexport type ProvideLiquidityArgs = {\n  signer: Signer | JsonRpcSigner;\n  chainId: number;\n  poolId: number;\n  owner: string;\n  amount: number;\n  minShares: number;\n};\n\nexport type RemoveLiquidityArgs = {\n  signer: Signer | JsonRpcSigner;\n  chainId: number;\n  poolId: number;\n  sharesAmount: number;\n  minOut: number;\n};\n"]}

package/dist/services/margin-accounts/index.js

@@ -0,0 +1,21 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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 });
+__exportStar(require("./types"), exports);
+__exportStar(require("./account"), exports);
+__exportStar(require("./deposit"), exports);
+__exportStar(require("./withdraw"), exports);
+//# sourceMappingURL=index.js.map

package/dist/services/margin-accounts/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,4CAA0B;AAC1B,6CAA2B","sourcesContent":["export * from './types';\nexport * from './account';\nexport * from './deposit';\nexport * from './withdraw';\n"]}

package/dist/services/margin-accounts/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Signer } from 'ethers';\n\nexport type CreateAccountArgs = {\n  signer: Signer;\n  chainId: number;\n  ownerAddress: string;\n};\n\nexport type DepositArgs = {\n  signer: Signer;\n  chainId: number;\n  accountId: number;\n  token: string;\n  amount: bigint;\n  marketId: number;\n  exchangeId: number;\n};\n\nexport type WithdrawArgs = {\n  signer: Signer;\n  chainId: number;\n  accountId: number;\n  token: string;\n  amount: bigint;\n  marketId: number;\n  exchangeId: number;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\n\nexport type CreateAccountArgs = {\n  signer: Signer | JsonRpcSigner;\n  chainId: number;\n  ownerAddress: string;\n};\n\nexport type DepositArgs = {\n  signer: Signer | JsonRpcSigner;\n  chainId: number;\n  accountId: number;\n  token: string;\n  amount: bigint;\n  marketId: number;\n  exchangeId: number;\n};\n\nexport type WithdrawArgs = {\n  signer: Signer | JsonRpcSigner;\n  chainId: number;\n  accountId: number;\n  token: string;\n  amount: bigint;\n  marketId: number;\n  exchangeId: number;\n};\n"]}

package/dist/services/orders/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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 });
+__exportStar(require("./types"), exports);
+__exportStar(require("./order"), exports);
+//# sourceMappingURL=index.js.map

package/dist/services/orders/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/orders/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,0CAAwB","sourcesContent":["export * from './types';\nexport * from './order';\n"]}

package/dist/services/orders/order.js

@@ -40,16 +40,25 @@ exports.matchOrder = void 0;
 var encode_1 = require("./encode");
 var executeTransaction_1 = require("../executeTransaction");
 var consts_1 = require("../../utils/consts");
+var trade_1 = require("../../utils/trade");
 var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, data, value, result;
+    var orderPriceLimit, orderBase, _a, data, value, chainId, result;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                _a = (0, encode_1.encodeMatchOrder)(params.accountId, params.orderBase, params.orderPriceLimit, params.counterpartyAccountIds, params.marketId, params.exchangeId), data = _a.calldata, value = _a.value;
-                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, params.chainId, consts_1.TransactionType.TRADE)];
+                if (params.orderSize === BigInt(0)) {
+                    throw new Error('Position size can not be 0');
+                }
+                orderPriceLimit = (0, trade_1.calculatePriceLimitForTrade)(params.market.currentPrice, params.orderSize);
+                orderBase = (0, trade_1.calculateOrderBaseFromOrderSize)(params.orderSize, params.market.currentPrice);
+                _a = (0, encode_1.encodeMatchOrder)(params.marginAccountId, orderBase, orderPriceLimit, params.market.counterpartyAccountIds, params.market.id, params.market.exchangeId), data = _a.calldata, value = _a.value;
+                chainId = 80001;
+                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, consts_1.TransactionType.TRADE)];
             case 1:
                 result = _b.sent();
-                return [2 /*return*/, result];
+                return [2 /*return*/, {
+                        transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
+                    }];
         }
     });
 }); };

package/dist/services/orders/order.js.map

@@ -1 +1 @@
-{"version":3,"file":"order.js","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAA4C;AAC5C,4DAA2D;AAC3D,6CAAqD;AAE9C,IAAM,UAAU,GAAG,UAAO,MAAsB;;;;;gBAE/C,KAA4B,IAAA,yBAAgB,EAChD,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,sBAAsB,EAC7B,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,UAAU,CAClB,EAPiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAO3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,MAAM,CAAC,OAAO,EACd,wBAAe,CAAC,KAAK,CACtB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO,MAAM,EAAC;;;KACf,CAAC;AApBW,QAAA,UAAU,cAoBrB","sourcesContent":["import { MatchOrderArgs } from './types';\nimport { encodeMatchOrder } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { TransactionType } from '../../utils/consts';\n\nexport const matchOrder = async (params: MatchOrderArgs): Promise<unknown> => {\n  // @todo update type once we agree on the structure\n  const { calldata: data, value } = encodeMatchOrder(\n    params.accountId,\n    params.orderBase,\n    params.orderPriceLimit,\n    params.counterpartyAccountIds,\n    params.marketId,\n    params.exchangeId,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    params.chainId,\n    TransactionType.TRADE,\n  );\n\n  return result;\n};\n"]}
+{"version":3,"file":"order.js","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAA4C;AAC5C,4DAA2D;AAC3D,6CAAqD;AACrD,2CAG2B;AAEpB,IAAM,UAAU,GAAG,UACxB,MAAsB;;;;;gBAEtB,IAAI,MAAM,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;oBACnC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAChD,CAAC;gBACK,eAAe,GAAG,IAAA,mCAA2B,EACjD,MAAM,CAAC,MAAM,CAAC,YAAY,EAC1B,MAAM,CAAC,SAAS,CACjB,CAAC;gBAEI,SAAS,GAAG,IAAA,uCAA+B,EAC/C,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,MAAM,CAAC,YAAY,CAC3B,CAAC;gBAEI,KAA4B,IAAA,yBAAgB,EAChD,MAAM,CAAC,eAAe,EACtB,SAAS,EACT,eAAe,EACf,MAAM,CAAC,MAAM,CAAC,sBAAsB,EACpC,MAAM,CAAC,MAAM,CAAC,EAAE,EAChB,MAAM,CAAC,MAAM,CAAC,UAAU,CACzB,EAPiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAO3B;gBAGI,OAAO,GAAG,KAAK,CAAC;gBACP,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,wBAAe,CAAC,KAAK,CACtB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAtCW,QAAA,UAAU,cAsCrB","sourcesContent":["import { MatchOrderArgs, MatchOrderResult } from './types';\nimport { encodeMatchOrder } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { TransactionType } from '../../utils/consts';\nimport {\n  calculateOrderBaseFromOrderSize,\n  calculatePriceLimitForTrade,\n} from '../../utils/trade';\n\nexport const matchOrder = async (\n  params: MatchOrderArgs,\n): Promise<MatchOrderResult> => {\n  if (params.orderSize === BigInt(0)) {\n    throw new Error('Position size can not be 0');\n  }\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    params.orderSize,\n  );\n\n  const orderBase = calculateOrderBaseFromOrderSize(\n    params.orderSize,\n    params.market.currentPrice,\n  );\n\n  const { calldata: data, value } = encodeMatchOrder(\n    params.marginAccountId,\n    orderBase,\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.exchangeId,\n  );\n\n  // @todo update it\n  const chainId = 80001;\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    TransactionType.TRADE,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/orders/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Signer } from 'ethers';\n\nexport type MatchOrderArgs = {\n  signer: Signer;\n  chainId: number;\n  accountId: number;\n  orderBase: bigint;\n  orderPriceLimit: bigint;\n  counterpartyAccountIds: number[];\n  marketId: number;\n  exchangeId: number;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Signer, JsonRpcSigner } from 'ethers';\n\nexport type MarketArg = {\n  id: number;\n  exchangeId: number;\n  counterpartyAccountIds: number[];\n  currentPrice: number;\n};\n\nexport type MatchOrderArgs = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: number;\n  orderSize: bigint;\n  market: MarketArg;\n};\n\nexport type MatchOrderResult = {\n  transactionHash: string | null;\n};\n"]}

package/dist/services/token/index.js

@@ -0,0 +1,20 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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 });
+__exportStar(require("./types"), exports);
+__exportStar(require("./approve"), exports);
+__exportStar(require("./getAllowance"), exports);
+//# sourceMappingURL=index.js.map

package/dist/services/token/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/token/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,iDAA+B","sourcesContent":["export * from './types';\nexport * from './approve';\nexport * from './getAllowance';\n"]}

package/dist/services/token/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,2CAAE,CAAA;IACF,qDAAO,CAAA;AACT,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB","sourcesContent":["import { Signer } from 'ethers';\n\nexport enum ApprovalType {\n  LP,\n  DEPOSIT,\n}\n\nexport type ApproveTokenArgs = {\n  signer: Signer;\n  chainId: number;\n  token: string;\n  type: ApprovalType;\n};\n\nexport type GetAllowanceArgs = {\n  signer: Signer;\n  chainId: number;\n  token: string;\n  type: ApprovalType;\n};\n\nexport type GetERC20AllowanceArgs = {\n  walletAddress: string;\n  tokenAddress: string;\n  spenderAddress: string;\n  subject: Signer;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,2CAAE,CAAA;IACF,qDAAO,CAAA;AACT,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\n\nexport enum ApprovalType {\n  LP,\n  DEPOSIT,\n}\n\nexport type ApproveTokenArgs = {\n  signer: Signer | JsonRpcSigner;\n  chainId: number;\n  token: string;\n  type: ApprovalType;\n};\n\nexport type GetAllowanceArgs = {\n  signer: Signer | JsonRpcSigner;\n  chainId: number;\n  token: string;\n  type: ApprovalType;\n};\n\nexport type GetERC20AllowanceArgs = {\n  walletAddress: string;\n  tokenAddress: string;\n  spenderAddress: string;\n  subject: Signer;\n};\n"]}

package/dist/types/index.d.ts

@@ -1,2 +1,5 @@
-export * from './utils/action';
+export * from './services/lp';
+export * from './services/margin-accounts';
+export * from './services/orders';
+export * from './services/token';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC"}

package/dist/types/services/executeTransaction.d.ts

@@ -1,4 +1,4 @@
-import { Signer } from 'ethers';
+import { JsonRpcSigner, Signer } from 'ethers';
 import { TransactionType } from '../utils/consts';
 export type Transaction = {
     from: string;
@@ -6,8 +6,8 @@ export type Transaction = {
     data: string;
     value?: string;
 };
-export declare function estimateGas(signer: Signer, data: string, value: string, chainId: number, transactionType: TransactionType): Promise<Transaction & {
+export declare function estimateGas(signer: Signer | JsonRpcSigner, data: string, value: string, chainId: number, transactionType: TransactionType): Promise<Transaction & {
     gasLimit: bigint;
 }>;
-export declare function executeTransaction(signer: Signer, data: string, value: string, chainId: number, transactionType: TransactionType): Promise<import("ethers").TransactionReceipt | null>;
+export declare function executeTransaction(signer: Signer | JsonRpcSigner, data: string, value: string, chainId: number, transactionType: TransactionType): Promise<import("ethers").TransactionReceipt | null>;
 //# sourceMappingURL=executeTransaction.d.ts.map

package/dist/types/services/executeTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executeTransaction.d.ts","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,WAAW,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAuB7C;AAED,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,eAAe,uDAiBjC"}
+{"version":3,"file":"executeTransaction.d.ts","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAG/C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,WAAW,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAuB7C;AAED,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,eAAe,uDAiBjC"}

package/dist/types/services/lp/index.d.ts

@@ -0,0 +1,3 @@
+export * from './types';
+export * from './lp';
+//# sourceMappingURL=index.d.ts.map

package/dist/types/services/lp/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/lp/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,MAAM,CAAC"}

package/dist/types/services/lp/types.d.ts

@@ -1,6 +1,6 @@
-import { Signer } from 'ethers';
+import { JsonRpcSigner, Signer } from 'ethers';
 export type ProvideLiquidityArgs = {
-    signer: Signer;
+    signer: Signer | JsonRpcSigner;
     chainId: number;
     poolId: number;
     owner: string;
@@ -8,7 +8,7 @@ export type ProvideLiquidityArgs = {
     minShares: number;
 };
 export type RemoveLiquidityArgs = {
-    signer: Signer;
+    signer: Signer | JsonRpcSigner;
     chainId: number;
     poolId: number;
     sharesAmount: number;

package/dist/types/services/lp/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE/C,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC"}

package/dist/types/services/margin-accounts/index.d.ts

@@ -0,0 +1,5 @@
+export * from './types';
+export * from './account';
+export * from './deposit';
+export * from './withdraw';
+//# sourceMappingURL=index.d.ts.map

package/dist/types/services/margin-accounts/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC"}

package/dist/types/services/margin-accounts/types.d.ts

@@ -1,11 +1,11 @@
-import { Signer } from 'ethers';
+import { JsonRpcSigner, Signer } from 'ethers';
 export type CreateAccountArgs = {
-    signer: Signer;
+    signer: Signer | JsonRpcSigner;
     chainId: number;
     ownerAddress: string;
 };
 export type DepositArgs = {
-    signer: Signer;
+    signer: Signer | JsonRpcSigner;
     chainId: number;
     accountId: number;
     token: string;
@@ -14,7 +14,7 @@ export type DepositArgs = {
     exchangeId: number;
 };
 export type WithdrawArgs = {
-    signer: Signer;
+    signer: Signer | JsonRpcSigner;
     chainId: number;
     accountId: number;
     token: string;

package/dist/types/services/margin-accounts/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE/C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC"}

package/dist/types/services/orders/index.d.ts

@@ -0,0 +1,3 @@
+export * from './types';
+export * from './order';
+//# sourceMappingURL=index.d.ts.map

package/dist/types/services/orders/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/orders/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC"}

package/dist/types/services/orders/order.d.ts

@@ -1,3 +1,3 @@
-import { MatchOrderArgs } from './types';
-export declare const matchOrder: (params: MatchOrderArgs) => Promise<unknown>;
+import { MatchOrderArgs, MatchOrderResult } from './types';
+export declare const matchOrder: (params: MatchOrderArgs) => Promise<MatchOrderResult>;
 //# sourceMappingURL=order.d.ts.map

package/dist/types/services/orders/order.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order.d.ts","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAKzC,eAAO,MAAM,UAAU,WAAkB,cAAc,KAAG,QAAQ,OAAO,CAoBxE,CAAC"}
+{"version":3,"file":"order.d.ts","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAS3D,eAAO,MAAM,UAAU,WACb,cAAc,KACrB,QAAQ,gBAAgB,CAoC1B,CAAC"}

package/dist/types/services/orders/types.d.ts

@@ -1,12 +1,17 @@
-import { Signer } from 'ethers';
-export type MatchOrderArgs = {
-    signer: Signer;
-    chainId: number;
-    accountId: number;
-    orderBase: bigint;
-    orderPriceLimit: bigint;
-    counterpartyAccountIds: number[];
-    marketId: number;
+import { Signer, JsonRpcSigner } from 'ethers';
+export type MarketArg = {
+    id: number;
     exchangeId: number;
+    counterpartyAccountIds: number[];
+    currentPrice: number;
+};
+export type MatchOrderArgs = {
+    signer: Signer | JsonRpcSigner;
+    marginAccountId: number;
+    orderSize: bigint;
+    market: MarketArg;
+};
+export type MatchOrderResult = {
+    transactionHash: string | null;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/types/services/orders/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAE/C,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC"}

package/dist/types/services/token/index.d.ts

@@ -0,0 +1,4 @@
+export * from './types';
+export * from './approve';
+export * from './getAllowance';
+//# sourceMappingURL=index.d.ts.map

package/dist/types/services/token/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/token/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC"}

package/dist/types/services/token/types.d.ts

@@ -1,16 +1,16 @@
-import { Signer } from 'ethers';
+import { JsonRpcSigner, Signer } from 'ethers';
 export declare enum ApprovalType {
     LP = 0,
     DEPOSIT = 1
 }
 export type ApproveTokenArgs = {
-    signer: Signer;
+    signer: Signer | JsonRpcSigner;
     chainId: number;
     token: string;
     type: ApprovalType;
 };
 export type GetAllowanceArgs = {
-    signer: Signer;
+    signer: Signer | JsonRpcSigner;
     chainId: number;
     token: string;
     type: ApprovalType;

package/dist/types/services/token/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,oBAAY,YAAY;IACtB,EAAE,IAAA;IACF,OAAO,IAAA;CACR;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE/C,oBAAY,YAAY;IACtB,EAAE,IAAA;IACF,OAAO,IAAA;CACR;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC"}

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

@@ -0,0 +1,3 @@
+export declare function calculatePriceLimitForTrade(orderPrice: number, size: bigint): bigint;
+export declare function calculateOrderBaseFromOrderSize(orderSize: bigint, currentPrice: number): bigint;
+//# sourceMappingURL=trade.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"trade.d.ts","sourceRoot":"/","sources":["utils/trade.ts"],"names":[],"mappings":"AAAA,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,GACX,MAAM,CAeR;AAED,wBAAgB,+BAA+B,CAC7C,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,GACnB,MAAM,CAOR"}

package/dist/utils/trade.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateOrderBaseFromOrderSize = exports.calculatePriceLimitForTrade = void 0;
+function calculatePriceLimitForTrade(orderPrice, size) {
+    // Ensure orderPrice is BigInt
+    var orderPriceBigInt = BigInt(orderPrice);
+    // Calculate 50% of the order price
+    var offset = orderPriceBigInt / BigInt(2);
+    // Determine if the size is positive or negative and adjust the price accordingly
+    if (size > 0) {
+        // Trade is long, so add
+        return (orderPriceBigInt + offset) * BigInt(1e18);
+    }
+    else {
+        // Trade is short, so subtract
+        return (orderPriceBigInt - offset) * BigInt(1e18);
+    }
+}
+exports.calculatePriceLimitForTrade = calculatePriceLimitForTrade;
+function calculateOrderBaseFromOrderSize(orderSize, currentPrice) {
+    var decimalFactor = BigInt('1000000'); // 10^6
+    // @todo check decimal places handling
+    var orderBase = (orderSize * decimalFactor) / BigInt(currentPrice);
+    return orderBase;
+}
+exports.calculateOrderBaseFromOrderSize = calculateOrderBaseFromOrderSize;
+//# sourceMappingURL=trade.js.map

package/dist/utils/trade.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trade.js","sourceRoot":"/","sources":["utils/trade.ts"],"names":[],"mappings":";;;AAAA,SAAgB,2BAA2B,CACzC,UAAkB,EAClB,IAAY;IAEZ,8BAA8B;IAC9B,IAAM,gBAAgB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;IAE5C,mCAAmC;IACnC,IAAM,MAAM,GAAG,gBAAgB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAE5C,iFAAiF;IACjF,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;QACb,wBAAwB;QACxB,OAAO,CAAC,gBAAgB,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC;SAAM,CAAC;QACN,8BAA8B;QAC9B,OAAO,CAAC,gBAAgB,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC;AACH,CAAC;AAlBD,kEAkBC;AAED,SAAgB,+BAA+B,CAC7C,SAAiB,EACjB,YAAoB;IAEpB,IAAM,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO;IAChD,sCAAsC;IAEtC,IAAM,SAAS,GAAG,CAAC,SAAS,GAAG,aAAa,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;IAErE,OAAO,SAAS,CAAC;AACnB,CAAC;AAVD,0EAUC","sourcesContent":["export function calculatePriceLimitForTrade(\n  orderPrice: number,\n  size: bigint,\n): bigint {\n  // Ensure orderPrice is BigInt\n  const orderPriceBigInt = BigInt(orderPrice);\n\n  // Calculate 50% of the order price\n  const offset = orderPriceBigInt / BigInt(2);\n\n  // Determine if the size is positive or negative and adjust the price accordingly\n  if (size > 0) {\n    // Trade is long, so add\n    return (orderPriceBigInt + offset) * BigInt(1e18);\n  } else {\n    // Trade is short, so subtract\n    return (orderPriceBigInt - offset) * BigInt(1e18);\n  }\n}\n\nexport function calculateOrderBaseFromOrderSize(\n  orderSize: bigint,\n  currentPrice: number,\n): bigint {\n  const decimalFactor = BigInt('1000000'); // 10^6\n  // @todo check decimal places handling\n\n  const orderBase = (orderSize * decimalFactor) / BigInt(currentPrice);\n\n  return orderBase;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -32,5 +32,5 @@
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.10.4",
-  "gitHead": "0cd4bd2ca7ec708fcf7ef2198aa7abdc4dbbc83c"
+  "gitHead": "c93a765b3c4e44a13d3f96237342d0508fe55a71"
 }

package/src/index.ts

@@ -1 +1,4 @@
-export * from './utils/action';
+export * from './services/lp';
+export * from './services/margin-accounts';
+export * from './services/orders';
+export * from './services/token';

package/src/services/executeTransaction.ts

@@ -1,4 +1,4 @@
-import { Signer } from 'ethers';
+import { JsonRpcSigner, Signer } from 'ethers';
 import { getGasBuffer } from '../utils/txHelpers';
 import { getAddress } from '../utils/contractAddresses';
 import { TransactionType } from '../utils/consts';
@@ -11,7 +11,7 @@ export type Transaction = {
 };
 
 export async function estimateGas(
-  signer: Signer,
+  signer: Signer | JsonRpcSigner,
   data: string,
   value: string,
   chainId: number,
@@ -42,7 +42,7 @@ export async function estimateGas(
 }
 
 export async function executeTransaction(
-  signer: Signer,
+  signer: Signer | JsonRpcSigner,
   data: string,
   value: string,
   chainId: number,

package/src/services/lp/index.ts

@@ -0,0 +1,2 @@
+export * from './types';
+export * from './lp';

package/src/services/lp/types.ts

@@ -1,7 +1,7 @@
-import { Signer } from 'ethers';
+import { JsonRpcSigner, Signer } from 'ethers';
 
 export type ProvideLiquidityArgs = {
-  signer: Signer;
+  signer: Signer | JsonRpcSigner;
   chainId: number;
   poolId: number;
   owner: string;
@@ -10,7 +10,7 @@ export type ProvideLiquidityArgs = {
 };
 
 export type RemoveLiquidityArgs = {
-  signer: Signer;
+  signer: Signer | JsonRpcSigner;
   chainId: number;
   poolId: number;
   sharesAmount: number;

package/src/services/margin-accounts/index.ts

@@ -0,0 +1,4 @@
+export * from './types';
+export * from './account';
+export * from './deposit';
+export * from './withdraw';

package/src/services/margin-accounts/types.ts

@@ -1,13 +1,13 @@
-import { Signer } from 'ethers';
+import { JsonRpcSigner, Signer } from 'ethers';
 
 export type CreateAccountArgs = {
-  signer: Signer;
+  signer: Signer | JsonRpcSigner;
   chainId: number;
   ownerAddress: string;
 };
 
 export type DepositArgs = {
-  signer: Signer;
+  signer: Signer | JsonRpcSigner;
   chainId: number;
   accountId: number;
   token: string;
@@ -17,7 +17,7 @@ export type DepositArgs = {
 };
 
 export type WithdrawArgs = {
-  signer: Signer;
+  signer: Signer | JsonRpcSigner;
   chainId: number;
   accountId: number;
   token: string;

package/src/services/orders/index.ts

@@ -0,0 +1,2 @@
+export * from './types';
+export * from './order';

package/src/services/orders/order.ts

@@ -1,26 +1,48 @@
-import { MatchOrderArgs } from './types';
+import { MatchOrderArgs, MatchOrderResult } from './types';
 import { encodeMatchOrder } from './encode';
 import { executeTransaction } from '../executeTransaction';
 import { TransactionType } from '../../utils/consts';
+import {
+  calculateOrderBaseFromOrderSize,
+  calculatePriceLimitForTrade,
+} from '../../utils/trade';
+
+export const matchOrder = async (
+  params: MatchOrderArgs,
+): Promise<MatchOrderResult> => {
+  if (params.orderSize === BigInt(0)) {
+    throw new Error('Position size can not be 0');
+  }
+  const orderPriceLimit = calculatePriceLimitForTrade(
+    params.market.currentPrice,
+    params.orderSize,
+  );
+
+  const orderBase = calculateOrderBaseFromOrderSize(
+    params.orderSize,
+    params.market.currentPrice,
+  );
 
-export const matchOrder = async (params: MatchOrderArgs): Promise<unknown> => {
-  // @todo update type once we agree on the structure
   const { calldata: data, value } = encodeMatchOrder(
-    params.accountId,
-    params.orderBase,
-    params.orderPriceLimit,
-    params.counterpartyAccountIds,
-    params.marketId,
-    params.exchangeId,
+    params.marginAccountId,
+    orderBase,
+    orderPriceLimit,
+    params.market.counterpartyAccountIds,
+    params.market.id,
+    params.market.exchangeId,
   );
 
+  // @todo update it
+  const chainId = 80001;
   const result = await executeTransaction(
     params.signer,
     data,
     value,
-    params.chainId,
+    chainId,
     TransactionType.TRADE,
   );
 
-  return result;
+  return {
+    transactionHash: result?.hash || null,
+  };
 };

package/src/services/orders/types.ts

@@ -1,12 +1,19 @@
-import { Signer } from 'ethers';
+import { Signer, JsonRpcSigner } from 'ethers';
 
-export type MatchOrderArgs = {
-  signer: Signer;
-  chainId: number;
-  accountId: number;
-  orderBase: bigint;
-  orderPriceLimit: bigint;
-  counterpartyAccountIds: number[];
-  marketId: number;
+export type MarketArg = {
+  id: number;
   exchangeId: number;
+  counterpartyAccountIds: number[];
+  currentPrice: number;
+};
+
+export type MatchOrderArgs = {
+  signer: Signer | JsonRpcSigner;
+  marginAccountId: number;
+  orderSize: bigint;
+  market: MarketArg;
+};
+
+export type MatchOrderResult = {
+  transactionHash: string | null;
 };

package/src/services/token/index.ts

@@ -0,0 +1,3 @@
+export * from './types';
+export * from './approve';
+export * from './getAllowance';

package/src/services/token/types.ts

@@ -1,4 +1,4 @@
-import { Signer } from 'ethers';
+import { JsonRpcSigner, Signer } from 'ethers';
 
 export enum ApprovalType {
   LP,
@@ -6,14 +6,14 @@ export enum ApprovalType {
 }
 
 export type ApproveTokenArgs = {
-  signer: Signer;
+  signer: Signer | JsonRpcSigner;
   chainId: number;
   token: string;
   type: ApprovalType;
 };
 
 export type GetAllowanceArgs = {
-  signer: Signer;
+  signer: Signer | JsonRpcSigner;
   chainId: number;
   token: string;
   type: ApprovalType;

package/src/utils/trade.ts

@@ -0,0 +1,31 @@
+export function calculatePriceLimitForTrade(
+  orderPrice: number,
+  size: bigint,
+): bigint {
+  // Ensure orderPrice is BigInt
+  const orderPriceBigInt = BigInt(orderPrice);
+
+  // Calculate 50% of the order price
+  const offset = orderPriceBigInt / BigInt(2);
+
+  // Determine if the size is positive or negative and adjust the price accordingly
+  if (size > 0) {
+    // Trade is long, so add
+    return (orderPriceBigInt + offset) * BigInt(1e18);
+  } else {
+    // Trade is short, so subtract
+    return (orderPriceBigInt - offset) * BigInt(1e18);
+  }
+}
+
+export function calculateOrderBaseFromOrderSize(
+  orderSize: bigint,
+  currentPrice: number,
+): bigint {
+  const decimalFactor = BigInt('1000000'); // 10^6
+  // @todo check decimal places handling
+
+  const orderBase = (orderSize * decimalFactor) / BigInt(currentPrice);
+
+  return orderBase;
+}