@reyaxyz/common 0.189.0 → 0.189.1

package/src/transactions/abis/CustomMulticall3.json

@@ -0,0 +1,490 @@
+{
+  "abi": [
+    {
+      "type": "function",
+      "name": "aggregate",
+      "inputs": [
+        {
+          "name": "calls",
+          "type": "tuple[]",
+          "internalType": "struct CustomMulticall3.Call[]",
+          "components": [
+            {
+              "name": "target",
+              "type": "address",
+              "internalType": "address"
+            },
+            {
+              "name": "callData",
+              "type": "bytes",
+              "internalType": "bytes"
+            }
+          ]
+        }
+      ],
+      "outputs": [
+        {
+          "name": "blockNumber",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
+        {
+          "name": "returnData",
+          "type": "bytes[]",
+          "internalType": "bytes[]"
+        }
+      ],
+      "stateMutability": "payable"
+    },
+    {
+      "type": "function",
+      "name": "aggregate3",
+      "inputs": [
+        {
+          "name": "calls",
+          "type": "tuple[]",
+          "internalType": "struct CustomMulticall3.Call3[]",
+          "components": [
+            {
+              "name": "target",
+              "type": "address",
+              "internalType": "address"
+            },
+            {
+              "name": "allowFailure",
+              "type": "bool",
+              "internalType": "bool"
+            },
+            {
+              "name": "callData",
+              "type": "bytes",
+              "internalType": "bytes"
+            }
+          ]
+        }
+      ],
+      "outputs": [
+        {
+          "name": "returnData",
+          "type": "tuple[]",
+          "internalType": "struct CustomMulticall3.Result[]",
+          "components": [
+            {
+              "name": "success",
+              "type": "bool",
+              "internalType": "bool"
+            },
+            {
+              "name": "returnData",
+              "type": "bytes",
+              "internalType": "bytes"
+            }
+          ]
+        }
+      ],
+      "stateMutability": "payable"
+    },
+    {
+      "type": "function",
+      "name": "aggregate3Value",
+      "inputs": [
+        {
+          "name": "calls",
+          "type": "tuple[]",
+          "internalType": "struct CustomMulticall3.Call3Value[]",
+          "components": [
+            {
+              "name": "target",
+              "type": "address",
+              "internalType": "address"
+            },
+            {
+              "name": "allowFailure",
+              "type": "bool",
+              "internalType": "bool"
+            },
+            {
+              "name": "value",
+              "type": "uint256",
+              "internalType": "uint256"
+            },
+            {
+              "name": "callData",
+              "type": "bytes",
+              "internalType": "bytes"
+            }
+          ]
+        }
+      ],
+      "outputs": [
+        {
+          "name": "returnData",
+          "type": "tuple[]",
+          "internalType": "struct CustomMulticall3.Result[]",
+          "components": [
+            {
+              "name": "success",
+              "type": "bool",
+              "internalType": "bool"
+            },
+            {
+              "name": "returnData",
+              "type": "bytes",
+              "internalType": "bytes"
+            }
+          ]
+        }
+      ],
+      "stateMutability": "payable"
+    },
+    {
+      "type": "function",
+      "name": "blockAndAggregate",
+      "inputs": [
+        {
+          "name": "calls",
+          "type": "tuple[]",
+          "internalType": "struct CustomMulticall3.Call[]",
+          "components": [
+            {
+              "name": "target",
+              "type": "address",
+              "internalType": "address"
+            },
+            {
+              "name": "callData",
+              "type": "bytes",
+              "internalType": "bytes"
+            }
+          ]
+        }
+      ],
+      "outputs": [
+        {
+          "name": "blockNumber",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
+        {
+          "name": "blockHash",
+          "type": "bytes32",
+          "internalType": "bytes32"
+        },
+        {
+          "name": "returnData",
+          "type": "tuple[]",
+          "internalType": "struct CustomMulticall3.Result[]",
+          "components": [
+            {
+              "name": "success",
+              "type": "bool",
+              "internalType": "bool"
+            },
+            {
+              "name": "returnData",
+              "type": "bytes",
+              "internalType": "bytes"
+            }
+          ]
+        }
+      ],
+      "stateMutability": "payable"
+    },
+    {
+      "type": "function",
+      "name": "getBasefee",
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "basefee",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ],
+      "stateMutability": "view"
+    },
+    {
+      "type": "function",
+      "name": "getBlockHash",
+      "inputs": [
+        {
+          "name": "blockNumber",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ],
+      "outputs": [
+        {
+          "name": "blockHash",
+          "type": "bytes32",
+          "internalType": "bytes32"
+        }
+      ],
+      "stateMutability": "view"
+    },
+    {
+      "type": "function",
+      "name": "getBlockNumber",
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "blockNumber",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ],
+      "stateMutability": "view"
+    },
+    {
+      "type": "function",
+      "name": "getChainId",
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "chainid",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ],
+      "stateMutability": "view"
+    },
+    {
+      "type": "function",
+      "name": "getCurrentBlockCoinbase",
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "coinbase",
+          "type": "address",
+          "internalType": "address"
+        }
+      ],
+      "stateMutability": "view"
+    },
+    {
+      "type": "function",
+      "name": "getCurrentBlockDifficulty",
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "difficulty",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ],
+      "stateMutability": "view"
+    },
+    {
+      "type": "function",
+      "name": "getCurrentBlockGasLimit",
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "gaslimit",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ],
+      "stateMutability": "view"
+    },
+    {
+      "type": "function",
+      "name": "getCurrentBlockTimestamp",
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "timestamp",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ],
+      "stateMutability": "view"
+    },
+    {
+      "type": "function",
+      "name": "getEthBalance",
+      "inputs": [
+        {
+          "name": "addr",
+          "type": "address",
+          "internalType": "address"
+        }
+      ],
+      "outputs": [
+        {
+          "name": "balance",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ],
+      "stateMutability": "view"
+    },
+    {
+      "type": "function",
+      "name": "getLastBlockHash",
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "blockHash",
+          "type": "bytes32",
+          "internalType": "bytes32"
+        }
+      ],
+      "stateMutability": "view"
+    },
+    {
+      "type": "function",
+      "name": "tryAggregate",
+      "inputs": [
+        {
+          "name": "requireSuccess",
+          "type": "bool",
+          "internalType": "bool"
+        },
+        {
+          "name": "calls",
+          "type": "tuple[]",
+          "internalType": "struct CustomMulticall3.Call[]",
+          "components": [
+            {
+              "name": "target",
+              "type": "address",
+              "internalType": "address"
+            },
+            {
+              "name": "callData",
+              "type": "bytes",
+              "internalType": "bytes"
+            }
+          ]
+        }
+      ],
+      "outputs": [
+        {
+          "name": "returnData",
+          "type": "tuple[]",
+          "internalType": "struct CustomMulticall3.Result[]",
+          "components": [
+            {
+              "name": "success",
+              "type": "bool",
+              "internalType": "bool"
+            },
+            {
+              "name": "returnData",
+              "type": "bytes",
+              "internalType": "bytes"
+            }
+          ]
+        }
+      ],
+      "stateMutability": "payable"
+    },
+    {
+      "type": "function",
+      "name": "tryAggregatePreservingError",
+      "inputs": [
+        {
+          "name": "requireSuccess",
+          "type": "bool",
+          "internalType": "bool"
+        },
+        {
+          "name": "calls",
+          "type": "tuple[]",
+          "internalType": "struct CustomMulticall3.Call[]",
+          "components": [
+            {
+              "name": "target",
+              "type": "address",
+              "internalType": "address"
+            },
+            {
+              "name": "callData",
+              "type": "bytes",
+              "internalType": "bytes"
+            }
+          ]
+        }
+      ],
+      "outputs": [
+        {
+          "name": "returnData",
+          "type": "tuple[]",
+          "internalType": "struct CustomMulticall3.Result[]",
+          "components": [
+            {
+              "name": "success",
+              "type": "bool",
+              "internalType": "bool"
+            },
+            {
+              "name": "returnData",
+              "type": "bytes",
+              "internalType": "bytes"
+            }
+          ]
+        }
+      ],
+      "stateMutability": "payable"
+    },
+    {
+      "type": "function",
+      "name": "tryBlockAndAggregate",
+      "inputs": [
+        {
+          "name": "requireSuccess",
+          "type": "bool",
+          "internalType": "bool"
+        },
+        {
+          "name": "calls",
+          "type": "tuple[]",
+          "internalType": "struct CustomMulticall3.Call[]",
+          "components": [
+            {
+              "name": "target",
+              "type": "address",
+              "internalType": "address"
+            },
+            {
+              "name": "callData",
+              "type": "bytes",
+              "internalType": "bytes"
+            }
+          ]
+        }
+      ],
+      "outputs": [
+        {
+          "name": "blockNumber",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
+        {
+          "name": "blockHash",
+          "type": "bytes32",
+          "internalType": "bytes32"
+        },
+        {
+          "name": "returnData",
+          "type": "tuple[]",
+          "internalType": "struct CustomMulticall3.Result[]",
+          "components": [
+            {
+              "name": "success",
+              "type": "bool",
+              "internalType": "bool"
+            },
+            {
+              "name": "returnData",
+              "type": "bytes",
+              "internalType": "bytes"
+            }
+          ]
+        }
+      ],
+      "stateMutability": "payable"
+    }
+  ]
+}

