Commit Graph

22792 Commits

Author SHA1 Message Date
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
ffba12b55b added single-eval token cond to FinalizeCCtx 2019-01-18 01:10:28 +05:00
dimxy
8d8b253138 first time changed eval usage and MakeTokenCCcond.. for assets 2019-01-18 01:08:35 +05:00
dimxy
4379cffe74 corr call to EncodeAssetOpet in prices.cpp 2019-01-18 01:08:34 +05:00
dimxy
41da2aed5f corr call to EncodeAssetOpRet 2019-01-18 01:08:33 +05:00
dimxy
a7d7451c88 corr call to DecodeAssetTokenOpRet 2019-01-18 01:08:32 +05:00
dimxy
2d8027854d first changes in assets for 2-eval vouts 2019-01-18 01:08:31 +05:00
dimxy
96a6530044 corr getting 1of2 addr in 1of2 validator 2019-01-18 01:08:29 +05:00
dimxy
395fac4173 corr cp param to ...addr1of2set 2019-01-18 01:08:29 +05:00
dimxy
46406f3c25 corr CCinit in HeirClaim 2019-01-18 01:08:28 +05:00
dimxy
9e7b031466 corr ccinit in HeirAdd 2019-01-18 01:08:27 +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
849d60f4d9 eval changed back to EVAL_HEIR in CCinit in HeirAdd 2019-01-18 01:08:24 +05:00
dimxy
99c5484b66 corr cp usage in helper funcs 2019-01-18 01:08:24 +05:00
dimxy
fd0c4b8978 corr CCinit in HeirAdd HeirClaim 2019-01-18 01:08:23 +05:00
dimxy
1fb94e5a34 corr DecodeHeirEitherOpRet in validators
added EVAL_TOKENS check in DecodeTokenOpRet
2019-01-18 01:08:22 +05:00
dimxy
08c0a5a8c6 corr "is token" check in HeirInfo 2019-01-18 01:08:21 +05:00
dimxy
d3c804c50c corr DecodeHeirEitherOpRet call in LifeTimeHeirContractFund
restores !ismempool.. check
2019-01-18 01:08:20 +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
42a48b9653 corrected call to DecodeHeirEitherOpRet in Heirinfo 2019-01-18 01:08:16 +05:00
dimxy
1a5999e0bd _DecodeHeirEitherOpRet corrected vopretStripped proc 2019-01-18 01:08:16 +05:00
dimxy
d41cd8b991 corr unmarshal retcode proc in _DecodeHeirEitherOpRet
GetTokenBalance returns error always, obsolete
2019-01-18 01:08:15 +05:00
dimxy
97a030d05a corrected passing vopretStripped to DecodeHeirOpRet (instead CScript) 2019-01-18 01:08:14 +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
9edec18b96 heirinfo logging enabled 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
bdc2915f16 corrected call to IsTokensVout 2019-01-18 01:08:04 +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
15c71c69f1 corrected GetCCaddress call in get TokenBalance 2019-01-18 01:08:00 +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