From 4573a8336f84fb63e5d0641be520561aafe80ff8 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Wed, 31 Aug 2022 14:10:40 -0400 Subject: [PATCH 1/2] Fix compile error --- src/wallet/wallet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 1db729e2f..d7b818723 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3122,7 +3122,7 @@ std::vector CWallet::ResendWalletTransactionsBefore(int64_t nTime) continue; // Do not relay expired transactions, to avoid other nodes banning us - if (wtx.nExpiryHeight > 0 && wtx.nExpiryHeight < chainActive.LastTip->GetHeight()) { + if (wtx.nExpiryHeight > 0 && wtx.nExpiryHeight < chainActive.LastTip()->GetHeight()) { fprintf(stderr,"%s: ignoring expired tx %s\n", wtx.GetHash().ToString().c_str() ); // TODO: should we call EraseFromWallet(wtx) right here? continue; From 63f9e2230818ee817c595b3ac5254d0904bbd103 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Wed, 31 Aug 2022 14:15:38 -0400 Subject: [PATCH 2/2] log the function name correctly --- src/wallet/wallet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index d7b818723..229f49275 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3123,7 +3123,7 @@ std::vector CWallet::ResendWalletTransactionsBefore(int64_t nTime) // Do not relay expired transactions, to avoid other nodes banning us if (wtx.nExpiryHeight > 0 && wtx.nExpiryHeight < chainActive.LastTip()->GetHeight()) { - fprintf(stderr,"%s: ignoring expired tx %s\n", wtx.GetHash().ToString().c_str() ); + fprintf(stderr,"%s: ignoring expired tx %s\n", __func__, wtx.GetHash().ToString().c_str() ); // TODO: should we call EraseFromWallet(wtx) right here? continue; }