Commit Graph

15032 Commits

Author SHA1 Message Date
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
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
jl777
816acd6719 Test 2018-09-19 21:14:25 -11:00
jl777
5efdb4f325 N 2018-09-19 21:10:58 -11:00
jl777
bfd7858525 Syntax 2018-09-19 21:09:27 -11:00
jl777
f44cd67e82 Prices stub 2018-09-19 21:04:47 -11:00
Alrighttt
c2059876c3 Update version.h 2018-09-19 13:38:33 -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
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
08d66385b3 Test 2018-09-18 04:13:43 -11:00
jl777
403b69675c 1of2 CC 2018-09-18 03:48:44 -11:00
jl777
61ee7d9ad2 Merge branch 'jl777' into FSM 2018-09-17 06:02:03 -11:00
jl777
c5164b3c7b Skip human help if longer chain is invalid due to notarization 2018-09-17 05:58:07 -11:00
jl777
9662fa3864 Merge branch 'jl777' into FSM 2018-09-17 03:16:21 -11:00
jl777
9648870fdc Sync gateways 2018-09-17 03:16:04 -11:00
jl777
4f80a29cc4 Test 2018-09-17 03:12:56 -11:00
jl777
791ad592f1 Test 2018-09-17 03:09:39 -11:00
jl777
7fccea1dab Msig suppport 2018-09-17 03:08:28 -11:00
jl777
12832b1d22 notarization check for asset chains 2018-09-17 01:04:34 -11:00
jl777
6b52965769 Stronger check for asset chain notarizations 2018-09-17 01:03:14 -11:00
jl777
119f1c1e0c Asset chain notarization check 2018-09-17 01:02:32 -11:00