Commit Graph

107 Commits

Author SHA1 Message Date
dimxy
e2fc84faac defined missing rpc createburntx 2019-04-19 19:28:48 +05:00
dimxy
4add699cbb token migration moved to FSM 2019-04-19 14:41:46 +05:00
blackjok3r
ab7558ab9d inital commit for notarypay 0BR 2019-04-17 17:42:24 +08:00
Mihailo Milenkovic
2872c88795 Adding dual daemon import and gateway import. (#21) 2019-04-10 13:09:11 +02:00
jl777
2f9dfa9ad2 Truncated prices roc 2019-04-06 00:21:26 -11:00
jl777
c90448edba prices rpc call stub 2019-04-01 23:09:51 -11:00
jl777
ac5ec55126 Initial Payments CC without validation 2019-03-21 03:14:59 -11:00
blackjok3r
142744f22d verushashv1_1, fix walletdb.h, proto version, cleanwallettransactions add 2019-02-26 17:35:07 +08:00
blackjok3r
096d25df97 Disable all experminetal/LABS features that are not required. 2019-02-26 12:49:17 +08:00
blackjok3r
536cb5f86d geterablockheights RPC 2019-02-21 20:17:08 +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
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
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
292edfb284 Merge branch 'FSM' of https://github.com/jl777/komodo into mastertest 2019-01-23 16:57:05 +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
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
blackjok3r
a543b675f6 Merge branch 'FSM' of https://github.com/jl777/komodo 2019-01-10 02:25:59 +08:00
jl777
3e5cfdc24b Merge pull request #1146 from jl777/jl777
Jl777
2019-01-07 04:14:57 -11:00
blackjok3r
5a917a6f02 Merge branch 'FSM' of https://github.com/jl777/komodo 2019-01-06 23:19:16 +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
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
0ea9ae3c05 Update copyright to 2019 2018-12-31 21:41:05 -11:00
jl777
142f5c112f Selfimport 2018-12-29 01:47:55 -11:00
blackjok3r
d2a7d55272 test git diff 2018-12-20 21:13:32 +08:00
blackjok3r
134ae5436f Merge branch 'FSM' of https://github.com/jl777/komodo
f
2018-12-18 23:45:37 +08:00
Mihailo Milenkovic
56430117fe Channels fix (#5)
- Fix bug when destination invokes payment (wrong pubkeys in OP_RETURN - validation would fail)
- Added channelslist RPC
- Changed channelsinfo data to JSON format
2018-12-17 17:56:06 +01:00
blackjok3r
5ced63c9c9 Add getlastsegidstakes RPC 2018-12-11 14:18:44 +08:00
blackjok3r
697eddcc79 Merge branch 'FSM' of https://github.com/jl777/komodo into jl777-FSM
merge
2018-11-29 23:22:32 +08:00
jl777
fe274bf254 Merge pull request #985 from Mixa84/FSM
Gateways withdraw update
2018-11-26 08:39:10 -11:00
Mihailo Milenkovic
16f5598f36 Gateways (#3)
- Changed gateways withdrawal flow
- Added txnotarizedconfirmed function to check if transaction is confirmed/notarized
- Fixed max number of inputs when adding in varuous CC functions
- Added TESTMODE to set CC confirmation tx to 2 blocks instead of 60
2018-11-26 20:32:57 +01:00
Jonathan "Duke" Leto
8c34aa1f7c Add back tokenconvert 2018-11-26 18:09:44 +01: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