@reyaxyz/sdk 0.20.2 → 0.20.3

package/dist/services/lp/index.js

@@ -19,4 +19,5 @@ __exportStar(require("./lp"), exports);
 __exportStar(require("./bridgeAndDepositPassivePool"), exports);
 __exportStar(require("./transferFromMAToPool"), exports);
 __exportStar(require("./withdrawPassivePoolAndBridge"), exports);
+__exportStar(require("./simulateTransferFromMAToPool"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/lp/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,uCAAqB;AACrB,gEAA8C;AAC9C,yDAAuC;AACvC,iEAA+C","sourcesContent":["export * from './types';\nexport * from './lp';\nexport * from './bridgeAndDepositPassivePool';\nexport * from './transferFromMAToPool';\nexport * from './withdrawPassivePoolAndBridge';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/lp/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,uCAAqB;AACrB,gEAA8C;AAC9C,yDAAuC;AACvC,iEAA+C;AAC/C,iEAA+C","sourcesContent":["export * from './types';\nexport * from './lp';\nexport * from './bridgeAndDepositPassivePool';\nexport * from './transferFromMAToPool';\nexport * from './withdrawPassivePoolAndBridge';\nexport * from './simulateTransferFromMAToPool';\n"]}

package/dist/services/lp/simulateTransferFromMAToPool.js

@@ -0,0 +1,67 @@
+"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.simulateTransferFromMAToPool = void 0;
+// The maximum is inclusive and the minimum is inclusive
+function getRandomIntInclusive(min, max) {
+    min = Math.ceil(min);
+    max = Math.floor(max);
+    return Math.floor(Math.random() * (max - min + 1) + min);
+}
+var randomSimulation = function () {
+    return {
+        bridgeGasFees: getRandomIntInclusive(1000, 100000),
+        estimatedDepositedAmount: getRandomIntInclusive(1000, 100000),
+    };
+};
+var simulateTransferFromMAToPool = function (
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+params) { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, new Promise(function (resolve) {
+                    setTimeout(function () {
+                        resolve(randomSimulation());
+                    }, Math.random() * 100 + 1000);
+                })];
+            case 1: return [2 /*return*/, _a.sent()];
+        }
+    });
+}); };
+exports.simulateTransferFromMAToPool = simulateTransferFromMAToPool;
+//# sourceMappingURL=simulateTransferFromMAToPool.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"simulateTransferFromMAToPool.js","sourceRoot":"/","sources":["services/lp/simulateTransferFromMAToPool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,wDAAwD;AACxD,SAAS,qBAAqB,CAAC,GAAW,EAAE,GAAW;IACrD,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;AAC3D,CAAC;AAED,IAAM,gBAAgB,GAAG;IACvB,OAAO;QACL,aAAa,EAAE,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC;QAClD,wBAAwB,EAAE,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC;KAC9D,CAAC;AACJ,CAAC,CAAC;AAEK,IAAM,4BAA4B,GAAG;AAC1C,6DAA6D;AAC7D,MAA0C;;;oBAEnC,qBAAM,IAAI,OAAO,CAAC,UAAC,OAAO;oBAC/B,UAAU,CACR;wBACE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;oBAC9B,CAAC,EACD,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,IAAI,CAC3B,CAAC;gBACJ,CAAC,CAAC,EAAA;oBAPF,sBAAO,SAOL,EAAC;;;KACJ,CAAC;AAZW,QAAA,4BAA4B,gCAYvC","sourcesContent":["import {\n  SimulateTransferFromMAToPoolParams,\n  SimulateTransferFromMAToPoolResult,\n} from './types';\n\n// The maximum is inclusive and the minimum is inclusive\nfunction getRandomIntInclusive(min: number, max: number) {\n  min = Math.ceil(min);\n  max = Math.floor(max);\n  return Math.floor(Math.random() * (max - min + 1) + min);\n}\n\nconst randomSimulation = (): SimulateTransferFromMAToPoolResult => {\n  return {\n    bridgeGasFees: getRandomIntInclusive(1000, 100000),\n    estimatedDepositedAmount: getRandomIntInclusive(1000, 100000),\n  };\n};\n\nexport const simulateTransferFromMAToPool = async (\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  params: SimulateTransferFromMAToPoolParams,\n): Promise<SimulateTransferFromMAToPoolResult> => {\n  return await new Promise((resolve) => {\n    setTimeout(\n      () => {\n        resolve(randomSimulation());\n      },\n      Math.random() * 100 + 1000,\n    );\n  });\n};\n"]}

package/dist/services/lp/transferFromMAToPool.js

@@ -53,12 +53,12 @@ var transferFromMAToPool = function (params) { return __awaiter(void 0, void 0,
             case 1:
                 network = _c.sent();
                 chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
-                return [4 /*yield*/, (0, sign_1.signCoreCommands)(params.signer, chainId, params.accountId, params.owner.coreSigNonce, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS)];
+                return [4 /*yield*/, (0, sign_1.signCoreCommands)(params.signer, chainId, params.marginAccountId, params.owner.coreSigNonce, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS)];
             case 2:
                 eip712Signature = _c.sent();
                 tokenDecimals = (0, common_2.getTokenDetails)(params.pool.tokenAddress).tokenDecimals;
                 amount = (0, common_2.scale)(tokenDecimals)(params.amount);
-                _a = (0, encode_1.encodeTransferFromMAToPool)(params.accountId, amount, eip712Signature, params.pool.id, params.owner.address, BigInt(0)), data = _a.calldata, value = _a.value;
+                _a = (0, encode_1.encodeTransferFromMAToPool)(params.marginAccountId, amount, eip712Signature, params.pool.id, params.owner.address, BigInt(0)), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY)];
             case 3:
                 result = _c.sent();

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

