Commit Graph

19188 Commits

Author SHA1 Message Date
blackjok3r
4dec9ceba8 change to just int, compiler was mad 2018-09-24 15:43:43 +08:00
blackjok3r
91c3080146 hmmm need to have height activation for MoMoM aswell, as uses a diffrent
array for its pubkeys,disable this for now to test.
2018-09-24 15:37:15 +08:00
blackjok3r
44f2c39ada try and add eras, for notaries, with timestamp activation 2018-09-24 15:27:14 +08:00
blackjok3r
d35a888245 ) 2018-09-21 17:23:26 +08:00
blackjok3r
c2ec9c5468 syntax 2018-09-21 17:21:30 +08:00
blackjok3r
0233e249cf change to int 2018-09-21 17:19:16 +08:00
blackjok3r
90f50a9ee7 add is_staked function 2018-09-21 17:15:21 +08:00
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
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