Reverse cs_main, cs_wallet lock order and reduce cs_main locking #16426

2251@@ -2274,13 +2252,13 @@ bool CWalletTx::InMempool() const
2252     return fInMempool;
2253 }
2254 
2255-bool CWalletTx::IsTrusted(interfaces::Chain::Lock& locked_chain) const
2256+bool CWalletTx::IsTrusted() const
2257 {
2258     // Quick answer in most cases
2259-    if (!locked_chain.checkFinalTx(*tx)) {
2260+    if (!pwallet->chain().checkFinalTx(*tx)) {

564@@ -565,7 +565,7 @@ UniValue importwallet(const JSONRPCRequest& request)
565         if (!file.is_open()) {
566             throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot open wallet dump file");
567         }
568-        Optional<int> tip_height = locked_chain->getHeight();
569+        Optional<int> tip_height = pwallet->chain().getHeight();

3411-                    // ... and all their affected keys
3412-                    std::map<CKeyID, int>::iterator rit = mapKeyFirstBlock.find(keyid);
3413-                    if (rit != mapKeyFirstBlock.end() && *height < rit->second)
3414-                        rit->second = *height;
3415-                }
3416+        // ... which are already in a block

757@@ -758,6 +758,9 @@ class CWallet final : public WalletStorage, private interfaces::Chain::Notificat
758     /** Interface to assert chain access and if successful lock it */
759     std::unique_ptr<interfaces::Chain::Lock> LockChain() { return m_chain ? m_chain->lock() : nullptr; }
760 
761+    /** Interface to assert chain access */
762+    bool HaveChain() { return m_chain ? true : false; }

3417+        for (const CTxOut& txout : wtx.tx->vout) {
3418+            // iterate over all their outputs
3419+            for (const auto& keyid : GetAffectedKeys(txout.scriptPubKey, *spk_man)) {
3420+                // ... and all their affected keys
3421+                std::map<CKeyID, int>::iterator rit = mapKeyFirstBlock.find(keyid);
3422+                if (rit != mapKeyFirstBlock.end() && wtx.m_confirm.block_height < rit->second)

2451     if (chain.isInitialBlockDownload()) {
2452         return false;
2453     }
2454     constexpr int64_t MAX_ANTI_FEE_SNIPING_TIP_AGE = 8 * 60 * 60; // in seconds
2455-    if (locked_chain.getBlockTime(*locked_chain.getHeight()) < (GetTime() - MAX_ANTI_FEE_SNIPING_TIP_AGE)) {
2456+    auto locked_chain = chain.lock();

330@@ -344,6 +331,7 @@ class ChainImpl : public Chain
331     }
332     std::unique_ptr<Handler> handleNotifications(Notifications& notifications) override
333     {
334+        LOCK(::cs_main);

127+    //! Get block height above genesis block. Returns 0 for genesis block,
128+    //! 1 for following block, and so on. Returns nullopt for a block not
129+    //! included in the current chain.
130+    virtual Optional<int> getBlockHeight(const uint256& hash) = 0;
131+
132+    //! Get block hash. Height must be valid or this function will abort.

59@@ -60,16 +60,16 @@ WalletTx MakeWalletTx(CWallet& wallet, const CWalletTx& wtx)
60 }
61 
62 //! Construct wallet tx status struct.
63-WalletTxStatus MakeWalletTxStatus(interfaces::Chain::Lock& locked_chain, const CWalletTx& wtx)
64+WalletTxStatus MakeWalletTxStatus(CWallet& wallet, const CWalletTx& wtx)
65 {
66     WalletTxStatus result;
67-    result.block_height = locked_chain.getBlockHeight(wtx.m_confirm.hashBlock).get_value_or(std::numeric_limits<int>::max());
68+    result.block_height = wtx.m_confirm.block_height;

315@@ -330,14 +316,13 @@ class WalletImpl : public Wallet
316         if (mi == m_wallet->mapWallet.end()) {
317             return false;
318         }
319-        if (Optional<int> height = locked_chain->getHeight()) {
320-            num_blocks = *height;
321-            block_time = locked_chain->getBlockTime(*height);
322+        num_blocks = m_wallet->GetLastBlockHeight();
323+        if (num_blocks >= 0) {
324+            block_time = m_wallet->chain().getBlockTime(num_blocks);

354@@ -358,8 +355,7 @@ UniValue importprunedfunds(const JSONRPCRequest& request)
355         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Something wrong with merkleblock");
356     }
357 
358-    auto locked_chain = pwallet->chain().lock();
359-    Optional<int> height = locked_chain->getBlockHeight(merkleBlock.header.GetHash());
360+    Optional<int> height = pwallet->chain().getBlockHeight(merkleBlock.header.GetHash());

329@@ -330,11 +330,10 @@ class WalletImpl : public Wallet
330         if (mi == m_wallet->mapWallet.end()) {
331             return false;
332         }
333-        if (Optional<int> height = locked_chain->getHeight()) {
334-            num_blocks = *height;
335-            block_time = locked_chain->getBlockTime(*height);
336+        num_blocks = m_wallet->GetLastBlockHeight();
337+        if (num_blocks >= 0) {

1600@@ -1601,8 +1601,8 @@ static UniValue listsinceblock(const JSONRPCRequest& request)
1601 
1602     bool include_removed = (request.params[3].isNull() || request.params[3].get_bool());
1603 
1604-    const Optional<int> tip_height = locked_chain->getHeight();
1605-    int depth = tip_height && height ? (1 + *tip_height - *height) : -1;
1606+    int tip_height = pwallet->GetLastBlockHeight();
1607+    int depth = tip_height >= 0 && height ? (1 + tip_height - *height) : -1;

1633@@ -1634,7 +1634,7 @@ static UniValue listsinceblock(const JSONRPCRequest& request)
1634         --*altheight;
1635     }
1636 
1637-    int last_height = tip_height ? *tip_height + 1 - target_confirms : -1;
1638+    int last_height = tip_height >= 0 ? tip_height + 1 - target_confirms : -1;

779@@ -790,9 +780,9 @@ UniValue dumpwallet(const JSONRPCRequest& request)
780     // produce output
781     file << strprintf("# Wallet dump created by Bitcoin %s\n", CLIENT_BUILD);
782     file << strprintf("# * Created on %s\n", FormatISO8601DateTime(GetTime()));
783-    const Optional<int> tip_height = locked_chain->getHeight();
784-    file << strprintf("# * Best block at time of backup was %i (%s),\n", tip_height.get_value_or(-1), tip_height ? locked_chain->getBlockHash(*tip_height).ToString() : "(missing block hash)");
785-    file << strprintf("#   mined on %s\n", tip_height ? FormatISO8601DateTime(locked_chain->getBlockTime(*tip_height)) : "(missing block time)");
786+    int tip_height = pwallet->GetLastBlockHeight();
787+    file << strprintf("# * Best block at time of backup was %i (%s),\n", tip_height, tip_height >= 0 ? pwallet->chain().getBlockHash(tip_height).ToString() : "(missing block hash)");
788+    file << strprintf("#   mined on %s\n", tip_height >= 0 ? FormatISO8601DateTime(pwallet->chain().getBlockTime(tip_height)) : "(missing block hash)");

154+    }
155+    Optional<int64_t> getBlockTime(int height) override
156+    {
157+        LOCK(::cs_main);
158+        CBlockIndex* block = ::ChainActive()[height];
159+        assert(block != nullptr);

789@@ -790,9 +790,9 @@ UniValue dumpwallet(const JSONRPCRequest& request)
790     // produce output
791     file << strprintf("# Wallet dump created by Bitcoin %s\n", CLIENT_BUILD);
792     file << strprintf("# * Created on %s\n", FormatISO8601DateTime(GetTime()));
793-    const Optional<int> tip_height = locked_chain->getHeight();
794-    file << strprintf("# * Best block at time of backup was %i (%s),\n", tip_height.get_value_or(-1), tip_height ? locked_chain->getBlockHash(*tip_height).ToString() : "(missing block hash)");
795-    file << strprintf("#   mined on %s\n", tip_height ? FormatISO8601DateTime(locked_chain->getBlockTime(*tip_height)) : "(missing block time)");
796+    int tip_height = pwallet->GetLastBlockHeight();
797+    file << strprintf("# * Best block at time of backup was %i (%s),\n", tip_height, locked_chain->getBlockHash(tip_height).ToString());
798+    file << strprintf("#   mined on %s\n", tip_height >= 0 ? FormatISO8601DateTime(locked_chain->getBlockTime(tip_height)) : "(missing block hash)");

1364@@ -1365,7 +1365,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
1365         EnsureWalletIsUnlocked(pwallet);
1366 
1367         // Verify all timestamps are present before importing any keys.
1368-        const Optional<int> tip_height = locked_chain->getHeight();
1369+        const Optional<int> tip_height = pwallet->chain().getHeight();
1370         now = tip_height ? locked_chain->getBlockMedianTimePast(*tip_height) : 0;

1633@@ -1634,8 +1634,7 @@ static UniValue listsinceblock(const JSONRPCRequest& request)
1634         --*altheight;
1635     }
1636 
1637-    int last_height = tip_height ? *tip_height + 1 - target_confirms : -1;
1638-    uint256 lastblock = last_height >= 0 ? locked_chain->getBlockHash(last_height) : uint256();
1639+    uint256 lastblock = tip_height + 1 - target_confirms >= 0 ? locked_chain->getBlockHash(tip_height + 1 - target_confirms) : uint256();

2887@@ -2914,9 +2888,8 @@ static UniValue listunspent(const JSONRPCRequest& request)
2888         cctl.m_avoid_address_reuse = false;
2889         cctl.m_min_depth = nMinDepth;
2890         cctl.m_max_depth = nMaxDepth;
2891-        auto locked_chain = pwallet->chain().lock();
2892         LOCK(pwallet->cs_wallet);

45@@ -51,79 +46,74 @@ class Wallet;
46 //! * The handleRpc, registerRpcs, rpcEnableDeprecated methods and other RPC
47 //!   methods can go away if wallets listen for HTTP requests on their own
48 //!   ports instead of registering to handle requests on the node HTTP port.
49+//!
50+//! * Move fee estimation queries to an asynchronous interface and let the
51+//!   wallet cache it, fee estimation being driven by node mempool, wallet
52+//!   should be the consumer.
53+//!
54+//! * The `guesVerificationProgress`, `getBlockHeight`, `getBlockHash`, etc

2402@@ -2412,11 +2403,10 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nC
2403 
2404     // Acquire the locks to prevent races to the new locked unspents between the

3775@@ -3800,24 +3776,34 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
3776     // Try to top up keypool. No-op if the wallet is locked.
3777     walletInstance->TopUpKeyPool();
3778 
3779-    auto locked_chain = chain.lock();
3780     LOCK(walletInstance->cs_wallet);
3781 
3782+    // Register wallet with validationinterface. It's done before rescan to avoid

336-        } else {
337-            num_blocks = -1;
338-            block_time = -1;
339-        }
340+        num_blocks = m_wallet->GetLastBlockHeight();
341+        block_time = locked_chain->getBlockTime(num_blocks);

564@@ -565,8 +565,8 @@ UniValue importwallet(const JSONRPCRequest& request)
565         if (!file.is_open()) {
566             throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot open wallet dump file");
567         }
568-        Optional<int> tip_height = locked_chain->getHeight();
569-        nTimeBegin = tip_height ? locked_chain->getBlockTime(*tip_height) : 0;
570+        Optional<int> tip_height = pwallet->chain().getHeight();
571+        nTimeBegin = locked_chain->getBlockTime(*tip_height);

789@@ -790,9 +790,9 @@ UniValue dumpwallet(const JSONRPCRequest& request)
790     // produce output
791     file << strprintf("# Wallet dump created by Bitcoin %s\n", CLIENT_BUILD);
792     file << strprintf("# * Created on %s\n", FormatISO8601DateTime(GetTime()));
793-    const Optional<int> tip_height = locked_chain->getHeight();
794-    file << strprintf("# * Best block at time of backup was %i (%s),\n", tip_height.get_value_or(-1), tip_height ? locked_chain->getBlockHash(*tip_height).ToString() : "(missing block hash)");
795-    file << strprintf("#   mined on %s\n", tip_height ? FormatISO8601DateTime(locked_chain->getBlockTime(*tip_height)) : "(missing block time)");
796+    int tip_height = pwallet->GetLastBlockHeight();
797+    file << strprintf("# * Best block at time of backup was %i (%s),\n", tip_height, locked_chain->getBlockHash(tip_height).ToString());
798+    file << strprintf("#   mined on %s\n", FormatISO8601DateTime(locked_chain->getBlockTime(tip_height)));

1364@@ -1365,8 +1365,8 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
1365         EnsureWalletIsUnlocked(pwallet);
1366 
1367         // Verify all timestamps are present before importing any keys.
1368-        const Optional<int> tip_height = locked_chain->getHeight();
1369-        now = tip_height ? locked_chain->getBlockMedianTimePast(*tip_height) : 0;
1370+        const Optional<int> tip_height = pwallet->chain().getHeight();
1371+        now = locked_chain->getBlockMedianTimePast(*tip_height);

1633@@ -1634,8 +1634,8 @@ static UniValue listsinceblock(const JSONRPCRequest& request)
1634         --*altheight;
1635     }
1636 
1637-    int last_height = tip_height ? *tip_height + 1 - target_confirms : -1;
1638-    uint256 lastblock = last_height >= 0 ? locked_chain->getBlockHash(last_height) : uint256();
1639+    int lastheight = tip_height + 1 - target_confirms;
1640+    uint256 lastblock = lastheight >= 0 ? locked_chain->getBlockHash(lastheight) : uint256();

3526@@ -3527,7 +3527,7 @@ UniValue rescanblockchain(const JSONRPCRequest& request)
3527     uint256 start_block, stop_block;
3528     {
3529         auto locked_chain = pwallet->chain().lock();
3530-        Optional<int> tip_height = locked_chain->getHeight();
3531+        Optional<int> tip_height = pwallet->chain().getHeight();

151@@ -152,6 +152,10 @@ BOOST_FIXTURE_TEST_CASE(importmulti_rescan, TestChain100Setup)
152     // after.
153     {
154         std::shared_ptr<CWallet> wallet = std::make_shared<CWallet>(chain.get(), WalletLocation(), WalletDatabase::CreateDummy());
155+        {
156+            LOCK(wallet->cs_wallet);
157+            wallet->SetLastBlockProcessed(::ChainActive().Height(), ::ChainActive().Tip()->GetBlockHash());
158+        }

1550@@ -1551,7 +1551,7 @@ int64_t CWallet::RescanFromTime(int64_t startTime, const WalletRescanReserver& r
1551     {
1552         auto locked_chain = chain().lock();
1553         const Optional<int> start_height = locked_chain->findFirstBlockWithTimeAndHeight(startTime - TIMESTAMP_WINDOW, 0, &start_block);
1554-        const Optional<int> tip_height = locked_chain->getHeight();
1555+        const Optional<int> tip_height = chain().getHeight();

2451         return false;
2452     }
2453     constexpr int64_t MAX_ANTI_FEE_SNIPING_TIP_AGE = 8 * 60 * 60; // in seconds
2454-    if (locked_chain.getBlockTime(*locked_chain.getHeight()) < (GetTime() - MAX_ANTI_FEE_SNIPING_TIP_AGE)) {
2455+    auto locked_chain = chain.lock();
2456+    if (locked_chain->getBlockTime(block_height) < (GetTime() - MAX_ANTI_FEE_SNIPING_TIP_AGE)) {

358@@ -359,7 +359,8 @@ UniValue importprunedfunds(const JSONRPCRequest& request)
359     }
360 
361     auto locked_chain = pwallet->chain().lock();
362-    Optional<int> height = locked_chain->getBlockHeight(merkleBlock.header.GetHash());
363+    LOCK(pwallet->cs_wallet);
364+    Optional<int> height = pwallet->chain().getBlockHeight(merkleBlock.header.GetHash());

3408+            // iterate over all their outputs
3409+            for (const auto& keyid : GetAffectedKeys(txout.scriptPubKey, *spk_man)) {
3410+                // ... and all their affected keys
3411+                std::map<CKeyID, int>::iterator rit = mapKeyFirstBlock.find(keyid);
3412+                if (rit != mapKeyFirstBlock.end() && wtx.m_confirm.block_height < rit->second) {
3413+                    rit->second = wtx.m_confirm.block_height;

121@@ -125,6 +122,10 @@ class Chain
122     //! included in the current chain.
123     virtual Optional<int> getBlockHeight(const uint256& hash) = 0;
124 
125+    //! Get block hash. Returns nullopt for a block not included in the
126+    //! current chain.
127+    virtual Optional<uint256> getBlockHash(int height) = 0;

789@@ -790,7 +790,8 @@ UniValue dumpwallet(const JSONRPCRequest& request)
790     file << strprintf("# Wallet dump created by Bitcoin %s\n", CLIENT_BUILD);
791     file << strprintf("# * Created on %s\n", FormatISO8601DateTime(GetTime()));
792     int tip_height = pwallet->GetLastBlockHeight();
793-    file << strprintf("# * Best block at time of backup was %i (%s),\n", tip_height, locked_chain->getBlockHash(tip_height).ToString());
794+    Optional<uint256> block_hash = pwallet->chain().getBlockHash(tip_height);
795+    file << strprintf("# * Best block at time of backup was %i (%s),\n", tip_height, block_hash ? (*block_hash).ToString() : "(missing block hash)");

1633@@ -1634,8 +1634,8 @@ static UniValue listsinceblock(const JSONRPCRequest& request)
1634         --*altheight;
1635     }
1636 
1637-    int lastheight = tip_height + 1 - target_confirms;
1638-    uint256 lastblock = lastheight >= 0 ? locked_chain->getBlockHash(lastheight) : uint256();
1639+    Optional<uint256> lastblock_hash = pwallet->chain().getBlockHash(tip_height + 1 - target_confirms);

3569+            if (stop_height >= 0) {
3570+                Optional<uint256> block_hash = pwallet->chain().getBlockHash(stop_height);
3571+                if (block_hash) {
3572+                    stop_block = *block_hash;
3573+                } else {
3574+                    throw JSONRPCError(RPC_MISC_ERROR, "stop_block has been reorged out of main chain");

1674             // handle updated tip hash
1675             const uint256 prev_tip_hash = tip_hash;
1676-            tip_hash = locked_chain->getBlockHash(*tip_height);
1677+            Optional<uint256> optional_tip_hash = chain().getBlockHash(*tip_height);
1678+            if (!optional_tip_hash) {
1679+                break;

243+        CBlockIndex* block = ::ChainActive()[height];
244+        if (block != nullptr) {
245+            return block->GetBlockTime();
246+        }
247+        return nullopt;
248+    }

3411@@ -3412,8 +3412,10 @@ void CWallet::GetKeyBirthTimes(interfaces::Chain::Lock& locked_chain, std::map<C
3412     }
3413 
3414     // Extract block timestamps for those keys
3415-    for (const auto& entry : mapKeyFirstBlock)
3416-        mapKeyBirth[entry.first] = locked_chain.getBlockTime(entry.second) - TIMESTAMP_WINDOW; // block times can be 2h off
3417+    for (const auto& entry : mapKeyFirstBlock) {
3418+        Optional<int64_t> block_time = chain().getBlockTime(entry.second);
3419+        mapKeyBirth[entry.first] = !block_time ? 0 : *block_time - TIMESTAMP_WINDOW; // block times can be 2h off

1368@@ -1369,8 +1369,11 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
1369         EnsureWalletIsUnlocked(pwallet);
1370 
1371         // Verify all timestamps are present before importing any keys.
1372-        const Optional<int> tip_height = pwallet->chain().getHeight();
1373-        now = locked_chain->getBlockMedianTimePast(*tip_height);
1374+        Optional<int> tip_height = pwallet->chain().getHeight();
1375+        if (tip_height) {
1376+            const Optional<int64_t> tip_mtp = pwallet->chain().getBlockMedianTimePast(*tip_height);
1377+            now = tip_mtp ? *tip_mtp : 0;

120+    virtual CBlockLocator getTipLocator() = 0;
121+
122+    //! Return height of the highest block on chain in common with the locator,
123+    //! which will either be the original block used to create the locator,
124+    //! or one of its ancestors.
125+    virtual Optional<int> findLocatorFork(const CBlockLocator& locator) = 0;

3982+    // be pending on the validation-side until lock release. It's likely to have
3983+    // block processing duplicata (if rescan block range overlaps with notification one)
3984+    // but we guarantee at least than wallet state is correct after notifications delivery.
3985+    // This is temporary until rescan and notifications delivery are unified under same
3986+    // interface.
3987+    walletInstance->m_chain_notifications_handler = walletInstance->chain().handleNotifications(walletInstance);

129@@ -135,6 +130,11 @@ class Chain
130     //! unlocked when the returned interface is freed.
131     virtual std::unique_ptr<Lock> lock(bool try_lock = false) = 0;
132 
133+    //! Get current chain height, not including genesis block (returns 0 if
134+    //! chain only contains genesis block, nullopt if chain does not contain
135+    //! any blocks)
136+    virtual Optional<int> getHeight() = 0;

334@@ -335,7 +335,7 @@ class WalletImpl : public Wallet
335         LOCK(m_wallet->cs_wallet);
336         auto mi = m_wallet->mapWallet.find(txid);
337         if (mi != m_wallet->mapWallet.end()) {
338-            num_blocks = locked_chain->getHeight().get_value_or(-1);
339+            num_blocks = m_wallet->GetLastBlockHeight();

129@@ -135,6 +130,11 @@ class Chain
130     //! any blocks)
131     virtual Optional<int> getHeight() = 0;
132 
133+    //! Get block height above genesis block. Returns 0 for genesis block,
134+    //! 1 for following block, and so on. Returns nullopt for a block not
135+    //! included in the current chain.
136+    virtual Optional<int> getBlockHeight(const uint256& hash) = 0;

131@@ -135,6 +132,9 @@ class Chain
132     //! included in the current chain.
133     virtual Optional<int> getBlockHeight(const uint256& hash) = 0;
134 
135+    //! Get block hash. Height must be valid or this function will abort.
136+    virtual uint256 getBlockHash(int height) = 0;

224@@ -234,6 +225,15 @@ class ChainImpl : public Chain
225         std::unique_ptr<Chain::Lock> result = std::move(lock); // Temporary to avoid CWG 1579
226         return result;
227     }
228+    Optional<int> getHeight() override
229+    {
230+        WAIT_LOCK(cs_main, lock);

104@@ -135,6 +105,28 @@ class Chain
105     //! Get block hash. Height must be valid or this function will abort.
106     virtual uint256 getBlockHash(int height) = 0;
107 
108+    //! Check that the block is available on disk (i.e. has not been
109+    //! pruned), and contains transactions.
110+    virtual bool haveBlockOnDisk(int height) = 0;

239@@ -240,6 +240,10 @@ BOOST_FIXTURE_TEST_CASE(importwallet_rescan, TestChain100Setup)
240         std::shared_ptr<CWallet> wallet = std::make_shared<CWallet>(chain.get(), WalletLocation(), WalletDatabase::CreateDummy());
241         LOCK(wallet->cs_wallet);
242         wallet->SetupLegacyScriptPubKeyMan();
243+        {

226@@ -234,6 +227,12 @@ class ChainImpl : public Chain
227         }
228         return nullopt;
229     }
230+    uint256 getBlockHash(int height) override
231+    {
232+        LOCK(::cs_main);
233+        CBlockIndex* block = ::ChainActive()[height];
234+        return block->GetBlockHash();

585@@ -586,6 +586,11 @@ BOOST_FIXTURE_TEST_CASE(wallet_disableprivkeys, TestChain100Setup)
586     auto chain = interfaces::MakeChain(node);
587     std::shared_ptr<CWallet> wallet = std::make_shared<CWallet>(chain.get(), WalletLocation(), WalletDatabase::CreateDummy());
588     wallet->SetupLegacyScriptPubKeyMan();
589+    {
590+        auto locked_chain = chain->lock();
591+        LOCK(wallet->cs_wallet);
592+        wallet->SetLastBlockProcessed(::ChainActive().Height(), ::ChainActive().Tip()->GetBlockHash());
593+    }

69     result.depth_in_main_chain = wtx.GetDepthInMainChain();
70     result.time_received = wtx.nTimeReceived;
71     result.lock_time = wtx.tx->nLockTime;
72-    result.is_final = locked_chain.checkFinalTx(*wtx.tx);
73-    result.is_trusted = wtx.IsTrusted(locked_chain);
74+    result.is_final = wallet.chain().checkFinalTx(*wtx.tx);