Commit Graph

14241 Commits

Author SHA1 Message Date
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
jl777
9cb1ec9c6e WIN32 -> _WIN32 2017-10-15 02:04:29 +03:00
jl777
1248a49e4f Fix windows .conf locations 2017-10-15 01:54:15 +03:00
jl777
7c49b46d5a Revert "Merge branch 'master' into dPoW"
This reverts commit a487e5a1d3, reversing
changes made to 6be96b7e1c.
2017-10-13 16:43:52 +03:00
jl777
a487e5a1d3 Merge branch 'master' into dPoW 2017-10-13 11:43:06 +03:00
Homu
af549fe6ed Auto merge of #2650 - str4d:2645-listunspent-benchmark, r=str4d
Add benchmark for listunspent

Closes #2645.
2017-10-12 15:24:53 -07:00
jl777
1625f62f58 More delay for assetchains.old 2017-10-12 23:51:01 +03:00
Jack Grigg
8598c20d40 Changes to get test_r1cs_ppzksnark passing 2017-10-11 21:15:49 +01:00
Jack Grigg
82e839e4ff Add "make libsnark-tests" that runs libsnark's "make check" 2017-10-11 15:22:24 +01:00
Jack Grigg
19f6668c27 Add "make check" to libsnark that runs the Google Tests 2017-10-11 15:21:44 +01:00
Jack Grigg
638e742f3f Update libsnark LDLIBS
-lsodium is necessary as we altered libsnark to use libsodium's RNG.
2017-10-11 15:19:33 +01:00
Jack Grigg
4699d0eb36 Add alt_bn128 to QAP and Merkle tree gadget tests 2017-10-11 15:18:01 +01:00
Jack Grigg
df3083fe4e Remove test code corresponding to removed code 2017-10-11 14:59:51 +01:00
Jack Grigg
054ae60645 Migrate libsnark test code to Google Test 2017-10-11 14:54:42 +01:00
jl777
fb58b26e51 Test 2017-10-10 16:00:35 +03:00
jl777
6cfebd395a Test 2017-10-10 15:44:55 +03:00
jl777
fc28273bfe Test 2017-10-10 15:20:08 +03:00
jl777
2ec7c24dc7 Test 2017-10-10 15:11:11 +03:00
jl777
4a5b2da93b Test 2017-10-10 15:04:52 +03:00
jl777
f71a47b0fa Test 2017-10-10 14:59:33 +03:00
jl777
319fa8be55 Test 2017-10-10 14:42:34 +03:00
jl777
1f8581e154 Test 2017-10-10 14:29:37 +03:00