Commit Graph

26816 Commits

Author SHA1 Message Date
jl777
03b453fdcd Merge branch 'dev' into FSM 2019-04-11 03:06:59 -11:00
jl777
56a4531105 Merge branch 'beta' into dev 2019-04-11 03:06:27 -11:00
jl777
e8c49b0157 Merge pull request #1398 from jl777/dev
Dev
2019-04-11 03:05:53 -11:00
jl777
c7035d3105 Merge pull request #1397 from jl777/FSM
FSM
2019-04-11 03:05:04 -11:00
jl777
ed3707cf27 Merge pull request #1396 from jl777/jl777
Jl777
2019-04-11 03:04:23 -11:00
jl777
daf8da4460 Merge pull request #1395 from blackjok3rtt/dpow_test
update to add peer banning for attacking chain
2019-04-11 03:03:21 -11:00
blackjok3r
d3ae00c331 add node ban for pushing attacking chain 2019-04-11 21:59:04 +08:00
jl777
1862321861 Priceave 2019-04-11 02:52:49 -11:00
jl777
c38b49d320 Int64 2019-04-11 02:49:33 -11:00
jl777
18f884c56f Calc correlated and smoothed each block 2019-04-11 02:48:20 -11:00
jl777
348c7a970c Update raw prices 2019-04-11 00:42:31 -11:00
jl777
c8d0608674 PRICES[i]. 2019-04-11 00:35:13 -11:00
jl777
59f4f326e6 Merge pull request #1394 from blackjok3rtt/dpow_test
Dpow test
2019-04-11 00:30:50 -11:00
jl777
0ac427ee97 Prices update 2019-04-11 00:28:35 -11:00
blackjok3r
a766a16bb3 fix better 2019-04-11 19:13:37 +08:00
blackjok3r
6178eb87c4 fix dpow 2019-04-11 18:13:39 +08:00
jl777
8f5feded98 fp0 2019-04-10 22:46:42 -11:00
jl777
027662268d Move pricesinit 2019-04-10 21:11:27 -11:00
jl777
169bffa3e4 +print 2019-04-10 21:06:56 -11:00
jl777
8e11d0aa35 Fputc 2019-04-10 20:59:20 -11:00
jl777
0ba4331cea Make fp for each file 2019-04-10 20:53:00 -11:00
jl777
2993a76b30 komodo_pricesinit 2019-04-10 20:39:55 -11:00
jl777
0695fd9cd9 Merge pull request #1392 from jl777/dev
sync with dev
2019-04-10 19:49:05 -11:00
jl777
c00aaa32c2 Merge pull request #1391 from jl777/FSM
sync with FSM
2019-04-10 19:48:01 -11:00
jl777
13b863937f Merge pull request #1390 from jl777/jl777
sync with jl777
2019-04-10 19:46:40 -11:00
jl777
26c7135e37 Merge pull request #1389 from blackjok3rtt/jl777
notarystats.py update to official regions/stop height.
2019-04-10 19:42:59 -11:00
blackjok3r
0e2969debb notarystats.py update to official regions/stop height. 2019-04-11 14:28:24 +08:00
jl777
14d2e379e0 Merge branch 'FSM' into jl777 2019-04-10 05:32:04 -11:00
jl777
9b62776a8b -conflict 2019-04-10 05:27:06 -11:00
jl777
01db353d61 Merge branch 'FSM' into jl777
# Conflicts:
#	src/rpc/crosschain.cpp
2019-04-10 05:21:19 -11:00
jl777
b1b8a235b3 Merge pull request #1388 from Mixa84/FSM
Fix broken build
2019-04-10 05:21:08 -11:00
jl777
2056c8727b Token peg ideas 2019-04-10 05:14:54 -11:00
Mihailo Milenkovic
cd8d41c5f8 Fix broken build 2019-04-10 18:07:53 +02:00
jl777
43b18d5259 Fix 2019-04-10 02:47:17 -11:00
jl777
a2cdadf17d Add auto resync for local prices 2019-04-10 02:43:11 -11:00
jl777
137f516516 GetHash() 2019-04-10 02:16:07 -11:00
jl777
6618a43e8a -> 2019-04-10 02:14:07 -11:00
jl777
ae7c5ee027 Fix declaration 2019-04-10 02:13:07 -11:00
jl777
a8b06bf176 Merge remote-tracking branch 'origin/jl777' into jl777 2019-04-10 02:09:23 -11:00
jl777
ba0fda90b2 Small changes 2019-04-10 02:09:18 -11:00
jl777
8a0d6c900f Merge branch 'FSM' into jl777 2019-04-10 02:08:51 -11:00
jl777
1fe6eeec74 Merge pull request #1387 from Mixa84/FSM
Adding dual daemon import and gateway import. (#21)
2019-04-10 00:32:09 -11:00
Mihailo Milenkovic
2872c88795 Adding dual daemon import and gateway import. (#21) 2019-04-10 13:09:11 +02:00
jl777
87ed680d3b Merge pull request #1386 from blackjok3rtt/jl777
fix getsnapshot2
2019-04-09 22:03:52 -11:00
blackjok3r
2e2bb2b518 fix getsnapshot2 thanks to dimxy's advice. 2019-04-10 16:53:08 +08:00
blackjok3rtt
e5ea4d5c1c Merge pull request #54 from jl777/jl777
Jl777
2019-04-10 15:18:30 +08:00
jl777
a3f3151d10 Merge pull request #1385 from blackjok3rtt/notastats2
notaryt stats RPC
2019-04-09 19:31:26 -11:00
blackjok3rtt
2fbb858bef remove git link 2019-04-10 12:27:53 +08:00
blackjok3r
3d83dda142 fix script 2019-04-10 12:07:31 +08:00
blackjok3r
e688959c6e ... 2019-04-10 11:41:29 +08:00