EspressoSystems
diff --git a/‎.dockerignore
+1 b/‎.dockerignore
+1
diff --git a/‎.github/workflows/arbitrator-ci.yml
+14-6 b/‎.github/workflows/arbitrator-ci.yml
+14-6
diff --git a/‎.github/workflows/ci.yml
+53-16 b/‎.github/workflows/ci.yml
+53-16
diff --git a/‎.github/workflows/codeql-analysis.yml
+4-2 b/‎.github/workflows/codeql-analysis.yml
+4-2
diff --git a/‎.github/workflows/submodule-pin-check.yml
+4-4 b/‎.github/workflows/submodule-pin-check.yml
+4-4
diff --git a/‎.gitmodules
+3-4 b/‎.gitmodules
+3-4
diff --git a/‎Dockerfile
+3 b/‎Dockerfile
+3
diff --git a/‎Makefile
+36-14 b/‎Makefile
+36-14
diff --git a/‎arbitrator/Cargo.toml
+1 b/‎arbitrator/Cargo.toml
+1
@@ -36,6 +36,7 @@ arbitrator/tools/wasmer/target/
 arbitrator/tools/wasm-tools/
 arbitrator/tools/pricers/
 arbitrator/tools/module_roots/
+arbitrator/tools/stylus_benchmark
 arbitrator/langs/rust/target/
 arbitrator/langs/bf/target/
 
 
@@ -71,12 +71,6 @@ jobs:
           cache: 'yarn'
           cache-dependency-path: '**/yarn.lock'
 
-      - name: Install rust stable
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: 'stable'
-          components: 'llvm-tools-preview, rustfmt, clippy'
-
       - name: Install rust nightly
         uses: dtolnay/rust-toolchain@nightly
         id: install-rust-nightly
@@ -85,6 +79,14 @@ jobs:
           targets: 'wasm32-wasi, wasm32-unknown-unknown'
           components: 'rust-src, rustfmt, clippy'
 
+      - name: Install rust stable
+        id: install-rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: '1.80.1'
+          targets: 'wasm32-wasi, wasm32-unknown-unknown'
+          components: 'llvm-tools-preview, rustfmt, clippy'
+
       - name: Set STYLUS_NIGHTLY_VER environment variable
         run: echo "STYLUS_NIGHTLY_VER=+$(rustup toolchain list | grep '^nightly' | head -n1 | cut -d' ' -f1)" >> "$GITHUB_ENV"
 
@@ -172,12 +174,18 @@ jobs:
       - name: Run rust tests
         run: cargo test -p arbutil -p prover -p jit -p stylus --release --manifest-path arbitrator/prover/Cargo.toml
 
+      - name: Check stylus_bechmark
+        run: cargo check --manifest-path arbitrator/tools/stylus_benchmark/Cargo.toml
+
       - name: Rustfmt
         run: cargo fmt -p arbutil -p prover -p jit -p stylus --manifest-path arbitrator/Cargo.toml -- --check
 
       - name: Rustfmt - langs/rust
         run: cargo fmt --all --manifest-path arbitrator/langs/rust/Cargo.toml -- --check
 
+      - name: Rustfmt - tools/stylus_benchmark
+        run: cargo fmt --all --manifest-path arbitrator/tools/stylus_benchmark/Cargo.toml -- --check
+
       - name: Make proofs from test cases
         run: make -j test-gen-proofs
 
 
@@ -116,6 +116,7 @@ jobs:
 
       - name: Install rust stable
         uses: dtolnay/rust-toolchain@stable
+        id: install-rust
         with:
           toolchain: "1.81.0"
           targets: "wasm32-wasi, wasm32-unknown-unknown"
@@ -140,6 +141,9 @@ jobs:
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
+        
+      - name: Install cbindgen
+        run: cargo install --force cbindgen
 
       - name: Cache Build Products
         uses: actions/cache@v3
@@ -196,6 +200,7 @@ jobs:
       - name: Build all lint dependencies
         run: make -j build-node-deps
 
+
       # TODO: celestia has lint errors, fix in later PRs
       # - name: Lint
       #   if: matrix.test-mode == 'defaults'
