Commit Graph

16997 Commits

Author SHA1 Message Date
jl777
e8cb981dd0 Test 2017-11-03 19:24:53 +02:00
jl777
314350e695 KOMODO_ENDOFERA 2017-11-03 19:22:56 +02:00
Homu
086c6bed58 Auto merge of #2704 - bitcartel:fix_qa_shieldcoinbase_hang, r=str4d
Fix an issue where qa test wallet_shieldcoinbase could hang.

Closes #2703. The mempool was not synced so a block could be generated and not
clear out the mempool.  This would then cause subsequent code
which expected the mempool of all nodes to be empty to hang.
2017-11-03 02:06:10 -07:00
Simon
337bca8125 Fix an issue where qa test wallet_shieldcoinbase could hang.
The mempool was not synced so a block could be generated and not
clear out the mempool.  This would then cause subsequent code
which expected the mempool of all nodes to be empty to hang.
2017-11-03 00:39:23 -07:00
Homu
3775ac5250 Auto merge of #2692 - bitcartel:2639_enable_z_shieldcoinbase, r=str4d
Closes #2639. z_shieldcoinbase is now supported, no longer experimental.

This reverts commit 5023af7bd5.
2017-11-02 00:18:40 -07:00
Simon
c5dabd2b66 Closes #2639. Adds optional limit parameter with a default value of 50.
The new parameter is to satisfy the principle of least astonishment
by providing a sensible default for the maximum number of transparent
inputs to shield.  If users do not configure -mempooltxinputlimit
it is possible for them to create transactions with hundreds of
inputs which suffer from mining delay, due to the current state of
the network where some miners have configured -mempooltxinputlimit
as a way to deal with the problem of quadratic hashing.
2017-11-01 10:40:24 -07:00
Simon
1051242926 Closes #2576. Update link to security info on z.cash website. 2017-10-31 20:31:40 -07:00
Homu
08c91f49e6 Auto merge of #2698 - bitcartel:2263_fix_broken_pipe, r=str4d
Fix broken pipe error on some platforms when running qa test wallet_protectcoinbase.py

Closes #2263.
2017-10-31 15:47:05 -07:00
Ariel Gabizon
4305a56221 boost::format -> tinyformat 2017-11-01 02:11:49 +13:00
Sean Bowe
394f41853b Integrate low memory prover. 2017-11-01 02:11:49 +13:00
Sean Bowe
c8a7f74753 Add streaming prover. 2017-11-01 02:11:49 +13:00
Sean Bowe
abf4af12df Refactor proof generation function. 2017-11-01 02:11:46 +13:00
kozyilmaz
35e12d992a empty spaces in PATH variable cause build failure 2017-10-31 15:14:21 +03:00
ca333
eeaec53966 update travis config 2017-10-31 01:43:52 +01:00
ca333
e11eb529b9 Merge pull request #60 from jl777/dev
dev update
2017-10-31 01:41:23 +01:00
jl777
31e342b831 Notarize CHIPS 2017-10-30 21:03:20 +02:00
Simon
cf72e8e06e Closes #2263 fixing broken pipe error. 2017-10-30 11:58:37 -07:00
jl777
0f8433ce45 Merge pull request #498 from jl777/dPoW
fixes assetchain detection of notarizations and universal build
2017-10-26 23:48:25 +03:00
Simon
c2d3bafeaa Closes #2639. z_shieldcoinbase is now supported, no longer experimental.
This reverts commit 5023af7bd5.
2017-10-26 11:29:36 -07:00
jl777
2c1ea2350a Remove print 2017-10-26 15:51:25 +03:00
jl777
b8c28d758e Merge pull request #497 from jl777/beta
fix assetchains notarization detection and universal build
2017-10-26 15:01:17 +03:00
Homu
fbd59653a2 Auto merge of #2687 - leto:patch-1, r=str4d
Update performance-measurements.sh

