Commit Graph

291 Commits

Author SHA1 Message Date
blackjok3r
351405ce37 more fix 2018-11-02 18:47:50 +08:00
blackjok3r
85bbfadd2f attempt to add Raddress array 2018-11-02 18:40:04 +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
Alrighttt
31b6ef8e17 merge latest FSM to blackjok3r 2018-10-15 03:29:06 +02:00
jl777
ade1fc54a8 KOMODO_DPOWCONFS 2018-10-14 12:44:34 -11:00
jl777
c606ce6925 Backward compatible dPoW enforcement! 2018-10-14 11:56:06 -11:00
blackjok3r
b9b7f12d84 fix edgcase where eras before current get chosen out of order and
prevent later ones being activated.
2018-10-12 14:06:26 +08:00
blackjok3rtt
0cfd7009d7 Merge pull request #21 from StakedChain/master
merge master down
2018-10-07 00:23:08 +08:00
Alrighttt
78e10a3b60 merge lastest jl-dev branch 2018-09-29 15:59:47 +00:00
blackjok3r
dee9067adc modified: src/komodo_notary.h 2018-09-26 14:53:41 +08:00
blackjok3r
6ecc2a17bf new timestamps try again lol 2018-09-25 18:53:32 +08:00
blackjok3r
8abbd8e183 meh 2018-09-25 17:56:49 +08:00
blackjok3r
15fe2fb59d I think this might be it 2018-09-25 17:50:51 +08:00
blackjok3r
1a948db4fd who knows 2018-09-25 16:38:39 +08:00
blackjok3r
5161c86d56 that didnt work, try another way 2018-09-25 10:16:05 +08:00
blackjok3r
2cf2e5f83e try to zero array of pubkeys 2018-09-25 01:17:49 +08:00
blackjok3r
475e8bc5cb add era gap, and change to start at era 1 instead of 0. 2018-09-24 23:22:38 +08:00
blackjok3r
d75be221a0 fux stupid error 2018-09-24 19:55:23 +08:00
blackjok3r
6120642eb1 add a print for isstaked 2018-09-24 18:58:38 +08:00
blackjok3r
fdf332d9ab fix silly 2018-09-24 16:24:25 +08:00
blackjok3r
533cb0369c pointless line remove 2018-09-24 15:46:38 +08:00
blackjok3r
5ef1dc5127 ; 2018-09-24 15:45:03 +08:00
blackjok3r
44f2c39ada try and add eras, for notaries, with timestamp activation 2018-09-24 15:27:14 +08:00
jl777
a2e2291e26 Test 2018-09-23 05:53:54 -11:00
jl777
a8c6526acf Test 2018-09-23 05:51:51 -11:00
jl777
569bb55b5f Test 2018-09-23 05:48:40 -11:00
jl777
3a36ff1776 Test 2018-09-23 05:47:33 -11:00
jl777
fb11078137 Allow crypto777 pub key 2018-09-21 23:40:08 -11:00
jl777
69d86d7782 Fix 2018-09-21 23:33:11 -11:00
jl777
2682c88a7a Fix 2018-09-21 23:30:34 -11:00
jl777
0c2c564c24 ac_private to allow notary p2pk bouts 2018-09-21 23:29:00 -11:00
blackjok3r
c2ec9c5468 syntax 2018-09-21 17:21:30 +08:00
blackjok3r
90f50a9ee7 add is_staked function 2018-09-21 17:15:21 +08:00
blackjok3r
7384746b72 WTFWTFW 2018-09-21 15:48:26 +08:00
blackjok3r
77ee7feec8 about to blow it up 2018-09-21 15:43:16 +08:00
blackjok3r
1183a043b2 try again 2018-09-21 13:28:25 +08:00
blackjok3r
95918c6402 fix dumbness 2018-09-21 12:29:39 +08:00
blackjok3r
feed6b75c9 Merge branch 'blackjok3r' of https://github.com/StakedChain/komodo into blackjok3r
not sure what this si LOL
2018-09-21 12:24:35 +08:00
blackjok3rtt
a3c528d14e Merge branch 'blackjok3r'
merg matser
2018-09-21 04:21:32 +00:00
blackjok3r
b7a3348ed1 change some stuff 2018-09-21 11:43:32 +08:00
blackjok3r
75a86d88a2 ? 2018-09-21 03:10:28 +08:00
blackjok3r
9a241aa9c2 try again 2018-09-21 02:10:11 +08:00
blackjok3r
dda0a48e8d ; 2018-09-21 01:48:37 +08:00
blackjok3r
47cd790436 try staked.h again 2018-09-21 01:46:02 +08:00
blackjok3rtt
94ceb6e39e Merge branch 'HFtest' into blackjok3r
fix merg conflict
2018-09-20 16:54:32 +00:00
blackjok3r
3330881171 Use min sigs = 3 for staked chains, so we can add more pubkeys. 2018-09-20 22:44:41 +08:00
Alrighttt
d1b74ce6d1 hard fork mandatory update 2018-09-19 18:50:38 +02:00
blackjok3r
876a6e0f9b Merge branch 'dev' of https://github.com/jl777/komodo into jl777-dev
fix merge conflict
2018-09-19 13:46:01 +08:00
blackjok3r
0c0befd6c4 remove one pubkey just incase 2018-09-13 19:10:52 +08:00
blackjok3r
42ce922b97 fix stupid mistake 2018-09-13 13:50:47 +08:00