Commit Graph

20081 Commits

Author SHA1 Message Date
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
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
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
416c90c291 Merge branch 'dev' into jl777 2018-09-17 03:14:01 -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
jl777
d2bcb614c3 Merge branch 'dev' into jl777 2018-09-15 21:50:40 -11:00
jl777
34bc8189ff Merge pull request #882 from jl777/FSM
prepare for gateways multisig and add notarization check to disconnect tip
2018-09-15 21:50:18 -11:00
jl777
8ccb74fb8e -p 2018-09-15 21:48:31 -11:00
jl777
a6a00b5ca2 Test 2018-09-15 21:47:43 -11:00
jl777
f9d85c8f86 Check for notarized in disconnect tip 2018-09-15 21:46:46 -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
jl777
f4e8439469 - 2018-09-14 00:16:16 -11:00
jl777
d3be9b4470 Initial channels CC doc 2018-09-13 23:57:57 -11:00
jl777
b71da7105f Test 2018-09-13 06:06:26 -11:00
jl777
1deabac47a Test 2018-09-13 06:05:29 -11:00
jl777
ea17adb690 Test 2018-09-13 06:04:41 -11:00
jl777
81abf81750 Test 2018-09-13 06:02:15 -11:00
jl777
2a4078bb5c Test 2018-09-13 05:59:06 -11:00
jl777
e94993253a Gatewaysinfo 2018-09-13 05:57:32 -11:00
jl777
e29657a397 Merge pull request #880 from jl777/FSM
FSM
2018-09-13 03:56:00 -11:00
jl777
4f17a3b394 Merge pull request #879 from tonymorony/jl777
deprecated oraclefeed compilation script
2018-09-13 03:55:48 -11:00
Anton Lysakov
e2f37fc6c1 deprecated oraclefeed compilation script 2018-09-13 21:46:02 +07:00
blackjok3r
0c0befd6c4 remove one pubkey just incase 2018-09-13 19:10:52 +08:00
jl777
1805ffc2fa Test 2018-09-12 23:03:54 -11:00
jl777
8c3015309f Test 2018-09-12 23:01:38 -11:00
jl777
518ae45859 Test 2018-09-12 22:59:28 -11:00