@reyaxyz/sdk 0.72.0 → 0.73.0

package/README.md

@@ -6,5 +6,5 @@
 
 | Statements                  | Branches                | Functions                 | Lines             |
 | --------------------------- | ----------------------- | ------------------------- | ----------------- |
-| ![Statements](https://img.shields.io/badge/statements-12.41%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-9.45%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-12.16%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-11.75%25-red.svg?style=flat) |
+| ![Statements](https://img.shields.io/badge/statements-12.17%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-9.09%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-12%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-11.52%25-red.svg?style=flat) |
 

package/dist/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./services/lp"), exports);
 __exportStar(require("./services/margin-accounts"), exports);
 __exportStar(require("./services/money-flows"), exports);
 __exportStar(require("./services/orders"), exports);
+__exportStar(require("./services/isolated-order"), exports);
 __exportStar(require("./services/token"), exports);
 var config_1 = require("./config");
 Object.defineProperty(exports, "configureSDK", { enumerable: true, get: function () { return config_1.configureSDK; } });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,6DAA2C;AAC3C,yDAAuC;AACvC,oDAAkC;AAClC,mDAAiC;AACjC,mCAAwC;AAA/B,sGAAA,YAAY,OAAA","sourcesContent":["export * from './services/lp';\nexport * from './services/margin-accounts';\nexport * from './services/money-flows';\nexport * from './services/orders';\nexport * from './services/token';\nexport { configureSDK } from './config';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,6DAA2C;AAC3C,yDAAuC;AACvC,oDAAkC;AAClC,4DAA0C;AAC1C,mDAAiC;AACjC,mCAAwC;AAA/B,sGAAA,YAAY,OAAA","sourcesContent":["export * from './services/lp';\nexport * from './services/margin-accounts';\nexport * from './services/money-flows';\nexport * from './services/orders';\nexport * from './services/isolated-order';\nexport * from './services/token';\nexport { configureSDK } from './config';\n"]}

package/dist/services/isolated-order/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("./isolatedOrder"), exports);
+//# sourceMappingURL=index.js.map

package/dist/services/isolated-order/index.js.map

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

package/dist/services/isolated-order/isolatedOrder.js

@@ -0,0 +1,88 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeIsolatedOrder = void 0;
+var common_1 = require("@reyaxyz/common");
+var margin_accounts_1 = require("../margin-accounts");
+var orders_1 = require("../orders");
+var executeIsolatedOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
+    var createAccountResult, network, chainId, matchOrderResult;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0: return [4 /*yield*/, (0, margin_accounts_1.createAccount)({
+                    signer: params.signer,
+                    ownerAddress: params.owner.address,
+                    name: 'Isolated Trade Account',
+                })];
+            case 1:
+                createAccountResult = _b.sent();
+                if (!createAccountResult.accountId) {
+                    throw new Error('New Account Id not available to execute isolated trade');
+                }
+                return [4 /*yield*/, ((_a = params.signer.provider) === null || _a === void 0 ? void 0 : _a.getNetwork())];
+            case 2:
+                network = _b.sent();
+                chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
+                return [4 /*yield*/, (0, margin_accounts_1.transferMarginBetweenAccounts)({
+                        signer: params.signer,
+                        owner: params.owner,
+                        fromMarginAccountId: params.fromMarginAccountId,
+                        toMarginAccountId: createAccountResult.accountId,
+                        amount: params.requiredMargin,
+                        tokenAddress: (0, common_1.getTokenInfoByName)('RUSD', chainId).address,
+                    })];
+            case 3:
+                _b.sent();
+                return [4 /*yield*/, (0, orders_1.matchOrder)({
+                        signer: params.signer,
+                        owner: params.owner,
+                        marginAccountId: createAccountResult.accountId,
+                        snappedAmountInBase: params.snappedAmountInBase,
+                        market: params.market,
+                    })];
+            case 4:
+                matchOrderResult = _b.sent();
+                return [2 /*return*/, {
+                        transactionHash: (matchOrderResult === null || matchOrderResult === void 0 ? void 0 : matchOrderResult.transactionHash) || null,
+                    }];
+        }
+    });
+}); };
+exports.executeIsolatedOrder = executeIsolatedOrder;
+//# sourceMappingURL=isolatedOrder.js.map

