Merge branch 'master' into bold

.dockerignore

@@ -13,6 +13,9 @@ solgen/go
 **/node_modules
 
 target/**/*
+!target/machines
+!target/machines/*
+!target/machines/**/*
 brotli/buildfiles/**/*
 
 # these are used by environment outside the docker:

.github/workflows/arbitrator-ci.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-8
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -49,23 +49,18 @@ jobs:
           cache-dependency-path: '**/yarn.lock'
 
       - name: Install rust stable
-        uses: actions-rs/toolchain@v1
-        id: install-rust
+        uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          toolchain: "stable"
-          override: true
           components: 'llvm-tools-preview, rustfmt, clippy'
+          targets: 'wasm32-wasi, wasm32-unknown-unknown'
 
       - name: Install grcov
-        uses: actions-rs/install@v0.1
+        uses: jaxxstorm/action-install[email protected]
         with:
-          crate: grcov
-          version: latest
-          use-tool-cache: true
-
-      - name: Install rust wasm targets
-        run: rustup target add wasm32-wasi wasm32-unknown-unknown
+          repo: mozilla/grcov
+          tag: v0.8.18
+          extension: "\\.bz2"
+          cache: enable
 
       - name: Cache Rust intermediate build products
         uses: actions/cache@v3
@@ -148,22 +143,13 @@ jobs:
           echo RUSTDOCFLAGS="-Cpanic=abort" >> $GITHUB_ENV
 
       - name: Clippy check
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --all --manifest-path arbitrator/Cargo.toml -- -D warnings
+        run: cargo clippy --all --manifest-path arbitrator/Cargo.toml -- -D warnings
 
       - name: Run rust tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --all --manifest-path arbitrator/Cargo.toml
+        run: cargo test --all --manifest-path arbitrator/Cargo.toml
 
       - name: Rustfmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all --manifest-path arbitrator/Cargo.toml -- --check
+        run: cargo fmt --all --manifest-path arbitrator/Cargo.toml -- --check
 
       - name: Make proofs from test cases
         run: make -j test-gen-proofs

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -53,27 +53,10 @@ jobs:
           sudo apt-get update && sudo apt-get install -y lld-14
           sudo ln -s /usr/bin/wasm-ld-14 /usr/local/bin/wasm-ld
 
-      - name: Install rust wasm32-unknown-unknown
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: "stable"
-          target: wasm32-unknown-unknown
-
-      - name: Install rust wasm32-wasi
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: "stable"
-          target: wasm32-wasi
-
       - name: Install rust stable
-        uses: actions-rs/toolchain@v1
-        id: install-rust
+        uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          toolchain: "stable"
-          override: true
+          targets: 'wasm32-unknown-unknown, wasm32-wasi'
 
       - name: Cache Build Products
         uses: actions/cache@v3
@@ -125,10 +108,9 @@ jobs:
         run: make -j build-node-deps
 
       - name: Lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
           version: latest
-          skip-go-installation: true
           skip-pkg-cache: true
       - name: Custom Lint
         run: |

.github/workflows/codeql-analysis.yml

@@ -32,7 +32,6 @@ jobs:
       contents: read
       security-events: write
     env:
-      CODEQL_EXTRACTOR_GO_BUILD_TRACING: 'on'
       WABT_VERSION: 1.0.32
 
     strategy:
@@ -44,7 +43,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: true
 
@@ -74,12 +73,7 @@ jobs:
         go-version: 1.20.x
 
     - name: Install rust stable
-      uses: actions-rs/toolchain@v1
-      id: install-rust
-      with:
-        profile: minimal
-        toolchain: "stable"
-        override: true
+      uses: dtolnay/rust-toolchain@stable
 
     - name: Cache Rust Build Products
       uses: actions/cache@v3

.github/workflows/docker.yml

@@ -23,12 +23,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
         with:
           driver-opts: network=host
 
@@ -40,7 +40,7 @@ jobs:
           restore-keys: ${{ runner.os }}-buildx-
 
       - name: Build nitro-node docker
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           target: nitro-node
           push: true
@@ -50,7 +50,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
       - name: Build nitro-node-dev docker
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           target: nitro-node-dev
           push: true
@@ -59,6 +59,17 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
+      - name: Start background nitro-testnode
+        shell: bash
+        run: |
+          cd nitro-testnode
+          ./test-node.bash --init --dev &
+      
+      - name: Wait for rpc to come up
+        shell: bash
+        run: |
+          ${{ github.workspace }}/.github/workflows/waitForNitro.sh
+  
       - name: Print WAVM module root
         id: module-root
         run: |

