Jack Grigg
639e46b4d7
Revert "Remove testnet-only difficulty rules"
This reverts commit 333ea3c426
.
6 years ago
Jack Grigg
5ead4b1713
Revert "Get rid of consensus.fPowAllowMinDifficultyBlocks."
This reverts commit dffc025d38
.
6 years ago
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
6 years ago
Simon
b7549f2aec
Add test that Sapling shielded transactions have MAX_PRIORITY
6 years ago
Eirik Ogilvie-Wigley
51e6ed6110
Move FIXME comment to where the fix should happen
6 years ago
Eirik Ogilvie-Wigley
a13492744d
Use max priority for all shielded transfers
6 years ago
Homu
2558943080
Auto merge of #3499 - arcalinea:3379_z_listreceivedbyaddress, r=bitcartel
Sapling support for z_listreceivedbyaddress
Closes #3379 .
6 years ago
Larry Ruane
e4f0d6a8de
Sapling support for z_listreceivedbyaddress
6 years ago
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
6 years ago
Homu
fbbbb1cc82
Auto merge of #3537 - str4d:enable-sapling-features, r=bitcartel
Enable Sapling features on mainnet
Reverts the last commit from #3458 .
6 years ago
Simon
4c4e1718b1
Update qa test as offline regtest nodes need branch id passed in.
6 years ago
Jack Grigg
34e222c18e
Revert "Disable Sapling features on mainnet"
This reverts commit 554e00e8f9
.
6 years ago
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 .
6 years ago
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.
6 years ago
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>
6 years ago
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 .
6 years ago
Eirik Ogilvie-Wigley
c10249f3de
Remove unused import
6 years ago
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 .
6 years ago
Homu
75c1dbc5eb
Auto merge of #3452 - LarryRuane:3399-peer-ban-test, r=bitcartel
Test peer banning logic in both pre- and post-initial block download states
The DoS ban scores are different for each, and it's nice to test both.
Follow-on from #3410 .
6 years ago
Homu
379c7439a0
Auto merge of #3479 - Eirik0:rpc-test-cleanup, r=bitcartel
Rpc test cleanup
The main purpose of this PR was to inline the method 'wait_for_async_operation_id' from util.py in tests where we were doing this manually. To make it work in all cases, I had to change the method to return the result in the case where the call failed. I also did a bit of general clean up (removing semicolons) in the files which I changed.
6 years ago
Homu
4fc1066b6f
Auto merge of #3516 - str4d:3506-sendmany-sapling-t-ovk, r=ebfull
Generate an ovk to encrypt outCiphertext for t-addr senders
Closes #3506 .
6 years ago
Jack Grigg
bb4b6982e3
Generate an ovk to encrypt outCiphertext for t-addr senders
Closes #3506 .
6 years ago
Jack Grigg
bd3c860cb4
Use ovk directly in the TransactionBuilder API instead of fvk
6 years ago
Homu
e95bdeabbf
Auto merge of #3521 - bitcartel:sapling_json_data, r=str4d
Add Sapling fields to JSON RPC output using TxToJSON.
Related to #3063 to add Sapling support to wallet RPCs.
6 years ago
Homu
49356ed798
Auto merge of #3512 - str4d:3487-nu-peer-management, r=ebfull
Make NU peer management logic upgrade-agnostic
Closes #3487 .
6 years ago
Simon
3501519bc8
Update qa test to check for Sapling related JSON fields.
6 years ago
Simon
9ba7479de1
Add Sapling fields to JSON RPC output using TxToJSON.
6 years ago
Eirik Ogilvie-Wigley
36a490677c
Allow passing branchId when calling signrawtransaction
6 years ago
Eirik Ogilvie-Wigley
40b9527301
Incorporate APPROX_RELEASE_HEIGHT when determining what consensus branch to sign with
6 years ago
Eirik Ogilvie-Wigley
19697025c6
Add test for signing raw transactions offline
6 years ago
Eirik Ogilvie-Wigley
5602e1f1a6
Allow passing timeout parameter to wait_and_assert_operationid_status
6 years ago
Eirik Ogilvie-Wigley
e39f0e16c2
Remove unused imports
6 years ago
Eirik Ogilvie-Wigley
4d89d020a6
Remove unneeded semicolons
6 years ago
Eirik Ogilvie-Wigley
f081d9cb02
Use utility method to wait for async operations
6 years ago
Eirik Ogilvie-Wigley
611f93244b
Allow more information to be returned when an async rpc fails
6 years ago
Eirik Ogilvie-Wigley
b37dc4e22f
Don't export empty zip32 metadata
6 years ago
Eirik Ogilvie-Wigley
2fe39561ec
Export zip32 metadata with sapling keys
6 years ago
Eirik Ogilvie-Wigley
ae807af413
Export comment on HDSeed and fingerprint with wallet
6 years ago
Jonas Schnelli
002753ae64
[Wallet] ensure CKeyMetadata.hdMasterKeyID will be cleared during SetNull()
Zcash: modified for zip32
8 years ago
Jonas Schnelli
82e71233b0
[Wallet] print hd masterkeyid in getwalletinfo
Zcash: modified for zip32
8 years ago
Jonas Schnelli
b6d1af89f2
[Wallet] extend CKeyMetadata with HD keypath
Zcash: modified for zip32
8 years ago
Eirik Ogilvie-Wigley
9bcf90e2de
Add sapling support to z_importwallet
6 years ago
Eirik Ogilvie-Wigley
0f03de5536
Return more information when adding a spending key
6 years ago
Eirik Ogilvie-Wigley
fcab001b1e
Move AddSpendingKeyToWallet
6 years ago
Eirik Ogilvie-Wigley
a0783bb957
Rename AddZKey to include sprout
6 years ago
Eirik Ogilvie-Wigley
5e360fb29f
Add sapling spending keys to z_exportwallet
6 years ago
Eirik Ogilvie-Wigley
d6b31d59b5
Rename map to include sprout
6 years ago
Larry Ruane
6206d86237
Test peer banning logic in both pre- and post-initial block download states
6 years ago
Homu
0e0f5e4ea7
Auto merge of #3496 - bitcartel:3442_sapling_note_locking, r=str4d
Add Sapling note locking to the CWallet class
Closes #3442 .
6 years ago
Jack Grigg
8e057ad9ee
qa: Test both Overwinter and Sapling peer management
6 years ago