zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
11,292 Commits 5 Branches 0 Tags 57 MiB
Commit Graph

7575 Commits

Author SHA1 Message Date
Wladimir J. van der Laan 7b1acda395
chain: Add assertion in case of missing records in index db 2018-04-04 11:18:41 +01:00
Daira Hopwood 473a113241 Don't increase banscore if the transaction only just expired. 
Author: Jack Grigg <str4d@z.cash>
 2018-04-04 01:29:47 +01:00
Jay Graber e4dff510b4 Set ban score for expired txs to 0 2018-04-03 23:50:43 +01:00
Homu 77669b952b Auto merge of #2598 - str4d:2074-dbwrapper, r=str4d 
Bitcoin 0.12+ dbwrapper improvements

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6650
  - Only refactor - excludes obfuscation
- bitcoin/bitcoin#6777
  - Excluding obfuscation-related changes
- bitcoin/bitcoin#6865
- bitcoin/bitcoin#6823
- bitcoin/bitcoin#6873
- bitcoin/bitcoin#7927
  - Excluding first commit (already included) and second commit (obfuscation-related)
- bitcoin/bitcoin#8467

Part of #2074.
 2018-04-03 14:11:29 -07:00
Jack Grigg 2d7bae5b33
Update CBlockTreeDB::EraseBatchSync for dbwrapper refactor 2018-04-03 21:38:34 +01:00
Homu 599c847818 Auto merge of #2820 - str4d:darwin-build-patches, r=str4d 
[macOS] Darwin build patches

Part of #2246.
 2018-04-03 12:44:24 -07:00
Pavel Janík 56aa25684c
Do not shadow members in dbwrapper 2018-04-03 20:40:54 +01:00
Wladimir J. van der Laan 3923bcca7c
dbwrapper: Move `HandleError` to `dbwrapper_private` 
HandleError is implementation-specific.
 2018-04-03 20:40:54 +01:00
Wladimir J. van der Laan 809a429ecf
dbwrapper: Pass parent CDBWrapper into CDBBatch and CDBIterator 
Zcash: Makes future extensions easier.

Original description (when this was introduced upstream):

Pass parent wrapper directly instead of obfuscation key. This
makes it possible for other databases which re-use this code
to use other properties from the database.

Add a namespace dbwrapper_private for private functions to be used
only in dbwrapper.h/cpp and dbwrapper_tests.
 2018-04-03 20:40:54 +01:00
Jeff Garzik e3da7a572d
leveldbwrapper file rename to dbwrapper.* 2018-04-03 20:40:54 +01:00
Jeff Garzik f345c41ec4
leveldbwrapper symbol rename: Remove "Level" from class, etc. names 2018-04-03 20:40:54 +01:00
Jeff Garzik 7249ee6d7c
leveldbwrapper: Remove unused .Prev(), .SeekToLast() methods 
Also, trim trailing whitespace.
 2018-04-03 20:40:54 +01:00
Daniel Kraft c77586964a
trivial: use constants for db keys 
Replace literal occurances of the key "prefixes" 'c' and 'b' in txdb.cpp
by the respective constants.
 2018-04-03 20:40:54 +01:00
Pieter Wuille f95bf4c417
Fix chainstate serialized_size computation 2018-04-03 20:40:54 +01:00
James O'Beirne 79272bfaf9
Add tests for gettxoutsetinfo, CLevelDBBatch, CLevelDBIterator 
Thanks @dexX7.
 2018-04-03 20:40:54 +01:00
James O'Beirne 0d9524ba6b
Minor bugfixes 
Was "Handle obfuscation in CLevelDBIterator"

Zcash: Only bugfixes
 2018-04-03 20:40:54 +01:00
Pieter Wuille 1ebf50b6da
Encapsulate CLevelDB iterators cleanly 
Conflicts:
	src/leveldb.cpp
	src/leveldb.h
	src/txdb.cpp
 2018-04-03 20:40:54 +01:00
Jack Grigg 3a8e1d0cf4
Refactor Zcash changes to CCoinsViewDB 
To match upstream changes.
 2018-04-03 20:40:54 +01:00
James O'Beirne 0d81464be7
Refactor leveldbwrapper 
Was "Add chainstate obfuscation to avoid spurious antivirus detection"