@@ -1 +1 @@
-{"version":3,"file":"transferFromMAToPool.js","sourceRoot":"/","sources":["services/lp/transferFromMAToPool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA+D;AAC/D,mEAA6D;AAC7D,4DAA2D;AAC3D,gCAA2C;AAC3C,0CAAyD;AACzD,mCAAsD;AAKtD,6CAAgE;AAEzD,IAAM,oBAAoB,GAAG,UAClC,MAAkC;;;;;oBAElB,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;gBAEjB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBANK,eAAe,GAAG,SAMvB;gBAEO,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,cAA9C,CAA+C;gBAC9D,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,mCAA0B,EAC1D,MAAM,CAAC,SAAS,EAChB,MAAM,EACN,eAAe,EACf,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,KAAK,CAAC,OAAO,EACpB,MAAM,CAAC,CAAC,CAAC,CACV,EAPiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAO3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,eAAe,CAC7B,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AArCW,QAAA,oBAAoB,wBAqC/B","sourcesContent":["import { getCurrentTimestampInSeconds } from '@reyaxyz/common';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signCoreCommands } from '../sign';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeTransferFromMAToPool } from './encode';\nimport {\n  TransferFromMAToPoolParams,\n  TransferFromMAToPoolResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const transferFromMAToPool = async (\n  params: TransferFromMAToPoolParams,\n): Promise<TransferFromMAToPoolResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const eip712Signature = await signCoreCommands(\n    params.signer,\n    chainId,\n    params.accountId,\n    params.owner.coreSigNonce,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const { tokenDecimals } = getTokenDetails(params.pool.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const { calldata: data, value } = encodeTransferFromMAToPool(\n    params.accountId,\n    amount,\n    eip712Signature,\n    params.pool.id,\n    params.owner.address,\n    BigInt(0),\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.PERIPHERY_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"transferFromMAToPool.js","sourceRoot":"/","sources":["services/lp/transferFromMAToPool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA+D;AAC/D,mEAA6D;AAC7D,4DAA2D;AAC3D,gCAA2C;AAC3C,0CAAyD;AACzD,mCAAsD;AAKtD,6CAAgE;AAEzD,IAAM,oBAAoB,GAAG,UAClC,MAAkC;;;;;oBAElB,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;gBAEjB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBANK,eAAe,GAAG,SAMvB;gBAEO,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,cAA9C,CAA+C;gBAC9D,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,mCAA0B,EAC1D,MAAM,CAAC,eAAe,EACtB,MAAM,EACN,eAAe,EACf,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,KAAK,CAAC,OAAO,EACpB,MAAM,CAAC,CAAC,CAAC,CACV,EAPiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAO3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,eAAe,CAC7B,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AArCW,QAAA,oBAAoB,wBAqC/B","sourcesContent":["import { getCurrentTimestampInSeconds } from '@reyaxyz/common';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signCoreCommands } from '../sign';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeTransferFromMAToPool } from './encode';\nimport {\n  TransferFromMAToPoolParams,\n  TransferFromMAToPoolResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const transferFromMAToPool = async (\n  params: TransferFromMAToPoolParams,\n): Promise<TransferFromMAToPoolResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const eip712Signature = await signCoreCommands(\n    params.signer,\n    chainId,\n    params.marginAccountId,\n    params.owner.coreSigNonce,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const { tokenDecimals } = getTokenDetails(params.pool.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const { calldata: data, value } = encodeTransferFromMAToPool(\n    params.marginAccountId,\n    amount,\n    eip712Signature,\n    params.pool.id,\n    params.owner.address,\n    BigInt(0),\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.PERIPHERY_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\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 { JsonRpcSigner, Signer } from 'ethers';\nimport {\n  LpPoolEntity,\n  LpWithdrawBalanceEntity,\n  MarginAccountEntity,\n  OwnerMetadataEntity,\n} from '@reyaxyz/common';\n\nexport type ProvideLiquidityParams = {\n  signer: Signer | JsonRpcSigner;\n  amount: number;\n  lpPoolId: LpPoolEntity['id'];\n};\n\nexport type RemoveLiquidityParams = {\n  signer: Signer | JsonRpcSigner;\n  lpPoolId: LpPoolEntity['id'];\n  amount: number;\n};\n\nexport type ProvideLiquidityResult = {\n  transactionHash: string | null;\n};\n\nexport type RemoveLiquidityResult = {\n  transactionHash: string | null;\n};\n\nexport type TransferFromMAToPoolParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;\n  accountId: MarginAccountEntity['id'];\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n};\n\nexport type TransferFromMAToPoolResult = {\n  transactionHash: string | null;\n};\n\nexport type WithdrawPassivePoolAndBridgeParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'poolSigNonce'>;\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n  sharePrice: LpWithdrawBalanceEntity['poolSharePrice'];\n};\n\nexport type WithdrawPassivePoolAndBridgeResult = {\n  transactionHash: string | null;\n};\n\nexport type BridgeAndDepositPassivePoolParams = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: OwnerMetadataEntity['address'];\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n};\n\nexport type BridgeAndDepositPassivePoolResult = {\n  transactionHash: string | null;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport {\n  LpPoolEntity,\n  LpWithdrawBalanceEntity,\n  MarginAccountEntity,\n  OwnerMetadataEntity,\n} from '@reyaxyz/common';\n\nexport type ProvideLiquidityParams = {\n  signer: Signer | JsonRpcSigner;\n  amount: number;\n  lpPoolId: LpPoolEntity['id'];\n};\n\nexport type RemoveLiquidityParams = {\n  signer: Signer | JsonRpcSigner;\n  lpPoolId: LpPoolEntity['id'];\n  amount: number;\n};\n\nexport type ProvideLiquidityResult = {\n  transactionHash: string | null;\n};\n\nexport type RemoveLiquidityResult = {\n  transactionHash: string | null;\n};\n\nexport type TransferFromMAToPoolParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;\n  marginAccountId: MarginAccountEntity['id'];\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n};\n\nexport type TransferFromMAToPoolResult = {\n  transactionHash: string | null;\n};\n\nexport type WithdrawPassivePoolAndBridgeParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'poolSigNonce'>;\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n  sharePrice: LpWithdrawBalanceEntity['poolSharePrice'];\n};\n\nexport type WithdrawPassivePoolAndBridgeResult = {\n  transactionHash: string | null;\n};\n\nexport type BridgeAndDepositPassivePoolParams = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: OwnerMetadataEntity['address'];\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n};\n\nexport type BridgeAndDepositPassivePoolResult = {\n  transactionHash: string | null;\n};\n\nexport type SimulateTransferFromMAToPoolResult = {\n  bridgeGasFees: number;\n  estimatedDepositedAmount: number;\n};\n\n// TODO: Milan reevaluate these params\nexport type SimulateTransferFromMAToPoolParams = {\n  signer: Signer | JsonRpcSigner;\n  lpPoolId: LpPoolEntity['id'];\n  tokenAddress: LpPoolEntity['tokenAddress'];\n  amount: number;\n};\n"]}

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

