Commit Graph

147 Commits

Author SHA1 Message Date
jl777
112df09f65 Events 2019-03-22 04:25:09 -11:00
jl777
2188a60318 Rvalidate 2019-03-03 23:58:08 -11:00
jl777
973124163e Lockflag 2019-02-28 20:14:38 -11:00
dimxy
2a32401ef8 corr FilterOutNonCCOprets checking cc opret data 2019-02-28 13:54:56 +05:00
dimxy
de6828ec7c tokens blob support 2019-02-28 00:07:08 +05:00
jl777
2496f79e41 Jsonstr 2019-02-20 23:05:58 -11:00
dimxy
9eed81089b corr check for non-existing eval
in CCLogPrintStream -debug=cat-0 added

declr corrected

comment added to check for non supported eval

added check if eval not supported

СCLogPrintStream moved to CCutils.cpp
2019-02-12 15:05:52 +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
9fdb634a4e cc log levels corr 2019-02-12 02:01:52 +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
dimxy
e583658d14 removed non-fungible data from 't' opret
added fieldId for non-fungible data in 'c' opret
changed to cc marker int tokencreate, added in rogue_finishgame
(tokenlist supports old and new markers)
2019-02-11 19:04:52 +05:00
jl777
3795785a38 -print 2019-02-10 10:37:55 -11:00
jl777
9342d3f742 Token support 2019-02-10 04:40:58 -11:00
jl777
366ade08a0 Merge nonfungible 2019-02-10 02:28:14 -11:00
jl777
0a87322d84 Merge branch 'FSM' into jl777
# Conflicts:
#	src/cc/CCinclude.h
#	src/cc/CCtokens.cpp
#	src/cc/CCtx.cpp
#	src/wallet/rpcwallet.cpp
2019-02-10 02:24:24 -11:00
dimxy
14f1da959c non-fungible tokens support (three-eval token vouts) added in CCtokens (additional opret data)
non-fungible tokens support added in assets
logging changed in CCtokens.cpp for bitcon LogPrintStr with -debug=<category> support
2019-02-10 17:04:55 +05:00
jl777
cb5f7eaaa1 Auto broadcast rogue rpc tx 2019-02-09 21:55:50 -11:00
jl777
2fcf3f3f0f 1of2 signing 2019-02-05 21:29:18 -11:00
jl777
dd8f2697b7 Many changes 2019-02-05 19:25:32 -11:00
jl777
06d45f433b CBlockIndex *komodo_chainactive(int32_t height) 2019-02-02 06:45:43 -11:00
jl777
3ba832b6bc Pending object 2019-01-29 21:48:26 -11:00
jl777
ff22a1aedb Priv2addr 2019-01-28 21:30:42 -11:00
jl777
7cfb6293c6 komodo_defs a lot more 2019-01-21 00:31:14 -11:00
jl777
53b2d35da7 Bit256 2019-01-20 00:03:36 -11:00
jl777
0ceca4c745 komodo_cJSON.h 2019-01-20 00:01:18 -11:00
jl777
887f6cb2ab Test 2019-01-20 00:00:51 -11:00
jl777
01d2fa36a2 UniValue CClib_info(struct CCcontract_info *cp) 2019-01-19 23:38:48 -11:00
jl777
62322eb589 struct CCcontract_info 2019-01-19 23:31:12 -11:00
jl777
c4d932a318 Partial revert 2019-01-19 23:23:08 -11:00
jl777
10528424f9 CC_info * 2019-01-19 22:48:46 -11:00
jl777
cc1d119144 Test 2019-01-19 02:34:33 -11:00
jl777
6e40c81b94 uint8_t 2019-01-19 00:39:53 -11:00
jl777
539b6dd1a9 -ac_ccenable[] 2019-01-19 00:38:55 -11:00
jl777
1e058154e3 Merge branch 'FSM' into jl777 2019-01-17 23:22:48 -11:00
Mihailo Milenkovic
6915c400e3 Fix ChannelsPayment when destpub issues payment,add check_signing_pubkey 2019-01-18 11:14:40 +01:00
jl777
8aa8284e61 Merge branch 'FSM' into jl777
# Conflicts:
#	src/cc/CCtx.cpp
2019-01-17 20:24:28 -11:00
dimxy
0455243118 more debug logging removed 2019-01-18 01:10:53 +05:00
Mihailo Milenkovic
e23073fff5 Channels adaptation to TokensCC (#3)
* Initial changes

* ChannelsCC adaptation

* Fix

* Fix

* Fix

* Fix

* Fix

* Fix

* Fix

* Fix

* Fix

* Fix
2019-01-18 01:10:40 +05:00
dimxy
8d8b253138 first time changed eval usage and MakeTokenCCcond.. for assets 2019-01-18 01:08:35 +05:00
dimxy
41da2aed5f corr call to EncodeAssetOpRet 2019-01-18 01:08:33 +05:00
dimxy
2d8027854d first changes in assets for 2-eval vouts 2019-01-18 01:08:31 +05:00
dimxy
ec954480a8 added more variants checking vouts in IsTokenVout
corr vouts1 in Heir.cpp to single-eval token
changed result type for HeirFund
2019-01-18 01:08:26 +05:00
dimxy
034198730a changed vcontractOpret in IsTokensVout
remove extra param from IsTokensVout
2019-01-18 01:08:03 +05:00
dimxy
c4c58b484a heir modified for two eval Tokens
changed to new 2-opret format
2019-01-18 01:07:57 +05:00
dimxy
6d509d5293 added MakeTokensCCcond1 and MakeTokensCCvout1 2019-01-18 01:04:48 +05:00
dimxy
c2942d60a4 Tokens CC cond test code added to HeirClaim TokenValidate 2019-01-18 01:04:42 +05:00
dimxy
1f6d62e7c8 MakeTokensCC1of2vout MakeTokensCCcond1of2 test code added
gateways partially adapted for tokens
2019-01-18 01:04:39 +05:00
dimxy
675787d676 Asset contract modified to support the Tokens contract 2019-01-18 01:04:32 +05:00
dimxy
be71d108b2 Added CCaddr1of2set and FinalizeCCtx modified to support it
(small test CCerror code added - temp)
2019-01-18 01:04:31 +05:00
dimxy
8e8a94404f Split Asset contract into Tokens and Assets 2019-01-18 01:04:29 +05:00