diff options
| -rw-r--r-- | src/core.h | 8 | ||||
| -rw-r--r-- | src/script.h | 7 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/core.h b/src/core.h index 1b9d4dd765..a8828324fa 100644 --- a/src/core.h +++ b/src/core.h @@ -389,7 +389,13 @@ public: int nVersion; // construct a CCoins from a CTransaction, at a given height - CCoins(const CTransaction &tx, int nHeightIn) : fCoinBase(tx.IsCoinBase()), vout(tx.vout), nHeight(nHeightIn), nVersion(tx.nVersion) { } + CCoins(const CTransaction &tx, int nHeightIn) : fCoinBase(tx.IsCoinBase()), vout(tx.vout), nHeight(nHeightIn), nVersion(tx.nVersion) { + BOOST_FOREACH(CTxOut &txout, vout) { + if (txout.scriptPubKey.IsUnspendable()) + txout.SetNull(); + } + Cleanup(); + } // empty constructor CCoins() : fCoinBase(false), vout(0), nHeight(0), nVersion(0) { } diff --git a/src/script.h b/src/script.h index f5ed611548..842b8512eb 100644 --- a/src/script.h +++ b/src/script.h @@ -553,6 +553,13 @@ public: return true; } + // Returns whether the script is guaranteed to fail at execution, + // regardless of the initial stack. This allows outputs to be pruned + // instantly when entering the UTXO set. + bool IsUnspendable() const + { + return (size() > 0 && *begin() == OP_RETURN); + } void SetDestination(const CTxDestination& address); void SetMultisig(int nRequired, const std::vector<CPubKey>& keys); |