@reyaxyz/sdk 0.144.2 → 0.145.1

package/README.md

@@ -6,5 +6,5 @@
 
 | Statements                  | Branches                | Functions                 | Lines             |
 | --------------------------- | ----------------------- | ------------------------- | ----------------- |
-| ![Statements](https://img.shields.io/badge/statements-8.81%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-5.88%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-3.79%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-8.47%25-red.svg?style=flat) |
+| ![Statements](https://img.shields.io/badge/statements-12.23%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-7.2%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-6.12%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-11.84%25-red.svg?style=flat) |
 

package/dist/index.js

@@ -20,7 +20,6 @@ __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/conditional-orders"), 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,yDAAuC;AACvC,gDAA8B;AAC9B,6DAA2C;AAC3C,yDAAuC;AACvC,oDAAkC;AAClC,gEAA8C;AAC9C,mDAAiC;AACjC,mCAAoE;AAA3D,sGAAA,YAAY,OAAA;AAAE,oHAAA,0BAA0B,OAAA","sourcesContent":["export * from './services/api-wallets';\nexport * from './services/lp';\nexport * from './services/margin-accounts';\nexport * from './services/money-flows';\nexport * from './services/orders';\nexport * from './services/conditional-orders';\nexport * from './services/token';\nexport { configureSDK, getTransactionModuleClient } from './config';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yDAAuC;AACvC,gDAA8B;AAC9B,6DAA2C;AAC3C,yDAAuC;AACvC,oDAAkC;AAClC,mDAAiC;AACjC,mCAAoE;AAA3D,sGAAA,YAAY,OAAA;AAAE,oHAAA,0BAA0B,OAAA","sourcesContent":["export * from './services/api-wallets';\nexport * from './services/lp';\nexport * from './services/margin-accounts';\nexport * from './services/money-flows';\nexport * from './services/orders';\nexport * from './services/token';\nexport { configureSDK, getTransactionModuleClient } from './config';\n"]}

package/dist/services/encode.js

@@ -1,50 +1,35 @@
 "use strict";
 ////////////////////  ENCODE SINGLE  ////////////////////
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeRouterCall = exports.encodeSingleTrade = exports.encodeSingleStakeFromMarginAccount = exports.encodeSingleUnstakeFromMarginAccount = exports.encodeSingleTransferMargin = exports.encodeSingleWithdraw = exports.encodeSingleDeposit = void 0;
+exports.encodeSingleTrade = exports.encodeSingleStakeFromMarginAccount = exports.encodeSingleUnstakeFromMarginAccount = exports.encodeSingleTransferMargin = exports.encodeSingleWithdraw = exports.encodeSingleDeposit = void 0;
 var common_1 = require("@reyaxyz/common");
-var common_2 = require("@reyaxyz/common");
 var ethers_1 = require("ethers");
-// const abi = [
-//   'function coreExecute(uint128 poolId, uint128 accountId, Command[] commands, EIP712Signature sig)',
-// ];
 var encodeSingleDeposit = function (token, amount, multiAction) {
-    multiAction.newAction((0, common_2.getCommand)(common_2.CommandType.DEPOSIT, [token, amount], 0, 0));
+    multiAction.newAction((0, common_1.getCommand)(common_1.CommandType.DEPOSIT, [token, amount], 0, 0));
 };
 exports.encodeSingleDeposit = encodeSingleDeposit;
 var encodeSingleWithdraw = function (token, amount, multiAction) {
-    multiAction.newAction((0, common_2.getCommand)(common_2.CommandType.WITHDRAW, [token, amount], 0, 0));
+    multiAction.newAction((0, common_1.getCommand)(common_1.CommandType.WITHDRAW, [token, amount], 0, 0));
 };
 exports.encodeSingleWithdraw = encodeSingleWithdraw;
 var encodeSingleTransferMargin = function (toMarginAccountId, token, amount, multiAction) {
-    multiAction.newAction((0, common_2.getCommand)(common_2.CommandType.TRANSFER_MARGIN_ACCOUNT, [[toMarginAccountId, token, amount]], 0, 0));
+    multiAction.newAction((0, common_1.getCommand)(common_1.CommandType.TRANSFER_MARGIN_ACCOUNT, [[toMarginAccountId, token, amount]], 0, 0));
 };
 exports.encodeSingleTransferMargin = encodeSingleTransferMargin;
 var encodeSingleUnstakeFromMarginAccount = function (poolId, srusdAmount, minOut, multiAction) {
     var encodedUnstakeInputs = ethers_1.AbiCoder.defaultAbiCoder().encode(['uint128', 'uint256', 'uint256'], [poolId, srusdAmount, minOut]);
-    multiAction.newAction((0, common_2.getCommand)(common_2.CommandType.MANAGE_POOL_STAKE, [1, encodedUnstakeInputs], 0, 0));
+    multiAction.newAction((0, common_1.getCommand)(common_1.CommandType.MANAGE_POOL_STAKE, [1, encodedUnstakeInputs], 0, 0));
 };
 exports.encodeSingleUnstakeFromMarginAccount = encodeSingleUnstakeFromMarginAccount;
 var encodeSingleStakeFromMarginAccount = function (poolId, amount, minShares, multiAction) {
     var encodedStakeInputs = ethers_1.AbiCoder.defaultAbiCoder().encode(['uint128', 'uint256', 'uint256'], [poolId, amount, minShares]);
-    multiAction.newAction((0, common_2.getCommand)(common_2.CommandType.MANAGE_POOL_STAKE, [0, encodedStakeInputs], 0, 0));
+    multiAction.newAction((0, common_1.getCommand)(common_1.CommandType.MANAGE_POOL_STAKE, [0, encodedStakeInputs], 0, 0));
 };
 exports.encodeSingleStakeFromMarginAccount = encodeSingleStakeFromMarginAccount;
 var encodeSingleTrade = function (counterpartyAccountIds, orderBase, orderPriceLimit, marketId, exchangeId, multiAction) {
     // (int256 orderBase, UD60x18 orderPriceLimit) = abi.decode(matchOrderInputs.inputs, (int256, UD60x18));
     var encodedBasePrice = ethers_1.AbiCoder.defaultAbiCoder().encode(['int256', 'uint256'], [orderBase, orderPriceLimit]);
-    multiAction.newAction((0, common_2.getCommand)(common_2.CommandType.MATCH_ORDER, [counterpartyAccountIds, encodedBasePrice], marketId, exchangeId));
+    multiAction.newAction((0, common_1.getCommand)(common_1.CommandType.MATCH_ORDER, [counterpartyAccountIds, encodedBasePrice], marketId, exchangeId));
 };
 exports.encodeSingleTrade = encodeSingleTrade;
-var encodeRouterCall = function (multiAction, accountId, nativeCurrencyValue) {
-    var functionSignature = 'execute';
-    var parameters = [accountId, multiAction.commands];
-    var INTERFACE = new ethers_1.Interface(common_1.CoreAbi);
-    var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
-    return {
-        calldata: calldata,
-        value: BigInt(nativeCurrencyValue).toString(10),
-    };
-};
-exports.encodeRouterCall = encodeRouterCall;
 //# sourceMappingURL=encode.js.map

package/dist/services/encode.js.map

@@ -1 +1 @@
-{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/encode.ts"],"names":[],"mappings":"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","sourcesContent":["////////////////////  ENCODE SINGLE  ////////////////////\n\nimport { MethodParameters, MultiAction, CoreAbi } from '@reyaxyz/common';\nimport { CommandType, getCommand } from '@reyaxyz/common';\nimport { AbiCoder, Interface } from 'ethers';\n// const abi = [\n//   'function coreExecute(uint128 poolId, uint128 accountId, Command[] commands, EIP712Signature sig)',\n// ];\nexport const encodeSingleDeposit = (\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(getCommand(CommandType.DEPOSIT, [token, amount], 0, 0));\n};\n\nexport const encodeSingleWithdraw = (\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(\n    getCommand(CommandType.WITHDRAW, [token, amount], 0, 0),\n  );\n};\n\nexport const encodeSingleTransferMargin = (\n  toMarginAccountId: number,\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(\n    getCommand(\n      CommandType.TRANSFER_MARGIN_ACCOUNT,\n      [[toMarginAccountId, token, amount]],\n      0,\n      0,\n    ),\n  );\n};\n\nexport const encodeSingleUnstakeFromMarginAccount = (\n  poolId: number,\n  srusdAmount: bigint,\n  minOut: bigint,\n  multiAction: MultiAction,\n): void => {\n  const encodedUnstakeInputs = AbiCoder.defaultAbiCoder().encode(\n    ['uint128', 'uint256', 'uint256'],\n    [poolId, srusdAmount, minOut],\n  );\n\n  multiAction.newAction(\n    getCommand(CommandType.MANAGE_POOL_STAKE, [1, encodedUnstakeInputs], 0, 0),\n  );\n};\n\nexport const encodeSingleStakeFromMarginAccount = (\n  poolId: number,\n  amount: bigint,\n  minShares: bigint,\n  multiAction: MultiAction,\n): void => {\n  const encodedStakeInputs = AbiCoder.defaultAbiCoder().encode(\n    ['uint128', 'uint256', 'uint256'],\n    [poolId, amount, minShares],\n  );\n\n  multiAction.newAction(\n    getCommand(CommandType.MANAGE_POOL_STAKE, [0, encodedStakeInputs], 0, 0),\n  );\n};\n\nexport const encodeSingleTrade = (\n  counterpartyAccountIds: number[],\n  orderBase: bigint,\n  orderPriceLimit: bigint,\n  marketId: number,\n  exchangeId: number,\n  multiAction: MultiAction,\n): void => {\n  // (int256 orderBase, UD60x18 orderPriceLimit) = abi.decode(matchOrderInputs.inputs, (int256, UD60x18));\n  const encodedBasePrice = AbiCoder.defaultAbiCoder().encode(\n    ['int256', 'uint256'],\n    [orderBase, orderPriceLimit],\n  );\n\n  multiAction.newAction(\n    getCommand(\n      CommandType.MATCH_ORDER,\n      [counterpartyAccountIds, encodedBasePrice],\n      marketId,\n      exchangeId,\n    ),\n  );\n};\n\nexport const encodeRouterCall = (\n  multiAction: MultiAction,\n  accountId: number,\n  nativeCurrencyValue: bigint,\n): MethodParameters => {\n  const functionSignature = 'execute';\n  const parameters = [accountId, multiAction.commands];\n\n  const INTERFACE = new Interface(CoreAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(nativeCurrencyValue).toString(10),\n  };\n};\n"]}
+{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/encode.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,0CAA0D;AAC1D,iCAAkC;AAE3B,IAAM,mBAAmB,GAAG,UACjC,KAAa,EACb,MAAc,EACd,WAAwB;IAExB,WAAW,CAAC,SAAS,CAAC,IAAA,mBAAU,EAAC,oBAAW,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAChF,CAAC,CAAC;AANW,QAAA,mBAAmB,uBAM9B;AAEK,IAAM,oBAAoB,GAAG,UAClC,KAAa,EACb,MAAc,EACd,WAAwB;IAExB,WAAW,CAAC,SAAS,CACnB,IAAA,mBAAU,EAAC,oBAAW,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CACxD,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,oBAAoB,wBAQ/B;AAEK,IAAM,0BAA0B,GAAG,UACxC,iBAAyB,EACzB,KAAa,EACb,MAAc,EACd,WAAwB;IAExB,WAAW,CAAC,SAAS,CACnB,IAAA,mBAAU,EACR,oBAAW,CAAC,uBAAuB,EACnC,CAAC,CAAC,iBAAiB,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,EACpC,CAAC,EACD,CAAC,CACF,CACF,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,0BAA0B,8BAcrC;AAEK,IAAM,oCAAoC,GAAG,UAClD,MAAc,EACd,WAAmB,EACnB,MAAc,EACd,WAAwB;IAExB,IAAM,oBAAoB,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAC5D,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EACjC,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,CAC9B,CAAC;IAEF,WAAW,CAAC,SAAS,CACnB,IAAA,mBAAU,EAAC,oBAAW,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE,oBAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAC3E,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,oCAAoC,wCAc/C;AAEK,IAAM,kCAAkC,GAAG,UAChD,MAAc,EACd,MAAc,EACd,SAAiB,EACjB,WAAwB;IAExB,IAAM,kBAAkB,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAC1D,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EACjC,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAC5B,CAAC;IAEF,WAAW,CAAC,SAAS,CACnB,IAAA,mBAAU,EAAC,oBAAW,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE,kBAAkB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CACzE,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,kCAAkC,sCAc7C;AAEK,IAAM,iBAAiB,GAAG,UAC/B,sBAAgC,EAChC,SAAiB,EACjB,eAAuB,EACvB,QAAgB,EAChB,UAAkB,EAClB,WAAwB;IAExB,wGAAwG;IACxG,IAAM,gBAAgB,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACxD,CAAC,QAAQ,EAAE,SAAS,CAAC,EACrB,CAAC,SAAS,EAAE,eAAe,CAAC,CAC7B,CAAC;IAEF,WAAW,CAAC,SAAS,CACnB,IAAA,mBAAU,EACR,oBAAW,CAAC,WAAW,EACvB,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,EAC1C,QAAQ,EACR,UAAU,CACX,CACF,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,iBAAiB,qBAsB5B","sourcesContent":["////////////////////  ENCODE SINGLE  ////////////////////\n\nimport { MultiAction } from '@reyaxyz/common';\nimport { CommandType, getCommand } from '@reyaxyz/common';\nimport { AbiCoder } from 'ethers';\n\nexport const encodeSingleDeposit = (\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(getCommand(CommandType.DEPOSIT, [token, amount], 0, 0));\n};\n\nexport const encodeSingleWithdraw = (\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(\n    getCommand(CommandType.WITHDRAW, [token, amount], 0, 0),\n  );\n};\n\nexport const encodeSingleTransferMargin = (\n  toMarginAccountId: number,\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(\n    getCommand(\n      CommandType.TRANSFER_MARGIN_ACCOUNT,\n      [[toMarginAccountId, token, amount]],\n      0,\n      0,\n    ),\n  );\n};\n\nexport const encodeSingleUnstakeFromMarginAccount = (\n  poolId: number,\n  srusdAmount: bigint,\n  minOut: bigint,\n  multiAction: MultiAction,\n): void => {\n  const encodedUnstakeInputs = AbiCoder.defaultAbiCoder().encode(\n    ['uint128', 'uint256', 'uint256'],\n    [poolId, srusdAmount, minOut],\n  );\n\n  multiAction.newAction(\n    getCommand(CommandType.MANAGE_POOL_STAKE, [1, encodedUnstakeInputs], 0, 0),\n  );\n};\n\nexport const encodeSingleStakeFromMarginAccount = (\n  poolId: number,\n  amount: bigint,\n  minShares: bigint,\n  multiAction: MultiAction,\n): void => {\n  const encodedStakeInputs = AbiCoder.defaultAbiCoder().encode(\n    ['uint128', 'uint256', 'uint256'],\n    [poolId, amount, minShares],\n  );\n\n  multiAction.newAction(\n    getCommand(CommandType.MANAGE_POOL_STAKE, [0, encodedStakeInputs], 0, 0),\n  );\n};\n\nexport const encodeSingleTrade = (\n  counterpartyAccountIds: number[],\n  orderBase: bigint,\n  orderPriceLimit: bigint,\n  marketId: number,\n  exchangeId: number,\n  multiAction: MultiAction,\n): void => {\n  // (int256 orderBase, UD60x18 orderPriceLimit) = abi.decode(matchOrderInputs.inputs, (int256, UD60x18));\n  const encodedBasePrice = AbiCoder.defaultAbiCoder().encode(\n    ['int256', 'uint256'],\n    [orderBase, orderPriceLimit],\n  );\n\n  multiAction.newAction(\n    getCommand(\n      CommandType.MATCH_ORDER,\n      [counterpartyAccountIds, encodedBasePrice],\n      marketId,\n      exchangeId,\n    ),\n  );\n};\n"]}

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

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 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) {
@@ -47,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeBridgeAndDepositExistingMA = exports.encodeBridgeAndDepositNewMA = exports.encodeWithdrawMAAndBridge = exports.encodeTransferMargin = exports.encodeWithdraw = exports.encodeDeposit = exports.encodeCreateAccountCall = void 0;
+exports.encodeBridgeAndDepositExistingMA = exports.encodeWithdrawMAAndBridge = exports.encodeTransferMargin = exports.encodeCreateAccountCall = void 0;
 var common_1 = require("@reyaxyz/common");
 var ethers_1 = require("ethers");
 var encode_1 = require("../encode");
@@ -62,22 +51,6 @@ var encodeCreateAccountCall = function (accountOwner) {
     return { calldata: calldata, value: BigInt(0).toString(10) };
 };
 exports.encodeCreateAccountCall = encodeCreateAccountCall;
-var encodeDeposit = function (accountId, token, amount) {
-    var multiAction = new common_1.MultiAction();
-    (0, encode_1.encodeSingleDeposit)(token, amount, multiAction);
-    var value = BigInt(0);
-    var call = (0, encode_1.encodeRouterCall)(multiAction, accountId, value);
-    return __assign({}, call);
-};
-exports.encodeDeposit = encodeDeposit;
-var encodeWithdraw = function (accountId, token, amount) {
-    var multiAction = new common_1.MultiAction();
-    (0, encode_1.encodeSingleWithdraw)(token, amount, multiAction);
-    var value = BigInt(0);
-    var call = (0, encode_1.encodeRouterCall)(multiAction, accountId, value);
-    return __assign({}, call);
-};
-exports.encodeWithdraw = encodeWithdraw;
 var encodeTransferMargin = function (signer, chainId, coreSigNonce, fromMarginAccountId, toMarginAccountId, token, amount) { return __awaiter(void 0, void 0, void 0, function () {
     var multiAction, eip712Signature, value, functionSignature, parameters, INTERFACE, calldata;
     return __generator(this, function (_a) {
@@ -130,27 +103,6 @@ var encodeWithdrawMAAndBridge = function (accountId, corePeripheryTokenAddress,
     return { calldata: calldata, value: BigInt(0).toString(10) };
 };
 exports.encodeWithdrawMAAndBridge = encodeWithdrawMAAndBridge;
-var encodeBridgeAndDepositNewMA = function (receiver, socketMsgGasLimit, socketConnector, socketBridgeOptions, socketFees, accountOwner, peripheryTokenAddress, peripheryTokenAmount, moneyInOutTokenAmount) {
-    var PERIPHERY_INTERFACE = new ethers_1.Interface(common_2.PeripheryAbi);
-    var inputs = {
-        accountOwner: accountOwner,
-        token: peripheryTokenAddress,
-    };
-    var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositNewMA((address,address))', [inputs]);
-    var functionSignature = 'bridge';
-    var parameters = [
-        receiver,
-        moneyInOutTokenAmount,
-        socketMsgGasLimit,
-        socketConnector,
-        peripheryCalldata,
-        socketBridgeOptions,
-    ];
-    var INTERFACE = new ethers_1.Interface(common_2.Socket_VaultWithPayloadAbi);
-    var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
-    return { calldata: calldata, value: socketFees.toString(10) };
-};
-exports.encodeBridgeAndDepositNewMA = encodeBridgeAndDepositNewMA;
 var encodeBridgeAndDepositExistingMA = function (receiver, socketMsgGasLimit, socketConnector, socketBridgeOptions, socketFees, accountId, peripheryTokenAddress, peripheryTokenAmount, moneyInOutTokenAmount) {
     var PERIPHERY_INTERFACE = new ethers_1.Interface(common_2.PeripheryAbi);
     var inputs = {

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

@@ -1 +1 @@
-{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { MethodParameters, MultiAction } from '@reyaxyz/common';\nimport { Interface } from 'ethers';\nimport {\n  encodeRouterCall,\n  encodeSingleDeposit,\n  encodeSingleTransferMargin,\n  encodeSingleWithdraw,\n} from '../encode';\nimport {\n  CoreAbi as abi,\n  PeripheryAbi,\n  Socket_VaultWithPayloadAbi,\n  CORE_DEADLINE_IN_SECONDS,\n  EIP712Signature,\n  signCoreCommands,\n  ContractType,\n  getAddress,\n} from '@reyaxyz/common';\nimport { getCurrentTimestampInSeconds } from '@reyaxyz/common';\nimport { Signer } from 'ethers';\nimport { ethers } from 'ethers';\n\nexport const encodeCreateAccountCall = (\n  accountOwner: string,\n): MethodParameters => {\n  const functionSignature = 'createAccount';\n  const parameters = [accountOwner];\n  const INTERFACE = new Interface(abi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeDeposit = (\n  accountId: number,\n  token: string,\n  amount: bigint,\n): MethodParameters => {\n  const multiAction = new MultiAction();\n\n  encodeSingleDeposit(token, amount, multiAction);\n\n  const value = BigInt(0);\n  const call = encodeRouterCall(multiAction, accountId, value);\n\n  return {\n    ...call,\n  };\n};\n\nexport const encodeWithdraw = (\n  accountId: number,\n  token: string,\n  amount: bigint,\n): MethodParameters => {\n  const multiAction = new MultiAction();\n\n  encodeSingleWithdraw(token, amount, multiAction);\n\n  const value = BigInt(0);\n  const call = encodeRouterCall(multiAction, accountId, value);\n\n  return {\n    ...call,\n  };\n};\n\nexport const encodeTransferMargin = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  fromMarginAccountId: number,\n  toMarginAccountId: number,\n  token: string,\n  amount: bigint,\n): Promise<MethodParameters> => {\n  const multiAction = new MultiAction();\n  // todo: note can we make this more stateless?\n  encodeSingleTransferMargin(toMarginAccountId, token, amount, multiAction);\n\n  const { signature: eip712Signature } = await signCoreCommands(\n    signer,\n    chainId,\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    fromMarginAccountId,\n    multiAction.commands,\n    coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n    ethers.AbiCoder.defaultAbiCoder().encode([], []),\n  );\n\n  const value = BigInt(0);\n  const functionSignature = 'transferFromMAToMA';\n  const parameters = [\n    {\n      accountId: fromMarginAccountId,\n      transfer: {\n        destAccountId: toMarginAccountId,\n        collateral: token,\n        collateralAmount: amount,\n      },\n      sig: eip712Signature,\n    },\n  ];\n\n  const INTERFACE = new Interface(PeripheryAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(value).toString(10),\n  };\n};\n\nexport const encodeWithdrawMAAndBridge = (\n  accountId: number,\n  corePeripheryTokenAddress: string,\n  corePeripheryTokenAmount: bigint,\n  sig: EIP712Signature,\n  socketMsgGasLimit: bigint,\n  chainId: number,\n  receiver: string,\n): MethodParameters => {\n  const functionSignature = 'withdrawMA';\n  const parameters = [\n    {\n      accountId,\n      token: corePeripheryTokenAddress,\n      tokenAmount: corePeripheryTokenAmount,\n      sig,\n      socketMsgGasLimit,\n      chainId,\n      receiver,\n    },\n  ];\n  const INTERFACE = new Interface(PeripheryAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeBridgeAndDepositNewMA = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketBridgeOptions: string,\n  socketFees: bigint,\n  accountOwner: string,\n  peripheryTokenAddress: string,\n  peripheryTokenAmount: bigint,\n  moneyInOutTokenAmount: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(PeripheryAbi);\n  const inputs = {\n    accountOwner,\n    token: peripheryTokenAddress,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositNewMA((address,address))',\n    [inputs],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    moneyInOutTokenAmount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n    socketBridgeOptions,\n  ];\n  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: socketFees.toString(10) };\n};\n\nexport const encodeBridgeAndDepositExistingMA = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketBridgeOptions: string,\n  socketFees: bigint,\n  accountId: number,\n  peripheryTokenAddress: string,\n  peripheryTokenAmount: bigint,\n  moneyInOutTokenAmount: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(PeripheryAbi);\n  const inputs = {\n    accountId,\n    token: peripheryTokenAddress,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositExistingMA((uint128,address))',\n    [inputs],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    moneyInOutTokenAmount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n    socketBridgeOptions,\n  ];\n  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: socketFees.toString(10) };\n};\n"]}
+{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { MethodParameters, MultiAction } from '@reyaxyz/common';\nimport { Interface } from 'ethers';\nimport { encodeSingleTransferMargin } from '../encode';\nimport {\n  CoreAbi as abi,\n  PeripheryAbi,\n  Socket_VaultWithPayloadAbi,\n  CORE_DEADLINE_IN_SECONDS,\n  EIP712Signature,\n  signCoreCommands,\n  ContractType,\n  getAddress,\n} from '@reyaxyz/common';\nimport { getCurrentTimestampInSeconds } from '@reyaxyz/common';\nimport { Signer } from 'ethers';\nimport { ethers } from 'ethers';\n\nexport const encodeCreateAccountCall = (\n  accountOwner: string,\n): MethodParameters => {\n  const functionSignature = 'createAccount';\n  const parameters = [accountOwner];\n  const INTERFACE = new Interface(abi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeTransferMargin = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  fromMarginAccountId: number,\n  toMarginAccountId: number,\n  token: string,\n  amount: bigint,\n): Promise<MethodParameters> => {\n  const multiAction = new MultiAction();\n  // todo: note can we make this more stateless?\n  encodeSingleTransferMargin(toMarginAccountId, token, amount, multiAction);\n\n  const { signature: eip712Signature } = await signCoreCommands(\n    signer,\n    chainId,\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    fromMarginAccountId,\n    multiAction.commands,\n    coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n    ethers.AbiCoder.defaultAbiCoder().encode([], []),\n  );\n\n  const value = BigInt(0);\n  const functionSignature = 'transferFromMAToMA';\n  const parameters = [\n    {\n      accountId: fromMarginAccountId,\n      transfer: {\n        destAccountId: toMarginAccountId,\n        collateral: token,\n        collateralAmount: amount,\n      },\n      sig: eip712Signature,\n    },\n  ];\n\n  const INTERFACE = new Interface(PeripheryAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(value).toString(10),\n  };\n};\n\nexport const encodeWithdrawMAAndBridge = (\n  accountId: number,\n  corePeripheryTokenAddress: string,\n  corePeripheryTokenAmount: bigint,\n  sig: EIP712Signature,\n  socketMsgGasLimit: bigint,\n  chainId: number,\n  receiver: string,\n): MethodParameters => {\n  const functionSignature = 'withdrawMA';\n  const parameters = [\n    {\n      accountId,\n      token: corePeripheryTokenAddress,\n      tokenAmount: corePeripheryTokenAmount,\n      sig,\n      socketMsgGasLimit,\n      chainId,\n      receiver,\n    },\n  ];\n  const INTERFACE = new Interface(PeripheryAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeBridgeAndDepositExistingMA = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketBridgeOptions: string,\n  socketFees: bigint,\n  accountId: number,\n  peripheryTokenAddress: string,\n  peripheryTokenAmount: bigint,\n  moneyInOutTokenAmount: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(PeripheryAbi);\n  const inputs = {\n    accountId,\n    token: peripheryTokenAddress,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositExistingMA((uint128,address))',\n    [inputs],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    moneyInOutTokenAmount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n    socketBridgeOptions,\n  ];\n  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: socketFees.toString(10) };\n};\n"]}

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

@@ -16,10 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./types"), exports);
 __exportStar(require("./account"), exports);
-__exportStar(require("./deposit"), exports);
-__exportStar(require("./withdraw"), exports);
 __exportStar(require("./bridgeAndDepositExistingMA"), exports);
-__exportStar(require("./bridgeAndDepositNewMA"), exports);
 __exportStar(require("./transferMarginBetweenAccounts"), exports);
 __exportStar(require("./withdrawMAAndBridge"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,4CAA0B;AAC1B,6CAA2B;AAC3B,+DAA6C;AAC7C,0DAAwC;AACxC,kEAAgD;AAChD,wDAAsC","sourcesContent":["export * from './types';\nexport * from './account';\nexport * from './deposit';\nexport * from './withdraw';\nexport * from './bridgeAndDepositExistingMA';\nexport * from './bridgeAndDepositNewMA';\nexport * from './transferMarginBetweenAccounts';\nexport * from './withdrawMAAndBridge';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,+DAA6C;AAC7C,kEAAgD;AAChD,wDAAsC","sourcesContent":["export * from './types';\nexport * from './account';\nexport * from './bridgeAndDepositExistingMA';\nexport * from './transferMarginBetweenAccounts';\nexport * from './withdrawMAAndBridge';\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 { JsonRpcSigner, Signer } from 'ethers';\nimport {\n  MarginRatioHealth,\n  MoneyInOutChainId,\n  OwnerMetadataEntity,\n  SocketDepositFees,\n  TokenEntity,\n} from '@reyaxyz/common';\n\nexport type CreateAccountParams = {\n  ownerAddress: string;\n  name: string;\n  source?: string;\n};\n\nexport type CreateAccountResult = {\n  transactionHash: string | null;\n  accountId: number | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type DepositParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type DepositResult = {\n  transactionHash: string | null;\n};\n\nexport type WithdrawParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type WithdrawResult = {\n  transactionHash: string | null;\n};\n\nexport type SimulateDepositResult = {\n  bridgeGasFees: number;\n  marginRatioHealth: MarginRatioHealth;\n  marginRatio: number;\n};\n\n// TODO: Milan reevaluate these params\nexport type SimulateDepositParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type SimulateWithdrawResult = {\n  bridgeGasFees: number;\n\n  marginRatioHealth: MarginRatioHealth;\n  marginRatio: number;\n};\n\n// TODO: Milan reevaluate these params\nexport type SimulateWithdrawParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type TransferMarginBetweenAccountsParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  fromMarginAccountId: number;\n  toMarginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type TransferMarginBetweenAccountsResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type WithdrawMAAndBridgeParams = {\n  signer: Signer | JsonRpcSigner;\n  moneyInOutChainId: MoneyInOutChainId;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;\n  marginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n  // if not provided it has same value as owner.address\n  receiverAddress?: Lowercase<string>;\n};\n\nexport type WithdrawMAAndBridgeParamsResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type BridgeAndDepositNewMAParams = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: OwnerMetadataEntity['address'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n  socketDepositFees: SocketDepositFees['fees'];\n};\n\nexport type BridgeAndDepositNewMAResult = {\n  transactionHash: string | null;\n};\n\nexport type BridgeAndDepositExistingMAParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n  socketDepositFees: SocketDepositFees['fees'];\n  moneyInOutChainId?: MoneyInOutChainId;\n};\n\nexport type BridgeAndDepositExistingMAResult = {\n  transactionHash: string | null;\n};\n\nexport type SimulateTransferMarginBetweenAccountsResult = {\n  bridgeGasFees: number;\n  marginRatioHealth: MarginRatioHealth;\n  marginRatio: number;\n};\n\n// TODO: Milan reevaluate these params\nexport type SimulateTransferMarginBetweenAccountsParams = {\n  signer: Signer | JsonRpcSigner;\n  fromMarginAccountId: number;\n  toMarginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport {\n  MoneyInOutChainId,\n  OwnerMetadataEntity,\n  SocketDepositFees,\n  TokenEntity,\n} from '@reyaxyz/common';\n\nexport type CreateAccountParams = {\n  ownerAddress: string;\n  name: string;\n  source?: string;\n};\n\nexport type CreateAccountResult = {\n  transactionHash: string | null;\n  accountId: number | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type TransferMarginBetweenAccountsParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  fromMarginAccountId: number;\n  toMarginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type TransferMarginBetweenAccountsResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type WithdrawMAAndBridgeParams = {\n  signer: Signer | JsonRpcSigner;\n  moneyInOutChainId: MoneyInOutChainId;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;\n  marginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n  // if not provided it has same value as owner.address\n  receiverAddress?: Lowercase<string>;\n};\n\nexport type WithdrawMAAndBridgeParamsResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type BridgeAndDepositExistingMAParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n  socketDepositFees: SocketDepositFees['fees'];\n  moneyInOutChainId?: MoneyInOutChainId;\n};\n\nexport type BridgeAndDepositExistingMAResult = {\n  transactionHash: string | null;\n};\n"]}

package/dist/services/token/index.js

@@ -17,6 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./types"), exports);
 __exportStar(require("./approve"), exports);
 __exportStar(require("./getAllowance"), exports);
-__exportStar(require("./getBalanceByTokenAddress"), exports);
-__exportStar(require("./getRUSDUnderlyingSignerInfo"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/token/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,iDAA+B;AAC/B,6DAA2C;AAC3C,gEAA8C","sourcesContent":["export * from './types';\nexport * from './approve';\nexport * from './getAllowance';\nexport * from './getBalanceByTokenAddress';\nexport * from './getRUSDUnderlyingSignerInfo';\n"]}
+{"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":";;;AAKA,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,2CAAE,CAAA;IACF,qDAAO,CAAA;IACP,mDAAM,CAAA;AACR,CAAC,EAJW,YAAY,4BAAZ,YAAY,QAIvB","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { TokenEntity, TokenName } from '@reyaxyz/common';\n\nexport { GetBalancesForBridgeArgs } from '@reyaxyz/common';\n\nexport enum ApprovalType {\n  LP,\n  DEPOSIT,\n  BRIDGE,\n}\n\nexport type ApproveTokenParams = {\n  signer: Signer | JsonRpcSigner;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n  type: ApprovalType;\n};\n\nexport type GetAllowanceParams = {\n  signer: Signer | JsonRpcSigner;\n  tokenAddress: TokenEntity['address'];\n  type: ApprovalType;\n};\n\nexport type GetBalanceByTokenAddressParams = {\n  signer: Signer | JsonRpcSigner;\n  tokenAddress: TokenEntity['address'];\n};\n\nexport type GetRUSDUnderlyingSignerInfoParams = {\n  signer: Signer | JsonRpcSigner;\n};\n\nexport type GetRUSDUnderlyingSignerInfoResult = {\n  balance: number;\n  rusdUnderlying: TokenEntity;\n};\n\nexport type LPBalanceInfo = {\n  tokenEntity: TokenEntity;\n  balance: number;\n};\n\nexport type LPBalanceInfoV2 = {\n  [tokenName: TokenName]: {\n    tokenEntity: TokenEntity;\n    balance: number;\n  };\n};\n\nexport type GetBalancesForBridgeLPResult = {\n  [chainId: string]: LPBalanceInfo;\n};\n\nexport type GetBalancesForBridgeLPV2Result = {\n  [chainId: string]: LPBalanceInfoV2;\n};\nexport type MABalanceInfo = { [tokenName: TokenName]: number };\n\nexport type GetBalancesForBridgeMAResult = {\n  [chainId: string]: MABalanceInfo;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":";;;AAKA,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,2CAAE,CAAA;IACF,qDAAO,CAAA;IACP,mDAAM,CAAA;AACR,CAAC,EAJW,YAAY,4BAAZ,YAAY,QAIvB","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { TokenEntity } from '@reyaxyz/common';\n\nexport { GetBalancesForBridgeArgs } from '@reyaxyz/common';\n\nexport enum ApprovalType {\n  LP,\n  DEPOSIT,\n  BRIDGE,\n}\n\nexport type ApproveTokenParams = {\n  signer: Signer | JsonRpcSigner;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n  type: ApprovalType;\n};\n\nexport type GetAllowanceParams = {\n  signer: Signer | JsonRpcSigner;\n  tokenAddress: TokenEntity['address'];\n  type: ApprovalType;\n};\n"]}

package/dist/types/index.d.ts

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

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

@@ -1,9 +1,8 @@
-import { MethodParameters, MultiAction } from '@reyaxyz/common';
+import { MultiAction } from '@reyaxyz/common';
 export declare const encodeSingleDeposit: (token: string, amount: bigint, multiAction: MultiAction) => void;
 export declare const encodeSingleWithdraw: (token: string, amount: bigint, multiAction: MultiAction) => void;
 export declare const encodeSingleTransferMargin: (toMarginAccountId: number, token: string, amount: bigint, multiAction: MultiAction) => void;
 export declare const encodeSingleUnstakeFromMarginAccount: (poolId: number, srusdAmount: bigint, minOut: bigint, multiAction: MultiAction) => void;
 export declare const encodeSingleStakeFromMarginAccount: (poolId: number, amount: bigint, minShares: bigint, multiAction: MultiAction) => void;
 export declare const encodeSingleTrade: (counterpartyAccountIds: number[], orderBase: bigint, orderPriceLimit: bigint, marketId: number, exchangeId: number, multiAction: MultiAction) => void;
-export declare const encodeRouterCall: (multiAction: MultiAction, accountId: number, nativeCurrencyValue: bigint) => MethodParameters;
 //# sourceMappingURL=encode.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/encode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAW,MAAM,iBAAiB,CAAC;AAMzE,eAAO,MAAM,mBAAmB,UACvB,MAAM,UACL,MAAM,eACD,WAAW,KACvB,IAEF,CAAC;AAEF,eAAO,MAAM,oBAAoB,UACxB,MAAM,UACL,MAAM,eACD,WAAW,KACvB,IAIF,CAAC;AAEF,eAAO,MAAM,0BAA0B,sBAClB,MAAM,SAClB,MAAM,UACL,MAAM,eACD,WAAW,KACvB,IASF,CAAC;AAEF,eAAO,MAAM,oCAAoC,WACvC,MAAM,eACD,MAAM,UACX,MAAM,eACD,WAAW,KACvB,IASF,CAAC;AAEF,eAAO,MAAM,kCAAkC,WACrC,MAAM,UACN,MAAM,aACH,MAAM,eACJ,WAAW,KACvB,IASF,CAAC;AAEF,eAAO,MAAM,iBAAiB,2BACJ,MAAM,EAAE,aACrB,MAAM,mBACA,MAAM,YACb,MAAM,cACJ,MAAM,eACL,WAAW,KACvB,IAeF,CAAC;AAEF,eAAO,MAAM,gBAAgB,gBACd,WAAW,aACb,MAAM,uBACI,MAAM,KAC1B,gBAUF,CAAC"}
+{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/encode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAI9C,eAAO,MAAM,mBAAmB,UACvB,MAAM,UACL,MAAM,eACD,WAAW,KACvB,IAEF,CAAC;AAEF,eAAO,MAAM,oBAAoB,UACxB,MAAM,UACL,MAAM,eACD,WAAW,KACvB,IAIF,CAAC;AAEF,eAAO,MAAM,0BAA0B,sBAClB,MAAM,SAClB,MAAM,UACL,MAAM,eACD,WAAW,KACvB,IASF,CAAC;AAEF,eAAO,MAAM,oCAAoC,WACvC,MAAM,eACD,MAAM,UACX,MAAM,eACD,WAAW,KACvB,IASF,CAAC;AAEF,eAAO,MAAM,kCAAkC,WACrC,MAAM,UACN,MAAM,aACH,MAAM,eACJ,WAAW,KACvB,IASF,CAAC;AAEF,eAAO,MAAM,iBAAiB,2BACJ,MAAM,EAAE,aACrB,MAAM,mBACA,MAAM,YACb,MAAM,cACJ,MAAM,eACL,WAAW,KACvB,IAeF,CAAC"}

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

@@ -2,10 +2,7 @@ import { MethodParameters } from '@reyaxyz/common';
 import { EIP712Signature } from '@reyaxyz/common';
 import { Signer } from 'ethers';
 export declare const encodeCreateAccountCall: (accountOwner: string) => MethodParameters;
-export declare const encodeDeposit: (accountId: number, token: string, amount: bigint) => MethodParameters;
-export declare const encodeWithdraw: (accountId: number, token: string, amount: bigint) => MethodParameters;
 export declare const encodeTransferMargin: (signer: Signer, chainId: number, coreSigNonce: number, fromMarginAccountId: number, toMarginAccountId: number, token: string, amount: bigint) => Promise<MethodParameters>;
 export declare const encodeWithdrawMAAndBridge: (accountId: number, corePeripheryTokenAddress: string, corePeripheryTokenAmount: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint, chainId: number, receiver: string) => MethodParameters;
-export declare const encodeBridgeAndDepositNewMA: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketBridgeOptions: string, socketFees: bigint, accountOwner: string, peripheryTokenAddress: string, peripheryTokenAmount: bigint, moneyInOutTokenAmount: bigint) => MethodParameters;
 export declare const encodeBridgeAndDepositExistingMA: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketBridgeOptions: string, socketFees: bigint, accountId: number, peripheryTokenAddress: string, peripheryTokenAmount: bigint, moneyInOutTokenAmount: bigint) => MethodParameters;
 //# sourceMappingURL=encode.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,iBAAiB,CAAC;AAQhE,OAAO,EAKL,eAAe,EAIhB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,eAAO,MAAM,uBAAuB,iBACpB,MAAM,KACnB,gBAMF,CAAC;AAEF,eAAO,MAAM,aAAa,cACb,MAAM,SACV,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,cAAc,cACd,MAAM,SACV,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,oBAAoB,WACvB,MAAM,WACL,MAAM,gBACD,MAAM,uBACC,MAAM,qBACR,MAAM,SAClB,MAAM,UACL,MAAM,KACb,QAAQ,gBAAgB,CAoC1B,CAAC;AAEF,eAAO,MAAM,yBAAyB,cACzB,MAAM,6BACU,MAAM,4BACP,MAAM,OAC3B,eAAe,qBACD,MAAM,WAChB,MAAM,YACL,MAAM,KACf,gBAgBF,CAAC;AAEF,eAAO,MAAM,2BAA2B,aAC5B,MAAM,qBACG,MAAM,mBACR,MAAM,uBACF,MAAM,cACf,MAAM,gBACJ,MAAM,yBACG,MAAM,wBACP,MAAM,yBACL,MAAM,KAC5B,gBAuBF,CAAC;AAEF,eAAO,MAAM,gCAAgC,aACjC,MAAM,qBACG,MAAM,mBACR,MAAM,uBACF,MAAM,cACf,MAAM,aACP,MAAM,yBACM,MAAM,wBACP,MAAM,yBACL,MAAM,KAC5B,gBAuBF,CAAC"}
+{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,iBAAiB,CAAC;AAGhE,OAAO,EAKL,eAAe,EAIhB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,eAAO,MAAM,uBAAuB,iBACpB,MAAM,KACnB,gBAMF,CAAC;AAEF,eAAO,MAAM,oBAAoB,WACvB,MAAM,WACL,MAAM,gBACD,MAAM,uBACC,MAAM,qBACR,MAAM,SAClB,MAAM,UACL,MAAM,KACb,QAAQ,gBAAgB,CAoC1B,CAAC;AAEF,eAAO,MAAM,yBAAyB,cACzB,MAAM,6BACU,MAAM,4BACP,MAAM,OAC3B,eAAe,qBACD,MAAM,WAChB,MAAM,YACL,MAAM,KACf,gBAgBF,CAAC;AAEF,eAAO,MAAM,gCAAgC,aACjC,MAAM,qBACG,MAAM,mBACR,MAAM,uBACF,MAAM,cACf,MAAM,aACP,MAAM,yBACM,MAAM,wBACP,MAAM,yBACL,MAAM,KAC5B,gBAuBF,CAAC"}

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

@@ -1,9 +1,6 @@
 export * from './types';
 export * from './account';
-export * from './deposit';
-export * from './withdraw';
 export * from './bridgeAndDepositExistingMA';
-export * from './bridgeAndDepositNewMA';
 export * from './transferMarginBetweenAccounts';
 export * from './withdrawMAAndBridge';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +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;AAC3B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,iCAAiC,CAAC;AAChD,cAAc,uBAAuB,CAAC"}
+{"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,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,uBAAuB,CAAC"}

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

@@ -1,5 +1,5 @@
 import { JsonRpcSigner, Signer } from 'ethers';
-import { MarginRatioHealth, MoneyInOutChainId, OwnerMetadataEntity, SocketDepositFees, TokenEntity } from '@reyaxyz/common';
+import { MoneyInOutChainId, OwnerMetadataEntity, SocketDepositFees, TokenEntity } from '@reyaxyz/common';
 export type CreateAccountParams = {
     ownerAddress: string;
     name: string;
@@ -10,46 +10,6 @@ export type CreateAccountResult = {
     accountId: number | null;
     coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;
 };
-export type DepositParams = {
-    signer: Signer | JsonRpcSigner;
-    marginAccountId: number;
-    tokenAddress: TokenEntity['address'];
-    amount: number;
-};
-export type DepositResult = {
-    transactionHash: string | null;
-};
-export type WithdrawParams = {
-    signer: Signer | JsonRpcSigner;
-    marginAccountId: number;
-    tokenAddress: TokenEntity['address'];
-    amount: number;
-};
-export type WithdrawResult = {
-    transactionHash: string | null;
-};
-export type SimulateDepositResult = {
-    bridgeGasFees: number;
-    marginRatioHealth: MarginRatioHealth;
-    marginRatio: number;
-};
-export type SimulateDepositParams = {
-    signer: Signer | JsonRpcSigner;
-    marginAccountId: number;
-    tokenAddress: TokenEntity['address'];
-    amount: number;
-};
-export type SimulateWithdrawResult = {
-    bridgeGasFees: number;
-    marginRatioHealth: MarginRatioHealth;
-    marginRatio: number;
-};
-export type SimulateWithdrawParams = {
-    signer: Signer | JsonRpcSigner;
-    marginAccountId: number;
-    tokenAddress: TokenEntity['address'];
-    amount: number;
-};
 export type TransferMarginBetweenAccountsParams = {
     signer: Signer | JsonRpcSigner;
     owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;
@@ -75,16 +35,6 @@ export type WithdrawMAAndBridgeParamsResult = {
     transactionHash: string | null;
     coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;
 };
-export type BridgeAndDepositNewMAParams = {
-    signer: Signer | JsonRpcSigner;
-    ownerAddress: OwnerMetadataEntity['address'];
-    tokenAddress: TokenEntity['address'];
-    amount: number;
-    socketDepositFees: SocketDepositFees['fees'];
-};
-export type BridgeAndDepositNewMAResult = {
-    transactionHash: string | null;
-};
 export type BridgeAndDepositExistingMAParams = {
     signer: Signer | JsonRpcSigner;
     marginAccountId: number;
@@ -96,16 +46,4 @@ export type BridgeAndDepositExistingMAParams = {
 export type BridgeAndDepositExistingMAResult = {
     transactionHash: string | null;
 };
-export type SimulateTransferMarginBetweenAccountsResult = {
-    bridgeGasFees: number;
-    marginRatioHealth: MarginRatioHealth;
-    marginRatio: number;
-};
-export type SimulateTransferMarginBetweenAccountsParams = {
-    signer: Signer | JsonRpcSigner;
-    fromMarginAccountId: number;
-    toMarginAccountId: number;
-    tokenAddress: TokenEntity['address'];
-    amount: number;
-};
 //# sourceMappingURL=types.d.ts.map

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":"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"}
+{"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;AAC/C,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,mBAAmB,GAAG;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;CAC1D,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;IACjD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;CAC1D,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,cAAc,CAAC,CAAC;IAC7D,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IAEf,eAAe,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG;IAC5C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;CAC1D,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC7C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC"}

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

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

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

@@ -1 +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;AAC/B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,+BAA+B,CAAC"}
+{"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,5 +1,5 @@
 import { JsonRpcSigner, Signer } from 'ethers';
-import { TokenEntity, TokenName } from '@reyaxyz/common';
+import { TokenEntity } from '@reyaxyz/common';
 export { GetBalancesForBridgeArgs } from '@reyaxyz/common';
 export declare enum ApprovalType {
     LP = 0,
@@ -17,37 +17,4 @@ export type GetAllowanceParams = {
     tokenAddress: TokenEntity['address'];
     type: ApprovalType;
 };
-export type GetBalanceByTokenAddressParams = {
-    signer: Signer | JsonRpcSigner;
-    tokenAddress: TokenEntity['address'];
-};
-export type GetRUSDUnderlyingSignerInfoParams = {
-    signer: Signer | JsonRpcSigner;
-};
-export type GetRUSDUnderlyingSignerInfoResult = {
-    balance: number;
-    rusdUnderlying: TokenEntity;
-};
-export type LPBalanceInfo = {
-    tokenEntity: TokenEntity;
-    balance: number;
-};
-export type LPBalanceInfoV2 = {
-    [tokenName: TokenName]: {
-        tokenEntity: TokenEntity;
-        balance: number;
-    };
-};
-export type GetBalancesForBridgeLPResult = {
-    [chainId: string]: LPBalanceInfo;
-};
-export type GetBalancesForBridgeLPV2Result = {
-    [chainId: string]: LPBalanceInfoV2;
-};
-export type MABalanceInfo = {
-    [tokenName: TokenName]: number;
-};
-export type GetBalancesForBridgeMAResult = {
-    [chainId: string]: MABalanceInfo;
-};
 //# sourceMappingURL=types.d.ts.map

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,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAE3D,oBAAY,YAAY;IACtB,EAAE,IAAA;IACF,OAAO,IAAA;IACP,MAAM,IAAA;CACP;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,WAAW,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,CAAC,SAAS,EAAE,SAAS,GAAG;QACtB,WAAW,EAAE,WAAW,CAAC;QACzB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CAAC;CACpC,CAAC;AACF,MAAM,MAAM,aAAa,GAAG;IAAE,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,CAAA;CAAE,CAAC;AAE/D,MAAM,MAAM,4BAA4B,GAAG;IACzC,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC;CAClC,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;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAE3D,oBAAY,YAAY;IACtB,EAAE,IAAA;IACF,OAAO,IAAA;IACP,MAAM,IAAA;CACP;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.144.2",
+  "version": "0.145.1",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -30,12 +30,12 @@
     "test:spot-order": "npx ts-node scripts/test-spot-order.ts"
   },
   "dependencies": {
-    "@reyaxyz/api-v2-sdk": "0.301.8",
-    "@reyaxyz/common": "0.340.1",
+    "@reyaxyz/api-v2-sdk": "0.301.10",
+    "@reyaxyz/common": "0.340.2",
     "axios": "1.6.2",
     "bignumber.js": "9.1.2",
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.3.1",
-  "gitHead": "81fe181d39be63346c1446af37a7bc1c7250541d"
+  "gitHead": "ad95bf078b3be858c45df5252e3f7096e1f362a6"
 }

package/src/index.ts

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

package/src/services/encode.ts

@@ -1,11 +1,9 @@
 ////////////////////  ENCODE SINGLE  ////////////////////
 
-import { MethodParameters, MultiAction, CoreAbi } from '@reyaxyz/common';
+import { MultiAction } from '@reyaxyz/common';
 import { CommandType, getCommand } from '@reyaxyz/common';
-import { AbiCoder, Interface } from 'ethers';
-// const abi = [
-//   'function coreExecute(uint128 poolId, uint128 accountId, Command[] commands, EIP712Signature sig)',
-// ];
+import { AbiCoder } from 'ethers';
+
 export const encodeSingleDeposit = (
   token: string,
   amount: bigint,
@@ -95,19 +93,3 @@ export const encodeSingleTrade = (
     ),
   );
 };
-
-export const encodeRouterCall = (
-  multiAction: MultiAction,
-  accountId: number,
-  nativeCurrencyValue: bigint,
-): MethodParameters => {
-  const functionSignature = 'execute';
-  const parameters = [accountId, multiAction.commands];
-
-  const INTERFACE = new Interface(CoreAbi);
-  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
-  return {
-    calldata: calldata,
-    value: BigInt(nativeCurrencyValue).toString(10),
-  };
-};