Improve handling of recursion_zkr.zip (risc0#1367)

* Avoid re-downloading if cached copy is already valid * Copy source from LFS only if file is valid (i.e. LFS has been pulled) * Download from S3 bucket otherwise * Update hash to latest * Fix docs.rs build issue * Fixes risc0#1366 * Fixes risc0#1048 * Supersedes risc0#1347 * Supersedes risc0#1348 * Fixes risc0#1163 Co-authored-by: @weikengchen
IssouChancla · Jan 23, 2024 · 496b2a0 · 496b2a0
1 parent d8c49df
commit 496b2a0
Show file tree

Hide file tree

Showing 38 changed files with 73 additions and 50 deletions.
diff --git a/.github/workflows/bench_applications.yml b/.github/workflows/bench_applications.yml
@@ -59,8 +59,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - if: matrix.feature == 'cuda'
         uses: ./.github/actions/cuda
       - uses: ./.github/actions/rustup

diff --git a/.github/workflows/bench_datasheet.yml b/.github/workflows/bench_datasheet.yml
@@ -60,8 +60,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - if: matrix.feature == 'cuda'
         uses: ./.github/actions/cuda
       - uses: ./.github/actions/rustup

diff --git a/.github/workflows/bench_pr.yml b/.github/workflows/bench_pr.yml
@@ -39,8 +39,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - if: matrix.feature == 'cuda'
         uses: ./.github/actions/cuda
       - uses: ./.github/actions/rustup

diff --git a/.github/workflows/bench_trends.yml b/.github/workflows/bench_trends.yml
@@ -51,8 +51,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - if: matrix.feature == 'cuda'
         uses: ./.github/actions/cuda
       - uses: ./.github/actions/rustup

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -155,8 +155,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - if: matrix.feature == 'cuda'
         uses: ./.github/actions/cuda
       - uses: ./.github/actions/rustup
@@ -232,8 +230,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - if: matrix.feature == 'cuda'
         uses: ./.github/actions/cuda
       - uses: ./.github/actions/rustup
@@ -302,8 +298,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - uses: ./.github/actions/rustup
       - uses: ./.github/actions/sccache
         with:
@@ -351,8 +345,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - uses: browser-actions/setup-firefox@v1
       - run: firefox --version
       - uses: ./.github/actions/rustup
@@ -379,8 +371,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - uses: ./.github/actions/rustup
       - uses: ./.github/actions/sccache
         with:
@@ -402,6 +392,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           lfs: true
+      - run: git lfs pull
       - uses: ./.github/actions/rustup
       - uses: ./.github/actions/sccache
         with:

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -23,8 +23,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - uses: ./.github/actions/rustup
       - name: Set the variables
         env:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           lfs: true
-      - run: git lfs checkout
+      - run: git lfs pull
       - uses: ./.github/actions/rustup
       - uses: ./.github/actions/sccache
         with:

diff --git a/.github/workflows/website-test.yml b/.github/workflows/website-test.yml
@@ -75,7 +75,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          lfs: true
           # Recursive checkout required to build Solidity contracts and bindings.
           submodules: recursive
       - uses: ./.github/actions/rustup

diff --git a/benchmarks/Cargo.lock b/benchmarks/Cargo.lock
diff --git a/bonsai/Cargo.lock b/bonsai/Cargo.lock
diff --git a/bonsai/examples/governance/Cargo.lock b/bonsai/examples/governance/Cargo.lock
diff --git a/bonsai/examples/governance/methods/guest/Cargo.lock b/bonsai/examples/governance/methods/guest/Cargo.lock
diff --git a/examples/Cargo.lock b/examples/Cargo.lock
diff --git a/examples/bevy/methods/guest/Cargo.lock b/examples/bevy/methods/guest/Cargo.lock
diff --git a/examples/chess/methods/guest/Cargo.lock b/examples/chess/methods/guest/Cargo.lock
diff --git a/examples/composition/methods/guest/Cargo.lock b/examples/composition/methods/guest/Cargo.lock
diff --git a/examples/digital-signature/methods/guest/Cargo.lock b/examples/digital-signature/methods/guest/Cargo.lock
diff --git a/examples/ecdsa/methods/guest/Cargo.lock b/examples/ecdsa/methods/guest/Cargo.lock
diff --git a/examples/groth16-verifier/methods/guest/Cargo.lock b/examples/groth16-verifier/methods/guest/Cargo.lock
diff --git a/examples/hello-world/methods/guest/Cargo.lock b/examples/hello-world/methods/guest/Cargo.lock
diff --git a/examples/json/methods/guest/Cargo.lock b/examples/json/methods/guest/Cargo.lock
diff --git a/examples/jwt-validator/methods/guest/Cargo.lock b/examples/jwt-validator/methods/guest/Cargo.lock
diff --git a/examples/password-checker/methods/guest/Cargo.lock b/examples/password-checker/methods/guest/Cargo.lock
diff --git a/examples/profiling/methods/guest/Cargo.lock b/examples/profiling/methods/guest/Cargo.lock
diff --git a/examples/prorata/methods/guest/Cargo.lock b/examples/prorata/methods/guest/Cargo.lock
diff --git a/examples/sha/methods/guest/Cargo.lock b/examples/sha/methods/guest/Cargo.lock
diff --git a/examples/smartcore-ml/methods/guest/Cargo.lock b/examples/smartcore-ml/methods/guest/Cargo.lock
diff --git a/examples/voting-machine/methods/guest/Cargo.lock b/examples/voting-machine/methods/guest/Cargo.lock
diff --git a/examples/waldo/methods/guest/Cargo.lock b/examples/waldo/methods/guest/Cargo.lock
diff --git a/examples/wasm/methods/guest/Cargo.lock b/examples/wasm/methods/guest/Cargo.lock
diff --git a/examples/wordle/methods/guest/Cargo.lock b/examples/wordle/methods/guest/Cargo.lock
diff --git a/examples/xgboost/methods/guest/Cargo.lock b/examples/xgboost/methods/guest/Cargo.lock
diff --git a/examples/zkevm-demo/methods/guest/Cargo.lock b/examples/zkevm-demo/methods/guest/Cargo.lock
diff --git a/risc0/circuit/recursion/Cargo.toml b/risc0/circuit/recursion/Cargo.toml
@@ -38,6 +38,7 @@ downloader = { version = "0.2", default-features = false, features = [
   "rustls-tls",
   "verify",
 ], optional = true }
+hex = "0.4"
 sha2 = { version = "0.10", optional = true }
 
 [features]