@@ -53,7 +53,7 @@ var bridgeAndDepositExisingMA = function (params) { return __awaiter(void 0, voi
             case 1:
                 network = _c.sent();
                 chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
-                return [4 /*yield*/, (0, sign_1.signCoreCommands)(params.signer, chainId, params.accountId, params.owner.coreSigNonce, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS)];
+                return [4 /*yield*/, (0, sign_1.signCoreCommands)(params.signer, chainId, params.marginAccountId, params.owner.coreSigNonce, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS)];
             case 2:
                 eip712Signature = _c.sent();
                 tokenDecimals = (0, common_2.getTokenDetails)(params.tokenAddress).tokenDecimals;
@@ -61,7 +61,7 @@ var bridgeAndDepositExisingMA = function (params) { return __awaiter(void 0, voi
                 _a = (0, encode_1.encodeBridgeAndDepositExistingMA)((0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), BigInt('10000000'), (0, common_1.getSocketConnector)({
                     chainId: chainId,
                     tokenAddress: params.tokenAddress,
-                }), params.accountId, params.tokenAddress, amount, eip712Signature), data = _a.calldata, value = _a.value;
+                }), params.marginAccountId, params.tokenAddress, amount, eip712Signature), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, (0, common_1.getSocketVault)({
                         moneyInOutChainId: chainId,
                         tokenAddress: params.tokenAddress,

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

@@ -1 +1 @@
-{"version":3,"file":"bridgeAndDepositExistingMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAIyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAyD;AACzD,mCAA4D;AAK5D,gCAA2C;AAC3C,6CAAgE;AAEzD,IAAM,yBAAyB,GAAG,UACvC,MAAuC;;;;;oBAEvB,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;gBACjB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBANK,eAAe,GAAG,SAMvB;gBAEO,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,yCAAgC,EAChE,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,EACF,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,eAAe,CAChB,EAXiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAW3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;qBAClC,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA3CW,QAAA,yBAAyB,6BA2CpC","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  getSocketConnector,\n  getSocketVault,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeBridgeAndDepositExistingMA } from './encode';\nimport {\n  BridgeAndDepositExisingMAParams,\n  BridgeAndDepositExisingMAResult,\n} from './types';\nimport { signCoreCommands } from '../sign';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const bridgeAndDepositExisingMA = async (\n  params: BridgeAndDepositExisingMAParams,\n): Promise<BridgeAndDepositExisingMAResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n  const eip712Signature = await signCoreCommands(\n    params.signer,\n    chainId,\n    params.accountId,\n    params.owner.coreSigNonce,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const { calldata: data, value } = encodeBridgeAndDepositExistingMA(\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    BigInt('10000000'),\n    getSocketConnector({\n      chainId: chainId,\n      tokenAddress: params.tokenAddress,\n    }),\n    params.accountId,\n    params.tokenAddress,\n    amount,\n    eip712Signature,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    getSocketVault({\n      moneyInOutChainId: chainId,\n      tokenAddress: params.tokenAddress,\n    }),\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"bridgeAndDepositExistingMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAIyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAyD;AACzD,mCAA4D;AAK5D,gCAA2C;AAC3C,6CAAgE;AAEzD,IAAM,yBAAyB,GAAG,UACvC,MAAuC;;;;;oBAEvB,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;gBACjB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBANK,eAAe,GAAG,SAMvB;gBAEO,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,yCAAgC,EAChE,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,EACF,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,eAAe,CAChB,EAXiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAW3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;qBAClC,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA3CW,QAAA,yBAAyB,6BA2CpC","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  getSocketConnector,\n  getSocketVault,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeBridgeAndDepositExistingMA } from './encode';\nimport {\n  BridgeAndDepositExisingMAParams,\n  BridgeAndDepositExisingMAResult,\n} from './types';\nimport { signCoreCommands } from '../sign';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const bridgeAndDepositExisingMA = async (\n  params: BridgeAndDepositExisingMAParams,\n): Promise<BridgeAndDepositExisingMAResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n  const eip712Signature = await signCoreCommands(\n    params.signer,\n    chainId,\n    params.marginAccountId,\n    params.owner.coreSigNonce,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const { calldata: data, value } = encodeBridgeAndDepositExistingMA(\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    BigInt('10000000'),\n    getSocketConnector({\n      chainId: chainId,\n      tokenAddress: params.tokenAddress,\n    }),\n    params.marginAccountId,\n    params.tokenAddress,\n    amount,\n    eip712Signature,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    getSocketVault({\n      moneyInOutChainId: chainId,\n      tokenAddress: params.tokenAddress,\n    }),\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -24,4 +24,5 @@ __exportStar(require("./bridgeAndDepositExistingMA"), exports);
 __exportStar(require("./bridgeAndDepositNewMA"), exports);
 __exportStar(require("./transferMarginBetweenAccounts"), exports);
 __exportStar(require("./withdrawMAAndBridge"), exports);
+__exportStar(require("./simulateTransferMarginBetweenAccounts"), 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,oDAAkC;AAClC,qDAAmC;AACnC,6CAA2B;AAC3B,+DAA6C;AAC7C,0DAAwC;AACxC,kEAAgD;AAChD,wDAAsC","sourcesContent":["export * from './types';\nexport * from './account';\nexport * from './deposit';\nexport * from './simulateDeposit';\nexport * from './simulateWithdraw';\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,4CAA0B;AAC1B,oDAAkC;AAClC,qDAAmC;AACnC,6CAA2B;AAC3B,+DAA6C;AAC7C,0DAAwC;AACxC,kEAAgD;AAChD,wDAAsC;AACtC,0EAAwD","sourcesContent":["export * from './types';\nexport * from './account';\nexport * from './deposit';\nexport * from './simulateDeposit';\nexport * from './simulateWithdraw';\nexport * from './withdraw';\nexport * from './bridgeAndDepositExistingMA';\nexport * from './bridgeAndDepositNewMA';\nexport * from './transferMarginBetweenAccounts';\nexport * from './withdrawMAAndBridge';\nexport * from './simulateTransferMarginBetweenAccounts';\n"]}

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

@@ -0,0 +1,68 @@
+"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.simulateTransferMarginBetweenAccounts = void 0;
+// The maximum is inclusive and the minimum is inclusive
+function getRandomIntInclusive(min, max) {
+    min = Math.ceil(min);
+    max = Math.floor(max);
+    return Math.floor(Math.random() * (max - min + 1) + min);
+}
+var randomSimulation = function () {
+    return {
+        bridgeGasFees: getRandomIntInclusive(1000, 100000),
+        marginRatio: getRandomIntInclusive(1, 100),
+        marginRatioHealth: 'danger',
+    };
+};
+var simulateTransferMarginBetweenAccounts = function (
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+params) { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, new Promise(function (resolve) {
+                    setTimeout(function () {
+                        resolve(randomSimulation());
+                    }, Math.random() * 100 + 1000);
+                })];
+            case 1: return [2 /*return*/, _a.sent()];
+        }
+    });
+}); };
+exports.simulateTransferMarginBetweenAccounts = simulateTransferMarginBetweenAccounts;
+//# sourceMappingURL=simulateTransferMarginBetweenAccounts.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"simulateTransferMarginBetweenAccounts.js","sourceRoot":"/","sources":["services/margin-accounts/simulateTransferMarginBetweenAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,wDAAwD;AACxD,SAAS,qBAAqB,CAAC,GAAW,EAAE,GAAW;IACrD,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;AAC3D,CAAC;AAED,IAAM,gBAAgB,GAAG;IACvB,OAAO;QACL,aAAa,EAAE,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC;QAClD,WAAW,EAAE,qBAAqB,CAAC,CAAC,EAAE,GAAG,CAAC;QAC1C,iBAAiB,EAAE,QAAQ;KAC5B,CAAC;AACJ,CAAC,CAAC;AAEK,IAAM,qCAAqC,GAAG;AACnD,6DAA6D;AAC7D,MAAmD;;;oBAE5C,qBAAM,IAAI,OAAO,CAAC,UAAC,OAAO;oBAC/B,UAAU,CACR;wBACE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;oBAC9B,CAAC,EACD,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,IAAI,CAC3B,CAAC;gBACJ,CAAC,CAAC,EAAA;oBAPF,sBAAO,SAOL,EAAC;;;KACJ,CAAC;AAZW,QAAA,qCAAqC,yCAYhD","sourcesContent":["import {\n  SimulateTransferMarginBetweenAccountsParams,\n  SimulateTransferMarginBetweenAccountsResult,\n} from './types';\n\n// The maximum is inclusive and the minimum is inclusive\nfunction getRandomIntInclusive(min: number, max: number) {\n  min = Math.ceil(min);\n  max = Math.floor(max);\n  return Math.floor(Math.random() * (max - min + 1) + min);\n}\n\nconst randomSimulation = (): SimulateTransferMarginBetweenAccountsResult => {\n  return {\n    bridgeGasFees: getRandomIntInclusive(1000, 100000),\n    marginRatio: getRandomIntInclusive(1, 100),\n    marginRatioHealth: 'danger',\n  };\n};\n\nexport const simulateTransferMarginBetweenAccounts = async (\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  params: SimulateTransferMarginBetweenAccountsParams,\n): Promise<SimulateTransferMarginBetweenAccountsResult> => {\n  return await new Promise((resolve) => {\n    setTimeout(\n      () => {\n        resolve(randomSimulation());\n      },\n      Math.random() * 100 + 1000,\n    );\n  });\n};\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  MarginAccountEntity,\n  OwnerMetadataEntity,\n  TokenEntity,\n} from '@reyaxyz/common';\n\nexport type CreateAccountParams = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: string;\n};\n\nexport type CreateAccountResult = {\n  transactionHash: string | null;\n};\n\nexport type DepositParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\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: MarginAccountEntity['id'];\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: MarginAccountEntity['marginRatioHealth'];\n  marginRatio: MarginAccountEntity['marginRatioPercentage'];\n};\n\n// TODO: Milan reevaluate these params\nexport type SimulateDepositParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type SimulateWithdrawResult = {\n  bridgeGasFees: number;\n\n  marginRatioHealth: MarginAccountEntity['marginRatioHealth'];\n  marginRatio: MarginAccountEntity['marginRatioPercentage'];\n};\n\n// TODO: Milan reevaluate these params\nexport type SimulateWithdrawParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type TransferMarginBetweenAccountsParams = {\n  signer: Signer | JsonRpcSigner;\n  fromMarginAccountId: MarginAccountEntity['id'];\n  toMarginAccountId: MarginAccountEntity['id'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type TransferMarginBetweenAccountsResult = {\n  transactionHash: string | null;\n};\n\nexport type WithdrawMAAndBridgeParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;\n  accountId: MarginAccountEntity['id'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n  receiverAddress: string;\n};\n\nexport type WithdrawMAAndBridgeParamsResult = {\n  transactionHash: string | null;\n};\n\nexport type BridgeAndDepositNewMAParams = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: OwnerMetadataEntity['address'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type BridgeAndDepositNewMAResult = {\n  transactionHash: string | null;\n};\n\nexport type BridgeAndDepositExisingMAParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;\n  accountId: MarginAccountEntity['id'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type BridgeAndDepositExisingMAResult = {\n  transactionHash: string | null;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport {\n  MarginAccountEntity,\n  OwnerMetadataEntity,\n  TokenEntity,\n} from '@reyaxyz/common';\nimport { simulateTransferMarginBetweenAccounts } from './simulateTransferMarginBetweenAccounts';\n\nexport type CreateAccountParams = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: string;\n};\n\nexport type CreateAccountResult = {\n  transactionHash: string | null;\n};\n\nexport type DepositParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\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: MarginAccountEntity['id'];\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: MarginAccountEntity['marginRatioHealth'];\n  marginRatio: MarginAccountEntity['marginRatioPercentage'];\n};\n\n// TODO: Milan reevaluate these params\nexport type SimulateDepositParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type SimulateWithdrawResult = {\n  bridgeGasFees: number;\n\n  marginRatioHealth: MarginAccountEntity['marginRatioHealth'];\n  marginRatio: MarginAccountEntity['marginRatioPercentage'];\n};\n\n// TODO: Milan reevaluate these params\nexport type SimulateWithdrawParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type TransferMarginBetweenAccountsParams = {\n  signer: Signer | JsonRpcSigner;\n  fromMarginAccountId: MarginAccountEntity['id'];\n  toMarginAccountId: MarginAccountEntity['id'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type TransferMarginBetweenAccountsResult = {\n  transactionHash: string | null;\n};\n\nexport type WithdrawMAAndBridgeParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;\n  marginAccountId: MarginAccountEntity['id'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n  // if not provided it has same value as owner.address\n  receiverAddress?: string;\n};\n\nexport type WithdrawMAAndBridgeParamsResult = {\n  transactionHash: string | null;\n};\n\nexport type BridgeAndDepositNewMAParams = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: OwnerMetadataEntity['address'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type BridgeAndDepositNewMAResult = {\n  transactionHash: string | null;\n};\n\nexport type BridgeAndDepositExisingMAParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;\n  marginAccountId: MarginAccountEntity['id'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type BridgeAndDepositExisingMAResult = {\n  transactionHash: string | null;\n};\n\nexport type SimulateTransferMarginBetweenAccountsResult = {\n  bridgeGasFees: number;\n  marginRatioHealth: MarginAccountEntity['marginRatioHealth'];\n  marginRatio: MarginAccountEntity['marginRatioPercentage'];\n};\n\n// TODO: Milan reevaluate these params\nexport type SimulateTransferMarginBetweenAccountsParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n"]}

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

