Correct how wallet blinding logic detects which token id to use based on blinding keys

This commit is contained in:
Gregory Sanders 2018-12-12 16:12:30 -05:00
parent fff2dccc1e
commit c579f4b524

View file

@ -265,10 +265,10 @@ int BlindTransaction(std::vector<uint256 >& input_blinding_factors, const std::v
} }
// New Issuance // New Issuance
if (issuance.assetBlindingNonce.IsNull()) { if (issuance.assetBlindingNonce.IsNull()) {
bool assetToBlind = (vBlindIssuanceAsset.size() > i && vBlindIssuanceAsset[i].IsValid()) ? true : false; bool blind_issuance = (vBlindIssuanceToken.size() > i && vBlindIssuanceToken[i].IsValid()) ? true : false;
GenerateAssetEntropy(entropy, tx.vin[i].prevout, issuance.assetEntropy); GenerateAssetEntropy(entropy, tx.vin[i].prevout, issuance.assetEntropy);
CalculateAsset(asset, entropy); CalculateAsset(asset, entropy);
CalculateReissuanceToken(token, entropy, assetToBlind); CalculateReissuanceToken(token, entropy, blind_issuance);
} else { } else {
CalculateAsset(asset, issuance.assetEntropy); CalculateAsset(asset, issuance.assetEntropy);
} }
@ -395,8 +395,8 @@ int BlindTransaction(std::vector<uint256 >& input_blinding_factors, const std::v
if (nPseudo == 0) { if (nPseudo == 0) {
CalculateAsset(asset, entropy); CalculateAsset(asset, entropy);
} else { } else {
bool assetToBlind = (vBlindIssuanceAsset.size() > nIn && vBlindIssuanceAsset[nIn].IsValid()) ? true : false; bool blind_issuance = (vBlindIssuanceToken.size() > nIn && vBlindIssuanceToken[nIn].IsValid()) ? true : false;
CalculateReissuanceToken(asset, entropy, assetToBlind); CalculateReissuanceToken(asset, entropy, blind_issuance);
} }
} else { } else {
if (nPseudo == 0) { if (nPseudo == 0) {