Commit Graph

14241 Commits

Author SHA1 Message Date
jl777
2df89273c1 +print 2018-04-16 16:42:41 +03:00
ca333
b8d174ef94 add Makefile 2018-04-16 15:18:45 +02:00
jl777
11077d9019 Disable auto rewind 2018-04-16 13:05:52 +03:00
jl777
7db1433a02 Disable auto rewind 2018-04-16 13:05:13 +03:00
jl777
8441f3f92f Disable auto rewind 2018-04-16 13:03:58 +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
5db22eedcb if ( pindex != 0 ) 2018-04-16 11:31:05 +03:00
jl777
562deb53ca Test validity in mined block path 2018-04-16 11:31:05 +03:00
jl777
7a1b1fc4ff if ( pindex != 0 ) 2018-04-16 11:30:11 +03:00
jl777
7101b35b2d Deal with missing prev 2018-04-16 10:30:46 +03:00
jl777
2a32e55a31 Blockader 2018-04-16 10:25:20 +03:00
jl777
e73b2055c6 Merge branch 'beta' into mergemaster
# Conflicts:
#	src/main.cpp
2018-04-16 10:16:01 +03:00
jl777
9226f69ef1 +prints 2018-04-16 09:55:38 +03:00
jl777
d3e5f6b7c3 return false; 2018-04-16 09:09:38 +03:00
jl777
78ca477a56 Set pindexPrev 2018-04-16 09:08:04 +03:00
jl777
cfefc9211b Miner fixes 2018-04-16 08:59:42 +03:00
jl777
b95368bf87 Mining fix 2018-04-16 08:56:27 +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
ca333
afa02103c9 update Makefile 2018-04-16 07:21:04 +02: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
ca333
5da8e41df2 fix Makefile 2018-04-16 06:48:44 +02: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
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
7413e8565f Move equihash test 2018-04-16 06:01:39 +03:00
jl777
9e9cf3011b Test 2018-04-16 05:59:27 +03:00
jl777
5a2a0543f9 Test 2018-04-16 05:44:41 +03:00
jl777
d608d49460 Prevent PoW check during premising 2018-04-16 05:43:21 +03:00
jl777
bea77378f9 Merge pull request #585 from jl777/dev
Dev
2018-04-16 05:34:21 +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