Commit Graph

23688 Commits

Author SHA1 Message Date
ca333
35f5119b0a fix darwin build config
resolve conflict from major update
2018-04-20 15:44:33 +02:00
ca333
e8bac1cf04 Merge pull request #19 from jl777/dev
dev
2018-04-20 15:40:51 +02:00
pbca26
81bf7c7a8d Merge pull request #4 from loxal/patch-2
A reference komodo.conf for a Xeon class node
2018-04-20 14:29:53 +03:00
pbca26
c7b7afc059 Merge pull request #16 from jl777/master
Compensate for processblock
2018-04-20 14:29:32 +03:00
pbca26
720372e9c8 Merge pull request #17 from jl777/beta
Beta update from jl777 repo
2018-04-20 14:29:23 +03:00
jl777
3128a24af6 Test 2018-04-20 13:35:16 +03:00
jl777
563d507c61 Test 2018-04-20 13:30:54 +03:00
jl777
cfb55edbbc Test 2018-04-20 13:25:22 +03:00
jl777
7b025a4790 Test 2018-04-20 13:24:48 +03:00
jl777
dd66e3af3a Test 2018-04-20 13:20:26 +03:00
jl777
e16d22ee0f Test 2018-04-20 13:13:18 +03:00
jl777
9464ac21bc Test 2018-04-20 13:03:27 +03:00
jl777
820600d13f Test 2018-04-20 12:43:08 +03:00
jl777
b85130925b Test 2018-04-20 12:42:27 +03:00
jl777
66dd02d288 Test 2018-04-20 12:32:39 +03:00
jl777
b1d85b23e6 Test 2018-04-20 12:21:01 +03:00
jl777
519578c9c9 Test 2018-04-20 12:17:02 +03:00
jl777
0f102ea7e3 Test 2018-04-20 12:14:11 +03:00
jl777
5295318ec4 Test 2018-04-20 12:08:51 +03:00
jl777
8dcf7f3fab Test 2018-04-20 12:07:57 +03:00
jl777
b5d0fe2e24 Test 2018-04-20 11:55:06 +03:00
jl777
b92dfb1eb5 Test 2018-04-20 11:53:02 +03:00
Jack Grigg
22ffe8ce44 Remove now-unshadowed serialization lines that do nothing
Previously we had both nVersion as a class parameter *and* a serialization
argument, and in several inherited serializers the latter was set to the former,
in order to pass the serialized object's version into underlying parsers. #3180
pulled in the upstream changes to clean this up, and in doing so these lines
became no-ops - setting the class parameter to itself. Clang throws warnings on
this, which turn into errors on the MacOS builder.

We can just remove these, because upstream already had done so in earlier PRs,
indicating that they were not being relied on by underlying parsers.
2018-04-20 09:48:33 +01:00
jl777
7732dbc26b Test 2018-04-20 11:34:37 +03:00
jl777
9850dffd80 Test 2018-04-20 11:30:27 +03:00
jl777
fd835d9406 Test 2018-04-20 11:29:12 +03:00
Homu
5821bb0a4d Auto merge of #3185 - ebfull:sapling-testnet-params, r=str4d
Load Sapling testnet parameters into memory

This PR depends on https://github.com/zcash/librustzcash/pull/4.

The parameters are not loaded into memory if `zcashd` is configured as a mainnet node -- this is something we can change in the weeks before `2.0.0`.
2018-04-20 01:28:13 -07:00
jl777
592f6fa210 Test 2018-04-20 11:24:41 +03:00
jl777
bc2bcf8551 Test 2018-04-20 11:24:01 +03:00
jl777
4aad3872a9 Test 2018-04-20 11:20:57 +03:00
jl777
bee39cbbbb Test 2018-04-20 11:20:11 +03:00
jl777
17522a5557 Test 2018-04-20 11:19:35 +03:00
jl777
415f5097cf Test 2018-04-20 10:59:21 +03:00
jl777
e14073653c Test 2018-04-20 10:55:12 +03:00
jl777
6d3df1e66c Test 2018-04-20 10:47:27 +03:00
jl777
4f48647cdc Test 2018-04-20 10:30:40 +03:00
jl777
97ecac6248 Merge pull request #598 from jl777/jl777
Jl777
2018-04-20 09:59:56 +03:00
jl777
26f6fa01cb Add back MoM that dev merge undid 2018-04-20 09:38:46 +03:00
jl777
74d30ec279 Merge branch 'dev' into jl777 2018-04-20 09:32:24 +03:00
jl777
a6f1662b4e Merge pull request #597 from ca333/patch-8
fix windows support
2018-04-20 09:32:05 +03:00
ca333
e59cd065e8 add windows condition
WIN specific libboost fix
2018-04-20 05:25:00 +02:00
ca333
64be5a8b41 Merge pull request #72 from DeckerSU/dev-winpatch-ca333
src/snark patches for windows build [needs check]
2018-04-20 03:53:10 +02:00
DeckerSU
390b0a79b2 Merge branch 'patch-8' of https://github.com/ca333/komodo into dev-winpatch-ca333 2018-04-20 03:38:00 +03:00
DeckerSU
5a83e4fc3f src/snark patches for windows build 2018-04-20 03:32:45 +03:00
ca333
942e45b592 add windows port
use windows.h for WIN crossbuild
2018-04-20 01:56:09 +02:00
jl777
02290a3fd8 Test 2018-04-20 01:15:21 +03:00
jl777
8d028ba061 Test 2018-04-20 01:06:43 +03:00
jl777
7377cedcf6 Test 2018-04-20 00:40:03 +03:00
jl777
65b4e8809d Test 2018-04-20 00:39:38 +03:00
jl777
8eb43ab4ff Decrement notes for assetchains, need to test 2018-04-20 00:23:58 +03:00