3e471410f1
Persist Sapling payment address to IVK map
...
This ensures we remember any diversified addresses manually generated
outside the wallet.
2018-10-06 00:45:39 +01:00
9ce6f8425b
Add gtest coverage of Sapling wallet persistence
2018-10-06 00:01:22 +01:00
fe92bc700a
Adding in rpc wallet sap for test_bitcoin
2018-10-06 00:01:21 +01:00
48a93fd2e0
Serialize Sapling data in CWalletTx
...
If 2.0.0 nodes upgrade to 2.0.1 after Sapling has activated, the v4 Sapling
transactions in their wallet will be treated as corrupt, and a rescan will be
triggered which will overwrite the old-format transactions with the new
Sapling-aware format.
2018-10-06 00:01:20 +01:00
2fcf06077f
Persist Sapling key material in the wallet to disk
2018-10-06 00:01:14 +01:00
1b79de781c
Store ExtFVK with encrypted Sapling spending key instead of FVK
...
This ensures that even when the wallet is encrypted, we can derive the default
Sapling payment address for our spending keys.
2018-10-05 23:13:32 +01:00
87ae893d75
Revert "wallet: Comment out HDSeed and CHDChain persistence to disk"
...
This reverts commit b7f9a7ae02
2018-10-05 17:46:43 +01:00
967bbbc486
Auto merge of #3561 - bitcartel:3560_update_sapling_note_data, r=bitcartel
...
Closes #3560 . Update Sapling note data correctly when importing a key.
2018-10-04 15:37:34 -07:00
4ba35551d4
Auto merge of #3510 - arcalinea:3378_z_listunspent, r=bitcartel
...
Sapling support for z_listunspent
Closes #3378 .
2018-10-04 11:39:14 -07:00
27a6a99cb0
fix z_listunspent includeWatchonly logic
2018-10-04 12:26:36 -06:00
325ba00336
Auto merge of #3542 - Eirik0:3511-update-address-mapping, r=bitcartel
...
Add newly discovered sapling addresses to the wallet when decrypting
Closes #3511
2018-10-03 21:49:32 -07:00
f0dcfceb81
Closes #3560 . Update Sapling note data correctly when importing a key.
2018-10-03 15:40:50 -07:00
bcdb4344f0
Auto merge of #3548 - Eirik0:3546-sapling-coin-priority, r=bitcartel
...
Use max priority for all shielded transactions
Addresses https://github.com/zcash/zcash/issues/3546#issuecomment-425184034
2018-10-01 10:13:15 -07:00
a4ecd0fa72
Add newly discovered sapling addresses to the wallet
2018-10-01 09:34:25 -06:00
b7549f2aec
Add test that Sapling shielded transactions have MAX_PRIORITY
2018-09-30 17:23:53 -07:00
5f57babd08
Cleanup to address review comments.
2018-09-28 22:11:05 -07:00
c0f7e4059d
Fix rebasing of CWallet::GetNullifiersForAddresses
2018-09-28 22:08:07 -07:00
d7d6480ce3
z_listunspent rpc unit test: add testing for Sapling
2018-09-28 15:23:24 -07:00
27b3cce94f
Modify GetNullifiersForAddresses for Sapling
2018-09-28 15:23:21 -07:00
cd1c6e3767
Modify comments
2018-09-28 15:19:10 -07:00
011f9a02ef
Add rpc test for sprout txs z_listunspent
2018-09-28 15:19:10 -07:00
66795a408b
z_listunspent sapling support - needs refactor
2018-09-28 15:19:05 -07:00
06f2a8f9b6
s/jsoutindex/outindex for sapling outputs
2018-09-28 15:13:29 -07:00
51e6ed6110
Move FIXME comment to where the fix should happen
2018-09-28 12:16:05 -06:00
a13492744d
Use max priority for all shielded transfers
2018-09-28 10:32:30 -06:00
2558943080
Auto merge of #3499 - arcalinea:3379_z_listreceivedbyaddress, r=bitcartel
...
Sapling support for z_listreceivedbyaddress
Closes #3379 .
2018-09-27 16:01:14 -07:00
e4f0d6a8de
Sapling support for z_listreceivedbyaddress
2018-09-27 16:59:29 -06:00
83c4e360da
Address need not be optional when adding sapling keys
2018-09-27 15:44:04 -06:00
e6f6c5d08c
Auto merge of #3535 - bitcartel:fix_regtest_signrawtransaction, r=str4d
...
Do not use APPROX_RELEASE_HEIGHT to get consensus branch id in regtest mode.
Closes #3534
2018-09-22 11:35:27 -07:00
fbbbb1cc82
Auto merge of #3537 - str4d:enable-sapling-features, r=bitcartel
...
Enable Sapling features on mainnet
Reverts the last commit from #3458 .
2018-09-21 17:32:56 -07:00
4c4e1718b1
Update qa test as offline regtest nodes need branch id passed in.
2018-09-21 17:16:44 -07:00
34e222c18e
Revert "Disable Sapling features on mainnet"
...
This reverts commit 554e00e8f9
2018-09-21 23:43:31 +01:00
09476a5fdb
Auto merge of #3536 - bitcartel:3533_replace_assert_with_exception, 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 #3533 .
2018-09-21 15:35:51 -07:00
f1cb49ac86
For #3533 . Replace asserts with JSON errors.
...
This helps prevent users from triggering an assert if they pass in
Sapling addresses to RPC calls: z_mergetoaddress, z_importviewingkey
and z_exportviewingkey.
2018-09-21 15:01:45 -07:00
18f8abb62d
Closes #3534 . Do not use APPROX_RELEASE_HEIGHT to get consensus branch
...
id when in regtest mode.
Co-authored-by: Larry Ruane <larryruane@gmail.com>
2018-09-21 11:10:15 -07:00
36243f41f1
Auto merge of #3520 - Eirik0:3327-sign-offline, r=bitcartel
...
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 .
2018-09-19 15:02:52 -07:00
c10249f3de
Remove unused import
2018-09-19 14:41:02 -06:00
25c3f903c1
Auto merge of #3491 - Eirik0:3218-sapling-import-export-wallet, r=str4d
...
Add Sapling support to z_importwallet and z_exportwallet
Includes code adapted from upstream PR https://github.com/bitcoin/bitcoin/pull/8323
Closes #3218 .
2018-09-19 12:15:48 -07:00
75c1dbc5eb
Auto merge of #3452 - LarryRuane:3399-peer-ban-test, r=bitcartel
...
Test peer banning logic in both pre- and post-initial block download states
The DoS ban scores are different for each, and it's nice to test both.
Follow-on from #3410 .
2018-09-19 10:25:23 -07:00
379c7439a0
Auto merge of #3479 - Eirik0:rpc-test-cleanup, r=bitcartel
...
Rpc test cleanup
The main purpose of this PR was to inline the method 'wait_for_async_operation_id' from util.py in tests where we were doing this manually. To make it work in all cases, I had to change the method to return the result in the case where the call failed. I also did a bit of general clean up (removing semicolons) in the files which I changed.
2018-09-18 20:05:39 -07:00
4fc1066b6f
Auto merge of #3516 - str4d:3506-sendmany-sapling-t-ovk, r=ebfull
...
Generate an ovk to encrypt outCiphertext for t-addr senders
Closes #3506 .
2018-09-18 18:10:52 -07:00
bb4b6982e3
Generate an ovk to encrypt outCiphertext for t-addr senders
...
Closes #3506 .
2018-09-19 00:51:30 +01:00
bd3c860cb4
Use ovk directly in the TransactionBuilder API instead of fvk
2018-09-18 23:26:31 +01:00
e95bdeabbf
Auto merge of #3521 - bitcartel:sapling_json_data, r=str4d
...
Add Sapling fields to JSON RPC output using TxToJSON.
Related to #3063 to add Sapling support to wallet RPCs.
2018-09-18 12:13:14 -07:00
49356ed798
Auto merge of #3512 - str4d:3487-nu-peer-management, r=ebfull
...
Make NU peer management logic upgrade-agnostic
Closes #3487 .
2018-09-18 04:25:54 -07:00
3501519bc8
Update qa test to check for Sapling related JSON fields.
2018-09-17 10:01:50 -07:00
9ba7479de1
Add Sapling fields to JSON RPC output using TxToJSON.
2018-09-17 09:44:43 -07:00
36a490677c
Allow passing branchId when calling signrawtransaction
2018-09-17 10:27:39 -06:00
40b9527301
Incorporate APPROX_RELEASE_HEIGHT when determining what consensus branch to sign with
2018-09-17 10:27:39 -06:00
19697025c6
Add test for signing raw transactions offline
2018-09-17 10:27:37 -06:00
Jack Grigg
mdr0id
Homu
Larry Ruane
Simon
Eirik Ogilvie-Wigley
Jay Graber