Skip to content
Permalink
Browse files

Add deserializing constructors to CTransaction and CMutableTransaction

  • Loading branch information...
sipa committed Nov 10, 2016
1 parent 0e85204 commit da60506fc80f6a78f1b271a9a53b956b49b37234
Showing with 13 additions and 0 deletions.
  1. +4 −0 src/primitives/transaction.cpp
  2. +9 −0 src/primitives/transaction.h
@@ -78,6 +78,10 @@ CTransaction::CTransaction(const CMutableTransaction &tx) : nVersion(tx.nVersion
UpdateHash();
}

CTransaction::CTransaction(CMutableTransaction &&tx) : nVersion(tx.nVersion), vin(std::move(tx.vin)), vout(std::move(tx.vout)), wit(std::move(tx.wit)), nLockTime(tx.nLockTime) {
UpdateHash();
}

CTransaction& CTransaction::operator=(const CTransaction &tx) {
*const_cast<int*>(&nVersion) = tx.nVersion;
*const_cast<std::vector<CTxIn>*>(&vin) = tx.vin;
@@ -379,6 +379,7 @@ class CTransaction

/** Convert a CMutableTransaction into a CTransaction. */
CTransaction(const CMutableTransaction &tx);
CTransaction(CMutableTransaction &&tx);

CTransaction& operator=(const CTransaction& tx);

@@ -392,6 +393,9 @@ class CTransaction
}
}

template <typename Stream>
CTransaction(deserialize_type, Stream& s) : CTransaction(CMutableTransaction(deserialize, s)) {}

bool IsNull() const {
return vin.empty() && vout.empty();
}
@@ -460,6 +464,11 @@ struct CMutableTransaction
SerializeTransaction(*this, s, ser_action);
}

template <typename Stream>
CMutableTransaction(deserialize_type, Stream& s) {
Unserialize(s);
}

/** Compute the hash of this CMutableTransaction. This is computed on the
* fly, as opposed to GetHash() in CTransaction, which uses a cached result.
*/

0 comments on commit da60506

Please sign in to comment.
You can’t perform that action at this time.