package/dist/services/isolated-order/isolatedOrder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isolatedOrder.js","sourceRoot":"/","sources":["services/isolated-order/isolatedOrder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAAqD;AACrD,sDAG4B;AAC5B,oCAAuC;AAEhC,IAAM,oBAAoB,GAAG,UAClC,MAA2B;;;;;oBAQC,qBAAM,IAAA,+BAAa,EAAC;oBAC9C,MAAM,EAAE,MAAM,CAAC,MAAM;oBACrB,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO;oBAClC,IAAI,EAAE,wBAAwB;iBAC/B,CAAC,EAAA;;gBAJI,mBAAmB,GAAG,SAI1B;gBAEF,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,CAAC;oBACnC,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;gBAC5E,CAAC;gBAKe,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAEzC,qBAAM,IAAA,+CAA6B,EAAC;wBAClC,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,KAAK,EAAE,MAAM,CAAC,KAAK;wBACnB,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;wBAC/C,iBAAiB,EAAE,mBAAmB,CAAC,SAAS;wBAChD,MAAM,EAAE,MAAM,CAAC,cAAc;wBAC7B,YAAY,EAAE,IAAA,2BAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC,OAAO;qBAC1D,CAAC,EAAA;;gBAPF,SAOE,CAAC;gBAIsB,qBAAM,IAAA,mBAAU,EAAC;wBACxC,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,KAAK,EAAE,MAAM,CAAC,KAAK;wBACnB,eAAe,EAAE,mBAAmB,CAAC,SAAS;wBAC9C,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;wBAC/C,MAAM,EAAE,MAAM,CAAC,MAAM;qBACtB,CAAC,EAAA;;gBANI,gBAAgB,GAAG,SAMvB;gBAEF,sBAAO;wBACL,eAAe,EAAE,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,eAAe,KAAI,IAAI;qBAC3D,EAAC;;;KACH,CAAC;AA/CW,QAAA,oBAAoB,wBA+C/B","sourcesContent":["import { IsolatedOrderParams, IsolatedOrderResults } from './types';\nimport { getTokenInfoByName } from '@reyaxyz/common';\nimport {\n  createAccount,\n  transferMarginBetweenAccounts,\n} from '../margin-accounts';\nimport { matchOrder } from '../orders';\n\nexport const executeIsolatedOrder = async (\n  params: IsolatedOrderParams,\n): Promise<IsolatedOrderResults> => {\n  // todo: p2  consider performing all steps in api and only call one api function from here?\n\n  // step 1: create new account\n\n  // todo: p2: consider having a function that creates an account and auto-generates a name in one go, use it t&cs also\n  // todo: p2: error handling & logging\n  const createAccountResult = await createAccount({\n    signer: params.signer,\n    ownerAddress: params.owner.address,\n    name: 'Isolated Trade Account',\n  });\n\n  if (!createAccountResult.accountId) {\n    throw new Error('New Account Id not available to execute isolated trade');\n  }\n\n  // step 2: transfer margin from source to destination account\n  // todo: p1: generalise to handle multiple transfer commands\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  await transferMarginBetweenAccounts({\n    signer: params.signer,\n    owner: params.owner,\n    fromMarginAccountId: params.fromMarginAccountId,\n    toMarginAccountId: createAccountResult.accountId,\n    amount: params.requiredMargin,\n    tokenAddress: getTokenInfoByName('RUSD', chainId).address,\n  });\n\n  // step 3: execute trade\n\n  const matchOrderResult = await matchOrder({\n    signer: params.signer,\n    owner: params.owner,\n    marginAccountId: createAccountResult.accountId,\n    snappedAmountInBase: params.snappedAmountInBase,\n    market: params.market,\n  });\n\n  return {\n    transactionHash: matchOrderResult?.transactionHash || null,\n  };\n};\n"]}

package/dist/services/isolated-order/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/services/isolated-order/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/isolated-order/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Signer, JsonRpcSigner } from 'ethers';\nimport { MarginAccountEntity, OwnerMetadataEntity } from '@reyaxyz/common';\nimport { MarketParams } from '../orders';\n\nexport type IsolatedOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce' | 'address'>;\n  fromMarginAccountId: MarginAccountEntity['id'];\n  requiredMargin: number; // todo: p2: use type from simulation in api-sdk via common dep\n  snappedAmountInBase: number; // todo: p2: use type from simulation in api-sdk via common dep\n  market: MarketParams;\n};\n\nexport type IsolatedOrderResults = {\n  transactionHash: string | null;\n};\n"]}

