Commit Graph
12000 Commits
Author SHA1 Message Date
jl777 bc17ac4928 Merge remote-tracking branch 'zcash/master' into rebase
# Conflicts:
#	README.md
#	src/Makefile.gtest.include
#	src/chainparams.cpp
#	src/init.cpp
#	src/miner.cpp
#	src/wallet/wallet.cpp
2016-12-12 12:19:13 +02:00
jl777 132aea8c60 test 2016-12-12 10:37:59 +02:00
jl777 c5b295d857 test 2016-12-12 09:28:23 +02:00
jl777 d63fdb34cc test 2016-12-12 09:23:45 +02:00
jl777 716fb38229 suppress gateway for non-fiat 2016-12-12 09:15:20 +02:00
jl777 6b1a6da1f3 test 2016-12-11 10:01:23 +02:00
jl777 ff67b2413e test 2016-12-11 09:38:08 +02:00
jl777 72da1eea47 test 2016-12-10 22:15:46 +02:00
zkbot 9f7bc6cba5 Auto merge of #1904 - str4d:1749-write-witness-cache-with-best-block, r=ebfull
Write witness caches when writing the best block

For steady-state operation, this reduces the average time between wallet disk
writes from once per block to once per hour.

On -rescan, witness caches are only written out at the end along with the best
block, increasing speed while ensuring that on-disk state is kept consistent.

Witness caches are now never recreated during a -reindex, on the assumption that
the blocks themselves are not changing (the chain is just being reconstructed),
and so the witnesses will remain valid.

Part of #1749.
2016-12-09 21:11:15 +00:00
jl777 a7f87026bb mining fix, interests alloc fix, paxwithdraw mining 2016-12-09 17:10:12 +02:00
jl777 a62cf5ce2d test 2016-12-09 16:50:04 +02:00
jl777 206c579d09 test 2016-12-09 16:43:18 +02:00
jl777 fa0d10cc5c test 2016-12-09 16:06:50 +02:00
jl777 9b570fb1f2 test 2016-12-09 16:05:21 +02:00
jl777 0449e3f0a5 test 2016-12-09 15:11:56 +02:00
jl777 8ae929129a test 2016-12-09 15:08:10 +02:00
jl777 02c36c15f4 test 2016-12-09 15:04:42 +02:00
jl777 65d74516bb test 2016-12-09 14:59:04 +02:00
jl777 1bc5fdf882 test 2016-12-09 14:02:03 +02:00
Jack Grigg 9d2cc3a784 Make the test pass by fixing the bug! 2016-12-10 00:56:32 +13:00
Jack Grigg eeee6d5d6c Add a reindex test that fails because of a bug in decrementing witness caches
Ref: https://github.com/zcash/zcash/pull/1904#issuecomment-265992988
2016-12-10 00:51:32 +13:00
jl777 b8176b070c test 2016-12-09 13:23:01 +02:00
zkbot 6575dfba4e Auto merge of #1930 - arcalinea:revise-release-note-generation, r=str4d
Gather release notes from previous release to HEAD

Release-notes.py used to depend on release already being tagged--now gathers release notes from previous tagged release up to current HEAD.
2016-12-09 10:42:33 +00:00
Jay Graber c1e46db8ab Gather release notes from previous release to HEAD
Also update release-process.md to replace git shortlog command with
release-notes.py script.
2016-12-09 23:40:23 +13:00
jl777 431af13e5f test 2016-12-09 12:37:12 +02:00
jl777 aacc96f83e test 2016-12-09 12:35:25 +02:00
jl777 250195b07f tes 2016-12-09 12:33:57 +02:00
jl777 1e22f86563 test 2016-12-09 12:20:56 +02:00
jl777 a39d7b21d7 test 2016-12-09 12:17:58 +02:00
zkbot 02bb4df58d Auto merge of #1918 - bitcartel:timeout_cpu_throttling, r=str4d
Increase timeout as laptops on battery power have cpu throttling.

