@reyaxyz/common 0.174.0 → 0.175.1

package/src/transactions/abis/CoreProxy.json

@@ -5645,6 +5645,125 @@
         ],
         "outputs": [],
         "stateMutability": "nonpayable"
-    }
+    },
+    {
+      "type": "function",
+      "name": "tryAggregate",
+      "inputs": [
+          {
+              "name": "requireSuccess",
+              "type": "bool",
+              "internalType": "bool"
+          },
+          {
+              "name": "calls",
+              "type": "bytes[]",
+              "internalType": "bytes[]"
+          }
+      ],
+      "outputs": [
+          {
+              "name": "returnData",
+              "type": "tuple[]",
+              "internalType": "struct MulticallResult[]",
+              "components": [
+                  {
+                      "name": "success",
+                      "type": "bool",
+                      "internalType": "bool"
+                  },
+                  {
+                      "name": "returnData",
+                      "type": "bytes",
+                      "internalType": "bytes"
+                  }
+              ]
+          }
+      ],
+      "stateMutability": "payable"
+  },
+  {
+      "type": "error",
+      "name": "MulticallFailed",
+      "inputs": [
+          {
+              "name": "index",
+              "type": "uint256",
+              "internalType": "uint256"
+          },
+          {
+              "name": "inputData",
+              "type": "bytes",
+              "internalType": "bytes"
+          },
+          {
+              "name": "returnData",
+              "type": "bytes",
+              "internalType": "bytes"
+          }
+      ]
+    },
+    {
+        "type": "event",
+        "name": "FailedCall",
+        "inputs": [
+            {
+                "name": "index",
+                "type": "uint256",
+                "indexed": false,
+                "internalType": "uint256"
+            },
+            {
+                "name": "inputData",
+                "type": "bytes",
+                "indexed": false,
+                "internalType": "bytes"
+            },
+            {
+                "name": "returnData",
+                "type": "bytes",
+                "indexed": false,
+                "internalType": "bytes"
+            },
+            {
+                "name": "blockTimestamp",
+                "type": "uint256",
+                "indexed": false,
+                "internalType": "uint256"
+            }
+        ],
+        "anonymous": false
+    },
+    {
+      "type": "event",
+      "name": "SuccessfulCall",
+      "inputs": [
+          {
+              "name": "index",
+              "type": "uint256",
+              "indexed": false,
+              "internalType": "uint256"
+          },
+          {
+              "name": "inputData",
+              "type": "bytes",
+              "indexed": false,
+              "internalType": "bytes"
+          },
+          {
+              "name": "returnData",
+              "type": "bytes",
+              "indexed": false,
+              "internalType": "bytes"
+          },
+          {
+              "name": "blockTimestamp",
+              "type": "uint256",
+              "indexed": false,
+              "internalType": "uint256"
+          }
+      ],
+      "anonymous": false
+  }
   ]
 }

package/src/transactions/abis/Errors.json

@@ -3586,6 +3586,27 @@
       "type": "error",
       "name": "MismatchedLength",
       "inputs": []
+    },
+    {
+      "type": "error",
+      "name": "MulticallFailed",
+      "inputs": [
+          {
+              "name": "index",
+              "type": "uint256",
+              "internalType": "uint256"
+          },
+          {
+              "name": "inputData",
+              "type": "bytes",
+              "internalType": "bytes"
+          },
+          {
+              "name": "returnData",
+              "type": "bytes",
+              "internalType": "bytes"
+          }
+      ]
     }
   ]
 }

package/src/transactions/buildMulticallTx.ts

@@ -1,4 +1,5 @@
 import { ethers } from 'ethers';
+import { abi as CoreAbi } from './abis/CoreProxy.json';
 import { abi as MulticallAbi } from './abis/MulticallV2.json';
 
 export type Call = {
@@ -6,6 +7,14 @@ export type Call = {
   callData: string;
 };
 
+export const encodeCoreMulticall = (calls: Call[]): string => {
+  const functionSignature = 'tryAggregate';
+  const parameters: [boolean, string[]] = [false, calls.map((c) => c.callData)];
+  const INTERFACE = new ethers.Interface(CoreAbi);
+  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
+  return calldata;
+};
+
 const encodeMulticall = (requireSuccess: boolean, calls: Call[]): string => {
   const functionSignature = 'tryAggregate';
   const parameters: [boolean, Call[]] = [requireSuccess, calls];

package/src/transactions/executeTransaction.ts

@@ -90,6 +90,57 @@ export async function estimateGasFromTxAndChainId(
   throw new Error('All RPC URLs failed; last error: ' + lastError);
 }
 
+export async function estimateGasWithoutHardcoding(
+  signer: Signer | JsonRpcSigner,
+  data: string,
+  value: string,
+  chainId: number,
+  targetContract: ContractType | string,
+): Promise<
+  Transaction & {
+    gasLimit: bigint;
+    maxPriorityFeePerGas?: bigint;
+    maxFeePerGas?: bigint;
+  }
+> {
+  const accountAddress = await signer.getAddress();
+
+  const contractAddress = Object.values(ContractType).includes(
+    targetContract as ContractType,
+  )
+    ? getAddress(chainId, targetContract as ContractType)
+    : targetContract;
+  const tx = {
+    from: accountAddress, // @todo Update with relayer address
+    to: contractAddress,
+    data,
+    ...(value && value !== '0' ? { value: value } : {}),
+  };
+
+  let gasLimit: bigint = BigInt('5000000'); // hardcode to 5m gas limit if fails to get estimate
+
+  try {
+    const provider = ethers.getDefaultProvider(reyaChainIdRPCMapper[chainId]);
+    const estimation = await provider.estimateGas(tx);
+    gasLimit = addGasBuffer(estimation);
+  } catch (error) {
+    const decodedError = await errorDecoder.decode(error);
+    const reason = customReasonMapper(decodedError);
+    console.error(
+      `Error simulating transaction account address ${accountAddress} reason ${decodedError?.name} ${decodedError} ${error}`,
+    );
+    throw new Error(reason);
+  }
+
+  if (Object.values(ReyaChainId).includes(chainId as ReyaChainId)) {
+    const maxPriorityFeePerGas: bigint = BigInt('0');
+    const maxFeePerGas: bigint = BigInt('100000000');
+    return { ...tx, gasLimit, maxPriorityFeePerGas, maxFeePerGas };
+  }
+
+  return { ...tx, gasLimit };
+}
+
 async function estimateGasExternalChains(
   signer: Signer | JsonRpcSigner,
   data: string,
@@ -184,3 +235,10 @@ const customReasonMapper = ({ name, reason }: DecodedError): string => {
 function addGasBuffer(estimation: bigint): bigint {
   return (estimation * BigInt(120)) / BigInt(100);
 }
+
+// eslint-disable-next-line  @typescript-eslint/no-explicit-any
+export async function decodeError(returnData: any): Promise<string> {
+  const decodedError = await errorDecoder.decode(returnData);
+  const reason = customReasonMapper(decodedError);
+  return reason;
+}

package/src/types.ts

@@ -90,6 +90,7 @@ export type CollateralEntity = {
   percentage: number;
   balance: number;
   balanceRUSD: number;
+  balanceWithHaircutRUSD: number;
   exchangeRate: number;
   exchangeRateChange24HPercentage: number;
 };
@@ -106,6 +107,7 @@ export type MarginAccountEntity = {
   totalBalance: number;
   totalBalanceUnderlyingAsset: string;
   totalBalanceChange24HPercentage: number;
+  totalBalanceWithHaircut: number;
   livePnL: number;
   livePnLUnderlyingAsset: string;
   realizedPnL: number;