DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
16,140 Commits 6 Branches 7 Tags
cd897e2b88e4e8c0ef95f4d30b6dde619ec09f62
Commit Graph
11912 Commits
Author SHA1 Message Date
ca333 5c4beea04c Merge pull request #59 from jl777/dev 
dev update
 2017-10-24 05:34:58 +02: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
Scott Sadler d430a5e8ca upgrade cJSON and move customizations to komodo_cJSON 2017-10-23 09:55:37 -07: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 ebfe4120fb Speed up npoints 2017-10-23 15:49:13 +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
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
Sean Bowe 1a9543d064 Remove crusty old "loadVerifyingKey"/"loadProvingKey" APIs and associated invariants. 2017-10-21 15:42:41 +03:00
Scott Sadler 2b67565e51 update cryptoconditions module ref 2017-10-20 23:44:45 -07:00
Scott Sadler 07f83521f7 basic integration of cryptoconditions 2017-10-19 14:08:32 -07:00
jl777 01071eaaba Disable pax pow for now 2017-10-19 23:29:42 +03:00
jl777 f19ffc34ca Test 2017-10-18 22:43:08 +03:00
jl777 79383e0a78 Change to new interest calc 2017-10-18 22:40:29 +03:00
Homu 4ca8f506d7 Auto merge of #2652 - str4d:820-libsnark-subtree, r=str4d 
Move libsnark in-repo as a git subtree

This PR pulls in the libsnark subtree at the exact commit that we currently fetch via the depends system. To verify:

```
$ ./contrib/devtools/git-subtree-check.sh src/snark
src/snark in HEAD was last updated to upstream commit 9ada3f84ab484c57b2247c2f41091fd6a0916573 (tree c10a38c759)
src/snark in HEAD currently refers to tree 34e916d3f6
:100644 100644 427f4f4ce9 13e54da68b M	Makefile
:040000 040000 42f29e42d1 dd73536163 M	src
FAIL: subtree directory tree doesn't match subtree commit tree
```

This shows that there are changes relative to what we currently use, due to the later commits in the PR. If we exclude them, we see that the code is identical:

```
$ git checkout 26a8f68ea8
$ ./contrib/devtools/git-subtree-check.sh src/snark
src/snark in HEAD was last updated to upstream commit 9ada3f84ab484c57b2247c2f41091fd6a0916573 (tree c10a38c759)
src/snark in HEAD currently refers to tree c10a38c759
GOOD
```

Closes #820.
 2017-10-17 20:41:11 -07:00
Jack Grigg d43b32bbfe Remove OpenSSL libraries from libsnark LDLIBS 
Unnecessary in the Zcash libsnark fork.
 2017-10-17 20:33:28 -07:00
Jack Grigg 99ca5e1a22 Ensure that libsnark is built first, so its headers are available 2017-10-17 19:04:38 -07:00
Jack Grigg e2283742db Add libsnark to "make clean" 2017-10-17 19:03:41 -07:00
jl777 89559d8575 Remove print 2017-10-16 21:16:37 +03:00