From 9237e43052743b15adb7ce994bc3d5f1aeca8c63 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Sat, 29 Dec 2018 21:44:48 +0800 Subject: [PATCH] change tombstone, revert LOCK, problem isnt that. --- src/importcoin.cpp | 2 +- src/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/importcoin.cpp b/src/importcoin.cpp index 71e469423..3a5ddcc30 100644 --- a/src/importcoin.cpp +++ b/src/importcoin.cpp @@ -107,7 +107,7 @@ void AddImportTombstone(const CTransaction &importTx, CCoinsViewCache &inputs, i uint256 burnHash = importTx.vin[0].prevout.hash; CCoinsModifier modifier = inputs.ModifyCoins(burnHash); modifier->nHeight = nHeight; - modifier->nVersion = 1; + modifier->nVersion = 4; modifier->vout.push_back(CTxOut(0, CScript() << OP_0)); } diff --git a/src/main.cpp b/src/main.cpp index 302a6162a..d7d6037ba 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3852,7 +3852,7 @@ bool static DisconnectTip(CValidationState &state, bool fBare = false) { if ((i == (block.vtx.size() - 1)) && (ASSETCHAINS_STAKED != 0 && (komodo_isPoS((CBlock *)&block) != 0))) { #ifdef ENABLE_WALLET - LOCK(cs_main); + LOCK2(cs_main, pwalletMain->cs_wallet); pwalletMain->EraseFromWallet(tx.GetHash()); #endif }