Commit Graph
76 Commits
Author SHA1 Message Date
blackjok3r c85b1ace10 hmmmm 2018-09-21 17:02:22 +08:00
blackjok3r 263c24b266 maybe 2018-09-21 16:56:34 +08:00
blackjok3r 5f2b706625 meh 2018-09-21 16:09:51 +08:00
blackjok3r 3b210ee00c WTFTWTFEWIDlknPI 2018-09-21 15:57:30 +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 c83285ffe2 add include file to makefile ... Please work?! 2018-09-21 15:24:53 +08:00
blackjok3r bb33491657 thanks mike 2018-09-21 15:11:36 +08:00
blackjok3r 3539848b60 typo 2018-09-21 13:41:40 +08:00
blackjok3r 9a469cda6f try hardcode of array length 2018-09-21 13:37:26 +08:00
blackjok3r 1183a043b2 try again 2018-09-21 13:28:25 +08:00
blackjok3r 14acb852d5 try again 2018-09-21 13:23:00 +08:00
blackjok3r 158d7befbc WTF!??!? 2018-09-21 13:11:12 +08:00
blackjok3r bb7815b05b that didnt work 2018-09-21 13:09:53 +08:00
blackjok3r 3dcbdcb85c try something else 2018-09-21 13:08:13 +08:00
blackjok3r 9f1e5ad6c0 runnign around in circles here, little sense! 2018-09-21 12:41:10 +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 6bcd127f0b Merge branch 'master' into blackjok3r
mergse master
2018-09-21 04:22:13 +00:00
blackjok3rtt a3c528d14e Merge branch 'blackjok3r'
merg matser
2018-09-21 04:21:32 +00:00
blackjok3rtt de2936e90e Merge branch 'HFtest'
merge down
2018-09-21 03:55:06 +00:00
blackjok3rtt d5e3425710 Merge branch 'master' into HFtest
fix verison.h
2018-09-21 03:54:50 +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 24f0f84417 try this 2018-09-21 11:20:09 +08:00
blackjok3r 41c25e89db ? 2018-09-21 03:16:35 +08:00
blackjok3r 0f02546428 ? 2018-09-21 03:12:24 +08:00
blackjok3r 75a86d88a2 ? 2018-09-21 03:10:28 +08:00
blackjok3r f58cc01b5e ; 2018-09-21 02:58:53 +08:00
blackjok3r 9b97cb1a5d one more time 2018-09-21 02:54:13 +08:00
blackjok3r 550e9a54ac i 2018-09-21 02:19:24 +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
blackjok3r 9e417e48d7 Change min protcol version so STAKED chains have their own value, so KMD
can still work.
2018-09-20 23:15:00 +08:00
blackjok3r 3330881171 Use min sigs = 3 for staked chains, so we can add more pubkeys. 2018-09-20 22:44:41 +08:00
blackjok3r 53771be236 make it so prints are diffrent. 2018-09-19 15:31:09 +08:00
blackjok3r 47656a74d0 ; 2018-09-19 14:52:22 +08:00
blackjok3r 1444ed4e2d add print of MoMoM data each time it is called. 2018-09-19 14:51:41 +08:00
blackjok3r 3eef88c755 Merge branch 'master' of https://github.com/StakedChain/komodo
ok
2018-09-19 13:47:59 +08:00
blackjok3r 4300a42d4d Merge branch 'jl777-dev'
fix confilct
2018-09-19 13:47:03 +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 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 b22e7d44f4 add modofication to stop normal komodo repo using staked chains 2018-09-11 14:09:04 +00:00
blackjok3r 63fe933da5 notaries_staked.h bounty to fix this is valid 2018-09-10 20:30:04 +08:00
blackjok3r b3c526f9c6 add placeholder 15th pubkey 2018-09-10 20:28:20 +08:00
blackjok3r 31b6db4b41 fix spaces just incase 2018-09-10 13:53:47 +08: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
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 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 1049d013b7 test 2018-09-08 12:28:02 +08:00
blackjok3r 14f27f2e49 test 2018-09-08 12:26:32 +08:00
blackjok3r 1ab2893839 test 2018-09-08 12:08:07 +08:00
blackjok3r d5b43746be fingers crossed 2018-09-08 09:58:29 +08:00
blackjok3r 9f93a0de96 poofish 2018-09-08 09:52:08 +08:00
blackjok3r c069525a77 fix stupidity 2018-09-08 09:49:50 +08:00
blackjok3r e18e04bed7 LOL im drunk 2018-09-08 09:38:12 +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