Commit Graph

14905 Commits

Author SHA1 Message Date
blackjok3r
d5f8644985 change array to non static and remove init 2018-09-30 13:07:38 +08:00
blackjok3r
c6fb1e9117 try this instead 2018-09-30 13:00:09 +08:00
blackjok3r
f56c91238a change ac_private pubkeys to use STAKED notaries instead of elected 2018-09-30 12:49:40 +08:00
Alrighttt
78e10a3b60 merge lastest jl-dev branch 2018-09-29 15:59:47 +00:00
blackjok3r
396d4e4209 Add error for sending coin to source chain 2018-09-26 17:25:02 +08:00
blackjok3r
ff9e1c7f36 Merge branch 'master' of https://github.com/StakedChain/komodo 2018-09-26 11:30:56 +08:00
blackjok3r
dcffb1c796 change ERA's 2018-09-26 11:30:31 +08:00
Alrighttt
2e25cdf0a4 add STAKEDED 2018-09-26 02:26:48 +00:00
blackjok3r
6ecc2a17bf new timestamps try again lol 2018-09-25 18:53:32 +08:00
blackjok3r
4becb91f8e fix silly mistake 2018-09-25 18:42:30 +08:00
blackjok3r
8abbd8e183 meh 2018-09-25 17:56:49 +08:00
blackjok3r
15fe2fb59d I think this might be it 2018-09-25 17:50:51 +08:00
blackjok3rtt
3aee2fae5e hopefully fixed that lol 2018-09-25 17:38:18 +08:00
blackjok3rtt
93e35be732 Merge pull request #13 from StakedChain/blackjok3r3
Height Activation
2018-09-25 16:41:11 +08:00
blackjok3r
1a948db4fd who knows 2018-09-25 16:38:39 +08:00
blackjok3r
dcb7ed78c0 ) 2018-09-25 15:41:55 +08:00
blackjok3r
211f57fb45 tidy up 2018-09-25 15:40:44 +08:00
blackjok3r
a2d3bd9f84 try 2018-09-25 15:21:04 +08:00
blackjok3r
6eec4962bd opps 2018-09-25 15:19:21 +08:00
blackjok3r
07f90f9852 move cross chain choose to staked.cpp 2018-09-25 15:17:51 +08:00
blackjok3r
f16893312f try that 2018-09-25 14:29:22 +08:00
blackjok3r
d6726e1bd6 1 2018-09-25 14:27:08 +08:00
blackjok3r
84f0f23626 try call function 2018-09-25 14:25:27 +08:00
blackjok3r
562d0132f7 test 2018-09-25 14:20:21 +08:00
blackjok3r
7db608e7c5 timstaps 2018-09-25 14:16:39 +08:00
blackjok3r
3e86777927 try move crosschain auth to a function, and clean up code a bit. 2018-09-25 13:49:15 +08:00
blackjok3r
582b359c15 == 0 2018-09-25 10:24:15 +08:00
blackjok3r
2e82dcdf8e change eras 2018-09-25 10:19:27 +08:00
blackjok3r
5161c86d56 that didnt work, try another way 2018-09-25 10:16:05 +08:00
blackjok3r
2cf2e5f83e try to zero array of pubkeys 2018-09-25 01:17:49 +08:00
jl777
1513c37f65 Merge pull request #894 from jl777/jl777
+print
2018-09-24 05:54:55 -11:00
jl777
a5a8968a32 Merge branch 'beta' into dev 2018-09-24 05:49:30 -11:00
jl777
49adb58081 Merge branch 'master' into beta 2018-09-24 05:09:14 -11:00
blackjok3r
b60948261b reset eras, try from reqync 2018-09-25 00:03:00 +08:00
blackjok3r
6368a83fe3 retest gap 2018-09-24 23:51:38 +08:00
blackjok3r
01b6ef666a add check for num vins over 2 for all AC 2018-09-24 23:46:08 +08:00
blackjok3r
595f3d7a5f fix pointless print 2018-09-24 23:27:45 +08:00
blackjok3r
14c46b11bf ) 2018-09-24 23:25:33 +08:00
blackjok3r
475e8bc5cb add era gap, and change to start at era 1 instead of 0. 2018-09-24 23:22:38 +08:00
jl777
6b72038d2d add claimpubkey check 2018-09-24 03:45:08 -11:00
blackjok3r
3ae2594212 } 2018-09-24 22:13:38 +08:00
blackjok3r
bb5402c9a9 add eras for cross chain auth? 2018-09-24 22:10:37 +08:00
blackjok3r
9cdde9ca12 oops 2018-09-24 21:53:00 +08:00
blackjok3r
7d8a97e1f9 reactivate staked auth, and try to fetch era from auto function 2018-09-24 21:51:13 +08:00
Jorian
966a168037 fix ip 2018-09-24 15:43:16 +02:00
blackjok3r
360925ac6a ; 2018-09-24 21:42:22 +08:00
Jorian
594c9d1274 add mgnx 2018-09-24 15:41:03 +02:00
blackjok3r
f541d4a7d5 try pull from cBlock 2018-09-24 21:40:51 +08:00
blackjok3r
2b91c1d732 try this instead 2018-09-24 21:29:20 +08:00
blackjok3r
7aea99c1a4 try and get timesstamp for crosschain auth height activation 2018-09-24 21:24:48 +08:00