Merge commit 'a73b3288e42f1506af8162f26225a820ced966f9' as 'depend/zc…

…ash'

depend/zcash/.cargo/config.offline

@@ -0,0 +1,8 @@
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
+
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+# The directory for this source is set to RUST_VENDORED_SOURCES by src/Makefile.am

depend/zcash/.editorconfig

@@ -0,0 +1,17 @@
+# This configures basic cross-editor formatting.
+#
+# See https://editorconfig.org/ for more info, and to see if your editor
+# requires a plugin to take advantage of it.
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{Makefile*, *.mk}]
+indent_style = tab

depend/zcash/.gitattributes

@@ -0,0 +1 @@
+src/clientversion.cpp export-subst

depend/zcash/.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,65 @@
+---
+name: Bug report
+about: Create a report about a bug in zcashd.
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+<!--
+This issue tracker is only for technical issues related to zcashd.
+
+General Zcash questions and/or support requests and are best directed to the
+Zcash Forum: https://forum.zcashcommunity.com/
+
+For reporting security vulnerabilities or for sensitive discussions with our
+security team, please email [email protected] . You can use this GPG key to send
+an encrypted message:
+    https://z.cash/gpg-pubkeys/security.asc
+    fingerprint: AF85 0445 546C 18B7 86F9  2C62 88FB 8B86 D8B5 A68C
+
+The key and fingerprint are duplicated on our Public Keys page:
+https://z.cash/support/pubkeys.html
+-->
+
+### Describe the issue
+Please provide a general summary of the issue you're experiencing
+
+### Can you reliably reproduce the issue?
+#### If so, please list the steps to reproduce below:
+1. 
+2. 
+3. 
+
+### Expected behaviour
+Tell us what should happen
+
+### Actual behaviour + errors
+Tell us what happens instead including any noticeable error output (any messages
+displayed on-screen when e.g. a crash occurred)
+
+### The version of Zcash you were using:
+Run `zcashd --version` to find out
+
+### Machine specs:
+- OS name + version:
+- CPU:
+- RAM:
+- Disk size:
+- Disk Type (HD/SDD):
+- Linux kernel version (uname -a):
+- Compiler version (gcc --version):
+- Linker version (ld -v):
+- Assembler version (as --version):
+
+### Any extra information that might be useful in the debugging process.
+This includes the relevant contents of `~/.zcash/debug.log`. You can paste raw
+text, attach the file directly in the issue or link to the text via a pastebin
+type site. Please also include any non-standard things you did during
+compilation (extra flags, dependency version changes etc.) if applicable.
+
+### Do you have a backup of `~/.zcash` directory and/or take a VM snapshot?
+- Backing up / making a copy of the `~/.zcash` directory might help make the
+  problem reproducible. Please redact appropriately.
+- Taking a VM snapshot is really helpful for interactively testing fixes

depend/zcash/.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Suggest an idea for zcashd.
+title: ''
+labels: 'use case'
+assignees: ''
+
+---
+
+## Is your feature request related to a problem? Please describe.
+A clear and concise description of what the problem is. Example: I'm always
+frustrated when [...]
+
+## Describe the solution you'd like
+A clear and concise description of what you want to happen.
+
+## Alternatives you've considered
+A clear and concise description of any alternative solutions or features you've
+considered.
+
+## Additional context
+Add any other context or screenshots about the feature request here.

depend/zcash/.github/ISSUE_TEMPLATE/ux-report.md

@@ -0,0 +1,17 @@
+---
+name: UX report
+about: Was zcashd hard to use? It's not you, it's us. We want to hear about it.
+title: 'UX: '
+labels: 'usability'
+assignees: ''
+
+---
+
+<!-- Did zcashd not do what you expected?
+Was it hard to figure out how to do something?
+Could an error message be more helpful?
+It's not you, it's us. We want to hear about it. -->
+
+## What were you trying to do
+
+## What happened

depend/zcash/.github/dependabot.yml

@@ -0,0 +1,14 @@
+version: 2
+updates:
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    timezone: Etc/UTC
+  open-pull-requests-limit: 10
+  reviewers:
+  - str4d
+  assignees:
+  - str4d
+  labels:
+  - "A-CI"

