Merge branch 'main' into feat-rollup-query

OffchainLabs · Feb 14, 2025 · 897e1d8 · 897e1d8
2 parents b1addc4 + c906634
commit 897e1d8
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 13 deletions.
diff --git a/src/arbAggregatorPrepareTransactionRequest.ts b/src/arbAggregatorPrepareTransactionRequest.ts
@@ -27,13 +27,14 @@ function arbAggregatorEncodeFunctionData<
   });
 }
 
-type ArbAggregatorPrepareFunctionDataParameters<
+export type ArbAggregatorPrepareFunctionDataParameters<
   TFunctionName extends ArbAggregatorPrepareTransactionRequestFunctionName,
 > = ArbAggregatorEncodeFunctionDataParameters<TFunctionName> & {
   upgradeExecutor: Address | false;
   abi: ArbAggregatorAbi;
 };
-function arbAggregatorPrepareFunctionData<
+
+export function arbAggregatorPrepareFunctionData<
   TFunctionName extends ArbAggregatorPrepareTransactionRequestFunctionName,
 >(params: ArbAggregatorPrepareFunctionDataParameters<TFunctionName>) {
   const { upgradeExecutor } = params;

diff --git a/src/arbOwnerPrepareTransactionRequest.ts b/src/arbOwnerPrepareTransactionRequest.ts
@@ -27,13 +27,14 @@ function arbOwnerEncodeFunctionData<
   });
 }
 
-type ArbOwnerPrepareFunctionDataParameters<
+export type ArbOwnerPrepareFunctionDataParameters<
   TFunctionName extends ArbOwnerPrepareTransactionRequestFunctionName,
 > = ArbOwnerEncodeFunctionDataParameters<TFunctionName> & {
   upgradeExecutor: Address | false;
   abi: ArbOwnerAbi;
 };
-function arbOwnerPrepareFunctionData<
+
+export function arbOwnerPrepareFunctionData<
   TFunctionName extends ArbOwnerPrepareTransactionRequestFunctionName,
 >(params: ArbOwnerPrepareFunctionDataParameters<TFunctionName>) {
   const { upgradeExecutor } = params;

diff --git a/src/getValidators.ts b/src/getValidators.ts
@@ -170,10 +170,23 @@ export async function getValidators<TChain extends Chain>(
           abi: [execTransactionABI],
           data: tx.input,
         });
+
+        const execTransactionCalldataData = execTransactionCalldata[2];
+        const execTransactionCalldataDataFnSelector = execTransactionCalldataData.slice(0, 10);
+
+        if (execTransactionCalldataDataFnSelector !== upgradeExecutorExecuteCallFunctionSelector) {
+          console.warn(
+            `[getValidators] unable to decode "execTransaction" calldata, tx id: ${tx.hash}`,
+          );
+          isAccurate = false;
+          return acc;
+        }
+
         const { args: executeCallCalldata } = decodeFunctionData({
           abi: [executeCallABI],
-          data: execTransactionCalldata[2],
+          data: execTransactionCalldataData,
         });
+
         return updateAccumulator(acc, executeCallCalldata[1]);
       }
       default: {

diff --git a/src/getValidators.unit.test.ts b/src/getValidators.unit.test.ts
@@ -151,7 +151,7 @@ it('getValidators return all validators (Xai)', async () => {
     rollup: '0xc47dacfbaa80bd9d8112f4e8069482c2a3221336',
   });
   expect(validators).toEqual(['0x25EA41f0bDa921a0eBf48291961B1F10b59BC6b8']);
-  expect(isAccurate).toBeTruthy();
+  expect(isAccurate).toBeFalsy();
 });
 
 // https://sepolia.arbiscan.io/tx/0x5b0b49e0259289fc89949a55a5ad35a8939440a55065d29b14e5e7ef7494efff

diff --git a/src/index.ts b/src/index.ts
@@ -64,10 +64,26 @@ import {
   upgradeExecutorPrepareRemoveExecutorTransactionRequest,
   UpgradeExecutorPrepareRemoveExecutorTransactionRequestParams,
 } from './upgradeExecutorPrepareRemoveExecutorTransactionRequest';
