Merge branch 'main' of github.com:ZcashFoundation/zebra into main_zai…

…no_changes
ZcashFoundation · Nov 5, 2024 · 40adedc · 40adedc
2 parents 1b5c466 + d7fbde3
commit 40adedc
Show file tree

Hide file tree

Showing 41 changed files with 491 additions and 377 deletions.
diff --git a/.github/workflows/cd-deploy-nodes-gcp.patch-external.yml b/.github/workflows/cd-deploy-nodes-gcp.patch-external.yml
@@ -43,3 +43,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: 'echo "Skipping job on fork"'
+
+  get-disk-name:
+    name: Get disk name
+    runs-on: ubuntu-latest
+    steps:
+      - run: 'echo "Skipping job on fork"'
diff --git a/.github/workflows/cd-deploy-nodes-gcp.patch.yml b/.github/workflows/cd-deploy-nodes-gcp.patch.yml
@@ -52,3 +52,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: 'echo "No build required"'
+
+  get-disk-name:
+    name: Get disk name
+    runs-on: ubuntu-latest
+    steps:
+      - run: 'echo "No build required"'
diff --git a/.github/workflows/cd-deploy-nodes-gcp.yml b/.github/workflows/cd-deploy-nodes-gcp.yml
@@ -242,7 +242,7 @@ jobs:
     if: ${{ !cancelled() && !failure() && ((github.event_name == 'push' && github.ref_name == 'main') || github.event_name == 'release') }}
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
         with:
           persist-credentials: false
 
@@ -265,18 +265,18 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].6
+        uses: google-github-actions/[email protected].7
         with:
           workload_identity_provider: '${{ vars.GCP_WIF }}'
           service_account: '${{ vars.GCP_DEPLOYMENTS_SA }}'
 
       - name: Set up Cloud SDK
-        uses: google-github-actions/[email protected].1
+        uses: google-github-actions/[email protected].2
 
       - name: Create instance template for ${{ matrix.network }}
         run: |
           DISK_NAME="zebrad-cache-${{ env.GITHUB_HEAD_REF_SLUG_URL || env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }}-${NETWORK}"
-          DISK_PARAMS="name=${DISK_NAME},device-name=${DISK_NAME},size=400GB,type=pd-ssd"
+          DISK_PARAMS="name=${DISK_NAME},device-name=${DISK_NAME},size=400GB,type=pd-balanced"
           if [ -n "${{ env.CACHED_DISK_NAME }}" ]; then
             DISK_PARAMS+=",image=${{ env.CACHED_DISK_NAME }}"
           elif [ ${{ inputs.no_cached_disk && github.event_name == 'workflow_dispatch' }} ]; then
@@ -287,8 +287,8 @@ jobs:
           fi
           gcloud compute instance-templates create-with-container zebrad-${{ needs.versioning.outputs.major_version || env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }}-${NETWORK} \
           --machine-type ${{ vars.GCP_SMALL_MACHINE }} \
-          --boot-disk-size 50GB \
-          --boot-disk-type=pd-ssd \
+          --boot-disk-size=10GB \
+          --boot-disk-type=pd-standard \
           --image-project=cos-cloud \
           --image-family=cos-stable \
           --network-interface=subnet=${{ vars.GCP_SUBNETWORK }} \
@@ -353,7 +353,7 @@ jobs:
     if: ${{ !failure() && github.event_name == 'workflow_dispatch' }}
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
         with:
           persist-credentials: false
 
@@ -376,19 +376,19 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].6
+        uses: google-github-actions/[email protected].7
         with:
           workload_identity_provider: '${{ vars.GCP_WIF }}'
           service_account: '${{ vars.GCP_DEPLOYMENTS_SA }}'
 
       - name: Set up Cloud SDK
-        uses: google-github-actions/[email protected].1
+        uses: google-github-actions/[email protected].2
 
       # Create instance template from container image
       - name: Manual deploy of a single ${{ inputs.network }} instance running zebrad
         run: |
           DISK_NAME="zebrad-cache-${{ env.GITHUB_HEAD_REF_SLUG_URL || env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }}-${NETWORK}"