Zcash: Extracted the refactor, omitting the chainstate obfuscation.
 2018-04-03 20:40:54 +01:00
Homu 3055fd5508 Auto merge of #3136 - str4d:2937-z_importviewingkey-startheight, r=daira 
Fix z_importviewingkey startHeight parameter

Closes #2937.

Co-authored-by: Tomas M <tomas@slax.org>
 2018-04-03 09:41:09 -07:00
Homu 395ed619a0 Auto merge of #2899 - str4d:2829-alertnotify-deprecation, r=str4d 
Notify users about auto-senescence via -alertnotify

Closes #2829.
 2018-04-03 06:07:08 -07:00
Homu 3a47b9bcfd Auto merge of #3132 - str4d:2898-rewind-block-index, r=daira 
When rewinding, remove insufficiently-validated blocks

If a block is insufficiently-validated against a particular branch ID, then we
cannot guarantee that even the block header will be valid under the actual
consensus rules the node will want to apply. Instead require that the blocks are
completely re-validated, by removing them from the block index (which is
equivalent to reducing their validity to BLOCK_VALID_UNKNOWN).

Closes #3100.
 2018-04-03 04:37:21 -07:00
Jack Grigg 6c44424322
Adjust deprecation message to work in both UI and -alertnotify 2018-04-03 12:17:30 +01:00
Jack Grigg f5007d8912
When rewinding, remove insufficiently-validated blocks 
If a block is insufficiently-validated against a particular branch ID, then we
cannot guarantee that even the block header will be valid under the actual
consensus rules the node will want to apply. Instead require that the blocks are
completely re-validated, by removing them from the block index (which is
equivalent to reducing their validity to BLOCK_VALID_UNKNOWN).
 2018-04-03 10:58:31 +01:00
Homu ca981fd442 Auto merge of #3080 - leto:jsindex, r=bitcartel 
Return JoinSplit and JoinSplitOutput indexes in z_listreceivedbyaddress

This implements a feature request by @nathan-at-least in https://github.com/zcash/zcash/issues/2932 and I wanted to ask for feedback about the exact form of the data returned before updating tests and docs.
 2018-04-03 00:30:11 -07:00
Jack Grigg 28915c30ca
Fix z_importviewingkey startHeight parameter 
Closes #2937.
 2018-04-03 02:43:52 +01:00
Homu 347804fe73 Auto merge of #3106 - braddmiller:3046-mergetoaddress-concurrent, r=str4d 
Add Note Locking to z_mergetoaddress

Adds note locking to `z_mergetoaddress` allowing it to be invoked multiple times before previous `z_mergetoaddress` operations have finished.

