Mihail Fedorov
b56e224002
Adding coin in single commit
2018-02-26 09:47:59 +03:00
jl777
84be13c031
Merge pull request #524 from jl777/kolo
...
DNS and docker stuff
2018-02-26 08:06:07 +02:00
Mihail Fedorov
b26a0857dc
sleepless
2018-02-26 08:50:39 +03:00
Mihail Fedorov
94ee86f056
New docker file test
2018-02-26 08:30:14 +03:00
Scott Sadler
80ea0d26b0
latest cryptoconditions
2018-02-26 02:10:58 -03:00
jl777
8410781107
Merge pull request #522 from jl777/dev
...
new -ac options
second slate of hard coded notaries
new coins
2018-02-26 07:05:05 +02:00
Mihail Fedorov
4afdbc9556
New final dns names for seeds
2018-02-26 02:38:59 +03:00
Scott Sadler
28658719ea
tweak hoek interface
2018-02-25 16:22:12 -03:00
jl777
e1b44812f7
Merge branch 'beta' into dev
2018-02-25 15:44:06 +02:00
jl777
e2a7f87c31
Merge pull request #521 from jl777/kolo
...
VOTE replaced with VOTE2018
2018-02-25 11:02:41 +02:00
Mihail Fedorov
8bf22c6fd0
fiat scripts
2018-02-25 03:49:58 +03:00
Mihail Fedorov
ec0b0757b6
fiat scripts
2018-02-25 03:46:02 +03:00
Mihail Fedorov
830d5ff54e
vote2018
2018-02-25 03:22:03 +03:00
Scott Sadler
7d937f290e
add secp256k1 condition type to cryptoconditions
2018-02-24 19:43:37 -03:00
Homu
be262f065f
Auto merge of #2985 - str4d:release-v1.0.15-rc1, r=ebfull
...
Release v1.0.15-rc1
2018-02-23 21:08:05 -08:00
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
