jl777
|
68e95fde75
|
Remove check for normal input
|
2019-02-10 10:05:55 -11:00 |
|
jl777
|
9d00a3f5a8
|
-print
|
2019-02-10 09:43:19 -11:00 |
|
jl777
|
012e7cdf83
|
2 prints
|
2019-02-10 09:37:43 -11:00 |
|
jl777
|
b488b0b270
|
+print
|
2019-02-10 09:33:20 -11:00 |
|
jl777
|
abec8d30fb
|
Test
|
2019-02-10 09:29:58 -11:00 |
|
jl777
|
505dc7520d
|
Change to myGetTransaction
|
2019-02-10 09:27:26 -11:00 |
|
jl777
|
ffc96c9674
|
(char *)
|
2019-02-10 02:36:32 -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
|
a42b9198df
|
logging param changed to "cctokens" "ccassets"
|
2019-02-10 17:48:24 +05: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
|
dd8f2697b7
|
Many changes
|
2019-02-05 19:25:32 -11:00 |
|
dimxy
|
5f116e5d13
|
removed incorrect debug logging in IsTokensvout
|
2019-01-23 11:38:56 +05:00 |
|
jl777
|
62322eb589
|
struct CCcontract_info
|
2019-01-19 23:31:12 -11:00 |
|
jl777
|
10528424f9
|
CC_info *
|
2019-01-19 22:48:46 -11:00 |
|
dimxy
|
0455243118
|
more debug logging removed
|
2019-01-18 01:10:53 +05:00 |
|
dimxy
|
7c16ba9ca2
|
some debug loggin removed
|
2019-01-18 01:10:52 +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
|
dddda4e32b
|
corr logging in IsTokensVout
|
2019-01-18 01:10:30 +05:00 |
|
dimxy
|
c66787ada6
|
added support for 2 check pubkeys for single-eval token vouts
|
2019-01-18 01:10:30 +05:00 |
|
dimxy
|
114d7779d6
|
added support for 2 check pubkeys in IsTokenVout
|
2019-01-18 01:10:29 +05:00 |
|
dimxy
|
46406f3c25
|
corr CCinit in HeirClaim
|
2019-01-18 01:08:28 +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
|
1fb94e5a34
|
corr DecodeHeirEitherOpRet in validators
added EVAL_TOKENS check in DecodeTokenOpRet
|
2019-01-18 01:08:22 +05:00 |
|
dimxy
|
a684909b7a
|
corr cpTokens usage in TokensExactAmounts
|
2019-01-18 01:08:19 +05:00 |
|
dimxy
|
dbae803774
|
added loggin into isTokensVout
|
2019-01-18 01:08:18 +05:00 |
|
dimxy
|
5c35c03d60
|
added isTokenVout call to Add1of2address func in heir.cpp
corrected ExtractTokensVinPubkeys call -> in isTokensVout
|
2019-01-18 01:08:17 +05:00 |
|
dimxy
|
d41cd8b991
|
corr unmarshal retcode proc in _DecodeHeirEitherOpRet
GetTokenBalance returns error always, obsolete
|
2019-01-18 01:08:15 +05:00 |
|
dimxy
|
39731c231f
|
try to construct secod opret w/o serialization
|
2019-01-18 01:08:13 +05:00 |
|
dimxy
|
ab87b673eb
|
iterator increment corr
|
2019-01-18 01:08:13 +05:00 |
|
dimxy
|
400b798cd2
|
try to add second opret w/o serialization
|
2019-01-18 01:08:12 +05:00 |
|
dimxy
|
7b7b5bdbc0
|
corr encode token opret plus no opcode cscript
|
2019-01-18 01:08:11 +05:00 |
|
dimxy
|
32469f37c1
|
Added DecodeHeirEitherOpret handy func
corr serialization second opret via payload
|
2019-01-18 01:08:10 +05:00 |
|
dimxy
|
20bd5c88b7
|
opret processing returned to the variant without OP_RETURN opcode (cause this caused validation err)
|
2019-01-18 01:08:09 +05:00 |
|
dimxy
|
e24039f137
|
corr concat opret1+opret2
|
2019-01-18 01:08:09 +05:00 |
|
dimxy
|
fe0cc96584
|
corr second opret building more
|
2019-01-18 01:08:08 +05:00 |
|
dimxy
|
c78b88725f
|
corrected opret concat
|
2019-01-18 01:08:07 +05:00 |
|
dimxy
|
d6214fc994
|
corr second opret building/parsing
|
2019-01-18 01:08:06 +05:00 |
|
dimxy
|
46d9219e21
|
added second opret logging into IsTokenVout
|
2019-01-18 01:08:06 +05:00 |
|
dimxy
|
d2119d8c45
|
corr IsTokensVout def - extra param
|
2019-01-18 01:08:05 +05:00 |
|
dimxy
|
034198730a
|
changed vcontractOpret in IsTokensVout
remove extra param from IsTokensVout
|
2019-01-18 01:08:03 +05:00 |
|
dimxy
|
e1ddbcaf6c
|
corr else if in FinalizeCCtx
|
2019-01-18 01:08:02 +05:00 |
|
dimxy
|
9f1c21c5b5
|
corr tokenaddr name
|
2019-01-18 01:08:02 +05:00 |
|
dimxy
|
bfce0c18b8
|
getMyEval() resurrection
|
2019-01-18 01:08:01 +05:00 |
|
dimxy
|
0d6eb9853a
|
added logging to IsTokenVout
|
2019-01-18 01:08:01 +05:00 |
|
dimxy
|
0a76f9d897
|
AssetXXX() changed to GetTokenBalance, TokenInfo, TokenList
added processing of incorrect tokenid to GetTokenBalance
|
2019-01-18 01:07:59 +05:00 |
|
dimxy
|
6065a6dec4
|
corrected -> no token vout pubkey validation for 'c'
modified MakeTokenCCcond1 and 1of2 to eliminate duplicate evals
|
2019-01-18 01:07:58 +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
|
d67ca1779a
|
MakeTokensCCcond1of2 corrrected and simplified
|
2019-01-18 01:04:46 +05:00 |
|