Homu
527b7feef5
Auto merge of #3592 - Eirik0:z-sendmany-better-error, r=bitcartel
...
Better error message when sending to both sprout and sapling
When trying to send to both Sprout and Sapling (not currently supported with z_sendmany) we were getting the following error in our operation result: `general exception: boost::bad_get: failed value get using boost::get`.
This PR changes this to fail with a better error message before the async operation begins:
```
error code: -8
error message:
Cannot send to both Sprout and Sapling addresses using z_sendmany
```
2018-10-12 15:30:34 -07:00
Eirik Ogilvie-Wigley
0917c84d9a
Better error message when sending to both sprout and sapling
...
Co-authored-by mdr0id <marshall@z.cash>
2018-10-12 14:12:21 -06:00
Simon
01918e8742
Update test to verify Sapling nullifiers and witnesses persist correctly.
2018-10-11 21:52:56 -07:00
Eirik Ogilvie-Wigley
3f824a908b
Fix HDSeed comment
2018-10-10 16:00:59 -06:00
Homu
732e167043
Auto merge of #3450 - leto:rpctest-readme, r=str4d
...
Fix some typos in rpc-tests readme
2018-10-09 13:18:07 -07:00
Homu
c2bb0ec67f
Auto merge of #3517 - mdr0id:3388_persist_wallet, r=str4d
...
Sapling support for persisting wallet to disk
Closes #3388 . Closes #3061 .
2018-10-08 09:53:34 -07:00
Simon
01282e4fa6
Update wallet_persistence test to verify spending notes after restart.
2018-10-07 16:22:33 -07:00
Simon
08f1baaaca
Update wallet_persistence test to verify wallet txs are persisted across restarts.
2018-10-06 22:53:24 -07:00
Simon
5537bf5cdb
Fix file permissions of QA test wallet_persistence.py
2018-10-06 21:05:30 -07:00
mdr0id
2fcf06077f
Persist Sapling key material in the wallet to disk
2018-10-06 00:01:14 +01:00
Homu
625797a037
Auto merge of #3518 - str4d:3216-z_shieldcoinbase, r=str4d
...
Add Sapling support to z_shieldcoinbase
Part of #3216 .
2018-10-05 03:33:16 -07:00
Jack Grigg
089ec92e7b
Fix pyflakes warnings
2018-10-05 11:32:22 +01:00
Homu
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
Jack Grigg
f09aae037c
Update wallet_listreceived test for now-correct empty Sapling memos
2018-10-04 22:46:15 +01:00
Homu
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
Simon
f0dcfceb81
Closes #3560 . Update Sapling note data correctly when importing a key.
2018-10-03 15:40:50 -07:00
Jack Grigg
5f91a95641
Add Sapling support to z_shieldcoinbase
...
Part of #3216 .
2018-10-03 12:16:18 +01:00
Homu
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
Simon
b7549f2aec
Add test that Sapling shielded transactions have MAX_PRIORITY
2018-09-30 17:23:53 -07:00
Simon
5f57babd08
Cleanup to address review comments.
2018-09-28 22:11:05 -07:00
Larry Ruane
d7d6480ce3
z_listunspent rpc unit test: add testing for Sapling
2018-09-28 15:23:24 -07:00
Jay Graber
011f9a02ef
Add rpc test for sprout txs z_listunspent
2018-09-28 15:19:10 -07:00
Larry Ruane
e4f0d6a8de
Sapling support for z_listreceivedbyaddress
2018-09-27 16:59:29 -06:00
Simon
4c4e1718b1
Update qa test as offline regtest nodes need branch id passed in.
2018-09-21 17:16:44 -07:00
Simon
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
Homu
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
Eirik Ogilvie-Wigley
c10249f3de
Remove unused import
2018-09-19 14:41:02 -06:00
Homu
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
Homu
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
Homu
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
Simon
3501519bc8
Update qa test to check for Sapling related JSON fields.
2018-09-17 10:01:50 -07:00
Eirik Ogilvie-Wigley
40b9527301
Incorporate APPROX_RELEASE_HEIGHT when determining what consensus branch to sign with
2018-09-17 10:27:39 -06:00
Eirik Ogilvie-Wigley
19697025c6
Add test for signing raw transactions offline
2018-09-17 10:27:37 -06:00
Eirik Ogilvie-Wigley
5602e1f1a6
Allow passing timeout parameter to wait_and_assert_operationid_status
2018-09-14 18:41:14 -06:00
Eirik Ogilvie-Wigley
e39f0e16c2
Remove unused imports
2018-09-14 18:41:14 -06:00
Eirik Ogilvie-Wigley
4d89d020a6
Remove unneeded semicolons
2018-09-14 18:41:14 -06:00
Eirik Ogilvie-Wigley
f081d9cb02
Use utility method to wait for async operations
2018-09-14 18:41:14 -06:00
Eirik Ogilvie-Wigley
611f93244b
Allow more information to be returned when an async rpc fails
2018-09-14 18:41:14 -06:00
Eirik Ogilvie-Wigley
b37dc4e22f
Don't export empty zip32 metadata
2018-09-14 18:36:24 -06:00
Eirik Ogilvie-Wigley
2fe39561ec
Export zip32 metadata with sapling keys
2018-09-14 17:27:20 -06:00
Eirik Ogilvie-Wigley
ae807af413
Export comment on HDSeed and fingerprint with wallet
2018-09-14 17:26:02 -06:00
Eirik Ogilvie-Wigley
9bcf90e2de
Add sapling support to z_importwallet
2018-09-14 16:16:03 -06:00
Eirik Ogilvie-Wigley
5e360fb29f
Add sapling spending keys to z_exportwallet
2018-09-14 15:07:15 -06:00
Jack Grigg
8e057ad9ee
qa: Test both Overwinter and Sapling peer management
2018-09-12 12:15:37 +01:00
Jack Grigg
af04224522
Fix file permissions of wallet_sapling RPC test
2018-09-03 08:27:33 +01:00
Jack Grigg
0f436a0a26
Fix RPC test that checks exact wording of cleaned-up error message
2018-09-03 08:23:09 +01:00
Jack Grigg
e54c4d2ca1
rpcwallet: Add Sapling support to z_sendmany
2018-08-27 11:36:14 +01:00
Homu
622751da12
Auto merge of #3444 - LarryRuane:2982-mininode-version, r=str4d
...
generalize mininode.py protocol versioning
Fixes #2982 -- replace `overwintered` boolean argument to NodeConn constructor with a protocol version integer, so that adding Sapling (and beyond) will be easier.
2018-08-20 09:48:51 -07:00
Eirik Ogilvie-Wigley
4e1e91512d
Fix assertion and comment
2018-08-06 09:58:40 -06:00
Eirik Ogilvie-Wigley
7929851626
Only include the change field if we have a spending key
2018-08-06 09:58:40 -06:00