Zsa integration diff

.cargo/config.offline

@@ -4,5 +4,15 @@ linker = "aarch64-linux-gnu-gcc"
 [source.crates-io]
 replace-with = "vendored-sources"
 
+[source."https://github.com/QED-it/librustzcash"]
+git = "https://github.com/QED-it/librustzcash"
+rev = "b35afbce395ada0c3d62373ffa12f7a7e4f82e81"
+replace-with = "vendored-sources"
+
+[source."https://github.com/QED-it/orchard"]
+git = "https://github.com/QED-it/orchard"
+rev = "3518629964805c46598c7ccc4764ea6f42fbd5c5"
+replace-with = "vendored-sources"
+
 [source.vendored-sources]
 # The directory for this source is set to RUST_VENDORED_SOURCES by src/Makefile.am

.circleci/config.yml

@@ -0,0 +1,48 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine.
+# See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+
+# Define a job to be invoked later in a workflow.
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+jobs:
+  build:
+    # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
+    # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
+    docker:
+      - image: cimg/base:2022.03
+    # Add steps to the job
+    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
+    steps:
+      - checkout
+      - run:
+          name: "Build all"
+          command: | 
+            ls -l;
+            pwd;
+            sudo apt update && sudo apt install libncurses5 automake libtool bsdmainutils;
+            CONFIGURE_FLAGS=--enable-online-rust ./zcutil/build.sh -j8
+#            ./zcutil/build.sh -j8
+      - run:
+          name: Compress Artifacts
+          command: tar -cvzf zcashd-artifact.tar ./src/zcashd ./src/zcash-cli ./src/zcashd-wallet-tool ./src/zcash-tx
+
+      - store_artifacts:
+          path: /home/circleci/project/zcashd-artifact.tar
+
+#      - run:
+#          name: "gtest all"
+#          command: |
+#            ./src/zcash-gtest --gtest_break_on_failure
+#
+#      - run:
+#          name: "python tests all"
+#          command: |
+#            ./qa/pull-tester/rpc-tests.py
+
+
+# Invoke jobs via workflows
+# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
+workflows:
+  build-workflow:
+    jobs:
+      - build

.editorconfig

@@ -12,3 +12,6 @@ indent_size = 4
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[{Makefile*, *.mk}]
+indent_style = tab

.github/workflows/audits.yml

@@ -11,20 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-
-      - name: Install cargo-vet
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: cargo-vet
-
-      - name: Run cargo vet --locked
-        uses: actions-rs/cargo@v1
-        with:
-          command: vet
-          args: --locked
+      - 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

.github/workflows/book.yml

@@ -21,10 +21,7 @@ jobs:
           mdbook-version: 'latest'
 
       - name: Install mdbook-katex
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: mdbook-katex
+        run: cargo install mdbook-katex
 
       - name: Build zcashd book
         run: mdbook build doc/book/

.github/workflows/build.yml