@@ -44,35 +44,38 @@ var sign_1 = require("../sign");
 var common_2 = require("../token/common");
 var encode_1 = require("./encode");
 var consts_1 = require("../../utils/consts");
-var withdrawMAAndBridge = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var network, chainId, eip712Signature, tokenDecimals, amount, _a, data, value, result;
-    var _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0: return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
-            case 1:
-                network = _c.sent();
-                chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
-                return [4 /*yield*/, (0, sign_1.signCoreCommands)(params.signer, chainId, params.accountId, params.owner.coreSigNonce, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS)];
-            case 2:
-                eip712Signature = _c.sent();
-                tokenDecimals = (0, common_2.getTokenDetails)(params.tokenAddress).tokenDecimals;
-                amount = (0, common_2.scale)(tokenDecimals)(params.amount);
-                _a = (0, encode_1.encodeWithdrawMAAndBridge)(params.accountId, params.tokenAddress, amount, eip712Signature, BigInt('10000000'), (0, common_1.getSocketConnector)({
-                    chainId: chainId,
-                    tokenAddress: params.tokenAddress,
-                }), (0, common_1.getSocketController)({
-                    reyaChainId: chainId,
-                    tokenAddress: params.tokenAddress,
-                }), params.receiverAddress), data = _a.calldata, value = _a.value;
-                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, contractAddresses_1.ContractType.CORE_PROXY)];
-            case 3:
-                result = _c.sent();
-                return [2 /*return*/, {
-                        transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
-                    }];
-        }
+var withdrawMAAndBridge = function (_a) {
+    var signer = _a.signer, marginAccountId = _a.marginAccountId, owner = _a.owner, amount = _a.amount, tokenAddress = _a.tokenAddress, _b = _a.receiverAddress, receiverAddress = _b === void 0 ? owner.address : _b;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var network, chainId, eip712Signature, tokenDecimals, scaledAmount, _c, data, value, result;
+        var _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0: return [4 /*yield*/, ((_d = signer.provider) === null || _d === void 0 ? void 0 : _d.getNetwork())];
+                case 1:
+                    network = _e.sent();
+                    chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
+                    return [4 /*yield*/, (0, sign_1.signCoreCommands)(signer, chainId, marginAccountId, owner.coreSigNonce, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS)];
+                case 2:
+                    eip712Signature = _e.sent();
+                    tokenDecimals = (0, common_2.getTokenDetails)(tokenAddress).tokenDecimals;
+                    scaledAmount = (0, common_2.scale)(tokenDecimals)(amount);
+                    _c = (0, encode_1.encodeWithdrawMAAndBridge)(marginAccountId, tokenAddress, scaledAmount, eip712Signature, BigInt('10000000'), (0, common_1.getSocketConnector)({
+                        chainId: chainId,
+                        tokenAddress: tokenAddress,
+                    }), (0, common_1.getSocketController)({
+                        reyaChainId: chainId,
+                        tokenAddress: tokenAddress,
+                    }), receiverAddress), data = _c.calldata, value = _c.value;
+                    return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(signer, data, value, chainId, contractAddresses_1.ContractType.CORE_PROXY)];
+                case 3:
+                    result = _e.sent();
+                    return [2 /*return*/, {
+                            transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
+                        }];
+            }
+        });
     });