@@ -215,29 +220,66 @@ jobs:
           echo "GOGC=80" >> "$GITHUB_ENV"
           echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> "$GITHUB_ENV"
 
-      - name: run tests without race detection (path and hash state scheme)
+      - name: run tests without race detection and path state scheme
+        if: matrix.test-mode == 'defaults'
+        shell: bash
+        env:
+          TEST_STATE_SCHEME: path
+        run: |
+          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/target/lib
+          echo "Running tests with Path Scheme" >> full.log
+          ${{ github.workspace }}/scripts/espresso-run-test-ci
+  
+      - name: run tests without race detection and hash state scheme
         if: matrix.test-mode == 'defaults'
         shell: bash
         env:
-          TEST_STATE_SCHEME: ${{ matrix.test-state-scheme }}
+          TEST_STATE_SCHEME: hash
         run: |
           export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/target/lib
-          scripts/espresso-run-test-ci
+          echo "Running tests with Hash Scheme" >> full.log
+          ${{ github.workspace }}/scripts/espresso-run-test-ci
 
-      - name: run tests with race detection (path and hash state scheme)
+      - name: run tests with race detection and hash state scheme
         if: matrix.test-mode == 'race'
         shell: bash
         env:
-          TEST_STATE_SCHEME: ${{ matrix.test-state-scheme }}
+          TEST_STATE_SCHEME: hash
         run: |
           export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/target/lib
-          scripts/espresso-run-test-ci -race
+          echo "Running tests with Hash Scheme" >> full.log
+          ${{ github.workspace }}/scripts/espresso-run-test-ci -race
 
       - name: run redis tests
-        if: matrix.test-mode == 'redis'
+        if: matrix.test-mode == 'defaults'
+        shell: bash
         run: |
           export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/target/lib
-          TEST_REDIS=redis://localhost:6379/0 scripts/espresso-run-test-ci -p 1 -run TestRedis ./arbnode/... ./system_tests/...
+          echo "Running redis tests" >> full.log
+          TEST_REDIS=redis://localhost:6379/0 ${{ github.workspace }}/scripts/espresso-run-test-ci -p 1 -run TestRedis ./arbnode/... ./system_tests/...
+
+      - name: create block input json file
+        if: matrix.test-mode == 'defaults'
+        run: |
+          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/target/lib
+          gotestsum --format short-verbose -- -run TestProgramStorage$ ./system_tests/... --count 1 --recordBlockInputs.WithBaseDir="${{ github.workspace }}/target" --recordBlockInputs.WithTimestampDirEnabled=false --recordBlockInputs.WithBlockIdInFileNameEnabled=false
+      
+      - name: run arbitrator prover on block input json
+        if: matrix.test-mode == 'defaults'
+        run: |
+          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/target/lib
+          make build-prover-bin
+          target/bin/prover target/machines/latest/machine.wavm.br -b --json-inputs="${{ github.workspace }}/target/TestProgramStorage/block_inputs.json"
+      
+      - name: run jit prover on block input json
+        if: matrix.test-mode == 'defaults'
+        run: |
+          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/target/lib
+          make build-jit
+          if [ -n "$(target/bin/jit --binary target/machines/latest/replay.wasm --cranelift --json-inputs='${{ github.workspace }}/target/TestProgramStorage/block_inputs.json')" ]; then
+            echo "Error: Command produced output."
+            exit 1
+          fi
 
       - name: run challenge tests
         if: matrix.test-mode == 'challenge'
@@ -263,19 +305,14 @@ jobs:
       - name: Archive detailed run log
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.test-mode }}-full.log
+          name: ${{ matrix.test-mode }}-${{ matrix.test-state-scheme || 'default' }}-full.log
           path: full.log
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v2
-        if: false
+        if: matrix.test-mode == 'defaults'
         with:
           fail_ci_if_error: false
           files: ./coverage.txt,./coverage-redis.txt
           verbose: false
-          token: ${{ secrets.CODECOV_TOKEN }}
-
-      - name: Check available space after CI run
-        if: "!cancelled()"
-        run: |
-          sudo df -h
+          token: ${{ secrets.CODECOV_TOKEN }}
@@ -83,12 +83,14 @@ jobs:
       with:
         version: nightly
 
