Skip to content
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

nwc fixups #1155

Merged
merged 2 commits into from
Apr 24, 2024
Merged

nwc fixups #1155

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9109707
return error for events sent to inactive profiles
johncantrell97 Apr 23, 2024
a3aba9f
return error response when create_invoice fails
johncantrell97 Apr 23, 2024
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
65 changes: 42 additions & 23 deletions mutiny-core/src/nostr/nwc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,10 +421,7 @@ impl NostrWalletConnect {
let mut needs_save = false;
let mut needs_delete = false;
let mut result = None;
if self.profile.active()
&& event.kind == Kind::WalletConnectRequest
&& event.pubkey == client_pubkey
{
if event.kind == Kind::WalletConnectRequest && event.pubkey == client_pubkey {
let server_key = self.server_key.secret_key()?;

let decrypted = decrypt(server_key, &client_pubkey, &event.content)?;
Expand All @@ -446,6 +443,18 @@ impl NostrWalletConnect {
}
};

// only respond to commands sent to active profiles
if !self.profile.active() {
return self
.get_skipped_error_event(
&event,
req.method,
ErrorCode::Other,
"Nostr profile inactive".to_string(),
)
.map(Some);
}

// only respond to commands that are allowed by the profile
if !self.profile.available_commands().contains(&req.method) {
return self
Expand Down Expand Up @@ -593,28 +602,38 @@ impl NostrWalletConnect {
.label
.clone()
.unwrap_or(self.profile.name.clone());
let invoice = node.create_invoice(amount_sats, vec![label]).await?;
let bolt11 = invoice.bolt11.expect("just made");

let content = Response {
result_type: Method::MakeInvoice,
error: None,
result: Some(ResponseResult::MakeInvoice(MakeInvoiceResponseResult {
invoice: bolt11.to_string(),
payment_hash: bolt11.payment_hash().to_string(),
})),
};
let response = match node.create_invoice(amount_sats, vec![label]).await {
Err(e) => self.get_skipped_error_event(
&event,
Method::MakeInvoice,
ErrorCode::Other,
format!("Failed to create invoice: {:?}", e),
)?,
Ok(invoice) => {
let bolt11 = invoice.bolt11.expect("just made");

let content = Response {
result_type: Method::MakeInvoice,
error: None,
result: Some(ResponseResult::MakeInvoice(MakeInvoiceResponseResult {
invoice: bolt11.to_string(),
payment_hash: bolt11.payment_hash().to_string(),
})),
};

let encrypted = encrypt(
self.server_key.secret_key()?,
&self.client_key.public_key(),
content.as_json(),
)?;
let encrypted = encrypt(
self.server_key.secret_key()?,
&self.client_key.public_key(),
content.as_json(),
)?;

let p_tag = Tag::public_key(event.pubkey);
let e_tag = Tag::event(event.id);
let response = EventBuilder::new(Kind::WalletConnectResponse, encrypted, [p_tag, e_tag])
.to_event(&self.server_key)?;
let p_tag = Tag::public_key(event.pubkey);
let e_tag = Tag::event(event.id);
EventBuilder::new(Kind::WalletConnectResponse, encrypted, [p_tag, e_tag])
.to_event(&self.server_key)?
}
};

Ok(Some(response))
}
Expand Down
Loading