-          DISK_PARAMS="name=${DISK_NAME},device-name=${DISK_NAME},size=400GB,type=pd-ssd"
+          DISK_PARAMS="name=${DISK_NAME},device-name=${DISK_NAME},size=400GB,type=pd-balanced"
           if [ -n "${{ env.CACHED_DISK_NAME }}" ]; then
             DISK_PARAMS+=",image=${{ env.CACHED_DISK_NAME }}"
           elif [ ${{ inputs.no_cached_disk && github.event_name == 'workflow_dispatch' }} ]; then
@@ -399,8 +399,8 @@ jobs:
           fi
           gcloud compute instances create-with-container "zebrad-${{ env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }}-${NETWORK}" \
           --machine-type ${{ vars.GCP_SMALL_MACHINE }} \
-          --boot-disk-size 50GB \
-          --boot-disk-type=pd-ssd \
+          --boot-disk-size=10GB \
+          --boot-disk-type=pd-standard \
           --image-project=cos-cloud \
           --image-family=cos-stable \
           --network-interface=subnet=${{ vars.GCP_SUBNETWORK }} \

diff --git a/.github/workflows/chore-delete-gcp-resources.yml b/.github/workflows/chore-delete-gcp-resources.yml
@@ -39,20 +39,20 @@ jobs:
       contents: 'read'
       id-token: 'write'
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
         with:
           persist-credentials: false
 
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].6
+        uses: google-github-actions/[email protected].7
         with:
           workload_identity_provider: '${{ vars.GCP_WIF }}'
           service_account: '${{ vars.GCP_DEPLOYMENTS_SA }}'
 
       - name: Set up Cloud SDK
-        uses: google-github-actions/[email protected].1
+        uses: google-github-actions/[email protected].2
 
       # Deletes all mainnet and testnet instances older than $DELETE_INSTANCE_DAYS days.
       #
@@ -106,14 +106,14 @@ jobs:
       contents: 'read'
       id-token: 'write'
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
         with:
           persist-credentials: false
 
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].6
+        uses: google-github-actions/[email protected].7
         with:
           workload_identity_provider: '${{ vars.GCP_WIF }}'
           service_account: '${{ vars.GCP_DEPLOYMENTS_SA }}'

diff --git a/.github/workflows/ci-build-crates.patch.yml b/.github/workflows/ci-build-crates.patch.yml
@@ -23,7 +23,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
 
       # Setup Rust with stable toolchain and minimal profile
       - name: Setup Rust

diff --git a/.github/workflows/ci-build-crates.yml b/.github/workflows/ci-build-crates.yml
@@ -60,7 +60,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
       - uses: r7kamura/[email protected]
 
       # Setup Rust with stable toolchain and minimal profile
@@ -122,7 +122,7 @@ jobs:
       matrix: ${{ fromJson(needs.matrix.outputs.matrix) }}
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
         with:
           persist-credentials: false
       - uses: r7kamura/[email protected]

diff --git a/.github/workflows/ci-coverage.yml b/.github/workflows/ci-coverage.yml
@@ -69,7 +69,7 @@ jobs:
     runs-on: ubuntu-latest-xl
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
         with:
           persist-credentials: false
 

diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml
@@ -37,7 +37,7 @@ jobs:
       rust: ${{ steps.changed-files-rust.outputs.any_changed == 'true' }}
       workflows: ${{ steps.changed-files-workflows.outputs.any_changed == 'true' }}
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
         with:
           persist-credentials: false
           fetch-depth: 0
@@ -69,7 +69,7 @@ jobs:
     if: ${{ needs.changed-files.outputs.rust == 'true' }}
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
         with:
           persist-credentials: false
 
@@ -119,7 +119,7 @@ jobs:
     if: ${{ needs.changed-files.outputs.rust == 'true' }}
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
         with:
           persist-credentials: false
       - uses: r7kamura/[email protected]
@@ -149,7 +149,7 @@ jobs:
     needs: changed-files
     if: ${{ needs.changed-files.outputs.workflows == 'true' }}
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
       - name: actionlint
         uses: reviewdog/[email protected]
         with:
@@ -166,7 +166,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: changed-files
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
       - uses: codespell-project/[email protected]
         with:
           only_warn: 1

