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
jl777
9850ab03d4
Test
2017-10-23 13:42:02 +03:00
jl777
05e307ec9e
Test
2017-10-23 13:40:00 +03:00
jl777
36c733e967
Test
2017-10-23 13:27:15 +03:00
jl777
0a3fa75723
Test
2017-10-23 13:21:14 +03:00
jl777
64ef675b85
Test
2017-10-23 13:15:57 +03:00
jl777
d0d61f8f47
Test
2017-10-23 13:03:39 +03:00
jl777
0b27cefac1
Test
2017-10-23 13:00:54 +03:00
jl777
66134a2290
Test
2017-10-23 12:53:51 +03:00
jl777
7c18529bef
Test
2017-10-23 12:52:15 +03:00
jl777
5d3c018631
Test
2017-10-23 12:40:34 +03:00
jl777
fac8d1ff97
Test
2017-10-23 12:36:34 +03:00
jl777
a4f48f0079
Test
2017-10-23 12:21:44 +03:00
jl777
7df54c3275
Test
2017-10-23 12:14:21 +03:00
jl777
f480802b46
Test
2017-10-23 12:11:58 +03:00
jl777
a0b9382cb9
Test
2017-10-23 12:10:22 +03:00
jl777
ee5e8026ae
Allow asset chains notarization.11
2017-10-23 11:39:58 +03:00
Scott Sadler
2356884c5f
function to create a cryptocondition from a Univalue
2017-10-22 23:27:44 -07:00
Scott Sadler
8fa1b4be0e
upgrade cJSON and move cJSON extensions to different module
2017-10-22 21:57:07 -07:00
ca333
b5bde7e591
333
2017-10-23 00:33:56 +02:00
Scott Sadler
342611f932
add rpccryptoconditions
2017-10-21 23:23:57 -07:00
ca333
4847823816
Merge branch 'dev' of https://github.com/ca333/komodo into dev
2017-10-22 04:09:23 +02:00
ca333
a2d7c036e0
darwin 333
2017-10-22 04:08:53 +02:00
Scott Sadler
a032ddea1f
configure.ac must not include cryptoconditions in AC_CONFIG_SUBDIRS because that disables shared linking. cryptoconditions must not include config.h because that includes conflicting variables.
2017-10-21 17:54:17 -07:00
ca333
3957e2b74a
Merge pull request #58 from jl777/dev
...
dev update
2017-10-21 21:43:57 +02:00
