Commit Graph

16306 Commits

Author SHA1 Message Date
jl777
bdeeaa4978 Test 2018-04-16 08:29:21 +03:00
jl777
7b136bcd74 Merge branch 'dev' into devmerge
# Conflicts:
#	src/init.cpp
#	src/komodo_bitcoind.h
#	src/komodo_events.h
#	src/komodo_notary.h
#	src/komodo_structs.h
#	src/main.cpp
#	src/pow.cpp
#	src/rpcblockchain.cpp
2018-04-16 08:28:20 +03:00
jl777
9dd93da474 Test validity in mined block path 2018-04-16 08:23:29 +03:00
jl777
6e0857cee1 Fix 2018-04-16 08:09:36 +03:00
jl777
64c8549164 Fix 2018-04-16 08:03:53 +03:00
jl777
e60ac1ca04 Fix 2018-04-16 08:02:27 +03:00
jl777
60eafafa52 Use CreateJoinSplit.cpp method for wallet-utility.cpp 2018-04-16 08:01:06 +03:00
jl777
e8972fab17 Fix 2018-04-16 08:00:07 +03:00
jl777
12b1a8af4c Extern MAX_MONEY 2018-04-16 07:56:48 +03:00
jl777
1abdb0de13 MAX_MONEY declare 2018-04-16 07:55:06 +03:00
jl777
2b9acc59fc Merge pull request #586 from ca333/patch-5
fix Makefile
2018-04-16 07:52:02 +03:00
ca333
5da8e41df2 fix Makefile 2018-04-16 06:48:44 +02:00
jl777
f64557f7e0 Test 2018-04-16 07:19:36 +03:00
jl777
c29e5dd704 -libsnark/gtests.cpp 2018-04-16 07:15:11 +03:00
jl777
ff84ea5301 -wallet utility 2018-04-16 07:00:56 +03:00
jl777
6c537f91c0 Merge branch 'dev' into devmerge
# Conflicts:
#	src/init.cpp
#	src/komodo_bitcoind.h
#	src/komodo_events.h
#	src/komodo_notary.h
#	src/komodo_structs.h
#	src/main.cpp
#	src/pow.cpp
#	src/rpcblockchain.cpp
2018-04-16 06:57:36 +03:00
jl777
bd1f06d8b6 Declare taxied 2018-04-16 06:14:10 +03:00
jl777
cd6830c5e1 Strip git diff 2018-04-16 06:07:52 +03:00
jl777
b63b56277b Merge pull request #584 from scottgrayson/trunk-merge
Fix merge conflicts for Bitcore PR
2018-04-16 06:02:56 +03:00
jl777
96f9009e29 Fixup mining PoW checks 2018-04-16 05:25:07 +03:00
jl777
3283cb53e7 Prints 2018-04-16 05:02:26 +03:00
Scott Grayson
0c4f43951e Merge branch 'dev' of https://github.com/jl777/komodo into trunk-merge
* 'dev' of https://github.com/jl777/komodo: (1062 commits)
  Delay PoW check until connect block
  Declare
  KOMODO_NEWBLOCKS
  Prevent autorewind if syncing. Not a critical update
  Change n0/n1 size to int32_t
  Syntax
  Fix n -> static n0/n1
  Test
  Test
  Test
  KOMODO_LONGESTCHAIN = height;
  Sync main.cpp to jl777
  -print
  -USD/EUR
  readme
  curl fix
  -print
  Fix buffer overflows and reduce KMD men usage
  -print
  Test
  ...
2018-04-15 21:59:37 -04:00
jl777
9a0f279889 Test 2018-04-16 04:56:27 +03:00
jl777
d4ae49affd Syntax 2018-04-16 04:33:31 +03:00
jl777
f8ba64736f Test miner 2018-04-16 04:21:30 +03:00
jl777
ba6c9a5a47 Move equihash to check block 2018-04-16 04:18:35 +03:00
jl777
f64a0444d0 Restore fixes 2018-04-16 03:40:49 +03:00
jl777
c51be288c5 +error return 2018-04-16 03:39:37 +03:00
jl777
b012e5ed5d Delay PoW check until connect block 2018-04-16 02:48:12 +03:00
jl777
8bb84dabc4 -print 2018-04-16 02:47:29 +03:00
jl777
3d3f275f14 +prints 2018-04-16 02:45:36 +03:00
jl777
da4020cb61 Test 2018-04-16 02:35:19 +03:00
jl777
b6aa98f662 Test 2018-04-16 02:24:40 +03:00
jl777
f6cad5cc70 Test 2018-04-16 02:21:05 +03:00
jl777
07359935eb Test 2018-04-16 02:15:18 +03:00
jl777
bd8997bfa7 Test 2018-04-16 02:11:53 +03:00
jl777
44c0859ffb Test 2018-04-16 02:07:45 +03:00
jl777
0edbd23e8c Test 2018-04-16 01:59:38 +03:00
jl777
073cf3b29d Test 2018-04-16 01:54:44 +03:00
jl777
58ce89f01b Disable PoW outside of connect 2018-04-16 01:51:23 +03:00
jl777
872cf91b44 Test accepting failed check block 2018-04-16 01:35:35 +03:00
jl777
04a1f0bbc3 Test 2018-04-16 01:24:58 +03:00
jl777
9142a36868 Test 2018-04-16 01:17:20 +03:00
jl777
7156407825 Test 2018-04-16 01:16:16 +03:00
jl777
176eeb772d Test 2018-04-16 01:15:30 +03:00
jl777
876e74e980 Test 2018-04-16 01:09:02 +03:00
jl777
49601901de Test 2018-04-16 01:04:37 +03:00
jl777
d828f57946 Test 2018-04-16 00:22:22 +03:00
jl777
7466a33007 Test 2018-04-16 00:03:29 +03:00
jl777
9c0f7e8947 Declare 2018-04-15 23:56:46 +03:00