@reyaxyz/sdk 0.146.8 → 0.147.1

package/README.md

@@ -6,5 +6,5 @@
 
 | Statements                  | Branches                | Functions                 | Lines             |
 | --------------------------- | ----------------------- | ------------------------- | ----------------- |
-| ![Statements](https://img.shields.io/badge/statements-6.39%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-5.55%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-2.66%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-6.09%25-red.svg?style=flat) |
+| ![Statements](https://img.shields.io/badge/statements-6.12%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-5.71%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-2.4%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-5.82%25-red.svg?style=flat) |
 

package/dist/index.js

@@ -18,6 +18,7 @@ exports.getTransactionModuleClient = exports.configureSDK = void 0;
 __exportStar(require("./services/api-wallets"), exports);
 __exportStar(require("./services/lp"), exports);
 __exportStar(require("./services/margin-accounts"), exports);
+__exportStar(require("./services/margin-accounts-v2"), exports);
 __exportStar(require("./services/money-flows"), exports);
 __exportStar(require("./services/orders"), exports);
 __exportStar(require("./services/token"), exports);

package/dist/index.js.map

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

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.encodeUnstakeStakedReya = exports.encodeStakeReya = exports.encodeWithdrawPassivePoolAndBridge = exports.encodeStakeFromMarginAccount = exports.encodeUnstakeFromMarginAccount = exports.encodeDepositLiquidityToAccount = void 0;
+exports.encodeBridgeAndDepositPassivePool = 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,36 +121,6 @@ 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 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"]}
+{"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"]}

package/dist/services/lp/index.js

@@ -20,6 +20,4 @@ __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;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"]}
+{"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"]}

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 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"]}
+{"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"]}

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

@@ -41,6 +41,9 @@ var network_1 = require("../../utils/network");
 var signAndBroadcastTransaction_1 = require("../signAndBroadcastTransaction");
 var encode_1 = require("./encode");
 var common_1 = require("@reyaxyz/common");