-}); };
+};
 exports.withdrawMAAndBridge = withdrawMAAndBridge;
 //# sourceMappingURL=withdrawMAAndBridge.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"withdrawMAAndBridge.js","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAIyB;AACzB,mEAA6D;AAC7D,4DAA2D;AAC3D,gCAA2C;AAC3C,0CAAyD;AACzD,mCAAqD;AAKrD,6CAAgE;AAEzD,IAAM,mBAAmB,GAAG,UACjC,MAAiC;;;;;oBAEjB,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;gBACjB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBANK,eAAe,GAAG,SAMvB;gBAEO,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,kCAAyB,EACzD,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,eAAe,EACf,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,EACF,IAAA,4BAAmB,EAAC;oBAClB,WAAW,EAAE,OAAO;oBACpB,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,EACF,MAAM,CAAC,eAAe,CACvB,EAfiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAe3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,UAAU,CACxB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA5CW,QAAA,mBAAmB,uBA4C9B","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  getSocketConnector,\n  getSocketController,\n} from '@reyaxyz/common';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signCoreCommands } from '../sign';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeWithdrawMAAndBridge } from './encode';\nimport {\n  WithdrawMAAndBridgeParams,\n  WithdrawMAAndBridgeParamsResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const withdrawMAAndBridge = async (\n  params: WithdrawMAAndBridgeParams,\n): Promise<WithdrawMAAndBridgeParamsResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n  const eip712Signature = await signCoreCommands(\n    params.signer,\n    chainId,\n    params.accountId,\n    params.owner.coreSigNonce,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const { calldata: data, value } = encodeWithdrawMAAndBridge(\n    params.accountId,\n    params.tokenAddress,\n    amount,\n    eip712Signature,\n    BigInt('10000000'),\n    getSocketConnector({\n      chainId: chainId,\n      tokenAddress: params.tokenAddress,\n    }),\n    getSocketController({\n      reyaChainId: chainId,\n      tokenAddress: params.tokenAddress,\n    }),\n    params.receiverAddress,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.CORE_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"withdrawMAAndBridge.js","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAIyB;AACzB,mEAA6D;AAC7D,4DAA2D;AAC3D,gCAA2C;AAC3C,0CAAyD;AACzD,mCAAqD;AAKrD,6CAAgE;AAEzD,IAAM,mBAAmB,GAAG,UAAO,EAOd;QAN1B,MAAM,YAAA,EACN,eAAe,qBAAA,EACf,KAAK,WAAA,EACL,MAAM,YAAA,EACN,YAAY,kBAAA,EACZ,uBAA+B,EAA/B,eAAe,mBAAG,KAAK,CAAC,OAAO,KAAA;;;;;;wBAEf,qBAAM,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;oBAA7C,OAAO,GAAG,SAAmC;oBAC7C,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;oBACjB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,EACN,OAAO,EACP,eAAe,EACf,KAAK,CAAC,YAAY,EAClB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;oBANK,eAAe,GAAG,SAMvB;oBAEO,aAAa,GAAK,IAAA,wBAAe,EAAC,YAAY,CAAC,cAAlC,CAAmC;oBAClD,YAAY,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;oBAE5C,KAA4B,IAAA,kCAAyB,EACzD,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;wBACjB,OAAO,SAAA;wBACP,YAAY,cAAA;qBACb,CAAC,EACF,IAAA,4BAAmB,EAAC;wBAClB,WAAW,EAAE,OAAO;wBACpB,YAAY,cAAA;qBACb,CAAC,EACF,eAAe,CAChB,EAfiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAe3B;oBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,EACN,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,UAAU,CACxB,EAAA;;oBANK,MAAM,GAAG,SAMd;oBAED,sBAAO;4BACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;yBACtC,EAAC;;;;CACH,CAAC;AAjDW,QAAA,mBAAmB,uBAiD9B","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  getSocketConnector,\n  getSocketController,\n} from '@reyaxyz/common';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signCoreCommands } from '../sign';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeWithdrawMAAndBridge } from './encode';\nimport {\n  WithdrawMAAndBridgeParams,\n  WithdrawMAAndBridgeParamsResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const withdrawMAAndBridge = async ({\n  signer,\n  marginAccountId,\n  owner,\n  amount,\n  tokenAddress,\n  receiverAddress = owner.address,\n}: WithdrawMAAndBridgeParams): Promise<WithdrawMAAndBridgeParamsResult> => {\n  const network = await signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n  const eip712Signature = await signCoreCommands(\n    signer,\n    chainId,\n    marginAccountId,\n    owner.coreSigNonce,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const { tokenDecimals } = getTokenDetails(tokenAddress);\n  const scaledAmount = scale(tokenDecimals)(amount);\n\n  const { calldata: data, value } = encodeWithdrawMAAndBridge(\n    marginAccountId,\n    tokenAddress,\n    scaledAmount,\n    eip712Signature,\n    BigInt('10000000'),\n    getSocketConnector({\n      chainId,\n      tokenAddress,\n    }),\n    getSocketController({\n      reyaChainId: chainId,\n      tokenAddress,\n    }),\n    receiverAddress,\n  );\n\n  const result = await executeTransaction(\n    signer,\n    data,\n    value,\n    chainId,\n    ContractType.CORE_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -3,4 +3,5 @@ export * from './lp';
 export * from './bridgeAndDepositPassivePool';
 export * from './transferFromMAToPool';
 export * from './withdrawPassivePoolAndBridge';
