|
|
@ -3534,7 +3534,6 @@ CWalletKey::CWalletKey(int64_t nExpires) |
|
|
|
int CMerkleTx::SetMerkleBranch(const CBlockIndex* pindex, int posInBlock) |
|
|
|
int CMerkleTx::SetMerkleBranch(const CBlockIndex* pindex, int posInBlock) |
|
|
|
{ |
|
|
|
{ |
|
|
|
AssertLockHeld(cs_main); |
|
|
|
AssertLockHeld(cs_main); |
|
|
|
CBlock blockTmp; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Update the tx's hashBlock
|
|
|
|
// Update the tx's hashBlock
|
|
|
|
hashBlock = pindex->GetBlockHash(); |
|
|
|
hashBlock = pindex->GetBlockHash(); |
|
|
|