@reyaxyz/sdk 0.51.0 → 0.52.1

package/src/services/lp/encode.ts

@@ -44,31 +44,36 @@ export const encodeTransferFromMAToPool = (
   sig: EIP712Signature,
   poolId: number,
   minShares: bigint,
+  receiver: string,
 ): MethodParameters => {
   const functionSignature = 'transferFromMAToPool';
-  const parameters = [{ accountId, amount, sig, poolId, minShares }];
+  const parameters = [{ accountId, amount, sig, poolId, minShares, receiver }];
   const INTERFACE = new Interface(peripheryAbi);
   const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
   return { calldata: calldata, value: BigInt(0).toString(10) };
 };
 
 export const encodeWithdrawPassivePoolAndBridge = (
+  owner: string,
   poolId: number,
   sharesAmount: bigint,
   minOut: bigint,
   sig: EIP712Signature,
   socketMsgGasLimit: bigint,
+  socketPayloadSize: bigint,
   socketConnector: string,
   receiver: string,
 ): MethodParameters => {
   const functionSignature = 'withdrawPassivePool';
   const parameters = [
     {
+      owner,
       poolId,
       sharesAmount,
       minOut,
       sig,
       socketMsgGasLimit,
+      socketPayloadSize,
       socketConnector,
       receiver,
     },
@@ -82,6 +87,7 @@ export const encodeBridgeAndDepositPassivePool = (
   receiver: string,
   socketMsgGasLimit: bigint,
   socketConnector: string,
+  socketBridgeOptions: string,
   socketFees: bigint,
   poolId: number,
   owner: string,
@@ -89,25 +95,28 @@ export const encodeBridgeAndDepositPassivePool = (
   minShares: bigint,
   fallbackSocketMsgGasLimit: bigint,
   fallbackSocketConnector: string,
+  fallbackSocketPayloadSize: bigint,
 ): MethodParameters => {
   const PERIPHERY_INTERFACE = new Interface(peripheryAbi);
   const inputs = { poolId, owner, amount, minShares };
   const fallbackData = {
     socketMsgGasLimit: fallbackSocketMsgGasLimit,
     socketConnector: fallbackSocketConnector,
+    socketPayloadSize: fallbackSocketPayloadSize,
   };
   const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(
-    'depositPassivePool((uint128,address,uint256,uint256),(uint256,address))',
+    'depositPassivePool((uint128,address,uint256,uint256),(uint256,uint256,address))',
     [inputs, fallbackData],
   );
 
-  const functionSignature = 'depositToAppChain';
+  const functionSignature = 'bridge';
   const parameters = [
     receiver,
     amount,
     socketMsgGasLimit,
     socketConnector,
     peripheryCalldata,
+    socketBridgeOptions,
   ];
   const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);
   const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);

package/src/services/lp/transferFromMAToPool.ts

@@ -44,6 +44,7 @@ export const transferFromMAToPool = async (
     eip712Signature,
     params.pool.id,
     BigInt(0),
+    params.owner.address,
   );
 
   const result = await executeTransaction(

package/src/services/lp/types.ts

@@ -31,7 +31,7 @@ export type RemoveLiquidityResult = {
 
 export type TransferFromMAToPoolParams = {
   signer: Signer | JsonRpcSigner;
-  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;
+  owner: Pick<OwnerMetadataEntity, 'coreSigNonce' | 'address'>;
   marginAccountId: MarginAccountEntity['id'];
   pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;
   amount: number;

package/src/services/lp/withdrawPassivePoolAndBridge.ts

@@ -40,11 +40,13 @@ export const withdrawPassivePoolAndBridge = async (
   );
 
   const { calldata: data, value } = encodeWithdrawPassivePoolAndBridge(
+    params.owner.address,
     params.pool.id,
     sharesAmount,
     BigInt(0),
     eip712Signature,
     BigInt('10000000'), //todo
+    BigInt(0),
     getSocketConnectors({
       moneyInOutChainId: params.moneyInOutChainId,
       tokenName: 'USDC', // todo: this should not be hardcoded

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

@@ -1,5 +1,4 @@
 import {
-  getCurrentTimestampInSeconds,
   getSocketConnectors,
   getSocketDepositFeesAsBigInt,
   getSocketVault,
@@ -16,8 +15,6 @@ import {
   BridgeAndDepositExistingMAParams,
   BridgeAndDepositExistingMAResult,
 } from './types';
-import { signCoreCommands } from '../sign';
-import { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';
 import { encodeSingleDeposit } from '../encode';
 import { MultiAction } from '../../utils/action';
 
@@ -53,16 +50,6 @@ export const bridgeAndDepositExistingMA = async (
     ContractType.PERIPHERY_PROXY,
   );
 
-  const eip712Signature = await signCoreCommands(
-    params.signer,
-    reyaChainId,
-    peripheryAddress,
-    params.marginAccountId,
-    multiAction.commands,
-    params.owner.coreSigNonce + 1,
-    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,
-  );
-
   const socketConnectors = getSocketConnectors({
     moneyInOutChainId: moneyInOutChainId,
     tokenName: moneyInOutTokenInfo.name,
@@ -72,16 +59,17 @@ export const bridgeAndDepositExistingMA = async (
     peripheryAddress,
     BigInt('10000000'),
     socketConnectors.deposit,
+    '0x',
     getSocketDepositFeesAsBigInt({
       moneyInOutChainId: moneyInOutChainId,
     }),
     params.marginAccountId,
     reyaPeripheryTokenInfo.address,
     scale(reyaPeripheryTokenInfo.decimals)(params.amount),
-    eip712Signature,
     scale(moneyInOutTokenInfo.decimals)(params.amount),
     BigInt('10000000'),
     socketConnectors.withdraw,
+    BigInt(0),
   );
 
   const result = await executeTransaction(

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

@@ -41,6 +41,7 @@ export const bridgeAndDepositNewMA = async (
     getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),
     BigInt('10000000'),
     socketConnectors.deposit,
+    '0x',
     getSocketDepositFeesAsBigInt({
       moneyInOutChainId: moneyInOutChainId,
     }),
@@ -50,6 +51,7 @@ export const bridgeAndDepositNewMA = async (
     scale(moneyInOutTokenInfo.decimals)(params.amount),
     BigInt('10000000'),
     socketConnectors.withdraw,
+    BigInt(0),
   );
 
   const result = await executeTransaction(

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

@@ -7,8 +7,8 @@ import {
   encodeSingleWithdraw,
 } from '../encode';
 
-import { abi } from '../../abis/AccountModule.json';
-import { abi as coreAbi } from '../../abis/ExecutionModule.json';
+import { abi } from '../../abis/CoreProxy.json';
+import { abi as coreAbi } from '../../abis/CoreProxy.json';
 import { abi as peripheryAbi } from '../../abis/Periphery.json';
 import { abi as Socket_VaultWithPayloadAbi } from '../../abis/socket/VaultWithPayload.json';
 import { EIP712Signature, signCoreCommands } from '../sign';
@@ -70,7 +70,7 @@ export const encodeTransferMargin = async (
   amount: bigint,
 ): Promise<MethodParameters> => {
   const multiAction = new MultiAction();
-
+  // todo: note can we make this more stateless?
   encodeSingleTransferMargin(toMarginAccountId, token, amount, multiAction);
 
   const eip712Signature = await signCoreCommands(
@@ -105,6 +105,7 @@ export const encodeWithdrawMAAndBridge = (
   corePeripheryTokenAmount: bigint,
   sig: EIP712Signature,
   socketMsgGasLimit: bigint,
+  socketPayloadSize: bigint,
   socketConnector: string,
   receiver: string,
 ): MethodParameters => {
@@ -116,6 +117,7 @@ export const encodeWithdrawMAAndBridge = (
       tokenAmount: corePeripheryTokenAmount,
       sig,
       socketMsgGasLimit,
+      socketPayloadSize,
       socketConnector,
       receiver,
     },
@@ -129,6 +131,7 @@ export const encodeBridgeAndDepositNewMA = (
   receiver: string,
   socketMsgGasLimit: bigint,
   socketConnector: string,
+  socketBridgeOptions: string,
   socketFees: bigint,
   accountOwner: string,
   peripheryTokenAddress: string,
@@ -136,6 +139,7 @@ export const encodeBridgeAndDepositNewMA = (
   moneyInOutTokenAmount: bigint,
   fallbackSocketMsgGasLimit: bigint,
   fallbackSocketConnector: string,
+  fallbackSocketPayloadSize: bigint,
 ): MethodParameters => {
   const PERIPHERY_INTERFACE = new Interface(peripheryAbi);
   const inputs = {
@@ -146,19 +150,21 @@ export const encodeBridgeAndDepositNewMA = (
   const fallbackData = {
     socketMsgGasLimit: fallbackSocketMsgGasLimit,
     socketConnector: fallbackSocketConnector,
+    socketPayloadSize: fallbackSocketPayloadSize,
   };
   const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(
-    'depositNewMA((address,address,uint256),(uint256,address))',
+    'depositNewMA((address,address,uint256),(uint256,uint256,address))',
     [inputs, fallbackData],
   );
 
-  const functionSignature = 'depositToAppChain';
+  const functionSignature = 'bridge';
   const parameters = [
     receiver,
     moneyInOutTokenAmount,
     socketMsgGasLimit,
     socketConnector,
     peripheryCalldata,
+    socketBridgeOptions,
   ];
   const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);
   const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
@@ -169,38 +175,40 @@ export const encodeBridgeAndDepositExistingMA = (
   receiver: string,
   socketMsgGasLimit: bigint,
   socketConnector: string,
+  socketBridgeOptions: string,
   socketFees: bigint,
   accountId: number,
   peripheryTokenAddress: string,
   peripheryTokenAmount: bigint,
-  sig: EIP712Signature,
   moneyInOutTokenAmount: bigint,
   fallbackSocketMsgGasLimit: bigint,
   fallbackSocketConnector: string,
+  fallbackSocketPayloadSize: bigint,
 ): MethodParameters => {
   const PERIPHERY_INTERFACE = new Interface(peripheryAbi);
   const inputs = {
     accountId,
     token: peripheryTokenAddress,
     tokenAmount: peripheryTokenAmount,
-    sig,
   };
   const fallbackData = {
     socketMsgGasLimit: fallbackSocketMsgGasLimit,
     socketConnector: fallbackSocketConnector,
+    socketPayloadSize: fallbackSocketPayloadSize,
   };
   const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(
-    'depositExistingMA((uint128,address,uint256,(uint8,bytes32,bytes32,uint256)),(uint256,address))',
+    'depositExistingMA((uint128,address,uint256),(uint256,uint256,address))',
     [inputs, fallbackData],
   );
 
-  const functionSignature = 'depositToAppChain';
+  const functionSignature = 'bridge';
   const parameters = [
     receiver,
     moneyInOutTokenAmount,
     socketMsgGasLimit,
     socketConnector,
     peripheryCalldata,
+    socketBridgeOptions,
   ];
   const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);
   const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);

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

@@ -63,6 +63,7 @@ export const withdrawMAAndBridge = async ({
     scale(corePeripheryTokenInfo.decimals)(unscaledAmount),
     eip712Signature,
     BigInt('10000000'),
+    BigInt(0),
     socketConnectors.withdraw,
     receiverAddress,
   );

package/src/services/orders/encode.ts

@@ -4,7 +4,7 @@ import { signCoreCommands } from '../sign';
 import { getCurrentTimestampInSeconds } from '@reyaxyz/common';
 import { CORE_DEADLINE_IN_SECONDS, RELAYER_ACCOUNT } from '../../utils/consts';
 import { Interface, Signer } from 'ethers';
-import { abi } from '../../abis/ExecutionModule.json';
+import { abi } from '../../abis/CoreProxy.json';
 export const encodeMatchOrder = async (
   signer: Signer,
   chainId: number,