avnish
47952a6db8
changed test names from _ to CamelCase
2018-10-10 08:48:52 +05:30
avnish
678ddb633a
changed block_test to BlockTests
2018-10-10 08:36:16 +05:30
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
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
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
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
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
Homu
2558943080
Auto merge of #3499 - arcalinea:3379_z_listreceivedbyaddress, r=bitcartel
...
Sapling support for z_listreceivedbyaddress
Closes #3379 .
2018-09-27 16:01:14 -07:00
Larry Ruane
e4f0d6a8de
Sapling support for z_listreceivedbyaddress
2018-09-27 16:59:29 -06:00
Eirik Ogilvie-Wigley
83c4e360da
Address need not be optional when adding sapling keys
2018-09-27 15:44:04 -06:00
Homu
e6f6c5d08c
Auto merge of #3535 - bitcartel:fix_regtest_signrawtransaction, r=str4d
...
Do not use APPROX_RELEASE_HEIGHT to get consensus branch id in regtest mode.
Closes #3534
2018-09-22 11:35:27 -07:00
Homu
fbbbb1cc82
Auto merge of #3537 - str4d:enable-sapling-features, r=bitcartel
...
Enable Sapling features on mainnet
Reverts the last commit from #3458 .
2018-09-21 17:32:56 -07:00
Simon
4c4e1718b1
Update qa test as offline regtest nodes need branch id passed in.
2018-09-21 17:16:44 -07:00
Jack Grigg
34e222c18e
Revert "Disable Sapling features on mainnet"
...
This reverts commit 554e00e8f9
.
2018-09-21 23:43:31 +01:00
Homu
09476a5fdb
Auto merge of #3536 - bitcartel:3533_replace_assert_with_exception, r=str4d
...
Replace Sapling support-related asserts with JSON errors
This helps prevent users from triggering an assert if they pass in Sapling addresses to RPC calls which do not fully support Sapling yet: z_mergetoaddress, z_importviewingkey and z_exportviewingkey.
Part of #3533 .
2018-09-21 15:35:51 -07:00
Simon
f1cb49ac86
For #3533 . Replace asserts with JSON errors.
...
This helps prevent users from triggering an assert if they pass in
Sapling addresses to RPC calls: z_mergetoaddress, z_importviewingkey
and z_exportviewingkey.
2018-09-21 15:01:45 -07:00
Simon
18f8abb62d
Closes #3534 . Do not use APPROX_RELEASE_HEIGHT to get consensus branch
...
id when in regtest mode.
Co-authored-by: Larry Ruane <larryruane@gmail.com>
2018-09-21 11:10:15 -07:00
Homu
36243f41f1
Auto merge of #3520 - Eirik0:3327-sign-offline, r=bitcartel
...
Fix signing raw transactions with unsynced offline nodes
This PR address the issue in two different ways:
- In `signrawtransaction` we determine the consensus branch ID (which we then later use to construct the transaction) using the chain height. We now also consider the `APPROX_RELEASE_HEIGHT` as this is a better estimation than 0 for the height of the chain if we are unsynced. (This in and of itself solves the Overwinter signing issue).
- We have added an additional parameter to `signrawtransaction` to allow manually overriding the consensus branch ID that zcashd determines we are on. This allows users to work around corner cases where the first strategy is still insufficient.
Closes #3327 .
2018-09-19 15:02:52 -07:00
Eirik Ogilvie-Wigley
c10249f3de
Remove unused import
2018-09-19 14:41:02 -06:00
Homu
25c3f903c1
Auto merge of #3491 - Eirik0:3218-sapling-import-export-wallet, r=str4d
...
Add Sapling support to z_importwallet and z_exportwallet
Includes code adapted from upstream PR https://github.com/bitcoin/bitcoin/pull/8323
Closes #3218 .
2018-09-19 12:15:48 -07:00