diff --git a/.github/workflows/ci-unit-tests-os.yml b/.github/workflows/ci-unit-tests-os.yml
@@ -94,7 +94,7 @@ jobs:
             rust: beta
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
         with:
           persist-credentials: false
       - uses: r7kamura/[email protected]
@@ -183,7 +183,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
         with:
           persist-credentials: false
       - uses: r7kamura/[email protected]
@@ -205,7 +205,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
         with:
           persist-credentials: false
       - uses: r7kamura/[email protected]
@@ -248,7 +248,7 @@ jobs:
     continue-on-error: ${{ matrix.checks == 'advisories' }}
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
         with:
           persist-credentials: false
       - uses: r7kamura/[email protected]
@@ -269,7 +269,7 @@ jobs:
 
     steps:
       - name: Checkout git repository
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           persist-credentials: false
       - uses: r7kamura/[email protected]

diff --git a/.github/workflows/docs-deploy-firebase.yml b/.github/workflows/docs-deploy-firebase.yml
@@ -85,14 +85,14 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout the source code
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           persist-credentials: false
 
       - uses: r7kamura/[email protected]
 
       - name: Setup mdBook
-        uses: jontze/[email protected].0
+        uses: jontze/[email protected].1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           mdbook-version: '~0.4'
@@ -106,7 +106,7 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].6
+        uses: google-github-actions/[email protected].7
         with:
           workload_identity_provider: '${{ vars.GCP_WIF }}'
           service_account: '${{ vars.GCP_FIREBASE_SA }}'
@@ -138,7 +138,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout the source code
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           persist-credentials: false
 
@@ -164,7 +164,7 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].6
+        uses: google-github-actions/[email protected].7
         with:
           workload_identity_provider: '${{ vars.GCP_WIF }}'
           service_account: '${{ vars.GCP_FIREBASE_SA }}'

diff --git a/.github/workflows/docs-dockerhub-description.yml b/.github/workflows/docs-dockerhub-description.yml
@@ -17,7 +17,7 @@ jobs:
   dockerHubDescription:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
         with:
           persist-credentials: false
 

diff --git a/.github/workflows/manual-zcashd-deploy.yml b/.github/workflows/manual-zcashd-deploy.yml
@@ -29,7 +29,7 @@ jobs:
       id-token: 'write'
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
         with:
           persist-credentials: false
 
@@ -52,20 +52,20 @@ jobs:
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/[email protected].6
+        uses: google-github-actions/[email protected].7
         with:
           workload_identity_provider: '${{ vars.GCP_WIF }}'
           service_account: '${{ vars.GCP_DEPLOYMENTS_SA }}'
 
       - name: Set up Cloud SDK
-        uses: google-github-actions/[email protected].1
+        uses: google-github-actions/[email protected].2
 
       # Create instance template from container image
       - name: Create instance template
         run: |
           gcloud compute instance-templates create-with-container zcashd-${{ env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }} \
-          --boot-disk-size 10GB \
-          --boot-disk-type=pd-ssd \
+          --boot-disk-size=10GB \
+          --boot-disk-type=pd-standard \
           --image-project=cos-cloud \
           --image-family=cos-stable \
           --container-stdin \

diff --git a/.github/workflows/release-crates-io.yml b/.github/workflows/release-crates-io.yml
@@ -70,7 +70,7 @@ jobs:
       - uses: r7kamura/[email protected]
 
       - name: Checkout git repository
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           persist-credentials: false
 

diff --git a/.github/workflows/scripts/release-crates-dry-run.sh b/.github/workflows/scripts/release-crates-dry-run.sh
@@ -23,8 +23,8 @@ fi
 cargo release version --verbose --execute --no-confirm --allow-branch '*' --workspace --exclude zebrad --exclude zebra-scan --exclude zebra-grpc patch
 
 # Due to a bug in cargo-release, we need to pass exact versions for alpha crates:
-cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebra-scan 0.1.0-alpha.10
-cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebra-grpc 0.1.0-alpha.8
+cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebra-scan 0.1.0-alpha.11
+cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebra-grpc 0.1.0-alpha.9
 
 # Update zebrad:
 cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebrad patch