package/dist/types/index.d.ts

@@ -2,6 +2,7 @@ export * from './services/lp';
 export * from './services/margin-accounts';
 export * from './services/money-flows';
 export * from './services/orders';
+export * from './services/isolated-order';
 export * from './services/token';
 export { configureSDK } from './config';
 //# 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,eAAe,CAAC;AAC9B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC"}

package/dist/types/services/isolated-order/index.d.ts

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

package/dist/types/services/isolated-order/index.d.ts.map

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

package/dist/types/services/isolated-order/isolatedOrder.d.ts

@@ -0,0 +1,3 @@
+import { IsolatedOrderParams, IsolatedOrderResults } from './types';
+export declare const executeIsolatedOrder: (params: IsolatedOrderParams) => Promise<IsolatedOrderResults>;
+//# sourceMappingURL=isolatedOrder.d.ts.map

package/dist/types/services/isolated-order/isolatedOrder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isolatedOrder.d.ts","sourceRoot":"/","sources":["services/isolated-order/isolatedOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAQpE,eAAO,MAAM,oBAAoB,WACvB,mBAAmB,KAC1B,QAAQ,oBAAoB,CA6C9B,CAAC"}

package/dist/types/services/isolated-order/types.d.ts

@@ -0,0 +1,15 @@
+import { Signer, JsonRpcSigner } from 'ethers';
+import { MarginAccountEntity, OwnerMetadataEntity } from '@reyaxyz/common';
+import { MarketParams } from '../orders';
+export type IsolatedOrderParams = {
+    signer: Signer | JsonRpcSigner;
+    owner: Pick<OwnerMetadataEntity, 'coreSigNonce' | 'address'>;
+    fromMarginAccountId: MarginAccountEntity['id'];
+    requiredMargin: number;
+    snappedAmountInBase: number;
+    market: MarketParams;
+};
+export type IsolatedOrderResults = {
+    transactionHash: string | null;
+};
+//# sourceMappingURL=types.d.ts.map

package/dist/types/services/isolated-order/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/isolated-order/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,cAAc,GAAG,SAAS,CAAC,CAAC;IAC7D,mBAAmB,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC/C,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"trade.d.ts","sourceRoot":"/","sources":["utils/trade.ts"],"names":[],"mappings":"AAEA,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,MAAM,CAkBR"}
+{"version":3,"file":"trade.d.ts","sourceRoot":"/","sources":["utils/trade.ts"],"names":[],"mappings":"AAGA,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,MAAM,CAkBR"}

package/dist/utils/trade.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculatePriceLimitForTrade = void 0;
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
+// 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
     var orderPriceBigInt = (0, bignumber_js_1.default)(orderPrice);

package/dist/utils/trade.js.map