depend/zcash/.github/workflows/audits.yml

@@ -0,0 +1,18 @@
+name: Audits
+
+on: [push, pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  cargo-vet:
+    name: Vet Rust dependencies
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@stable
+        id: toolchain
+      - run: rustup override set ${{steps.toolchain.outputs.name}}
+      - run: cargo install cargo-vet --version ~0.6
+      - run: cargo vet --locked

depend/zcash/.github/workflows/book.yml

@@ -0,0 +1,33 @@
+name: zcashd book
+
+on:
+  push:
+    branches:
+      - master
+
+permissions: {}
+jobs:
+  deploy:
+    permissions:
+      contents: write # to push pages branch (peaceiris/actions-gh-pages)
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup mdBook
+        uses: peaceiris/actions-mdbook@v1
+        with:
+          mdbook-version: 'latest'
+
+      - name: Install mdbook-katex
+        run: cargo install mdbook-katex
+
+      - name: Build zcashd book
+        run: mdbook build doc/book/
+
+      - name: Deploy to GitHub Pages
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./doc/book/book

depend/zcash/.github/workflows/checks.yml

@@ -0,0 +1,45 @@
+name: Checks
+
+on: pull_request_target
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
+jobs:
+  recent-base:
+    name: Branch base is sufficiently recent
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the base branch
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Check out the PR branch
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+          fetch-depth: 0
+
+      - name: Ensure branch contains necessary commits for Tekton CI
+        id: tekton
+        # https://github.com/zcash/zcash/pull/6358
+        run: git merge-base --is-ancestor 267ddf8efe36cc799c4c31772a8883ea332ef55b ${{ github.head_ref }}
+
+      - name: Tell PR author if they need to rebase
+        if: failure() && steps.tekton.outcome == 'failure'
+        run: echo "::error::Branch needs to be rebased so that Tekton CI can run"
+
+      - name: Avoid running Tekton CI if it would provably fail
+        if: failure() && steps.tekton.outcome == 'failure'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            github.rest.issues.removeLabel({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              name: "safe-to-build",
+            })

depend/zcash/.github/workflows/lints.yml

@@ -0,0 +1,94 @@
+name: Lints
+
+# We only run these lints on trial-merges of PRs to reduce noise.
+on: pull_request
+
+jobs:
+  commit-script-check:
+    name: Scripted diffs
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Check scripted diffs
+        run: ./test/lint/commit-script-check.sh ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
+
+  general-lints:
+    name: General
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install dependencies
+        run: sudo python3 -m pip install yq
+
+      - name: Cargo patches
+        run: ./test/lint/lint-cargo-patches.sh
+        if: always()
+
+      - name: Include guards
+        run: ./test/lint/lint-include-guards.sh
+        if: always()
+
+      - name: Includes
+        run: ./test/lint/lint-includes.sh
+        if: always()
+
+      - name: Locale dependence
+        run: ./test/lint/lint-locale-dependence.sh
+        if: always()
+        continue-on-error: true # Temporary until we get this passing
+
+      - name: Shebang
+        run: ./test/lint/lint-shebang.sh
+        if: always()
+        continue-on-error: true # Temporary until we get this passing
+
+      - name: Shell locale
+        run: ./test/lint/lint-shell-locale.sh
+        if: always()
+        continue-on-error: true # Temporary until we get this passing
+
+      - name: Shellcheck
+        run: ./test/lint/lint-shell.sh
+        if: always()
+
+      - name: Whitespace
+        run: ./test/lint/lint-whitespace.sh
+        if: always()
+
+  python:
+    name: Python
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install dependencies
+        run: sudo python3 -m pip install pyflakes
+
+      - name: Pyflakes
+        run: pyflakes qa src zcutil
+        if: always()
+
+      - name: UTF-8 encoding
+        run: ./test/lint/lint-python-utf8-encoding.sh
+        if: always()
+
+  rust-clippy:
+    name: Clippy (MSRV)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run clippy
+        uses: actions-rs/clippy-check@v1
+        with:
+          name: Clippy (MSRV)
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --all-features --all-targets -- -D warnings
+
+  rustfmt:
+    name: Rustfmt
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: cargo fmt -- --check