Merge branch 'master' into fix-metrics-definitionoverload

Author: joshuacolvin0

.github/actions/install-rust/action.yml

@@ -5,7 +5,7 @@ inputs:
   toolchain:
     required: true
     description: 'Toolchain to install'
-    default: '1.84.1'
+    default: '1.88.0'
   targets:
     required: true
     description: 'Compilation targets to install'

.github/workflows/bold.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v5
         with:
-          submodules: true
+          submodules: recursive
 
       - name: Install dependencies
         run: sudo apt update && sudo apt install -y wabt gotestsum

.github/workflows/ci.yml

@@ -48,7 +48,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v5
       with:
-        submodules: true
+        submodules: recursive
 
     - name: Install dependencies
       run: sudo apt update && sudo apt install -y wabt

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v5
         with:
-          submodules: true
+          submodules: recursive
 
       - name: Install dependencies
         run: sudo apt update && sudo apt install -y wabt gotestsum
@@ -188,7 +188,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v5
         with:
-          submodules: true
+          submodules: recursive
           fetch-depth: 10           // Will cover most PRs
           persist-credentials: true // In case changed-files requires deeper depth
 

.github/workflows/nightly-ci.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
-          submodules: true
+          submodules: recursive
           persist-credentials: false
           ref: "${{ github.event.pull_request.head.sha }}"
 

.github/workflows/submodule-pin-check.yml

@@ -38,3 +38,5 @@ arbos/testdata/*
 #other temporaries
 tmp/*
 .env
+go.work
+go.work.sum

.gitignore

@@ -49,8 +49,8 @@ FROM wasm-base AS wasm-libs-builder
 	# clang / lld used by soft-float wasm
 RUN apt-get update && \
     apt-get install -y clang=1:14.0-55.7~deb12u1 lld=1:14.0-55.7~deb12u1 wabt
-    # pinned rust 1.84.1
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.84.1 --target x86_64-unknown-linux-gnu,wasm32-unknown-unknown,wasm32-wasip1
+    # pinned rust 1.88.0
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.88.0 --target x86_64-unknown-linux-gnu,wasm32-unknown-unknown,wasm32-wasip1
 COPY ./Makefile ./
 COPY arbitrator/Cargo.* arbitrator/
 COPY arbitrator/arbutil arbitrator/arbutil
@@ -108,7 +108,7 @@ COPY --from=contracts-builder workspace/contracts-legacy/build/contracts/src/pre
 COPY --from=contracts-builder workspace/.make/ .make/
 RUN PATH="$PATH:/usr/local/go/bin" NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-wasm-bin
 
-FROM rust:1.84.1-slim-bookworm AS prover-header-builder
+FROM rust:1.88.0-slim-bookworm AS prover-header-builder
 WORKDIR /workspace
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -134,7 +134,7 @@ RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-prover-header
 FROM scratch AS prover-header-export
 COPY --from=prover-header-builder /workspace/target/ /
 
-FROM rust:1.84.1-slim-bookworm AS prover-builder
+FROM rust:1.88.0-slim-bookworm AS prover-builder
 WORKDIR /workspace
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -238,10 +238,11 @@ RUN ./download-machine.sh consensus-v32 0x184884e1eb9fefdc158f6c8ac912bb183bf3cf
 #RUN ./download-machine.sh consensus-v40-rc.1 0x6dae396b0b7644a2d63b4b22e6452b767aa6a04b6778dadebdd74aa40f40a5c5
 #RUN ./download-machine.sh consensus-v40-rc.2 0xa8206be13d53e456c7ab061d94bab5b229d674ac57ffe7281216479a8820fcc0
 RUN ./download-machine.sh consensus-v41 0xa18d6266cef250802c3cb2bfefe947ea1aa9a32dd30a8d1dfc4568a8714d3a7a
-RUN ./download-machine.sh consensus-v50-alpha.1 0x28cfd8d81613ce4ebe750e77bfd95d6d95d4f53240488095a11c1ad3a494fa82
-RUN ./download-machine.sh consensus-v50-rc.1 0x8fd725477d8ef58183a1a943c375a8495a22cd2d7d701ac917fe20d69993e88e
-RUN ./download-machine.sh consensus-v50-rc.2 0xc1ea4d6d2791bf5bdf6de3c2166ce4aab8fe16ca4ad5c226e8ae31a8b77f1a08
+#RUN ./download-machine.sh consensus-v50-alpha.1 0x28cfd8d81613ce4ebe750e77bfd95d6d95d4f53240488095a11c1ad3a494fa82
+#RUN ./download-machine.sh consensus-v50-rc.1 0x8fd725477d8ef58183a1a943c375a8495a22cd2d7d701ac917fe20d69993e88e
+#RUN ./download-machine.sh consensus-v50-rc.2 0xc1ea4d6d2791bf5bdf6de3c2166ce4aab8fe16ca4ad5c226e8ae31a8b77f1a08
 RUN ./download-machine.sh consensus-v50-rc.3 0x385fa2524d86d4ebc340988224f8686b3f485c7c9f7bc1015a64c85a9c76a6b0
+RUN ./download-machine.sh consensus-v50-rc.4 0x393be710f252e8217d66fe179739eba1ed471f0d5a847b5905c30926d853241a
 RUN ./download-machine.sh consensus-v40 0xdb698a2576298f25448bc092e52cf13b1e24141c997135d70f217d674bbeb69a
 
 FROM golang:1.24.5-bookworm AS node-builder
@@ -257,7 +258,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install -y wabt
 COPY go.mod go.sum ./
 COPY go-ethereum/go.mod go-ethereum/go.sum go-ethereum/
-COPY bold/go.mod bold/go.sum bold/
 RUN go mod download
 COPY . ./
 COPY --from=contracts-builder workspace/contracts/build/ contracts/build/

Dockerfile

@@ -35,7 +35,7 @@ pub trait Color {
 impl<T> Color for T where T: Display {
 
     fn color(&self, color: &str) -> String {
-        format!("{}{}{}", color, self, CLEAR)
+        format!("{color}{self}{CLEAR}")
     }
 
     fn blue(&self)   -> String { self.color(BLUE)   }
@@ -76,7 +76,7 @@ pub trait DebugColor {
 impl<T> DebugColor for T where T: Debug {
 
     fn debug_color(&self, color: &str) -> String {
-        format!("{}{:?}{}", color, self, CLEAR)
+        format!("{color}{self:?}{CLEAR}")
     }
 
     fn debug_blue(&self)   -> String { self.debug_color(BLUE)   }

arbitrator/arbutil/src/color.rs

@@ -65,7 +65,7 @@ impl Display for UserOutcome {
         use UserOutcome::*;
         match self {
             Success(data) => write!(f, "success {}", hex::encode(data)),
-            Failure(err) => write!(f, "failure {:?}", err),
+            Failure(err) => write!(f, "failure {err:?}"),
             OutOfInk => write!(f, "out of ink"),
             OutOfStack => write!(f, "out of stack"),
             Revert(data) => {