+import {
+  arbOwnerPrepareFunctionData,
+  ArbOwnerPrepareFunctionDataParameters,
+} from './arbOwnerPrepareTransactionRequest';
 import { arbOwnerPublicActions } from './decorators/arbOwnerPublicActions';
 import { arbGasInfoPublicActions } from './decorators/arbGasInfoPublicActions';
+import {
+  arbAggregatorPrepareFunctionData,
+  ArbAggregatorPrepareFunctionDataParameters,
+} from './arbAggregatorPrepareTransactionRequest';
 import { arbAggregatorActions } from './decorators/arbAggregatorActions';
+import {
+  sequencerInboxPrepareFunctionData,
+  SequencerInboxPrepareFunctionDataParameters,
+} from './sequencerInboxPrepareTransactionRequest';
 import { sequencerInboxActions } from './decorators/sequencerInboxActions';
+import {
+  rollupAdminLogicPrepareFunctionData,
+  RollupAdminLogicPrepareFunctionDataParameters,
+} from './rollupAdminLogicPrepareTransactionRequest';
 import { rollupAdminLogicPublicActions } from './decorators/rollupAdminLogicPublicActions';
 
 import { ChainConfig, ChainConfigArbitrumParams } from './types/ChainConfig';
@@ -169,10 +185,23 @@ import { prepareArbitrumNetwork } from './utils/registerNewNetwork';
 
 export {
   arbOwnerPublicActions,
+  arbOwnerPrepareFunctionData,
+  ArbOwnerPrepareFunctionDataParameters,
+  //
   arbGasInfoPublicActions,
+  //
   arbAggregatorActions,
+  arbAggregatorPrepareFunctionData,
+  ArbAggregatorPrepareFunctionDataParameters,
+  //
   sequencerInboxActions,
+  sequencerInboxPrepareFunctionData,
+  SequencerInboxPrepareFunctionDataParameters,
+  //
   rollupAdminLogicPublicActions,
+  rollupAdminLogicPrepareFunctionData,
+  RollupAdminLogicPrepareFunctionDataParameters,
+  //
   createRollupPrepareTransactionRequest,
   CreateRollupPrepareTransactionRequestParams,
   CreateRollupFunctionInputs,

diff --git a/src/rollupAdminLogicPrepareTransactionRequest.ts b/src/rollupAdminLogicPrepareTransactionRequest.ts
@@ -32,13 +32,14 @@ function rollupAdminLogicEncodeFunctionData<TFunctionName extends RollupAdminLog
   });
 }
 
-type RollupAdminLogicPrepareFunctionDataParameters<
+export type RollupAdminLogicPrepareFunctionDataParameters<
   TFunctionName extends RollupAdminLogicFunctionName,
 > = RollupAdminLogicEncodeFunctionDataParameters<TFunctionName> & {
   upgradeExecutor: Address | false;
   abi: RollupAdminLogicAbi;
   rollup: Address;
 };
+
 export function rollupAdminLogicPrepareFunctionData<
   TFunctionName extends RollupAdminLogicFunctionName,
 >(params: RollupAdminLogicPrepareFunctionDataParameters<TFunctionName>) {

diff --git a/src/sequencerInboxPrepareTransactionRequest.ts b/src/sequencerInboxPrepareTransactionRequest.ts
@@ -30,12 +30,14 @@ function sequencerInboxEncodeFunctionData<TFunctionName extends SequencerInboxFu
   });
 }
 
-type SequencerInboxPrepareFunctionDataParameters<TFunctionName extends SequencerInboxFunctionName> =
-  SequencerInboxEncodeFunctionDataParameters<TFunctionName> & {
-    upgradeExecutor: Address | false;
-    abi: SequencerInboxAbi;
-    sequencerInbox: Address;
-  };
+export type SequencerInboxPrepareFunctionDataParameters<
+  TFunctionName extends SequencerInboxFunctionName,
+> = SequencerInboxEncodeFunctionDataParameters<TFunctionName> & {
+  upgradeExecutor: Address | false;
+  abi: SequencerInboxAbi;
+  sequencerInbox: Address;
+};
+
 export function sequencerInboxPrepareFunctionData<TFunctionName extends SequencerInboxFunctionName>(
   params: SequencerInboxPrepareFunctionDataParameters<TFunctionName>,
 ) {