Skip to content

Fix/fix tx stuck #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Fix/fix tx stuck #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47a7ca5
chore: add log for debugging
andhikayuana May 22, 2025
25c9e05
fix: filter out using rejectedTx callback
andhikayuana May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 40 additions & 6 deletions BRPeer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ static int _BRPeerAcceptTxMessage(BRPeer *peer, const uint8_t *msg, size_t msgLe
uint64_t feeAmount = BRTransactionStandardFee(tx);

//DEV: uncomment for debugging
// peer_log(peer, "from _BRPeerAcceptTxMessage");
// peer_log(peer, "tx details: hash=%s, version=%d, blockHeight=%d, timestamp=%d, lockTime=%u",
// u256hex(tx->txHash), tx->version, tx->blockHeight, tx->timestamp, tx->lockTime);
//
Expand All @@ -438,15 +439,19 @@ static int _BRPeerAcceptTxMessage(BRPeer *peer, const uint8_t *msg, size_t msgLe
// }
//
// peer_log(peer, "tx size=%zu bytes, fee=%llu", txSize, feeAmount);
//
// if (feeAmount/txSize < 10) {
// peer_log(peer, "stuck tx: %s, (low fee: %llu lit/byte)", u256hex(txHash), feeAmount/txSize);
// }

if (txSize > 0 && tx->blockHeight == TX_UNCONFIRMED && feeAmount/txSize < 10) {
//don't relay to wallet
peer_log(peer, "skipping stuck transaction: %s, (low fee: %llu litoshis/byte, min. is 10 litoshis/byte)", u256hex(txHash), feeAmount/txSize);
// Check if the transaction has a low fee rate
if (txSize > 0 && tx->blockHeight == TX_UNCONFIRMED && tx->timestamp == 0 && feeAmount/txSize < 10) {
// Don't relay to wallet
peer_log(peer, "skipping stuck transaction: %s, (low fee: %llu sat/byte)", u256hex(txHash), feeAmount/txSize);
BRTransactionFree(tx);
if (ctx->rejectedTx) ctx->rejectedTx(ctx->info, txHash, REJECT_LOWFEE);
r = 1;
}
else if (ctx->relayedTx) {
r = 0;
} else if (ctx->relayedTx) {
ctx->relayedTx(ctx->info, tx);
}
else BRTransactionFree(tx);
Expand Down Expand Up @@ -577,6 +582,35 @@ static int _BRPeerAcceptGetdataMessage(BRPeer *peer, const uint8_t *msg, size_t
}

peer_log(peer, "publishing tx: %s", txHex);

size_t txSize = BRTransactionSize(tx);
uint64_t feeAmount = BRTransactionStandardFee(tx);

//DEV: uncomment for debugging
// peer_log(peer, "from _BRPeerAcceptGetdataMessage");
// peer_log(peer, "tx details: hash=%s, version=%d, blockHeight=%d, timestamp=%d, lockTime=%u",
// u256hex(tx->txHash), tx->version, tx->blockHeight, tx->timestamp, tx->lockTime);
//
// peer_log(peer, "tx inputs: count=%zu", tx->inCount);
// for (size_t i = 0; i < tx->inCount; i++) {
// peer_log(peer, " input[%zu]: txHash=%s, index=%u, signature length=%zu, sequence=%u",
// i, u256hex(tx->inputs[i].txHash), tx->inputs[i].index,
// tx->inputs[i].sigLen, tx->inputs[i].sequence);
// }
//
// peer_log(peer, "tx outputs: count=%zu", tx->outCount);
// for (size_t j = 0; j < tx->outCount; j++) {
// char addr[75] = "";
// BRAddressFromScriptPubKey(addr, sizeof(addr), tx->outputs[j].script, tx->outputs[j].scriptLen);
// peer_log(peer, " output[%zu]: amount=%llu, scriptLen=%zu, address=%s",
// j, tx->outputs[j].amount, tx->outputs[j].scriptLen, addr);
// }
//
// peer_log(peer, "tx size=%zu bytes, fee=%llu", txSize, feeAmount);
// if (feeAmount/txSize < 10) {
// peer_log(peer, "stuck tx: %s, (low fee: %llu lit/byte)", u256hex(tx->txHash), feeAmount/txSize);
// }

BRPeerSendMessage(peer, buf, bufLen, MSG_TX);
break;
}
Expand Down
36 changes: 29 additions & 7 deletions BRPeerManager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,6 +1222,35 @@ static void _peerHasTx(void *info, UInt256 txHash)
}

if (tx) {

//DEV: uncomment for debugging
// peer_log(peer, "from _peerHasTx");
// size_t txSize = BRTransactionSize(tx);
// uint64_t feeAmount = BRTransactionStandardFee(tx);
// peer_log(peer, "tx details: hash=%s, version=%d, blockHeight=%d, timestamp=%d, lockTime=%u",
// u256hex(tx->txHash), tx->version, tx->blockHeight, tx->timestamp, tx->lockTime);
//
// peer_log(peer, "tx inputs: count=%zu", tx->inCount);
// for (size_t i = 0; i < tx->inCount; i++) {
// peer_log(peer, " input[%zu]: txHash=%s, index=%u, signature length=%zu, sequence=%u",
// i, u256hex(tx->inputs[i].txHash), tx->inputs[i].index,
// tx->inputs[i].sigLen, tx->inputs[i].sequence);
// }
//
// peer_log(peer, "tx outputs: count=%zu", tx->outCount);
// for (size_t j = 0; j < tx->outCount; j++) {
// char addr[75] = "";
// BRAddressFromScriptPubKey(addr, sizeof(addr), tx->outputs[j].script, tx->outputs[j].scriptLen);
// peer_log(peer, " output[%zu]: amount=%llu, scriptLen=%zu, address=%s",
// j, tx->outputs[j].amount, tx->outputs[j].scriptLen, addr);
// }
//
// peer_log(peer, "tx size=%zu bytes, fee=%llu", txSize, feeAmount);
// if (feeAmount/txSize < 10) {
// peer_log(peer, "stuck tx: %s, (low fee: %llu lit/byte)", u256hex(tx->txHash), feeAmount/txSize);
// }


isWalletTx = BRWalletRegisterTransaction(manager->wallet, tx);
if (isWalletTx) tx = BRWalletTransactionForHash(manager->wallet, tx->txHash);

Expand Down Expand Up @@ -1258,13 +1287,6 @@ static void _peerRejectedTx(void *info, UInt256 txHash, uint8_t code)
_BRTxPeerListRemovePeer(manager->txRequests, txHash, peer);

if (tx) {

// Handle tx rejection
if (tx->blockHeight == TX_UNCONFIRMED && (code == REJECT_DUST || code == REJECT_LOWFEE || code == REJECT_NONSTANDARD)) {
peer_log(peer, "transaction rejected as dust/lowfee/nonstandard, removing: %s", u256hex(txHash));
BRWalletRemoveTransaction(manager->wallet, txHash);
}

if (_BRTxPeerListRemovePeer(manager->txRelays, txHash, peer) && tx->blockHeight == TX_UNCONFIRMED) {
// set timestamp 0 to mark tx as unverified
_BRPeerManagerUpdateTx(manager, &txHash, 1, TX_UNCONFIRMED, 0);
Expand Down