Commit Graph

26556 Commits

Author SHA1 Message Date
Alrighttt
aef9aa88d5 Merge pull request #1 from jl777/dev
Dev
2018-11-14 10:39:47 -05:00
blackjok3rtt
85250d52fa Merge pull request #11 from jl777/FSM
Fix rounding error:  + 0.00000000499999
2018-11-14 18:08:52 +08:00
ca333
fbb3b3e9a0 Merge pull request #76 from jl777/master
KOMODO_EXTRASATOSHI
2018-11-13 21:56:39 +01:00
jl777
f5e142203e KOMODO_EXTRASATOSHI 2018-11-13 09:47:15 -11:00
jl777
ef17574fb7 Merge pull request #946 from jl777/dev
Dev
2018-11-13 09:43:23 -11:00
jl777
ad56eb54d2 Merge pull request #945 from jl777/jl777
Jl777
2018-11-13 09:42:07 -11:00
jl777
39dcafb0f1 Merge pull request #944 from jl777/FSM
FSM
2018-11-13 09:41:24 -11:00
blackjok3r
a9957e3bb4 Merge branch 'jl777-dev' into dev 2018-11-14 01:41:41 +08:00
blackjok3r
f246c25791 Merge branch 'dev' of https://github.com/jl777/komodo into jl777-dev
fix
2018-11-14 01:41:20 +08:00
jl777
a1f6cb8019 Fix rounding error: + 0.00000000499999 2018-11-13 06:35:07 -11:00
Mihail Fedorov
6dfdb96cf2 KMDICE coming back 2018-11-13 20:34:16 +03:00
blackjok3r
f4965c1c69 fix 2018-11-13 23:55:23 +08:00
blackjok3r
3276079b1d is not for staked. 2018-11-13 23:51:37 +08:00
blackjok3r
3d4e48cdd1 update setpubkey RPC to be comptible with the node-stratum-pool fork 2018-11-13 23:33:13 +08:00
blackjok3r
29d67993c8 getblock template with mode:disablecb this allows a pool to use the
daemons coinbase tx rather than build its own.
2018-11-13 23:28:36 +08:00
blackjok3rtt
4632956f4a Merge pull request #9 from jl777/FSM
Fsm
2018-11-13 23:10:07 +08:00
jl777
7f5ed6ec45 Merge pull request #943 from Alrighttt/dev
Dev
2018-11-13 01:19:02 -11:00
jl777
0ff0f60496 +print 2018-11-13 00:24:00 -11:00
jl777
6a187f4644 remove fprintf 2018-11-12 23:52:01 -11:00
blackjok3r
2120ab4fd1 fix 2018-11-13 18:09:23 +08:00
blackjok3r
d3f5fd5b3e Merge branch 'FSM' of https://github.com/jl777/komodo into mastertest
fixed
2018-11-13 18:07:25 +08:00
jl777
08b2f80458 Purge after 2 hours no matter what 2018-11-12 20:56:49 -11:00
jl777
d97378bd51 +KMD 2018-11-12 20:41:39 -11:00
jl777
5eef7503f1 Extra satoshi exemption 2018-11-12 20:34:56 -11:00
blackjok3r
0724759fc4 fix KMD sync issue? 2018-11-13 13:57:06 +08:00
jl777
00b0ad6a48 Revert 2018-11-12 07:43:05 -11:00
jl777
84ea5902c3 mempool.cs 2018-11-12 07:36:35 -11:00
Alrighttt
48881a7529 add ZEX fiat script 2018-11-12 09:28:37 -05:00
Alrighttt
6da472c874 add ZEX 2018-11-12 09:14:13 -05:00
blackjok3rtt
4de1a81b3a Merge pull request #8 from jl777/FSM
Fsm
2018-11-12 18:57:14 +08:00
ca333
6ae45699ae Merge pull request #72 from jl777/dev
update dev
2018-11-12 11:33:59 +01:00
jl777
931812c28a Minutxos -> 10000 2018-11-11 23:24:28 -11:00
jl777
466678352a dealer0_fundingtxid 2018-11-11 23:20:02 -11:00
jl777
1978a02179 dealer0_fundingtxid 2018-11-11 23:19:27 -11:00
jl777
ce23148940 dealer0_fundingtxid 2018-11-11 23:17:39 -11:00
jl777
ba291f4caf Dealer0 thread 2018-11-11 23:06:51 -11:00
jl777
4ae77bc74e Refund -> locked 2018-11-11 22:41:06 -11:00
jl777
87acaff056 Delete after orphaning 2018-11-11 22:14:58 -11:00
jl777
e54a35248c Merge pull request #942 from jl777/dev
Dev
2018-11-11 21:45:31 -11:00
jl777
5c391082dd Merge pull request #941 from jl777/jl777
Jl777
2018-11-11 21:44:59 -11:00
jl777
8edff10be2 Merge pull request #940 from jl777/FSM
FSM
2018-11-11 21:44:30 -11:00
jl777
7ebf06aedd MAX_MONEY cap 10000100000 2018-11-11 21:43:52 -11:00
blackjok3r
e502865727 fix setpubkey for pool 2018-11-12 15:20:20 +08:00
blackjok3r
02a54b36a8 fix max money cap!? 2018-11-12 12:39:11 +08:00
blackjok3r
8e1f081a7e ix? 2018-11-12 11:53:07 +08:00
blackjok3rtt
f96a79d1fb Merge pull request #7 from blackjok3rtt/cleanwalletnotarisations
Cleanwalletnotarisations
2018-11-12 11:46:03 +08:00
blackjok3rtt
ac709a0c7f Merge branch 'dev' into cleanwalletnotarisations 2018-11-12 11:45:56 +08:00
blackjok3r
9fc964e473 Merge branch 'jl777-dev' into dev
the commit.
2018-11-12 11:43:29 +08:00
blackjok3r
ebb7db627c Merge branch 'dev' of https://github.com/jl777/komodo into jl777-dev
fix
2018-11-12 11:43:01 +08:00
blackjok3r
025d680a9e remove print again 2018-11-12 10:40:49 +08:00