Reference issue [#3046](https://github.com/zcash/zcash/issues/3046)

Co-authored-by: Eirik Ogilvie-Wigley <eirik@z.cash>
 2018-03-30 14:29:17 -07:00
Homu 1a9caa6ac1 Auto merge of #3127 - str4d:2688-mandatory-rust, r=ebfull 
Make Rust compilation mandatory

The temporary integration check in CheckEquihashSolution() remains, until we
have "real" Rust code to integrate.

Closes #2688.
 2018-03-30 12:58:34 -07:00
Homu 72f14060bc Auto merge of #3098 - str4d:2343-overwinter-disable-mempooltxinputlimit, r=str4d 
Ignore -mempooltxinputlimit once Overwinter activates

Overwinter changes the SignatureHash function to solve the quadratic hashing problem, so this option will no longer be needed.
 2018-03-30 08:33:58 -07:00
Brad Miller 4e6400bc00 Implement note locking for z_mergetoaddress 
Co-authored-by: Eirik Ogilvie-Wigley <eirik@z.cash>
 2018-03-29 15:48:34 -06:00
Jack Grigg b96f7d692d
wallet: Cast size_t to uint64_t before passing to UniValue 2018-03-29 01:05:45 +02:00
Jack Grigg 4ff92bb6d8
rpcwallet.cpp: Cast size_t to uint64_t before passing to UniValue 2018-03-29 01:02:58 +02:00
Jack Grigg 8e95a12b63
Cast ZCIncrementalMerkleTree::size() to uint64_t before passing to UniValue 
size_t is ambiguous for serialization, and UniValue doesn't have an API for
handling this internally.
 2018-03-28 19:51:48 +02:00
Homu 5bdce01848 Auto merge of #2913 - bitcartel:2910_z_listunspent, r=bitcartel 
Closes #2910. Add z_listunspent RPC call.

Have tested on network.  Opening up for review.
 2018-03-28 10:40:49 -07:00
Simon d72c19a662 Closes #2910. Add z_listunspent RPC call. 2018-03-28 10:38:57 -07:00
Jack Grigg f0118aaa0b
Add base case to CurrentEpoch() 2018-03-28 18:29:20 +02:00
Jack Grigg 792c05d8a9
Set PLATFORM flag when compiling libsnark 2018-03-28 18:29:19 +02:00
Jack Grigg 381a79a909
libsnark: Don't set -static on Darwin 
Co-authored-by: kozyilmaz <kazim@monolytic.com>
 2018-03-28 18:29:19 +02:00
Jack Grigg 4fe053e6e8
Move explicit instantiation of IncrementalMerkleTree::emptyroots into header 
Fixes a -Wundefined-var-template warning with clang.
 2018-03-28 18:29:19 +02:00
Jack Grigg 6c7930f688
Use uint64_t instead of size_t for serialized indices into tx.vjoinsplit 
size_t has no guarantee of uniform size, and thus far has been serialized as a
uint64_t on supported platforms.
 2018-03-28 18:29:19 +02:00
Jack Grigg d58ed91af0
Optimise serialization of MerklePath, avoiding ambiguity of std::vector<bool> 
The serialization enforces a maximum supported Merkle tree depth of 64.

Closes #2831.
 2018-03-28 18:26:08 +02:00
Jack Grigg d9cd254e5e
Make Rust compilation mandatory 
The temporary integration check in CheckEquihashSolution() remains, until we
have "real" Rust code to integrate.

Closes #2688.
 2018-03-28 17:55:45 +02:00
Jack Grigg 31afbcc5c9
Ignore -mempooltxinputlimit once Overwinter activates 2018-03-28 14:25:42 +02:00
Homu fb26130787 Auto merge of #3109 - bitcartel:2966_extend_tests, r=str4d 
Part of #2966, extending Sprout tests to other epochs.

Tests updated:
- test_Get
- test_simple_joinsplit_invalidity
 2018-03-27 13:10:39 -07:00
Homu 99b6f76355 Auto merge of #3111 - bitcartel:3110_high_fee_error_reporting, r=bitcartel 
Closes #3110.  Ensure user can see error message about absurdly high fees.
 2018-03-27 10:33:52 -07:00
Simon 8b15afd315 Closes #3110. Ensure user can see error message about absurdly high fees. 2018-03-27 10:23:24 -07:00
Homu 9a6809a75b Auto merge of #3113 - bitcartel:update_boost_1.66.0, r=str4d 
Update boost to 1.66.0

- Remove no longer required patch `deprecated_auto_ptr.patch`.
- Remove potentially no longer required patch `include_poll.patch`. This might cause a regression for unsupported platform Alpine Linux (see #1559)
 2018-03-27 07:31:16 -07:00
Jack Grigg b466c1c90c
cleanup: Ensure code is pyflakes-clean for CI 2018-03-27 02:47:57 +02:00
Simon 68cc953012 Part of #2966, extending Sprout tests to other epochs. 
Tests updated:
- test_Get
- test_simple_joinsplit_invalidity
 2018-03-26 16:22:37 -07:00
Jack Grigg 31e6dde842
snark: Remove -mt suffix from Boost library 2018-03-26 18:28:07 +02:00
Homu 4d6498b900 Auto merge of #3082 - str4d:overwinter-info, r=daira 
Add link to Overwinter info page
 2018-03-23 07:25:09 -07:00
Homu 8ed0346284 Auto merge of #3077 - str4d:asan-initialization-order-fiasco, r=str4d 
Split declaration and definition of SPROUT_BRANCH_ID constant

Fixes an initialization-order-fiasco error detected by ASan:
https://ci.z.cash/#/builders/7/builds/149
 2018-03-20 16:16:13 -07:00
Jack Grigg 7346f09026
Only set multicore flags if OpenMP is available 2018-03-19 17:32:21 +01:00
Simon eb13862667 Closes #3084. Log txid when removing expired txs from mempool. 2018-03-16 11:46:39 -07:00
Jack Grigg 7b4d0c7762
Notify users about auto-senescence via -alertnotify 
Closes #2829.
 2018-03-16 10:25:45 +01:00
Homu 01c31ec57f Auto merge of #3069 - braddmiller:3034-disable-auto-dep, r=daira 
Disable auto-deprecation on regtest and testnet

Prevents auto-senescence based on @str4d's recommendation to early return out of `EnforceNodeDeprecation` if net is not `main`.

Closes #2876.

Co-authored-by: Marshall Gaucher <marshall@z.cash>
 2018-03-15 18:45:15 -07:00
Homu bc8221da81 Auto merge of #3089 - kozyilmaz:clang, r=str4d 
[macOS] Fix test/gtest bugs caught by latest clang

Tests fail with latest clang on macOS (clang-900.0.39.2)

```
test/rpc_wallet_tests.cpp:1064:26: error: implicit conversion from 'double' to 'CAmount' (aka 'long long') changes value from 123.456 to 123 [-Werror,-Wliteral-conversion]
test/rpc_wallet_tests.cpp:1071:18: error: implicit conversion from 'double' to 'CAmount' (aka 'long long') changes value from 1.111 to 1 [-Werror,-Wliteral-conversion]
gtest/test_deprecation.cpp:28:1: error: control reaches end of non-void function [-Werror,-Wreturn-type]
```

Part of #2246.
 2018-03-15 17:21:23 -07:00
Jack Grigg 132a255000
Add link to Overwinter info page 2018-03-13 00:47:10 +00:00
Jonathan "Duke" Leto cb7bcd21ae Return JoinSplit and JoinSplitOutput indexes in z_listreceivedbyaddress 2018-03-12 00:50:56 -07:00
Jack Grigg a6ae8f55ae
Split declaration and definition of SPROUT_BRANCH_ID constant 
Fixes an initialization-order-fiasco error detected by ASan:
https://ci.z.cash/#/builders/7/builds/149
 2018-03-09 09:42:20 +00:00
Homu d88a12262c Auto merge of #3050 - bitcartel:cleanup_define_X, r=daira 
Code clean up. Remove use of X macro.

Closes #3049
 2018-03-08 03:19:29 -08:00
Brad Miller e882e3c06f Clean up 2018-03-07 09:33:55 -07:00
Homu b3a656cf53 Auto merge of #3048 - str4d:analysis-tools, r=str4d 
Add configure flags for enabling ASan/UBSan and TSan

Also adds an environment variable for setting configure flags in `./zcutil/build.sh`.
 2018-03-06 11:53:43 -08:00
Simon 7e9d662ef6 Code clean up. Remove use of X macro. 2018-03-05 15:00:33 -08:00
Homu 9a6a81afff Auto merge of #3036 - plutomonkey:typo, r=daira 
Fix typo in comment: should link to issue #1359.

Fix typo in comment.
 2018-03-02 06:21:20 -08:00
Daira Hopwood c938fb1f17 Squashed commit of the following: 
commit 5e7222e4bc0401ef8c6d8049b12a62d4854ac85c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Thu Mar 1 21:20:51 2018 +0200

    Cleanup

commit 2e1bc7a7cd6c72e7c3d2ff74cb30f7a56515006c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Thu Mar 1 21:19:53 2018 +0200

    Cleanup

commit edd7fa87fb2c839c17457ff004d258a049df832f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Thu Mar 1 21:18:57 2018 +0200

    Cleanup

commit ee34e1433806655a7123f0617802aa4771507dff
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Thu Mar 1 21:18:10 2018 +0200

    Cleanup

commit 20779e4021b8ab95a87289d2741ad2f0fbc7fb39
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Thu Mar 1 21:16:52 2018 +0200

    Cleanup

commit 084e1aa563807f5625ad3aaff376b598e139f2a7
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 18:42:49 2018 +0200

    Fix typo

commit c61a7c2319d3b9b96d1b5ad52ecf9d4f2fd92658
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 18:37:43 2018 +0200

    Cleanup

commit e435c0229b0cbe3f4a77f43b01ca87ed0552d405
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 18:17:58 2018 +0200

    Fix typos

commit e05bff3fea8915e95a473fe3266b2b1f727deca0
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 17:59:32 2018 +0200

    Fix typo

commit 8c55c7840232cef7fa4389a12f6f220e86f5f581
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 17:46:33 2018 +0200

    Fix typos

commit a1edfcc5cc29d815ba7e8c4baaf14c23ef93af64
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 17:39:41 2018 +0200

    Fix typos

commit 2ce2c4d180e936ccc5c10745a6430fda5de38a9b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 17:14:10 2018 +0200

    Fix typo

commit 5bdc6cd5bc9cff93aa48fbdeda36d4d9774bfa18
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 17:12:14 2018 +0200

    Fix typo

commit d08749f549575efc6f44a7f80850bc439c12ad5c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:54:06 2018 +0200

    Revert one change

commit a734bb1191c692f09f58bcc8e85160ce7c839905
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:52:45 2018 +0200

    Fix typo

commit 95fbc8d94bbefc0db989c83d0f053111bfed45e7
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:51:33 2018 +0200

    Fix typos

commit d17d540a83d035cf9a200f9a8b19f0fab6084728
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:49:36 2018 +0200

    Fix typo

commit c4bf4402210bcb926ccfb3928afeb3a8a7490b42
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:48:09 2018 +0200

    Fix typo

commit 25e7990848a1d723702e2d041c04bc68a6c1275f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:47:01 2018 +0200

    Fix typo

commit d72ffb5b0253e0d7b992ffe13c40695421378dc3
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:45:20 2018 +0200

    Fix typo

commit 705e6f271192a575cc99d794545b0efe75d964c4
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:41:19 2018 +0200

    Revert one change

commit 4fd26cd29e21c42b027e37da2616761ebc399d16
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:39:41 2018 +0200

    Revert commit

commit 8a5cc627b1048368fe8807973d1f542bab2e045f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:28:56 2018 +0200

    Fix typo

commit 0a24baa7258c0ae0f244d82af8d0831b148ab012
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 16:15:45 2018 +0200

    Fix typo

commit 38f93ecd90171fb881243f0de55b3452daccff20
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 15:56:49 2018 +0200

    Fix typos

commit 15446fd62400c36c2a51f7e6f13725cc8adfd924
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 15:48:00 2018 +0200

    Fix typos

commit 76533b41986bbc5826070a1e644215a74757c1db
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 15:04:38 2018 +0200

    Fix typo

commit aea330c2b0bf76975ec69142a732288cc8b192bd
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 14:46:29 2018 +0200

    Fix typo

commit 8b1b1d0be1dc44f36c22c54d1a3d56d84d456b92
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 14:40:23 2018 +0200

    Fix typo

commit 46ea76785a26cf20a664ed211c8f3fb9a283e127
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 14:14:17 2018 +0200

    Fix typo

commit e0d7c5748545dd0975507ad603623072fcc6bdea
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 14:08:24 2018 +0200

    Fix typo

commit 604d5a244323b17ba596b12d245407e1cf63a375
Merge: 6c081ca 1c65b2b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 09:03:23 2018 +0200

    Merge pull request #36 from rex4539/patch-36

    Fix typo

commit 6c081caf28b7cef9e62ed523284dff90e4add16d
Merge: 899e5d2 88fa2d9
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 09:02:49 2018 +0200

    Merge pull request #35 from rex4539/patch-35

    Fix typo

commit 899e5d2c343ac7ea5069b8548e5df86c8e963e21
Merge: 6380c7f 40e73e2
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 09:02:16 2018 +0200

    Merge pull request #34 from rex4539/patch-34

    Fix typo

commit 6380c7f740246474c69d8145bde61688551efe83
Merge: f592274 4567667
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 09:01:47 2018 +0200

    Merge pull request #33 from rex4539/patch-33

    Fix typos

commit f592274a713162da0083bd6d22fb47cb1afcdba9
Merge: d86ef7e 4aeaa3a
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 09:01:14 2018 +0200

    Merge pull request #32 from rex4539/patch-32

    Fix typo

commit d86ef7e5e4f7e9c2014358ec5b647d1815eb304d
Merge: fe0b432 5cdd1b2
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 09:00:41 2018 +0200

    Merge pull request #31 from rex4539/patch-31

    Fix typo

commit fe0b432ee125ae0b876af2c26139dfc979005a3b
Merge: 6fd6d0d 70130d0
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 09:00:12 2018 +0200

    Merge pull request #30 from rex4539/patch-30

    Fix typos

commit 6fd6d0dcf3714118a623c0d8d84aabb4578410a8
Merge: 389660f 3377426
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:59:42 2018 +0200

    Merge pull request #29 from rex4539/patch-29

    Fix typo

commit 389660f856cb60ff475a8757aad3873b99213cc0
Merge: a0b85ce 40643eb
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:59:15 2018 +0200

    Merge pull request #28 from rex4539/patch-28

    Fix typo

commit a0b85ce3b4d2e6596da0727e05c1fe15c289b1e7
Merge: 6f9a1c7 23ead80
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:58:42 2018 +0200

    Merge pull request #27 from rex4539/patch-27

    Fix typo

commit 6f9a1c71a680bb3ed1c249dd42bf0a54663d0af3
Merge: b880547 3612eab
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:58:06 2018 +0200

    Merge pull request #26 from rex4539/patch-26

    Patch 26

commit b880547415afeae36bd19867388e60a3040a15ca
Merge: a3b7da2 5c3177f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:57:24 2018 +0200

    Merge pull request #25 from rex4539/patch-25

    Fix typo

commit a3b7da2c6d6691f38751292e1aea63498a325788
Merge: edd8586 60026ef
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:56:52 2018 +0200

    Merge pull request #24 from rex4539/patch-24

    Fix typo

commit edd8586fdf8c112f4c513804610c237d7e2e80ef
Merge: 0c28eb7 f979c00
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:56:12 2018 +0200

    Merge pull request #23 from rex4539/patch-23

    Fix typo

commit 0c28eb7717821b1d68016f40911d07f2a7231b4f
Merge: 775beb6 c900722
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:55:42 2018 +0200

    Merge pull request #22 from rex4539/patch-22

    Fix typo

commit 775beb625beb1fc5f72388c076b295de4b8ff039
Merge: a0cf889 1027543
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:55:16 2018 +0200

    Merge pull request #21 from rex4539/patch-21

    Fix typo

commit a0cf88971e756c37c406bab3066c11d6fc7f6d74
Merge: 4504b48 f3fa89b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:54:44 2018 +0200

    Merge pull request #20 from rex4539/patch-20

    Fix typo

commit 4504b4824b3438e931ca8d24a56b1887657e87cd
Merge: dd0bcbf 2699eca
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:54:20 2018 +0200

    Merge pull request #19 from rex4539/patch-19

    Fix typo

commit dd0bcbfc89293e9760156d5534f3a558451e1f29
Merge: abfb65a f02ef2e
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:53:46 2018 +0200

    Merge pull request #18 from rex4539/patch-18

    Fix typos

commit abfb65afaed49c34b9875df79f6fe6eb2b7bf769
Merge: 68b46b7 6485c90
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:53:08 2018 +0200

    Merge pull request #17 from rex4539/patch-17

    Fix typo

commit 68b46b75d2e5b7ae97e83fc5541c46b4907a7899
Merge: a131e84 fcc0828
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:52:39 2018 +0200

    Merge pull request #16 from rex4539/patch-16

    Fix typo

commit a131e844652e58aff78fa8952e7547a9ba82b8a1
Merge: 8487c0e 8a688ff
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:51:54 2018 +0200

    Merge pull request #15 from rex4539/patch-15

    Fix typo

commit 8487c0e39092b74e977c7a60f4a07a27606756a8
Merge: bcc4cb4 bb60b83
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:51:28 2018 +0200

    Merge pull request #14 from rex4539/patch-14

    Fix typos

commit bcc4cb46130e789faa9adae9b159ca818f67ec52
Merge: 23e66e9 53539bb
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:51:00 2018 +0200

    Merge pull request #13 from rex4539/patch-13

    Fix typos

commit 23e66e956bff2d6935c7a4dd570d457294018a77
Merge: 56956cf 0808445
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:50:27 2018 +0200

    Merge pull request #12 from rex4539/patch-12

    Fix typo

commit 56956cf23ba1208aa39cb3ab1ef60375c6630263
Merge: 77007d4 7a4f064
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:49:59 2018 +0200

    Merge pull request #11 from rex4539/patch-11

    Fix typo

commit 77007d49fa1d8cb80aef02bea1dd15e522a47c90
Merge: e78ad0c 48c33fb
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:49:16 2018 +0200

    Merge pull request #10 from rex4539/patch-10

    Fix typo

commit e78ad0cf0d91955a848f5e953a042eabdcdac198
Merge: 38a3e08 809f01c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:48:33 2018 +0200

    Merge pull request #9 from rex4539/patch-9

    Fix typo

commit 38a3e08699fe4c4ec715b1783dba18bff6b829fb
Merge: eee3c28 fec279c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:48:05 2018 +0200

    Merge pull request #8 from rex4539/patch-8

    Fix typo

commit eee3c286eb84f994310142a9e7fdbd36a671e593
Merge: 702635b cf81b4e
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:47:33 2018 +0200

    Merge pull request #7 from rex4539/patch-7

    Fix typo

commit 702635bb34abb2f83ded27ae95deefd5b6e7df93
Merge: d7497ea 3bbcc3d
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:47:01 2018 +0200

    Merge pull request #6 from rex4539/patch-6

    Fix typo

commit d7497ea070e03380cf1d4f533b7dc4b881f724f8
Merge: bfcc1e8 f639727
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:45:33 2018 +0200

    Merge pull request #5 from rex4539/patch-5

    Fix typos

commit bfcc1e8ae2094ca4e9837f623999705f538aff04
Merge: f4440ec 55262fe
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:45:05 2018 +0200

    Merge pull request #4 from rex4539/patch-4

    Remove space for word "backup"

commit f4440ecd4a7367e6bc4a5f75bea112290017ed2b
Merge: f8b487f 61d5279
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:44:31 2018 +0200

    Merge pull request #3 from rex4539/patch-3

    Fix typos in zmq.md

commit f8b487f5699990fabc7fc383d02bc728db3cb9aa
Merge: 60104a7 f2ce50f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:42:51 2018 +0200

    Merge pull request #2 from rex4539/patch-2

    Fix typo in security-warnings.md

commit 60104a7034f55284afb814e81a1430a8b2b0d8d1
Merge: be262f0 af7dfe0
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 08:41:48 2018 +0200

    Merge pull request #1 from rex4539/patch-1

    Fix typos

commit 1c65b2bd0c49f7f392d0e3a2db14ce1366a87171
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 07:35:26 2018 +0200

    Fix typo

commit 88fa2d966a3b462ed34a9a4659fc390711cc0276
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 07:21:00 2018 +0200

    Fix typo

commit 40e73e258671f21d2b2205509e9cae1f50294752
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 07:14:21 2018 +0200

    Fix typo

commit 4567667fcc8b4197dfd51da34fe82b0f2fb78127
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 06:44:40 2018 +0200

    Fix typos

commit 4aeaa3a3d6335302c53c0f5f4ef81de05e266479
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 05:55:25 2018 +0200

    Fix typo

commit 5cdd1b29b4c90492aa15fed7940984e1d675052f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 05:36:46 2018 +0200

    Fix typo

commit 70130d05f1646c8b9fb1f33c4efbe2a5fcf7138b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 05:28:21 2018 +0200

    Fix typos

commit 33774261b1c63e5640aa1dd251edb67892ed7a5b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 05:00:56 2018 +0200

    Fix typo

commit 40643ebfcd85ee257a4576e85d2fb6c73dad17b5
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 04:51:57 2018 +0200

    Fix typo

commit 23ead80e05116ebfeaac0a00d5bd4a158fbeb54e
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 04:29:53 2018 +0200

    Fix typo

commit 3612eaba2dcf273e94cac9ad889723776ce55108
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 04:19:36 2018 +0200

    Fix typos

commit 5c3177f5d191d1f4e4d9f78ae4b75381010f7768
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 04:13:03 2018 +0200

    Fix typo

commit 60026efe27a39300e428879ad8dba94f19934870
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 04:08:09 2018 +0200

    Fix typo

commit f979c0074efd66804f229c8b3cc6e812d7f26406
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 04:01:44 2018 +0200

    Fix typo

commit c9007220a8a727c1cfe3b25b453c178eacd431f3
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 03:52:33 2018 +0200

    Fix typo

commit 1027543bd30701c4b09aa66226281a10563db910
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 03:36:19 2018 +0200

    Fix typo

commit f3fa89bcd30e0cb45ff4391e78d02452c9227be0
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 03:34:37 2018 +0200

    Fix typo

commit 2699eca938f1e413a29d4408a271aaafd27969cc
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 03:30:29 2018 +0200

    Fix typo

commit f02ef2e495fe43142d305f5c4f40dcfa3d2cb423
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 03:22:36 2018 +0200

    Fix typos

commit 6485c908433bb91fd70d7e18cf3611c9a96115a7
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 03:10:06 2018 +0200

    Fix typo

commit fcc082850564b14b86b1932dfc5a099816c72ef1
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 03:06:26 2018 +0200

    Fix typo

commit 8a688ff7405d67bd4c77b0aa0ebdd4b4a8a9a6a7
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 03:02:50 2018 +0200

    Fix typo

commit bb60b83853ed0a82ca47dd58d55f1849ddcf23ab
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 02:59:25 2018 +0200

    Fix typos

commit 53539bb720c7676b9d37e25dde3423db3aa7bfa1
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 02:50:55 2018 +0200

    Fix typos

commit 080844581d6488ab797ac188acae9c4b2e1d0c59
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 01:05:54 2018 +0200

    Fix typo

commit 7a4f0649ac5e71f39f0bef7f2e1fcb6fafad0291
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 00:16:31 2018 +0200

    Fix typo

commit 48c33fb3f9ab1ad287987d147ee4bbe186f7ade1
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 00:07:42 2018 +0200

    Fix typo

commit 809f01ca4f785a7b5bc9cc2c388e0ae814ecaa95
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Tue Feb 27 00:02:34 2018 +0200

    Fix typo

commit fec279cac89aa917be929447c81177811728361a
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Mon Feb 26 23:55:27 2018 +0200

    Fix typo

commit cf81b4e12399570545372d4c9daceca8e70142d5
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Mon Feb 26 23:48:43 2018 +0200

    Fix typo

commit 3bbcc3d9986caf8df99bec5d8a18d0f0c8990e06
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Mon Feb 26 23:28:52 2018 +0200

    Fix typo

commit f639727525dbd23f5f2d0f89e7be13d868e984c3
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Mon Feb 26 23:13:12 2018 +0200

    Fix typos

commit 55262fe9c5e1e127c6b817a0c2ab3f9db3ac35b9
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Mon Feb 26 22:46:52 2018 +0200

    Remove space for word "backup"

commit 61d52797d4d26a90dcc15e2bcd6f19a5f36faac3
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Mon Feb 26 22:23:31 2018 +0200

    Fix typos in zmq.md

commit f2ce50f10e67b4265e559a432681bc44828ae59b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Mon Feb 26 22:12:58 2018 +0200

    Fix typo in security-warnings.md

commit af7dfe046c12109e44ddc18dff07ede8755cf4f9
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date:   Mon Feb 26 21:59:24 2018 +0200

    Fix typos

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2018-03-02 11:45:05 +00:00
Jason Davies 4ec29af154 Fix typo in comment: should link to issue #1359. 2018-03-01 23:35:08 +00:00
Jack Grigg c4379e3a22
Add configure flags for enabling ASan/UBSan and TSan 
Co-authored-by: Robert Seacord <rcseacord@gmail.com>
 2018-03-01 16:04:42 +00:00
Jack Grigg 1d6f7acf4d
make-release.py: Versioning changes for 1.0.15. 2018-02-28 16:44:07 +00:00
Jack Grigg 138cf77004
Overwinter release notes and testnet activation height 
Closes #2957.
 2018-02-28 13:19:36 +00:00
Jack Grigg 704b76358d
Use block hash comparison for consistency check when loading block index 
The Equihash check caused block index loading to take around 38x longer.
However, we don't need to check it directly, as the only paths to writing a
block header to disk already go through a proof-of-work check (e.g. receiving a
block over the network). By forcing the block header inside the CBlockIndex to
be re-serialized, we retain the benefits of the consistency check without the
overhead at startup.

Co-authored-by: Brad Miller <brad@z.cash>
 2018-02-27 00:47:56 +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
Jay Graber 7b92f27e18 Add expiry to z_mergetoaddress 2018-02-23 15:15:46 -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
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
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
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 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
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
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
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
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
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
Jack Grigg a3353b4e01
Regenerate SignatureHash tests 2018-02-20 04:22:21 +00:00