Commit Graph

27210 Commits

Author SHA1 Message Date
jl777
1231c3240d Merge remote-tracking branch 'origin/FSM' into FSM
# Conflicts:
#	src/cc/CCtx.cpp
2019-01-25 16:45:19 -11:00
jl777
524342f7ba Single #define _MAX_BLOCK_SIZE to set max block size 2019-01-25 16:43:57 -11:00
jl777
fc515c1f4a Merge pull request #1206 from DeckerSU/patch-gcc-8
Patch gcc 8
2019-01-25 16:37:17 -11:00
jl777
e4791f54e6 Merge branch 'FSM' into patch-gcc-8 2019-01-25 16:33:13 -11:00
blackjok3rtt
0d8bd51091 Merge pull request #16 from jl777/jl777
Jl777
2019-01-26 11:01:54 +08:00
DeckerSU
52cfb02f40 komodo_activate_sapling return value fix 2019-01-26 04:21:55 +03:00
DeckerSU
a6e7da55e2 fix gcc-8 / g++-8 build 2019-01-26 03:09:54 +03:00
blackjok3r
5131e12bd7 sorrry 2019-01-26 03:00:57 +08:00
blackjok3r
0875e0ecf1 fix setgenerate false 2019-01-26 02:52:54 +08:00
blackjok3r
2bff24cffe fix LABST is not staked = 2. Will stop having any block reward. 2019-01-26 00:58:17 +08:00
blackjok3r
e9bd3e1d67 try change version 2019-01-25 23:44:04 +08:00
blackjok3rtt
eceffe5f5a Merge pull request #15 from jl777/dev
Dev
2019-01-25 21:14:36 +08:00
blackjok3r
ef567651e3 fix block1 to allow an ac_aupply. 2019-01-25 20:51:57 +08:00
jl777
6f28b46ba6 Merge pull request #1205 from jl777/dev
Dev
2019-01-25 01:31:12 -11:00
jl777
8fdb3ea055 Merge pull request #1204 from jl777/FSM
set nonz = 0
2019-01-25 01:29:33 -11:00
jl777
3ea404eaf3 Merge pull request #1203 from jl777/jl777
Jl777
2019-01-25 01:28:50 -11:00
jl777
07a05ccd6b -print 2019-01-25 01:27:55 -11:00
jl777
a268218d11 Nonz = 0 2019-01-25 01:24:33 -11:00
jl777
2246cd0c55 Nonz = 0 2019-01-25 01:24:05 -11:00
jl777
9dda24f913 set nonz = 0 2019-01-25 01:23:36 -11:00
blackjok3r
d5b76cee9d try fix extralen bug. Add is_STAKED == 2 to have a consensus block reward of 0. 2019-01-25 19:59:42 +08:00
jl777
b4a9c7e504 Init nonz 2019-01-25 00:57:40 -11:00
blackjok3r
4bda6bcac4 Change is_STAKED so that chains with a BR are 1 and chains with none are 2. Chains that are 255 are banned, and no notarisations can happen. 2019-01-25 19:14:22 +08:00
blackjok3rtt
04f7f39d23 Merge pull request #79 from KMDLabs/mastertest
Merge MaterTest to master.
2019-01-25 18:09:07 +08:00
blackjok3r
fd1de72c60 fixed 2019-01-25 16:54:27 +08:00
blackjok3r
63eda9498a test fix 2019-01-25 16:50:15 +08:00
blackjok3r
73e71d5e4e fix 2019-01-25 16:42:50 +08:00
blackjok3r
b984401e96 add ca333's Makefile, change depend to hardcoded berkely DB in depnds folder. Add exception for COINABSE_MATURITY =1 for all LABS chains. 2019-01-25 16:18:00 +08:00
jl777
d336a9276c Merge pull request #1201 from jl777/kolo
OUR asset
2019-01-24 19:50:35 -11:00
jl777
e5ab582a33 Merge pull request #1202 from jl777/dev
Dev
2019-01-24 19:48:46 -11:00
Mihail Fedorov
ebf84f3055 OUR asset 2019-01-25 01:54:33 +03:00
Mihail Fedorov
9bc086de8e OUR asset 2019-01-25 01:52:45 +03:00
Mihail Fedorov
03130a6856 OUR asset 2019-01-25 01:52:24 +03:00
jl777
9370bdbe16 Merge pull request #1179 from jl777/FSM
FSM
2019-01-24 05:09:36 -11:00
jl777
1b53f34527 Use tmp 2019-01-24 04:18:54 -11:00
jl777
ed73fd8423 Undo tmpfile 2019-01-24 04:16:01 -11:00
jl777
d682dfd830 +print 2019-01-24 03:42:27 -11:00
jl777
d797bce94d Test 2019-01-24 03:34:10 -11:00
jl777
10b7fff5bc Static 2019-01-24 03:32:22 -11:00
jl777
d8611d936d FlushStateMode 2019-01-24 03:30:17 -11:00
jl777
f5ad6948fc -recvtx 2019-01-24 03:28:26 -11:00
blackjok3rtt
6a8a3731f0 Merge pull request #14 from jl777/jl777
Jl777
2019-01-24 22:28:04 +08:00
jl777
df9d2ddc97 Test 2019-01-24 03:11:31 -11:00
jl777
eda67fa9d6 bool ReceivedBlockTransactions(const CBlock &block, CValidationState& state, CBlockIndex *pindexNew, const CDiskBlockPos& pos) 2019-01-24 03:04:10 -11:00
jl777
f44e95a3f5 nDataPos 2019-01-24 03:02:21 -11:00
jl777
4c4c50cbd7 Receive transactions 2019-01-24 03:01:02 -11:00
jl777
b963af2269 Tmp undo file 2019-01-24 02:41:08 -11:00
jl777
f9e2487fdd Mark new file as dirty 2019-01-24 02:37:35 -11:00
jl777
86ee8f6550 Switch to main file from temp files 2019-01-24 02:33:21 -11:00
jl777
05371f93bd +print 2019-01-24 02:30:39 -11:00