Commit Graph

20081 Commits

Author SHA1 Message Date
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
jl777
44d8e00a25 +print 2018-09-20 07:52:46 -11: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
jl777
71d6712d8d Test 2018-09-20 06:47:08 -11: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
jl777
68da1c69bd Test 2018-09-20 03:50:58 -11:00
jl777
8fc335afe1 Test 2018-09-20 03:49:47 -11:00
jl777
66bee980b5 Test 2018-09-20 03:49:07 -11:00
jl777
e45b565837 Test 2018-09-20 03:47:39 -11:00
jl777
4ab5f2f1d7 Test 2018-09-20 03:46:55 -11:00
jl777
627cd0f559 Assets 't' exemption 2018-09-20 03:45:37 -11:00
blackjok3r
3330881171 Use min sigs = 3 for staked chains, so we can add more pubkeys. 2018-09-20 22:44:41 +08:00
jl777
ff3116ce3c Chance for AssetConvert to validate 2018-09-20 02:55:45 -11:00
jl777
2884a3f64a Test 2018-09-19 22:35:50 -11:00
jl777
dceeaa3dc5 Test 2018-09-19 22:35:08 -11:00
jl777
1605948a06 Test 2018-09-19 22:18:51 -11:00
jl777
9eece428bb Test 2018-09-19 22:15:50 -11:00
jl777
009f09069b Remove dualmode for gateways 2018-09-19 22:08:09 -11:00
jl777
541e5e9249 Token convert 2018-09-19 21:51:56 -11:00
jl777
7d6f7d7ea5 PricesAddFunding 2018-09-19 21:34:25 -11:00
jl777
a51c08d1a1 Test 2018-09-19 21:32:22 -11:00
jl777
06c4e87ff9 CCprices.h 2018-09-19 21:29:11 -11:00
jl777
feb11ae038 std::vector<CPubKey>pubkeys; 2018-09-19 21:18:15 -11:00
jl777
f6b969d4b4 Test 2018-09-19 21:17:06 -11:00