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

CA: uint256 -> CAssetID

Browse source
This commit is contained in:
Mark Friedenbach 2017-03-04 09:23:26 -08:00 • committed by Gregory Sanders
parent 6a23fa3950
commit 892cb984ae
16 changed files with 120 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/validation.cpp
View file

@ -684,7 +684,7 @@ bool VerifyAmounts(const CCoinsViewCache& cache, const CTransaction& tx, std::ve
return false;
if (asset.IsAssetID()) {
uint256 fixedAsset;
CAssetID fixedAsset;
asset.GetAssetID(fixedAsset);
ret = secp256k1_generator_generate(secp256k1_ctx_verify_amounts, &gen, fixedAsset.begin());
assert(ret != 0);
@ -729,7 +729,7 @@ bool VerifyAmounts(const CCoinsViewCache& cache, const CTransaction& tx, std::ve
return false;
if (asset.IsAssetID()) {
uint256 fixedAsset;
CAssetID fixedAsset;
asset.GetAssetID(fixedAsset);
ret = secp256k1_generator_generate(secp256k1_ctx_verify_amounts, &gen, fixedAsset.begin());
assert(ret != 0);
@ -788,7 +788,7 @@ bool VerifyAmounts(const CCoinsViewCache& cache, const CTransaction& tx, std::ve
{
const CTxOutAsset& asset = cache.GetOutputFor(tx.vin[i]).nAsset;
if (asset.IsAssetID()) {
uint256 fixedAsset;
CAssetID fixedAsset;
asset.GetAssetID(fixedAsset);
ret = secp256k1_generator_generate(secp256k1_ctx_verify_amounts, &ephemeral_input_tags[i], fixedAsset.begin());
assert(ret != 0);
@ -834,7 +834,7 @@ bool VerifyCoinbaseAmount(const CTransaction& tx, const CAmountMap& mapFees)
for (unsigned int i = 0; i < tx.vout.size(); i++) {
if (!tx.vout[i].nValue.IsAmount() || !tx.vout[i].nAsset.IsAssetID())
return false;
uint256 assetid;
CAssetID assetid;
tx.vout[i].nAsset.GetAssetID(assetid);
remaining[assetid] -= tx.vout[i].nValue.GetAmount();
}
@ -1902,7 +1902,7 @@ void GenerateAssetEntropy(uint256& entropy, const COutPoint& prevout, const uint
entropy = ComputeFastMerkleRoot(leaves);
}
void CalculateAssetID(uint256& assetID, const uint256& entropy)
void CalculateAssetID(CAssetID& assetID, const uint256& entropy)
{
static const uint256 kZero = uint256S("0x0000000000000000000000000000000000000000000000000000000000000000");
// H_a : asset tag
@ -1912,10 +1912,10 @@ void CalculateAssetID(uint256& assetID, const uint256& entropy)
leaves.reserve(2);
leaves.push_back(entropy);
leaves.push_back(kZero);
assetID = ComputeFastMerkleRoot(leaves);
assetID = CAssetID(ComputeFastMerkleRoot(leaves));
}
void CalculateReissuanceToken(uint256& reissuanceTokenID, const uint256& entropy, bool fConfidential)
void CalculateReissuanceToken(CAssetID& reissuanceTokenID, const uint256& entropy, bool fConfidential)
{
static const uint256 kOne = uint256S("0x0000000000000000000000000000000000000000000000000000000000000001");
static const uint256 kTwo = uint256S("0x0000000000000000000000000000000000000000000000000000000000000002");
@ -1929,7 +1929,7 @@ void CalculateReissuanceToken(uint256& reissuanceTokenID, const uint256& entropy
leaves.reserve(2);
leaves.push_back(entropy);
leaves.push_back(fConfidential? kTwo: kOne);
reissuanceTokenID = ComputeFastMerkleRoot(leaves);
reissuanceTokenID = CAssetID(ComputeFastMerkleRoot(leaves));
}
bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsViewCache &inputs, bool fScriptChecks, unsigned int flags, bool cacheStore, PrecomputedTransactionData& txdata, std::set<std::pair<uint256, COutPoint> >& setWithdrawsSpent, std::vector<CCheck*> *pvChecks)