Merge branch 'main' into chore/allow-crater-runs

ZcashFoundation · Feb 22, 2024 · 8b0cfa6 · 8b0cfa6
2 parents c9e2bad + 9167093
commit 8b0cfa6
Show file tree

Hide file tree

Showing 82 changed files with 2,935 additions and 924 deletions.
diff --git a/.github/workflows/cd-deploy-nodes-gcp.yml b/.github/workflows/cd-deploy-nodes-gcp.yml
@@ -226,7 +226,7 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].0
+        uses: google-github-actions/[email protected].1
         with:
           retries: '3'
           workload_identity_provider: '${{ vars.GCP_WIF }}'
@@ -328,7 +328,7 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].0
+        uses: google-github-actions/[email protected].1
         with:
           retries: '3'
           workload_identity_provider: '${{ vars.GCP_WIF }}'

diff --git a/.github/workflows/chore-delete-gcp-resources.yml b/.github/workflows/chore-delete-gcp-resources.yml
@@ -46,7 +46,7 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].0
+        uses: google-github-actions/[email protected].1
         with:
           retries: '3'
           workload_identity_provider: '${{ vars.GCP_WIF }}'
@@ -114,7 +114,7 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].0
+        uses: google-github-actions/[email protected].1
         with:
           retries: '3'
           workload_identity_provider: '${{ vars.GCP_WIF }}'

diff --git a/.github/workflows/ci-coverage.yml b/.github/workflows/ci-coverage.yml
@@ -103,4 +103,4 @@ jobs:
         run: cargo llvm-cov --lcov --no-run --output-path lcov.info
 
       - name: Upload coverage report to Codecov
-        uses: codecov/codecov-action@v3.1.6
+        uses: codecov/codecov-action@v4.0.1
diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml
@@ -44,7 +44,7 @@ jobs:
 
       - name: Rust files
         id: changed-files-rust