+/**
+ * @deprecated Use {@link createAccountV2} instead.
+ */
 var createAccount = function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var data, chainId, result;
     return __generator(this, function (_a) {

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

@@ -1 +1 @@
-{"version":3,"file":"account.js","sourceRoot":"/","sources":["services/margin-accounts/account.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAqD;AACrD,8EAA6E;AAC7E,mCAAmD;AAEnD,0CAA+C;AAExC,IAAM,aAAa,GAAG,UAC3B,MAA2B;;;;;gBAET,IAAI,GAAK,IAAA,gCAAuB,EAAC,MAAM,CAAC,YAAY,CAAC,SAAjD,CAAkD;gBAClE,OAAO,GAAG,IAAA,wBAAc,GAAE,CAAC;gBAElB,qBAAM,IAAA,yDAA2B,EAC9C,IAAI,EACJ,OAAO,EACP,qBAAY,CAAC,UAAU,EACvB;wBACE,WAAW,EAAE,MAAM,CAAC,IAAI;wBACxB,MAAM,EAAE,eAAe;wBACvB,MAAM,EAAE,MAAM,CAAC,YAAY;wBAC3B,aAAa,EAAE,MAAM,CAAC,MAAM;qBAC7B,CACF,EAAA;;gBAVK,MAAM,GAAG,SAUd;gBACD,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,IAAI;wBACvC,YAAY,EAAE,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,IAAI,IAAI;wBAClD,SAAS,EAAE,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,CAAC;qBACrC,EAAC;;;KACH,CAAC;AAtBW,QAAA,aAAa,iBAsBxB","sourcesContent":["import { getReyaNetwork } from '../../utils/network';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { encodeCreateAccountCall } from './encode';\nimport { CreateAccountParams, CreateAccountResult } from './types';\nimport { ContractType } from '@reyaxyz/common';\n\nexport const createAccount = async (\n  params: CreateAccountParams,\n): Promise<CreateAccountResult> => {\n  const { calldata: data } = encodeCreateAccountCall(params.ownerAddress);\n  const chainId = getReyaNetwork();\n\n  const result = await signAndBroadcastTransaction(\n    data,\n    chainId,\n    ContractType.CORE_PROXY,\n    {\n      accountName: params.name,\n      action: 'createAccount',\n      sender: params.ownerAddress,\n      accountSource: params.source,\n    },\n  );\n  return {\n    transactionHash: result?.txHash || null,\n    coreSigNonce: Number(result?.coreSigNonce) || null,\n    accountId: Number(result?.accountId),\n  };\n};\n"]}
+{"version":3,"file":"account.js","sourceRoot":"/","sources":["services/margin-accounts/account.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAqD;AACrD,8EAA6E;AAC7E,mCAAmD;AAEnD,0CAA+C;AAC/C;;GAEG;AACI,IAAM,aAAa,GAAG,UAC3B,MAA2B;;;;;gBAET,IAAI,GAAK,IAAA,gCAAuB,EAAC,MAAM,CAAC,YAAY,CAAC,SAAjD,CAAkD;gBAClE,OAAO,GAAG,IAAA,wBAAc,GAAE,CAAC;gBAElB,qBAAM,IAAA,yDAA2B,EAC9C,IAAI,EACJ,OAAO,EACP,qBAAY,CAAC,UAAU,EACvB;wBACE,WAAW,EAAE,MAAM,CAAC,IAAI;wBACxB,MAAM,EAAE,eAAe;wBACvB,MAAM,EAAE,MAAM,CAAC,YAAY;wBAC3B,aAAa,EAAE,MAAM,CAAC,MAAM;qBAC7B,CACF,EAAA;;gBAVK,MAAM,GAAG,SAUd;gBACD,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,IAAI;wBACvC,YAAY,EAAE,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,IAAI,IAAI;wBAClD,SAAS,EAAE,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,CAAC;qBACrC,EAAC;;;KACH,CAAC;AAtBW,QAAA,aAAa,iBAsBxB","sourcesContent":["import { getReyaNetwork } from '../../utils/network';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { encodeCreateAccountCall } from './encode';\nimport { CreateAccountParams, CreateAccountResult } from './types';\nimport { ContractType } from '@reyaxyz/common';\n/**\n * @deprecated Use {@link createAccountV2} instead.\n */\nexport const createAccount = async (\n  params: CreateAccountParams,\n): Promise<CreateAccountResult> => {\n  const { calldata: data } = encodeCreateAccountCall(params.ownerAddress);\n  const chainId = getReyaNetwork();\n\n  const result = await signAndBroadcastTransaction(\n    data,\n    chainId,\n    ContractType.CORE_PROXY,\n    {\n      accountName: params.name,\n      action: 'createAccount',\n      sender: params.ownerAddress,\n      accountSource: params.source,\n    },\n  );\n  return {\n    transactionHash: result?.txHash || null,\n    coreSigNonce: Number(result?.coreSigNonce) || null,\n    accountId: Number(result?.accountId),\n  };\n};\n"]}

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

@@ -41,6 +41,9 @@ var common_1 = require("@reyaxyz/common");
 var common_2 = require("@reyaxyz/common");
 var encode_1 = require("./encode");
 var config_1 = require("../../config");
+/**
+ * @deprecated Use {@link socketBridgeAndDepositMAV2} instead.
+ */
 var bridgeAndDepositExistingMA = function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var moneyInOutChainId, _a, _b, reyaChainId, moneyInOutTokenInfo, reyaPeripheryTokenInfo, reyaCoreTokenInfo, peripheryAddress, socketConnectors, _c, data, value, result, transactionModuleClient, error_1;
     var _d, _e, _f;

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,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"]}
+{"version":3,"file":"bridgeAndDepositExistingMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CASyB;AACzB,0CAA+E;AAC/E,mCAA4D;AAK5D,uCAA0D;AAE1D;;GAEG;AACI,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\n/**\n * @deprecated Use {@link socketBridgeAndDepositMAV2} instead.\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,19 +36,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeOFTBridgeAndDepositExistingMA = exports.buildOFTBridgeAndDepositExistingMASendParam = exports.encodeLzSendAndComposeExtraOptions = exports.encodeWithdrawMALZ = exports.encodeBridgeAndDepositExistingMA = exports.encodeWithdrawMAAndBridge = exports.encodeTransferMargin = exports.encodeCreateAccountCall = void 0;
+exports.encodeBridgeAndDepositExistingMA = exports.encodeWithdrawMAAndBridge = exports.encodeTransferMargin = exports.encodeCreateAccountCall = void 0;
 var common_1 = require("@reyaxyz/common");
 var ethers_1 = require("ethers");
 var encode_1 = require("../encode");
 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];
@@ -130,90 +124,4 @@ 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 {\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"]}
+{"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  moneyInOutTokenAmount: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(PeripheryAbi);\n  const inputs = {\n    accountId,\n    token: peripheryTokenAddress,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositExistingMA((uint128,address))',\n    [inputs],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    moneyInOutTokenAmount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n    socketBridgeOptions,\n  ];\n  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: socketFees.toString(10) };\n};\n"]}

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

@@ -17,8 +17,6 @@ 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,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"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,+DAA6C;AAC7C,kEAAgD;AAChD,wDAAsC","sourcesContent":["export * from './types';\nexport * from './account';\nexport * from './bridgeAndDepositExistingMA';\nexport * from './transferMarginBetweenAccounts';\nexport * from './withdrawMAAndBridge';\n"]}

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

@@ -42,6 +42,9 @@ var common_2 = require("@reyaxyz/common");
 var signAndBroadcastTransaction_1 = require("../signAndBroadcastTransaction");
 var encode_1 = require("./encode");
 var network_1 = require("../../utils/network");
+/**
+ * @deprecated Use {@link transferMarginBetweenAccountsV2} instead.
+ */
 var transferMarginBetweenAccounts = function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var tokenInfo, amount, chainId, data, result;
     return __generator(this, function (_a) {

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

@@ -1 +1 @@
-{"version":3,"file":"transferMarginBetweenAccounts.js","sourceRoot":"/","sources":["services/margin-accounts/transferMarginBetweenAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAiE;AACjE,0CAA+C;AAC/C,8EAA6E;AAC7E,mCAAgD;AAKhD,+CAAqD;AAE9C,IAAM,6BAA6B,GAAG,UAC3C,MAA2C;;;;;gBAErC,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACvD,MAAM,GAAG,IAAA,gBAAO,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAEpD,OAAO,GAAG,IAAA,wBAAc,GAAE,CAAC;gBAEN,qBAAM,IAAA,6BAAoB,EACnD,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,MAAM,CAAC,mBAAmB,EAC1B,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,YAAY,EACnB,MAAM,CACP,EAAA;;gBARiB,IAAI,GAAK,CAAA,SAQ1B,CAAA,SARqB;gBAUP,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,EAAE,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,IAAI,IAAI;qBACnD,EAAC;;;KACH,CAAC;AA7BW,QAAA,6BAA6B,iCA6BxC","sourcesContent":["import { scaleV2, getTokenInfoByAddress } from '@reyaxyz/common';\nimport { ContractType } from '@reyaxyz/common';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { encodeTransferMargin } from './encode';\nimport {\n  TransferMarginBetweenAccountsParams,\n  TransferMarginBetweenAccountsResult,\n} from './types';\nimport { getReyaNetwork } from '../../utils/network';\n\nexport const transferMarginBetweenAccounts = async (\n  params: TransferMarginBetweenAccountsParams,\n): Promise<TransferMarginBetweenAccountsResult> => {\n  const tokenInfo = getTokenInfoByAddress(params.tokenAddress);\n  const amount = scaleV2(tokenInfo.decimals)(params.amount);\n\n  const chainId = getReyaNetwork();\n\n  const { calldata: data } = await encodeTransferMargin(\n    params.signer,\n    chainId,\n    params.owner.coreSigNonce,\n    params.fromMarginAccountId,\n    params.toMarginAccountId,\n    params.tokenAddress,\n    amount,\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: Number(result?.coreSigNonce) || null,\n  };\n};\n"]}
+{"version":3,"file":"transferMarginBetweenAccounts.js","sourceRoot":"/","sources":["services/margin-accounts/transferMarginBetweenAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAiE;AACjE,0CAA+C;AAC/C,8EAA6E;AAC7E,mCAAgD;AAKhD,+CAAqD;AAErD;;GAEG;AACI,IAAM,6BAA6B,GAAG,UAC3C,MAA2C;;;;;gBAErC,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACvD,MAAM,GAAG,IAAA,gBAAO,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAEpD,OAAO,GAAG,IAAA,wBAAc,GAAE,CAAC;gBAEN,qBAAM,IAAA,6BAAoB,EACnD,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,MAAM,CAAC,mBAAmB,EAC1B,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,YAAY,EACnB,MAAM,CACP,EAAA;;gBARiB,IAAI,GAAK,CAAA,SAQ1B,CAAA,SARqB;gBAUP,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,EAAE,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,IAAI,IAAI;qBACnD,EAAC;;;KACH,CAAC;AA7BW,QAAA,6BAA6B,iCA6BxC","sourcesContent":["import { scaleV2, getTokenInfoByAddress } from '@reyaxyz/common';\nimport { ContractType } from '@reyaxyz/common';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { encodeTransferMargin } from './encode';\nimport {\n  TransferMarginBetweenAccountsParams,\n  TransferMarginBetweenAccountsResult,\n} from './types';\nimport { getReyaNetwork } from '../../utils/network';\n\n/**\n * @deprecated Use {@link transferMarginBetweenAccountsV2} instead.\n */\nexport const transferMarginBetweenAccounts = async (\n  params: TransferMarginBetweenAccountsParams,\n): Promise<TransferMarginBetweenAccountsResult> => {\n  const tokenInfo = getTokenInfoByAddress(params.tokenAddress);\n  const amount = scaleV2(tokenInfo.decimals)(params.amount);\n\n  const chainId = getReyaNetwork();\n\n  const { calldata: data } = await encodeTransferMargin(\n    params.signer,\n    chainId,\n    params.owner.coreSigNonce,\n    params.fromMarginAccountId,\n    params.toMarginAccountId,\n    params.tokenAddress,\n    amount,\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: Number(result?.coreSigNonce) || null,\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  MoneyInOutChainId,\n  OwnerMetadataEntity,\n  SocketDepositFees,\n  TokenEntity,\n} from '@reyaxyz/common';\n\nexport type CreateAccountParams = {\n  ownerAddress: string;\n  name: string;\n  source?: string;\n};\n\nexport type CreateAccountResult = {\n  transactionHash: string | null;\n  accountId: number | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type TransferMarginBetweenAccountsParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  fromMarginAccountId: number;\n  toMarginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type TransferMarginBetweenAccountsResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type WithdrawMAAndBridgeParams = {\n  signer: Signer | JsonRpcSigner;\n  moneyInOutChainId: MoneyInOutChainId;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;\n  marginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n  // if not provided it has same value as owner.address\n  receiverAddress?: Lowercase<string>;\n};\n\nexport type WithdrawMAAndBridgeParamsResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type BridgeAndDepositExistingMAParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n  socketDepositFees: SocketDepositFees['fees'];\n  moneyInOutChainId?: MoneyInOutChainId;\n};\n\nexport type BridgeAndDepositExistingMAResult = {\n  transactionHash: string | null;\n};\n\nexport type OFTWithdrawMAAndBridgeParams = WithdrawMAAndBridgeParams;\n\nexport type OFTWithdrawMAAndBridgeResult = WithdrawMAAndBridgeParamsResult;\n\nexport type OFTBridgeAndDepositExistingMAParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n  moneyInOutChainId?: MoneyInOutChainId;\n};\n\nexport type OFTBridgeAndDepositExistingMAResult = {\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  MoneyInOutChainId,\n  OwnerMetadataEntity,\n  SocketDepositFees,\n  TokenEntity,\n} from '@reyaxyz/common';\n\nexport type CreateAccountParams = {\n  ownerAddress: string;\n  name: string;\n  source?: string;\n};\n\nexport type CreateAccountResult = {\n  transactionHash: string | null;\n  accountId: number | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type TransferMarginBetweenAccountsParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  fromMarginAccountId: number;\n  toMarginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type TransferMarginBetweenAccountsResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type WithdrawMAAndBridgeParams = {\n  signer: Signer | JsonRpcSigner;\n  moneyInOutChainId: MoneyInOutChainId;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;\n  marginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n  // if not provided it has same value as owner.address\n  receiverAddress?: Lowercase<string>;\n};\n\nexport type WithdrawMAAndBridgeParamsResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type BridgeAndDepositExistingMAParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: number;\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n  socketDepositFees: SocketDepositFees['fees'];\n  moneyInOutChainId?: MoneyInOutChainId;\n};\n\nexport type BridgeAndDepositExistingMAResult = {\n  transactionHash: string | null;\n};\n"]}

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

@@ -48,6 +48,9 @@ var common_5 = require("@reyaxyz/common");
 var ethers_1 = require("ethers");
 var config_1 = require("../../config");
 var network_1 = require("../../utils/network");
+/**
+ * @deprecated Use {@link withdrawMAAndSocketBridgeV2} instead.
+ */
 var withdrawMAAndBridge = function (_a) {
     var signer = _a.signer, moneyInOutChainId = _a.moneyInOutChainId, marginAccountId = _a.marginAccountId, owner = _a.owner, unscaledAmount = _a.amount, tokenAddress = _a.tokenAddress, _b = _a.receiverAddress, receiverAddress = _b === void 0 ? owner.address : _b;
     return __awaiter(void 0, void 0, void 0, function () {

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

@@ -1 +1 @@
-{"version":3,"file":"withdrawMAAndBridge.js","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  scale,\n  getTokenInfoByAddress,\n  getSocketWithdrawMsgGasLimit,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '@reyaxyz/common';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { signCoreCommands } from '@reyaxyz/common';\nimport { encodeWithdrawMAAndBridge } from './encode';\nimport {\n  WithdrawMAAndBridgeParams,\n  WithdrawMAAndBridgeParamsResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '@reyaxyz/common';\nimport { encodeSingleWithdraw } from '../encode';\nimport { MultiAction } from '@reyaxyz/common';\nimport { ethers } from 'ethers';\nimport { getTransactionModuleClient } from '../../config';\nimport { getReyaNetwork } from '../../utils/network';\n\nexport const withdrawMAAndBridge = async ({\n  signer,\n  moneyInOutChainId,\n  marginAccountId,\n  owner,\n  amount: unscaledAmount,\n  tokenAddress,\n  receiverAddress = owner.address,\n}: WithdrawMAAndBridgeParams): Promise<WithdrawMAAndBridgeParamsResult> => {\n  const reyaChainId = getReyaNetwork();\n\n  const corePeripheryTokenInfo = getTokenInfoByAddress(tokenAddress);\n\n  const multiAction = new MultiAction();\n  encodeSingleWithdraw(\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    multiAction,\n  );\n\n  const socketMsgGasLimit = getSocketWithdrawMsgGasLimit({\n    moneyInOutChainId: moneyInOutChainId,\n  }).msgGasLimit;\n\n  const { signature: eip712Signature } = await signCoreCommands(\n    signer,\n    reyaChainId,\n    getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),\n    marginAccountId,\n    multiAction.commands,\n    owner.coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n    ethers.AbiCoder.defaultAbiCoder().encode(\n      ['address', 'uint256', 'uint256'],\n      [receiverAddress, moneyInOutChainId, socketMsgGasLimit],\n    ),\n  );\n\n  const { calldata: data } = encodeWithdrawMAAndBridge(\n    marginAccountId,\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    eip712Signature,\n    socketMsgGasLimit,\n    moneyInOutChainId,\n    receiverAddress,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    data,\n    reyaChainId,\n    ContractType.PERIPHERY_PROXY,\n    {\n      destinationType: 'account',\n    },\n  );\n\n  if (!result?.txHash) {\n    return {\n      transactionHash: null,\n      coreSigNonce: null,\n    };\n  }\n\n  try {\n    const transactionModuleClient = getTransactionModuleClient();\n    await transactionModuleClient.pushPendingTransaction(\n      marginAccountId,\n      result.txHash,\n      moneyInOutChainId,\n      unscaledAmount,\n      corePeripheryTokenInfo.address,\n      'withdrawal',\n    );\n  } catch (error) {\n    console.log('Error persisting pending withdraw transaction', error);\n  }\n\n  return {\n    transactionHash: result?.txHash || null,\n    coreSigNonce: Number(result?.coreSigNonce) || null,\n  };\n};\n"]}
+{"version":3,"file":"withdrawMAAndBridge.js","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  scale,\n  getTokenInfoByAddress,\n  getSocketWithdrawMsgGasLimit,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '@reyaxyz/common';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { signCoreCommands } from '@reyaxyz/common';\nimport { encodeWithdrawMAAndBridge } from './encode';\nimport {\n  WithdrawMAAndBridgeParams,\n  WithdrawMAAndBridgeParamsResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '@reyaxyz/common';\nimport { encodeSingleWithdraw } from '../encode';\nimport { MultiAction } from '@reyaxyz/common';\nimport { ethers } from 'ethers';\nimport { getTransactionModuleClient } from '../../config';\nimport { getReyaNetwork } from '../../utils/network';\n\n/**\n * @deprecated Use {@link withdrawMAAndSocketBridgeV2} instead.\n */\nexport const withdrawMAAndBridge = async ({\n  signer,\n  moneyInOutChainId,\n  marginAccountId,\n  owner,\n  amount: unscaledAmount,\n  tokenAddress,\n  receiverAddress = owner.address,\n}: WithdrawMAAndBridgeParams): Promise<WithdrawMAAndBridgeParamsResult> => {\n  const reyaChainId = getReyaNetwork();\n\n  const corePeripheryTokenInfo = getTokenInfoByAddress(tokenAddress);\n\n  const multiAction = new MultiAction();\n  encodeSingleWithdraw(\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    multiAction,\n  );\n\n  const socketMsgGasLimit = getSocketWithdrawMsgGasLimit({\n    moneyInOutChainId: moneyInOutChainId,\n  }).msgGasLimit;\n\n  const { signature: eip712Signature } = await signCoreCommands(\n    signer,\n    reyaChainId,\n    getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),\n    marginAccountId,\n    multiAction.commands,\n    owner.coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n    ethers.AbiCoder.defaultAbiCoder().encode(\n      ['address', 'uint256', 'uint256'],\n      [receiverAddress, moneyInOutChainId, socketMsgGasLimit],\n    ),\n  );\n\n  const { calldata: data } = encodeWithdrawMAAndBridge(\n    marginAccountId,\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    eip712Signature,\n    socketMsgGasLimit,\n    moneyInOutChainId,\n    receiverAddress,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    data,\n    reyaChainId,\n    ContractType.PERIPHERY_PROXY,\n    {\n      destinationType: 'account',\n    },\n  );\n\n  if (!result?.txHash) {\n    return {\n      transactionHash: null,\n      coreSigNonce: null,\n    };\n  }\n\n  try {\n    const transactionModuleClient = getTransactionModuleClient();\n    await transactionModuleClient.pushPendingTransaction(\n      marginAccountId,\n      result.txHash,\n      moneyInOutChainId,\n      unscaledAmount,\n      corePeripheryTokenInfo.address,\n      'withdrawal',\n    );\n  } catch (error) {\n    console.log('Error persisting pending withdraw transaction', error);\n  }\n\n  return {\n    transactionHash: result?.txHash || null,\n    coreSigNonce: Number(result?.coreSigNonce) || null,\n  };\n};\n"]}

package/dist/services/{lp/stakeReya.js → margin-accounts-v2/createAccount.js}

@@ -36,40 +36,38 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stakeReya = void 0;
+exports.createAccountV2 = void 0;
+var ethers_1 = require("ethers");
 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;
+var common_1 = require("@reyaxyz/common");
+var getCalldata = function (accountOwner) {
+    var functionSignature = 'createAccount';
+    var parameters = [accountOwner];
+    var INTERFACE = new ethers_1.Interface(common_1.CoreAbi);
+    var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
+    return calldata;
+};
+var createAccountV2 = function (params) { return __awaiter(void 0, void 0, void 0, function () {
+    var calldata, chainId, result;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                calldata = getCalldata(params.ownerAddress);
                 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]))];
+                return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(calldata, chainId, common_1.ContractType.CORE_PROXY, {
+                        accountName: params.name,
+                        action: 'createAccount',
+                        sender: params.ownerAddress,
+                    })];
             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,
+                        accountId: Number(result === null || result === void 0 ? void 0 : result.accountId),
                     }];
         }
     });
 }); };
