Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/assets/assets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -827,13 +827,16 @@ bool ReissueAssetFromScript(const CScript& scriptPubKey, CReissueAsset& reissue,
if (!IsScriptReissueAsset(scriptPubKey, nStartingIndex))
return false;

if (scriptPubKey.empty() || scriptPubKey.back() != OP_DROP)
return false;

CTxDestination destination;
ExtractDestination(scriptPubKey, destination);

strAddress = EncodeDestination(destination);

std::vector<unsigned char> vchReissueAsset;
vchReissueAsset.insert(vchReissueAsset.end(), scriptPubKey.begin() + nStartingIndex, scriptPubKey.end());
vchReissueAsset.insert(vchReissueAsset.end(), scriptPubKey.begin() + nStartingIndex, scriptPubKey.end() - 1);
CDataStream ssReissue(vchReissueAsset, SER_NETWORK, PROTOCOL_VERSION);

try {
Expand All @@ -843,6 +846,9 @@ bool ReissueAssetFromScript(const CScript& scriptPubKey, CReissueAsset& reissue,
return false;
}

if (!ssReissue.empty())
return false;

return true;
}

Expand Down
6 changes: 6 additions & 0 deletions src/test/assets/serialization_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ BOOST_FIXTURE_TEST_SUITE(serialization_tests, BasicTestingSetup)
BOOST_CHECK_MESSAGE(serializedAsset2.nAmount == 100000000, "Amount weren't equal");
BOOST_CHECK_MESSAGE(serializedAsset2.strIPFSHash == "", "IPFSHash wasn't equal");

// Reject trailing data in a reissue payload.
scriptPubKey.insert(scriptPubKey.end() - 1, 0x00);
CReissueAsset malformedAsset;
BOOST_CHECK_MESSAGE(!ReissueAssetFromScript(scriptPubKey, malformedAsset, address),
"Malformed reissue payload was accepted");

// Txid Hash instead of IPFS
CReissueAsset reissue3(name, 100000000, 0, 0, DecodeAssetData("9c2c8e121a0139ba39bffd3ca97267bca9d4c0c1e84ac0c34a883c28e7a912ca"));
scriptPubKey = GetScriptForDestination(dest);
Expand Down