ZSA synced with the upstream v4.2.0

.cargo/config.toml

@@ -3,6 +3,12 @@
 # Flags that apply to all Zebra crates and configurations
 [target.'cfg(all())']
 rustflags = [
+    # Enable tx_v6 everywhere by default
+    "--cfg", 'feature="tx_v6"',
+
+    # TODO: Remove when ZSA is stable
+    "--cfg", "zcash_unstable=\"nu7\"",
+
     # Zebra standard lints for Rust 1.65+
 
     # High-risk code
@@ -82,6 +88,12 @@ rustflags = [
 
 [build]
 rustdocflags = [
+    # Enable tx_v6 everywhere by default
+    "--cfg", 'feature="tx_v6"',
+
+    # TODO: Remove when ZSA is stable
+    "--cfg", "zcash_unstable=\"nu7\"",
+
     # The -A and -W settings must be the same as the `RUSTDOCFLAGS` in:
     # https://github.com/ZcashFoundation/zebra/blob/main/.github/workflows/docs-deploy-firebase.yml#L68
 

.dockerignore

@@ -22,4 +22,4 @@
 !zebra-*
 !zebrad
 !docker/entrypoint.sh
-!docker/default-zebra-config.toml
+!testnet-single-node-deploy

.github/workflows/ci-basic.yml

@@ -0,0 +1,67 @@
+name: Basic checks
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        nu7:
+          - true
+          - false
+
+    env:
+      # Use system-installed RocksDB library instead of building from scratch
+      ROCKSDB_LIB_DIR: /usr/lib
+      # Use system-installed Snappy library for compression in RocksDB
+      SNAPPY_LIB_DIR: /usr/lib/x86_64-linux-gnu
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Show system resource summary (before cleanup)
+        run: |
+          df -h
+          free -h
+          lscpu | egrep 'Model name|Socket|Thread|Core|CPU\(s\)'
+
+      - name: Free disk space (safe cleanup for Rust CI)
+        run: |
+          # Remove heavy preinstalled SDKs and toolchains
+          sudo rm -rf /usr/local/lib/android || true
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY" || true  # preinstalled tool caches
+          df -h
+
+      - name: Install dependencies on Ubuntu
+        run: sudo apt-get update && sudo apt-get install -y protobuf-compiler librocksdb-dev
+      - name: Install formatting & linting tools
+        run: rustup component add rustfmt clippy
+
+      - name: Verify working directory is clean
+        run: git diff --exit-code
+
+      - name: Strip nu7/tx_v6 flags from config
+        if: ${{ !matrix.nu7 }}
+        run: |
+          sed -i 's|.*"--cfg", .feature="tx_v6".*|# &|' .cargo/config.toml
+          sed -i 's|.*"--cfg", "zcash_unstable=\\"nu7\\"".*|# &|' .cargo/config.toml
+
+      - name: Run tests
+        run: timeout --preserve-status 1h cargo test --verbose --locked
+      - name: Run doc check
+        run: cargo doc --workspace --no-deps --all-features --document-private-items --locked
+      - name: Run format check
+        run: cargo fmt -- --check
+      - name: Run clippy
+        run: cargo clippy --workspace --all-targets --features "default-release-binaries proptest-impl lightwalletd-grpc-tests zebra-checkpoints"
+      - name: Restore cargo config
+        run: git checkout -- .cargo/config.toml
+      - name: Verify working directory is clean
+        run: git diff --exit-code
+
+      - name: Show system resource summary
+        run: |
+          df -h
+          free -h
+          lscpu | egrep 'Model name|Socket|Thread|Core|CPU\(s\)'

.github/workflows/lint.yml

@@ -67,7 +67,8 @@ jobs:
           cache-on-failure: true
       - uses: ./.github/actions/setup-zebra-build
       - name: Run clippy
-        run: cargo clippy ${{ matrix.args }} --features "${{ matrix.features }}"
+        # TODO: Temporary QED-it fork exception for clippy::manual_option_zip; remove before merging this branch upstream.
+        run: cargo clippy ${{ matrix.args }} --features "${{ matrix.features }}" -- -A unknown-lints -A clippy::manual_option_zip
 
   crate-checks:
     permissions:

.github/workflows/tests-unit.yml

@@ -66,6 +66,9 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c #v1.15.2
         with:
           toolchain: ${{ matrix.rust-version }}
+          # Mirror the cfgs in .cargo/config.toml; the action's RUSTFLAGS export
+          # would otherwise replace them.
+          rustflags: '-D warnings --cfg zcash_unstable="nu7" --cfg feature="tx_v6"'
           cache-key: unit-tests-${{ matrix.os }}-${{ matrix.rust-version }}-${{ matrix.features }}
           cache-on-failure: true
       - uses: taiki-e/install-action@305bebabd4457bed9b82541755f034994382465b #v2.68.10