@@ -0,0 +1,117 @@
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: Tier ${{ matrix.tier }} platform ${{ matrix.platform }}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.tier == 3 }}
+    strategy:
+      matrix:
+        include:
+          - name: ubuntu-20.04
+            tier: 1
+            platform: Ubuntu 20.04
+            os: ubuntu-20.04
+
+          - name: ubuntu-22.04
+            tier: 3
+            platform: Ubuntu 22.04
+            os: ubuntu-22.04
+
+          - name: macos-11
+            tier: 3
+            platform: macOS Big Sur 11
+            os: macos-11
+            brew_deps: >
+              autoconf
+              automake
+              coreutils
+              libtool
+              pkgconfig
+
+          - name: mingw32
+            tier: 3
+            platform: Windows (64-bit MinGW)
+            os: ubuntu-latest
+            cross_deps: >
+              mingw-w64
+            host: HOST=x86_64-w64-mingw32
+
+          - name: aarch64-linux
+            tier: 3
+            platform: ARM64 Linux
+            os: ubuntu-latest
+            cross_deps: >
+              g++-aarch64-linux-gnu
+            host: HOST=aarch64-linux-gnu
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install Homebrew build dependencies
+        if: matrix.brew_deps != ''
+        run: brew install ${{ matrix.brew_deps }}
+
+      - name: Install cross-compilation build dependencies
+        if: matrix.cross_deps != ''
+        run: sudo apt install ${{ matrix.cross_deps }}
+
+      - name: Configure MinGW to use POSIX variant
+        if: matrix.name == 'mingw32'
+        run: |
+          sudo update-alternatives --set x86_64-w64-mingw32-gcc $(update-alternatives --query x86_64-w64-mingw32-gcc | grep Alternative | grep posix | cut -d' ' -f2)
+          sudo update-alternatives --set x86_64-w64-mingw32-g++ $(update-alternatives --query x86_64-w64-mingw32-g++ | grep Alternative | grep posix | cut -d' ' -f2)
+
+      - name: Cache built dependencies
+        uses: actions/cache@v3
+        with:
+          path: depends/built
+          key: ${{ matrix.name }}-built-${{ hashFiles('depends/Makefile', 'depends/funcs.mk') }}-${{ hashFiles('depends/packages/*.mk', 'depends/patches/**/*') }}
+          restore-keys: |
+            ${{ matrix.name }}-built-${{ hashFiles('depends/Makefile', 'depends/funcs.mk') }}-
+
+      - name: Prepare ccache timestamp
+        id: ccache_cache_timestamp
+        shell: bash
+        run: echo "timestamp=$(date +'%Y-%m-%d-%H;%M;%S')" >> "$GITHUB_OUTPUT"
+
+      - name: Cache ccache files
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/ccache
+          key: ${{ matrix.name }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
+          restore-keys: |
+            ${{ matrix.name }}-ccache-
+
+      - name: Build zcashd
+        id: build
+        run: >
+          ${{ matrix.host }}
+          ./zcutil/build.sh
+          -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)"
+
+      - name: Build zcashd with libraries enabled
+        if: ${{ always() && steps.build.outcome == 'success' }}
+        run: >
+          CONFIGURE_FLAGS="--with-libs"
+          ${{ matrix.host }}
+          ./zcutil/build.sh
+          -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)"
+
+      - name: Build zcashd with wallet disabled
+        if: ${{ always() && steps.build.outcome == 'success' }}
+        run: >
+          CONFIGURE_FLAGS="--disable-wallet"
+          ${{ matrix.host }}
+          ./zcutil/build.sh
+          -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)"
+
+      - name: Build zcashd with mining disabled
+        if: ${{ always() && steps.build.outcome == 'success' }}
+        run: >
+          CONFIGURE_FLAGS="--disable-mining"
+          ${{ matrix.host }}
+          ./zcutil/build.sh
+          -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)"

.github/workflows/lints.yml

@@ -75,19 +75,14 @@ jobs:
         if: always()
 
   rust-clippy:
-    name: Clippy (1.64.0)
+    name: Clippy (MSRV)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: 1.64.0
-          components: clippy
-          override: true
       - name: Run clippy
         uses: actions-rs/clippy-check@v1
         with:
-          name: Clippy (1.64.0)
+          name: Clippy (MSRV)
           token: ${{ secrets.GITHUB_TOKEN }}
           args: --all-features --all-targets -- -D warnings
 
@@ -96,12 +91,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: 1.64.0
-          override: true
-      - run: rustup component add rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: -- --check
+      - run: cargo fmt -- --check

.gitignore

@@ -44,7 +44,6 @@ confdefs.h
 conftest.cpp
 conftest.err
 
-cache/
 venv-mnf/
 src/univalue/gen
 
@@ -130,3 +129,5 @@ src/fuzzing/*/output
 src/fuzz.cpp
 
 .updatecheck-token
+.env
+poetry.lock

COPYING

@@ -1,6 +1,6 @@
-Copyright (c) 2016-2022 The Zcash developers
-Copyright (c) 2009-2022 The Bitcoin Core developers
-Copyright (c) 2009-2022 Bitcoin Developers
+Copyright (c) 2016-2023 The Zcash developers
+Copyright (c) 2009-2023 The Bitcoin Core developers
+Copyright (c) 2009-2023 Bitcoin Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal