DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
16,599 Commits 4 Branches 1 Tag
e16d22ee0fa187f4ac09027449d6ad79bc6c8fa4
Commit Graph

16599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Grigg
34ce29b3ee make-release.py: Updated release notes and changelog for 1.0.15-rc1. 2018-02-24 04:20:05 +00:00
Jack Grigg
7d0c1df409 make-release.py: Updated manpages for 1.0.15-rc1. 2018-02-24 04:17:59 +00:00
Jack Grigg
1dd95be4a9 make-release.py: Versioning changes for 1.0.15-rc1. 2018-02-24 04:08:36 +00:00
Homu
a418756ef4 Auto merge of #2874 - arcalinea:tx_block_expiry, r=arcalinea 
Transaction expiry height

Implements ZIP 203.

- Only applies after Overwinter blockheight.

Closes #754.
 2018-02-23 18:37:48 -08:00
Jay Graber
59da58cdb0 Change rpc_tests to 21 2018-02-23 18:20:30 -08:00
Homu
e6e483b2b0 Auto merge of #2919 - bitcartel:2904_branch_id_protocol_handshake, r=str4d 
Overwinter peer management

Implements ZIP 201.

Part of #2904.
 2018-02-23 17:18:04 -08:00
Jay Graber
7b92f27e18 Add expiry to z_mergetoaddress 2018-02-23 15:15:46 -08:00
Simon
b6e5cc7d27 Add python qa test overwinter_peer_management. 2018-02-23 14:22:43 -08:00
Simon
72b2192950 Overwinter peer management and network handshaking. 
Implements ZIP 201.
 2018-02-23 14:21:27 -08:00
Simon
2423a40c08 Add field nProtocolVersion to struct NetworkUpgrade. 2018-02-23 14:05:13 -08:00
rofl0r
33ae5edd2c remove -mt suffix from boost libraries built by depends 2018-02-23 15:52:55 +00:00
Jay Graber
5943f227da Add mempool_tx_expiry.py test 2018-02-23 00:12:10 -08:00
Jay Graber
9c12b8e903 Add -txexpirydelta cli option 2018-02-23 00:12:10 -08:00
Jay Graber
9bb37bf0d5 Implement transaction expiry for Overwinter 2018-02-23 00:12:03 -08:00
Homu
c5904fb2a4 Auto merge of #2797 - str4d:2493-active-merging, r=bitcartel 
Implement z_mergetoaddress for combining UTXOs and notes

Closes #2493.
 2018-02-22 20:59:51 -08:00
Jack Grigg
15ced9b153 wallet_mergetoaddress: Add additional syncs to prevent race conditions 2018-02-23 04:28:04 +00:00
Homu
f472edd0e2 Auto merge of #2960 - bitcartel:2959_overwinter_fix_sighash_test, r=str4d 
Closes #2954 and #2959.  Fixes Overwinter issues in sighash_tests.
 2018-02-22 17:47:14 -08:00
Jack Grigg
713b366231 Regenerate sighash tests 2018-02-23 01:40:08 +00:00
Simon
07f94352ad Closes #2954 and #2959. Fixes Overwinter issues in sighash_tests. 2018-02-23 01:40:05 +00:00
Homu
0be6cb979e Auto merge of #2978 - bitcartel:2906_v1_tx_no_assert, r=str4d 
Closes #2964. z_sendmany once again makes v1 tx for taddr to taddr.
 2018-02-22 07:47:49 -08:00
Simon
e6cd2a8356 Closes #2964. z_sendmany once again makes v1 tx for taddr to taddr. 
In accordance with the Zcash protocol spec.
 2018-02-22 15:43:42 +00:00
Homu
c2d98b47c1 Auto merge of #2808 - arcalinea:2785_upgrades_rpc, r=str4d 
Add network upgrade details to getblockchaininfo

Closes #2785. Closes #2974.
 2018-02-22 06:03:06 -08:00
Jack Grigg
50a90615af Document that consensus.chaintip != consensus.nextblock just before an upgrade 2018-02-22 14:01:43 +00:00
Jack Grigg
4c3d2b3bbe Check upgrade status in wallet_overwintertx RPC test 2018-02-22 13:44:40 +00:00
Jack Grigg
2bda6a9b22 Add z_mergetoaddress to release notes 2018-02-22 13:23:25 +00:00
Jack Grigg
553a5c1ab2 Gate z_mergetoaddress as an experimental feature 2018-02-22 13:23:25 +00:00
Jack Grigg
6e9c7629af Implement z_mergetoaddress for combining UTXOs and notes 
Closes #2493.
 2018-02-22 13:23:18 +00:00
