Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZSA integration (step 1): Integrate ZSA-compatible crates into Zebra while maintaining original Orchard (Vanilla) support for now [to upstream] #14

Closed
wants to merge 53 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
43b5e50
Prepare to use Orchard ZSA
dmidem Jul 29, 2024
95dce56
Switch Zebra to QED-it ZSA-compatible crates but maintain the origina…
dmidem Aug 11, 2024
054e655
Merge remote-tracking branch 'origin/main' into switch-to-zsa-crates-…
dmidem Aug 18, 2024
cdb9efd
fix(docker): allow the `zebra` user access to relevant dirs (#8817)
gustavovalverde Aug 29, 2024
0ef9987
fix(state): Write database format version to disk atomically to avoid…
arya2 Aug 29, 2024
6b95d27
fix(rpc): Return verification errors from `sendrawtransaction` RPC me…
arya2 Aug 30, 2024
2d23d6b
Merge branch 'zsa1' into switch-to-zsa-crates-nu6
dmidem Sep 2, 2024
53c65b6
Trigger CI
dmidem Sep 2, 2024
9a616f4
fix(deps): Replace `serde_yaml` by `serde_yml` (#8825)
upbqdn Sep 2, 2024
c238847
Add basic CI checks workflow
dmidem Sep 3, 2024
2c13ae9
Fix ci-basic.yml
dmidem Sep 3, 2024
5a839c6
Fix ci-basic.yml (2)
dmidem Sep 3, 2024
367a14b
Add installing of build-essential to ci-basic.yml
dmidem Sep 3, 2024
5541b27
Remove `shielded-scan` from experimental features (#8827)
upbqdn Sep 3, 2024
f2427d6
add(docs): Add minimal hardware requirements (#8822)
upbqdn Sep 3, 2024
e9bbb97
Update README.md (#8824)
dismad Sep 3, 2024
f425747
Try to use librocksdb-dev in ci-basic.yml
dmidem Sep 3, 2024
831c847
Run ci-basic.yml on ubuntu-24.04
dmidem Sep 3, 2024
ecaf98d
Enable nu6 cfg flag in ci-basic.yml
dmidem Sep 3, 2024
7d11159
Adjust the code with librustzcash/zcash_protocol nu6 related changes
dmidem Sep 4, 2024
6a0196e
Add RUSTDOCFLAGS to ci-basic.yml
dmidem Sep 4, 2024
d31eea5
ref(docker): use cache mounts for build cache (#8796)
gustavovalverde Sep 5, 2024
17d7f91
build(deps): bump tj-actions/changed-files in the devops group (#8835)
dependabot[bot] Sep 5, 2024
1511997
fix clippy lints (#8855)
oxarbitrage Sep 6, 2024
554a37d
feat(rpc): Add a `stop` rpc method (#8839)
oxarbitrage Sep 9, 2024
082cdad
feat(rpc): Add a `generate` rpc method (#8849)
oxarbitrage Sep 9, 2024
3f94303
feat(rpc): Add more fields to `getmininginfo` call (#8860)
oxarbitrage Sep 18, 2024
60d09a4
build(deps): bump tj-actions/changed-files in the devops group (#8874)
dependabot[bot] Sep 18, 2024
c5d8eb5
fix(rpc): modify shutdown used in `stop()` (#8863)
oxarbitrage Sep 18, 2024
aec07f2
ref(ci): consolidate cached states workflows and scripts (#8865)
gustavovalverde Sep 19, 2024
8870b2c
feat(cd): deploy instances with attached cached states (#8868)
gustavovalverde Sep 19, 2024
6951988
chore(docker): remove debugging output by default (#8870)
gustavovalverde Sep 19, 2024
c8280d4
feat(tests): Move the RPC tests framework from zcashd (#8866)
oxarbitrage Sep 20, 2024
1526276
Merge remote-tracking branch 'origin/main' into switch-to-zsa-crates-nu6
dmidem Sep 22, 2024
9e94dc5
Merge remote-tracking branch 'zcash/main' into switch-to-zsa-crates-nu6
dmidem Sep 22, 2024
d6301a6
Returns an error instead of panicking when the relevant chain is empt…
arya2 Sep 23, 2024
ac1242a
feat(ci): add Docker Scout vulnerabilities scanning (#8871)
gustavovalverde Sep 24, 2024
689a776
build(deps): bump docker/scout-action in the devops group (#8890)
dependabot[bot] Oct 1, 2024
12ade98
Merge branch 'main' into switch-to-zsa-crates-nu6
dmidem Oct 2, 2024
3bf4bc8
fix(actions): disk regeneration does not required a cached state (#8…
gustavovalverde Oct 4, 2024
abfb9ce
build(deps): bump the devops group with 4 updates (#8905)
dependabot[bot] Oct 7, 2024
841047a
build(deps): bump the prod group across 1 directory with 24 updates (…
dependabot[bot] Oct 7, 2024
7313d53
Responds with a maximum of 160 block headers (#8913)
arya2 Oct 7, 2024
63b8665
Updates post-NU6 funding stream address for FPF on Mainnet (#8914)
arya2 Oct 7, 2024
3220520
Update docker-compose.yml - tiny typo (#8893)
skyl Oct 7, 2024
a282103
build(deps): bump the devops group with 3 updates (#8919)
dependabot[bot] Oct 10, 2024
1600ede
upgrade checkpoints (#8924)
oxarbitrage Oct 10, 2024
8cd4d96
build(deps): Upgrade ECC crates for Zebra `v2.0.0-rc.0` release cand…
oxarbitrage Oct 10, 2024
f2e7bc9
feat(regtest): Add regtest halving interval and port test (#8888)
oxarbitrage Oct 10, 2024
fea9f46
Fixes a panic (#8928)
arya2 Oct 10, 2024
b894921
Release Zebra (`v2.0.0-rc.0`) (#8927)
oxarbitrage Oct 11, 2024
bb1395c
Merge branch 'main' into switch-to-zsa-crates-nu6
dmidem Oct 17, 2024
ccbc652
Merge branch 'zsa1' into zsa-integration-zsadeps
dmidem Oct 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
# Flags that apply to all Zebra crates and configurations
[target.'cfg(all())']
rustflags = [
# FIXME: Consider removing this line later (it's needed for the ZSA version of librustzcash crates)
"--cfg", "zcash_unstable=\"nu6\"",

# Zebra standard lints for Rust 1.65+

# High-risk code
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/ci-basic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Basic checks

#on: [push, pull_request]
on: [push]

jobs:
test:
name: Test on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-24.04]

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
# Enable the `nu6` feature in `zcash_protocol`
RUSTFLAGS: '--cfg zcash_unstable="nu6"'
RUSTDOCFLAGS: '--cfg zcash_unstable="nu6"'

steps:
- uses: actions/checkout@v4
- name: Install dependencies on Ubuntu
#run: sudo apt-get update && sudo apt-get install -y protobuf-compiler build-essential librocksdb-dev
run: sudo apt-get update && sudo apt-get install -y protobuf-compiler librocksdb-dev
- name: Run tests
run: cargo test --verbose
- name: Verify working directory is clean
run: git diff --exit-code
- name: Run doc check
run: cargo doc --all-features --document-private-items
- name: Run format check
run: cargo fmt -- --check
Loading