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

merge 2.0 to fix broken bionic builds and missing repo links #9

Merged
merged 385 commits into from
Oct 5, 2018

Conversation

nimbosa
Copy link
Member

@nimbosa nimbosa commented Oct 4, 2018

No description provided.

str4d and others added 30 commits August 1, 2018 09:46
Add Sapling support to z_getnewaddress and z_listaddresses

Closes #3217.
Add some more checkpoints, up to the 1.1.0 release
Don't call ECC_Start/ECC_Stop outside the test harness.
Rename merkle tree typedefs to include Sprout

This is to be consistent with the naming convention we have been using to distinguish Sprout/Sapling.
Signed-off-by: Daira Hopwood <[email protected]>
To be filled in when we implement Sapling persistence to disk.
Also GetPaymentAddresses -> GetSproutPaymentAddresses
Check the hash of the zk-SNARK parameters during initialization

**Please also review zcash/librustzcash#28
zkbot and others added 29 commits September 19, 2018 12:15
Add Sapling support to z_importwallet and z_exportwallet

Includes code adapted from upstream PR bitcoin/bitcoin#8323

Closes #3218.
Fix signing raw transactions with unsynced offline nodes

This PR address the issue in two different ways:

- In `signrawtransaction` we determine the consensus branch ID (which we then later use to construct the transaction) using the chain height. We now also consider the `APPROX_RELEASE_HEIGHT` as this is a better estimation than 0 for the height of the chain if we are unsynced. (This in and of itself solves the Overwinter signing issue).
- We have added an additional parameter to `signrawtransaction` to allow manually overriding the consensus branch ID that zcashd determines we are on. This allows users to work around corner cases where the first strategy is still insufficient.

Closes #3327.
This helps prevent users from triggering an assert if they pass in
Sapling addresses to RPC calls: z_mergetoaddress, z_importviewingkey
and z_exportviewingkey.
…=str4d

Replace Sapling support-related asserts with JSON errors

This helps prevent users from triggering an assert if they pass in Sapling addresses to RPC calls which do not fully support Sapling yet: z_mergetoaddress, z_importviewingkey and z_exportviewingkey.

Part of #3533.
Enable Sapling features on mainnet

Reverts the last commit from #3458.
Do not use APPROX_RELEASE_HEIGHT to get consensus branch id in regtest mode.

Closes #3534
…rtel

Sapling support for z_listreceivedbyaddress

Closes #3379.
Use max priority for all shielded transactions

Addresses #3546 (comment)
Add newly discovered sapling addresses to the wallet when decrypting

Closes #3511
Sapling support for z_listunspent

Closes #3378.
@nimbosa nimbosa merged commit 9f80533 into ZclassicDev:v1.1.1-ALPHA Oct 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.