Solve conflicts + Redeploy

Author: MauroToscano

.dockerignore

@@ -0,0 +1,14 @@
+docker/*
+**/.DS_Store
+**/.idea
+out
+cache
+**/build
+**/target
+**/aligned_verification_data
+**/broadcast
+volume
+nonce_*.bin
+docker-compose.yaml
+.github/**
+**.md

.github/pull_request_template.md

@@ -0,0 +1,31 @@
+# TITLE
+
+## Description
+
+Description of the pull request changes and motivation.
+
+## Type of change
+
+Please delete options that are not relevant.
+
+- [ ] New feature
+- [ ] Bug fix
+- [ ] Optimization
+- [ ] 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
+- [ ] Unit tests added
+- [ ] This change requires new documentation.
+  - [ ] Documentation has been added/updated.
+- [ ] This change is an Optimization
+  - [ ] 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-go.yml .github/workflows/build-and-test-go.yml.github/workflows/build-go.yml renamed to .github/workflows/build-and-test-go.yml

@@ -27,13 +27,16 @@ 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 Old Merkle Tree bindings
-        run: make build_merkle_tree_linux_old
       - name: Build operator
         run: go build operator/cmd/main.go
       - name: Build aggregator
         run: go build aggregator/cmd/main.go
+      

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

@@ -47,11 +47,13 @@ jobs:
           cargo build --all
 
   test:
-    runs-on: ubuntu-latest
+    runs-on: aligned-runner
     needs: build
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+      - name: foundry-toolchain
+        uses: foundry-rs/[email protected]
       - name: Cache Rust dependencies
         uses: actions/cache@v3
         with:

.github/workflows/send-proofs-docker.yml

@@ -0,0 +1,56 @@
+name: "[CI] Send proofs to network"
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+    paths-ignore:
+      - '**.md'
+
+concurrency:
+  group: pull_request-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  network-test-docker-compose:
+    name: "Test network with Docker Compose"
+    runs-on: aligned-runner-ci
+    permissions:
+      contents: read
+      packages: write
+      pull-requests: write
+
+    steps:
+    - name: Log in to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: Build containers
+      run: make docker_build
+
+    - name: Start containers and initialize network
+      run: make docker_up && sleep 15
+
+    - name: Send proofs batches
+      run: make docker_batcher_send_all_proofs_burst
+
+    - name: Verify all sent proofs
+      run: make docker_verify_proof_submission_success
+
+    - name: Stop containers
+      continue-on-error: true
+      if: always()
+      run: make docker_down
+
+    - name: Ensure admin permissions in _work
+      if: always()
+      run: sudo chown admin:admin -R /home/admin/actions-runner/_work/

.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