Merge pull request #111 from celo-org/seolaoh/backward-compat-l2-block-number

seolaoh · web-flow · commit f588ba1cb2b7 · 2026-02-19T19:12:06.000+08:00
Backport upstream fix for v1.0.0 games backward compatability
diff --git a/.github/workflows/cargo-tests.yml b/.github/workflows/cargo-tests.yml
@@ -49,7 +49,7 @@ jobs:
     - name: Install SP1 toolchain
       run: |
           curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up 
+          ~/.sp1/bin/sp1up -v 5.2.4
           ~/.sp1/bin/cargo-prove prove --version
           source ~/.bashrc
 
diff --git a/.github/workflows/cycle-count-diff-eigenda.yml b/.github/workflows/cycle-count-diff-eigenda.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Install SP1 toolchain
         run: |
           curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up
+          ~/.sp1/bin/sp1up -v 5.2.4
           ~/.sp1/bin/cargo-prove prove --version
           source ~/.bashrc
 
diff --git a/.github/workflows/cycle-count-diff.yml b/.github/workflows/cycle-count-diff.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Install SP1 toolchain
         run: |
           curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up 
+          ~/.sp1/bin/sp1up -v 5.2.4
           ~/.sp1/bin/cargo-prove prove --version
           source ~/.bashrc
 
diff --git a/.github/workflows/elf.yml b/.github/workflows/elf.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Install SP1 toolchain
         run: |
           curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up
+          ~/.sp1/bin/sp1up -v 5.2.4
           ~/.sp1/bin/cargo-prove prove --version
           source ~/.bashrc
       - name: Setup Docker Buildx
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Install SP1 toolchain
         run: |
           curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up 
+          ~/.sp1/bin/sp1up -v 5.2.4
           ~/.sp1/bin/cargo-prove prove --version
           source ~/.bashrc
 
diff --git a/book/advanced/verify-binaries.md b/book/advanced/verify-binaries.md
@@ -16,7 +16,7 @@ Anything that changes these programs requires reproducing the binaries. This inc
 Ensure you have the [`cargo prove`](https://docs.succinct.xyz/docs/sp1/getting-started/install#option-1-prebuilt-binaries-recommended) CLI tool installed and have the latest version of the toolchain by running:
 
 ```bash
-sp1up
+sp1up -v 5.2.4
 ```
 
 and
diff --git a/fault-proof/Dockerfile.challenger b/fault-proof/Dockerfile.challenger
@@ -22,7 +22,7 @@ RUN rustup install stable && rustup default stable
 
 # Install SP1
 RUN curl -L https://sp1.succinct.xyz | bash && \
-    ~/.sp1/bin/sp1up && \
+    ~/.sp1/bin/sp1up -v 5.2.4 && \
     ~/.sp1/bin/cargo-prove prove --version
 
 # Build stage
diff --git a/fault-proof/Dockerfile.challenger.celo b/fault-proof/Dockerfile.challenger.celo
@@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y \
 
 # Install SP1
 RUN curl -L https://sp1.succinct.xyz | bash && \
-    ~/.sp1/bin/sp1up && \
+    ~/.sp1/bin/sp1up -v 5.2.4 && \
     ~/.sp1/bin/cargo-prove prove --version
 
 
diff --git a/fault-proof/Dockerfile.proposer b/fault-proof/Dockerfile.proposer
@@ -22,7 +22,7 @@ RUN rustup install stable && rustup default stable
 
 # Install SP1
 RUN curl -L https://sp1.succinct.xyz | bash && \
-    ~/.sp1/bin/sp1up && \
+    ~/.sp1/bin/sp1up -v 5.2.4 && \
     ~/.sp1/bin/cargo-prove prove --version
 
 # Build stage
diff --git a/fault-proof/Dockerfile.proposer.celestia b/fault-proof/Dockerfile.proposer.celestia
@@ -22,7 +22,7 @@ RUN rustup install stable && rustup default stable
 
 # Install SP1
 RUN curl -L https://sp1.succinct.xyz | bash && \
-    ~/.sp1/bin/sp1up && \
+    ~/.sp1/bin/sp1up -v 5.2.4 && \
     ~/.sp1/bin/cargo-prove prove --version
 
 # Build stage
diff --git a/fault-proof/Dockerfile.proposer.celo b/fault-proof/Dockerfile.proposer.celo
@@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y \
 
 # Install SP1
 RUN curl -L https://sp1.succinct.xyz | bash && \
-    ~/.sp1/bin/sp1up && \
+    ~/.sp1/bin/sp1up -v 5.2.4 && \
     ~/.sp1/bin/cargo-prove prove --version
 
 
diff --git a/fault-proof/Dockerfile.proposer.eigenda b/fault-proof/Dockerfile.proposer.eigenda
@@ -22,7 +22,7 @@ RUN rustup install stable && rustup default stable
 
 # Install SP1
 RUN curl -L https://sp1.succinct.xyz | bash && \
-    ~/.sp1/bin/sp1up && \
+    ~/.sp1/bin/sp1up -v 5.2.4 && \
     ~/.sp1/bin/cargo-prove prove --version
 
 # Build stage
diff --git a/fault-proof/src/challenger.rs b/fault-proof/src/challenger.rs
@@ -358,7 +358,7 @@ where
             return Ok(());
         }
 
-        let l2_block_number = contract.l2SequenceNumber().call().await?;
+        let l2_block_number = contract.l2BlockNumber().call().await?;
         let computed_output_root =
             self.l2_provider.compute_output_root_at_block(l2_block_number).await?;
         let output_root = contract.rootClaim().call().await?;
