chore: Update templates

.github/workflows/ci.yml

@@ -23,17 +23,26 @@
       - run: nix build .#rustup-shim -L --accept-flake-config
 
   test:
-    name: Test template dev shell
+    name: Test ${{ matrix.template }} template
     runs-on: warp-ubuntu-latest-x64-16x
+    strategy:
+      fail-fast: false
+      matrix:
+        template:
+          - hello-world-async
+          - hello-world-blocking
     steps:
       - uses: actions/checkout@v6
       - uses: cachix/install-nix-action@v31
       - name: Replace sp1.nix URL with local path
         run: |
           sed -i 's|url = "github:argumentcomputer/sp1.nix"|url = "path:../.."|' flake.nix
           nix flake update sp1 --accept-flake-config
-        working-directory: ${{ github.workspace }}/templates/hello-world
+        working-directory: ${{ github.workspace }}/templates/${{ matrix.template }}
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: templates/${{ matrix.template }}
       - run: nix develop --accept-flake-config --command bash -c "cd script && cargo run --release -- --prove"
-        working-directory: ${{ github.workspace }}/templates/hello-world
+        working-directory: ${{ github.workspace }}/templates/${{ matrix.template }}
         env:
           RUST_LOG: info

.gitignore

@@ -1,4 +1,4 @@
 # Nix
-.direnv
+**/.direnv
 result
 templates/**/flake.lock

README.md

@@ -14,11 +14,12 @@ Then enter a dev shell and run the proof:
 
 ```
 cd my-project
-nix develop
+nix develop # or direnv allow
 cd script && cargo run --release -- --prove
 ```
 
-See the [template README](templates/hello-world/README.md) for more details on running proofs.
+See the [template README](templates/hello-world-async/README.md) for more
+details on running proofs.
 
 ## Packages
 
@@ -31,12 +32,12 @@ nix build .#sp1-home
 nix build .#rustup-shim
 ```
 
-| Package | Description |
-|---------|-------------|
-| `cargo-prove` | SP1 CLI (`cargo prove`) |
-| `succinct-rust` | Succinct's patched Rust toolchain |
-| `sp1-home` | Composed `~/.sp1` home directory |
-| `rustup-shim` | Shim that routes `rustc` to `succinct-rust` when `RUSTUP_TOOLCHAIN=succinct` |
+| Package         | Description                                                                  |
+| --------------- | ---------------------------------------------------------------------------- |
+| `cargo-prove`   | SP1 CLI (`cargo prove`)                                                      |
+| `succinct-rust` | Succinct's patched Rust toolchain                                            |
+| `sp1-home`      | `~/.sp1` home directory                                                      |
+| `rustup-shim`   | Shim that routes `rustc` to `succinct-rust` when `RUSTUP_TOOLCHAIN=succinct` |
 
 ## Dev Shell
 

flake.nix

@@ -58,8 +58,10 @@
             cargo-prove
           ];
           shellHook = ''
-            if [ ! -e "$HOME/.sp1" ]; then
+            if [ ! -e "$HOME/.sp1" ] && [ ! -L "$HOME/.sp1" ]; then
               ln -s ${sp1-home} "$HOME/.sp1"
+            elif [ -L "$HOME/.sp1" ]; then
+              ln -snf ${sp1-home} "$HOME/.sp1"
             elif [ ! -L "$HOME/.sp1" ]; then
               echo "Warning: $HOME/.sp1 exists and is not a symlink. SP1 toolchain may not work correctly."
             fi

garnix.yaml

@@ -0,0 +1,5 @@
+builds:
+  exclude:
+    - "packages.*.build-image"
+    - "packages.*.run-sp1"
+    - "packages.*.sp1-shell"

templates/default.nix

@@ -1,7 +1,11 @@
 rec {
   hello-world = {
-    path = ./hello-world;
-    description = "Hello World";
+    path = ./hello-world-async;
+    description = "Hello World (Async)";
+  };
+  hello-world-blocking = {
+    path = ./hello-world-blocking;
+    description = "Hello World (Blocking)";
   };
   default = hello-world;
 }

templates/hello-world-async/.github/workflows/foundry-test.yml

@@ -0,0 +1,41 @@
+name: Foundry Test
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ main ]
+  pull_request:
+
+
+jobs:
+  check:
+    strategy:
+      fail-fast: true
+
+    name: Foundry project
+    runs-on:
+      - runs-on
+      - runner=1cpu-linux-x64
+      - run-id=${{ github.run_id }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
+      - name: Run Forge build
+        run: |
+          cd contracts
+          forge --version
+          forge build --sizes
+        id: build
+
+      - name: Run Forge tests
+        run: |
+          cd contracts
+          forge test -vvv
+        id: test

templates/hello-world/.github/workflows/prove.yml → templates/hello-world-async/.github/workflows/prove.yml

@@ -28,12 +28,17 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.85.0
+          toolchain: 1.93.0
+
+      - name: "Install protoc"
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y protobuf-compiler
 
       - name: Install SP1 toolchain
         run: |
           curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up 
+          ~/.sp1/bin/sp1up -v v6.0.1
           ~/.sp1/bin/cargo-prove prove --version
 
       - name: Build SP1 program