Commit Graph

26378 Commits

Author SHA1 Message Date
jl777
ca2dd59830 Fix -ac_pubkey assumptions 2018-11-16 21:15:24 -11:00
jl777
be0d30ee9a Syntax 2018-11-16 20:38:09 -11:00
jl777
2c85dd261a Fix -ac_script 2018-11-16 20:36:46 -11:00
jl777
fb04d9a908 Add support for EVAL_HEIR 2018-11-16 02:33:16 -11:00
jl777
2cf4977c25 Merge pull request #957 from jl777/dev
Extra satoshi for KMDICE
2018-11-15 00:13:14 -11:00
jl777
c41f80392b Merge pull request #956 from jl777/jl777
Extra satoshi for KMDICE
2018-11-15 00:12:36 -11:00
jl777
6ca0bd1c3a Merge pull request #955 from jl777/FSM
Extra satoshi for KMDICE
2018-11-15 00:11:53 -11:00
jl777
377c3daeca Extra satoshi for KMDICE 2018-11-15 00:11:02 -11:00
jl777
d37b0bc7c7 Merge pull request #954 from jl777/dev
sync with FSM
2018-11-15 00:09:10 -11:00
jl777
168b59604e Merge pull request #953 from jl777/jl777
sync with FSM
2018-11-15 00:08:31 -11:00
jl777
0a0e74f740 Merge pull request #952 from jl777/FSM
synchronize to FSM
2018-11-15 00:07:41 -11:00
jl777
5d6c94f586 Web hook test 2018-11-14 22:40:10 -11:00
jl777
8dcded95b3 -() 2018-11-14 22:37:12 -11:00
miketout
6e2a502b0e Merge of Komodo and Verus Technologies Post Sapling, Pre-VerusPoP with Support for Time locked coinbases 2018-11-14 16:40:10 -08:00
jl777
a46640a43e Merge pull request #950 from blackjok3rtt/disable_coinbase_option
use external pubkey fix
2018-11-14 10:05:01 -11:00
blackjok3r
bbd4a619ff use external pubkey fix 2018-11-15 04:08:37 +08:00
jl777
45ac89ca0f Merge pull request #949 from blackjok3rtt/disable_coinbase_option
Disable coinbase option
2018-11-14 08:49:03 -11:00
blackjok3r
c1ba0e3c59 disable utxo fiter CCtx.cpp 2018-11-15 03:36:26 +08:00
jl777
4652afb57a Merge pull request #948 from Mixa84/FSM
Oracle Fix
2018-11-14 05:15:23 -11:00
jl777
f96d22f663 Merge pull request #947 from Alrighttt/dev
Fix ZEX seed node
2018-11-14 05:07:59 -11:00
Mihailo Milenkovic
e288ce42f6 Oracle Fix
- Reorder vins so that only one normal vin is before CC vin
- Fixed AddOracleInputs to add utxos only from that oracle
- Fixed sharing funds from all oracles for that pubkey in OraclesInfo
2018-11-14 16:48:15 +01:00
Alrighttt
33d6425c0e fix ZEX seed node 2018-11-14 10:41:08 -05:00
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