Merge this last as other PRs also update the test file `wallet_protectcoinbase.py`.
2016-12-09 09:03:37 +00:00
zkbot 0617e428e2 Auto merge of #1895 - bitcartel:1857_tx_priority, r=str4d
Closes #1857. Fixes bug where a transaction sending from a zaddr would have a priority of zero.

Transactions sent from a zaddr should now be mined sooner as they no longer have a priority of zero
2016-12-09 08:10:21 +00:00
zkbot 8a6c070bfa Auto merge of #1870 - str4d:1749-benchmark-rescanning, r=str4d
Add benchmarks for rescan components

Part of #1749.
2016-12-09 07:12:22 +00:00
zkbot a398121503 Auto merge of #1919 - ebfull:abstract-verification, r=str4d
Isolate verification to a ProofVerifier context object that allows verification behavior to be tuned by the caller.

This is an alternative foundation for #1892, i.e., #1892 will have to be changed if this PR is accepted.

I think this is a safer approach because it allows us to isolate verification behavior to a single object. This will come in handy when @arielgabizon finishes the batching code.
2016-12-09 06:22:53 +00:00
Sean Bowe 37cce214a4 ASSERT_TRUE -> ASSERT_FALSE 2016-12-08 23:14:23 -07:00
Jack Grigg 9755eb8292 Add JS to second block to ensure witnesses are incremented 2016-12-09 16:59:40 +13:00
Jack Grigg 88b7f3c28b Generate JS for trydecryptnotes, make number of addresses a variable 2016-12-09 16:59:39 +13:00
Jack Grigg a513ea90d4 Fix indentation 2016-12-09 16:59:34 +13:00
zkbot 07a728300b Auto merge of #1642 - str4d:add-solver-rate-to-getmininginfo, r=str4d
Add getlocalsolps and getnetworksolps RPC calls, show them in getmininginfo
2016-12-09 03:18:23 +00:00
zkbot f848d40c6d Auto merge of #1902 - bitcartel:1901_increase_default_settings_block_priority, r=str4d
Closes #1901. Increase default settings for max block size and space for priority transactions.

ref #1901
2016-12-09 00:33:01 +00:00
zkbot cdbd851417 Auto merge of #1928 - ebfull:fix-anchor-cache-bug, r=str4d
Fix anchor cache bug

Fixes #1912.

If an anchor is removed from the cache, but didn't exist in it beforehand, it will insert a blank tree. If it's reinserted in a child cache, when the child cache flushes it will mark the treestate as entered but won't bring the valid tree with it.

Thankfully, we assert when connecting blocks so that this inconsistency won't cause us to build on a blank tree after a reorg.
2016-12-08 21:22:23 +00:00
Sean Bowe 690171e268 Add more tests for ProofVerifier. 2016-12-08 12:47:41 -07:00
Sean Bowe eb82238dd0 Rename Dummy to Disabled. 2016-12-08 12:32:39 -07:00
jl777 daeecf9551 test 2016-12-08 19:03:39 +02:00
jl777 329e4359f3 test 2016-12-08 18:57:48 +02:00
jl777 da02b3be0c test 2016-12-08 18:50:21 +02:00
jl777 b8d7170d1c test 2016-12-08 18:47:19 +02:00
jl777 6e458bf3a0 test 2016-12-08 18:42:41 +02:00
zkbot e68e26c208 Auto merge of #1911 - bitcartel:1823_witness_does_not_have_same_anchor_as_change_input, r=str4d
With chained joinsplits, witness anchors for input notes no longer cross block boundaries

Closes #1823
2016-12-08 01:23:40 +00:00
zkbot 4af99fc45d Auto merge of #1909 - str4d:bash-completion, r=str4d
Bash completion

This PR pulls in bitcoin/bitcoin#8289, updates the bash completion files for use with Zcash, and bundles them into the Debian package.
2016-12-08 00:43:41 +00:00
zkbot aa1179b304 Auto merge of #1906 - str4d:1835-solaris-miniupnpc-patches, r=str4d
Apply MiniUPnP patches to enable compilation on Solaris 11

These can be removed after the next MiniUPnP release.

Closes #1835.
2016-12-08 00:04:39 +00:00