blackjok3r
304de9777d
fix getblocktemplate for PoW while staking
2019-01-26 12:57:05 +08:00
blackjok3r
bf726a2c03
Merge branch 'new_staker' into mastertest
2019-01-23 17:46:36 +08:00
blackjok3r
292edfb284
Merge branch 'FSM' of https://github.com/jl777/komodo into mastertest
2019-01-23 16:57:05 +08:00
blackjok3r
7167793dbf
new version
2019-01-23 02:50:53 +08:00
dimxy
3865cae643
added test to try to spend heir marker F
2019-01-22 23:04:04 +05:00
dimxy
50b9f4fe83
test_ac added
2019-01-22 23:03:51 +05:00
jl777
92cf6d2667
Fixes
2019-01-21 00:47:55 -11:00
jl777
7cfb6293c6
komodo_defs a lot more
2019-01-21 00:31:14 -11:00
jl777
016548281c
Payments address define
2019-01-19 23:00:53 -11:00
jl777
10528424f9
CC_info *
2019-01-19 22:48:46 -11:00
jl777
e555995f19
Marmaralock
2019-01-17 22:46:56 -11:00
dimxy
d63d43c8ef
heir funcs changed to one set
2019-01-18 01:11:02 +05:00
dimxy
8e8a94404f
Split Asset contract into Tokens and Assets
2019-01-18 01:04:29 +05:00
jl777
6620e4cec2
marmara_settlement skeleton
2019-01-15 04:04:00 -11:00
jl777
920a182c2b
marmarainfo firstheight lastheight minamount maxamount [currency issuerpk]
2019-01-14 21:21:37 -11:00
blackjok3r
f20420ea80
fixed staking/generate in getmininginfo
2019-01-14 18:18:18 +08:00
blackjok3r
4d8f79efe2
Merge branch 'FSM' of https://github.com/jl777/komodo into VHT
2019-01-14 17:02:41 +08:00
jl777
c334d5c2e4
Marmara transfer
2019-01-13 03:36:14 -11:00
jl777
c10dfbb858
marmara_issue
2019-01-13 03:21:20 -11:00
jl777
908ee69451
Marmarareceive roc
2019-01-13 03:04:34 -11:00
jl777
4c900a4708
Son
2019-01-12 08:21:57 -11:00
jl777
dda3ecd759
Connect marmara_poolpayout
2019-01-12 06:58:58 -11:00
blackjok3r
1e0e89523c
fix segid in pindex, fix help. Remove more pointless prints.
2019-01-11 17:06:06 +08:00
blackjok3r
5cb458b5f2
fix bug with getimports... Fix miner loop deadlock with staker. Remove annoying pointless prints for staker.
2019-01-10 16:44:09 +08:00
blackjok3r
a543b675f6
Merge branch 'FSM' of https://github.com/jl777/komodo
2019-01-10 02:25:59 +08:00
blackjok3r
9646dd709a
revert changes to import priority. Re-try flat transaction fee. Change miner lock to something safer. Add lock cs_main to import validation when accepting to mempool.
2019-01-10 01:35:18 +08:00
jl777
bce13f9276
0.3.3b
2019-01-09 00:07:01 -11:00
blackjok3r
83477b74f4
oops
2019-01-08 23:48:34 +08:00
blackjok3r
0dee67a800
set import max priotity, and also 0.001 flat fee.
2019-01-08 23:07:34 +08:00
blackjok3r
0b24307e2b
Add export description to burn TX on explorer.
2019-01-08 14:33:27 +08:00
jl777
e5797e6647
Update version
2019-01-07 07:43:48 -11:00
jl777
3e5cfdc24b
Merge pull request #1146 from jl777/jl777
...
Jl777
2019-01-07 04:14:57 -11:00
blackjok3r
6794cfc0cc
add IMP-<source>-<txid> to export address for explorer.
2019-01-07 23:04:54 +08:00
blackjok3r
58cb0e8ea2
use unused address variable for source, to get source chain to explorer.
2019-01-07 22:36:58 +08:00
blackjok3r
d53a4a9e5b
push changes for getrawtransaction
2019-01-07 18:11:51 +08:00
blackjok3r
5a917a6f02
Merge branch 'FSM' of https://github.com/jl777/komodo
2019-01-06 23:19:16 +08:00
Jonathan "Duke" Leto
f24ae214d2
Add dpowconfs to z_listunspent + listreceivedbyaddress and other small fixes
2019-01-05 19:24:14 +01:00
blackjok3r
75ae32c0aa
fix source chain display error
2019-01-04 14:35:34 +08:00
Mihailo Milenkovic
8089c2a86f
Decode CC opret RPC
2019-01-03 17:45:11 +01:00
jl777
6a1259ba5b
marmaraaddress
2019-01-02 19:17:55 -11:00
jl777
31e466f6c7
Triggers -> Marmara stubs
2019-01-02 19:10:10 -11:00
blackjok3r
bb95bce9e7
Add source chain to burn op return, and extract it in getimports RPC if it exists.
2019-01-03 01:02:45 +08:00
blackjok3r
e93fd95815
Merge branch 'FSM' of https://github.com/jl777/komodo into ac_import
2019-01-02 23:29:52 +08:00
blackjok3r
91b6694c71
Fix some bugs? Add getimports RPC.
2019-01-02 23:04:26 +08:00
jl777
ab5f7437a1
ASSETCHAINS_SYMBOL
2019-01-02 02:16:52 -11:00
jl777
c4f5be1c6d
Acname -> raw proof
2019-01-02 02:16:15 -11:00
jl777
bf3cef4edc
Set raw proof to ac_name for cross chain burn
2019-01-02 02:13:24 -11:00
jl777
d63390197d
Fix comment
2019-01-01 23:53:39 -11:00
jl777
a5c38d8f9c
Fix
2019-01-01 23:37:43 -11:00
jl777
e090330823
remove mutually exclusive constraint on selfimport
...
-ac_beam and -ac_coda cannot be active at the same time
Clusters can do import coin normally even with self-import chains.
-ac_import=KMD (any bitcoinprotocol coin) will make a side chain (not
implemented yet)
Theoretically -ac_beam or -ac_coda can work with side chain (not
implemented yet other than chain params)
2019-01-01 23:34:31 -11:00
