Commit Graph
100 Commits
Author SHA1 Message Date
dimxy 134534b384 var naming improved 2019-01-27 17:56:08 +05:00
dimxy daf34e2315 corrected rpc param size check 2019-01-27 17:17:27 +05:00
dimxy fdcc9d71c2 heirinfo var names corrected
memo field added
2019-01-27 17:03:38 +05:00
dimxy 82956c357a removed heir list header - simply txid array 2019-01-26 20:31:48 +05:00
dimxy 9bad115496 in heirlist added list header 2019-01-26 20:18:00 +05:00
dimxy 2ac92d7d6e result changed to VARR 2019-01-26 19:10:46 +05:00
dimxy 4b6b2a5540 'throw' changed to 'return result' on incorrect params
tx hex name = 'hex'
heirlist returns simple txid array now
2019-01-26 18:31:46 +05:00
dimxy defe854383 set fixed precision for total funds, too 2019-01-23 11:49:07 +05:00
dimxy 5f116e5d13 removed incorrect debug logging in IsTokensvout 2019-01-23 11:38:56 +05:00
dimxy 81fc7ca05b set fixed precision for coins for heirinfo 2019-01-23 11:36:56 +05:00
dimxy 6481576883 restored 1of2 validator for C (was off to test markerValidator) 2019-01-22 23:04:09 +05:00
dimxy de8af6cc93 debug logging disabled 2019-01-22 23:04:08 +05:00
dimxy da00a3d021 isVinValidator flag corrected = true 2019-01-22 23:04:08 +05:00
dimxy fb69b514b2 added logging to marker validator 2019-01-22 23:04:07 +05:00
dimxy 61f1d8771d removed 1of2 validator for test marker spending 2019-01-22 23:04:06 +05:00
dimxy 8a15610e44 corr marker validator 2019-01-22 23:04:06 +05:00
dimxy 098ba877fb corr test code for spending marker F 2019-01-22 23:04:05 +05:00
dimxy 3865cae643 added test to try to spend heir marker F 2019-01-22 23:04:04 +05:00
dimxy 28d090c05e corr adding marker vout for F 2019-01-22 23:04:02 +05:00
dimxy 6c26e91376 corr cpHeir init in _heirFund for marker
enabled logging
2019-01-22 23:04:01 +05:00
dimxy 426aa32dd5 corr F tx marker protection validation code 2019-01-22 23:04:00 +05:00
dimxy 98c5280e6b corr marker to cc unspendable for F, added validation to prevent its spending
added marker to prevent archiving for A
2019-01-22 23:03:59 +05:00
dimxy 2d20276606 better var naming for check vin's pubkey algo 2019-01-22 23:03:58 +05:00
dimxy 92ab8dd7d8 linux sleep added 2019-01-22 23:03:58 +05:00
dimxy a87816f551 test rpc serialization Sleep added 2019-01-22 23:03:56 +05:00
dimxy bd29037628 string "sec" (seconds) added to heirinfo 2019-01-22 23:03:56 +05:00
dimxy e6f41e085e added real owner inactivity time in heirinfo 2019-01-22 23:03:55 +05:00
dimxy 56d68d8166 corr checking for owner pubkey in vins (is owner's or is other's) 2019-01-22 23:03:54 +05:00
dimxy 21ad10ac15 check of vin's owner pubkeys added 2019-01-22 23:03:53 +05:00
dimxy 9c526cce7d corr heir rpc coins -> satoshi conversion 2019-01-22 23:03:52 +05:00
dimxy 50b9f4fe83 test_ac added 2019-01-22 23:03:51 +05:00
dimxy d9de6b7cde extra logging disabled in validator 2019-01-18 01:11:03 +05:00
dimxy d63d43c8ef heir funcs changed to one set 2019-01-18 01:11:02 +05:00
dimxy 80a1ef04f2 added proc of incorrect tokenid to tokenorders 2019-01-18 01:11:00 +05:00
dimxy 4b71e62557 disabled debug loggin in FinalizeCCtx 2019-01-18 01:10:58 +05:00
dimxy 9dc403f331 corr call to IsTokenVout in heir 2019-01-18 01:10:55 +05: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
dimxy c51e239400 corr FillSell self now single-eval token addr 2019-01-18 01:10:52 +05:00
dimxy 65dfecadf8 corr userCCaddr calc 2019-01-18 01:10:51 +05:00
dimxy a645af7ee4 corrected user cc addr for 'x' 2019-01-18 01:10:50 +05:00
dimxy 29052b0790 corr 'x' validation code
corr logging in FinalizeCCtx
2019-01-18 01:10:49 +05:00
dimxy 9657b5ce43 added CCaddr2set to CancelSell 2019-01-18 01:10:48 +05:00
dimxy f79531a29a corr asset unspents addr in AssetOrders 2019-01-18 01:10:47 +05:00
dimxy 9584d6db7f corr cond (single tokens) for buy in GetAssetorigaddrs 2019-01-18 01:10:47 +05:00
dimxy a99fd7502d added conds for ask/bid in GetAssetorigaddrs 2019-01-18 01:10:46 +05:00
dimxy 9293af0f1b added conditions for x S o B in AssetValidateCCvin 2019-01-18 01:10:45 +05:00
dimxy c18a655baf corr uninited cpAssets var in FillBuyOffer 2019-01-18 01:10:45 +05:00
dimxy 06e5d6fc6e corr dualUnspendable use in AssetOrders 2019-01-18 01:10:44 +05:00
dimxy 0588f5dc67 corr unspendable addr for 'S' 2019-01-18 01:10:43 +05:00
dimxy 401737d208 corr dualevalUnspendableAddr in AssetValidateCCvin 2019-01-18 01:10:42 +05:00
dimxy 778bc04009 corr cpAssets use for 'S' in AssetValidate 2019-01-18 01:10:41 +05:00
dimxy dae431eaa5 corr vopretStripped use in DecodeAssetsTokenOpret 2019-01-18 01:10:39 +05:00
dimxy 830b54cf20 corr unmarshal vopretStripped 2019-01-18 01:10:38 +05:00
dimxy b807d8eb29 corr dummy evalcode in DecodeAssetTokenOpRet 2019-01-18 01:10:38 +05:00
dimxy 029d3af05a add logging origpubkey to FillSell 2019-01-18 01:10:37 +05:00
dimxy 457b9aff54 more corr othertokenscond, set cp->unspendable 2019-01-18 01:10:36 +05:00
dimxy f67a849be0 corr CCaddr2set for tokens support in FillSell 2019-01-18 01:10:35 +05:00
dimxy a16e80dac4 more corr in tokensunspendable 2019-01-18 01:10:35 +05:00
dimxy 4903298fc3 corr tokesnunspenable priv and pk 2019-01-18 01:10:34 +05:00
dimxy 406fc53925 removed extra CCaddr2set 2019-01-18 01:10:33 +05:00
dimxy a7833f272f added othertokenscond to FinalizeCCtx 2019-01-18 01:10:32 +05:00
dimxy ee848abde9 corr mysingletokenscond in FinalizeCCtx
(corr err message in rpc call)
2019-01-18 01:10:32 +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 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