@@ -1 +1 @@
-{"version":3,"file":"trade.js","sourceRoot":"/","sources":["utils/trade.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAqC;AAErC,SAAgB,2BAA2B,CACzC,UAAkB,EAClB,MAAc;IAEd,8BAA8B;IAC9B,IAAM,gBAAgB,GAAG,IAAA,sBAAS,EAAC,UAAU,CAAC,CAAC;IAE/C,mCAAmC;IACnC,IAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEvC,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\nexport function calculatePriceLimitForTrade(\n  orderPrice: number,\n  amount: number,\n): bigint {\n  // Ensure orderPrice is BigInt\n  const orderPriceBigInt = BigNumber(orderPrice);\n\n  // Calculate 50% of the order price\n  const offset = orderPriceBigInt.div(2);\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":["utils/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,mCAAmC;IACnC,IAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEvC,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 50% of the order price\n  const offset = orderPriceBigInt.div(2);\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"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.72.0",
+  "version": "0.73.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -34,5 +34,5 @@
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@9.0.1",
-  "gitHead": "9ab576f5f2f329ae044cb5d49e388aab2a5fdf30"
+  "gitHead": "cbf9c4faf47872a9122b553e1b7048d2a43a341e"
 }

package/src/index.ts

@@ -2,5 +2,6 @@ export * from './services/lp';
 export * from './services/margin-accounts';
 export * from './services/money-flows';
 export * from './services/orders';
+export * from './services/isolated-order';
 export * from './services/token';
 export { configureSDK } from './config';

package/src/services/isolated-order/index.ts

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

package/src/services/isolated-order/isolatedOrder.ts

@@ -0,0 +1,56 @@
+import { IsolatedOrderParams, IsolatedOrderResults } from './types';
+import { getTokenInfoByName } from '@reyaxyz/common';
+import {
+  createAccount,
+  transferMarginBetweenAccounts,
+} from '../margin-accounts';
+import { matchOrder } from '../orders';
+
+export const executeIsolatedOrder = async (
+  params: IsolatedOrderParams,
+): Promise<IsolatedOrderResults> => {
+  // todo: p2  consider performing all steps in api and only call one api function from here?
+
+  // step 1: create new account
+
+  // todo: p2: consider having a function that creates an account and auto-generates a name in one go, use it t&cs also
+  // todo: p2: error handling & logging
+  const createAccountResult = await createAccount({
+    signer: params.signer,
+    ownerAddress: params.owner.address,
+    name: 'Isolated Trade Account',
+  });
+
+  if (!createAccountResult.accountId) {
+    throw new Error('New Account Id not available to execute isolated trade');
+  }
+
+  // step 2: transfer margin from source to destination account
+  // todo: p1: generalise to handle multiple transfer commands
+
+  const network = await params.signer.provider?.getNetwork();
+  const chainId = Number(network?.chainId);
+
+  await transferMarginBetweenAccounts({
+    signer: params.signer,
+    owner: params.owner,
+    fromMarginAccountId: params.fromMarginAccountId,
+    toMarginAccountId: createAccountResult.accountId,
+    amount: params.requiredMargin,
+    tokenAddress: getTokenInfoByName('RUSD', chainId).address,
+  });
+
+  // step 3: execute trade
+
+  const matchOrderResult = await matchOrder({
+    signer: params.signer,
+    owner: params.owner,
+    marginAccountId: createAccountResult.accountId,
+    snappedAmountInBase: params.snappedAmountInBase,
+    market: params.market,
+  });
+
+  return {
+    transactionHash: matchOrderResult?.transactionHash || null,
+  };
+};

package/src/services/isolated-order/types.ts

@@ -0,0 +1,16 @@
+import { Signer, JsonRpcSigner } from 'ethers';
+import { MarginAccountEntity, OwnerMetadataEntity } from '@reyaxyz/common';
+import { MarketParams } from '../orders';
+
+export type IsolatedOrderParams = {
+  signer: Signer | JsonRpcSigner;
+  owner: Pick<OwnerMetadataEntity, 'coreSigNonce' | 'address'>;
+  fromMarginAccountId: MarginAccountEntity['id'];
+  requiredMargin: number; // todo: p2: use type from simulation in api-sdk via common dep
+  snappedAmountInBase: number; // todo: p2: use type from simulation in api-sdk via common dep
+  market: MarketParams;
+};
+
+export type IsolatedOrderResults = {
+  transactionHash: string | null;
+};

package/src/utils/trade.ts

@@ -1,5 +1,6 @@
 import BigNumber from 'bignumber.js';
 
+// todo: need the ability to supply custom slippage or use a more conservative default for the slippage tolerance
 export function calculatePriceLimitForTrade(
   orderPrice: number,
   amount: number,