Merge branch '311-aggregator-wait-for-receipt-for-1-minute-if-not-bump-the-fee-v2' into test-aggregator-bump-fee

Author: MarcosNicolau

.github/pull_request_template.md

@@ -14,6 +14,8 @@ Please delete options that are not relevant.
 - [ ] Refactor
 
 ## Checklist
+
+- [ ] “Hotfix” to `testnet`, everything else to `staging`
 - [ ] Linked to Github Issue
 - [ ] This change depends on code or research by an external entity
   - [ ] Acknowledgements were updated to give credit
@@ -24,3 +26,6 @@ Please delete options that are not relevant.
   - [ ] Benchmarks added/run
 - [ ] Has a known issue
   - [Link to the open issue addressing it]() 
+- [ ] If your PR changes the Operator compatibility (Ex: Upgrade prover versions)
+  - [ ] This PR adds compatibility for operator for both versions and do not change batcher/docs/examples
+  - [ ] This PR updates batcher and docs/examples to the newer version. This requires the operator are already updated to be compatible

.github/workflows/build-and-test-go.yml

@@ -27,8 +27,12 @@ jobs:
           cache: false
       - name: Build SP1 bindings
         run: make build_sp1_linux
+      - name: Build Old SP1 bindings
+        run: make build_sp1_linux_old
       - name: Build Risc Zero go bindings
         run: make build_risc_zero_linux
+      - name: Build Old Risc Zero go bindings
+        run: make build_risc_zero_linux_old
       - name: Build Merkle Tree bindings
         run: make build_merkle_tree_linux
       - name: Build operator

.github/workflows/test-risc-zero-old.yml

@@ -0,0 +1,37 @@
+name: test-risc-zero-old
+
+on:
+  merge_group:
+  push:
+    branches: [main]
+  pull_request:
+    branches: ["*"]
+    paths:
+      - "operator/risc_zero_old/**"
+      - ".github/workflows/test-risc-zero-old.yml"
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clear device space
+        run: |
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /usr/local/.ghcup
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+          cache: false
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - name: Test Old Risc Zero Rust
+        run: make test_risc_zero_rust_ffi_old
+      - name: Test Old Risc Zero go bindings
+        run: make test_risc_zero_go_bindings_linux_old

.github/workflows/test-sp1-old.yml

@@ -0,0 +1,28 @@
+name: test-sp1-old
+
+on:
+  merge_group:
+  push:
+    branches: [main]
+  pull_request:
+    branches: ["*"]
+    paths:
+      - 'operator/sp1_old/**'
+      - '.github/workflows/test-sp1-old.yml'
+
+jobs:
+    test:
+      runs-on: ubuntu-latest
+      steps:
+        - uses: actions/checkout@v4
+        - uses: actions/setup-go@v5
+          with:
+            go-version: '1.22'
+            cache: false
+        - uses: actions-rs/toolchain@v1
+          with:
+            toolchain: stable
+        - name: Test Old SP1 Rust
+          run: make test_sp1_rust_ffi_old
+        - name: Test Old SP1 go bindings
+          run: make test_sp1_go_bindings_linux_old

Makefile

@@ -6,7 +6,7 @@ OS := $(shell uname -s)
 CONFIG_FILE?=config-files/config.yaml
 AGG_CONFIG_FILE?=config-files/config-aggregator.yaml
 
-OPERATOR_VERSION=v0.10.0
+OPERATOR_VERSION=v0.10.2
 
 ifeq ($(OS),Linux)
 	BUILD_ALL_FFI = $(MAKE) build_all_ffi_linux
@@ -17,7 +17,8 @@ ifeq ($(OS),Darwin)
 endif
 
 ifeq ($(OS),Linux)
-	LD_LIBRARY_PATH += $(CURDIR)/operator/risc_zero/lib
+	export LD_LIBRARY_PATH+=$(CURDIR)/operator/risc_zero_old/lib:$(CURDIR)/operator/risc_zero/lib
+	OPERATOR_FFIS=$(CURDIR)/operator/risc_zero_old/lib:$(CURDIR)/operator/risc_zero/lib
 endif
 
 ifeq ($(OS),Linux)
@@ -141,7 +142,7 @@ build_operator_macos:
 
 build_operator_linux:
 	@echo "Building Operator..."
-	@go build -ldflags "-X main.Version=$(OPERATOR_VERSION) -r $(LD_LIBRARY_PATH)" -o ./operator/build/aligned-operator ./operator/cmd/main.go
+	@go build -ldflags "-X main.Version=$(OPERATOR_VERSION) -r $(OPERATOR_FFIS)" -o ./operator/build/aligned-operator ./operator/cmd/main.go
 	@echo "Operator built into /operator/build/aligned-operator"
 
 update_operator:
@@ -513,11 +514,11 @@ build_binaries:
 __SP1_FFI__: ##
 build_sp1_macos:
 	@cd operator/sp1/lib && cargo build $(RELEASE_FLAG)
-	@cp operator/sp1/lib/target/$(TARGET_REL_PATH)/libsp1_verifier_ffi.dylib operator/sp1/lib/libsp1_verifier.dylib
+	@cp operator/sp1/lib/target/$(TARGET_REL_PATH)/libsp1_verifier_ffi.dylib operator/sp1/lib/libsp1_verifier_ffi.dylib
 
 build_sp1_linux:
 	@cd operator/sp1/lib && cargo build $(RELEASE_FLAG)