package/src/transactions/buildMulticallTx.ts

@@ -1,22 +1,22 @@
 import { ethers } from 'ethers';
 import { abi as CoreAbi } from './abis/CoreProxy.json';
-import { abi as MulticallAbi } from './abis/MulticallV2.json';
+import { abi as MulticallAbi } from './abis/CustomMulticall3.json';
 
 export type Call = {
   target: string;
   callData: string;
 };
 
-export const encodeCoreMulticall = (calls: Call[]): string => {
+export const encodeCoreMulticall = (calldatas: string[]): string => {
   const functionSignature = 'tryAggregate';
-  const parameters: [boolean, string[]] = [false, calls.map((c) => c.callData)];
+  const parameters: [boolean, string[]] = [false, calldatas];
   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 functionSignature = 'tryAggregatePreservingError';
   const parameters: [boolean, Call[]] = [requireSuccess, calls];
   const INTERFACE = new ethers.Interface(MulticallAbi);
   const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);

package/src/transactions/contractAddresses.ts

@@ -23,7 +23,7 @@ const addresses: Record<ReyaChainId, Record<ContractType, Address>> = {
       '0x9ec177fed042ef2307928be2f5cdbf663b20244b',
     [ContractType.ORACLE_ADAPTERS_PROXY]:
       '0xc501a2356703cd351703d68963c6f4136120f7cf',
-    [ContractType.MULTICALL]: '0xd9f0f399f5264faac91476dbd950574726d18633',
+    [ContractType.MULTICALL]: '0x5abde4f0af8eaf3c9967f7fa126e59a103357b5c',
   },
   [ReyaChainId.reyaNetwork]: {
     [ContractType.CORE_PROXY]: '0xa763b6a5e09378434406c003dae6487fbbdc1a80',
@@ -37,7 +37,7 @@ const addresses: Record<ReyaChainId, Record<ContractType, Address>> = {
       '0x27e5cb712334e101b3c232eb0be198baaa595f5f',
     [ContractType.ORACLE_ADAPTERS_PROXY]:
       '0x32edabc058c1207fe0ec5f8557643c28e4ff379e',
-    [ContractType.MULTICALL]: '0x82a55eb2346277d85d5d0a60101ebd0f02680b0d',
+    [ContractType.MULTICALL]: '0xed28d27dfca47ad2513c9f2e2d3c098c2ea5a47f',
   },
 };
 export const getAddress = (

package/src/transactions/executeTransaction.ts

@@ -36,11 +36,34 @@ export async function estimateGas(
 > {
   const accountAddress = await signer.getAddress();
 
+  return estimateGasGivenAddress(
+    accountAddress,
+    data,
+    value,
+    chainId,
+    targetContract,
+  );
+}
+
+export async function estimateGasGivenAddress(
+  accountAddress: string,
+  data: string,
+  value: string,
+  chainId: number,
+  targetContract: ContractType | string,
+): Promise<
+  Transaction & {
+    gasLimit: bigint;
+    maxPriorityFeePerGas?: bigint;
+    maxFeePerGas?: bigint;
+  }
+> {
   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,

package/src/transactions/index.ts

@@ -1,6 +1,6 @@
 export * from './action';
 export { abi as CoreAbi } from './abis/CoreProxy.json';
-export { abi as MulticallAbi } from './abis/MulticallV2.json';
+export { abi as MulticallAbi } from './abis/CustomMulticall3.json';
 export { abi as OracleAdaptersAbi } from './abis/OracleAdaptersProxy.json';
 export { abi as PeripheryAbi } from './abis/Periphery.json';
 export { abi as Socket_VaultWithPayloadAbi } from './abis/socket/VaultWithPayload.json';

package/src/types.ts

@@ -877,6 +877,7 @@ export type TransactionExecutionMetadata = {
 
 export type TransactionExecutionOutput = {
   txHash: string;
+  errorMessage?: string;
   accountId?: string | null;
   coreSigNonce?: string | null;
   poolSigNonce?: string | null;

package/src/utils/index.ts

@@ -6,3 +6,4 @@ export * from './timestamp';
 export * from './token';
 export * from './task-wrapper';
 export * from './whitelisted-wallets';
+export * from './stringify';

package/src/utils/stringify.ts

@@ -0,0 +1,8 @@
+export const stringifyObject = (obj: unknown): string => {
+  let stringifiedObject = 'Could not stringify object';
+  try {
+    stringifiedObject = JSON.stringify(obj, undefined, 2);
+  } catch {}
+
+  return stringifiedObject;
+};