@reyaxyz/sdk 0.50.0 → 0.52.0

package/src/abis/Periphery.json

@@ -143,17 +143,6 @@
       ],
       "anonymous": false
     },
-    {
-      "type": "error",
-      "name": "CheckZeroGasPrice",
-      "inputs": [
-        {
-          "name": "txGasPrice",
-          "type": "uint256",
-          "internalType": "uint256"
-        }
-      ]
-    },
     {
       "type": "error",
       "name": "ImplementationIsSterile",
@@ -262,6 +251,25 @@
       ],
       "stateMutability": "view"
     },
+    {
+      "type": "function",
+      "name": "getTokenExecutionHelper",
+      "inputs": [
+        {
+          "name": "token",
+          "type": "address",
+          "internalType": "address"
+        }
+      ],
+      "outputs": [
+        {
+          "name": "executionHelper",
+          "type": "address",
+          "internalType": "address"
+        }
+      ],
+      "stateMutability": "view"
+    },
     {
       "type": "function",
       "name": "getTokenStaticWithdrawFee",
@@ -288,12 +296,40 @@
     },
     {
       "type": "function",
-      "name": "rescueFunds",
+      "name": "rescueErc20",
       "inputs": [
         {
           "name": "amount",
           "type": "uint256",
           "internalType": "uint256"
+        },
+        {
+          "name": "token",
+          "type": "address",
+          "internalType": "address"
+        },
+        {
+          "name": "receiver",
+          "type": "address",
+          "internalType": "address"
+        }
+      ],
+      "outputs": [],
+      "stateMutability": "nonpayable"
+    },
+    {
+      "type": "function",
+      "name": "rescueEth",
+      "inputs": [
+        {
+          "name": "amount",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
+        {
+          "name": "receiver",
+          "type": "address",
+          "internalType": "address"
         }
       ],
       "outputs": [],
@@ -347,6 +383,24 @@
       "outputs": [],
       "stateMutability": "nonpayable"
     },
+    {
+      "type": "function",
+      "name": "setTokenExecutionHelper",
+      "inputs": [
+        {
+          "name": "token",
+          "type": "address",
+          "internalType": "address"
+        },
+        {
+          "name": "executionHelper",
+          "type": "address",
+          "internalType": "address"
+        }
+      ],
+      "outputs": [],
+      "stateMutability": "nonpayable"
+    },
     {
       "type": "function",
       "name": "setTokenStaticWithdrawFee",
@@ -370,6 +424,54 @@
       "outputs": [],
       "stateMutability": "nonpayable"
     },
+    {
+      "type": "error",
+      "name": "ControllerNotRegistered",
+      "inputs": [
+        {
+          "name": "token",
+          "type": "address",
+          "internalType": "address"
+        }
+      ]
+    },
+    {
+      "type": "error",
+      "name": "ExecutionHelperNotRegistered",
+      "inputs": [
+        {
+          "name": "token",
+          "type": "address",
+          "internalType": "address"
+        }
+      ]
+    },
+    {
+      "type": "error",
+      "name": "FailedToRescueFunds",
+      "inputs": []
+    },
+    {
+      "type": "error",
+      "name": "FailedTransfer",
+      "inputs": [
+        {
+          "name": "from",
+          "type": "address",
+          "internalType": "address"
+        },
+        {
+          "name": "to",
+          "type": "address",
+          "internalType": "address"
+        },
+        {
+          "name": "value",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ]
+    },
     {
       "type": "function",
       "name": "depositExistingMA",
@@ -393,33 +495,6 @@
               "name": "tokenAmount",
               "type": "uint256",
               "internalType": "uint256"
-            },
-            {
-              "name": "sig",
-              "type": "tuple",
-              "internalType": "struct EIP712Signature",
-              "components": [
-                {
-                  "name": "v",
-                  "type": "uint8",
-                  "internalType": "uint8"
-                },
-                {
-                  "name": "r",
-                  "type": "bytes32",
-                  "internalType": "bytes32"
-                },
-                {
-                  "name": "s",
-                  "type": "bytes32",
-                  "internalType": "bytes32"
-                },
-                {
-                  "name": "deadline",
-                  "type": "uint256",
-                  "internalType": "uint256"
-                }
-              ]
             }
           ]
         }
@@ -498,6 +573,22 @@
       "outputs": [],
       "stateMutability": "nonpayable"
     },
+    {
+      "type": "error",
+      "name": "BridgedAmountDoesNotMatch",
+      "inputs": [
+        {
+          "name": "bridgeAmount",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
+        {
+          "name": "givenAmount",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ]
+    },
     {
       "type": "error",
       "name": "CheckSelfCall",
@@ -575,33 +666,6 @@
               "name": "tokenAmount",
               "type": "uint256",
               "internalType": "uint256"
-            },
-            {
-              "name": "sig",
-              "type": "tuple",
-              "internalType": "struct EIP712Signature",
-              "components": [
-                {
-                  "name": "v",
-                  "type": "uint8",
-                  "internalType": "uint8"
-                },
-                {
-                  "name": "r",
-                  "type": "bytes32",
-                  "internalType": "bytes32"
-                },
-                {
-                  "name": "s",
-                  "type": "bytes32",
-                  "internalType": "bytes32"
-                },
-                {
-                  "name": "deadline",
-                  "type": "uint256",
-                  "internalType": "uint256"
-                }
-              ]
             }
           ]
         },
