Merge branch 'main' into feat-nitro-config-v3.6.0

Author: spsjvc

audit-ci.jsonc

@@ -72,11 +72,6 @@
     // https://github.com/cryptocoinjs/secp256k1-node/commit/dc37f41f2abfe87853b54bcd7d1b556db41b0c64#diff-7ae45ad102eab3b6d7e7896acd08c427a9b25b346470d7bc6507b6481575d519R35
     // from: @arbitrum/token-bridge-contracts > @openzeppelin/upgrades-core > ethereumjs-util > ethereum-cryptography
     "GHSA-584q-6j8j-r5pm",
-    // https://github.com/advisories/GHSA-fc9h-whq2-v747
-    // Valid ECDSA signatures erroneously rejected in Elliptic
-    // from: @arbitrum/token-bridge-contracts > @openzeppelin/upgrades-core > ethereumjs-util > ethereum-cryptography > secp256k1
-    // from: ethers > @ethersproject/signing-key
-    "GHSA-fc9h-whq2-v747",
     // https://github.com/advisories/GHSA-3xgq-45jj-v275
     // cross-spawn command injection vulnerability
     // Only used during development via audit-ci, nyc, and patch-package
@@ -101,12 +96,16 @@
     // https://github.com/advisories/GHSA-xcj6-pq6g-qj4x
     // the vite dev server (when exposed to the network with --host) can return contents of arbitrary files
     //
+    // https://github.com/advisories/GHSA-859w-5945-r5v3
+    // the vite dev server (when exposed to the network with --host) can return contents of arbitrary files
+    //
     // vite is only used with vitest for running tests, and without exposing the dev server to the network
     //
     // from: vitest>vite
     // from: vitest>vite-node>vite
     "GHSA-4r4m-qw57-chr8",
     "GHSA-356w-63v5-8wf4",
-    "GHSA-xcj6-pq6g-qj4x"
+    "GHSA-xcj6-pq6g-qj4x",
+    "GHSA-859w-5945-r5v3"
   ]
 }

package.json

@@ -35,6 +35,7 @@
     "**/@wagmi/cli/viem/ws": "8.17.1",
     "**/@ethersproject/providers/ws": "7.5.10",
     "**/elliptic": "6.6.1",
-    "**/nanoid": "3.3.8"
+    "**/nanoid": "3.3.8",
+    "**/base-x": "3.0.11"
   }
 }

src/contracts/Rollup/index.ts

@@ -1,2 +1,2 @@
 // export the latest version
-export * from './v2.1';
+export * from './v3.1';

src/contracts/SequencerInbox/index.ts

@@ -1,2 +1,2 @@
 // export the latest version
-export * from './v2.1';
+export * from './v3.1';

src/decorators/rollupAdminLogicPublicActions.integration.test.ts

@@ -19,7 +19,7 @@ const client = createPublicClient({
   }),
 );
 
