Jack Grigg
34e222c18e
Revert "Disable Sapling features on mainnet"
...
This reverts commit 554e00e8f9
2018-09-21 23:43:31 +01: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
jl777
a4f7b6910f
Fix silly bug
2018-09-21 07:08:47 -11:00
jl777
8267beff37
+print
2018-09-21 06:56:43 -11:00
jl777
88b5d9e46a
Fix token convert
2018-09-21 03:34:39 -11:00
Asher Dawes
5ce49ee344
Fixing Windows compilation.
...
Removing __cpuid definition when compiling for Windows to avoid conflicting definitions of __cpuid provided by gcc and intrin.h .
Updating GitLab yml to deploy to Slack during the build step for manual testing.
2018-09-20 16:08:25 -07:00
miketout
09dfacd0eb
Don't reject based on erroneous version
2018-09-20 14:07:16 -07:00
miketout
644c7445ec
Latest Zcash updates
2018-09-20 13:32:57 -07:00
jl777
44d8e00a25
+print
2018-09-20 07:52:46 -11:00
jl777
71d6712d8d
Test
2018-09-20 06:47:08 -11:00
jl777
68da1c69bd
Test
2018-09-20 03:50:58 -11:00
jl777
8fc335afe1
Test
2018-09-20 03:49:47 -11:00
jl777
66bee980b5
Test
2018-09-20 03:49:07 -11:00
jl777
e45b565837
Test
2018-09-20 03:47:39 -11:00
jl777
4ab5f2f1d7
Test
2018-09-20 03:46:55 -11:00
jl777
627cd0f559
Assets 't' exemption
2018-09-20 03:45:37 -11:00
jl777
ff3116ce3c
Chance for AssetConvert to validate
2018-09-20 02:55:45 -11:00
miketout
b8deecdc09
Sapling transaction testing
2018-09-20 03:08:36 -07:00
jl777
2884a3f64a
Test
2018-09-19 22:35:50 -11:00
jl777
dceeaa3dc5
Test
2018-09-19 22:35:08 -11:00
jl777
1605948a06
Test
2018-09-19 22:18:51 -11:00
jl777
9eece428bb
Test
2018-09-19 22:15:50 -11:00
jl777
009f09069b
Remove dualmode for gateways
2018-09-19 22:08:09 -11:00
jl777
541e5e9249
Token convert
2018-09-19 21:51:56 -11:00
jl777
7d6f7d7ea5
PricesAddFunding
2018-09-19 21:34:25 -11:00
jl777
a51c08d1a1
Test
2018-09-19 21:32:22 -11:00
jl777
06c4e87ff9
CCprices.h
2018-09-19 21:29:11 -11:00
jl777
feb11ae038
std::vector<CPubKey>pubkeys;
2018-09-19 21:18:15 -11:00
jl777
f6b969d4b4
Test
2018-09-19 21:17:06 -11:00
jl777
816acd6719
Test
2018-09-19 21:14:25 -11:00
jl777
5efdb4f325
N
2018-09-19 21:10:58 -11:00
jl777
bfd7858525
Syntax
2018-09-19 21:09:27 -11:00
jl777
f44cd67e82
Prices stub
2018-09-19 21:04:47 -11: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
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
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 .
2018-09-19 10:25:23 -07:00
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 .
2018-09-18 18:10:52 -07:00
Jack Grigg
bb4b6982e3
Generate an ovk to encrypt outCiphertext for t-addr senders
...
Closes #3506 .
2018-09-19 00:51:30 +01:00
Jack Grigg
bd3c860cb4
Use ovk directly in the TransactionBuilder API instead of fvk
2018-09-18 23:26:31 +01:00
miketout
9feb4b9e08
Major updates integration from all upstreams
2018-09-18 14:33:53 -07:00
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.
2018-09-18 12:13:14 -07:00
jl777
08d66385b3
Test
2018-09-18 04:13:43 -11:00
jl777
403b69675c
1of2 CC
2018-09-18 03:48:44 -11:00
Homu
49356ed798
Auto merge of #3512 - str4d:3487-nu-peer-management, r=ebfull
...
Make NU peer management logic upgrade-agnostic
Closes #3487 .
2018-09-18 04:25:54 -07:00
jl777
61ee7d9ad2
Merge branch 'jl777' into FSM
2018-09-17 06:02:03 -11:00
jl777
c5164b3c7b
Skip human help if longer chain is invalid due to notarization
2018-09-17 05:58:07 -11:00
Simon
9ba7479de1
Add Sapling fields to JSON RPC output using TxToJSON.
2018-09-17 09:44:43 -07:00
Eirik Ogilvie-Wigley
36a490677c
Allow passing branchId when calling signrawtransaction
2018-09-17 10:27:39 -06:00
Eirik Ogilvie-Wigley
40b9527301
Incorporate APPROX_RELEASE_HEIGHT when determining what consensus branch to sign with
2018-09-17 10:27:39 -06:00
