Skip to content

Commit

Permalink
[Cleanup] Remove CoinSpend dependancy from CTxIn
Browse files Browse the repository at this point in the history
  • Loading branch information
random-zebra committed Feb 14, 2020
1 parent 935c99c commit dc0cc41
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 15 deletions.
13 changes: 0 additions & 13 deletions src/primitives/transaction.cpp
Expand Up @@ -46,19 +46,6 @@ CTxIn::CTxIn(uint256 hashPrevTx, uint32_t nOut, CScript scriptSigIn, uint32_t nS
nSequence = nSequenceIn;
}

CTxIn::CTxIn(const libzerocoin::CoinSpend& spend, libzerocoin::CoinDenomination denom)
{
//Serialize the coinspend object and append it to a CScript
CDataStream serializedCoinSpend(SER_NETWORK, PROTOCOL_VERSION);
serializedCoinSpend << spend;
std::vector<unsigned char> data(serializedCoinSpend.begin(), serializedCoinSpend.end());

scriptSig = CScript() << OP_ZEROCOINSPEND << data.size();
scriptSig.insert(scriptSig.end(), data.begin(), data.end());
prevout.SetNull();
nSequence = denom;
}

bool CTxIn::IsZerocoinSpend() const
{
return prevout.hash == 0 && scriptSig.IsZerocoinSpend();
Expand Down
2 changes: 0 additions & 2 deletions src/primitives/transaction.h
Expand Up @@ -8,7 +8,6 @@
#define BITCOIN_PRIMITIVES_TRANSACTION_H

#include "amount.h"
#include "libzerocoin/CoinSpend.h"
#include "script/script.h"
#include "serialize.h"
#include "uint256.h"
Expand Down Expand Up @@ -79,7 +78,6 @@ class CTxIn

explicit CTxIn(COutPoint prevoutIn, CScript scriptSigIn=CScript(), uint32_t nSequenceIn=std::numeric_limits<unsigned int>::max());
CTxIn(uint256 hashPrevTx, uint32_t nOut, CScript scriptSigIn=CScript(), uint32_t nSequenceIn=std::numeric_limits<uint32_t>::max());
CTxIn(const libzerocoin::CoinSpend& spend, libzerocoin::CoinDenomination denom);

ADD_SERIALIZE_METHODS;

Expand Down

0 comments on commit dc0cc41

Please sign in to comment.