Skip to content

Commit 24cfa71

Browse files
cli: log the reason we can't find tx_cancel (#289)
* cli: log the reason we can't find tx_cancel When we can't find tx_cancel even though the cancel timelock expired, we publish it ourselves. However, some users had a problem where the tx_cancel wasn't found even though it was already published. This leads to the cli getting stuck in `CancelTimelockExpired` when it should go to `BtcCancelled`. This commit introduces an additional log statement that will help us narrow down why that is. * gui: update the documentation icon
1 parent b9609b9 commit 24cfa71

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src-gui/src/renderer/components/navigation/NavigationFooter.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import UnfinishedSwapsAlert from "../alert/UnfinishedSwapsAlert";
77
import LinkIconButton from "../icons/LinkIconButton";
88
import BackgroundRefundAlert from "../alert/BackgroundRefundAlert";
99
import MatrixIcon from "../icons/MatrixIcon";
10-
import { BookRounded } from "@material-ui/icons";
10+
import { BookRounded, MenuBook } from "@material-ui/icons";
1111

1212
const useStyles = makeStyles((theme) => ({
1313
outer: {
@@ -50,7 +50,7 @@ export default function NavigationFooter() {
5050
<Tooltip title="Read our official documentation">
5151
<span>
5252
<LinkIconButton url="https://docs.unstoppableswap.net">
53-
<BookRounded />
53+
<MenuBook />
5454
</LinkIconButton>
5555
</span>
5656
</Tooltip>

swap/src/protocol/bob/swap.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,11 @@ async fn next_state(
416416
event_emitter
417417
.emit_swap_progress_event(swap_id, TauriSwapProgressEvent::CancelTimelockExpired);
418418

419-
if state4.check_for_tx_cancel(bitcoin_wallet).await.is_err() {
419+
if let Err(err) = state4.check_for_tx_cancel(bitcoin_wallet).await {
420+
tracing::debug!(
421+
%err,
422+
"Couldn't find tx_cancel yet, publishing ourselves"
423+
);
420424
state4.submit_tx_cancel(bitcoin_wallet).await?;
421425
}
422426

0 commit comments

Comments
 (0)