Commit Graph

245 Commits

Author SHA1 Message Date
blackjok3r
3330881171 Use min sigs = 3 for staked chains, so we can add more pubkeys. 2018-09-20 22:44:41 +08: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
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
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
48d5318949 add address 2018-09-10 07:43:05 +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
fe6f552be6 LOL lol 2018-09-08 21:55:32 +08: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
a8e94f86c5 pubkeys update 2018-09-08 21:28:31 +08:00
blackjok3r
b8f060c43b update pubkeys 2018-09-08 21:25:55 +08:00
blackjok3r
ead6f50464 testing 2018-09-08 12:38:29 +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
blackjok3rtt
489eb6710d Test modification to allow STAKED* chains to have their own notary pubkeys. 2018-09-07 04:02:17 +08:00
Scott Sadler
c3aa599831 Merge remote-tracking branch 'jl/dev' into momo 2018-05-30 21:34:07 -03:00
jl777
1b9f98cd19 Truncate MoMdepth 2018-05-30 12:57:21 -11:00
Scott Sadler
81389fc7b4 merge dev; tests broken, need to use wallet for block rewards 2018-05-29 19:04:47 -03:00
Scott Sadler
06c960d2b7 m3 test proven 2018-05-15 22:27:10 -03:00
jl777
6494f040c5 Redundant calls to dpow KMD 2018-04-29 14:59:20 +03:00
jl777
a8de9f3888 Test 2018-04-26 15:19:07 +03:00
jl777
69d23911ce +prevMoMheight to getinfo 2018-04-26 15:14:12 +03:00
jl777
26f6fa01cb Add back MoM that dev merge undid 2018-04-20 09:38:46 +03:00
jl777
093f2730c8 Fix 2018-04-18 19:22:51 +03:00
jl777
ddd8e4744f Merge branch 'beta' into dev 2018-04-17 23:58:53 +03:00
jl777
47a4812f17 814000 change 2018-04-17 10:40:05 +03:00
jl777
a30dd993bf Test 2018-04-16 20:16:28 +03:00
jl777
6c537f91c0 Merge branch 'dev' into devmerge
# Conflicts:
#	src/init.cpp
#	src/komodo_bitcoind.h
#	src/komodo_events.h
#	src/komodo_notary.h
#	src/komodo_structs.h
#	src/main.cpp
#	src/pow.cpp
#	src/rpcblockchain.cpp
2018-04-16 06:57:36 +03:00
jl777
a5f848c45a Merge branch 'testmaster' into beta 2018-04-16 03:29:05 +03:00
jl777
598c8173df Revert "Test"
This reverts commit 4751ae3e8f.
2018-04-15 23:30:47 +03:00
jl777
ec50c8817a Revert "N -> static n0/n1"
This reverts commit da58058de8.
2018-04-15 23:30:42 +03:00