diff options
| author | ishaanam <ishaana.misra@gmail.com> | 2023-06-29 15:41:26 -0400 |
|---|---|---|
| committer | ishaanam <ishaana.misra@gmail.com> | 2024-03-14 17:38:39 -0400 |
| commit | ffe5ff1fb622a8da11b66289e1b778e45e449811 (patch) | |
| tree | 8e897b4078b6baefb9e3944b00be3b3de0e3f996 /src/wallet/interfaces.cpp | |
| parent | 180973a94180f9849bf7cb0dab7c9177a942efb8 (diff) | |
| download | bitcoin-ffe5ff1fb622a8da11b66289e1b778e45e449811.tar.xz | |
scripted-diff: wallet: s/TxStateConflicted/TxStateBlockConflicted
-BEGIN VERIFY SCRIPT-
sed -i 's/TxStateConflicted/TxStateBlockConflicted/g' src/wallet/wallet.cpp src/wallet/interfaces.cpp src/wallet/transaction.h src/wallet/transaction.cpp
sed -i 's/isConflicted/isBlockConflicted/g' src/wallet/transaction.h src/wallet/wallet.cpp
-END VERIFY SCRIPT-
Diffstat (limited to 'src/wallet/interfaces.cpp')
| -rw-r--r-- | src/wallet/interfaces.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp index d15273dfc9..6405fb9bba 100644 --- a/src/wallet/interfaces.cpp +++ b/src/wallet/interfaces.cpp @@ -92,7 +92,7 @@ WalletTxStatus MakeWalletTxStatus(const CWallet& wallet, const CWalletTx& wtx) WalletTxStatus result; result.block_height = wtx.state<TxStateConfirmed>() ? wtx.state<TxStateConfirmed>()->confirmed_block_height : - wtx.state<TxStateConflicted>() ? wtx.state<TxStateConflicted>()->conflicting_block_height : + wtx.state<TxStateBlockConflicted>() ? wtx.state<TxStateBlockConflicted>()->conflicting_block_height : std::numeric_limits<int>::max(); result.blocks_to_maturity = wallet.GetTxBlocksToMaturity(wtx); result.depth_in_main_chain = wallet.GetTxDepthInMainChain(wtx); |