miketout
085c3640bb
Improve error reporting and wallet cleanup
2018-10-12 13:54:31 -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
Homu
2e0be155a2
Auto merge of #3590 - bitcartel:fix_nullifier_persistence, r=bitcartel
...
Resolves Sapling nullifier persistence issue when importing a key.
During a rescan, a CWalletTx was persisted to disk before it had its
note data set. This meant that upon restart, the CWalletTx would
potentially be missing its nullifiers causing the balance to include
notes which had already been spent.
The resolution is to force a CWalletTx to be persisted after it has had
its nullifiers set correctly, before the note witnesses are updated.
2018-10-12 10:30:17 -07:00
jl777
2dd34e4694
Merge branch 'dev' into jl777
2018-10-12 01:19:07 -11:00
jl777
954af7de92
Merge branch 'dev' into jl777
2018-10-12 01:16:37 -11:00
jl777
01ba6d10d3
Merge pull request #907 from jl777/kolo
...
PGT
2018-10-11 23:54:35 -11:00
miketout
8c3a9bc7ae
Clean up POS checks
2018-10-12 01:12:08 -07:00
miketout
a8d2188651
Timeout adjustment
2018-10-11 22:47:07 -07:00
miketout
69fa3d0e00
Reduce lag timeouts
2018-10-11 22:28:37 -07:00
Simon
01918e8742
Update test to verify Sapling nullifiers and witnesses persist correctly.
2018-10-11 21:52:56 -07:00
miketout
af2e212d7a
Remove spurios opret in tx builder, don't wait forever for blocks before mining, add delay to getblocktemplate
2018-10-11 21:35:09 -07:00
Simon
cd10562c73
Resolves Sapling nullifier persistence issue when importing a key.
...
During a rescan, a CWalletTx was persisted to disk before it had its
note data set. This meant that upon restart, the CWalletTx would
potentially be missing its nullifiers causing the wallet's balance
to include notes which had already been spent.
The resolution is to ensure that after a rescan, a CWalletTx is
persisted after it has had its nullifiers set correctly.
Co-authored-by: Eirik Ogilvie-Wigley <eirik@z.cash >
2018-10-11 21:25:53 -07:00
miketout
271326fafd
Clean up stake rebroadcasting and mempool checking
2018-10-11 19:52:32 -07:00
miketout
ae773246f8
Error message only when cheatstaker parameter is invalid, not missing
2018-10-11 14:52:05 -07:00
miketout
3ce8aba005
Fix readme merge error
2018-10-11 14:31:15 -07:00
miketout
8b57c15f6a
Zcash latest changes
2018-10-11 14:30:42 -07:00
miketout
1021455845
Fix negative height issues for pruning cheat lists
2018-10-11 14:23:14 -07:00
arielgabizon
eb0bf23751
add test for sapling spend with transparent recipient
2018-10-11 15:22:20 +02:00
miketout
16ef4f1e3d
update comments
2018-10-10 22:14:05 -07:00
Michael Toutonghi
8fc4030c10
Reorganized cheatcatcher for build issues
2018-10-10 21:46:40 -07:00
Michael Toutonghi
99dbf2c2ed
Build
2018-10-10 19:20:01 -07:00
Michael Toutonghi
2d02c19ee7
Build
2018-10-10 19:15:41 -07:00
Michael Toutonghi
df756d24ba
Cheatcatcher
2018-10-10 19:02:09 -07:00
Mihail Fedorov
3cc05dc7b8
PGT
2018-10-11 04:07:04 +03:00
Simon
56765e24cb
Add test to verify final sapling root in block header is updated.
2018-10-10 17:30:58 -07: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
miketout
477fd227ee
Simpler internal check
2018-10-09 14:35:46 -07: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
jl777
68fd571656
Merge pull request #906 from Mixa84/channelCCFSM
...
Channel CC
2018-10-09 03:50:34 -11:00
Mihailo Milenkovic
702658f047
Code clean up
2018-10-09 16:22:36 +02:00
miketout
85ca7bb9cb
Debug comment cleanup
2018-10-09 00:04:45 -07:00
miketout
c754dbcfa6
Update to Zcash rc1
2018-10-08 23:47:20 -07:00
miketout
58fbbfc32f
Add staking control and reporting to getgenerate and setgenerate
2018-10-08 22:06:20 -07:00
miketout
5f63373eb9
Selectively reject Sapling transactions while synced below activation height. Add separate control of staking.
2018-10-08 21:15:21 -07:00
miketout
051af72cbd
Cap the random additional stake of a block to 1/2 the current stake difficulty
2018-10-08 17:20:31 -07:00
miketout
c2dc091e40
Merge branch 'master' of https://github.com/zcash/zcash into dev
2018-10-08 17:19:15 -07:00
miketout
8682e17a7d
Sapling support for z_shieldcoinbase and more
2018-10-08 16:17:24 -07:00
Eirik Ogilvie-Wigley
6829be1902
Remove unnecessary call to IsValidPaymentAddress
2018-10-08 16:25:29 -06:00
Eirik Ogilvie-Wigley
d6ad8cef2c
GenerateNewSproutZKey can return a SproutPaymentAddress
2018-10-08 14:52:58 -06: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
Eirik Ogilvie-Wigley
92fc29a3f4
Rename GenerateNewZKey to include Sprout
2018-10-08 14:23:03 -06:00
jl777
e3eea61546
-dpowassets
2018-10-08 09:09:23 -11:00
jl777
b32790aed8
-dpowassets
2018-10-08 09:08:55 -11: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
Mihailo Milenkovic
30743f7333
Add checks for correct input data
2018-10-08 17:45:53 +02:00
jl777
0de9262b57
Change prints
2018-10-08 00:00:46 -11:00
