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.

Sign up for GitHub

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

Jump to bottom

Provide Zebra compatibility: re-enable and fix zcash_client_backend, update prost dependency version #75

Merged
merged 16 commits into from
Oct 28, 2024
Merged

Provide Zebra compatibility: re-enable and fix zcash_client_backend, update prost dependency version #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
df67b1d
Provide Zebra compatibility: re-enable and fix zcash_client_backend, …
dmidem Oct 14, 2024
d765e76
Fix compilation errors in zcash_client_backend with orchard feature e…
dmidem Oct 14, 2024
279357a
Merge branch 'zsa1' into zebra-compat-enable-backend
dmidem Oct 15, 2024
f4a2488
Fix rustfmt issue
dmidem Oct 15, 2024
0d36de1
Add unstable-spanning-tree feature to github action
dmidem Oct 15, 2024
dea4867
Re-run CI
dmidem Oct 15, 2024
706d889
Upgrade Cargo.lock
dmidem Oct 15, 2024
ab85777
Update Cargo.lock to minimize diffs with zsa1 version
dmidem Oct 15, 2024
7191c6a
Copy the original Cargo.lock from zsa1 and pin prost dep version to =…
dmidem Oct 15, 2024
e16be08
Add a comment to Cargo.toml and return prost vesion back to 0.12.3
dmidem Oct 15, 2024
0d64995
Restore the original Cargo.lock from zsa1
dmidem Oct 15, 2024
5297945
Increase prost version to 0.12.6 and uncommented checks for zcash_cli…
dmidem Oct 16, 2024
f73fb8e
Run cargo build and commit updated rs files from zcash_client_backend…
dmidem Oct 16, 2024
e3c4803
Copy Cargo.lock and Cargo.toml from c3eace49 commit of zcash/librustz…
dmidem Oct 22, 2024
aee8972
Fix orchard patch.crates-io in Cargo.toml
dmidem Oct 22, 2024
ca10dc1
Run cargo build to re-generate zcash_client_backend/src/proto files
dmidem Oct 22, 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
1 change: 1 addition & 0 deletions .github/actions/prepare/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ runs:
transparent-inputs
sapling
unstable
unstable-spanning-tree
${{ inputs.extra-features }}
${{ steps.test.outputs.feature }}
'" >> $GITHUB_OUTPUT
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ jobs:
- name: Add zcash_proofs as a dependency of the synthetic crate
working-directory: ./ci-build
run: cargo add --no-default-features --path ../crates/zcash_proofs
# - name: Add zcash_client_backend as a dependency of the synthetic crate
# working-directory: ./ci-build
# run: cargo add --features lightwalletd-tonic --path ../crates/zcash_client_backend
- name: Add zcash_client_backend as a dependency of the synthetic crate
working-directory: ./ci-build
run: cargo add --features lightwalletd-tonic --path ../crates/zcash_client_backend
- name: Copy pinned dependencies into synthetic crate
run: cp crates/Cargo.lock ci-build/
- name: Add target
Expand Down
Loading
Loading