@reyaxyz/sdk 0.64.1 → 0.66.0

package/src/abis/Periphery.json

@@ -202,6 +202,10 @@
       "name": "ZeroAddress",
       "inputs": []
     },
+    {
+      "type": "receive",
+      "stateMutability": "payable"
+    },
     {
       "type": "function",
       "name": "getGlobalConfiguration",
@@ -232,6 +236,30 @@
       ],
       "stateMutability": "pure"
     },
+    {
+      "type": "function",
+      "name": "getTokenChainConnector",
+      "inputs": [
+        {
+          "name": "token",
+          "type": "address",
+          "internalType": "address"
+        },
+        {
+          "name": "chainId",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ],
+      "outputs": [
+        {
+          "name": "connector",
+          "type": "address",
+          "internalType": "address"
+        }
+      ],
+      "stateMutability": "view"
+    },
     {
       "type": "function",
       "name": "getTokenController",
@@ -365,6 +393,29 @@
       "outputs": [],
       "stateMutability": "nonpayable"
     },
+    {
+      "type": "function",
+      "name": "setTokenChainConnector",
+      "inputs": [
+        {
+          "name": "token",
+          "type": "address",
+          "internalType": "address"
+        },
+        {
+          "name": "chainId",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
+        {
+          "name": "connector",
+          "type": "address",
+          "internalType": "address"
+        }
+      ],
+      "outputs": [],
+      "stateMutability": "nonpayable"
+    },
     {
       "type": "function",
       "name": "setTokenController",
@@ -424,6 +475,22 @@
       "outputs": [],
       "stateMutability": "nonpayable"
     },
+    {
+      "type": "error",
+      "name": "ConnectorNotRegistered",
+      "inputs": [
+        {
+          "name": "token",
+          "type": "address",
+          "internalType": "address"
+        },
+        {
+          "name": "chainId",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ]
+    },
     {
       "type": "error",
       "name": "ControllerNotRegistered",
@@ -490,11 +557,6 @@
               "name": "token",
               "type": "address",
               "internalType": "address"
-            },
-            {
-              "name": "tokenAmount",
-              "type": "uint256",
-              "internalType": "uint256"
             }
           ]
         }
@@ -520,11 +582,6 @@
               "name": "token",
               "type": "address",
               "internalType": "address"
-            },
-            {
-              "name": "tokenAmount",
-              "type": "uint256",
-              "internalType": "uint256"
             }
           ]
         }
@@ -557,11 +614,6 @@
               "type": "address",
               "internalType": "address"
             },
-            {
-              "name": "amount",
-              "type": "uint256",
-              "internalType": "uint256"
-            },
             {
               "name": "minShares",
               "type": "uint256",
@@ -575,26 +627,15 @@
     },
     {
       "type": "error",
-      "name": "BridgedAmountDoesNotMatch",
+      "name": "CallerIsNotExecutionHelper",
       "inputs": [
         {
-          "name": "bridgeAmount",
-          "type": "uint256",
-          "internalType": "uint256"
+          "name": "caller",
+          "type": "address",
+          "internalType": "address"
         },
         {
-          "name": "givenAmount",
-          "type": "uint256",
-          "internalType": "uint256"
-        }
-      ]
-    },
-    {
-      "type": "error",
-      "name": "CheckSelfCall",
-      "inputs": [
-        {
-          "name": "caller",
+          "name": "token",
           "type": "address",
           "internalType": "address"
         }
@@ -643,199 +684,6 @@
         }
       ]
     },
