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
miketout
aa3ce4242f
Fix upgrade check polarity
2018-10-03 11:17:08 -07:00
miketout
86e31e3dfc
Cleanup staking and fee consistency for stake tx
2018-10-03 10:31:01 -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
miketout
b3e3f61826
Enable extended data on stakes and general cleanup
2018-10-03 09:26:40 -07: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
miketout
06f4116090
VerusStakeTransaction
2018-10-03 00:58:00 -07:00
miketout
8a727a26a7
Beginning of N@S solution using CoinbaseGuard CC
2018-10-02 19:49:54 -07: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
Jay Graber
cd1c6e3767
Modify comments
2018-09-28 15:19:10 -07:00
Jay Graber
011f9a02ef
Add rpc test for sprout txs z_listunspent
2018-09-28 15:19:10 -07:00
Jay Graber
66795a408b
z_listunspent sapling support - needs refactor
2018-09-28 15:19:05 -07:00
Jay Graber
06f2a8f9b6
s/jsoutindex/outindex for sapling outputs
2018-09-28 15:13:29 -07:00
miketout
c68ca1a225
Leverage nonce for overwhelming chance of single deterministic winner for chain power in POS
2018-09-28 14:35:38 -07:00
Eirik Ogilvie-Wigley
51e6ed6110
Move FIXME comment to where the fix should happen
2018-09-28 12:16:05 -06:00
Eirik Ogilvie-Wigley
a13492744d
Use max priority for all shielded transfers
2018-09-28 10:32:30 -06:00
miketout
8449c166ed
Merge branch 'dev' of https://github.com/miketout/komodo into dev
2018-09-28 01:39:04 -07:00
Jack Grigg