-it.skip('successfully set validators', async () => {
+it('successfully set validators', async () => {
   const randomAccounts = [
     privateKeyToAccount(generatePrivateKey()).address,
     privateKeyToAccount(generatePrivateKey()).address,
@@ -31,7 +31,10 @@ it.skip('successfully set validators', async () => {
       rollup: l3Rollup,
     },
   );
-  expect(initialValidators).toHaveLength(10);
+  // By default, chains from nitro testnode has 11 validators
+  // https://github.com/OffchainLabs/nitro-testnode/blob/de8cf4edec0d12e5ef1b7623e54e35ddb579ff0b/test-node.bash#L634
+  // https://github.com/OffchainLabs/nitro-contracts/blob/47a9c034bc082256d498f8031fab1a37c37a123c/scripts/rollupCreation.ts#L250-L257
+  expect(initialValidators).toHaveLength(11);
   expect(isAccurateInitially).toBeTruthy();
 
   const tx = await client.rollupAdminLogicPrepareTransactionRequest({

src/getBatchPosters.integration.test.ts

@@ -38,7 +38,7 @@ async function setBatchPoster(batchPoster: Address, state: boolean) {
 }
 
 // Tests can be enabled once we run one node per integration test
-describe.skip('successfully get batch posters', () => {
+describe('successfully get batch posters', () => {
   it('when disabling the same batch posters multiple time', async () => {
     const randomAccount = privateKeyToAccount(generatePrivateKey()).address;
 

src/getBatchPosters.ts

@@ -9,6 +9,7 @@ import {
   getFunctionSelector,
 } from 'viem';
 
+import { rollupCreatorABI as rollupCreatorV3Dot1ABI } from './contracts/RollupCreator';
 import { rollupCreatorABI as rollupCreatorV2Dot1ABI } from './contracts/RollupCreator/v2.1';
 import { rollupCreatorABI as rollupCreatorV1Dot1ABI } from './contracts/RollupCreator/v1.1';
 import { sequencerInboxABI } from './contracts/SequencerInbox';
@@ -18,6 +19,9 @@ import { gnosisSafeL2ABI } from './contracts/GnosisSafeL2';
 import { createRollupFetchTransactionHash } from './createRollupFetchTransactionHash';
 import { getLogsWithBatching } from './utils/getLogsWithBatching';
 
+const createRollupV3Dot1ABI = getAbiItem({ abi: rollupCreatorV3Dot1ABI, name: 'createRollup' });
+const createRollupV3Dot1FunctionSelector = getFunctionSelector(createRollupV3Dot1ABI);
+
 const createRollupV2Dot1ABI = getAbiItem({ abi: rollupCreatorV2Dot1ABI, name: 'createRollup' });
 const createRollupV2Dot1FunctionSelector = getFunctionSelector(createRollupV2Dot1ABI);
 
@@ -40,6 +44,7 @@ const ownerFunctionCalledEventAbi = getAbiItem({
 
 function getBatchPostersFromFunctionData<
   TAbi extends
+    | (typeof createRollupV3Dot1ABI)[]
     | (typeof createRollupV2Dot1ABI)[]
     | (typeof createRollupV1Dot1ABI)[]
     | (typeof setIsBatchPosterABI)[],
@@ -148,6 +153,14 @@ export async function getBatchPosters<TChain extends Chain>(
     const txSelectedFunction = tx.input.slice(0, 10);
 
     switch (txSelectedFunction) {
+      case createRollupV3Dot1FunctionSelector: {
+        const [{ batchPosters }] = getBatchPostersFromFunctionData({
+          abi: [createRollupV3Dot1ABI],
+          data: tx.input,
+        });
+
+        return new Set([...acc, ...batchPosters]);
+      }
       case createRollupV2Dot1FunctionSelector: {
         const [{ batchPosters }] = getBatchPostersFromFunctionData({
           abi: [createRollupV2Dot1ABI],

src/getBatchPosters.unit.test.ts

@@ -7,7 +7,7 @@ import {
   encodeFunctionData,
   http,
 } from 'viem';
-import { arbitrum, arbitrumSepolia } from 'viem/chains';
+import { arbitrum, arbitrumSepolia, sepolia } from 'viem/chains';
 import { it, expect, vi, describe } from 'vitest';
 
 import { gnosisSafeL2ABI } from './contracts/GnosisSafeL2';
@@ -26,6 +26,11 @@ const arbitrumSepoliaClient = createPublicClient({
   transport: http(),
 });
 
+const sepoliaClient = createPublicClient({
+  chain: sepolia,
+  transport: http('https://sepolia.gateway.tenderly.co'),
+});
+
 function mockLog(transactionHash: string) {
   return {
     address: '0x193e2887031c148ab54f5e856ea51ae521661200',
@@ -186,6 +191,16 @@ it('getBatchPosters returns batch posters for a chain created with RollupCreator
   expect(isAccurate).toBeTruthy();
 });
 
+// https://sepolia.etherscan.io/tx/0xd79a80b7300df1bcb14e2e3ea83521d1ae37e5f171a787fb0f5377ea7f5003ad
+it('getBatchPosters returns batch posters for a chain created with RollupCreator v3.1', async () => {
+  const { isAccurate, batchPosters } = await getBatchPosters(sepoliaClient, {
+    rollup: '0x5D65e18b873dD978EeE4704BC6033436aA253936',
+    sequencerInbox: '0x3fB778EC3e6126aF1d956A7812Eb0a28B9d25017',
+  });
+  expect(batchPosters).toEqual(['0x05c82FC99a41e417Ea6ED14e1D3f3b01BBFfba5A']);
+  expect(isAccurate).toBeTruthy();
+});
+
 describe('createRollupFunctionSelector', () => {
   it('getBatchPosters returns all batch posters with isAccurate flag set to true', async () => {
     const mockTransport = () =>
@@ -489,7 +504,7 @@ describe('safeL2FunctionSelector', () => {
 });
 
 describe('Detect batch posters added or removed multiple times', () => {
-  it('when disabling the same batch poster multiple time', async () => {
+  it('when disabling the same batch poster multiple times', async () => {
     const batchPoster = '0xC0b97e2998edB3Bf5c6369e7f7eFfb49c36fA962';
     const mockTransport = () =>
       createTransport({
@@ -527,7 +542,7 @@ describe('Detect batch posters added or removed multiple times', () => {
     expect(batchPosters).toEqual([]);
     expect(isAccurate).toBeTruthy();
   });
-  it('when enabling the same batch posters multiple time', async () => {
+  it('when enabling the same batch posters multiple times', async () => {
     const batchPoster = '0xC0b97e2998edB3Bf5c6369e7f7eFfb49c36fA962';
     const mockTransport = () =>
       createTransport({

src/getValidators.integration.test.ts

@@ -38,8 +38,8 @@ async function setValidator(validator: Address, state: boolean) {
 }
 
 // Tests can be enabled once we run one node per integration test
-describe.skip('successfully get validators', () => {
-  it('when disabling the same validator multiple time', async () => {
+describe('successfully get validators', () => {
+  it('when disabling the same validator multiple times', async () => {
     const randomAccount = privateKeyToAccount(generatePrivateKey()).address;
 
     const { isAccurate: isAccurateInitially, validators: initialValidators } = await getValidators(
@@ -48,8 +48,11 @@ describe.skip('successfully get validators', () => {
         rollup: l3Rollup,
       },
     );
-    // By default, chains from nitro testnode has 10 validators
-    expect(initialValidators).toHaveLength(10);
+
+    // By default, chains from nitro testnode has 11 validators
+    // https://github.com/OffchainLabs/nitro-testnode/blob/de8cf4edec0d12e5ef1b7623e54e35ddb579ff0b/test-node.bash#L634
+    // https://github.com/OffchainLabs/nitro-contracts/blob/47a9c034bc082256d498f8031fab1a37c37a123c/scripts/rollupCreation.ts#L250-L257
+    expect(initialValidators).toHaveLength(11);
     expect(isAccurateInitially).toBeTruthy();
 
     await setValidator(randomAccount, false);
@@ -79,7 +82,7 @@ describe.skip('successfully get validators', () => {
     expect(isAccurateFinal).toBeTruthy();
   });
 
-  it('when enabling the same validators multiple time', async () => {
+  it('when enabling the same validators multiple times', async () => {
     const randomAccount = privateKeyToAccount(generatePrivateKey()).address;
 
     const { isAccurate: isAccurateInitially, validators: initialValidators } = await getValidators(
@@ -88,8 +91,10 @@ describe.skip('successfully get validators', () => {
         rollup: l3Rollup,
       },
     );
-    // By default, chains from nitro testnode has 10 validators
-    expect(initialValidators).toHaveLength(10);
+    // By default, chains from nitro testnode has 11 validators
+    // https://github.com/OffchainLabs/nitro-testnode/blob/de8cf4edec0d12e5ef1b7623e54e35ddb579ff0b/test-node.bash#L634
+    // https://github.com/OffchainLabs/nitro-contracts/blob/47a9c034bc082256d498f8031fab1a37c37a123c/scripts/rollupCreation.ts#L250-L257
+    expect(initialValidators).toHaveLength(11);
     expect(isAccurateInitially).toBeTruthy();
 
     await setValidator(randomAccount, true);
@@ -113,7 +118,10 @@ describe.skip('successfully get validators', () => {
       client,
       { rollup: l3Rollup },
     );
-    expect(initialValidators).toHaveLength(10);
+    // By default, chains from nitro testnode has 11 validators
+    // https://github.com/OffchainLabs/nitro-testnode/blob/de8cf4edec0d12e5ef1b7623e54e35ddb579ff0b/test-node.bash#L634
+    // https://github.com/OffchainLabs/nitro-contracts/blob/47a9c034bc082256d498f8031fab1a37c37a123c/scripts/rollupCreation.ts#L250-L257
+    expect(initialValidators).toHaveLength(11);
     expect(isAccurateInitially).toBeTruthy();
 
     const firstValidator = initialValidators[0];
@@ -129,7 +137,10 @@ describe.skip('successfully get validators', () => {
       client,
       { rollup: l3Rollup },
     );
-    expect(initialValidators).toHaveLength(10);
+    // By default, chains from nitro testnode has 11 validators
+    // https://github.com/OffchainLabs/nitro-testnode/blob/de8cf4edec0d12e5ef1b7623e54e35ddb579ff0b/test-node.bash#L634
+    // https://github.com/OffchainLabs/nitro-contracts/blob/47a9c034bc082256d498f8031fab1a37c37a123c/scripts/rollupCreation.ts#L250-L257
+    expect(initialValidators).toHaveLength(11);
     expect(isAccurateInitially).toBeTruthy();
 
     const lastValidator = initialValidators[initialValidators.length - 1];