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

cancelbid

Browse Source
This commit is contained in:
jl777
2018-07-21 05:58:46 -11:00
parent 0444ad7181
commit cf6108142e
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cc/assets.cpp
View File

@@ -825,9 +825,9 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2;
if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
return(0);
else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() != 0 )
return eval->Invalid("invalid CC vout0 for buyvin");
else if ( DecodeOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey) == 0 )
else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
return eval->Invalid("invalid normal vout0 for buyvin");
else if ( DecodeOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey) != 'b' )
return eval->Invalid("invalid opreturn for buyvin");
else return(nValue);
}
@@ -931,6 +931,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
return eval->Invalid("mismatched refund for cancelbuy");
else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0 )
return eval->Invalid("invalid vout0 destaddr for cancelbuy");
fprintf(stderr,"cancelbuy validated to destaddr.(%s)\n",destaddr);
break;
case 'B': // fillbuy:

12
src/wallet/rpcwallet.cpp
View File

@@ -4881,7 +4881,17 @@ UniValue tokenbid(const UniValue& params, bool fHelp)
UniValue tokencancelbid(const UniValue& params, bool fHelp)
{
UniValue result(UniValue::VOBJ);
UniValue result(UniValue::VOBJ); std::string hex; uint256 bidtxid;
if ( fHelp || params.size() != 1 )
throw runtime_error("tokencancelbid bidtxid\n");
std::vector<unsigned char> bidid(ParseHex(params[0].get_str()));
memcpy(&bidtxid,bidid.data(),sizeof(bidtxid));
hex = CancelBuyOffer(0,bidtxid);
if ( hex.size() > 0 )
{
result.push_back(Pair("result", "success"));
result.push_back(Pair("hex", hex));
} else result.push_back(Pair("error", "could cancel bid"));
return(result);
}