DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
19,219 Commits 5 Branches 7 Tags
b60948261bf96b7acfd3a9d83795987811583e3a
Commit Graph
19219 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
blackjok3rtt af8470697b Merge branch 'blackjok3r' into HFtest 
merge fix
 2018-09-20 16:54:54 +00:00
blackjok3rtt 94ceb6e39e Merge branch 'HFtest' into blackjok3r 
fix merg conflict
 2018-09-20 16:54:32 +00: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
Alrighttt c2059876c3 Update version.h 2018-09-19 13:38:33 -04:00
Alrighttt 62991d393b Merge pull request #9 from StakedChain/HFtest 
H ftest
 2018-09-19 13:37:28 -04:00
Alrighttt 3a9b050014 whoops 2018-09-19 18:52:22 +02:00
Alrighttt d1b74ce6d1 hard fork mandatory update 2018-09-19 18:50:38 +02: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
jl777 119f1c1e0c Asset chain notarization check 2018-09-17 01:02:32 -11:00
blackjok3rtt c0128ed414 fix issue where if there are not two notarisations the MoMoM is indeterninate 2018-09-15 14:17:18 +08:00
jl777 167794e0dd Merge pull request #881 from Alrighttt/dev 
build error, fix typo
 2018-09-14 05:09:50 -11:00
Alrighttt 87f37301b4 build error, fix typo 2018-09-14 17:57:04 +02: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
jl777 c02faa1a61 Merge pull request #873 from Alrighttt/dev 
fix help examples
 2018-09-11 19:14:50 -11:00