Commit Graph
32164 Commits
Author SHA1 Message Date
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
miketout ca4a5f2692 Change name to Stake Guard 2018-10-07 19:56:02 -07:00
Simon 01282e4fa6 Update wallet_persistence test to verify spending notes after restart. 2018-10-07 16:22:33 -07:00
miketout d0cd50740c Fix error in display-only of winning stake POS hash when output prevout.n was not 0 2018-10-07 14:54:07 -07:00
miketout f2450b36f5 Remove debugging output 2018-10-07 14:32:45 -07:00
miketout 281a5e2eec Confirm positive and negative spends with and without priv keys 2018-10-07 14:21:43 -07:00
jl777 ad0e6b93b8 Merge pull request #905 from DeckerSU/dev
+ freq:5 for EMC2
2018-10-07 03:07:19 -11:00
DeckerSU eb94acf733 + freq:5 for EMC2 2018-10-07 17:06:27 +03:00
Michael Toutonghi ccc47c554c Add cc include dirs to make file 2018-10-06 23:44:26 -07:00
Simon 08f1baaaca Update wallet_persistence test to verify wallet txs are persisted across restarts. 2018-10-06 22:53:24 -07:00
miketout 191f3bbddd Complete nothing at stake solution, waiting for confirm of masks 2018-10-06 21:28:51 -07:00
Simon 5537bf5cdb Fix file permissions of QA test wallet_persistence.py 2018-10-06 21:05:30 -07:00
miketout a1fd99cf34 data parsing issues 2018-10-06 10:05:48 -07:00
blackjok3rtt 0cfd7009d7 Merge pull request #21 from StakedChain/master
merge master down
2018-10-07 00:23:08 +08: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
miketout 68b9a352da Change behavior of ExtractDestination, Solver, and GetscriptAddress for crypto conditions 2018-10-06 00:36:21 -07:00
jl777 1449ae165f Fix bug in consensus code from miketout for small networks 2018-10-05 18:29:39 -11:00
miketout ef9a13b557 Additional null check 2018-10-05 21:44:24 -07:00
miketout a6ac51616c Add null check to deref 2018-10-05 21:37:49 -07:00
Simon cb9cff5fdc Fix deadlock from calling CWallet::AddSaplingIncomingViewingKey instead of CBasicKeyStore::AddSaplingIncomingViewingKey 2018-10-05 21:15:08 -07:00
miketout 95c5c69bab Successful staking on Sapling wit Crypto Conditions 2018-10-05 21:09:09 -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
miketout 185b2d4f2f move things around and some debugging code for odd issues 2018-10-05 17:20:23 -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