-        uses: tj-actions/[email protected].2
+        uses: tj-actions/[email protected].4
         with:
           files: |
             **/*.rs
@@ -56,7 +56,7 @@ jobs:
 
       - name: Workflow files
         id: changed-files-workflows
-        uses: tj-actions/[email protected].2
+        uses: tj-actions/[email protected].4
         with:
           files: |
             .github/workflows/*.yml

diff --git a/.github/workflows/ci-unit-tests-os.yml b/.github/workflows/ci-unit-tests-os.yml
@@ -281,7 +281,7 @@ jobs:
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=stable --profile=minimal
 
       - name: Install cargo-machete
-        uses: baptiste0928/cargo-install@v2.2.0
+        uses: baptiste0928/cargo-install@v3.0.0
         with:
           crate: cargo-machete
 

diff --git a/.github/workflows/docs-deploy-firebase.yml b/.github/workflows/docs-deploy-firebase.yml
@@ -106,7 +106,7 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].0
+        uses: google-github-actions/[email protected].1
         with:
           retries: '3'
           workload_identity_provider: '${{ vars.GCP_WIF }}'
@@ -165,7 +165,7 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].0
+        uses: google-github-actions/[email protected].1
         with:
           retries: '3'
           workload_identity_provider: '${{ vars.GCP_WIF }}'

diff --git a/.github/workflows/manual-zcashd-deploy.yml b/.github/workflows/manual-zcashd-deploy.yml
@@ -52,7 +52,7 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].0
+        uses: google-github-actions/[email protected].1
         with:
           retries: '3'
           workload_identity_provider: '${{ vars.GCP_WIF }}'

diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
@@ -18,15 +18,15 @@ jobs:
   # Each time this workflow is executed, a build will be triggered to create a new image
   # with the corresponding tags using information from git
 
-  # The image will be named `zebra:<semver>.experimental`
+  # The image will be named `zebra:<semver>-experimental`
   build-experimental:
     name: Build Experimental Features Release Docker
     uses: ./.github/workflows/sub-build-docker-image.yml
     with:
       dockerfile_path: ./docker/Dockerfile
       dockerfile_target: runtime
       image_name: zebra
-      tag_suffix: .experimental
+      tag_suffix: -experimental
       features: ${{ format('{0} {1}', vars.RUST_PROD_FEATURES, vars.RUST_EXPERIMENTAL_FEATURES) }}
       rust_log: ${{ vars.RUST_LOG }}
     # This step needs access to Docker Hub secrets to run successfully

diff --git a/.github/workflows/release-crates-io.yml b/.github/workflows/release-crates-io.yml
@@ -85,7 +85,7 @@ jobs:
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=stable --profile=minimal
 
       - name: Install cargo-release
-        uses: baptiste0928/cargo-install@v2.2.0
+        uses: baptiste0928/cargo-install@v3.0.0
         with:
           crate: cargo-release
 

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Drafts your next Release notes
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v6
         with:
           config-name: release-drafter.yml
           commitish: main

diff --git a/.github/workflows/sub-build-docker-image.yml b/.github/workflows/sub-build-docker-image.yml
@@ -103,23 +103,14 @@ jobs:
           tags: |
             # These DockerHub release tags support the following use cases:
             # - `latest`: always use the latest Zebra release when you pull or update
-            # - `1`: use the latest Zebra release, but require manual intervention for the next network upgrade
-            # - `1.x`: update to bug fix releases, but don't add any new features or incompatibilities
             # - `v1.x.y` or `1.x.y`: always use the exact version, don't automatically upgrade
-            # - `sha-zzzzzz`: always use the exact commit (the same as `1.x.y`, but also used in CI and production image tests)
-            #
-            # Stopping publishing some tags is a silently breaking change:
-            # - `1`: doesn't get expected new consensus-compatible releases or bug fixes
-            # - `1.x`: doesn't get expected bug fixes
             #
             # `semver` adds a "latest" tag if `inputs.latest_tag` is `true`.
             type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
             type=ref,event=tag
             # DockerHub release and CI tags.
             # This tag makes sure tests are using exactly the right image, even when multiple PRs run at the same time.
-            type=sha
+            type=sha,event=push
             # These CI-only tags support CI on PRs, the main branch, and scheduled full syncs. 
             # These tags do not appear on DockerHub, because DockerHub images are only published on the release event.
             type=ref,event=pr
@@ -134,7 +125,7 @@ jobs:
 
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].0
+        uses: google-github-actions/[email protected].1
         with:
           retries: '3'
           workload_identity_provider: '${{ vars.GCP_WIF }}'

diff --git a/.github/workflows/sub-build-lightwalletd.yml b/.github/workflows/sub-build-lightwalletd.yml
@@ -111,7 +111,7 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].0
+        uses: google-github-actions/[email protected].1
         with:
           retries: '3'
           workload_identity_provider: '${{ vars.GCP_WIF }}'

diff --git a/.github/workflows/sub-deploy-integration-tests-gcp.yml b/.github/workflows/sub-deploy-integration-tests-gcp.yml
@@ -136,7 +136,7 @@ jobs:
 
       # Install our SSH secret
       - name: Install private SSH key
-        uses: shimataro/ssh-key-action@v2.6.1
+        uses: shimataro/ssh-key-action@v2.7.0
         with:
           key: ${{ secrets.GCP_SSH_PRIVATE_KEY }}
           name: google_compute_engine
@@ -150,7 +150,7 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].0
+        uses: google-github-actions/[email protected].1
         with:
           retries: '3'
           workload_identity_provider: '${{ vars.GCP_WIF }}'
@@ -197,7 +197,7 @@ jobs:
           echo "cached_disk_name=${CACHED_DISK_NAME}" >> "${GITHUB_OUTPUT}"
           echo "STATE_VERSION=${LOCAL_STATE_VERSION}" >> "${GITHUB_ENV}"
           echo "CACHED_DISK_NAME=${CACHED_DISK_NAME}" >> "${GITHUB_ENV}"
-          echo "DISK_OPTION=image=${CACHED_DISK_NAME}" >> "${GITHUB_ENV}"
+          echo "DISK_OPTION=image=$CACHED_DISK_NAME," >> "${GITHUB_ENV}"
 
 
       # Create a Compute Engine virtual machine and attach a cached state disk using the
@@ -212,7 +212,7 @@ jobs:
           --boot-disk-type pd-ssd \
           --image-project=cos-cloud \
           --image-family=cos-stable \
-          --create-disk=${DISK_OPTION},name="${{ inputs.test_id }}-${{ env.GITHUB_SHA_SHORT }}",device-name="${{ inputs.test_id }}-${{ env.GITHUB_SHA_SHORT }}",size=400GB,type=pd-ssd \
+          --create-disk=${DISK_OPTION}name="${{ inputs.test_id }}-${{ env.GITHUB_SHA_SHORT }}",device-name="${{ inputs.test_id }}-${{ env.GITHUB_SHA_SHORT }}",size=400GB,type=pd-ssd \
           --container-image=gcr.io/google-containers/busybox \
           --machine-type ${{ vars.GCP_LARGE_MACHINE }} \
           --network-interface=subnet=${{ vars.GCP_SUBNETWORK }} \
@@ -433,7 +433,7 @@ jobs:
 
       # Install our SSH secret
       - name: Install private SSH key
-        uses: shimataro/ssh-key-action@v2.6.1
+        uses: shimataro/ssh-key-action@v2.7.0
         with:
           key: ${{ secrets.GCP_SSH_PRIVATE_KEY }}
           name: google_compute_engine
@@ -447,7 +447,7 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].0
+        uses: google-github-actions/[email protected].1
         with:
           workload_identity_provider: '${{ vars.GCP_WIF }}'
           service_account: '${{ vars.GCP_DEPLOYMENTS_SA }}'
@@ -724,7 +724,7 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].0
+        uses: google-github-actions/[email protected].1
         with:
           workload_identity_provider: '${{ vars.GCP_WIF }}'
           service_account: '${{ vars.GCP_DEPLOYMENTS_SA }}'

diff --git a/.github/workflows/sub-find-cached-disks.yml b/.github/workflows/sub-find-cached-disks.yml
@@ -45,7 +45,7 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].0
+        uses: google-github-actions/[email protected].1
         with:
           retries: '3'
           workload_identity_provider: '${{ vars.GCP_WIF }}'

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -3,7 +3,6 @@
 * [Running and Debugging](#running-and-debugging)
 * [Bug Reports](#bug-reports)
 * [Pull Requests](#pull-requests)
-* [Zebra RFCs](#zebra-rfcs)
 
 ## Running and Debugging
 [running-and-debugging]: #running-and-debugging
@@ -49,40 +48,3 @@ to the "re-run jobs" button on the `Coverage (+nightly)` CI job's tab
 
 To access a report download and extract the zip artifact then open the top
 level `index.html`.
-
-## Zebra RFCs
-[zebra-rfcs]: #zebra-rfcs
-
-Significant changes to the Zebra codebase are planned using Zebra RFCs. These
-allow structured discussion about a proposed change and provide a record of
-the planned design.
-
-To make a Zebra RFC:
-
-1. Choose a short feature name like `my-feature`.
-
-2. Copy the `book/src/dev/rfcs/0000-template.md` file to
-`book/src/dev/rfcs/drafts/xxxx-my-feature.md`.
-
-3. Edit the template header to add the feature name and the date, but leave
-the other fields blank for now.
-
-4. Write the design! The template has a suggested list of sections that are a
-useful guide.
-
-5. Create an design PR using the RFC template.
-
-6. After creating an RFC PR, update the RFC header and the PR description
-with the PR number.
-
-7. Make changes to the RFC in collaboration with the Zebra team.
-
-8. When the RFC is merged, take the next available RFC number (not conflicting
-with any existing RFCs or design PRs) and name the RFC file accordingly, e.g.,
-`0027-my-feature.md` for number 27.
-
-9. Make sure that `book/src/SUMMARY.md` links to the new number for the RFC.
-
-10. After the RFC is accepted, create an issue for the implementation of the
-design, and update the RFC header and PR description with the implementation
-issue number.