Commit Graph

26556 Commits

Author SHA1 Message Date
dimxy
2ac92d7d6e result changed to VARR 2019-01-26 19:10:46 +05:00
dimxy
4b6b2a5540 'throw' changed to 'return result' on incorrect params
tx hex name = 'hex'
heirlist returns simple txid array now
2019-01-26 18:31:46 +05:00
jl777
57f6fd813a Merge pull request #1212 from jl777/FSM
FSM
2019-01-26 01:30:36 -11:00
jl777
f5ac1e19d9 Merge pull request #1211 from jl777/jl777
Jl777
2019-01-26 01:29:35 -11:00
jl777
9484ddf59b Merge pull request #1210 from KomodoPlatform/cclib_dyn
update linux makefile
2019-01-26 01:28:16 -11:00
ca333
25965a5307 Merge pull request #124 from jl777/jl777
sync cclib_dyn->jl777:jl777
2019-01-26 13:11:17 +01:00
ca333
18f8c77197 update linux makefile 2019-01-26 13:09:27 +01:00
ca333
fe4b34e9e3 add linux headers 2019-01-26 13:08:29 +01:00
blackjok3r
83387a82d3 wtf 2019-01-26 16:32:56 +08:00
blackjok3r
6d17cb5dec oopps 2019-01-26 16:00:03 +08:00
blackjok3r
3da846ce85 Merge branch 'FSM' of https://github.com/jl777/komodo 2019-01-26 15:59:29 +08:00
blackjok3r
9bf744ef26 fix getgenerate better 2019-01-26 15:08:00 +08:00
blackjok3r
17b2d1ed06 Fix staking output in getgenerate 2019-01-26 15:00:32 +08:00
blackjok3r
80a8414b83 fix lock up with staker when trying to startum mine and stake. 2019-01-26 14:37:11 +08:00
blackjok3r
304de9777d fix getblocktemplate for PoW while staking 2019-01-26 12:57:05 +08:00
jl777
c990c403b3 Merge pull request #1208 from jl777/FSM
FSM
2019-01-25 17:19:11 -11:00
jl777
b778dbef8e Merge pull request #1207 from jl777/jl777
Jl777
2019-01-25 17:16:59 -11:00
jl777
932b358243 +comments how to update to 8MB blocks 2019-01-25 17:15:56 -11:00
jl777
352c93f2c4 -<<<<< HEAD 2019-01-25 16:59:55 -11:00
jl777
61821dd51a Merge branch 'FSM' into jl777 2019-01-25 16:54:51 -11:00
jl777
91f213c4b8 +// 2019-01-25 16:54:42 -11:00
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
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
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
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