Commit Graph

128 Commits

Author SHA1 Message Date
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
dimxy
3774bde4bb added mytokenorders rpc 2019-02-13 13:15:10 +05: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
jl777
0a0d0ffa18 Merge branch 'FSM' into jl777 2019-02-08 16:14:54 -11: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
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
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
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
jl777
bce13f9276 0.3.3b 2019-01-09 00:07:01 -11: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
Jonathan "Duke" Leto
f24ae214d2 Add dpowconfs to z_listunspent + listreceivedbyaddress and other small fixes 2019-01-05 19:24:14 +01: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
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
jl777
8920674148 Syntax 2018-12-31 23:32:02 -11:00
jl777
2995bbcc79 rework selfimport 2018-12-31 23:28:35 -11:00
jl777
0ea9ae3c05 Update copyright to 2019 2018-12-31 21:41:05 -11:00
jl777
8624abc616 Self burn 2018-12-29 04:57:40 -11:00
jl777
e5c1fd79ca -prints 2018-12-29 04:51:35 -11:00
jl777
0841122cf4 - 2018-12-29 04:43:07 -11:00
jl777
302c65efd6 burnAmount 2018-12-29 04:37:38 -11:00
jl777
a1cdd56425 Test 2018-12-29 04:37:06 -11:00
jl777
5e890aa4f1 Test 2018-12-29 04:26:40 -11:00
jl777
31129381b4 Test 2018-12-29 04:24:00 -11:00
jl777
27d672a972 Test 2018-12-29 04:13:20 -11:00
jl777
24a9e7c408 test 2018-12-29 04:03:29 -11:00