Commit Graph

20631 Commits

Author SHA1 Message Date
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
miketout
ca4a5f2692 Change name to Stake Guard 2018-10-07 19:56:02 -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
Michael Toutonghi
ccc47c554c Add cc include dirs to make file 2018-10-06 23:44:26 -07:00
miketout
191f3bbddd Complete nothing at stake solution, waiting for confirm of masks 2018-10-06 21:28:51 -07:00
miketout
a1fd99cf34 data parsing issues 2018-10-06 10:05:48 -07:00
miketout
68b9a352da Change behavior of ExtractDestination, Solver, and GetscriptAddress for crypto conditions 2018-10-06 00:36:21 -07: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
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
miketout
180662c25e Merge pull request #26 from miketout/dev-zcash
Add stake consistency enforcement and near complete CoinbaseGuard val…
2018-10-05 14:57:22 -07:00
miketout
f3b0d2ab4e Add stake consistency enforcement and near complete CoinbaseGuard validation 2018-10-05 14:51:37 -07: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
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
miketout
392b840a3e Merge pull request #25 from miketout/dev-zcash
Dev zcash
2018-10-05 00:54:23 -07:00
miketout
3bfa5e2264 Latest Zcash updates and more CC for N@S 2018-10-05 00:26:06 -07:00
miketout
7a9960f086 Comment debugging printf's - tracked down to Zcash raw tx bug, which means we should sync 2018-10-04 17:13:42 -07: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
miketout
8cb6777047 Change error to qualified error vs. no error at all 2018-10-04 13:22:28 -07:00
miketout
3764dea5d0 Change block before header from error to warning 2018-10-04 12:42:50 -07: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
miketout
4739095d0f Fix comparison 2018-10-04 01:01:29 -07:00
miketout
00a7120e90 Cleanup, initialize stake for chainPower in pre-sapling path 2018-10-04 00:35:52 -07:00
miketout
2ed3bbec38 Debugging 2018-10-03 22:04:39 -07: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
miketout
dc5e6137c7 Never start Overwinter before 1 2018-10-03 20:33:12 -07:00
miketout
0a962eb958 remove sign from time lock check 2018-10-03 19:59:48 -07:00
miketout
f3ec769e42 Cleanup 2018-10-03 17:52:52 -07:00
miketout
f0f2dd9927 Delete VRSC_7776 2018-10-03 17:18:56 -07:00
miketout
43afe8c3ee Delete VRSC_7776 2018-10-03 17:18:28 -07:00
miketout
905fe35e50 More work on CoinbaseGuard and validation 2018-10-03 16:26:41 -07:00
Simon
f0dcfceb81 Closes #3560. Update Sapling note data correctly when importing a key. 2018-10-03 15:40:50 -07:00