Zsa integration diff #16
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit bitcoin/bitcoin@2022917)
-BEGIN VERIFY SCRIPT- sed -i 's/privkey/seckey/g' src/key.cpp -END VERIFY SCRIPT- (cherry picked from commit bitcoin/bitcoin@e10439c)
Zcashd release candidate v5.5.0-rc1
This enables PRs that have release notes to be merged in parallel to the RC process.
Merge v5.5.0-rc1 into the main branch
This allows zcash_script to include!() the file as part of its build process.
…from_Makefile Add reference in Makefile.am to zip317.h
(needed to test the help change in the next commit). Signed-off-by: Daira Emma Hopwood <[email protected]>
… fee, size, logical action count, and unpaid action count. This reflects the changes to use the ZIP 317 block construction algorithm and de-emphasise fee rate. Signed-off-by: Daira Emma Hopwood <[email protected]>
Change module comment in bridge.rs to doc comment to fix errors in zcash_script build
Previously, there were no arguments after `memo`, so it could always just be omitted. Now the `privacyPolicy` is there, so it’s necessary to be able to explicitly omit the memo. Using `"F6"` would work in some situations, but while it encodes the “no memo” case, the internal checks that ensure we don’t try to send a memo to transparent recipients fail on it. And as we can’t merge to a taddr without specifying `"AllowRevealedRecipients"`, this prevents merging to taddrs (unless the deprecated `legacy_privacy` feature is enabled). This change makes it possible to send `null` as the `memo` argument, which indicates “no memo” successfully. It does the same for `*_limit` parameters in `z_mergetoaddress` and `z_shieldcoinbase` (even though those don’t have a similar failure case), since those parameters also need to be specified when the `privacyPolicy` is, and it’s consistent with zcash#6599, rather than hardcoding some particular value. This also fixes a bug in `WalletTxBuilder` that could inadvertently require `AllowRevealedAmounts` on a transaction from a shielded pool to itself (via `NetAmountRecipient`).
Allow explicit “no memo” in z_mergetoaddress
Add `memo` parameter to `z_shieldcoinbase`
This also removes the restriction on merging Sprout to Sapling, as that is now controlled by `privacyPolicy`.
UA and cross-pool support in `z_mergetoaddress`, plus fixing a typo.
Improve `-printpriority` output to log the modified fee, conventional fee, size, logical actions, and unpaid actions
Co-authored-by: Daira Hopwood <[email protected]>
Co-authored-by: Daira Hopwood <[email protected]>
Support UA destinations in `z_mergetoaddress`
Signed-off-by: Daira Emma Hopwood <[email protected]>
are selected. Signed-off-by: Daira Emma Hopwood <[email protected]>
This ensures that if a rebuild of `rustcxx` is triggered but not a rebuild of `native_cxxbridge` (as can happen when a native toolchain package is updated), the source used by `rustcxx` is not missing.
Currently the linker silently fails, which breaks the build process. These utilities are not necessary for the overall build, and macOS is currently a Tier 3 platform, so we can skip building them for now.
We already weren't including their corresponding binaries. This change reduces the size of the `native_clang` cache tarball by 69 MB.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.