diff --git a/fault-proof/src/contract.rs b/fault-proof/src/contract.rs
@@ -64,6 +64,7 @@ sol! {
         function l2SequenceNumber() public pure returns (uint256 l2SequenceNumber_);
 
         /// @notice The L2 block number for which this game is proposing an output root.
+        /// @dev Alias for l2SequenceNumber() for backward compatibility.
         function l2BlockNumber() public pure returns (uint256 l2BlockNumber_);
 
         /// @notice Only the starting block number of the game.
diff --git a/fault-proof/src/proposer.rs b/fault-proof/src/proposer.rs
@@ -1385,7 +1385,7 @@ where
 
         let contract = OPSuccinctFaultDisputeGame::new(game_address, self.l1_provider.clone());
 
-        let l2_block = contract.l2SequenceNumber().call().await?;
+        let l2_block = contract.l2BlockNumber().call().await?;
         let output_root = self.l2_provider.compute_output_root_at_block(l2_block).await?;
         let claim = contract.rootClaim().call().await?;
         let was_respected = contract.wasRespectedGameTypeWhenCreated().call().await?;
@@ -2037,7 +2037,7 @@ where
         // Get the game block number to include in logs
         let game = OPSuccinctFaultDisputeGame::new(game_address, self.l1_provider.clone());
         let starting_l2_block_number = game.startingBlockNumber().call().await?;
-        let l2_block_number = game.l2SequenceNumber().call().await?;
+        let l2_block_number = game.l2BlockNumber().call().await?;
         let start_block = starting_l2_block_number.to::<u64>();
         let end_block = l2_block_number.to::<u64>();
 
diff --git a/fault-proof/tests/common/monitor.rs b/fault-proof/tests/common/monitor.rs
@@ -131,7 +131,7 @@ pub async fn wait_and_track_games<P: Provider>(
                         OPSuccinctFaultDisputeGame::new(game_info.proxy_, factory.provider());
 
                     // Get game details
-                    let l2_block_number = game.l2SequenceNumber().call().await?;
+                    let l2_block_number = game.l2BlockNumber().call().await?;
                     let parent_index = game.claimData().call().await?.parentIndex;
 
                     let tracked = TrackedGame {
diff --git a/scripts/utils/Dockerfile.game-monitor b/scripts/utils/Dockerfile.game-monitor
@@ -22,7 +22,7 @@ RUN rustup install stable && rustup default stable
 
 # Install SP1
 RUN curl -L https://sp1.succinct.xyz | bash && \
-    ~/.sp1/bin/sp1up -v v5.2.2 && \
+    ~/.sp1/bin/sp1up -v 5.2.4 && \
     ~/.sp1/bin/cargo-prove prove --version
 
 # Copy toolchain file
diff --git a/scripts/utils/Dockerfile.parallel-cost-estimator b/scripts/utils/Dockerfile.parallel-cost-estimator
@@ -27,7 +27,7 @@ RUN rustup show && \
 
 # Install SP1
 RUN curl -L https://sp1.succinct.xyz | bash && \
-    ~/.sp1/bin/sp1up && \
+    ~/.sp1/bin/sp1up -v 5.2.4 && \
     ~/.sp1/bin/cargo-prove prove --version
 ENV PATH=/root/.sp1/bin:$PATH
 
diff --git a/validity/Dockerfile b/validity/Dockerfile
@@ -15,7 +15,7 @@ WORKDIR /build
 
 # Install SP1
 RUN curl -L https://sp1.succinct.xyz | bash && \
-    ~/.sp1/bin/sp1up && \
+    ~/.sp1/bin/sp1up -v 5.2.4 && \
     ~/.sp1/bin/cargo-prove prove --version
 
 # Copy only what's needed for the build
@@ -47,7 +47,7 @@ RUN apt-get update && apt-get install -y \
 
 # Install SP1
 RUN curl -L https://sp1.succinct.xyz | bash && \
-    ~/.sp1/bin/sp1up && \
+    ~/.sp1/bin/sp1up -v 5.2.4 && \
     ~/.sp1/bin/cargo-prove prove --version
 
 # Copy only the built binaries from builder
diff --git a/validity/Dockerfile.celestia b/validity/Dockerfile.celestia
@@ -15,7 +15,7 @@ WORKDIR /build
 
 # Install SP1
 RUN curl -L https://sp1.succinct.xyz | bash && \
-    ~/.sp1/bin/sp1up && \
+    ~/.sp1/bin/sp1up -v 5.2.4 && \
     ~/.sp1/bin/cargo-prove prove --version
 
 # Copy only what's needed for the build
@@ -46,7 +46,7 @@ RUN apt-get update && apt-get install -y \
 
 # Install SP1
 RUN curl -L https://sp1.succinct.xyz | bash && \
-    ~/.sp1/bin/sp1up && \
+    ~/.sp1/bin/sp1up -v 5.2.4 && \
     ~/.sp1/bin/cargo-prove prove --version
 
 # Copy only the built binaries from builder
diff --git a/validity/Dockerfile.eigenda b/validity/Dockerfile.eigenda
@@ -15,7 +15,7 @@ WORKDIR /build
 
 # Install SP1
 RUN curl -L https://sp1.succinct.xyz | bash && \
-    ~/.sp1/bin/sp1up && \
+    ~/.sp1/bin/sp1up -v 5.2.4 && \
     ~/.sp1/bin/cargo-prove prove --version
 
 # Copy only what's needed for the build
@@ -49,7 +49,7 @@ RUN apt-get update && apt-get install -y \
 
 # Install SP1
 RUN curl -L https://sp1.succinct.xyz | bash && \
-    ~/.sp1/bin/sp1up && \
+    ~/.sp1/bin/sp1up -v 5.2.4 && \
     ~/.sp1/bin/cargo-prove prove --version
 
 # Copy only the built binaries from builder