@@ -615,6 +679,11 @@
               "type": "uint256",
               "internalType": "uint256"
             },
+            {
+              "name": "socketPayloadSize",
+              "type": "uint256",
+              "internalType": "uint256"
+            },
             {
               "name": "socketConnector",
               "type": "address",
@@ -662,6 +731,11 @@
               "type": "uint256",
               "internalType": "uint256"
             },
+            {
+              "name": "socketPayloadSize",
+              "type": "uint256",
+              "internalType": "uint256"
+            },
             {
               "name": "socketConnector",
               "type": "address",
@@ -714,6 +788,11 @@
               "type": "uint256",
               "internalType": "uint256"
             },
+            {
+              "name": "socketPayloadSize",
+              "type": "uint256",
+              "internalType": "uint256"
+            },
             {
               "name": "socketConnector",
               "type": "address",
@@ -727,15 +806,15 @@
     },
     {
       "type": "error",
-      "name": "ControllerNotRegistered",
+      "name": "CallerIsNotExecutionHelper",
       "inputs": [
         {
-          "name": "token",
+          "name": "caller",
           "type": "address",
           "internalType": "address"
         },
         {
-          "name": "controler",
+          "name": "token",
           "type": "address",
           "internalType": "address"
         }
@@ -743,40 +822,167 @@
     },
     {
       "type": "error",
-      "name": "FailedTransfer",
+      "name": "NotEnoughFees",
       "inputs": [
         {
-          "name": "from",
-          "type": "address",
-          "internalType": "address"
-        },
-        {
-          "name": "to",
-          "type": "address",
-          "internalType": "address"
+          "name": "tokenAmount",
+          "type": "uint256",
+          "internalType": "uint256"
         },
         {
-          "name": "value",
+          "name": "tokenFees",
           "type": "uint256",
           "internalType": "uint256"
         }
       ]
     },
     {
-      "type": "error",
-      "name": "NotEnoughFees",
+      "type": "function",
+      "name": "executeMatchOrders",
       "inputs": [
         {
-          "name": "tokenAmount",
-          "type": "uint256",
-          "internalType": "uint256"
-        },
+          "name": "inputs",
+          "type": "tuple",
+          "internalType": "struct PeripheryMatchOrderInputs",
+          "components": [
+            {
+              "name": "accountId",
+              "type": "uint128",
+              "internalType": "uint128"
+            },
+            {
+              "name": "commands",
+              "type": "tuple[]",
+              "internalType": "struct Command[]",
+              "components": [
+                {
+                  "name": "commandType",
+                  "type": "uint8",
+                  "internalType": "enum CommandType"
+                },
+                {
+                  "name": "inputs",
+                  "type": "bytes",
+                  "internalType": "bytes"
+                },
+                {
+                  "name": "marketId",
+                  "type": "uint128",
+                  "internalType": "uint128"
+                },
+                {
+                  "name": "exchangeId",
+                  "type": "uint128",
+                  "internalType": "uint128"
+                }
+              ]
+            },
+            {
+              "name": "sig",
+              "type": "tuple",
+              "internalType": "struct EIP712Signature",
+              "components": [
+                {
+                  "name": "v",
+                  "type": "uint8",
+                  "internalType": "uint8"
+                },
+                {
+                  "name": "r",
+                  "type": "bytes32",
+                  "internalType": "bytes32"
+                },
+                {
+                  "name": "s",
+                  "type": "bytes32",
+                  "internalType": "bytes32"
+                },
+                {
+                  "name": "deadline",
+                  "type": "uint256",
+                  "internalType": "uint256"
+                }
+              ]
+            }
+          ]
+        }
+      ],
+      "outputs": [],
+      "stateMutability": "nonpayable"
+    },
+    {
+      "type": "error",
+      "name": "InvalidMatchOrders",
+      "inputs": []
+    },
+    {
+      "type": "function",
+      "name": "transferFromMAToMA",
+      "inputs": [
         {
-          "name": "tokenFees",
-          "type": "uint256",
-          "internalType": "uint256"
+          "name": "inputs",
+          "type": "tuple",
+          "internalType": "struct TransferFromMAToMAInputs",
+          "components": [
+            {
+              "name": "accountId",
+              "type": "uint128",
+              "internalType": "uint128"
+            },
+            {
+              "name": "transfer",
+              "type": "tuple",
+              "internalType": "struct TransferInput",
+              "components": [
+                {
+                  "name": "destAccountId",
+                  "type": "uint128",
+                  "internalType": "uint128"
+                },
+                {
+                  "name": "collateral",
+                  "type": "address",
+                  "internalType": "address"
+                },
+                {
+                  "name": "collateralAmount",
+                  "type": "uint256",
+                  "internalType": "uint256"
+                }
+              ]
+            },
+            {
+              "name": "sig",
+              "type": "tuple",
+              "internalType": "struct EIP712Signature",
+              "components": [
+                {
+                  "name": "v",
+                  "type": "uint8",
+                  "internalType": "uint8"
+                },
+                {
+                  "name": "r",
+                  "type": "bytes32",
+                  "internalType": "bytes32"
+                },
+                {
+                  "name": "s",
+                  "type": "bytes32",
+                  "internalType": "bytes32"
+                },
+                {
+                  "name": "deadline",
+                  "type": "uint256",
+                  "internalType": "uint256"
+                }
+              ]
+            }
+          ]
         }
-      ]
+      ],
+      "outputs": [],
+      "stateMutability": "nonpayable"
     },
     {
       "type": "function",
@@ -833,6 +1039,11 @@
               "name": "minShares",
               "type": "uint256",
               "internalType": "uint256"
+            },
+            {
+              "name": "receiver",
+              "type": "address",
+              "internalType": "address"
             }
           ]
         }