jl777
bbb8ae00ad Fix 2018-02-22 12:17:39 +02:00
jl777
58434c5c34 Revert if 2018-02-22 12:15:36 +02:00
jl777
71b9e59c5a Guard against set generate crash in regtest 2018-02-22 12:00:08 +02:00
Scott Sadler
46d1bcc607 integration test for complex aux condition 2018-02-22 01:43:43 -03:00
Homu
933e0d6675 Auto merge of #2968 - maxgubler:v1.0.14-edit, r=str4d 
Fix documentation examples for z_importwallet z_exportwallet exportdir

Closes #2967.
 2018-02-21 20:14:32 -08:00
Scott Sadler
db2df2c37b integration test for basic aux condition 2018-02-22 00:59:15 -03:00
Homu
50400310af Auto merge of #2977 - str4d:loadblockindexguts-correctness, r=str4d 
Check Equihash solution when loading block index

An additional consistency check, which also ensures that the in-memory representation
matches the stored index.
 2018-02-21 19:05:23 -08:00
Jack Grigg
44488400c1 Check Equihash solution when loading block index 2018-02-21 22:37:19 +00:00
Homu
6264927fef Auto merge of #2931 - jc23424:hashreserved-diskindex, r=str4d 
read hashReserved from disk

This fixes a bug where the hashReserved field of the block header is not properly read back into CBlockIndex when loaded from disk. This happens to cause no issues currently because hashReserved has always been its default value (== 0), but if a block were ever mined where this was not the case, headers read back from disk would appear to have an invalid solution
 2018-02-21 14:35:58 -08:00
Scott Sadler
691b8708f1 Komodo CC aux callback has access to transaction via checker 2018-02-21 19:28:52 -03:00
Jack Grigg
ed9aa2b62a Add branch IDs for current and next block to getblockchaininfo 
Closes #2974.
 2018-02-21 21:18:03 +00:00
Jay Graber
71768555dd Add upgrades field to RPC call getblockchaininfo 
Closes #2785.

Co-authored-by: Jack Grigg <jack@z.cash>
 2018-02-21 21:01:46 +00:00
Scott Sadler
73b9e32b9d update to latest libcryptoconditions 2018-02-21 14:10:42 -03:00
jl777
6ec3d43c5c -print 2018-02-21 16:15:42 +02:00
jl777
a86845f3dc Merge pull request #519 from jl777/dPoW 
DPoW
 2018-02-21 16:15:11 +02:00
jl777
bce7c68fd7 Merge pull request #518 from jl777/beta 
-couldnt open printout
 2018-02-21 16:14:39 +02:00
jl777
877865e3ef -couldnt open printout 2018-02-21 16:13:55 +02:00
Homu
d4d2844829 Auto merge of #2463 - str4d:713-rollback-limit, r=str4d 
Implement roll-back limit for reorganisation

Part of  #2905. Closes #713.
 2018-02-20 15:17:22 -08:00
Maxwell Gubler
f70cd24521 Fix syntax examples for z_importwallet and export 2018-02-20 16:46:12 -05:00
Jack Grigg
bdbe8e8591 Extend CWallet::GetFilteredNotes to enable filtering on a set of addresses 2018-02-20 13:19:07 +00:00
Homu
8487be8360 Auto merge of #2903 - str4d:1408-sighash, r=str4d 
Overwinter SignatureHash

Implements ZIP 143.

Includes code cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7276
- bitcoin/bitcoin#7976
- bitcoin/bitcoin#8118
- bitcoin/bitcoin#8149
  - Only amount validation and SignatureHash commits.
- bitcoin/bitcoin#8346
- bitcoin/bitcoin#8524

Part of #2074 and #2254. Closes #1408 and #2584.
 2018-02-20 03:59:45 -08:00
Jack Grigg
4553901850 Use v3 transactions with caching for validatelargetx benchmark 2018-02-20 04:22:22 +00:00
Jack Grigg
818b94f94f Make number of inputs configurable in validatelargetx test 2018-02-20 04:22:22 +00:00