Skip to content

Dev zcash#25

Merged
miketout merged 27 commits intodevfrom
dev-zcash
Oct 5, 2018
Merged

Dev zcash#25
miketout merged 27 commits intodevfrom
dev-zcash

Conversation

@miketout
Copy link
Copy Markdown
Owner

@miketout miketout commented Oct 5, 2018

No description provided.

bitcartel and others added 27 commits September 21, 2018 11:10
…branch

id when in regtest mode.

Co-authored-by: Larry Ruane <larryruane@gmail.com>
This helps prevent users from triggering an assert if they pass in
Sapling addresses to RPC calls: z_mergetoaddress, z_importviewingkey
and z_exportviewingkey.
…on, r=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 zcash#3533.
Enable Sapling features on mainnet

Reverts the last commit from zcash#3458.
…r=str4d

Do not use APPROX_RELEASE_HEIGHT to get consensus branch id in regtest mode.

Closes zcash#3534
…bitcartel

Sapling support for z_listreceivedbyaddress

Closes zcash#3379.
…rtel

Use max priority for all shielded transactions

Addresses zcash#3546 (comment)
…artel

Add newly discovered sapling addresses to the wallet when decrypting

Closes zcash#3511
@miketout miketout merged commit 392b840 into dev 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.

5 participants