@@ -841,9 +1052,71 @@
       "stateMutability": "nonpayable"
     },
     {
-      "type": "error",
-      "name": "UnauthorizedCaller",
-      "inputs": []
+      "type": "function",
+      "name": "transferFromPoolToMA",
+      "inputs": [
+        {
+          "name": "inputs",
+          "type": "tuple",
+          "internalType": "struct TransferFromPoolToMAInputs",
+          "components": [
+            {
+              "name": "owner",
+              "type": "address",
+              "internalType": "address"
+            },
+            {
+              "name": "sig",
+              "type": "tuple",
+              "internalType": "struct EIP712Signature",
+              "components": [
+                {
+                  "name": "v",
+                  "type": "uint8",
+                  "internalType": "uint8"
+                },
+                {
+                  "name": "r",
+                  "type": "bytes32",
+                  "internalType": "bytes32"
+                },
+                {
+                  "name": "s",
+                  "type": "bytes32",
+                  "internalType": "bytes32"
+                },
+                {
+                  "name": "deadline",
+                  "type": "uint256",
+                  "internalType": "uint256"
+                }
+              ]
+            },
+            {
+              "name": "sharesAmount",
+              "type": "uint256",
+              "internalType": "uint256"
+            },
+            {
+              "name": "poolId",
+              "type": "uint128",
+              "internalType": "uint128"
+            },
+            {
+              "name": "minOut",
+              "type": "uint256",
+              "internalType": "uint256"
+            },
+            {
+              "name": "accountId",
+              "type": "uint128",
+              "internalType": "uint128"
+            }
+          ]
+        }
+      ],
+      "outputs": [],
+      "stateMutability": "nonpayable"
     },
     {
       "type": "function",
@@ -901,6 +1174,11 @@
               "type": "uint256",
               "internalType": "uint256"
             },
+            {
+              "name": "socketPayloadSize",
+              "type": "uint256",
+              "internalType": "uint256"
+            },
             {
               "name": "socketConnector",
               "type": "address",
@@ -926,6 +1204,11 @@
           "type": "tuple",
           "internalType": "struct WithdrawPassivePoolInputs",
           "components": [
+            {
+              "name": "owner",
+              "type": "address",
+              "internalType": "address"
+            },
             {
               "name": "poolId",
               "type": "uint128",
@@ -973,6 +1256,11 @@
               "type": "uint256",
               "internalType": "uint256"
             },
+            {
+              "name": "socketPayloadSize",
+              "type": "uint256",
+              "internalType": "uint256"
+            },
             {
               "name": "socketConnector",
               "type": "address",

package/src/abis/socket/VaultWithPayload.json

@@ -2,7 +2,7 @@
   "abi": [
     {
       "type": "function",
-      "name": "depositToAppChain",
+      "name": "bridge",
       "inputs": [
         {
           "name": "receiver_",
@@ -28,6 +28,11 @@
           "name": "execPayload_",
           "type": "bytes",
           "internalType": "bytes"
+        },
+        {
+          "name": "options_",
+          "type": "bytes",
+          "internalType": "bytes"
         }
       ]
     }

package/src/services/encode.ts

@@ -3,7 +3,7 @@
 import { MethodParameters, MultiAction } from '../utils/action';
 import { CommandType, getCommand } from '../utils/routerCommands';
 import { AbiCoder, Interface } from 'ethers';
-import { abi } from '../abis/ExecutionModule.json';
+import { abi } from '../abis/CoreProxy.json';
 // const abi = [
 //   'function coreExecute(uint128 poolId, uint128 accountId, Command[] commands, EIP712Signature sig)',
 // ];

package/src/services/lp/bridgeAndDepositPassivePool.ts

@@ -42,6 +42,7 @@ export const bridgeAndDepositPassivePool = async (
     peripheryAddress,
     BigInt('10000000'),
     socketConnectors.deposit,
+    '0x',
     getSocketDepositFeesAsBigInt({
       moneyInOutChainId: moneyInOutChainId,
     }),
@@ -51,6 +52,7 @@ export const bridgeAndDepositPassivePool = async (
     BigInt(0),
     BigInt('10000000'),
     socketConnectors.withdraw,
+    BigInt(0),
   );
 
   const result = await executeTransaction(