Backport PRs from main as of March 20

.env-compose → .env.broker-template

@@ -20,12 +20,15 @@ MINIO_BUCKET=workflow
 
 GRAFANA_IMG=grafana/grafana:11.0.0
 
-PRIVATE_KEY=0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba
+SEGMENT_SIZE=21
+RISC0_KECCAK_PO2=17
 
-BOUNDLESS_MARKET_ADDR=0xCE3478A9E0167a6Bc5716DC39DbbbfAc38F27623
-SET_VERIFIER_ADDR=0x261D8c5e9742e6f7f1076Fa1F560894524e19cad
+PRIVATE_KEY=
 
-SEGMENT_SIZE=20
-RISC0_KECCAK_PO2=17
+BOUNDLESS_MARKET_ADDRESS=
+SET_VERIFIER_ADDRESS=
 
-RPC_URL="http://localhost:8545"
+# Note you must use an RPC URL that supports event filters. Many free RPC providers 
+# do not support them.
+RPC_URL=
+ORDER_STREAM_URL=

.env.localnet-template

@@ -0,0 +1,15 @@
+# Default anvil node and order stream endpoint
+RPC_URL="http://localhost:8545"
+ORDER_STREAM_URL="http://localhost:8585"
+
+### Contracts ###
+# This will be copied to .env.localnet and filled with `just localnet`
+
+SET_VERIFIER_ADDRESS=
+BOUNDLESS_MARKET_ADDRESS=
+
+### Wallets private keys ###
+# Note: This is a funded address by default with anvil test configuration (index 3).
+
+PRIVATE_KEY="0x7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6"
+ADDRESS="0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"

.env.testnet

@@ -0,0 +1,6 @@
+# Sepolia contract addresses
+BOUNDLESS_MARKET_ADDRESS=0x69c7943DA0D7e45D44Bd0cE7a2412DCdAe423788
+SET_VERIFIER_ADDRESS=0xEf0A93B2310d52358F1eCA0C946aD7D25596e7dd
+
+# Public order stream URL
+ORDER_STREAM_URL="https://order-stream.beboundless.xyz/"

.github/CODEOWNERS

@@ -3,5 +3,5 @@
 # Note: Order is important; the last matching pattern takes the most
 # precedence.
 
-*                                      @boundless-xyz/maintainers @capossele @Wollac @zeroecco @austinabell @willemolding
-/docs/                                 @boundless-xyz/maintainers @capossele @Wollac @zeroecco @austinabell @willemolding
+*                                      @boundless-xyz/maintainers @capossele @Wollac @zeroecco @austinabell @willemolding @rlukata
+/docs/                                 @boundless-xyz/maintainers @capossele @Wollac @zeroecco @austinabell @willemolding @rlukata

.github/workflows/main.yml

@@ -33,6 +33,7 @@ jobs:
       - rust-pkg-check
       - docs-rs
       - bento
+      - bento_run
 
     runs-on: ubuntu-latest
     steps:
@@ -44,6 +45,13 @@ jobs:
 
   rust:
     runs-on: [self-hosted, Linux, X64, prod, cpu]
+    services:
+      postgres:
+        image: postgres:latest
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_PASSWORD: password
     steps:
       - name: checkout code
         uses: actions/checkout@v4
@@ -111,8 +119,9 @@ jobs:
         run: git diff --exit-code -- crates/boundless-market/src/contracts/artifacts
 
       - name: cargo test
-        run: cargo test --locked --workspace --all-targets -- ignored
+        run: cargo test --locked --workspace --all-targets -- --include-ignored
         env:
+          DATABASE_URL: postgres://postgres:password@localhost:5432/postgres
           RISC0_DEV_MODE: true
 
       - name: sccache stats
@@ -179,14 +188,59 @@ jobs:
         run: sqlx migrate run --source ./crates/taskdb/migrations/
 
       - name: cargo test
