blackjok3r
13012c169f
Merge branch 'notarypay_new'
2019-02-18 19:26:50 +08:00
blackjok3r
cb5aa3c45c
Merge branch 'FSM' of https://github.com/jl777/komodo into jl777-FSM
2019-02-18 19:09:54 +08:00
dimxy
a994a2c015
corrected invalid non-canonical
...
corrected burntx nExpiryHeight to prevent duplication of importtx (malleability)
added importcoin validation for amount, ac_pubkey
added sourcetx creation with amount in opret
2019-02-16 22:07:07 +05:00
blackjok3r
791d8dc13b
remove dynamic notary pay reward and revert to static amounts, cannot work!
2019-02-15 11:01:10 +08:00
blackjok3r
d7a122c548
fix reorged notarisation to use the same data points
2019-02-15 00:13:48 +08:00
blackjok3r
b9b3afcbe6
notarypay in getinfo
2019-02-14 17:37:37 +08:00
dimxy
3774bde4bb
added mytokenorders rpc
2019-02-13 13:15:10 +05:00
blackjok3r
f6a51145f5
New notary pay mechanisim...
2019-02-12 23:28:13 +08:00
jl777
061384f356
Merge branch 'FSM' into jl777
...
# Conflicts:
# src/cc/CCinclude.h
# src/cc/CCtokens.cpp
# src/cc/CCtx.cpp
# src/wallet/rpcwallet.cpp
2019-02-11 13:56:09 -11:00
dimxy
7a4072b4f1
test_burntx added
2019-02-12 00:14:08 +05:00
Mihailo Milenkovic
0edf474beb
Multi coin support for GatewaysCC ( #18 )
...
- Added support for other cions
- New RPC for getting address for a pubkey on external chain and for dumping private key in external chain format
2019-02-11 16:37:28 +01:00
blackjok3r
8328842ff0
Disable getblocktemplate flag
2019-02-10 21:44:06 +08:00
jl777
0a0d0ffa18
Merge branch 'FSM' into jl777
2019-02-08 16:14:54 -11:00
blackjok3r
528f39542e
fix reorg problem
2019-02-09 00:08:28 +08:00
blackjok3r
de0ced7444
Check for double signs on notarisation checks. revert minsigs to normal value.
2019-02-06 17:00:21 +08:00
blackjok3r
5f780b0325
fix
2019-02-06 15:35:20 +08:00
jl777
dd8f2697b7
Many changes
2019-02-05 19:25:32 -11:00
Mihailo Milenkovic
6fc97c61e3
Add support for dual opret with Token opret.
2019-02-01 13:46:49 +01:00
blackjok3r
14b64d13fe
assetchains_algo in getinfo
2019-01-30 16:55:04 +08:00
Mihailo Milenkovic
463caf96ec
Gateways with new TokensCC ( #15 )
...
- Adapting Gateways to new Tokens
- Making withdraws serialized until solution for parallel is made
2019-01-28 13:54:21 +01:00
blackjok3r
9bf744ef26
fix getgenerate better
2019-01-26 15:08:00 +08:00
blackjok3r
17b2d1ed06
Fix staking output in getgenerate
2019-01-26 15:00:32 +08:00
blackjok3r
80a8414b83
fix lock up with staker when trying to startum mine and stake.
2019-01-26 14:37:11 +08:00
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