.github/workflows/waitForNitro.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+# poll the nitro endpoint until we get a 0 return code or 30mins have passed, in that case exit 1
+timeout_time=$(($(date +%s) + 1800))
+
+while (( $(date +%s) <= timeout_time )); do
+  if curl -X POST -H 'Content-Type: application/json' -d '{"jsonrpc":"2.0","id":45678,"method":"eth_chainId","params":[]}' 'http://localhost:8547'; then
+    exit 0
+  else
+    sleep 20
+  fi
+done
+
+exit 1

Dockerfile

@@ -29,7 +29,7 @@ RUN apt-get update && \
     apt-get install -y git python3 make g++
 WORKDIR /workspace
 COPY contracts/package.json contracts/yarn.lock contracts/
-RUN cd contracts && yarn install --ignore-optional
+RUN cd contracts && yarn install
 COPY contracts contracts/
 COPY Makefile .
 RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-solidity
@@ -78,6 +78,7 @@ COPY ./go-ethereum ./go-ethereum
 COPY ./bold ./bold
 COPY --from=brotli-wasm-export / target/
 COPY --from=contracts-builder workspace/contracts/build/contracts/src/precompiles/ contracts/build/contracts/src/precompiles/
+COPY --from=contracts-builder workspace/contracts/node_modules/@offchainlabs/upgrade-executor/build/contracts/src/UpgradeExecutor.sol/UpgradeExecutor.json contracts/
 COPY --from=contracts-builder workspace/.make/ .make/
 RUN PATH="$PATH:/usr/local/go/bin" NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-wasm-bin
 
@@ -182,6 +183,7 @@ COPY bold/go.mod bold/go.sum bold/
 RUN go mod download
 COPY . ./
 COPY --from=contracts-builder workspace/contracts/build/ contracts/build/
+COPY --from=contracts-builder workspace/contracts/node_modules/@offchainlabs/upgrade-executor/build/contracts/src/UpgradeExecutor.sol/UpgradeExecutor.json contracts/node_modules/@offchainlabs/upgrade-executor/build/contracts/src/UpgradeExecutor.sol/
 COPY --from=contracts-builder workspace/.make/ .make/
 COPY --from=prover-header-export / target/
 COPY --from=brotli-library-export / target/

arbitrator/prover/src/main.rs

@@ -383,9 +383,7 @@ fn main() -> Result<()> {
         while let Some((module, func, profile)) = func_stack.pop() {
             sum.total_cycles += profile.total_cycles;
             sum.count += profile.count;
-            let entry = func_profile
-                .entry((module, func))
-                .or_insert_with(SimpleProfile::default);
+            let entry = func_profile.entry((module, func)).or_default();
             entry.count += sum.count;
             entry.total_cycles += sum.total_cycles;
             entry.local_cycles += profile.local_cycles;

arbitrator/prover/test-cases/go/main.go

@@ -89,7 +89,7 @@ func main() {
 	verified, err = MerkleSample(data, -1)
 	if err != nil {
 		if verified {
-			panic("succeded to verify proof invalid")
+			panic("succeeded to verify proof invalid")
 		}
 	}
 

arbnode/batch_poster.go

@@ -30,7 +30,6 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 
 	"github.com/offchainlabs/nitro/arbnode/dataposter"
-	"github.com/offchainlabs/nitro/arbnode/dataposter/storage"
 	"github.com/offchainlabs/nitro/arbnode/redislock"
 	"github.com/offchainlabs/nitro/arbos/arbostypes"
 	"github.com/offchainlabs/nitro/arbstate"
@@ -1109,22 +1108,21 @@ func (b *BatchPoster) Start(ctxIn context.Context) {
 			return b.config().PollInterval
 		}
 		posted, err := b.maybePostSequencerBatch(ctx)
-		ephemeralError := errors.Is(err, AccumulatorNotFoundErr) || errors.Is(err, storage.ErrStorageRace)
-		if !ephemeralError {
+		if err == nil {
 			b.firstEphemeralError = time.Time{}
 		}
 		if err != nil {
 			b.building = nil
 			logLevel := log.Error
-			if ephemeralError {
-				// Likely the inbox tracker just isn't caught up.
-				// Let's see if this error disappears naturally.
-				if b.firstEphemeralError == (time.Time{}) {
-					b.firstEphemeralError = time.Now()
-					logLevel = log.Debug
-				} else if time.Since(b.firstEphemeralError) < time.Minute {
-					logLevel = log.Debug
-				}
+			// Likely the inbox tracker just isn't caught up.
+			// Let's see if this error disappears naturally.
+			if b.firstEphemeralError == (time.Time{}) {
+				b.firstEphemeralError = time.Now()
+				logLevel = log.Warn
+			} else if time.Since(b.firstEphemeralError) < time.Minute {
+				logLevel = log.Warn
+			} else if time.Since(b.firstEphemeralError) < time.Minute*5 && strings.Contains(err.Error(), "will exceed max mempool size") {
+				logLevel = log.Warn
 			}
 			logLevel("error posting batch", "err", err)
 			return b.config().ErrorDelay