DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
20,542 Commits 1 Branch 1 Tag
5ce49ee344f67ed940fa6ae18e75e6e01c883a5b
Commit Graph

15372 Commits

Author SHA1 Message Date
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
miketout
b8deecdc09 Sapling transaction testing 2018-09-20 03:08:36 -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
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
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
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
Eirik Ogilvie-Wigley
b37dc4e22f Don't export empty zip32 metadata 2018-09-14 18:36:24 -06:00
Eirik Ogilvie-Wigley
2fe39561ec Export zip32 metadata with sapling keys 2018-09-14 17:27:20 -06:00
Eirik Ogilvie-Wigley
ae807af413 Export comment on HDSeed and fingerprint with wallet 2018-09-14 17:26:02 -06:00
Jonas Schnelli
002753ae64 [Wallet] ensure CKeyMetadata.hdMasterKeyID will be cleared during SetNull() 
Zcash: modified for zip32
 2018-09-14 17:17:24 -06:00
Jonas Schnelli
82e71233b0 [Wallet] print hd masterkeyid in getwalletinfo 
Zcash: modified for zip32
 2018-09-14 16:59:56 -06:00
Jonas Schnelli
b6d1af89f2 [Wallet] extend CKeyMetadata with HD keypath 
Zcash: modified for zip32
 2018-09-14 16:59:51 -06:00
Eirik Ogilvie-Wigley
9bcf90e2de Add sapling support to z_importwallet 2018-09-14 16:16:03 -06:00
Eirik Ogilvie-Wigley
0f03de5536 Return more information when adding a spending key 2018-09-14 16:00:47 -06:00
Eirik Ogilvie-Wigley
fcab001b1e Move AddSpendingKeyToWallet 2018-09-14 15:44:03 -06:00
Eirik Ogilvie-Wigley
a0783bb957 Rename AddZKey to include sprout 2018-09-14 15:07:15 -06:00
Eirik Ogilvie-Wigley
5e360fb29f Add sapling spending keys to z_exportwallet 2018-09-14 15:07:15 -06:00
Eirik Ogilvie-Wigley
d6b31d59b5 Rename map to include sprout 2018-09-14 15:07:15 -06:00
Michael Toutonghi
0c8fa56a02 All latest updates, smart contracts, including oracle from KMD/jl777 2018-09-13 13:00:13 -07:00
jl777
b9de8352c7 Verify gatewaysmarkdone 2018-09-12 08:54:22 -11:00
jl777
9f72c41af3 Test 2018-09-12 08:51:23 -11:00
jl777
b31844cbb5 Test 2018-09-12 08:37:02 -11:00
jl777
6bde696a31 Gatewaysmarkdone 2018-09-12 08:36:01 -11:00
Larry Ruane
6206d86237 Test peer banning logic in both pre- and post-initial block download states 2018-09-12 13:30:01 -06:00
jl777
11ce33e84f Test 2018-09-12 08:27:40 -11:00
jl777
40542921b7 Test 2018-09-12 08:13:09 -11:00
jl777
7f131476ca Test 2018-09-12 08:12:42 -11:00
jl777
49ccbc4dda Test 2018-09-12 08:10:51 -11:00
jl777
cfdf7b6b5e Test 2018-09-12 08:06:01 -11:00
jl777
32cfe054ca Test 2018-09-12 08:02:50 -11:00
jl777
b2a18a1ad9 Test 2018-09-12 08:00:43 -11:00
jl777
e4207d456f Test 2018-09-12 07:56:22 -11:00
jl777
8ea4e84f40 Test 2018-09-12 07:54:17 -11:00
jl777
2468e05229 Test 2018-09-12 07:50:26 -11:00
jl777
847837949c Test 2018-09-12 07:46:44 -11:00
jl777
2e1bceb446 Test 2018-09-12 07:42:54 -11:00
jl777
5135f3f49f Test 2018-09-12 07:40:20 -11:00
jl777
2c37b55deb Test 2018-09-12 07:39:22 -11:00
jl777
3efac93c26 Test 2018-09-12 07:37:43 -11:00
jl777
e5c8c5c8e8 Process deposits in oraclefeed.c 2018-09-12 07:34:50 -11:00