+    - name: Install cbindgen
+      run: cargo install --force cbindgen
+
     - name: Cache Rust Build Products
       uses: actions/cache@v3
       with:
         path: |
-          ~/.cargo/registry/
-          ~/.cargo/git/
+          ~/.cargo/
           arbitrator/target/
           arbitrator/wasm-libraries/target/
           arbitrator/wasm-libraries/soft-float/SoftFloat/build
 
@@ -25,20 +25,20 @@ jobs:
         run: |
           status_state="pending"
           declare -Ar exceptions=(
-            [contracts]=origin/develop
+            [contracts]=origin/pre-bold
             [nitro-testnode]=origin/master
-            
+
             #TODO Rachel to check these are the intended branches.
             [arbitrator/langs/c]=origin/vm-storage-cache
-            [arbitrator/tools/wasmer]=origin/adopt-v4.2.8
+            [arbitrator/tools/wasmer]=origin/stylus
           )
           divergent=0
           for mod in `git submodule --quiet foreach 'echo $name'`; do
             branch=origin/HEAD
             if [[ -v exceptions[$mod] ]]; then
               branch=${exceptions[$mod]}
             fi
-            
+
             if ! git -C $mod merge-base --is-ancestor HEAD $branch; then
               echo $mod diverges from $branch
               divergent=1
 
@@ -10,7 +10,6 @@
 [submodule "contracts"]
 	path = contracts
 	url = https://github.com/EspressoSystems/nitro-contracts.git
-	branch = celestia-integration
 [submodule "arbitrator/wasm-testsuite/testsuite"]
 	path = arbitrator/wasm-testsuite/testsuite
 	url = https://github.com/WebAssembly/testsuite.git
@@ -19,11 +18,12 @@
 	url = https://github.com/OffchainLabs/wasmer.git
 [submodule "nitro-testnode"]
 	path = nitro-testnode
-	url = https://github.com/EspressoSystems/nitro-testnode
+	url = https://github.com/EspressoSystems/nitro-testnode.git
 	branch = celestia-integration
 [submodule "bold"]
 	path = bold
-	url = https://github.com/OffchainLabs/bold.git
+	url = https://github.com/EspressoSystems/bold.git
+	branch = celestia
 [submodule "arbitrator/langs/rust"]
 	path = arbitrator/langs/rust
 	url = https://github.com/OffchainLabs/stylus-sdk-rs.git
@@ -39,4 +39,3 @@
 [submodule "go-ethereum"]
 	path = go-ethereum
 	url = https://github.com/OffchainLabs/go-ethereum.git
-	branch = nitro_v3.3.1
@@ -326,6 +326,8 @@ FROM nitro-node-slim AS nitro-node
 USER root
 COPY --from=prover-export /bin/jit                        /usr/local/bin/
 COPY --from=node-builder  /workspace/target/bin/daserver  /usr/local/bin/
+COPY --from=node-builder  /workspace/target/bin/autonomous-auctioneer  /usr/local/bin/
+COPY --from=node-builder  /workspace/target/bin/bidder-client  /usr/local/bin/
 COPY --from=node-builder  /workspace/target/bin/datool    /usr/local/bin/
 COPY --from=nitro-legacy /home/user/target/machines /home/user/nitro-legacy/machines
 RUN rm -rf /workspace/target/legacy-machines/latest
@@ -361,6 +363,7 @@ RUN rm -f /home/user/target/machines/latest
 COPY --from=prover-export /bin/jit                                         /usr/local/bin/
 COPY --from=node-builder  /workspace/target/bin/deploy                     /usr/local/bin/
 COPY --from=node-builder  /workspace/target/bin/seq-coordinator-invalidate /usr/local/bin/
+COPY --from=node-builder  /workspace/target/bin/mockexternalsigner        /usr/local/bin/
 COPY --from=module-root-calc /workspace/target/machines/latest/machine.wavm.br /home/user/target/machines/latest/
 COPY --from=module-root-calc /workspace/target/machines/latest/until-host-io-state.bin /home/user/target/machines/latest/
 COPY --from=module-root-calc /workspace/target/machines/latest/module-root.txt /home/user/target/machines/latest/
 
