mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-17 13:07:54 +02:00
Correct how wallet blinding logic detects which token id to use based on blinding keys
This commit is contained in:
parent
fff2dccc1e
commit
c579f4b524
1 changed files with 4 additions and 4 deletions
|
|
@ -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) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue