diff --git a/src/core.cpp b/src/core.cpp index 3018f9d6..ffcd06a4 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -161,29 +161,7 @@ uint64 CTxOutCompressor::DecompressAmount(uint64 x) return n; } -// calculate number of bytes for the bitmask, and its number of non-zero bytes -// each bit in the bitmask represents the availability of one output, but the -// availabilities of the first two outputs are encoded separately -void CCoins::CalcMaskSize(unsigned int &nBytes, unsigned int &nNonzeroBytes) const { - /* - unsigned int nLastUsedByte = 0; - for (unsigned int b = 0; 2+b*8 < vout.size(); b++) { - bool fZero = true; - for (unsigned int i = 0; i < 8 && 2+b*8+i < vout.size(); i++) { - if (!vout[2+b*8+i].IsNull()) { - fZero = false; - continue; - } - } - if (!fZero) { - nLastUsedByte = b + 1; - nNonzeroBytes++; - } - } - nBytes += nLastUsedByte; - */ -} - +#if 0 bool CCoins::Spend(const COutPoint &out, CTxInUndo &undo) { /* if (out.n >= vout.size()) @@ -207,6 +185,7 @@ bool CCoins::Spend(int nPos) { COutPoint out(0, nPos); return Spend(out, undo); } +#endif uint256 CBlockHeader::GetHash() const { diff --git a/src/core.h b/src/core.h index 0d4dba60..88288bad 100644 --- a/src/core.h +++ b/src/core.h @@ -323,64 +323,21 @@ public: /** pruned version of CTransaction: only retains metadata and unspent transaction outputs + * + * That is: userName and pubKey * * Serialized format: * - VARINT(nVersion) - * - VARINT(nCode) - * - unspentness bitvector, for vout[2] and further; least significant byte first - * - the non-spent CTxOuts (via CTxOutCompressor) + * - userName + * - pubKey * - VARINT(nHeight) * - * The nCode value consists of: - * - bit 1: IsCoinBase() - * - bit 2: vout[0] is not spent - * - bit 4: vout[1] is not spent - * - The higher bits encode N, the number of non-zero bytes in the following bitvector. - * - In case both bit 2 and bit 4 are unset, they encode N-1, as there must be at - * least one non-spent output). - * - * Example: 0104835800816115944e077fe7c803cfa57f29b36bf87c1d358bb85e - * <><><--------------------------------------------><----> - * | \ | / - * version code vout[1] height - * - * - version = 1 - * - code = 4 (vout[1] is not spent, and 0 non-zero bytes of bitvector follow) - * - unspentness bitvector: as 0 non-zero bytes follow, it has length 0 - * - vout[1]: 835800816115944e077fe7c803cfa57f29b36bf87c1d35 - * * 8358: compact amount representation for 60000000000 (600 BTC) - * * 00: special txout type pay-to-pubkey-hash - * * 816115944e077fe7c803cfa57f29b36bf87c1d35: address uint160 - * - height = 203998 - * - * - * Example: 0109044086ef97d5790061b01caab50f1b8e9c50a5057eb43c2d9563a4eebbd123008c988f1a4a4de2161e0f50aac7f17e7f9555caa486af3b - * <><><--><--------------------------------------------------><----------------------------------------------><----> - * / \ \ | | / - * version code unspentness vout[4] vout[16] height - * - * - version = 1 - * - code = 9 (coinbase, neither vout[0] or vout[1] are unspent, - * 2 (1, +1 because both bit 2 and bit 4 are unset) non-zero bitvector bytes follow) - * - unspentness bitvector: bits 2 (0x04) and 14 (0x4000) are set, so vout[2+2] and vout[14+2] are unspent - * - vout[4]: 86ef97d5790061b01caab50f1b8e9c50a5057eb43c2d9563a4ee - * * 86ef97d579: compact amount representation for 234925952 (2.35 BTC) - * * 00: special txout type pay-to-pubkey-hash - * * 61b01caab50f1b8e9c50a5057eb43c2d9563a4ee: address uint160 - * - vout[16]: bbd123008c988f1a4a4de2161e0f50aac7f17e7f9555caa4 - * * bbd123: compact amount representation for 110397 (0.001 BTC) - * * 00: special txout type pay-to-pubkey-hash - * * 8c988f1a4a4de2161e0f50aac7f17e7f9555caa4: address uint160 - * - height = 120891 */ class CCoins { public: - // whether transaction is a coinbase - bool fCoinBase; - - // unspent transaction outputs; spent outputs are .IsNull(); spent outputs at the end of the array are dropped - std::vector vout; + CScript userName; + CScript pubKey; // at which height this transaction was included in the active block chain int nHeight; @@ -390,91 +347,55 @@ public: int nVersion; // construct a CCoins from a CTransaction, at a given height - CCoins(const CTransaction &tx, int nHeightIn) : fCoinBase(tx.IsSpamMessage()), vout(), nHeight(nHeightIn), nVersion(tx.nVersion) { } + CCoins(const CTransaction &tx, int nHeightIn) : + userName(tx.userName), pubKey(tx.pubKey), nHeight(nHeightIn), nVersion(tx.nVersion) { } // empty constructor - CCoins() : fCoinBase(false), vout(0), nHeight(0), nVersion(0) { } + CCoins() : userName(), pubKey(), nHeight(0), nVersion(0) { } // remove spent outputs at the end of vout void Cleanup() { - while (vout.size() > 0 && vout.back().IsNull()) - vout.pop_back(); - if (vout.empty()) - std::vector().swap(vout); } void swap(CCoins &to) { - std::swap(to.fCoinBase, fCoinBase); - to.vout.swap(vout); + std::swap(to.userName, userName); + std::swap(to.pubKey, pubKey); std::swap(to.nHeight, nHeight); std::swap(to.nVersion, nVersion); } // equality test friend bool operator==(const CCoins &a, const CCoins &b) { - return a.fCoinBase == b.fCoinBase && + return a.userName == b.userName && + a.pubKey == b.pubKey && a.nHeight == b.nHeight && - a.nVersion == b.nVersion && - a.vout == b.vout; + a.nVersion == b.nVersion; } friend bool operator!=(const CCoins &a, const CCoins &b) { return !(a == b); } - void CalcMaskSize(unsigned int &nBytes, unsigned int &nNonzeroBytes) const; - bool IsCoinBase() const { - return fCoinBase; + return false; } unsigned int GetSerializeSize(int nType, int nVersion) const { unsigned int nSize = 0; - unsigned int nMaskSize = 0, nMaskCode = 0; - CalcMaskSize(nMaskSize, nMaskCode); - bool fFirst = vout.size() > 0 && !vout[0].IsNull(); - bool fSecond = vout.size() > 1 && !vout[1].IsNull(); - assert(fFirst || fSecond || nMaskCode); - unsigned int nCode = 8*(nMaskCode - (fFirst || fSecond ? 0 : 1)) + (fCoinBase ? 1 : 0) + (fFirst ? 2 : 0) + (fSecond ? 4 : 0); // version nSize += ::GetSerializeSize(VARINT(this->nVersion), nType, nVersion); - // size of header code - nSize += ::GetSerializeSize(VARINT(nCode), nType, nVersion); - // spentness bitmask - nSize += nMaskSize; - // txouts themself - for (unsigned int i = 0; i < vout.size(); i++) - if (!vout[i].IsNull()) - nSize += ::GetSerializeSize(CTxOutCompressor(REF(vout[i])), nType, nVersion); - // height + nSize += ::GetSerializeSize(userName, nType, nVersion); + nSize += ::GetSerializeSize(pubKey, nType, nVersion); nSize += ::GetSerializeSize(VARINT(nHeight), nType, nVersion); return nSize; } template void Serialize(Stream &s, int nType, int nVersion) const { - unsigned int nMaskSize = 0, nMaskCode = 0; - CalcMaskSize(nMaskSize, nMaskCode); - bool fFirst = vout.size() > 0 && !vout[0].IsNull(); - bool fSecond = vout.size() > 1 && !vout[1].IsNull(); - assert(fFirst || fSecond || nMaskCode); - unsigned int nCode = 8*(nMaskCode - (fFirst || fSecond ? 0 : 1)) + (fCoinBase ? 1 : 0) + (fFirst ? 2 : 0) + (fSecond ? 4 : 0); // version ::Serialize(s, VARINT(this->nVersion), nType, nVersion); // header code - ::Serialize(s, VARINT(nCode), nType, nVersion); - // spentness bitmask - for (unsigned int b = 0; bnVersion), nType, nVersion); // header code - ::Unserialize(s, VARINT(nCode), nType, nVersion); - fCoinBase = nCode & 1; - std::vector vAvail(2, false); - vAvail[0] = nCode & 2; - vAvail[1] = nCode & 4; - unsigned int nMaskCode = (nCode / 8) + ((nCode & 6) != 0 ? 0 : 1); - // spentness bitmask - while (nMaskCode > 0) { - unsigned char chAvail = 0; - ::Unserialize(s, chAvail, nType, nVersion); - for (unsigned int p = 0; p < 8; p++) { - bool f = (chAvail & (1 << p)) != 0; - vAvail.push_back(f); - } - if (chAvail != 0) - nMaskCode--; - } - // txouts themself - vout.assign(vAvail.size(), CTxOut()); - for (unsigned int i = 0; i < vAvail.size(); i++) { - if (vAvail[i]) - ::Unserialize(s, REF(CTxOutCompressor(vout[i])), nType, nVersion); - } + ::Unserialize(s, userName, nType, nVersion); + ::Unserialize(s, pubKey, nType, nVersion); // coinbase height ::Unserialize(s, VARINT(nHeight), nType, nVersion); Cleanup(); } + /* // mark an outpoint spent, and construct undo information bool Spend(const COutPoint &out, CTxInUndo &undo); @@ -521,16 +422,14 @@ public: // check whether a particular output is still available bool IsAvailable(unsigned int nPos) const { - return (nPos < vout.size() && !vout[nPos].IsNull()); + return false; } + */ // check whether the entire CCoins is spent // note that only !IsPruned() CCoins can be serialized bool IsPruned() const { - BOOST_FOREACH(const CTxOut &out, vout) - if (!out.IsNull()) - return false; - return true; + return false; } }; diff --git a/src/main.cpp b/src/main.cpp index da0b9e1e..e0620136 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -496,6 +496,7 @@ void CTxMemPool::pruneSpent(const uint256 &hashTx, CCoins &coins) { LOCK(cs); + /* std::map::iterator it = mapNextTx.lower_bound(COutPoint(hashTx, 0)); // iterate over all COutPoints in mapNextTx whose hash equals the provided hashTx @@ -503,6 +504,7 @@ void CTxMemPool::pruneSpent(const uint256 &hashTx, CCoins &coins) coins.Spend(it->first.n); // and remove those outputs from coins it++; } + */ } bool CTxMemPool::accept(CValidationState &state, CTransaction &tx, bool fLimitFree, @@ -1118,13 +1120,14 @@ void UpdateTime(CBlockHeader& block, const CBlockIndex* pindexPrev) - +/* const CTxOut &CCoinsViewCache::GetOutputFor(const CTxIn& input) { const CCoins &coins = GetCoins(input.prevout.hash); assert(coins.IsAvailable(input.prevout.n)); return coins.vout[input.prevout.n]; } +*/ int64 CCoinsViewCache::GetValueIn(const CTransaction& tx) { diff --git a/src/main.h b/src/main.h index 52f78207..af5f4693 100644 --- a/src/main.h +++ b/src/main.h @@ -1140,7 +1140,7 @@ public: // Check whether all prevouts of the transaction are present in the UTXO set represented by this view bool HaveInputs(const CTransaction& tx); - const CTxOut &GetOutputFor(const CTxIn& input); + //const CTxOut &GetOutputFor(const CTxIn& input); private: std::map::iterator FetchCoins(const uint256 &txid); diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index edaa7322..65346851 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -234,20 +234,17 @@ Value gettxout(const Array& params, bool fHelp) if (!pcoinsTip->GetCoins(hash, coins)) return Value::null; } - if (n<0 || (unsigned int)n>=coins.vout.size() || coins.vout[n].IsNull()) - return Value::null; ret.push_back(Pair("bestblock", pcoinsTip->GetBestBlock()->GetBlockHash().GetHex())); if ((unsigned int)coins.nHeight == MEMPOOL_HEIGHT) ret.push_back(Pair("confirmations", 0)); else ret.push_back(Pair("confirmations", pcoinsTip->GetBestBlock()->nHeight - coins.nHeight + 1)); - ret.push_back(Pair("value", ValueFromAmount(coins.vout[n].nValue))); + ret.push_back(Pair("userName", coins.userName.ToString())); Object o; - ScriptPubKeyToJSON(coins.vout[n].scriptPubKey, o); - ret.push_back(Pair("scriptPubKey", o)); + ScriptPubKeyToJSON(coins.pubKey, o); + ret.push_back(Pair("pubKey", o)); ret.push_back(Pair("version", coins.nVersion)); - ret.push_back(Pair("coinbase", coins.fCoinBase)); return ret; } diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index 2ef6eaf6..0a2baf43 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -445,6 +445,7 @@ Value signrawtransaction(const Array& params, bool fHelp) CCoins coins; if (view.GetCoins(txid, coins)) { + /* if (coins.IsAvailable(nOut) && coins.vout[nOut].scriptPubKey != scriptPubKey) { string err("Previous output scriptPubKey mismatch:\n"); err = err + coins.vout[nOut].scriptPubKey.ToString() + "\nvs:\n"+ @@ -452,14 +453,16 @@ Value signrawtransaction(const Array& params, bool fHelp) throw JSONRPCError(RPC_DESERIALIZATION_ERROR, err); } // what todo if txid is known, but the actual output isn't? + */ } /* if ((unsigned int)nOut >= coins.vout.size()) coins.vout.resize(nOut+1); coins.vout[nOut].scriptPubKey = scriptPubKey; coins.vout[nOut].nValue = 0; // we don't know the actual output value + */ view.SetCoins(txid, coins); -*/ + // if redeemScript given and not using the local wallet (private keys // given), add redeemScript to the tempKeystore so it can be signed: if (fGivenKeys && scriptPubKey.IsPayToScriptHash()) diff --git a/src/txdb.cpp b/src/txdb.cpp index 34836eaa..8ca093c3 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -136,18 +136,10 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) { ssKey >> txhash; ss << txhash; ss << VARINT(coins.nVersion); - ss << (coins.fCoinBase ? 'c' : 'n'); + ss << coins.userName; + ss << coins.pubKey; ss << VARINT(coins.nHeight); stats.nTransactions++; - for (unsigned int i=0; i