-exports.stakeReya = stakeReya;
-//# sourceMappingURL=stakeReya.js.map
+exports.createAccountV2 = createAccountV2;
+//# sourceMappingURL=createAccount.js.map

package/dist/services/margin-accounts-v2/createAccount.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createAccount.js","sourceRoot":"/","sources":["services/margin-accounts-v2/createAccount.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAmC;AACnC,+CAAqD;AACrD,8EAA6E;AAE7E,0CAAwD;AAExD,IAAM,WAAW,GAAG,UAAC,YAAoB;IACvC,IAAM,iBAAiB,GAAG,eAAe,CAAC;IAC1C,IAAM,UAAU,GAAG,CAAC,YAAY,CAAC,CAAC;IAClC,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,gBAAO,CAAC,CAAC;IACzC,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEK,IAAM,eAAe,GAAG,UAC7B,MAA6B;;;;;gBAEvB,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAC5C,OAAO,GAAG,IAAA,wBAAc,GAAE,CAAC;gBAElB,qBAAM,IAAA,yDAA2B,EAC9C,QAAQ,EACR,OAAO,EACP,qBAAY,CAAC,UAAU,EACvB;wBACE,WAAW,EAAE,MAAM,CAAC,IAAI;wBACxB,MAAM,EAAE,eAAe;wBACvB,MAAM,EAAE,MAAM,CAAC,YAAY;qBAC5B,CACF,EAAA;;gBATK,MAAM,GAAG,SASd;gBACD,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,IAAI;wBACvC,SAAS,EAAE,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,CAAC;qBACrC,EAAC;;;KACH,CAAC;AApBW,QAAA,eAAe,mBAoB1B","sourcesContent":["import { Interface } from 'ethers';\nimport { getReyaNetwork } from '../../utils/network';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { CreateAccountParamsV2, CreateAccountResultV2 } from './types';\nimport { ContractType, CoreAbi } from '@reyaxyz/common';\n\nconst getCalldata = (accountOwner: string): string => {\n  const functionSignature = 'createAccount';\n  const parameters = [accountOwner];\n  const INTERFACE = new Interface(CoreAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return calldata;\n};\n\nexport const createAccountV2 = async (\n  params: CreateAccountParamsV2,\n): Promise<CreateAccountResultV2> => {\n  const calldata = getCalldata(params.ownerAddress);\n  const chainId = getReyaNetwork();\n\n  const result = await signAndBroadcastTransaction(\n    calldata,\n    chainId,\n    ContractType.CORE_PROXY,\n    {\n      accountName: params.name,\n      action: 'createAccount',\n      sender: params.ownerAddress,\n    },\n  );\n  return {\n    transactionHash: result?.txHash || null,\n    accountId: Number(result?.accountId),\n  };\n};\n"]}

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.esimateFeeLzBridgeAndDepositMAV2 = exports.lzBridgeAndDepositMAV2 = exports.estimateFeeSocketBridgeAndDepositMAV2 = exports.socketBridgeAndDepositMAV2 = void 0;
+var socketBridgeAndDepositMA_1 = require("./socket/socketBridgeAndDepositMA");
+Object.defineProperty(exports, "socketBridgeAndDepositMAV2", { enumerable: true, get: function () { return socketBridgeAndDepositMA_1.socketBridgeAndDepositMAV2; } });
+var estimateFeeSocketBridgeAndDepositMA_1 = require("./socket/estimateFeeSocketBridgeAndDepositMA");
+Object.defineProperty(exports, "estimateFeeSocketBridgeAndDepositMAV2", { enumerable: true, get: function () { return estimateFeeSocketBridgeAndDepositMA_1.estimateFeeSocketBridgeAndDepositMAV2; } });
+var lzBridgeAndDepositMA_1 = require("./lz/lzBridgeAndDepositMA");
+Object.defineProperty(exports, "lzBridgeAndDepositMAV2", { enumerable: true, get: function () { return lzBridgeAndDepositMA_1.lzBridgeAndDepositMAV2; } });
+var estimateFeeLzBridgeAndDepositMA_1 = require("./lz/estimateFeeLzBridgeAndDepositMA");
+Object.defineProperty(exports, "esimateFeeLzBridgeAndDepositMAV2", { enumerable: true, get: function () { return estimateFeeLzBridgeAndDepositMA_1.esimateFeeLzBridgeAndDepositMAV2; } });
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/margin-accounts-v2/deposit/index.ts"],"names":[],"mappings":";;;AAAA,8EAA+E;AAAtE,sIAAA,0BAA0B,OAAA;AACnC,oGAAqG;AAA5F,4JAAA,qCAAqC,OAAA;AAC9C,kEAAmE;AAA1D,8HAAA,sBAAsB,OAAA;AAC/B,wFAAwF;AAA/E,mJAAA,gCAAgC,OAAA","sourcesContent":["export { socketBridgeAndDepositMAV2 } from './socket/socketBridgeAndDepositMA';\nexport { estimateFeeSocketBridgeAndDepositMAV2 } from './socket/estimateFeeSocketBridgeAndDepositMA';\nexport { lzBridgeAndDepositMAV2 } from './lz/lzBridgeAndDepositMA';\nexport { esimateFeeLzBridgeAndDepositMAV2 } from './lz/estimateFeeLzBridgeAndDepositMA';\n"]}