-    {
-      "type": "function",
-      "name": "depositExistingMA",
-      "inputs": [
-        {
-          "name": "inputs",
-          "type": "tuple",
-          "internalType": "struct DepositExistingMAInputs",
-          "components": [
-            {
-              "name": "accountId",
-              "type": "uint128",
-              "internalType": "uint128"
-            },
-            {
-              "name": "token",
-              "type": "address",
-              "internalType": "address"
-            },
-            {
-              "name": "tokenAmount",
-              "type": "uint256",
-              "internalType": "uint256"
-            }
-          ]
-        },
-        {
-          "name": "fallbackData",
-          "type": "tuple",
-          "internalType": "struct FallbackData",
-          "components": [
-            {
-              "name": "socketMsgGasLimit",
-              "type": "uint256",
-              "internalType": "uint256"
-            },
-            {
-              "name": "socketPayloadSize",
-              "type": "uint256",
-              "internalType": "uint256"
-            },
-            {
-              "name": "socketConnector",
-              "type": "address",
-              "internalType": "address"
-            }
-          ]
-        }
-      ],
-      "outputs": [],
-      "stateMutability": "nonpayable"
-    },
-    {
-      "type": "function",
-      "name": "depositNewMA",
-      "inputs": [
-        {
-          "name": "inputs",
-          "type": "tuple",
-          "internalType": "struct DepositNewMAInputs",
-          "components": [
-            {
-              "name": "accountOwner",
-              "type": "address",
-              "internalType": "address"
-            },
-            {
-              "name": "token",
-              "type": "address",
-              "internalType": "address"
-            },
-            {
-              "name": "tokenAmount",
-              "type": "uint256",
-              "internalType": "uint256"
-            }
-          ]
-        },
-        {
-          "name": "fallbackData",
-          "type": "tuple",
-          "internalType": "struct FallbackData",
-          "components": [
-            {
-              "name": "socketMsgGasLimit",
-              "type": "uint256",
-              "internalType": "uint256"
-            },
-            {
-              "name": "socketPayloadSize",
-              "type": "uint256",
-              "internalType": "uint256"
-            },
-            {
-              "name": "socketConnector",
-              "type": "address",
-              "internalType": "address"
-            }
-          ]
-        }
-      ],
-      "outputs": [],
-      "stateMutability": "nonpayable"
-    },
-    {
-      "type": "function",
-      "name": "depositPassivePool",
-      "inputs": [
-        {
-          "name": "inputs",
-          "type": "tuple",
-          "internalType": "struct DepositPassivePoolInputs",
-          "components": [
-            {
-              "name": "poolId",
-              "type": "uint128",
-              "internalType": "uint128"
-            },
-            {
-              "name": "owner",
-              "type": "address",
-              "internalType": "address"
-            },
-            {
-              "name": "amount",
-              "type": "uint256",
-              "internalType": "uint256"
-            },
-            {
-              "name": "minShares",
-              "type": "uint256",
-              "internalType": "uint256"
-            }
-          ]
-        },
-        {
-          "name": "fallbackData",
-          "type": "tuple",
-          "internalType": "struct FallbackData",
-          "components": [
-            {
-              "name": "socketMsgGasLimit",
-              "type": "uint256",
-              "internalType": "uint256"
-            },
-            {
-              "name": "socketPayloadSize",
-              "type": "uint256",
-              "internalType": "uint256"
-            },
-            {
-              "name": "socketConnector",
-              "type": "address",
-              "internalType": "address"
-            }
-          ]
-        }
-      ],
-      "outputs": [],
-      "stateMutability": "nonpayable"
-    },
-    {
-      "type": "error",
-      "name": "CallerIsNotExecutionHelper",
-      "inputs": [
-        {
-          "name": "caller",
-          "type": "address",
-          "internalType": "address"
-        },
-        {
-          "name": "token",
-          "type": "address",
-          "internalType": "address"
-        }
-      ]
-    },
-    {
-      "type": "error",
-      "name": "NotEnoughFees",
-      "inputs": [
-        {
-          "name": "tokenAmount",
-          "type": "uint256",
-          "internalType": "uint256"
-        },
-        {
-          "name": "tokenFees",
-          "type": "uint256",
-          "internalType": "uint256"
-        }
-      ]
-    },
     {
       "type": "function",
       "name": "executeMatchOrders",
@@ -1175,15 +1023,10 @@
               "internalType": "uint256"
             },
             {
-              "name": "socketPayloadSize",
+              "name": "chainId",
               "type": "uint256",
               "internalType": "uint256"
             },
-            {
-              "name": "socketConnector",
-              "type": "address",
-              "internalType": "address"
-            },
             {
               "name": "receiver",
               "type": "address",
@@ -1257,15 +1100,10 @@
               "internalType": "uint256"
             },
             {
-              "name": "socketPayloadSize",
+              "name": "chainId",
               "type": "uint256",
               "internalType": "uint256"
             },
-            {
-              "name": "socketConnector",
-              "type": "address",
-              "internalType": "address"
-            },
             {
               "name": "receiver",
               "type": "address",
@@ -1277,6 +1115,22 @@
       "outputs": [],
       "stateMutability": "nonpayable"
     },
