Commit Graph

16291 Commits

Author SHA1 Message Date
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
jl777
1758d3df46 KOMODO_NEWBLOCKS 2018-04-15 23:55:51 +03:00
jl777
d9daa6281a Prevent autorewind if syncing. Not a critical update 2018-04-15 23:25:26 +03:00
jl777
03e2210d24 Test 2018-04-15 23:22:22 +03:00
jl777
14c144030a Fix non-static n -> n0/n1 2018-04-15 22:33:44 +03:00
jl777
7f0228a121 Change n0/n1 size to int32_t 2018-04-15 22:32:03 +03:00
jl777
c8a89440ac Syntax 2018-04-15 22:14:35 +03:00
jl777
df280f67b3 Fix n -> static n0/n1 2018-04-15 22:12:27 +03:00
jl777
8d65568383 main.cpp from dev 2018-04-15 21:15:20 +03:00
jl777
02626c56b2 Test 2018-04-15 20:59:34 +03:00
jl777
549446dd13 Test 2018-04-15 20:44:32 +03:00
jl777
a1f98933bc Test 2018-04-15 20:43:36 +03:00
jl777
caf6b6b54a KOMODO_LONGESTCHAIN = height; 2018-04-15 20:30:30 +03:00
jl777
59e8a4f7ee Sync main.cpp to jl777 2018-04-15 20:27:23 +03:00
jl777
edf5038441 -newlines 2018-04-15 20:07:56 +03:00
jl777
2c8d6b2246 One shot rewind 2018-04-15 20:06:30 +03:00