Fix error message, as per @daira
2017-10-24 15:29:09 -07:00
Duke Leto
a20b975a52 Update performance-measurements.sh
Fix error message, as per @daira
2017-10-24 14:50:26 -07:00
jl777
d303e4b8d3 Merge pull request #496 from jl777/dev
Undefine cJSON bools
2017-10-24 13:26:13 +03:00
jl777
9e8cfd58a9 Undefine cJSON bools 2017-10-24 13:24:02 +03:00
jl777
6e340b9ebb Merge pull request #495 from jl777/dev
Dev
2017-10-24 12:20:30 +03:00
jl777
58fbfec10c Merge pull request #494 from ca333/dev
dev update
2017-10-24 12:19:27 +03:00
ca333
5c4beea04c Merge pull request #59 from jl777/dev
dev update
2017-10-24 05:34:58 +02:00
ca333
3c3668af5e 333 2017-10-24 05:27:21 +02:00
Homu
6b58fd2c99 Auto merge of #2665 - leto:perf_fix, r=str4d
Fix bug where performance-measurements.sh fails hards when given no args

Better than "$1: unbound variable", we ran into this when testing this script in the Hush repo, so we are pushing this fix upstream.
2017-10-23 18:37:05 -07:00
Homu
fb2f98e00b Auto merge of #2555 - jasondavies:fix-2554, r=str4d
Fix various thread assertion errors caused during shutdown.

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6719
- bitcoin/bitcoin#6990
- bitcoin/bitcoin#8421
  - Second commit only in this PR
- bitcoin/bitcoin#11006

I've cherry-picked the relevant commits, along with a note in each commit referring to the original Bitcoin commit ID (and the Zcash issue numbers where applicable).  I've tested each issue with/without these patches applied.

Closes #2214, #2334, and #2554.
2017-10-23 15:15:14 -07:00
jl777
70bd41b2be Merge pull request #493 from libscott/refactor_cjson
Upgrade cJSON and move customizations to komodo_cJSON (PR to dev)
2017-10-23 21:07:25 +03:00
Scott Sadler
d430a5e8ca upgrade cJSON and move customizations to komodo_cJSON 2017-10-23 09:55:37 -07:00
jl777
911a8ce104 Merge pull request #492 from jl777/dev
reduce printouts
2017-10-23 16:45:50 +03:00
jl777
890374f4b0 Test 2017-10-23 16:44:59 +03:00
jl777
20b13d813c Test 2017-10-23 16:22:13 +03:00
jl777
b3e1e4e67a Test 2017-10-23 16:20:00 +03:00
João Barbosa
d3c8109b41 Improve shutdown process
Zcash: cherry-picked from commit 793667af1c31835e0eefcdd283930bb89cfeda8f
2017-10-23 14:14:45 +01:00
jl777
435de47a21 Test 2017-10-23 15:56:39 +03:00
jl777
db758ed3de Test 2017-10-23 15:55:29 +03:00
jl777
29f356e9c4 Merge pull request #491 from jl777/dev
Speed up npoints
2017-10-23 15:49:51 +03:00
jl777
ebfe4120fb Speed up npoints 2017-10-23 15:49:13 +03:00
jl777
47d6d62696 Merge pull request #490 from jl777/dev
fix assetchains notarization detection
2017-10-23 15:18:28 +03:00
jl777
78b3ac8f87 Test 2017-10-23 14:58:43 +03:00
jl777
5d1193043a Test 2017-10-23 14:39:53 +03:00
jl777
ca74f18693 Test 2017-10-23 14:39:25 +03:00
jl777
514018d9ac Test 2017-10-23 14:36:00 +03:00
jl777
05c1e522c0 Test 2017-10-23 13:54:39 +03:00
jl777
34c68daaa9 Test 2017-10-23 13:49:19 +03:00
jl777
21abd4df81 Test 2017-10-23 13:45:05 +03:00