diff options
author | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-04-26 13:55:13 +0200 |
---|---|---|
committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-08-12 14:53:10 +0200 |
commit | b3b3c2a5623d5c942d2b3565cc2d833c65105555 (patch) | |
tree | e354177eedaff7b846cf910e2a2d99cae3042cf1 /src/wallet/wallet.h | |
parent | 0d0abcac1efeb94f441aa13714ba01ccfacc05c0 (diff) | |
download | bitcoin-b3b3c2a5623d5c942d2b3565cc2d833c65105555.tar.xz |
Reduce cs_main locks during ConnectTip/SyncWithWallets
Diffstat (limited to 'src/wallet/wallet.h')
-rw-r--r-- | src/wallet/wallet.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 50c94ccfbc..952acd1535 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -200,7 +200,7 @@ public: READWRITE(nIndex); } - int SetMerkleBranch(const CBlock& block); + int SetMerkleBranch(const CBlockIndex* pIndex, int posInBlock); /** * Return depth of transaction in blockchain: @@ -731,8 +731,8 @@ public: void MarkDirty(); bool AddToWallet(const CWalletTx& wtxIn, bool fFlushOnClose=true); bool LoadToWallet(const CWalletTx& wtxIn); - void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, const CBlock* pblock); - bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate); + void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock); + bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex* pIndex, int posInBlock, bool fUpdate); int ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false); void ReacceptWalletTransactions(); void ResendWalletTransactions(int64_t nBestBlockTime); |