@@ -186,7 +186,7 @@ all: build build-replay-env test-gen-proofs
 	@touch .make/all
 
 .PHONY: build
-build: $(patsubst %,$(output_root)/bin/%, nitro deploy relay daserver datool seq-coordinator-invalidate nitro-val seq-coordinator-manager dbconv)
+build: $(patsubst %,$(output_root)/bin/%, nitro deploy relay daserver autonomous-auctioneer bidder-client datool mockexternalsigner seq-coordinator-invalidate nitro-val seq-coordinator-manager dbconv)
 	@printf $(done)
 
 .PHONY: build-node-deps
@@ -334,9 +334,18 @@ $(output_root)/bin/relay: $(DEP_PREDICATE) build-node-deps
 $(output_root)/bin/daserver: $(DEP_PREDICATE) build-node-deps
 	go build $(GOLANG_PARAMS) -o $@ "$(CURDIR)/cmd/daserver"
 
+$(output_root)/bin/autonomous-auctioneer: $(DEP_PREDICATE) build-node-deps
+	go build $(GOLANG_PARAMS) -o $@ "$(CURDIR)/cmd/autonomous-auctioneer"
+
+$(output_root)/bin/bidder-client: $(DEP_PREDICATE) build-node-deps
+	go build $(GOLANG_PARAMS) -o $@ "$(CURDIR)/cmd/bidder-client"
+
 $(output_root)/bin/datool: $(DEP_PREDICATE) build-node-deps
 	go build $(GOLANG_PARAMS) -o $@ "$(CURDIR)/cmd/datool"
 
+$(output_root)/bin/mockexternalsigner: $(DEP_PREDICATE) build-node-deps
+	go build $(GOLANG_PARAMS) -o $@ "$(CURDIR)/cmd/mockexternalsigner"
+
 $(output_root)/bin/seq-coordinator-invalidate: $(DEP_PREDICATE) build-node-deps
 	go build $(GOLANG_PARAMS) -o $@ "$(CURDIR)/cmd/seq-coordinator-invalidate"
 
@@ -471,67 +480,80 @@ $(stylus_test_dir)/%.wasm: $(stylus_test_dir)/%.b $(stylus_lang_bf)
 
 $(stylus_test_keccak_wasm): $(stylus_test_keccak_src)
 	$(cargo_nightly) --manifest-path $< --release --config $(stylus_cargo)
-	./scripts/remove_reference_types.sh $@
+	wasm2wat $@ > $@.wat #removing reference types
+	wat2wasm $@.wat -o $@
 	@touch -c $@ # cargo might decide to not rebuild the binary
 
 $(stylus_test_keccak-100_wasm): $(stylus_test_keccak-100_src)
 	$(cargo_nightly) --manifest-path $< --release --config $(stylus_cargo)
-	./scripts/remove_reference_types.sh $@
+	wasm2wat $@ > $@.wat #removing reference types
+	wat2wasm $@.wat -o $@
 	@touch -c $@ # cargo might decide to not rebuild the binary
 
 $(stylus_test_fallible_wasm): $(stylus_test_fallible_src)
 	$(cargo_nightly) --manifest-path $< --release --config $(stylus_cargo)
-	./scripts/remove_reference_types.sh $@
+	wasm2wat $@ > $@.wat #removing reference types
+	wat2wasm $@.wat -o $@
 	@touch -c $@ # cargo might decide to not rebuild the binary
 
 $(stylus_test_storage_wasm): $(stylus_test_storage_src)
 	$(cargo_nightly) --manifest-path $< --release --config $(stylus_cargo)
-	./scripts/remove_reference_types.sh $@
+	wasm2wat $@ > $@.wat #removing reference types
+	wat2wasm $@.wat -o $@
 	@touch -c $@ # cargo might decide to not rebuild the binary
 
 $(stylus_test_multicall_wasm): $(stylus_test_multicall_src)
 	$(cargo_nightly) --manifest-path $< --release --config $(stylus_cargo)
