|
|
@ -3136,9 +3136,10 @@ std::vector<uint256> CWallet::ResendWalletTransactionsBefore(int64_t nTime) |
|
|
|
// Do not relay expired transactions, to avoid other nodes banning us
|
|
|
|
// Current code will not ban nodes relaying expired txs but older nodes will
|
|
|
|
if (wtx.nExpiryHeight > 0 && wtx.nExpiryHeight < chainActive.LastTip()->GetHeight()) { |
|
|
|
fprintf(stderr,"%s: ignoring expired tx %s\n", __func__, wtx.GetHash().ToString().c_str() ); |
|
|
|
fprintf(stderr,"%s: ignoring expired tx %s with expiry %d at height %d\n", __func__, wtx.GetHash().ToString().c_str(), wtx.nExpiryHeight, chainActive.LastTip()->GetHeight() ); |
|
|
|
// TODO: expired detection doesn't seem to work right
|
|
|
|
// append to list of txs to delete
|
|
|
|
vwtxh.push_back(wtx.GetHash()); |
|
|
|
// vwtxh.push_back(wtx.GetHash());
|
|
|
|
continue; |
|
|
|
} |
|
|
|
|
|
|
|