+export * from './simulateTransferFromMAToPool';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/lp/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,MAAM,CAAC;AACrB,cAAc,+BAA+B,CAAC;AAC9C,cAAc,wBAAwB,CAAC;AACvC,cAAc,gCAAgC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/lp/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,MAAM,CAAC;AACrB,cAAc,+BAA+B,CAAC;AAC9C,cAAc,wBAAwB,CAAC;AACvC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gCAAgC,CAAC"}

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"simulateTransferFromMAToPool.d.ts","sourceRoot":"/","sources":["services/lp/simulateTransferFromMAToPool.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kCAAkC,EAClC,kCAAkC,EACnC,MAAM,SAAS,CAAC;AAgBjB,eAAO,MAAM,4BAA4B,WAE/B,kCAAkC,KACzC,QAAQ,kCAAkC,CAS5C,CAAC"}

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

@@ -19,7 +19,7 @@ export type RemoveLiquidityResult = {
 export type TransferFromMAToPoolParams = {
     signer: Signer | JsonRpcSigner;
     owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;
-    accountId: MarginAccountEntity['id'];
+    marginAccountId: MarginAccountEntity['id'];
     pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;
     amount: number;
 };
@@ -45,4 +45,14 @@ export type BridgeAndDepositPassivePoolParams = {
 export type BridgeAndDepositPassivePoolResult = {
     transactionHash: string | null;
 };
+export type SimulateTransferFromMAToPoolResult = {
+    bridgeGasFees: number;
+    estimatedDepositedAmount: number;
+};
+export type SimulateTransferFromMAToPoolParams = {
+    signer: Signer | JsonRpcSigner;
+    lpPoolId: LpPoolEntity['id'];
+    tokenAddress: LpPoolEntity['tokenAddress'];
+    amount: number;
+};
 //# sourceMappingURL=types.d.ts.map

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,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,uBAAuB,EACvB,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,cAAc,CAAC,CAAC;IAC7D,SAAS,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,cAAc,CAAC,CAAC;IAC7D,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC7C,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,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;AAC/C,OAAO,EACL,YAAY,EACZ,uBAAuB,EACvB,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,cAAc,CAAC,CAAC;IAC7D,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,cAAc,CAAC,CAAC;IAC7D,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC7C,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,aAAa,EAAE,MAAM,CAAC;IACtB,wBAAwB,EAAE,MAAM,CAAC;CAClC,CAAC;AAGF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,YAAY,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAC3C,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC"}

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

@@ -8,4 +8,5 @@ export * from './bridgeAndDepositExistingMA';
 export * from './bridgeAndDepositNewMA';
 export * from './transferMarginBetweenAccounts';
 export * from './withdrawMAAndBridge';
+export * from './simulateTransferMarginBetweenAccounts';
 //# 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,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,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,WAAW,CAAC;AAC1B,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,iCAAiC,CAAC;AAChD,cAAc,uBAAuB,CAAC;AACtC,cAAc,yCAAyC,CAAC"}

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"simulateTransferMarginBetweenAccounts.d.ts","sourceRoot":"/","sources":["services/margin-accounts/simulateTransferMarginBetweenAccounts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2CAA2C,EAC3C,2CAA2C,EAC5C,MAAM,SAAS,CAAC;AAiBjB,eAAO,MAAM,qCAAqC,WAExC,2CAA2C,KAClD,QAAQ,2CAA2C,CASrD,CAAC"}

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

@@ -60,10 +60,10 @@ export type TransferMarginBetweenAccountsResult = {
 export type WithdrawMAAndBridgeParams = {
     signer: Signer | JsonRpcSigner;
     owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;
-    accountId: MarginAccountEntity['id'];
+    marginAccountId: MarginAccountEntity['id'];
     tokenAddress: TokenEntity['address'];
     amount: number;
-    receiverAddress: string;
+    receiverAddress?: string;
 };
 export type WithdrawMAAndBridgeParamsResult = {
     transactionHash: string | null;
@@ -80,11 +80,22 @@ export type BridgeAndDepositNewMAResult = {
 export type BridgeAndDepositExisingMAParams = {
     signer: Signer | JsonRpcSigner;
     owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;
-    accountId: MarginAccountEntity['id'];
+    marginAccountId: MarginAccountEntity['id'];
     tokenAddress: TokenEntity['address'];
     amount: number;
 };
 export type BridgeAndDepositExisingMAResult = {
     transactionHash: string | null;
 };
+export type SimulateTransferMarginBetweenAccountsResult = {
+    bridgeGasFees: number;
+    marginRatioHealth: MarginAccountEntity['marginRatioHealth'];
+    marginRatio: MarginAccountEntity['marginRatioPercentage'];
+};
+export type SimulateTransferMarginBetweenAccountsParams = {
+    signer: Signer | JsonRpcSigner;
+    marginAccountId: MarginAccountEntity['id'];
+    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":"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"}

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

@@ -1,3 +1,3 @@
 import { WithdrawMAAndBridgeParams, WithdrawMAAndBridgeParamsResult } from './types';
-export declare const withdrawMAAndBridge: (params: WithdrawMAAndBridgeParams) => Promise<WithdrawMAAndBridgeParamsResult>;
+export declare const withdrawMAAndBridge: ({ signer, marginAccountId, owner, amount, tokenAddress, receiverAddress, }: WithdrawMAAndBridgeParams) => Promise<WithdrawMAAndBridgeParamsResult>;
 //# sourceMappingURL=withdrawMAAndBridge.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"withdrawMAAndBridge.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAChC,MAAM,SAAS,CAAC;AAGjB,eAAO,MAAM,mBAAmB,WACtB,yBAAyB,KAChC,QAAQ,+BAA+B,CA0CzC,CAAC"}
+{"version":3,"file":"withdrawMAAndBridge.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAChC,MAAM,SAAS,CAAC;AAGjB,eAAO,MAAM,mBAAmB,+EAO7B,yBAAyB,KAAG,QAAQ,+BAA+B,CA0CrE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.20.2",
+  "version": "0.20.3",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -29,10 +29,10 @@
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "dependencies": {
-    "@reyaxyz/common": "0.13.0",
+    "@reyaxyz/common": "0.14.0",
     "bignumber.js": "^9.1.2",
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.10.4",
-  "gitHead": "426e609d9d334b0c0d8205c9e7851922b84643bd"
+  "gitHead": "5fe06e2aa92aa58e2c4c49761325af8d548b4ade"
 }

package/src/services/lp/index.ts

@@ -3,3 +3,4 @@ export * from './lp';
 export * from './bridgeAndDepositPassivePool';
 export * from './transferFromMAToPool';
 export * from './withdrawPassivePoolAndBridge';
+export * from './simulateTransferFromMAToPool';

package/src/services/lp/simulateTransferFromMAToPool.ts

@@ -0,0 +1,32 @@
+import {
+  SimulateTransferFromMAToPoolParams,
+  SimulateTransferFromMAToPoolResult,
+} from './types';
+
+// The maximum is inclusive and the minimum is inclusive
+function getRandomIntInclusive(min: number, max: number) {
+  min = Math.ceil(min);
+  max = Math.floor(max);
+  return Math.floor(Math.random() * (max - min + 1) + min);
+}
+
+const randomSimulation = (): SimulateTransferFromMAToPoolResult => {
+  return {
+    bridgeGasFees: getRandomIntInclusive(1000, 100000),
+    estimatedDepositedAmount: getRandomIntInclusive(1000, 100000),
+  };
+};
+
+export const simulateTransferFromMAToPool = async (
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  params: SimulateTransferFromMAToPoolParams,
+): Promise<SimulateTransferFromMAToPoolResult> => {
+  return await new Promise((resolve) => {
+    setTimeout(
+      () => {
+        resolve(randomSimulation());
+      },
+      Math.random() * 100 + 1000,
+    );
+  });
+};

package/src/services/lp/transferFromMAToPool.ts

@@ -19,7 +19,7 @@ export const transferFromMAToPool = async (
   const eip712Signature = await signCoreCommands(
     params.signer,
     chainId,
-    params.accountId,
+    params.marginAccountId,
     params.owner.coreSigNonce,
     getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,
   );
@@ -28,7 +28,7 @@ export const transferFromMAToPool = async (
   const amount = scale(tokenDecimals)(params.amount);
 
   const { calldata: data, value } = encodeTransferFromMAToPool(
-    params.accountId,
+    params.marginAccountId,
     amount,
     eip712Signature,
     params.pool.id,

package/src/services/lp/types.ts

@@ -29,7 +29,7 @@ export type RemoveLiquidityResult = {
 export type TransferFromMAToPoolParams = {
   signer: Signer | JsonRpcSigner;
   owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;
-  accountId: MarginAccountEntity['id'];
+  marginAccountId: MarginAccountEntity['id'];
   pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;
   amount: number;
 };
@@ -60,3 +60,16 @@ export type BridgeAndDepositPassivePoolParams = {
 export type BridgeAndDepositPassivePoolResult = {
   transactionHash: string | null;
 };
+
+export type SimulateTransferFromMAToPoolResult = {
+  bridgeGasFees: number;
+  estimatedDepositedAmount: number;
+};
+
+// TODO: Milan reevaluate these params
+export type SimulateTransferFromMAToPoolParams = {
+  signer: Signer | JsonRpcSigner;
+  lpPoolId: LpPoolEntity['id'];
+  tokenAddress: LpPoolEntity['tokenAddress'];
+  amount: number;
+};

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

@@ -22,7 +22,7 @@ export const bridgeAndDepositExisingMA = async (
   const eip712Signature = await signCoreCommands(
     params.signer,
     chainId,
-    params.accountId,
+    params.marginAccountId,
     params.owner.coreSigNonce,
     getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,
   );
@@ -37,7 +37,7 @@ export const bridgeAndDepositExisingMA = async (
       chainId: chainId,
       tokenAddress: params.tokenAddress,
     }),
-    params.accountId,
+    params.marginAccountId,
     params.tokenAddress,
     amount,
     eip712Signature,

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

@@ -8,3 +8,4 @@ export * from './bridgeAndDepositExistingMA';
 export * from './bridgeAndDepositNewMA';
 export * from './transferMarginBetweenAccounts';
 export * from './withdrawMAAndBridge';
+export * from './simulateTransferMarginBetweenAccounts';

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

@@ -0,0 +1,33 @@
+import {
+  SimulateTransferMarginBetweenAccountsParams,
+  SimulateTransferMarginBetweenAccountsResult,
+} from './types';
+
+// The maximum is inclusive and the minimum is inclusive
+function getRandomIntInclusive(min: number, max: number) {
+  min = Math.ceil(min);
+  max = Math.floor(max);
+  return Math.floor(Math.random() * (max - min + 1) + min);
+}
+
+const randomSimulation = (): SimulateTransferMarginBetweenAccountsResult => {
+  return {
+    bridgeGasFees: getRandomIntInclusive(1000, 100000),
+    marginRatio: getRandomIntInclusive(1, 100),
+    marginRatioHealth: 'danger',
+  };
+};
+
+export const simulateTransferMarginBetweenAccounts = async (
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  params: SimulateTransferMarginBetweenAccountsParams,
+): Promise<SimulateTransferMarginBetweenAccountsResult> => {
+  return await new Promise((resolve) => {
+    setTimeout(
+      () => {
+        resolve(randomSimulation());
+      },
+      Math.random() * 100 + 1000,
+    );
+  });
+};

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

@@ -4,6 +4,7 @@ import {
   OwnerMetadataEntity,
   TokenEntity,
 } from '@reyaxyz/common';
+import { simulateTransferMarginBetweenAccounts } from './simulateTransferMarginBetweenAccounts';
 
 export type CreateAccountParams = {
   signer: Signer | JsonRpcSigner;
@@ -80,10 +81,11 @@ export type TransferMarginBetweenAccountsResult = {
 export type WithdrawMAAndBridgeParams = {
   signer: Signer | JsonRpcSigner;
   owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;
-  accountId: MarginAccountEntity['id'];
+  marginAccountId: MarginAccountEntity['id'];
   tokenAddress: TokenEntity['address'];
   amount: number;
-  receiverAddress: string;
+  // if not provided it has same value as owner.address
+  receiverAddress?: string;
 };
 
 export type WithdrawMAAndBridgeParamsResult = {
@@ -104,7 +106,7 @@ export type BridgeAndDepositNewMAResult = {
 export type BridgeAndDepositExisingMAParams = {
   signer: Signer | JsonRpcSigner;
   owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;
-  accountId: MarginAccountEntity['id'];
+  marginAccountId: MarginAccountEntity['id'];
   tokenAddress: TokenEntity['address'];
   amount: number;
 };
@@ -112,3 +114,17 @@ export type BridgeAndDepositExisingMAParams = {
 export type BridgeAndDepositExisingMAResult = {
   transactionHash: string | null;
 };
+
+export type SimulateTransferMarginBetweenAccountsResult = {
+  bridgeGasFees: number;
+  marginRatioHealth: MarginAccountEntity['marginRatioHealth'];
+  marginRatio: MarginAccountEntity['marginRatioPercentage'];
+};
+
+// TODO: Milan reevaluate these params
+export type SimulateTransferMarginBetweenAccountsParams = {
+  signer: Signer | JsonRpcSigner;
+  marginAccountId: MarginAccountEntity['id'];
+  tokenAddress: TokenEntity['address'];
+  amount: number;
+};

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

@@ -14,41 +14,46 @@ import {
 } from './types';
 import { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';
 
-export const withdrawMAAndBridge = async (
-  params: WithdrawMAAndBridgeParams,
-): Promise<WithdrawMAAndBridgeParamsResult> => {
-  const network = await params.signer.provider?.getNetwork();
+export const withdrawMAAndBridge = async ({
+  signer,
+  marginAccountId,
+  owner,
+  amount,
+  tokenAddress,
+  receiverAddress = owner.address,
+}: WithdrawMAAndBridgeParams): Promise<WithdrawMAAndBridgeParamsResult> => {
+  const network = await signer.provider?.getNetwork();
   const chainId = Number(network?.chainId);
   const eip712Signature = await signCoreCommands(
-    params.signer,
+    signer,
     chainId,
-    params.accountId,
-    params.owner.coreSigNonce,
+    marginAccountId,
+    owner.coreSigNonce,
     getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,
   );
 
-  const { tokenDecimals } = getTokenDetails(params.tokenAddress);
-  const amount = scale(tokenDecimals)(params.amount);
+  const { tokenDecimals } = getTokenDetails(tokenAddress);
+  const scaledAmount = scale(tokenDecimals)(amount);
 
   const { calldata: data, value } = encodeWithdrawMAAndBridge(
-    params.accountId,
-    params.tokenAddress,
-    amount,
+    marginAccountId,
+    tokenAddress,
+    scaledAmount,
     eip712Signature,
     BigInt('10000000'),
     getSocketConnector({
-      chainId: chainId,
-      tokenAddress: params.tokenAddress,
+      chainId,
+      tokenAddress,
     }),
     getSocketController({
       reyaChainId: chainId,
-      tokenAddress: params.tokenAddress,
+      tokenAddress,
     }),
-    params.receiverAddress,
+    receiverAddress,
   );
 
   const result = await executeTransaction(
-    params.signer,
+    signer,
     data,
     value,
     chainId,