-	@cp operator/sp1/lib/target/$(TARGET_REL_PATH)/libsp1_verifier_ffi.so operator/sp1/lib/libsp1_verifier.so
+	@cp operator/sp1/lib/target/$(TARGET_REL_PATH)/libsp1_verifier_ffi.so operator/sp1/lib/libsp1_verifier_ffi.so
 
 test_sp1_rust_ffi:
 	@echo "Testing SP1 Rust FFI source code..."
@@ -542,6 +543,25 @@ generate_risc_zero_empty_journal_proof:
 	@cd scripts/test_files/risc_zero/no_public_inputs && RUST_LOG=info cargo run --release
 	@echo "Fibonacci proof and ELF with empty journal generated in scripts/test_files/risc_zero/no_public_inputs folder"
 
+build_sp1_macos_old:
+	@cd operator/sp1_old/lib && cargo build $(RELEASE_FLAG)
+	@cp operator/sp1_old/lib/target/$(TARGET_REL_PATH)/libsp1_verifier_old_ffi.dylib operator/sp1_old/lib/libsp1_verifier_old_ffi.dylib
+
+build_sp1_linux_old:
+	@cd operator/sp1_old/lib && cargo build $(RELEASE_FLAG)
+	@cp operator/sp1_old/lib/target/$(TARGET_REL_PATH)/libsp1_verifier_old_ffi.so operator/sp1_old/lib/libsp1_verifier_old_ffi.so
+
+test_sp1_rust_ffi_old:
+	@echo "Testing SP1 Rust FFI source code..."
+	@cd operator/sp1_old/lib && RUST_MIN_STACK=83886080 cargo t --release
+
+test_sp1_go_bindings_macos_old: build_sp1_macos_old
+	@echo "Testing SP1 Go bindings..."
+	go test ./operator/sp1_old/... -v
+
+test_sp1_go_bindings_linux_old: build_sp1_linux_old
+	@echo "Testing SP1 Go bindings..."
+	go test ./operator/sp1_old/... -v
 
 __RISC_ZERO_FFI__: ##
 build_risc_zero_macos:
@@ -569,6 +589,27 @@ generate_risc_zero_fibonacci_proof:
 		RUST_LOG=info cargo run --release && \
 		echo "Fibonacci proof, pub input and image ID generated in scripts/test_files/risc_zero folder"
 
+build_risc_zero_macos_old:
+	@cd operator/risc_zero_old/lib && cargo build $(RELEASE_FLAG)
+	@cp operator/risc_zero_old/lib/target/$(TARGET_REL_PATH)/librisc_zero_verifier_old_ffi.dylib operator/risc_zero_old/lib/librisc_zero_verifier_old_ffi.dylib
+
+build_risc_zero_linux_old:
+	@cd operator/risc_zero_old/lib && cargo build $(RELEASE_FLAG)
+	@cp operator/risc_zero_old/lib/target/$(TARGET_REL_PATH)/librisc_zero_verifier_old_ffi.so operator/risc_zero_old/lib/librisc_zero_verifier_old_ffi.so
+
+test_risc_zero_rust_ffi_old:
+	@echo "Testing RISC Zero Rust FFI source code..."
+	@cd operator/risc_zero_old/lib && cargo test --release
+
+test_risc_zero_go_bindings_macos_old: build_risc_zero_macos_old
+	@echo "Testing RISC Zero Go bindings..."
+	go test ./operator/risc_zero_old/... -v
+
+test_risc_zero_go_bindings_linux_old: build_risc_zero_linux_old
+	@echo "Testing RISC Zero Go bindings..."
+	go test ./operator/risc_zero_old/... -v
+
+
 __MERKLE_TREE_FFI__: ##
 build_merkle_tree_macos:
 	@cd operator/merkle_tree/lib && cargo build $(RELEASE_FLAG)
@@ -607,13 +648,17 @@ build_all_ffi_macos: ## Build all FFIs for macOS
 	@echo "Building all FFIs for macOS..."
 	@$(MAKE) build_sp1_macos
 	@$(MAKE) build_risc_zero_macos
+	@$(MAKE) build_sp1_macos_old
+	@$(MAKE) build_risc_zero_macos_old
 	@$(MAKE) build_merkle_tree_macos
 	@echo "All macOS FFIs built successfully."
 
 build_all_ffi_linux: ## Build all FFIs for Linux
 	@echo "Building all FFIs for Linux..."
 	@$(MAKE) build_sp1_linux
 	@$(MAKE) build_risc_zero_linux
+	@$(MAKE) build_sp1_linux_old
+	@$(MAKE) build_risc_zero_linux_old
 	@$(MAKE) build_merkle_tree_linux
 	@echo "All Linux FFIs built successfully."
 

batcher/Cargo.lock

@@ -467,16 +467,6 @@ impl Batcher {
             return Ok(());
         }
 
-        // Nonce and max fee verification
-        let max_fee = nonced_verification_data.max_fee;
-        if max_fee < U256::from(MIN_FEE_PER_PROOF) {
-            error!("The max fee signed in the message is less than the accepted minimum fee to be included in the batch.");
-            send_message(ws_conn_sink.clone(), ValidityResponseMessage::InvalidMaxFee).await;
-            return Ok(());
-        }
-
-        // Check that we had a user state entry for this user and insert it if not.
-
         // We aquire the lock first only to query if the user is already present and the lock is dropped.
         // If it was not present, then the user nonce is queried to the Aligned contract.
         // Lastly, we get a lock of the batch state again and insert the user state if it was still missing.

batcher/aligned-batcher/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "aligned"
-version = "0.9.2"
+version = "0.10.2"
 edition = "2021"
 
 [dependencies]