Commit Graph

2277 Commits

Author SHA1 Message Date
blackjok3r
ada693f7d3 add prints back 2018-11-01 19:09:26 +08:00
blackjok3rtt
3ecd12ca8b Merge pull request #30 from StakedChain/blackjok3r
merge blackjok3r branch and FSM fixes into master
2018-11-01 14:01:09 +08:00
jl777
79429720dc -prints 2018-10-29 07:09:21 -11:00
jl777
d83a8593b2 -print 2018-10-29 07:03:09 -11:00
blackjok3r
3d7a5f9434 fix 2018-10-30 01:26:59 +08:00
blackjok3r
b6a9ea6c3a fix 2018-10-30 01:19:44 +08:00
blackjok3r
53476dff15 fix 2018-10-30 00:23:15 +08:00
blackjok3r
87d899fb9a fix 2018-10-30 00:13:02 +08:00
blackjok3r
6f84a8cb23 try 2018-10-30 00:10:41 +08:00
blackjok3r
06bdc76999 try 2018-10-29 23:52:17 +08:00
blackjok3r
30d0a58a1a fix 2018-10-29 23:41:54 +08:00
blackjok3r
2c98a4f5fe try 2018-10-29 23:40:05 +08:00
blackjok3r
5010217b99 bootst include 2018-10-29 23:29:35 +08:00
blackjok3r
6ba8c494e6 try optional to disable nullifiers check 2018-10-29 23:26:41 +08:00
blackjok3r
b64c592e07 try 2018-10-29 21:46:24 +08:00
blackjok3r
624d0e81cb a 2018-10-29 21:43:58 +08:00
blackjok3r
441240215f this 2018-10-29 21:43:37 +08:00
blackjok3r
bb2a48ab54 try 2018-10-29 21:43:13 +08:00
blackjok3r
22bbf1477c try 2018-10-29 21:40:12 +08:00
blackjok3r
eae3058c51 try 2018-10-29 21:34:45 +08:00
blackjok3r
7a0832ebb0 fix 2018-10-29 21:31:31 +08:00
blackjok3r
9dfab4e56e more 2018-10-29 21:19:15 +08:00
blackjok3r
16e69092d9 first try 2018-10-29 21:17:09 +08:00
blackjok3r
153227c27f fix? 2018-10-28 12:01:54 +08:00
jl777
b9fefbfa06 Auto-reconsider block 2018-10-27 00:24:19 -11:00
jl777
0af33a3f0d -print, allow ztx to be non 0x00 ends for txpow 2018-10-23 08:01:32 -11:00
jl777
a2c93c1f0d Check tx during mining 2018-10-22 05:17:51 -11:00
jl777
8551533ace uint256S 2018-10-21 12:05:58 -11:00
jl777
de59290f47 Exeption for genesis coinbase 2018-10-21 12:03:24 -11:00
jl777
b8fefe8a26 Syntax 2018-10-21 11:17:32 -11:00
jl777
b1c08466e9 Initial -ac_txpow 0, 1, 2, 3 with validation, but no txcreation 2018-10-21 11:13:35 -11:00
blackjok3r
b66f366d5c next try 2018-10-16 16:06:49 +08:00
blackjok3r
45ef1a21c7 try this 2018-10-16 14:21:23 +08:00
blackjok3r
0cf52141ef give this a go 2018-10-16 12:58:43 +08:00
Alrighttt
31b6ef8e17 merge latest FSM to blackjok3r 2018-10-15 03:29:06 +02:00
jl777
1449ae165f Fix bug in consensus code from miketout for small networks 2018-10-05 18:29:39 -11:00
Alrighttt
05f99c1b93 Merge pull request #20 from jl777/FSM
merge latest jl777-FSM
2018-10-03 11:38:09 -04:00
blackjok3r
220df8ac00 hard code number of notaries 2018-09-30 13:12:33 +08:00
blackjok3r
d5f8644985 change array to non static and remove init 2018-09-30 13:07:38 +08:00
blackjok3r
c6fb1e9117 try this instead 2018-09-30 13:00:09 +08:00
blackjok3r
f56c91238a change ac_private pubkeys to use STAKED notaries instead of elected 2018-09-30 12:49:40 +08:00
Alrighttt
78e10a3b60 merge lastest jl-dev branch 2018-09-29 15:59:47 +00:00
jl777
9f59de78b2 Ramp down blockreward over 30 years 2018-09-24 07:22:32 -11:00
jl777
1f77927e62 Keep mining rewards indefinitely 2018-09-24 07:19:21 -11:00
jl777
a5a8968a32 Merge branch 'beta' into dev 2018-09-24 05:49:30 -11:00
jl777
49adb58081 Merge branch 'master' into beta 2018-09-24 05:09:14 -11:00
blackjok3r
d75be221a0 fux stupid error 2018-09-24 19:55:23 +08:00
blackjok3r
44f2c39ada try and add eras, for notaries, with timestamp activation 2018-09-24 15:27:14 +08:00
jl777
f425c7eea5 Support for notarizing PRIVATE 2018-09-23 07:49:02 -11:00
jl777
a2e2291e26 Test 2018-09-23 05:53:54 -11:00