DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Commit Graph

  • 6ab103a5bc Merge branch 'FSM' into jl777 jl777 2019-01-17 20:21:43 -11:00
  • f5344fd3bd Merge pull request #1181 from dimxy/heir-tokens-cherpick4 jl777 2019-01-17 20:21:33 -11:00
  • d9de6b7cde extra logging disabled in validator dimxy 2019-01-18 00:47:01 +05:00
  • d63d43c8ef heir funcs changed to one set dimxy 2019-01-17 22:20:11 +05:00
  • 80a1ef04f2 added proc of incorrect tokenid to tokenorders dimxy 2019-01-17 20:41:18 +05:00
  • 4b71e62557 disabled debug loggin in FinalizeCCtx dimxy 2019-01-17 20:27:19 +05:00
  • 9dc403f331 corr call to IsTokenVout in heir dimxy 2019-01-17 19:42:02 +05:00
  • 0455243118 more debug logging removed dimxy 2019-01-17 19:36:44 +05:00
  • 7c16ba9ca2 some debug loggin removed dimxy 2019-01-17 18:36:03 +05:00
  • c51e239400 corr FillSell self now single-eval token addr dimxy 2019-01-17 15:19:29 +05:00
  • 65dfecadf8 corr userCCaddr calc dimxy 2019-01-17 15:05:55 +05:00
  • a645af7ee4 corrected user cc addr for 'x' dimxy 2019-01-17 13:14:03 +05:00
  • 29052b0790 corr 'x' validation code corr logging in FinalizeCCtx dimxy 2019-01-17 12:46:01 +05:00
  • 9657b5ce43 added CCaddr2set to CancelSell dimxy 2019-01-17 00:19:33 +05:00
  • f79531a29a corr asset unspents addr in AssetOrders dimxy 2019-01-16 23:50:42 +05:00
  • 9584d6db7f corr cond (single tokens) for buy in GetAssetorigaddrs dimxy 2019-01-16 22:56:30 +05:00
  • a99fd7502d added conds for ask/bid in GetAssetorigaddrs dimxy 2019-01-16 22:39:21 +05:00
  • 9293af0f1b added conditions for x S o B in AssetValidateCCvin dimxy 2019-01-16 22:10:25 +05:00
  • c18a655baf corr uninited cpAssets var in FillBuyOffer dimxy 2019-01-16 21:14:36 +05:00
  • 06e5d6fc6e corr dualUnspendable use in AssetOrders dimxy 2019-01-16 19:39:56 +05:00
  • 0588f5dc67 corr unspendable addr for 'S' dimxy 2019-01-16 19:21:41 +05:00
  • 401737d208 corr dualevalUnspendableAddr in AssetValidateCCvin dimxy 2019-01-16 18:52:38 +05:00
  • 778bc04009 corr cpAssets use for 'S' in AssetValidate dimxy 2019-01-16 18:37:51 +05:00
  • e23073fff5 Channels adaptation to TokensCC (#3) Mihailo Milenkovic 2019-01-16 14:05:54 +01:00
  • dae431eaa5 corr vopretStripped use in DecodeAssetsTokenOpret dimxy 2019-01-16 17:58:46 +05:00
  • 830b54cf20 corr unmarshal vopretStripped dimxy 2019-01-16 17:45:32 +05:00
  • b807d8eb29 corr dummy evalcode in DecodeAssetTokenOpRet dimxy 2019-01-16 15:29:39 +05:00
  • 029d3af05a add logging origpubkey to FillSell dimxy 2019-01-16 15:16:30 +05:00
  • 457b9aff54 more corr othertokenscond, set cp->unspendable dimxy 2019-01-16 14:41:39 +05:00
  • f67a849be0 corr CCaddr2set for tokens support in FillSell dimxy 2019-01-16 14:27:45 +05:00
  • a16e80dac4 more corr in tokensunspendable dimxy 2019-01-16 14:22:23 +05:00
  • 4903298fc3 corr tokesnunspenable priv and pk dimxy 2019-01-16 14:11:29 +05:00
  • 406fc53925 removed extra CCaddr2set dimxy 2019-01-16 12:17:35 +05:00
  • a7833f272f added othertokenscond to FinalizeCCtx dimxy 2019-01-16 12:12:41 +05:00
  • ee848abde9 corr mysingletokenscond in FinalizeCCtx (corr err message in rpc call) dimxy 2019-01-16 11:45:21 +05:00
  • dddda4e32b corr logging in IsTokensVout dimxy 2019-01-15 23:44:13 +05:00
  • c66787ada6 added support for 2 check pubkeys for single-eval token vouts dimxy 2019-01-15 23:39:04 +05:00
  • 114d7779d6 added support for 2 check pubkeys in IsTokenVout dimxy 2019-01-15 23:23:49 +05:00
  • ffba12b55b added single-eval token cond to FinalizeCCtx dimxy 2019-01-15 21:17:51 +05:00
  • 8d8b253138 first time changed eval usage and MakeTokenCCcond.. for assets dimxy 2019-01-15 20:55:26 +05:00
  • 4379cffe74 corr call to EncodeAssetOpet in prices.cpp dimxy 2019-01-15 17:01:42 +05:00
  • 41da2aed5f corr call to EncodeAssetOpRet dimxy 2019-01-15 16:54:36 +05:00
  • a7d7451c88 corr call to DecodeAssetTokenOpRet dimxy 2019-01-15 16:28:39 +05:00
  • 2d8027854d first changes in assets for 2-eval vouts dimxy 2019-01-15 16:22:14 +05:00
  • 96a6530044 corr getting 1of2 addr in 1of2 validator dimxy 2019-01-15 14:24:58 +05:00
  • 395fac4173 corr cp param to ...addr1of2set dimxy 2019-01-15 14:09:50 +05:00
  • 46406f3c25 corr CCinit in HeirClaim dimxy 2019-01-15 13:06:06 +05:00
  • 9e7b031466 corr ccinit in HeirAdd dimxy 2019-01-15 12:25:21 +05:00
  • ec954480a8 added more variants checking vouts in IsTokenVout corr vouts1 in Heir.cpp to single-eval token changed result type for HeirFund dimxy 2019-01-15 11:59:53 +05:00
  • 849d60f4d9 eval changed back to EVAL_HEIR in CCinit in HeirAdd dimxy 2019-01-14 22:11:24 +05:00
  • 99c5484b66 corr cp usage in helper funcs dimxy 2019-01-14 22:04:50 +05:00
  • fd0c4b8978 corr CCinit in HeirAdd HeirClaim dimxy 2019-01-14 21:42:37 +05:00
  • 1fb94e5a34 corr DecodeHeirEitherOpRet in validators added EVAL_TOKENS check in DecodeTokenOpRet dimxy 2019-01-14 17:26:42 +05:00
  • 08c0a5a8c6 corr "is token" check in HeirInfo dimxy 2019-01-14 13:23:08 +05:00
  • d3c804c50c corr DecodeHeirEitherOpRet call in LifeTimeHeirContractFund restores !ismempool.. check dimxy 2019-01-14 13:10:18 +05:00
  • a684909b7a corr cpTokens usage in TokensExactAmounts dimxy 2019-01-14 12:26:38 +05:00
  • dbae803774 added loggin into isTokensVout dimxy 2019-01-14 01:39:56 +05:00
  • 5c35c03d60 added isTokenVout call to Add1of2address func in heir.cpp corrected ExtractTokensVinPubkeys call -> in isTokensVout dimxy 2019-01-14 01:27:45 +05:00
  • 42a48b9653 corrected call to DecodeHeirEitherOpRet in Heirinfo dimxy 2019-01-14 00:38:56 +05:00
  • 1a5999e0bd _DecodeHeirEitherOpRet corrected vopretStripped proc dimxy 2019-01-14 00:30:42 +05:00
  • d41cd8b991 corr unmarshal retcode proc in _DecodeHeirEitherOpRet GetTokenBalance returns error always, obsolete dimxy 2019-01-13 23:07:31 +05:00
  • 97a030d05a corrected passing vopretStripped to DecodeHeirOpRet (instead CScript) dimxy 2019-01-13 22:38:33 +05:00
  • 39731c231f try to construct secod opret w/o serialization dimxy 2019-01-13 18:06:41 +05:00
  • ab87b673eb iterator increment corr dimxy 2019-01-13 17:48:03 +05:00
  • 400b798cd2 try to add second opret w/o serialization dimxy 2019-01-13 17:41:41 +05:00
  • 7b7b5bdbc0 corr encode token opret plus no opcode cscript dimxy 2019-01-13 17:09:11 +05:00
  • 32469f37c1 Added DecodeHeirEitherOpret handy func corr serialization second opret via payload dimxy 2019-01-13 16:47:28 +05:00
  • 9edec18b96 heirinfo logging enabled dimxy 2019-01-13 15:38:05 +05:00
  • 20bd5c88b7 opret processing returned to the variant without OP_RETURN opcode (cause this caused validation err) dimxy 2019-01-13 15:14:06 +05:00
  • e24039f137 corr concat opret1+opret2 dimxy 2019-01-13 00:44:57 +05:00
  • fe0cc96584 corr second opret building more dimxy 2019-01-13 00:38:22 +05:00
  • c78b88725f corrected opret concat dimxy 2019-01-13 00:17:33 +05:00
  • d6214fc994 corr second opret building/parsing dimxy 2019-01-13 00:12:23 +05:00
  • 46d9219e21 added second opret logging into IsTokenVout dimxy 2019-01-12 23:49:24 +05:00
  • d2119d8c45 corr IsTokensVout def - extra param dimxy 2019-01-12 17:05:47 +05:00
  • bdc2915f16 corrected call to IsTokensVout dimxy 2019-01-12 16:53:14 +05:00
  • 034198730a changed vcontractOpret in IsTokensVout remove extra param from IsTokensVout dimxy 2019-01-12 16:44:49 +05:00
  • e1ddbcaf6c corr else if in FinalizeCCtx dimxy 2019-01-12 16:23:41 +05:00
  • 9f1c21c5b5 corr tokenaddr name dimxy 2019-01-12 16:14:31 +05:00
  • bfce0c18b8 getMyEval() resurrection dimxy 2019-01-12 16:11:04 +05:00
  • 0d6eb9853a added logging to IsTokenVout dimxy 2019-01-12 15:48:45 +05:00
  • 15c71c69f1 corrected GetCCaddress call in get TokenBalance dimxy 2019-01-12 15:30:21 +05:00
  • 0a76f9d897 AssetXXX() changed to GetTokenBalance, TokenInfo, TokenList added processing of incorrect tokenid to GetTokenBalance dimxy 2019-01-12 15:20:55 +05:00
  • 6065a6dec4 corrected -> no token vout pubkey validation for 'c' modified MakeTokenCCcond1 and 1of2 to eliminate duplicate evals dimxy 2019-01-12 01:06:24 +05:00
  • c4c58b484a heir modified for two eval Tokens changed to new 2-opret format dimxy 2019-01-11 23:02:37 +05:00
  • 6d509d5293 added MakeTokensCCcond1 and MakeTokensCCvout1 dimxy 2019-01-11 14:34:56 +05:00
  • 805b3da050 heir evalcode logging added dimxy 2019-01-10 21:42:10 +05:00
  • d67ca1779a MakeTokensCCcond1of2 corrrected and simplified dimxy 2019-01-10 21:28:13 +05:00
  • 0177628e7d GetTokensCCaddress1of2 call corrected (test) in IsHeirFundingVout dimxy 2019-01-10 16:19:48 +05:00
  • 092b4c987a eval_heir corrected temp in HeirClaim dimxy 2019-01-10 16:12:09 +05:00
  • 37105d851a added logging in Add1of2addrinputs in heir dimxy 2019-01-10 16:06:00 +05:00
  • 732144ebb8 turn off HeirValidate temp dimxy 2019-01-10 15:50:55 +05:00
  • aa7c48f529 corrected EVAL_HEIR (test) in IsTokenVout dimxy 2019-01-10 15:35:09 +05:00
  • c2942d60a4 Tokens CC cond test code added to HeirClaim TokenValidate dimxy 2019-01-10 15:23:07 +05:00
  • 00968fd9cb destaddr logging added dimxy 2019-01-10 14:45:39 +05:00
  • 53b30074c2 corrected vpayload serialisation to opret dimxy 2019-01-10 14:00:29 +05:00
  • 1f6d62e7c8 MakeTokensCC1of2vout MakeTokensCCcond1of2 test code added gateways partially adapted for tokens dimxy 2019-01-10 13:40:21 +05:00
  • 884c58e3cf removed test CCerror code dimxy 2019-01-09 18:04:15 +05:00
  • 6e353a59a4 more var name hasheirspendingbegun improved dimxy 2019-01-09 17:28:34 +05:00
  • 8e8d4e0057 improved heir spending var name dimxy 2019-01-09 17:19:49 +05:00