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
Homu
807fb7497f
Auto merge of #3587 - Eirik0:3586-fix-dump-comment, r=ebfull
...
Fix HDSeed comment in wallet dump
Closes #3586
2018-10-10 16:34:49 -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
2b4c89c59b
Auto merge of #3578 - mdr0id:release-v2.0.1-rc1, r=bitcartel
...
Release v2.0.1-rc1
2018-10-08 13:41:35 -07:00
mdr0id
79ec0c6529
make-release.py: Updated release notes and changelog for 2.0.1-rc1.
2018-10-08 12:40:54 -07:00
mdr0id
426a9a7e0e
make-release.py: Updated manpages for 2.0.1-rc1.
2018-10-08 12:40:54 -07:00
mdr0id
94360cd098
make-release.py: Versioning changes for 2.0.1-rc1.
2018-10-08 12:23:18 -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
Jack Grigg
5513faccf6
Ignore decoding errors during -zapwallettxes
...
The undecoded wallet transaction is logged before proceeding, so later
recovery of metadata might be possible. But the fact that the user is
using -zapwallettxes is a clear indicator that they want
transactions removed from their wallet, so this is the priority.
2018-10-06 12:18:56 +01:00
Simon
cb9cff5fdc
Fix deadlock from calling CWallet::AddSaplingIncomingViewingKey instead of CBasicKeyStore::AddSaplingIncomingViewingKey
2018-10-05 21:15:08 -07:00
Homu
72f6925de1
Auto merge of #3567 - bitcartel:3546_estimate_tx_size, r=bitcartel
...
For #3546 . Improve estimated tx size for Sapling outputs.
2018-10-05 20:33:38 -07:00
Homu
a513798710
Auto merge of #3566 - bitcartel:3546_prohibit_sapling_map_orphans, r=bitcartel
...
For #3546 . Shielded tx with missing inputs are not treated as orphans.
2018-10-05 17:09:29 -07:00
Jack Grigg
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
mdr0id
9ce6f8425b
Add gtest coverage of Sapling wallet persistence
2018-10-06 00:01:22 +01:00
mdr0id
fe92bc700a
Adding in rpc wallet sap for test_bitcoin
2018-10-06 00:01:21 +01:00
mdr0id
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
mdr0id
2fcf06077f
Persist Sapling key material in the wallet to disk
2018-10-06 00:01:14 +01:00
Jack Grigg
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
Homu
aede10d3c2
Auto merge of #3559 - str4d:3552-testnet-min-difficulty-blocks, r=bitcartel
...
Allow minimum-difficulty blocks on testnet
This is a consensus rule change on testnet that will result in a chain split (leaving the stuck chain, as desired).
Reverts #2766 and part of #1338 .
Closes #3552 .
2018-10-05 12:24:42 -07:00
Simon
4dcc48b8cb
For #3546 . Improve estimated tx size for Sapling outputs.
2018-10-05 11:16:20 -07:00
Simon
c94f4477e8
For #3546 . Shielded tx with missing inputs are not treated as orphans.
2018-10-05 10:48:03 -07:00
mdr0id
87ae893d75
Revert "wallet: Comment out HDSeed and CHDChain persistence to disk"
...
This reverts commit b7f9a7ae02
.
2018-10-05 17:46:43 +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
Jack Grigg
2b47b0de7d
Position PoW.MinDifficultyRules test after rule activates
2018-10-05 00:10:17 +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
4c90270469
Explicitly check the min-difficulty flag against boost::none
...
It isn't clear how a boost::optional that holds 0 (which is the case for
regtest) is coerced to a boolean, unless you pore over the Boost
documentation. An explicit check is clearer.
2018-10-04 23:29:11 +01:00
Jack Grigg
1f7ee4af70
Rename min-difficulty flag to remove off-by-one in the name
2018-10-04 23:26:05 +01: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
Larry Ruane
27a6a99cb0
fix z_listunspent includeWatchonly logic
2018-10-04 12:26:36 -06:00
Jack Grigg
b86dc98047
Only enable min-difficulty blocks on testnet from a particular height
...
The min-difficulty change is a bilateral consensus rule change, and so
must be conditionally enabled in order for the earlier section of the
chain to synchronise.
Technically this could be implemented as a network upgrade, but as this will
never be deployed to mainnet, a targeted fork will suffice.
2018-10-04 14:05:27 +01:00
Homu
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
Simon
f0dcfceb81
Closes #3560 . Update Sapling note data correctly when importing a key.
2018-10-03 15:40:50 -07:00
Jack Grigg
1702a86455
Allow minimum-difficulty blocks on testnet and regtest
...
A block may be mined with nBits set to the minimum difficulty if its
nTime is set more than six block intervals (15 minutes) after its parent
block.
This is a consensus rule change on testnet that will result in a chain
split (as desired).
2018-10-03 17:50:17 +01:00
Jack Grigg
639e46b4d7
Revert "Remove testnet-only difficulty rules"
...
This reverts commit 333ea3c426
.
2018-10-03 16:15:03 +01:00
Jack Grigg
5ead4b1713
Revert "Get rid of consensus.fPowAllowMinDifficultyBlocks."
...
This reverts commit dffc025d38
.
2018-10-03 16:08:00 +01:00
Jack Grigg
5f91a95641
Add Sapling support to z_shieldcoinbase
...
Part of #3216 .
2018-10-03 12:16:18 +01:00
Jack Grigg
ba63dacbbb
Use the correct empty memo for Sapling outputs
2018-10-03 12:14:50 +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
Eirik Ogilvie-Wigley
a4ecd0fa72
Add newly discovered sapling addresses to the wallet
2018-10-01 09:34:25 -06: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
Simon
c0f7e4059d
Fix rebasing of CWallet::GetNullifiersForAddresses
2018-09-28 22:08:07 -07:00
Larry Ruane
d7d6480ce3
z_listunspent rpc unit test: add testing for Sapling
2018-09-28 15:23:24 -07:00
Jay Graber
27b3cce94f
Modify GetNullifiersForAddresses for Sapling
2018-09-28 15:23:21 -07:00