+    {
+      "type": "error",
+      "name": "NotEnoughFees",
+      "inputs": [
+        {
+          "name": "tokenAmount",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
+        {
+          "name": "tokenFees",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ]
+    },
     {
       "type": "function",
       "name": "onERC721Received",

package/src/services/lp/bridgeAndDepositPassivePool.ts

@@ -50,9 +50,6 @@ export const bridgeAndDepositPassivePool = async (
     params.ownerAddress,
     amount,
     BigInt(0),
-    BigInt('10000000'),
-    socketConnectors.withdraw,
-    BigInt(0),
   );
 
   const result = await executeTransaction(

package/src/services/lp/encode.ts

@@ -60,8 +60,7 @@ export const encodeWithdrawPassivePoolAndBridge = (
   minOut: bigint,
   sig: EIP712Signature,
   socketMsgGasLimit: bigint,
-  socketPayloadSize: bigint,
-  socketConnector: string,
+  chainId: number,
   receiver: string,
 ): MethodParameters => {
   const functionSignature = 'withdrawPassivePool';
@@ -73,8 +72,7 @@ export const encodeWithdrawPassivePoolAndBridge = (
       minOut,
       sig,
       socketMsgGasLimit,
-      socketPayloadSize,
-      socketConnector,
+      chainId,
       receiver,
     },
   ];
@@ -93,20 +91,12 @@ export const encodeBridgeAndDepositPassivePool = (
   owner: string,
   amount: bigint,
   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 inputs = { poolId, owner, minShares };
   const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(
-    'depositPassivePool((uint128,address,uint256,uint256),(uint256,uint256,address))',
-    [inputs, fallbackData],
+    'depositPassivePool((uint128,address,uint256))',
+    [inputs],
   );
 
   const functionSignature = 'bridge';

package/src/services/lp/transferFromMAToPool.ts

@@ -15,6 +15,7 @@ import {
 import { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';
 import { MultiAction } from '../../utils/action';
 import { encodeSingleWithdraw } from '../encode';
+import { ethers } from 'ethers';
 
 export const transferFromMAToPool = async (
   params: TransferFromMAToPoolParams,
@@ -25,6 +26,8 @@ export const transferFromMAToPool = async (
   const tokenInfo = getTokenInfoByAddress(params.pool.tokenAddress);
   const amount = scale(tokenInfo.decimals)(params.amount);
 
+  const minShares = BigInt(0);
+
   // transfer from MA to pool involves a core withdrawal
   const multiAction = new MultiAction();
   encodeSingleWithdraw(params.pool.tokenAddress, amount, multiAction);
@@ -36,6 +39,10 @@ export const transferFromMAToPool = async (
     multiAction.commands,
     params.owner.coreSigNonce + 1,
     getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,
+    ethers.AbiCoder.defaultAbiCoder().encode(
+      ['uint128', 'address', 'uint256'],
+      [params.pool.id, params.owner.address, minShares],
+    ),
   );
 
   const { calldata: data, value } = encodeTransferFromMAToPool(
@@ -43,7 +50,7 @@ export const transferFromMAToPool = async (
     amount,
     eip712Signature,
     params.pool.id,
-    BigInt(0),
+    minShares,
     params.owner.address,
   );
 

package/src/services/lp/withdrawPassivePoolAndBridge.ts

@@ -9,8 +9,6 @@ import { encodeWithdrawPassivePoolAndBridge } from './encode';
 import {
   ReyaChainId,
   getCurrentTimestampInSeconds,
-  getRUSDUnderlyingTokenInfo,
-  getSocketConnectors,
   scale,
 } from '@reyaxyz/common';
 import { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';
@@ -38,6 +36,9 @@ export const withdrawPassivePoolAndBridge = async (
     BigInt(0),
     params.owner.poolSigNonce + 1,
     getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,
+    BigInt('10000000'), //todo
+    params.moneyInOutChainId,
+    params.owner.address,
   );
 
   const { calldata: data, value } = encodeWithdrawPassivePoolAndBridge(
@@ -47,11 +48,7 @@ export const withdrawPassivePoolAndBridge = async (
     BigInt(0),
     eip712Signature,
     BigInt('10000000'), //todo
-    BigInt(0),
-    getSocketConnectors({
-      moneyInOutChainId: params.moneyInOutChainId,
-      tokenName: getRUSDUnderlyingTokenInfo(params.moneyInOutChainId).name,
-    }).withdraw,
+    params.moneyInOutChainId,
     params.owner.address,
   );
 

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

@@ -66,9 +66,6 @@ export const bridgeAndDepositExistingMA = async (
     reyaPeripheryTokenInfo.address,
     scale(reyaPeripheryTokenInfo.decimals)(params.amount),
     scale(moneyInOutTokenInfo.decimals)(params.amount),
-    BigInt('10000000'),
-    socketConnectors.withdraw,
-    BigInt(0),
   );
 
   const result = await executeTransaction(

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

@@ -49,9 +49,6 @@ export const bridgeAndDepositNewMA = async (
     reyaPeripheryTokenInfo.address,
     scale(reyaPeripheryTokenInfo.decimals)(params.amount),
     scale(moneyInOutTokenInfo.decimals)(params.amount),
-    BigInt('10000000'),
-    socketConnectors.withdraw,
-    BigInt(0),
   );
 
   const result = await executeTransaction(

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

@@ -8,7 +8,6 @@ import {
 } from '../encode';
 
 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';
@@ -83,18 +82,24 @@ export const encodeTransferMargin = async (
     multiAction.commands,
     coreSigNonce + 1,
     getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,
+    ethers.AbiCoder.defaultAbiCoder().encode([], []),
   );
 
   const value = BigInt(0);
-  const functionSignature = 'executeBySig';
+  const functionSignature = 'transferFromMAToMA';
   const parameters = [
-    fromMarginAccountId,
-    multiAction.commands,
-    eip712Signature,
-    ethers.AbiCoder.defaultAbiCoder().encode([], []),
+    {
+      accountId: fromMarginAccountId,
+      transfer: {
+        destAccountId: toMarginAccountId,
+        collateral: token,
+        collateralAmount: amount,
+      },
+      sig: eip712Signature,
+    },
   ];
 
-  const INTERFACE = new Interface(coreAbi);
+  const INTERFACE = new Interface(peripheryAbi);
   const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
   return {
     calldata: calldata,
@@ -108,8 +113,7 @@ export const encodeWithdrawMAAndBridge = (
   corePeripheryTokenAmount: bigint,
   sig: EIP712Signature,
   socketMsgGasLimit: bigint,
-  socketPayloadSize: bigint,
-  socketConnector: string,
+  chainId: number,
   receiver: string,
 ): MethodParameters => {
   const functionSignature = 'withdrawMA';
@@ -120,8 +124,7 @@ export const encodeWithdrawMAAndBridge = (
       tokenAmount: corePeripheryTokenAmount,
       sig,
       socketMsgGasLimit,
-      socketPayloadSize,
-      socketConnector,
+      chainId,
       receiver,
     },
   ];
@@ -140,24 +143,15 @@ export const encodeBridgeAndDepositNewMA = (
   peripheryTokenAddress: string,
   peripheryTokenAmount: bigint,
   moneyInOutTokenAmount: bigint,
-  fallbackSocketMsgGasLimit: bigint,
-  fallbackSocketConnector: string,
-  fallbackSocketPayloadSize: bigint,
 ): MethodParameters => {
   const PERIPHERY_INTERFACE = new Interface(peripheryAbi);
   const inputs = {
     accountOwner,
     token: peripheryTokenAddress,
-    tokenAmount: peripheryTokenAmount,
-  };
-  const fallbackData = {
-    socketMsgGasLimit: fallbackSocketMsgGasLimit,
-    socketConnector: fallbackSocketConnector,
-    socketPayloadSize: fallbackSocketPayloadSize,
   };
   const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(
-    'depositNewMA((address,address,uint256),(uint256,uint256,address))',
-    [inputs, fallbackData],
+    'depositNewMA((address,address))',
+    [inputs],
   );
 
   const functionSignature = 'bridge';
@@ -184,24 +178,15 @@ export const encodeBridgeAndDepositExistingMA = (
   peripheryTokenAddress: string,
   peripheryTokenAmount: bigint,
   moneyInOutTokenAmount: bigint,
-  fallbackSocketMsgGasLimit: bigint,
-  fallbackSocketConnector: string,
-  fallbackSocketPayloadSize: bigint,
 ): MethodParameters => {
   const PERIPHERY_INTERFACE = new Interface(peripheryAbi);
   const inputs = {
     accountId,
     token: peripheryTokenAddress,
-    tokenAmount: peripheryTokenAmount,
-  };
-  const fallbackData = {
-    socketMsgGasLimit: fallbackSocketMsgGasLimit,
-    socketConnector: fallbackSocketConnector,
-    socketPayloadSize: fallbackSocketPayloadSize,
   };
   const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(
-    'depositExistingMA((uint128,address,uint256),(uint256,uint256,address))',
-    [inputs, fallbackData],
+    'depositExistingMA((uint128,address))',
+    [inputs],
   );
 
   const functionSignature = 'bridge';

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

@@ -30,7 +30,7 @@ export const transferMarginBetweenAccounts = async (
     data,
     value,
     chainId,
-    ContractType.CORE_PROXY,
+    ContractType.PERIPHERY_PROXY,
     {},
   );