@@ -215,12 +215,6 @@ class CWalletTx
215215 * CWallet::ComputeTimeSmart().
216216 */
217217 unsigned int nTimeSmart;
218- /* *
219- * From me flag is set to 1 for transactions that were created by the wallet
220- * on this bitcoin node, and set to 0 for transactions that were created
221- * externally and came in through the network or sendrawtransaction RPC.
222- */
223- bool fFromMe ;
224218 int64_t nOrderPos; // !< position in ordered transaction list
225219 std::multimap<int64_t , CWalletTx*>::const_iterator m_it_wtxOrdered;
226220
@@ -249,7 +243,6 @@ class CWalletTx
249243 fTimeReceivedIsTxTime = false ;
250244 nTimeReceived = 0 ;
251245 nTimeSmart = 0 ;
252- fFromMe = false ;
253246 fChangeCached = false ;
254247 nChangeCached = 0 ;
255248 nOrderPos = -1 ;
@@ -281,10 +274,10 @@ class CWalletTx
281274
282275 std::vector<uint8_t > dummy_vector1; // !< Used to be vMerkleBranch
283276 std::vector<uint8_t > dummy_vector2; // !< Used to be vtxPrev
284- bool dummy_bool = false ; // !< Used to be fSpent
277+ bool dummy_bool = false ; // !< Used to be fFromMe and fSpent
285278 uint256 serializedHash = TxStateSerializedBlockHash (m_state);
286279 int serializedIndex = TxStateSerializedIndex (m_state);
287- s << TX_WITH_WITNESS (tx) << serializedHash << dummy_vector1 << serializedIndex << dummy_vector2 << mapValueCopy << vOrderForm << fTimeReceivedIsTxTime << nTimeReceived << fFromMe << dummy_bool;
280+ s << TX_WITH_WITNESS (tx) << serializedHash << dummy_vector1 << serializedIndex << dummy_vector2 << mapValueCopy << vOrderForm << fTimeReceivedIsTxTime << nTimeReceived << dummy_bool << dummy_bool;
288281 }
289282
290283 template <typename Stream>
@@ -294,10 +287,10 @@ class CWalletTx
294287
295288 std::vector<uint256> dummy_vector1; // !< Used to be vMerkleBranch
296289 std::vector<CMerkleTx> dummy_vector2; // !< Used to be vtxPrev
297- bool dummy_bool; // ! Used to be fSpent
290+ bool dummy_bool; // ! Used to be fFromMe and fSpent
298291 uint256 serialized_block_hash;
299292 int serializedIndex;
300- s >> TX_WITH_WITNESS (tx) >> serialized_block_hash >> dummy_vector1 >> serializedIndex >> dummy_vector2 >> mapValue >> vOrderForm >> fTimeReceivedIsTxTime >> nTimeReceived >> fFromMe >> dummy_bool;
293+ s >> TX_WITH_WITNESS (tx) >> serialized_block_hash >> dummy_vector1 >> serializedIndex >> dummy_vector2 >> mapValue >> vOrderForm >> fTimeReceivedIsTxTime >> nTimeReceived >> dummy_bool >> dummy_bool;
301294
302295 m_state = TxStateInterpretSerialized ({serialized_block_hash, serializedIndex});
303296
0 commit comments