Skip to content

fix(thread): answer commands with missing/unknown wallet id instead of 500 #7

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

Closed
feafel wants to merge 1 commit into from
Closed

fix(thread): answer commands with missing/unknown wallet id instead of 500 #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
107 changes: 107 additions & 0 deletions src/wallet/wallet_thread.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ impl WalletThread {
Some(id) => id,
None => {
log::error!("Command {} requires a wallet ID", cmd);
respond_wallet_missing(cmd);
continue;
}
};
Expand All @@ -311,13 +312,119 @@ impl WalletThread {
handle_wallet_cmd(wallet_state, id.clone(), cmd);
} else {
log::warn!("Wallet not found: {id}");
respond_wallet_missing(cmd);
}
}
}
}
}
}

/// Answer a command whose wallet id is missing or unknown instead of dropping
/// the response: otherwise the caller's oneshot closes and `send_cmd` reports
/// "wallet thread is dead" (HTTP 500), indistinguishable from a dead server
/// and an invitation to retry-storm. The wallet id is the master fingerprint,
/// so an unknown one is reported as an invalid fingerprint (HTTP 400).
fn respond_wallet_missing(cmd: WalletCmd) {
let err = rgb_lib::Error::InvalidFingerprint;
match cmd {
WalletCmd::Refresh {} => {}
WalletCmd::RefreshWallet { resp } => {
let _ = resp.send(Err(err));
}
WalletCmd::DropWallet { resp } => {
let _ = resp.send(Err(err));
}
WalletCmd::Stop { resp } => {
let _ = resp.send(Err(err));
}
WalletCmd::WalletInfo { resp } => {
let _ = resp.send(Err(err));
}
WalletCmd::Backup { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::Address { resp } => {
let _ = resp.send(Err(err));
}
WalletCmd::Assets { resp } => {
let _ = resp.send(Err(err));
}
WalletCmd::Transfers { resp } => {
let _ = resp.send(Err(err));
}
WalletCmd::FailTransfer { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::TransfersByAsset { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::TransfersByRecipient { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::Transactions { resp } => {
let _ = resp.send(Err(err));
}
WalletCmd::ListUnspends { resp } => {
let _ = resp.send(Err(err));
}
WalletCmd::AssetInfo { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::BtcBalance { resp } => {
let _ = resp.send(Err(err));
}
WalletCmd::TokenBalance { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::Receive { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::IssueNiaToken { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::IssueIfaToken { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::InflateBegin { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::InflateEnd { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::CreateUtxoBegin { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::CreateUtxoEnd { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::SendBegin { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::SendEnd { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::BurnBegin { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::BurnEnd { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::GetConsignment { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::SendBtcBegin { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::SendBtcEnd { resp, .. } => {
let _ = resp.send(Err(err));
}
WalletCmd::AddReadOnlyWallet { resp, .. } => {
let _ = resp.send(Err(err));
}
}
}

fn handle_wallet_cmd(wallet_state: Arc<Mutex<RgbWalletState>>, id: String, cmd: WalletCmd) {
log::debug!("handle cmd: wid={}, cmd={}", id, cmd);
match cmd {
Expand Down