@reyaxyz/sdk 0.145.2 → 0.146.0

package/README.md

@@ -6,5 +6,5 @@
 
 | Statements                  | Branches                | Functions                 | Lines             |
 | --------------------------- | ----------------------- | ------------------------- | ----------------- |
-| ![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) |
+| ![Statements](https://img.shields.io/badge/statements-7.12%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-5.83%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-3.33%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-6.79%25-red.svg?style=flat) |
 

package/dist/services/lp/encode.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeBridgeAndDepositPassivePool = exports.encodeWithdrawPassivePoolAndBridge = exports.encodeStakeFromMarginAccount = exports.encodeUnstakeFromMarginAccount = exports.encodeDepositLiquidityToAccount = void 0;
+exports.encodeBridgeAndDepositPassivePool = exports.encodeUnstakeStakedReya = exports.encodeStakeReya = exports.encodeWithdrawPassivePoolAndBridge = exports.encodeStakeFromMarginAccount = exports.encodeUnstakeFromMarginAccount = exports.encodeDepositLiquidityToAccount = void 0;
 var ethers_1 = require("ethers");
 var common_1 = require("@reyaxyz/common");
 var ethers_2 = require("ethers");
@@ -121,6 +121,36 @@ var encodeWithdrawPassivePoolAndBridge = function (owner, poolId, sharesAmount,
     return { calldata: calldata, value: BigInt(0).toString(10) };
 };
 exports.encodeWithdrawPassivePoolAndBridge = encodeWithdrawPassivePoolAndBridge;
+var encodeStakeReya = function (accountId, assetAmount, minShareAmount, withdrawSig) {
+    var functionSignature = 'stakeReya';
+    var parameters = [
+        {
+            accountId: accountId,
+            assetAmount: assetAmount,
+            minShareAmount: minShareAmount,
+            withdrawSig: withdrawSig,
+        },
+    ];
+    var INTERFACE = new ethers_1.Interface(common_1.PeripheryAbi);
+    var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
+    return { calldata: calldata, value: BigInt(0).toString(10) };
+};
+exports.encodeStakeReya = encodeStakeReya;
+var encodeUnstakeStakedReya = function (accountId, shareAmount, minAssetAmount, withdrawSig) {
+    var functionSignature = 'unstakeStakedReya';
+    var parameters = [
+        {
+            accountId: accountId,
+            shareAmount: shareAmount,
+            minAssetAmount: minAssetAmount,
+            withdrawSig: withdrawSig,
+        },
+    ];
+    var INTERFACE = new ethers_1.Interface(common_1.PeripheryAbi);
+    var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
+    return { calldata: calldata, value: BigInt(0).toString(10) };
+};
+exports.encodeUnstakeStakedReya = encodeUnstakeStakedReya;
 var encodeBridgeAndDepositPassivePool = function (receiver, socketMsgGasLimit, socketConnector, socketBridgeOptions, socketFees, poolId, owner, amount, minShares) {
     var PERIPHERY_INTERFACE = new ethers_1.Interface(common_1.PeripheryAbi);
     var inputs = { poolId: poolId, owner: owner, minShares: minShares };

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

@@ -1 +1 @@
-{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { Interface } from 'ethers';\nimport {\n  EIP712Signature,\n  Socket_VaultWithPayloadAbi,\n  MultiAction,\n  MethodParameters,\n  PeripheryAbi,\n  signCoreCommands,\n  getAddress,\n  ContractType,\n  CORE_DEADLINE_IN_SECONDS,\n  getCurrentTimestampInSeconds,\n} from '@reyaxyz/common';\nimport { ethers, Signer } from 'ethers';\nimport {\n  encodeSingleStakeFromMarginAccount,\n  encodeSingleUnstakeFromMarginAccount,\n} from '../encode';\n\nexport const encodeDepositLiquidityToAccount = async (\n  sig: EIP712Signature,\n  srusdAmount: bigint,\n  poolId: number,\n  accountId: number,\n): Promise<MethodParameters> => {\n  const functionSignature = 'depositLiquidityToAccount';\n  const parameters = [{ accountId, poolId, sharesAmount: srusdAmount, sig }];\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 encodeUnstakeFromMarginAccount = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  accountId: number,\n  poolId: number,\n  srusdAmount: bigint,\n  mintOut: bigint,\n): Promise<MethodParameters> => {\n  const multiAction = new MultiAction();\n\n  encodeSingleUnstakeFromMarginAccount(\n    poolId,\n    srusdAmount,\n    mintOut,\n    multiAction,\n  );\n\n  const { signature: eip712Signature } = await signCoreCommands(\n    signer,\n    chainId,\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    accountId,\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\n  const functionSignature = 'execute';\n  const parameters = [\n    { accountId, commands: multiAction.commands, sig: eip712Signature },\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 encodeStakeFromMarginAccount = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  accountId: number,\n  poolId: number,\n  amount: bigint,\n  minShares: bigint,\n): Promise<MethodParameters> => {\n  const multiAction = new MultiAction();\n\n  encodeSingleStakeFromMarginAccount(poolId, amount, minShares, multiAction);\n\n  const { signature: eip712Signature } = await signCoreCommands(\n    signer,\n    chainId,\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    accountId,\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\n  const functionSignature = 'execute';\n  const parameters = [\n    { accountId, commands: multiAction.commands, sig: eip712Signature },\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 encodeWithdrawPassivePoolAndBridge = (\n  owner: string,\n  poolId: number,\n  sharesAmount: bigint,\n  minOut: bigint,\n  sig: EIP712Signature,\n  socketMsgGasLimit: bigint,\n  chainId: number,\n  receiver: string,\n): MethodParameters => {\n  const functionSignature = 'withdrawPassivePool';\n  const parameters = [\n    {\n      owner,\n      poolId,\n      sharesAmount,\n      minOut,\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 encodeBridgeAndDepositPassivePool = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketBridgeOptions: string,\n  socketFees: bigint,\n  poolId: number,\n  owner: string,\n  amount: bigint,\n  minShares: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(PeripheryAbi);\n  const inputs = { poolId, owner, minShares };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositPassivePool((uint128,address,uint256))',\n    [inputs],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    amount,\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/lp/encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { Interface } from 'ethers';\nimport {\n  EIP712Signature,\n  Socket_VaultWithPayloadAbi,\n  MultiAction,\n  MethodParameters,\n  PeripheryAbi,\n  signCoreCommands,\n  getAddress,\n  ContractType,\n  CORE_DEADLINE_IN_SECONDS,\n  getCurrentTimestampInSeconds,\n} from '@reyaxyz/common';\nimport { ethers, Signer } from 'ethers';\nimport {\n  encodeSingleStakeFromMarginAccount,\n  encodeSingleUnstakeFromMarginAccount,\n} from '../encode';\n\nexport const encodeDepositLiquidityToAccount = async (\n  sig: EIP712Signature,\n  srusdAmount: bigint,\n  poolId: number,\n  accountId: number,\n): Promise<MethodParameters> => {\n  const functionSignature = 'depositLiquidityToAccount';\n  const parameters = [{ accountId, poolId, sharesAmount: srusdAmount, sig }];\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 encodeUnstakeFromMarginAccount = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  accountId: number,\n  poolId: number,\n  srusdAmount: bigint,\n  mintOut: bigint,\n): Promise<MethodParameters> => {\n  const multiAction = new MultiAction();\n\n  encodeSingleUnstakeFromMarginAccount(\n    poolId,\n    srusdAmount,\n    mintOut,\n    multiAction,\n  );\n\n  const { signature: eip712Signature } = await signCoreCommands(\n    signer,\n    chainId,\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    accountId,\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\n  const functionSignature = 'execute';\n  const parameters = [\n    { accountId, commands: multiAction.commands, sig: eip712Signature },\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 encodeStakeFromMarginAccount = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  accountId: number,\n  poolId: number,\n  amount: bigint,\n  minShares: bigint,\n): Promise<MethodParameters> => {\n  const multiAction = new MultiAction();\n\n  encodeSingleStakeFromMarginAccount(poolId, amount, minShares, multiAction);\n\n  const { signature: eip712Signature } = await signCoreCommands(\n    signer,\n    chainId,\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    accountId,\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\n  const functionSignature = 'execute';\n  const parameters = [\n    { accountId, commands: multiAction.commands, sig: eip712Signature },\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 encodeWithdrawPassivePoolAndBridge = (\n  owner: string,\n  poolId: number,\n  sharesAmount: bigint,\n  minOut: bigint,\n  sig: EIP712Signature,\n  socketMsgGasLimit: bigint,\n  chainId: number,\n  receiver: string,\n): MethodParameters => {\n  const functionSignature = 'withdrawPassivePool';\n  const parameters = [\n    {\n      owner,\n      poolId,\n      sharesAmount,\n      minOut,\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 encodeStakeReya = (\n  accountId: number,\n  assetAmount: bigint,\n  minShareAmount: bigint,\n  withdrawSig: EIP712Signature,\n): MethodParameters => {\n  const functionSignature = 'stakeReya';\n  const parameters = [\n    {\n      accountId,\n      assetAmount,\n      minShareAmount,\n      withdrawSig,\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 encodeUnstakeStakedReya = (\n  accountId: number,\n  shareAmount: bigint,\n  minAssetAmount: bigint,\n  withdrawSig: EIP712Signature,\n): MethodParameters => {\n  const functionSignature = 'unstakeStakedReya';\n  const parameters = [\n    {\n      accountId,\n      shareAmount,\n      minAssetAmount,\n      withdrawSig,\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 encodeBridgeAndDepositPassivePool = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketBridgeOptions: string,\n  socketFees: bigint,\n  poolId: number,\n  owner: string,\n  amount: bigint,\n  minShares: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(PeripheryAbi);\n  const inputs = { poolId, owner, minShares };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositPassivePool((uint128,address,uint256))',\n    [inputs],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    amount,\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/lp/index.js

@@ -20,4 +20,6 @@ __exportStar(require("./withdrawPassivePoolAndBridge"), exports);
 __exportStar(require("./transferStakeToMarginAccount"), exports);
 __exportStar(require("./unstakeFromMarginAccount"), exports);
 __exportStar(require("./stakeFromMarginAccount"), exports);
+__exportStar(require("./stakeReya"), exports);
+__exportStar(require("./unstakeStakedReya"), 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,gEAA8C;AAC9C,iEAA+C;AAC/C,iEAA+C;AAC/C,6DAA2C;AAC3C,2DAAyC","sourcesContent":["export * from './types';\nexport * from './bridgeAndDepositPassivePool';\nexport * from './withdrawPassivePoolAndBridge';\nexport * from './transferStakeToMarginAccount';\nexport * from './unstakeFromMarginAccount';\nexport * from './stakeFromMarginAccount';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/lp/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,gEAA8C;AAC9C,iEAA+C;AAC/C,iEAA+C;AAC/C,6DAA2C;AAC3C,2DAAyC;AACzC,8CAA4B;AAC5B,sDAAoC","sourcesContent":["export * from './types';\nexport * from './bridgeAndDepositPassivePool';\nexport * from './withdrawPassivePoolAndBridge';\nexport * from './transferStakeToMarginAccount';\nexport * from './unstakeFromMarginAccount';\nexport * from './stakeFromMarginAccount';\nexport * from './stakeReya';\nexport * from './unstakeStakedReya';\n"]}

package/dist/services/lp/stakeReya.js

@@ -0,0 +1,75 @@
+"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.stakeReya = void 0;
+var network_1 = require("../../utils/network");
+var common_1 = require("@reyaxyz/common");
+var encode_1 = require("../encode");
+var encode_2 = require("./encode");
+var signAndBroadcastTransaction_1 = require("../signAndBroadcastTransaction");
+var ethers_1 = require("ethers");
+var stakeReya = function (params) { return __awaiter(void 0, void 0, void 0, function () {
+    var chainId, reyaTokenInfo, sreyaTokenInfo, assetAmount, minShareAmount, multiAction, withdrawSig, data, result;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                chainId = (0, network_1.getReyaNetwork)();
+                reyaTokenInfo = (0, common_1.getTokenInfoByName)('REYA', chainId);
+                sreyaTokenInfo = (0, common_1.getTokenInfoByName)('SREYA', chainId);
+                assetAmount = (0, common_1.scale)(reyaTokenInfo.decimals)(params.amount);
+                minShareAmount = params.minShareAmount
+                    ? (0, common_1.scale)(sreyaTokenInfo.decimals)(params.minShareAmount)
+                    : BigInt(0);
+                multiAction = new common_1.MultiAction();
+                (0, encode_1.encodeSingleWithdraw)(reyaTokenInfo.address, assetAmount, multiAction);
+                return [4 /*yield*/, (0, common_1.signCoreCommands)(params.signer, chainId, (0, common_1.getAddress)(chainId, common_1.ContractType.PERIPHERY_PROXY), params.marginAccountId, multiAction.commands, params.owner.coreSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + common_1.CORE_DEADLINE_IN_SECONDS, ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(['string', 'uint256'], ['stakeReya', minShareAmount]))];
+            case 1:
+                withdrawSig = (_a.sent()).signature;
+                data = (0, encode_2.encodeStakeReya)(params.marginAccountId, assetAmount, minShareAmount, withdrawSig).calldata;
+                return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(data, chainId, common_1.ContractType.PERIPHERY_PROXY, {})];
+            case 2:
+                result = _a.sent();
+                return [2 /*return*/, {
+                        transactionHash: (result === null || result === void 0 ? void 0 : result.txHash) || null,
+                        coreSigNonce: (result === null || result === void 0 ? void 0 : result.coreSigNonce) != null ? Number(result.coreSigNonce) : null,
+                    }];
+        }
+    });
+}); };
+exports.stakeReya = stakeReya;
+//# sourceMappingURL=stakeReya.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"stakeReya.js","sourceRoot":"/","sources":["services/lp/stakeReya.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAAqD;AACrD,0CASyB;AACzB,oCAAiD;AACjD,mCAA2C;AAC3C,8EAA6E;AAC7E,iCAAgC;AAEzB,IAAM,SAAS,GAAG,UACvB,MAAuB;;;;;gBAEjB,OAAO,GAAG,IAAA,wBAAc,GAAE,CAAC;gBAE3B,aAAa,GAAG,IAAA,2BAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBACpD,cAAc,GAAG,IAAA,2BAAkB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACtD,WAAW,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC3D,cAAc,GAAG,MAAM,CAAC,cAAc;oBAC1C,CAAC,CAAC,IAAA,cAAK,EAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;oBACvD,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAER,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;gBACtC,IAAA,6BAAoB,EAAC,aAAa,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;gBAEnC,qBAAM,IAAA,yBAAgB,EACvD,MAAM,CAAC,MAAM,EACb,OAAO,EACP,IAAA,mBAAU,EAAC,OAAO,EAAE,qBAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,eAAe,EACtB,WAAW,CAAC,QAAQ,EACpB,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,EAC7B,IAAA,qCAA4B,GAAE,GAAG,iCAAwB,EACzD,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACtC,CAAC,QAAQ,EAAE,SAAS,CAAC,EACrB,CAAC,WAAW,EAAE,cAAc,CAAC,CAC9B,CACF,EAAA;;gBAZkB,WAAW,GAAK,CAAA,SAYlC,CAAA,UAZ6B;gBAcZ,IAAI,GAAK,IAAA,wBAAe,EACxC,MAAM,CAAC,eAAe,EACtB,WAAW,EACX,cAAc,EACd,WAAW,CACZ,SALqB,CAKpB;gBAEa,qBAAM,IAAA,yDAA2B,EAC9C,IAAI,EACJ,OAAO,EACP,qBAAY,CAAC,eAAe,EAC5B,EAAE,CACH,EAAA;;gBALK,MAAM,GAAG,SAKd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,IAAI;wBACvC,YAAY,EACV,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,KAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI;qBACpE,EAAC;;;KACH,CAAC;AAhDW,QAAA,SAAS,aAgDpB","sourcesContent":["import { StakeReyaParams, StakeReyaResult } from './types';\nimport { getReyaNetwork } from '../../utils/network';\nimport {\n  scale,\n  getTokenInfoByName,\n  ContractType,\n  getAddress,\n  signCoreCommands,\n  getCurrentTimestampInSeconds,\n  CORE_DEADLINE_IN_SECONDS,\n  MultiAction,\n} from '@reyaxyz/common';\nimport { encodeSingleWithdraw } from '../encode';\nimport { encodeStakeReya } from './encode';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { ethers } from 'ethers';\n\nexport const stakeReya = async (\n  params: StakeReyaParams,\n): Promise<StakeReyaResult> => {\n  const chainId = getReyaNetwork();\n\n  const reyaTokenInfo = getTokenInfoByName('REYA', chainId);\n  const sreyaTokenInfo = getTokenInfoByName('SREYA', chainId);\n  const assetAmount = scale(reyaTokenInfo.decimals)(params.amount);\n  const minShareAmount = params.minShareAmount\n    ? scale(sreyaTokenInfo.decimals)(params.minShareAmount)\n    : BigInt(0);\n\n  const multiAction = new MultiAction();\n  encodeSingleWithdraw(reyaTokenInfo.address, assetAmount, multiAction);\n\n  const { signature: withdrawSig } = await signCoreCommands(\n    params.signer,\n    chainId,\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    params.marginAccountId,\n    multiAction.commands,\n    params.owner.coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n    ethers.AbiCoder.defaultAbiCoder().encode(\n      ['string', 'uint256'],\n      ['stakeReya', minShareAmount],\n    ),\n  );\n\n  const { calldata: data } = encodeStakeReya(\n    params.marginAccountId,\n    assetAmount,\n    minShareAmount,\n    withdrawSig,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    data,\n    chainId,\n    ContractType.PERIPHERY_PROXY,\n    {},\n  );\n\n  return {\n    transactionHash: result?.txHash || null,\n    coreSigNonce:\n      result?.coreSigNonce != null ? Number(result.coreSigNonce) : 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  MoneyInOutChainId,\n  OwnerMetadataEntity,\n  SocketDepositFees,\n} from '@reyaxyz/common';\n\nexport type TransferStakeToMarginAccountParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'poolSigNonce'>;\n  marginAccountId: number;\n  pool: Pick<LpPoolEntity, 'id'>;\n  srusdAmount: number;\n};\n\nexport type TransferStakeToMarginAccountResult = {\n  transactionHash: string | null;\n  poolSigNonce: OwnerMetadataEntity['poolSigNonce'] | null;\n};\n\nexport type UnstakeFromMarginAccountParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  marginAccountId: number;\n  pool: Pick<LpPoolEntity, 'id'>;\n  srusdAmount: number;\n};\n\nexport type UnstakeFromMarginAccountResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type StakeFromMarginAccountParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  marginAccountId: number;\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n};\n\nexport type StakeFromMarginAccountResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type WithdrawPassivePoolAndBridgeParams = {\n  signer: Signer | JsonRpcSigner;\n  moneyInOutChainId: MoneyInOutChainId;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'poolSigNonce'>;\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n  sharePrice: LpWithdrawBalanceEntity['poolSharePrice'];\n  sharesAmount: number;\n  withdrawMax: boolean;\n};\n\nexport type WithdrawPassivePoolAndBridgeResult = {\n  transactionHash: string | null;\n  poolSigNonce: OwnerMetadataEntity['poolSigNonce'] | null;\n};\n\nexport type BridgeAndDepositPassivePoolParams = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: OwnerMetadataEntity['address'];\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n  socketDepositFees: SocketDepositFees['fees'];\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  MoneyInOutChainId,\n  OwnerMetadataEntity,\n  SocketDepositFees,\n} from '@reyaxyz/common';\n\nexport type TransferStakeToMarginAccountParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'poolSigNonce'>;\n  marginAccountId: number;\n  pool: Pick<LpPoolEntity, 'id'>;\n  srusdAmount: number;\n};\n\nexport type TransferStakeToMarginAccountResult = {\n  transactionHash: string | null;\n  poolSigNonce: OwnerMetadataEntity['poolSigNonce'] | null;\n};\n\nexport type UnstakeFromMarginAccountParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  marginAccountId: number;\n  pool: Pick<LpPoolEntity, 'id'>;\n  srusdAmount: number;\n};\n\nexport type UnstakeFromMarginAccountResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type StakeFromMarginAccountParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  marginAccountId: number;\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n};\n\nexport type StakeFromMarginAccountResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type WithdrawPassivePoolAndBridgeParams = {\n  signer: Signer | JsonRpcSigner;\n  moneyInOutChainId: MoneyInOutChainId;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'poolSigNonce'>;\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n  sharePrice: LpWithdrawBalanceEntity['poolSharePrice'];\n  sharesAmount: number;\n  withdrawMax: boolean;\n};\n\nexport type WithdrawPassivePoolAndBridgeResult = {\n  transactionHash: string | null;\n  poolSigNonce: OwnerMetadataEntity['poolSigNonce'] | null;\n};\n\nexport type StakeReyaParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  marginAccountId: number;\n  amount: number;\n  minShareAmount?: number;\n};\n\nexport type StakeReyaResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type UnstakeStakedReyaParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  marginAccountId: number;\n  shareAmount: number;\n  minAssetAmount?: number;\n};\n\nexport type UnstakeStakedReyaResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type BridgeAndDepositPassivePoolParams = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: OwnerMetadataEntity['address'];\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n  socketDepositFees: SocketDepositFees['fees'];\n};\n\nexport type BridgeAndDepositPassivePoolResult = {\n  transactionHash: string | null;\n};\n"]}

package/dist/services/lp/unstakeStakedReya.js

@@ -0,0 +1,75 @@
+"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.unstakeStakedReya = void 0;
+var network_1 = require("../../utils/network");
+var common_1 = require("@reyaxyz/common");
+var encode_1 = require("../encode");
+var encode_2 = require("./encode");
+var signAndBroadcastTransaction_1 = require("../signAndBroadcastTransaction");
+var ethers_1 = require("ethers");
+var unstakeStakedReya = function (params) { return __awaiter(void 0, void 0, void 0, function () {
+    var chainId, sreyaTokenInfo, reyaTokenInfo, shareAmount, minAssetAmount, multiAction, withdrawSig, data, result;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                chainId = (0, network_1.getReyaNetwork)();
+                sreyaTokenInfo = (0, common_1.getTokenInfoByName)('SREYA', chainId);
+                reyaTokenInfo = (0, common_1.getTokenInfoByName)('REYA', chainId);
+                shareAmount = (0, common_1.scale)(sreyaTokenInfo.decimals)(params.shareAmount);
+                minAssetAmount = params.minAssetAmount
+                    ? (0, common_1.scale)(reyaTokenInfo.decimals)(params.minAssetAmount)
+                    : BigInt(0);
+                multiAction = new common_1.MultiAction();
+                (0, encode_1.encodeSingleWithdraw)(sreyaTokenInfo.address, shareAmount, multiAction);
+                return [4 /*yield*/, (0, common_1.signCoreCommands)(params.signer, chainId, (0, common_1.getAddress)(chainId, common_1.ContractType.PERIPHERY_PROXY), params.marginAccountId, multiAction.commands, params.owner.coreSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + common_1.CORE_DEADLINE_IN_SECONDS, ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(['string', 'uint256'], ['unstakeStakedReya', minAssetAmount]))];
+            case 1:
+                withdrawSig = (_a.sent()).signature;
+                data = (0, encode_2.encodeUnstakeStakedReya)(params.marginAccountId, shareAmount, minAssetAmount, withdrawSig).calldata;
+                return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(data, chainId, common_1.ContractType.PERIPHERY_PROXY, {})];
+            case 2:
+                result = _a.sent();
+                return [2 /*return*/, {
+                        transactionHash: (result === null || result === void 0 ? void 0 : result.txHash) || null,
+                        coreSigNonce: (result === null || result === void 0 ? void 0 : result.coreSigNonce) != null ? Number(result.coreSigNonce) : null,
+                    }];
+        }
+    });
+}); };
+exports.unstakeStakedReya = unstakeStakedReya;
+//# sourceMappingURL=unstakeStakedReya.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"unstakeStakedReya.js","sourceRoot":"/","sources":["services/lp/unstakeStakedReya.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAAqD;AACrD,0CASyB;AACzB,oCAAiD;AACjD,mCAAmD;AACnD,8EAA6E;AAC7E,iCAAgC;AAEzB,IAAM,iBAAiB,GAAG,UAC/B,MAA+B;;;;;gBAEzB,OAAO,GAAG,IAAA,wBAAc,GAAE,CAAC;gBAE3B,cAAc,GAAG,IAAA,2BAAkB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACtD,aAAa,GAAG,IAAA,2BAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBACpD,WAAW,GAAG,IAAA,cAAK,EAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBACjE,cAAc,GAAG,MAAM,CAAC,cAAc;oBAC1C,CAAC,CAAC,IAAA,cAAK,EAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;oBACtD,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAER,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;gBACtC,IAAA,6BAAoB,EAAC,cAAc,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;gBAEpC,qBAAM,IAAA,yBAAgB,EACvD,MAAM,CAAC,MAAM,EACb,OAAO,EACP,IAAA,mBAAU,EAAC,OAAO,EAAE,qBAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,eAAe,EACtB,WAAW,CAAC,QAAQ,EACpB,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,EAC7B,IAAA,qCAA4B,GAAE,GAAG,iCAAwB,EACzD,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACtC,CAAC,QAAQ,EAAE,SAAS,CAAC,EACrB,CAAC,mBAAmB,EAAE,cAAc,CAAC,CACtC,CACF,EAAA;;gBAZkB,WAAW,GAAK,CAAA,SAYlC,CAAA,UAZ6B;gBAcZ,IAAI,GAAK,IAAA,gCAAuB,EAChD,MAAM,CAAC,eAAe,EACtB,WAAW,EACX,cAAc,EACd,WAAW,CACZ,SALqB,CAKpB;gBAEa,qBAAM,IAAA,yDAA2B,EAC9C,IAAI,EACJ,OAAO,EACP,qBAAY,CAAC,eAAe,EAC5B,EAAE,CACH,EAAA;;gBALK,MAAM,GAAG,SAKd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,IAAI;wBACvC,YAAY,EACV,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,KAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI;qBACpE,EAAC;;;KACH,CAAC;AAhDW,QAAA,iBAAiB,qBAgD5B","sourcesContent":["import { UnstakeStakedReyaParams, UnstakeStakedReyaResult } from './types';\nimport { getReyaNetwork } from '../../utils/network';\nimport {\n  scale,\n  getTokenInfoByName,\n  ContractType,\n  getAddress,\n  signCoreCommands,\n  getCurrentTimestampInSeconds,\n  CORE_DEADLINE_IN_SECONDS,\n  MultiAction,\n} from '@reyaxyz/common';\nimport { encodeSingleWithdraw } from '../encode';\nimport { encodeUnstakeStakedReya } from './encode';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { ethers } from 'ethers';\n\nexport const unstakeStakedReya = async (\n  params: UnstakeStakedReyaParams,\n): Promise<UnstakeStakedReyaResult> => {\n  const chainId = getReyaNetwork();\n\n  const sreyaTokenInfo = getTokenInfoByName('SREYA', chainId);\n  const reyaTokenInfo = getTokenInfoByName('REYA', chainId);\n  const shareAmount = scale(sreyaTokenInfo.decimals)(params.shareAmount);\n  const minAssetAmount = params.minAssetAmount\n    ? scale(reyaTokenInfo.decimals)(params.minAssetAmount)\n    : BigInt(0);\n\n  const multiAction = new MultiAction();\n  encodeSingleWithdraw(sreyaTokenInfo.address, shareAmount, multiAction);\n\n  const { signature: withdrawSig } = await signCoreCommands(\n    params.signer,\n    chainId,\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    params.marginAccountId,\n    multiAction.commands,\n    params.owner.coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n    ethers.AbiCoder.defaultAbiCoder().encode(\n      ['string', 'uint256'],\n      ['unstakeStakedReya', minAssetAmount],\n    ),\n  );\n\n  const { calldata: data } = encodeUnstakeStakedReya(\n    params.marginAccountId,\n    shareAmount,\n    minAssetAmount,\n    withdrawSig,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    data,\n    chainId,\n    ContractType.PERIPHERY_PROXY,\n    {},\n  );\n\n  return {\n    transactionHash: result?.txHash || null,\n    coreSigNonce:\n      result?.coreSigNonce != null ? Number(result.coreSigNonce) : null,\n  };\n};\n"]}

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

@@ -40,11 +40,9 @@ exports.bridgeAndDepositExistingMA = void 0;
 var common_1 = require("@reyaxyz/common");
 var common_2 = require("@reyaxyz/common");
 var encode_1 = require("./encode");
-var encode_2 = require("../encode");
-var common_3 = require("@reyaxyz/common");
 var config_1 = require("../../config");
 var bridgeAndDepositExistingMA = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var moneyInOutChainId, _a, _b, reyaChainId, moneyInOutTokenInfo, reyaPeripheryTokenInfo, reyaCoreTokenInfo, multiAction, peripheryAddress, socketConnectors, _c, data, value, result, transactionModuleClient, error_1;
+    var moneyInOutChainId, _a, _b, reyaChainId, moneyInOutTokenInfo, reyaPeripheryTokenInfo, reyaCoreTokenInfo, peripheryAddress, socketConnectors, _c, data, value, result, transactionModuleClient, error_1;
     var _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
@@ -66,14 +64,12 @@ var bridgeAndDepositExistingMA = function (params) { return __awaiter(void 0, vo
                 reyaCoreTokenInfo = reyaPeripheryTokenInfo.isRUSDUnderlying
                     ? (0, common_1.getTokenInfoByName)('RUSD', reyaChainId)
                     : reyaPeripheryTokenInfo;
-                multiAction = new common_3.MultiAction();
-                (0, encode_2.encodeSingleDeposit)(reyaCoreTokenInfo.address, (0, common_1.scale)(reyaPeripheryTokenInfo.decimals)(params.amount), multiAction);
                 peripheryAddress = (0, common_2.getAddress)(reyaChainId, common_2.ContractType.PERIPHERY_PROXY);
                 socketConnectors = (0, common_1.getSocketConnectors)({
                     moneyInOutChainId: moneyInOutChainId,
                     tokenName: moneyInOutTokenInfo.name,
                 });
-                _c = (0, encode_1.encodeBridgeAndDepositExistingMA)(peripheryAddress, common_1.SOCKET_BRIDGE_IN_MSG_GAS_LIMIT, socketConnectors.deposit, '0x', params.socketDepositFees, params.marginAccountId, reyaPeripheryTokenInfo.address, (0, common_1.scale)(reyaPeripheryTokenInfo.decimals)(params.amount), (0, common_1.scale)(moneyInOutTokenInfo.decimals)(params.amount)), data = _c.calldata, value = _c.value;
+                _c = (0, encode_1.encodeBridgeAndDepositExistingMA)(peripheryAddress, common_1.SOCKET_BRIDGE_IN_MSG_GAS_LIMIT, socketConnectors.deposit, '0x', params.socketDepositFees, params.marginAccountId, reyaPeripheryTokenInfo.address, (0, common_1.scale)(moneyInOutTokenInfo.decimals)(params.amount)), data = _c.calldata, value = _c.value;
                 return [4 /*yield*/, (0, common_2.executeTransaction)(params.signer, data, value, moneyInOutChainId, (0, common_1.getSocketVault)({
                         moneyInOutChainId: moneyInOutChainId,
                         tokenName: moneyInOutTokenInfo.name,

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

@@ -1 +1 @@
-{"version":3,"file":"bridgeAndDepositExistingMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getSocketConnectors,\n  getSocketVault,\n  scale,\n  MoneyInOutChainId,\n  getTokenInfoByAddress,\n  getTokenInfoByName,\n  getReyaNetworkFromMoneyInOutChainId,\n  SOCKET_BRIDGE_IN_MSG_GAS_LIMIT,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress, executeTransaction } from '@reyaxyz/common';\nimport { encodeBridgeAndDepositExistingMA } from './encode';\nimport {\n  BridgeAndDepositExistingMAParams,\n  BridgeAndDepositExistingMAResult,\n} from './types';\nimport { encodeSingleDeposit } from '../encode';\nimport { MultiAction } from '@reyaxyz/common';\nimport { getTransactionModuleClient } from '../../config';\n\nexport const bridgeAndDepositExistingMA = async (\n  params: BridgeAndDepositExistingMAParams,\n): Promise<BridgeAndDepositExistingMAResult> => {\n  const moneyInOutChainId: MoneyInOutChainId =\n    params.moneyInOutChainId ??\n    Number((await params.signer.provider?.getNetwork())?.chainId);\n  const reyaChainId = getReyaNetworkFromMoneyInOutChainId(moneyInOutChainId);\n\n  const moneyInOutTokenInfo = getTokenInfoByAddress(\n    params.tokenAddress,\n    moneyInOutChainId,\n  );\n  const reyaPeripheryTokenInfo = getTokenInfoByName(\n    moneyInOutTokenInfo.name === 'USDC.E' ? 'USDC' : moneyInOutTokenInfo.name,\n    reyaChainId,\n  );\n  const reyaCoreTokenInfo = reyaPeripheryTokenInfo.isRUSDUnderlying\n    ? getTokenInfoByName('RUSD', reyaChainId)\n    : reyaPeripheryTokenInfo;\n\n  const multiAction = new MultiAction();\n  encodeSingleDeposit(\n    reyaCoreTokenInfo.address,\n    scale(reyaPeripheryTokenInfo.decimals)(params.amount),\n    multiAction,\n  );\n\n  const peripheryAddress = getAddress(\n    reyaChainId,\n    ContractType.PERIPHERY_PROXY,\n  );\n\n  const socketConnectors = getSocketConnectors({\n    moneyInOutChainId: moneyInOutChainId,\n    tokenName: moneyInOutTokenInfo.name,\n  });\n\n  const { calldata: data, value } = encodeBridgeAndDepositExistingMA(\n    peripheryAddress,\n    SOCKET_BRIDGE_IN_MSG_GAS_LIMIT,\n    socketConnectors.deposit,\n    '0x',\n    params.socketDepositFees,\n    params.marginAccountId,\n    reyaPeripheryTokenInfo.address,\n    scale(reyaPeripheryTokenInfo.decimals)(params.amount),\n    scale(moneyInOutTokenInfo.decimals)(params.amount),\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    moneyInOutChainId,\n    getSocketVault({\n      moneyInOutChainId: moneyInOutChainId,\n      tokenName: moneyInOutTokenInfo.name,\n    }),\n  );\n\n  if (!result?.hash) {\n    return {\n      transactionHash: null,\n    };\n  }\n\n  try {\n    const transactionModuleClient = getTransactionModuleClient();\n    await transactionModuleClient.pushPendingTransaction(\n      params.marginAccountId,\n      result.hash,\n      moneyInOutChainId,\n      params.amount,\n      reyaCoreTokenInfo.address,\n      'deposit',\n    );\n  } catch (error) {\n    console.error('Error persisting pending deposit transaction', error);\n  }\n\n  return {\n    transactionHash: result?.hash,\n  };\n};\n"]}
+{"version":3,"file":"bridgeAndDepositExistingMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CASyB;AACzB,0CAA+E;AAC/E,mCAA4D;AAK5D,uCAA0D;AAEnD,IAAM,0BAA0B,GAAG,UACxC,MAAwC;;;;;;4BAGtC,MAAM,CAAC,iBAAiB;;;;gBACxB,KAAA,MAAM,CAAA;gBAAE,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAAlD,KAAA,kBAAO,MAAA,CAAC,SAA0C,CAAC,0CAAE,OAAO,EAAC,CAAA;;;gBAFzD,iBAAiB,KAEwC;gBACzD,WAAW,GAAG,IAAA,4CAAmC,EAAC,iBAAiB,CAAC,CAAC;gBAErE,mBAAmB,GAAG,IAAA,8BAAqB,EAC/C,MAAM,CAAC,YAAY,EACnB,iBAAiB,CAClB,CAAC;gBACI,sBAAsB,GAAG,IAAA,2BAAkB,EAC/C,mBAAmB,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,EACzE,WAAW,CACZ,CAAC;gBACI,iBAAiB,GAAG,sBAAsB,CAAC,gBAAgB;oBAC/D,CAAC,CAAC,IAAA,2BAAkB,EAAC,MAAM,EAAE,WAAW,CAAC;oBACzC,CAAC,CAAC,sBAAsB,CAAC;gBAErB,gBAAgB,GAAG,IAAA,mBAAU,EACjC,WAAW,EACX,qBAAY,CAAC,eAAe,CAC7B,CAAC;gBAEI,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;oBAC3C,iBAAiB,EAAE,iBAAiB;oBACpC,SAAS,EAAE,mBAAmB,CAAC,IAAI;iBACpC,CAAC,CAAC;gBAEG,KAA4B,IAAA,yCAAgC,EAChE,gBAAgB,EAChB,uCAA8B,EAC9B,gBAAgB,CAAC,OAAO,EACxB,IAAI,EACJ,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,eAAe,EACtB,sBAAsB,CAAC,OAAO,EAC9B,IAAA,cAAK,EAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CACnD,EATiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAS3B;gBAEa,qBAAM,IAAA,2BAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,iBAAiB,EACjB,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,iBAAiB;wBACpC,SAAS,EAAE,mBAAmB,CAAC,IAAI;qBACpC,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAA,EAAE,CAAC;oBAClB,sBAAO;4BACL,eAAe,EAAE,IAAI;yBACtB,EAAC;gBACJ,CAAC;;;;gBAGO,uBAAuB,GAAG,IAAA,mCAA0B,GAAE,CAAC;gBAC7D,qBAAM,uBAAuB,CAAC,sBAAsB,CAClD,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,IAAI,EACX,iBAAiB,EACjB,MAAM,CAAC,MAAM,EACb,iBAAiB,CAAC,OAAO,EACzB,SAAS,CACV,EAAA;;gBAPD,SAOC,CAAC;;;;gBAEF,OAAO,CAAC,KAAK,CAAC,8CAA8C,EAAE,OAAK,CAAC,CAAC;;oBAGvE,sBAAO;oBACL,eAAe,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI;iBAC9B,EAAC;;;KACH,CAAC;AA3EW,QAAA,0BAA0B,8BA2ErC","sourcesContent":["import {\n  getSocketConnectors,\n  getSocketVault,\n  scale,\n  MoneyInOutChainId,\n  getTokenInfoByAddress,\n  getTokenInfoByName,\n  getReyaNetworkFromMoneyInOutChainId,\n  SOCKET_BRIDGE_IN_MSG_GAS_LIMIT,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress, executeTransaction } from '@reyaxyz/common';\nimport { encodeBridgeAndDepositExistingMA } from './encode';\nimport {\n  BridgeAndDepositExistingMAParams,\n  BridgeAndDepositExistingMAResult,\n} from './types';\nimport { getTransactionModuleClient } from '../../config';\n\nexport const bridgeAndDepositExistingMA = async (\n  params: BridgeAndDepositExistingMAParams,\n): Promise<BridgeAndDepositExistingMAResult> => {\n  const moneyInOutChainId: MoneyInOutChainId =\n    params.moneyInOutChainId ??\n    Number((await params.signer.provider?.getNetwork())?.chainId);\n  const reyaChainId = getReyaNetworkFromMoneyInOutChainId(moneyInOutChainId);\n\n  const moneyInOutTokenInfo = getTokenInfoByAddress(\n    params.tokenAddress,\n    moneyInOutChainId,\n  );\n  const reyaPeripheryTokenInfo = getTokenInfoByName(\n    moneyInOutTokenInfo.name === 'USDC.E' ? 'USDC' : moneyInOutTokenInfo.name,\n    reyaChainId,\n  );\n  const reyaCoreTokenInfo = reyaPeripheryTokenInfo.isRUSDUnderlying\n    ? getTokenInfoByName('RUSD', reyaChainId)\n    : reyaPeripheryTokenInfo;\n\n  const peripheryAddress = getAddress(\n    reyaChainId,\n    ContractType.PERIPHERY_PROXY,\n  );\n\n  const socketConnectors = getSocketConnectors({\n    moneyInOutChainId: moneyInOutChainId,\n    tokenName: moneyInOutTokenInfo.name,\n  });\n\n  const { calldata: data, value } = encodeBridgeAndDepositExistingMA(\n    peripheryAddress,\n    SOCKET_BRIDGE_IN_MSG_GAS_LIMIT,\n    socketConnectors.deposit,\n    '0x',\n    params.socketDepositFees,\n    params.marginAccountId,\n    reyaPeripheryTokenInfo.address,\n    scale(moneyInOutTokenInfo.decimals)(params.amount),\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    moneyInOutChainId,\n    getSocketVault({\n      moneyInOutChainId: moneyInOutChainId,\n      tokenName: moneyInOutTokenInfo.name,\n    }),\n  );\n\n  if (!result?.hash) {\n    return {\n      transactionHash: null,\n    };\n  }\n\n  try {\n    const transactionModuleClient = getTransactionModuleClient();\n    await transactionModuleClient.pushPendingTransaction(\n      params.marginAccountId,\n      result.hash,\n      moneyInOutChainId,\n      params.amount,\n      reyaCoreTokenInfo.address,\n      'deposit',\n    );\n  } catch (error) {\n    console.error('Error persisting pending deposit transaction', error);\n  }\n\n  return {\n    transactionHash: result?.hash,\n  };\n};\n"]}

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

@@ -36,13 +36,19 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeBridgeAndDepositExistingMA = exports.encodeWithdrawMAAndBridge = exports.encodeTransferMargin = exports.encodeCreateAccountCall = void 0;
+exports.encodeOFTBridgeAndDepositExistingMA = exports.buildOFTBridgeAndDepositExistingMASendParam = exports.encodeLzSendAndComposeExtraOptions = exports.encodeWithdrawMALZ = 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");
 var common_2 = require("@reyaxyz/common");
 var common_3 = require("@reyaxyz/common");
 var ethers_2 = require("ethers");
+var LzComposerOperationType;
+(function (LzComposerOperationType) {
+    LzComposerOperationType[LzComposerOperationType["NONE"] = 0] = "NONE";
+    LzComposerOperationType[LzComposerOperationType["DEPOSIT_SPOT_ACCOUNT"] = 1] = "DEPOSIT_SPOT_ACCOUNT";
+    LzComposerOperationType[LzComposerOperationType["DEPOSIT_ACCOUNT"] = 2] = "DEPOSIT_ACCOUNT";
+})(LzComposerOperationType || (LzComposerOperationType = {}));
 var encodeCreateAccountCall = function (accountOwner) {
     var functionSignature = 'createAccount';
     var parameters = [accountOwner];
@@ -103,7 +109,7 @@ var encodeWithdrawMAAndBridge = function (accountId, corePeripheryTokenAddress,
     return { calldata: calldata, value: BigInt(0).toString(10) };
 };
 exports.encodeWithdrawMAAndBridge = encodeWithdrawMAAndBridge;
-var encodeBridgeAndDepositExistingMA = function (receiver, socketMsgGasLimit, socketConnector, socketBridgeOptions, socketFees, accountId, peripheryTokenAddress, peripheryTokenAmount, moneyInOutTokenAmount) {
+var encodeBridgeAndDepositExistingMA = function (receiver, socketMsgGasLimit, socketConnector, socketBridgeOptions, socketFees, accountId, peripheryTokenAddress, moneyInOutTokenAmount) {
     var PERIPHERY_INTERFACE = new ethers_1.Interface(common_2.PeripheryAbi);
     var inputs = {
         accountId: accountId,
@@ -124,4 +130,90 @@ var encodeBridgeAndDepositExistingMA = function (receiver, socketMsgGasLimit, so
     return { calldata: calldata, value: socketFees.toString(10) };
 };
 exports.encodeBridgeAndDepositExistingMA = encodeBridgeAndDepositExistingMA;
+var encodeWithdrawMALZ = function (accountId, corePeripheryTokenAddress, corePeripheryTokenAmount, sig, dstEid, receiver) {
+    var functionSignature = 'withdrawMALZ';
+    var parameters = [
+        {
+            accountId: accountId,
+            token: corePeripheryTokenAddress,
+            tokenAmount: corePeripheryTokenAmount,
+            sig: sig,
+            dstEid: dstEid,
+            receiver: receiver,
+        },
+    ];
+    var INTERFACE = new ethers_1.Interface(common_2.PeripheryAbi);
+    var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
+    return { calldata: calldata, value: BigInt(0).toString(10) };
+};
+exports.encodeWithdrawMALZ = encodeWithdrawMALZ;
+// Gas for lzReceive on destination: token credit + endpoint.sendCompose() queuing
+var LZ_RECEIVE_GAS = 1000000;
+// Gas estimate for lzCompose execution on destination chain
+// Covers: abi.decode + createOrGetSpotAccount/depositExistingMA in OftModule.lzCompose
+var LZ_COMPOSE_GAS = 1000000;
+/**
+ * Encode LZ v3 extraOptions with both lzReceive and lzCompose options.
+ * Required for msgType=2 (SEND_AND_CALL) since enforced options only cover msgType=1.
+ */
+var encodeLzSendAndComposeExtraOptions = function (receiveGas, composeGas) {
+    // Options v3 layout:
+    //   TYPE_3 header:           uint16(3)
+    //   --- lzReceive option ---
+    //   WORKER_ID:               uint8(1)
+    //   length:                  uint16(17) = OPTION_TYPE(1) + GAS(16)
+    //   OPTION_TYPE_LZRECEIVE:   uint8(1)
+    //   gas:                     uint128
+    //   --- lzCompose option ---
+    //   WORKER_ID:               uint8(1)
+    //   length:                  uint16(19) = OPTION_TYPE(1) + INDEX(2) + GAS(16)
+    //   OPTION_TYPE_LZCOMPOSE:   uint8(3)
+    //   index:                   uint16(0)
+    //   gas:                     uint128
+    return ethers_2.ethers.solidityPacked([
+        'uint16',
+        'uint8',
+        'uint16',
+        'uint8',
+        'uint128',
+        'uint8',
+        'uint16',
+        'uint8',
+        'uint16',
+        'uint128',
+    ], [3, 1, 17, 1, receiveGas, 1, 19, 3, 0, composeGas]);
+};
+exports.encodeLzSendAndComposeExtraOptions = encodeLzSendAndComposeExtraOptions;
+var buildOFTBridgeAndDepositExistingMASendParam = function (dstEid, receiverAddress, accountId, peripheryTokenAddress, amountLD, minAmountLD) {
+    var opType = LzComposerOperationType.DEPOSIT_ACCOUNT;
+    var opData = ethers_2.ethers.AbiCoder.defaultAbiCoder().encode(['uint128', 'address'], [accountId, peripheryTokenAddress]);
+    var composeMsg = ethers_2.ethers.AbiCoder.defaultAbiCoder().encode(['uint8', 'bytes'], [opType, opData]);
+    var receiverBytes32 = ethers_2.ethers.zeroPadValue(receiverAddress, 32);
+    var extraOptions = (0, exports.encodeLzSendAndComposeExtraOptions)(LZ_RECEIVE_GAS, LZ_COMPOSE_GAS);
+    var sendParam = {
+        dstEid: dstEid,
+        to: receiverBytes32,
+        amountLD: amountLD,
+        minAmountLD: minAmountLD,
+        extraOptions: extraOptions,
+        composeMsg: composeMsg,
+        oftCmd: '0x',
+    };
+    return { sendParam: sendParam, composeMsg: composeMsg };
+};
+exports.buildOFTBridgeAndDepositExistingMASendParam = buildOFTBridgeAndDepositExistingMASendParam;
+var encodeOFTBridgeAndDepositExistingMA = function (dstEid, receiverAddress, accountId, peripheryTokenAddress, amountLD, minAmountLD, messagingFee, callerAddress) {
+    var sendParam = (0, exports.buildOFTBridgeAndDepositExistingMASendParam)(dstEid, receiverAddress, accountId, peripheryTokenAddress, amountLD, minAmountLD).sendParam;
+    var INTERFACE = new ethers_1.Interface(common_2.OFTAbi);
+    var calldata = INTERFACE.encodeFunctionData('send', [
+        sendParam,
+        messagingFee,
+        callerAddress,
+    ]);
+    return {
+        calldata: calldata,
+        value: messagingFee.nativeFee.toString(10),
+    };
+};
+exports.encodeOFTBridgeAndDepositExistingMA = encodeOFTBridgeAndDepositExistingMA;
 //# sourceMappingURL=encode.js.map

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 { 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"]}
+{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAKyB;AACzB,iCAAmC;AACnC,oCAAuD;AACvD,0CAUyB;AACzB,0CAA+D;AAE/D,iCAAgC;AAEhC,IAAK,uBAIJ;AAJD,WAAK,uBAAuB;IAC1B,qEAAQ,CAAA;IACR,qGAAwB,CAAA;IACxB,2FAAmB,CAAA;AACrB,CAAC,EAJI,uBAAuB,KAAvB,uBAAuB,QAI3B;AAEM,IAAM,uBAAuB,GAAG,UACrC,YAAoB;IAEpB,IAAM,iBAAiB,GAAG,eAAe,CAAC;IAC1C,IAAM,UAAU,GAAG,CAAC,YAAY,CAAC,CAAC;IAClC,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,gBAAG,CAAC,CAAC;IACrC,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAC/D,CAAC,CAAC;AARW,QAAA,uBAAuB,2BAQlC;AAEK,IAAM,oBAAoB,GAAG,UAClC,MAAc,EACd,OAAe,EACf,YAAoB,EACpB,mBAA2B,EAC3B,iBAAyB,EACzB,KAAa,EACb,MAAc;;;;;gBAER,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;gBACtC,8CAA8C;gBAC9C,IAAA,mCAA0B,EAAC,iBAAiB,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;gBAEnC,qBAAM,IAAA,yBAAgB,EAC3D,MAAM,EACN,OAAO,EACP,IAAA,mBAAU,EAAC,OAAO,EAAE,qBAAY,CAAC,eAAe,CAAC,EACjD,mBAAmB,EACnB,WAAW,CAAC,QAAQ,EACpB,YAAY,GAAG,CAAC,EAChB,IAAA,qCAA4B,GAAE,GAAG,iCAAwB,EACzD,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CACjD,EAAA;;gBATkB,eAAe,GAAK,CAAA,SAStC,CAAA,UATiC;gBAW5B,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAClB,iBAAiB,GAAG,oBAAoB,CAAC;gBACzC,UAAU,GAAG;oBACjB;wBACE,SAAS,EAAE,mBAAmB;wBAC9B,QAAQ,EAAE;4BACR,aAAa,EAAE,iBAAiB;4BAChC,UAAU,EAAE,KAAK;4BACjB,gBAAgB,EAAE,MAAM;yBACzB;wBACD,GAAG,EAAE,eAAe;qBACrB;iBACF,CAAC;gBAEI,SAAS,GAAG,IAAI,kBAAS,CAAC,qBAAY,CAAC,CAAC;gBACxC,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;gBAC7E,sBAAO;wBACL,QAAQ,EAAE,QAAQ;wBAClB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;qBAClC,EAAC;;;KACH,CAAC;AA5CW,QAAA,oBAAoB,wBA4C/B;AAEK,IAAM,yBAAyB,GAAG,UACvC,SAAiB,EACjB,yBAAiC,EACjC,wBAAgC,EAChC,GAAoB,EACpB,iBAAyB,EACzB,OAAe,EACf,QAAgB;IAEhB,IAAM,iBAAiB,GAAG,YAAY,CAAC;IACvC,IAAM,UAAU,GAAG;QACjB;YACE,SAAS,WAAA;YACT,KAAK,EAAE,yBAAyB;YAChC,WAAW,EAAE,wBAAwB;YACrC,GAAG,KAAA;YACH,iBAAiB,mBAAA;YACjB,OAAO,SAAA;YACP,QAAQ,UAAA;SACT;KACF,CAAC;IACF,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,qBAAY,CAAC,CAAC;IAC9C,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAC/D,CAAC,CAAC;AAxBW,QAAA,yBAAyB,6BAwBpC;AAEK,IAAM,gCAAgC,GAAG,UAC9C,QAAgB,EAChB,iBAAyB,EACzB,eAAuB,EACvB,mBAA2B,EAC3B,UAAkB,EAClB,SAAiB,EACjB,qBAA6B,EAC7B,qBAA6B;IAE7B,IAAM,mBAAmB,GAAG,IAAI,kBAAS,CAAC,qBAAY,CAAC,CAAC;IACxD,IAAM,MAAM,GAAG;QACb,SAAS,WAAA;QACT,KAAK,EAAE,qBAAqB;KAC7B,CAAC;IACF,IAAM,iBAAiB,GAAG,mBAAmB,CAAC,kBAAkB,CAC9D,sCAAsC,EACtC,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,IAAM,iBAAiB,GAAG,QAAQ,CAAC;IACnC,IAAM,UAAU,GAAG;QACjB,QAAQ;QACR,qBAAqB;QACrB,iBAAiB;QACjB,eAAe;QACf,iBAAiB;QACjB,mBAAmB;KACpB,CAAC;IACF,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,mCAA0B,CAAC,CAAC;IAC5D,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAChE,CAAC,CAAC;AAhCW,QAAA,gCAAgC,oCAgC3C;AAEK,IAAM,kBAAkB,GAAG,UAChC,SAAiB,EACjB,yBAAiC,EACjC,wBAAgC,EAChC,GAAoB,EACpB,MAAc,EACd,QAAgB;IAEhB,IAAM,iBAAiB,GAAG,cAAc,CAAC;IACzC,IAAM,UAAU,GAAG;QACjB;YACE,SAAS,WAAA;YACT,KAAK,EAAE,yBAAyB;YAChC,WAAW,EAAE,wBAAwB;YACrC,GAAG,KAAA;YACH,MAAM,QAAA;YACN,QAAQ,UAAA;SACT;KACF,CAAC;IACF,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,qBAAY,CAAC,CAAC;IAC9C,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAC/D,CAAC,CAAC;AAtBW,QAAA,kBAAkB,sBAsB7B;AAEF,kFAAkF;AAClF,IAAM,cAAc,GAAG,OAAS,CAAC;AACjC,4DAA4D;AAC5D,uFAAuF;AACvF,IAAM,cAAc,GAAG,OAAS,CAAC;AAEjC;;;GAGG;AACI,IAAM,kCAAkC,GAAG,UAChD,UAAkB,EAClB,UAAkB;IAElB,qBAAqB;IACrB,uCAAuC;IACvC,6BAA6B;IAC7B,sCAAsC;IACtC,mEAAmE;IACnE,sCAAsC;IACtC,qCAAqC;IACrC,6BAA6B;IAC7B,sCAAsC;IACtC,8EAA8E;IAC9E,sCAAsC;IACtC,uCAAuC;IACvC,qCAAqC;IACrC,OAAO,eAAM,CAAC,cAAc,CAC1B;QACE,QAAQ;QACR,OAAO;QACP,QAAQ;QACR,OAAO;QACP,SAAS;QACT,OAAO;QACP,QAAQ;QACR,OAAO;QACP,QAAQ;QACR,SAAS;KACV,EACD,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,CACnD,CAAC;AACJ,CAAC,CAAC;AAhCW,QAAA,kCAAkC,sCAgC7C;AAEK,IAAM,2CAA2C,GAAG,UACzD,MAAc,EACd,eAAuB,EACvB,SAAiB,EACjB,qBAA6B,EAC7B,QAAgB,EAChB,WAAmB;IAEnB,IAAM,MAAM,GAAG,uBAAuB,CAAC,eAAe,CAAC;IACvD,IAAM,MAAM,GAAG,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACrD,CAAC,SAAS,EAAE,SAAS,CAAC,EACtB,CAAC,SAAS,EAAE,qBAAqB,CAAC,CACnC,CAAC;IAEF,IAAM,UAAU,GAAG,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACzD,CAAC,OAAO,EAAE,OAAO,CAAC,EAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CACjB,CAAC;IAEF,IAAM,eAAe,GAAG,eAAM,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IACjE,IAAM,YAAY,GAAG,IAAA,0CAAkC,EACrD,cAAc,EACd,cAAc,CACf,CAAC;IAEF,IAAM,SAAS,GAAiB;QAC9B,MAAM,QAAA;QACN,EAAE,EAAE,eAAe;QACnB,QAAQ,UAAA;QACR,WAAW,aAAA;QACX,YAAY,cAAA;QACZ,UAAU,YAAA;QACV,MAAM,EAAE,IAAI;KACb,CAAC;IAEF,OAAO,EAAE,SAAS,WAAA,EAAE,UAAU,YAAA,EAAE,CAAC;AACnC,CAAC,CAAC;AApCW,QAAA,2CAA2C,+CAoCtD;AAEK,IAAM,mCAAmC,GAAG,UACjD,MAAc,EACd,eAAuB,EACvB,SAAiB,EACjB,qBAA6B,EAC7B,QAAgB,EAChB,WAAmB,EACnB,YAA6B,EAC7B,aAAqB;IAEb,IAAA,SAAS,GAAK,IAAA,mDAA2C,EAC/D,MAAM,EACN,eAAe,EACf,SAAS,EACT,qBAAqB,EACrB,QAAQ,EACR,WAAW,CACZ,UAPgB,CAOf;IAEF,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,eAAM,CAAC,CAAC;IACxC,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE;QACpD,SAAS;QACT,YAAY;QACZ,aAAa;KACd,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ,UAAA;QACR,KAAK,EAAE,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;KAC3C,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,mCAAmC,uCA8B9C","sourcesContent":["import {\n  MethodParameters,\n  MultiAction,\n  OFTSendParam,\n  OFTMessagingFee,\n} from '@reyaxyz/common';\nimport { Interface } from 'ethers';\nimport { encodeSingleTransferMargin } from '../encode';\nimport {\n  CoreAbi as abi,\n  OFTAbi as OFTAbi,\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\nenum LzComposerOperationType {\n  NONE = 0,\n  DEPOSIT_SPOT_ACCOUNT = 1,\n  DEPOSIT_ACCOUNT = 2,\n}\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  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\nexport const encodeWithdrawMALZ = (\n  accountId: number,\n  corePeripheryTokenAddress: string,\n  corePeripheryTokenAmount: bigint,\n  sig: EIP712Signature,\n  dstEid: number,\n  receiver: string,\n): MethodParameters => {\n  const functionSignature = 'withdrawMALZ';\n  const parameters = [\n    {\n      accountId,\n      token: corePeripheryTokenAddress,\n      tokenAmount: corePeripheryTokenAmount,\n      sig,\n      dstEid,\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\n// Gas for lzReceive on destination: token credit + endpoint.sendCompose() queuing\nconst LZ_RECEIVE_GAS = 1_000_000;\n// Gas estimate for lzCompose execution on destination chain\n// Covers: abi.decode + createOrGetSpotAccount/depositExistingMA in OftModule.lzCompose\nconst LZ_COMPOSE_GAS = 1_000_000;\n\n/**\n * Encode LZ v3 extraOptions with both lzReceive and lzCompose options.\n * Required for msgType=2 (SEND_AND_CALL) since enforced options only cover msgType=1.\n */\nexport const encodeLzSendAndComposeExtraOptions = (\n  receiveGas: number,\n  composeGas: number,\n): string => {\n  // Options v3 layout:\n  //   TYPE_3 header:           uint16(3)\n  //   --- lzReceive option ---\n  //   WORKER_ID:               uint8(1)\n  //   length:                  uint16(17) = OPTION_TYPE(1) + GAS(16)\n  //   OPTION_TYPE_LZRECEIVE:   uint8(1)\n  //   gas:                     uint128\n  //   --- lzCompose option ---\n  //   WORKER_ID:               uint8(1)\n  //   length:                  uint16(19) = OPTION_TYPE(1) + INDEX(2) + GAS(16)\n  //   OPTION_TYPE_LZCOMPOSE:   uint8(3)\n  //   index:                   uint16(0)\n  //   gas:                     uint128\n  return ethers.solidityPacked(\n    [\n      'uint16',\n      'uint8',\n      'uint16',\n      'uint8',\n      'uint128',\n      'uint8',\n      'uint16',\n      'uint8',\n      'uint16',\n      'uint128',\n    ],\n    [3, 1, 17, 1, receiveGas, 1, 19, 3, 0, composeGas],\n  );\n};\n\nexport const buildOFTBridgeAndDepositExistingMASendParam = (\n  dstEid: number,\n  receiverAddress: string,\n  accountId: number,\n  peripheryTokenAddress: string,\n  amountLD: bigint,\n  minAmountLD: bigint,\n): { sendParam: OFTSendParam; composeMsg: string } => {\n  const opType = LzComposerOperationType.DEPOSIT_ACCOUNT;\n  const opData = ethers.AbiCoder.defaultAbiCoder().encode(\n    ['uint128', 'address'],\n    [accountId, peripheryTokenAddress],\n  );\n\n  const composeMsg = ethers.AbiCoder.defaultAbiCoder().encode(\n    ['uint8', 'bytes'],\n    [opType, opData],\n  );\n\n  const receiverBytes32 = ethers.zeroPadValue(receiverAddress, 32);\n  const extraOptions = encodeLzSendAndComposeExtraOptions(\n    LZ_RECEIVE_GAS,\n    LZ_COMPOSE_GAS,\n  );\n\n  const sendParam: OFTSendParam = {\n    dstEid,\n    to: receiverBytes32,\n    amountLD,\n    minAmountLD,\n    extraOptions,\n    composeMsg,\n    oftCmd: '0x',\n  };\n\n  return { sendParam, composeMsg };\n};\n\nexport const encodeOFTBridgeAndDepositExistingMA = (\n  dstEid: number,\n  receiverAddress: string,\n  accountId: number,\n  peripheryTokenAddress: string,\n  amountLD: bigint,\n  minAmountLD: bigint,\n  messagingFee: OFTMessagingFee,\n  callerAddress: string,\n): MethodParameters => {\n  const { sendParam } = buildOFTBridgeAndDepositExistingMASendParam(\n    dstEid,\n    receiverAddress,\n    accountId,\n    peripheryTokenAddress,\n    amountLD,\n    minAmountLD,\n  );\n\n  const INTERFACE = new Interface(OFTAbi);\n  const calldata = INTERFACE.encodeFunctionData('send', [\n    sendParam,\n    messagingFee,\n    callerAddress,\n  ]);\n\n  return {\n    calldata,\n    value: messagingFee.nativeFee.toString(10),\n  };\n};\n"]}

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

@@ -17,6 +17,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./types"), exports);
 __exportStar(require("./account"), exports);
 __exportStar(require("./bridgeAndDepositExistingMA"), exports);
+__exportStar(require("./oftBridgeAndDepositExistingMA"), exports);
+__exportStar(require("./oftWithdrawMAAndBridge"), 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,+DAA6C;AAC7C,kEAAgD;AAChD,wDAAsC","sourcesContent":["export * from './types';\nexport * from './account';\nexport * from './bridgeAndDepositExistingMA';\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,2DAAyC;AACzC,kEAAgD;AAChD,wDAAsC","sourcesContent":["export * from './types';\nexport * from './account';\nexport * from './bridgeAndDepositExistingMA';\nexport * from './oftBridgeAndDepositExistingMA';\nexport * from './oftWithdrawMAAndBridge';\nexport * from './transferMarginBetweenAccounts';\nexport * from './withdrawMAAndBridge';\n"]}