Commit Graph
100 Commits
Author SHA1 Message Date
jl777 cfea8d0ff5 New notaries activate 814000 2018-04-17 10:39:11 +03:00
jl777 32b915c93d test 2018-04-17 10:24:56 +03:00
jl777 5afd0f5da3 Test 2018-04-16 23:26:51 +03:00
jl777 f7ce3004cd Test 2018-04-16 23:15:02 +03:00
jl777 79d6d16cfc Test 2018-04-16 23:06:03 +03:00
jl777 707b061c25 Test 2018-04-16 23:03:05 +03:00
jl777 404721449e Test 2018-04-16 22:54:24 +03:00
jl777 c77a5f86da Test 2018-04-16 22:30:18 +03:00
jl777 fb64a588cf Test 2018-04-16 21:44:12 +03:00
jl777 26d9f4c347 Test 2018-04-16 21:11:35 +03:00
jl777 a658d9269f Test 2018-04-16 21:08:20 +03:00
jl777 0f5e787bbc Test 2018-04-16 20:57:44 +03:00
jl777 a8854ddf14 Test 2018-04-16 20:51:08 +03:00
jl777 973793f757 Test 2018-04-16 20:50:13 +03:00
jl777 958ee90a65 Test 2018-04-16 20:49:11 +03:00
jl777 70ebf02a21 Test 2018-04-16 20:46:10 +03:00
jl777 dac3c30c1a Test 2018-04-16 20:31:42 +03:00
jl777 8960e442e2 Test 2018-04-16 20:20:20 +03:00
jl777 b2e33f78fe Test 2018-04-16 20:17:53 +03:00
jl777 a30dd993bf Test 2018-04-16 20:16:28 +03:00
jl777 e284540042 Test 2018-04-16 20:01:00 +03:00
jl777 3ad8d2478f Test 2018-04-16 19:46:37 +03:00
jl777 5d173d2a9a Blockader 2018-04-16 17:11:14 +03:00
jl777 edddf5f020 Allow genesis: must update 2018-04-16 16:47:47 +03:00
jl777 b8dd52900a Disable auto rewind 2018-04-16 13:02:38 +03:00
jl777 68cf8a7e66 Fix 2018-04-16 12:21:46 +03:00
jl777 5215d24e81 Test another chance 2018-04-16 12:19:54 +03:00
jl777 54bf05383c if ( pindex != 0 ) 2018-04-16 11:31:34 +03:00
jl777 1d9d9b4f80 Devmerged 2018-04-16 08:41:04 +03:00
jl777 85db84a770 Merge branch 'devmerge' into jl777
# Conflicts:
#	src/komodo_globals.h
2018-04-16 08:40:08 +03:00
jl777 4d9b5edbcf Test 2018-04-16 08:35:52 +03:00
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 c01b993644 Test 2018-04-16 07:45:26 +03:00
jl777 455ba30411 Fix getblocktemplate 2018-04-16 07:41:57 +03: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 96f9009e29 Fixup mining PoW checks 2018-04-16 05:25:07 +03:00
jl777 3283cb53e7 Prints 2018-04-16 05:02:26 +03: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
jl777 412bb6a824 Test 2018-04-15 19:32:35 +03:00
jl777 2ca62c8784 Test 2018-04-15 19:32:01 +03:00
jl777 a9855467e2 Test 2018-04-15 19:14:57 +03:00
jl777 2cbb8be26b Test 2018-04-15 19:10:20 +03:00
jl777 15c97e2950 Test 2018-04-15 19:09:53 +03:00
jl777 c031c2c759 Test 2018-04-15 19:01:39 +03:00