-	./scripts/remove_reference_types.sh $@
+	wasm2wat $@ > $@.wat #removing reference types
+	wat2wasm $@.wat -o $@
 	@touch -c $@ # cargo might decide to not rebuild the binary
 
 $(stylus_test_log_wasm): $(stylus_test_log_src)
 	$(cargo_nightly) --manifest-path $< --release --config $(stylus_cargo)
-	./scripts/remove_reference_types.sh $@
+	wasm2wat $@ > $@.wat #removing reference types
+	wat2wasm $@.wat -o $@
 	@touch -c $@ # cargo might decide to not rebuild the binary
 
 $(stylus_test_create_wasm): $(stylus_test_create_src)
 	$(cargo_nightly) --manifest-path $< --release --config $(stylus_cargo)
-	./scripts/remove_reference_types.sh $@
+	wasm2wat $@ > $@.wat #removing reference types
+	wat2wasm $@.wat -o $@
 	@touch -c $@ # cargo might decide to not rebuild the binary
 
 $(stylus_test_math_wasm): $(stylus_test_math_src)
 	$(cargo_nightly) --manifest-path $< --release --config $(stylus_cargo)
-	./scripts/remove_reference_types.sh $@
+	wasm2wat $@ > $@.wat #removing reference types
+	wat2wasm $@.wat -o $@
 	@touch -c $@ # cargo might decide to not rebuild the binary
 
 $(stylus_test_evm-data_wasm): $(stylus_test_evm-data_src)
 	$(cargo_nightly) --manifest-path $< --release --config $(stylus_cargo)
-	./scripts/remove_reference_types.sh $@
+	wasm2wat $@ > $@.wat #removing reference types
+	wat2wasm $@.wat -o $@
 	@touch -c $@ # cargo might decide to not rebuild the binary
 
 $(stylus_test_read-return-data_wasm): $(stylus_test_read-return-data_src)
 	$(cargo_nightly) --manifest-path $< --release --config $(stylus_cargo)
-	./scripts/remove_reference_types.sh $@
+	wasm2wat $@ > $@.wat #removing reference types
+	wat2wasm $@.wat -o $@
 	@touch -c $@ # cargo might decide to not rebuild the binary
 
 $(stylus_test_sdk-storage_wasm): $(stylus_test_sdk-storage_src)
 	$(cargo_nightly) --manifest-path $< --release --config $(stylus_cargo)
-	./scripts/remove_reference_types.sh $@
+	wasm2wat $@ > $@.wat #removing reference types
+	wat2wasm $@.wat -o $@
 	@touch -c $@ # cargo might decide to not rebuild the binary
 
 $(stylus_test_erc20_wasm): $(stylus_test_erc20_src)
 	$(cargo_nightly) --manifest-path $< --release --config $(stylus_cargo)
-	./scripts/remove_reference_types.sh $@
+	wasm2wat $@ > $@.wat #removing reference types
+	wat2wasm $@.wat -o $@
 	@touch -c $@ # cargo might decide to not rebuild the binary
 
 $(stylus_test_hostio-test_wasm): $(stylus_test_hostio-test_src)
 	$(cargo_nightly) --manifest-path $< --release --config $(stylus_cargo)
-	./scripts/remove_reference_types.sh $@
+	wasm2wat $@ > $@.wat #removing reference types
+	wat2wasm $@.wat -o $@
 	@touch -c $@ # cargo might decide to not rebuild the binary
 
 contracts/test/prover/proofs/float%.json: $(arbitrator_cases)/float%.wasm $(prover_bin) $(output_latest)/soft-float.wasm
 
@@ -12,6 +12,7 @@ members = [
 exclude = [
         "stylus/tests/",
         "tools/wasmer/",
+        "tools/stylus_benchmark",
 ]
 resolver = "2"
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ members = [`
`12`	`12`	`exclude = [`
`13`	`13`	`"stylus/tests/",`
`14`	`14`	`"tools/wasmer/",`
	`15`	`+ "tools/stylus_benchmark",`
`15`	`16`	`]`
`16`	`17`	`resolver = "2"`
`17`	`18`