Commit Graph

50 Commits

Author SHA1 Message Date
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
6f3af3ff83 Change minsigs to 4, remove supply hack. 2018-09-21 11:46:25 +08: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
3a9b050014 whoops 2018-09-19 18:52:22 +02:00
blackjok3r
0c0befd6c4 remove one pubkey just incase 2018-09-13 19:10:52 +08:00
blackjok3r
bd2169b57d Add some keys, and change to use STKD and STAKED. 2018-09-13 12:37:28 +08:00
blackjok3r
a025b6f4e7 fix smk WTF?!? 2018-09-13 02:13:14 +08:00
blackjok3r
4aa70c4253 put metaphillibert back in ... etf happened there LOL 2018-09-13 02:07:47 +08:00
blackjok3r
55215da218 not sure 2018-09-13 00:03:41 +08:00
blackjok3r
38c0eee7af Fix 2018-09-12 23:51:25 +08:00
blackjok3r
2333d40937 FIX STKD != STAKED 2018-09-12 23:34:28 +08:00
blackjok3r
139aca9821 Add smk762 2018-09-12 21:22:05 +08:00
blackjok3rtt
36f90242d0 Merge pull request #7 from StakedChain/web
update webworker keys
2018-09-11 22:12:09 +08:00
blackjok3r
b3c526f9c6 add placeholder 15th pubkey 2018-09-10 20:28:20 +08:00
Alrighttt
e3f6985750 add jusoaresf, add mylo 2018-09-10 09:07:43 +00:00
webworker01
de3377d944 update webworker keys 2018-09-10 07:52:10 +00:00
Alrighttt
1c1105287e Merge branch 'master' of https://github.com/stakedchain/komodo 2018-09-10 07:36:36 +00:00
Alrighttt
a86d6f81ad add metaphilibert 2018-09-10 07:36:17 +00:00
blackjok3r
31b6db4b41 fix spaces just incase 2018-09-10 13:53:47 +08:00
Alrighttt
fdae4d44e9 add CHMEX, add addresses 2018-09-10 05:40:41 +00:00
Alrighttt
d33fc13c59 add titomane 2018-09-10 05:17:20 +00:00
Alrighttt
ce77a27048 finalize pubkeys 2018-09-10 05:08:48 +00:00
Alrighttt
aa62eb99f0 Merge pull request #4 from tonymorony/nntest
changed pubkey TonyL
2018-09-10 00:47:17 -04:00
blackjok3r
87835336c6 Merge branch 'nntest' of https://github.com/StakedChain/komodo into nntest 2018-09-09 07:19:19 +08:00
blackjok3r
2f358266f8 fix webworker 2018-09-09 07:18:39 +08:00
tonymorony
a35ead4321 changed pubket TonyL 2018-09-08 21:25:03 +00:00
Alrighttt
89223d1398 add pubkey 2018-09-08 14:39:26 +00:00
blackjok3r
362c398046 more beer 2018-09-08 21:52:50 +08:00
blackjok3r
e84001da53 soooo drunk 2018-09-08 21:44:19 +08:00
blackjok3r
fa9fd0a1e3 drunk again 2018-09-08 21:40:20 +08:00
blackjok3r
a8e94f86c5 pubkeys update 2018-09-08 21:28:31 +08:00
blackjok3r
b8f060c43b update pubkeys 2018-09-08 21:25:55 +08:00
blackjok3r
b20459fee2 test again 2018-09-08 13:01:02 +08:00
blackjok3r
ead6f50464 testing 2018-09-08 12:38:29 +08:00
blackjok3r
f04396d2c0 a 2018-09-08 12:30:47 +08:00
blackjok3r
f2c45ab4f8 try again 2018-09-08 09:35:26 +08:00
blackjok3r
b1a30161f0 Test, use single array, dynamically sized for crosschain auth 2018-09-08 09:29:00 +08:00
Alrighttt
f1025289c4 Merge pull request #2 from libscott/staked
bugfix; seen members not zeroed
2018-09-05 23:31:23 -04:00
Scott Sadler
062b770927 bugfix; seen members not zeroed 2018-09-06 00:14:45 -03:00
Alrighttt
13199c8446 temp add test pubkeys 2018-09-05 20:47:22 +00:00
Scott Sadler
040078433f fix outrageous typo 2018-09-05 00:27:06 -03:00
Scott Sadler
64a4efaa70 put clarifying comment 2018-09-05 00:22:38 -03:00
Scott Sadler
538de2ee49 multiple authorities 2018-09-05 00:19:12 -03:00