GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-20 13:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Consensus: Add asset type to CTxOut and validation

Browse source
This commit is contained in:
Gregory Sanders 2016-12-01 09:34:31 -05:00
parent c63b8e9803
commit 05bc6db085
19 changed files with 196 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rpc/rawtransaction.cpp
View file

@ -486,7 +486,7 @@ UniValue createrawtransaction(const UniValue& params, bool fHelp)
if (name_ == "data") {
std::vector<unsigned char> data = ParseHexV(sendTo[name_].getValStr(),"Data");
CTxOut out(0, CScript() << OP_RETURN << data);
CTxOut out(BITCOINID, 0, CScript() << OP_RETURN << data);
rawTx.vout.push_back(out);
} else {
CBitcoinAddress address(name_);
@ -502,7 +502,7 @@ UniValue createrawtransaction(const UniValue& params, bool fHelp)
outputValue += nAmount;
CTxOut out(nAmount, scriptPubKey);
CTxOut out(BITCOINID, nAmount, scriptPubKey);
if (address.IsBlinded()) {
CPubKey confidentiality_pubkey = address.GetBlindingKey();
if (!confidentiality_pubkey.IsValid())