added Verifier and Semver

.github/workflows/docker-build.yml

@@ -2,16 +2,33 @@ name: Docker Build
 
 on:
   push:
-    branches: [ buildfile ]
+    branches: [ verifier ]
   pull_request:
     branches: [ main ]
 
 jobs:
   build:
-    runs-on: ubuntu-latest  # , self-hosted
+    runs-on: ubuntu-latest  # , l5, self-hosted
+    permissions:
+      contents: write
     steps:
     - name: Check out code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
+
+    - name:  Bump version and push tag, Minor version for each merge
+      uses: anothrNick/[email protected]
+      id: taggerRun
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        WITH_V: true
+
+    - name: echo tag
+      run: |
+        echo "The current tag is: ${{ steps.taggerRun.outputs.new_tag }}"
+
+    - name: echo part
+      run: |
+        echo "The version increment was: ${{ steps.taggerRun.outputs.part }}"
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2 
@@ -26,41 +43,43 @@ jobs:
     - name: Build Docker image (manual)
       run: |
         docker build --no-cache -t e36io/hyperfridge-r0:${{ github.run_id }} .
-
-
-    # - name: Build Docker image
-    #   uses: docker/build-push-action@v2
-    #   with:
-    #     no-cache: true
-    #     context: .
-    #     file: ./Dockerfile
-    #     push: false
-    #     load: true
-    #     tags: e36io/hyperfridge-r0:${{ github.run_id }}
 
     - name: Create and Run Temporary Container
       run: |
         docker create --name temp-container e36io/hyperfridge-r0:${{ github.run_id }}
-        docker cp temp-container:/host/out/IMAGE_ID.hex ./IMAGE_ID.hex
+        docker cp temp-container:/app/IMAGE_ID.hex ./IMAGE_ID.hex
+        docker cp temp-container:/app ./app
+        docker cp temp-container:/data ./data
         docker rm temp-container  
 
     - name: Read the Image Tag
       id: read_tag
       run: echo "IMAGE_TAG=$(cat IMAGE_ID.hex)" >> $GITHUB_ENV        
 
+    - name: Zip App and Data Directories to create a release
+      run: |
+        zip -r hyperfridge-${{ env.IMAGE_TAG }}-${{ steps.taggerRun.outputs.new_tag }}.zip ./app ./data
+
     - name: Build and Push Docker image with custom tag
       if: github.event_name != 'pull_request'
       uses: docker/build-push-action@v2
       with:
         context: .
         file: ./Dockerfile
         push: true
-        tags: e36io/hyperfridge-r0:${{ env.IMAGE_TAG }}
+        tags: e36io/hyperfridge-r0:${{ steps.taggerRun.outputs.new_tag }}-${{ env.IMAGE_TAG }}
+
+    # - name: Create GitHub Tag
+    #   if: github.event_name != 'pull_request'
+    #   run: |
+    #     git config --local user.email "[email protected]"
+    #     git config --local user.name "GitHub Action"
+    #     git tag ${{ steps.taggerRun.outputs.new_tag }}-${{ env.IMAGE_TAG }}
+    #     git push origin ${{ steps.taggerRun.outputs.new_tag }}-${{ env.IMAGE_TAG }}        
 
-    - name: Create GitHub Tag
+    - name: Create GitHub Release with zipped binaries
       if: github.event_name != 'pull_request'
       run: |
-        git config --local user.email "[email protected]"
-        git config --local user.name "GitHub Action"
-        git tag ${{ env.IMAGE_TAG }}
-        git push origin ${{ env.IMAGE_TAG }}        
+          gh release create ${{ steps.taggerRun.outputs.new_tag }}-${{ env.IMAGE_TAG }} hyperfridge-${{ env.IMAGE_TAG }}-${{ steps.taggerRun.outputs.new_tag }}.zip --title "Release Version ${{ steps.taggerRun.outputs.new_tag }} Image ID:${{ env.IMAGE_TAG }}"
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["host", "methods"]
+members = ["host", "methods", "verifier"]
 
 # Always optimize; building and running the guest takes much longer without optimization.
 [profile.dev]

Dockerfile

@@ -6,19 +6,34 @@ RUN cargo risczero install
 
 COPY data data
 COPY host host
+COPY verifier verifier
 COPY methods methods
 COPY Cargo.toml /
 COPY rust-toolchain.toml /
 
+# create directory holding generated Id of Computation which will be proved. 
 WORKDIR /host
 RUN mkdir out; touch out/test.touch
-RUN RUST_BACKTRACE=1 RISC0_DEV_MODE=true cargo test  -- --nocapture
+RUN ls -la
 
-WORKDIR /methods/guest
-RUN RUST_BACKTRACE=1 RISC0_DEV_MODE=true cargo test --features debug_mode -- --nocapture
+WORKDIR /
+RUN RUST_BACKTRACE=1 RISC0_DEV_MODE=true cargo build --release 
+# creates fake proof for test data, so that calling "verifier" without parameters works
+RUN RUST_BACKTRACE=1 RISC0_DEV_MODE=true cargo test  --release -- --nocapture
 
-RUN ls -la /host
+# Final Stage - Alpine Image
+FROM alpine:latest as run
 
-#COPY host/out host/out
+# add glibc 
+RUN apk --no-cache add ca-certificates libgcc gcompat
 
-CMD ["RUST_BACKTRACE=1 RISC0_DEV_MODE=true cargo run  -- --nocapture "]
+# Copy the compiled binaries from the build stage
+COPY --from=build /target/release/host /app/host
+COPY --from=build /target/release/verifier /app/verifier
+COPY --from=build /target/riscv-guest/riscv32im-risc0-zkvm-elf/release/hyperfridge /app/hyperfridge
+COPY --from=build /host/out/IMAGE_ID.hex /app/IMAGE_ID.hex
+COPY --from=build /data /data
+
+WORKDIR /app
+
+CMD ["./verifier"]

README2.md

@@ -1,15 +1,21 @@
+# Todos
+
+- check for libs, eg. serde is double
+- use risc0 sha --> check for more
+- Paper: plug-in TradFi assets like Fiat accounts, and portfolios. Sepa, Indian, british
+
 # How to run with test data
 
 ```bash
 cd host
 RUST_BACKTRACE=1 RISC0_DEV_MODE=true cargo build  -- 
+RUST_BACKTRACE=1 RISC0_DEV_MODE=true cargo build  --release -- 
 RUST_BACKTRACE=1 RISC0_DEV_MODE=true cargo test  --
 RUST_BACKTRACE=1 RISC0_DEV_MODE=true cargo test  -- --nocapture
-RUST_BACKTRACE=1 cargo run  -- ../data/test/test.xml ../data/bank_public.pem ../data/client.pem  
-
+RUST_BACKTRACE=1 RISC0_DEV_MODE=true cargo run  -- ../data/test/test.xml ../data/bank_public.pem ../data/client.pem 
 ```
 
-Run tests for verifier - need to enable main function with feature flag:
+Run tests for verifier - need to enable main function with feature flag, use RUST_LOG="executor=info" as needed.  
 
 ```bash
 cd methods/guest
@@ -18,9 +24,13 @@ RUST_BACKTRACE=1 RISC0_DEV_MODE=true cargo test --features debug_mode
 RUST_BACKTRACE=1 RISC0_DEV_MODE=true cargo test --features debug_mode -- --nocapture
 ```
 
-RUST_LOG="executor=info"
-
+When pushing run clippy and fmt: 
 
+```bash
+cargo fmt --all
+cargo fmt --all -- --check
+RISC0_SKIP_BUILD=true  cargo clippy
+```
 
 Generate coverage data