-        run: cargo test --locked --workspace --all-targets -- ignored
+        run: cargo test --locked --workspace --all-targets -- --ignored
         env:
           DATABASE_URL: postgres://postgres:password@localhost:5432/postgres
           RISC0_DEV_MODE: true
 
       - name: sccache stats
         run: sccache --show-stats
 
+
+  bento_run:
+    runs-on: [self-hosted, Linux, X64, prod, cuda, g6.4xlarge]
+    needs: files-changed
+    if: needs.files-changed.outputs.bento == 'true'
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: install rust
+        uses: risc0/risc0/.github/actions/[email protected]
+        with:
+          toolchain: '1.81'
+
+      - name: Fetch CI AWS Creds
+        id: aws-creds
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: 'us-west-2'
+          role-to-assume: 'arn:aws:iam::083632199359:role/gha_oidc_risc0_cache_shared_access'
+          output-credentials: true
+
+      - name: create ci creds file
+        run: |
+          echo "[default]" > ./dockerfiles/ci-cache-creds.txt
+          echo "aws_access_key_id=${{ steps.aws-creds.outputs.aws-access-key-id }}" >> ./dockerfiles/ci-cache-creds.txt && \
+          echo "aws_secret_access_key=${{ steps.aws-creds.outputs.aws-secret-access-key }}" >> ./dockerfiles/ci-cache-creds.txt && \
+          echo "aws_session_token=${{ steps.aws-creds.outputs.aws-session-token }}" >> ./dockerfiles/ci-cache-creds.txt
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Start bento cluster
+        run: docker compose --env-file ./.env.broker-template -f compose.yml -f ./dockerfiles/compose.ci.yml up -d
+
+      - name: setup sccache + s3
+        uses: ./.github/actions/sccache
+
+      - name: Run a sample proof through
+        # TODO: snark, multi-segments, bigint, keccak, composition guest to express all functionality
+        working-directory: bento
+        run: RUST_LOG=info cargo run --bin bento_cli -- -c 32 -s
+
   rust-pkg-check:
     runs-on: [self-hosted, Linux, X64, prod, cpu]
     steps:
@@ -209,7 +263,7 @@ jobs:
       - name: install cargo risczero
         uses: ./.github/actions/bininstall-risc0
         with:
-          risczero-version: '1.2.0'
+          risczero-version: '~1.2.0'
           toolchain-version: 'r0.1.81.0'
 
       - name: check order-stream
@@ -403,6 +457,8 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       docker: ${{ steps.changes.outputs.docker }}
+      bento: ${{ steps.changes.outputs.bento }}
+
     steps:
       - name: checkout code
         uses: actions/checkout@v4
@@ -411,10 +467,12 @@ jobs:
         id: changes
         with:
           filters: |
-            src:
+            docker:
               - 'dockerfiles/**'
               - 'compose.yml'
-              - '.env-compose'
+              - '.env.broker-template'
+            bento:
+              - 'bento/**'
 
   docker:
     runs-on: [self-hosted, Linux, X64, prod, cpu]
@@ -427,7 +485,7 @@ jobs:
           submodules: recursive
 
       - name: docker-compose lint
-        run: docker compose --profile broker --env-file ./.env-compose config
+        run: docker compose --profile broker --env-file ./.env.broker-template config
 
       - name: Fetch CI AWS Creds
         id: aws-creds
@@ -448,4 +506,4 @@ jobs:
         run: docker buildx create --driver docker-container --use
 
       - name: docker compose build
-        run: docker compose --profile broker --env-file ./.env-compose -f compose.yml -f ./dockerfiles/compose.ci.yml build
+        run: docker compose --profile broker --env-file ./.env.broker-template -f compose.yml -f ./dockerfiles/compose.ci.yml build

.gitignore

@@ -15,8 +15,12 @@ deployment_secrets.toml
 # Devnet logs
 /logs
 
-# Dotenv file
-# .env
+# Ignore all env files
+.env*
+# Except for the templates and running network env files
+!.env.broker-template
+!.env.localnet-template
+!.env.testnet
 
 # Cargo
 target/