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

Wallet: GetIssuanceAssets to get CAmountMap for issuances

Browse source
This commit is contained in:
Luke Dashjr 2018-12-15 23:00:29 +00:00 • committed by Gregory Sanders
parent 4ea8f88274
commit 906cc4c40b
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/wallet/wallet.cpp
View file

@ -2024,6 +2024,19 @@ bool CWalletTx::IsEquivalentTo(const CWalletTx& _tx) const
return CTransaction(tx1) == CTransaction(tx2);
}
CAmountMap CWalletTx::GetIssuanceAssets(unsigned int input_index) const {
CAmountMap ret;
CAsset asset, token;
GetIssuanceAssets(input_index, &asset, &token);
if (!asset.IsNull()) {
ret[asset] = GetIssuanceAmount(input_index, false);
}
if (!token.IsNull()) {
ret[token] = GetIssuanceAmount(input_index, true);
}
return ret;
}
std::vector<uint256> CWallet::ResendWalletTransactionsBefore(int64_t nTime, CConnman* connman)
{
std::vector<uint256> result;
@ -5196,9 +5209,9 @@ CPubKey CWalletTx::GetOutputBlindingPubKey(unsigned int output_index) const {
return ret;
}
void CWalletTx::GetIssuanceAssets(unsigned int vinIndex, CAsset* out_asset, CAsset* out_reissuance_token) const {
assert(vinIndex < tx->vin.size());
const CAssetIssuance& issuance = tx->vin[vinIndex].assetIssuance;
void CWalletTx::GetIssuanceAssets(unsigned int input_index, CAsset* out_asset, CAsset* out_reissuance_token) const {
assert(input_index < tx->vin.size());
const CAssetIssuance& issuance = tx->vin[input_index].assetIssuance;
if (out_asset && issuance.nAmount.IsNull()) {
out_asset->SetNull();
@ -5212,7 +5225,7 @@ void CWalletTx::GetIssuanceAssets(unsigned int vinIndex, CAsset* out_asset, CAss
if (issuance.assetBlindingNonce.IsNull()) {
uint256 entropy;
GenerateAssetEntropy(entropy, tx->vin[vinIndex].prevout, issuance.assetEntropy);
GenerateAssetEntropy(entropy, tx->vin[input_index].prevout, issuance.assetEntropy);
if (out_reissuance_token) {
CalculateReissuanceToken(*out_reissuance_token, entropy, issuance.nAmount.IsCommitment());
}

2
src/wallet/wallet.h
View file

@ -535,6 +535,8 @@ public:
CAsset GetOutputAsset(unsigned int output_index) const;
//! Get the issuance CAssets for both the asset itself and the issuing tokens
void GetIssuanceAssets(unsigned int vinIndex, CAsset* out_asset, CAsset* out_reissuance_token) const;
// ! Return map of issued assets at input_index
CAmountMap GetIssuanceAssets(unsigned int input_index) const;
// ! Returns receiver's blinding pubkey
CPubKey GetOutputBlindingPubKey(unsigned int output_index) const;
//! Get the issuance blinder for either the asset itself or the issuing tokens