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

CA: hashAssetIdentifier -> assetEntropy

Browse source
This commit is contained in:
Mark Friedenbach 2017-03-04 15:11:15 -08:00 • committed by Gregory Sanders
parent 83456d6037
commit b2d8685a41
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/primitives/transaction.cpp
View file

@ -106,7 +106,7 @@ std::string CAssetIssuance::ToString() const
str += "CAssetIssuance(";
str += assetBlindingNonce.ToString();
str += ", ";
str += hashAssetIdentifier.ToString();
str += assetEntropy.ToString();
str += strprintf(", %s", (nAmount.IsAmount() ? strprintf("%d.%08d", nAmount.GetAmount() / COIN, nAmount.GetAmount() % COIN) : std::string("UNKNOWN")));
if (!nInflationKeys.IsNull())
str += strprintf(", %s", (nInflationKeys.IsAmount() ? strprintf("%d.%08d", nInflationKeys.GetAmount() / COIN, nInflationKeys.GetAmount() % COIN) : std::string("UNKNOWN")));

6
src/primitives/transaction.h
View file

@ -334,7 +334,7 @@ public:
// The original asset entropy (combination of Ricardian contract
// and outpoint used) which was used to generate the fixed asset
// tag and reissuance tokens.
uint256 hashAssetIdentifier;
uint256 assetEntropy;
// Both explicit and blinded issuance amounts are supported
// (see class definition for CTxOutValue for details).
@ -357,7 +357,7 @@ public:
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion)
{
READWRITE(assetBlindingNonce);
READWRITE(hashAssetIdentifier);
READWRITE(assetEntropy);
READWRITE(nAmount);
READWRITE(nInflationKeys);
}
@ -368,7 +368,7 @@ public:
friend bool operator==(const CAssetIssuance& a, const CAssetIssuance& b)
{
return a.assetBlindingNonce == b.assetBlindingNonce &&
a.hashAssetIdentifier == b.hashAssetIdentifier &&
a.assetEntropy == b.assetEntropy &&
a.nAmount == b.nAmount &&
a.nInflationKeys == b.nInflationKeys;
}