mirror of
https://github.com/aljazceru/BTCPayServerPlugins.git
synced 2025-12-17 07:34:24 +01:00
Validation of Nostr connection shouldn't be in CreateClient
This commit is contained in:
@@ -39,55 +39,8 @@ public class NostrWalletConnectLightningConnectionStringHandler : ILightningConn
|
||||
error = "Invalid nostr wallet connect uri";
|
||||
return null;
|
||||
}
|
||||
try
|
||||
{
|
||||
var connectParams = NIP47.ParseUri(uri);
|
||||
var cts = new CancellationTokenSource();
|
||||
cts.CancelAfter(TimeSpan.FromSeconds(10));
|
||||
var (client, disposable) = _nostrClientPool.GetClientAndConnect(connectParams.relays, cts.Token).ConfigureAwait(false).GetAwaiter().GetResult();
|
||||
using (disposable)
|
||||
{
|
||||
var commands = client.FetchNIP47AvailableCommands(connectParams.Item1, cancellationToken: cts.Token)
|
||||
.ConfigureAwait(false).GetAwaiter().GetResult();
|
||||
var requiredCommands = new[] {"get_info", "make_invoice", "lookup_invoice", "list_transactions"};
|
||||
if (commands?.Commands is null || requiredCommands.Any(c => !commands.Value.Commands.Contains(c)))
|
||||
{
|
||||
error =
|
||||
"No commands available or not all required commands are available (get_info, make_invoice, lookup_invoice, list_transactions)";
|
||||
return null;
|
||||
}
|
||||
|
||||
var response = client
|
||||
.SendNIP47Request<NIP47.GetInfoResponse>(connectParams.pubkey, connectParams.secret,
|
||||
new NIP47.GetInfoRequest(), cancellationToken: cts.Token).ConfigureAwait(false).GetAwaiter()
|
||||
.GetResult();
|
||||
|
||||
var walletNetwork = response.Network;
|
||||
if (!network.ChainName.ToString().Equals(walletNetwork,
|
||||
StringComparison.InvariantCultureIgnoreCase))
|
||||
{
|
||||
error =
|
||||
$"The network of the wallet ({walletNetwork}) does not match the network of the server ({network.ChainName})";
|
||||
return null;
|
||||
}
|
||||
if (response?.Methods is null || requiredCommands.Any(c => !response.Methods.Contains(c)))
|
||||
{
|
||||
error =
|
||||
"No commands available or not all required commands are available (get_info, make_invoice, lookup_invoice, list_transactions)";
|
||||
return null;
|
||||
}
|
||||
|
||||
(string[] Commands, string[] Notifications) values = (response.Methods ?? commands.Value.Commands,
|
||||
response.Notifications ?? commands.Value.Notifications);
|
||||
|
||||
error = null;
|
||||
return new NostrWalletConnectLightningClient(_nostrClientPool, uri, network, values);
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
error = "Invalid nostr wallet connect uri: " + e.Message;
|
||||
return null;
|
||||
}
|
||||
}
|
||||
error = null;
|
||||
return new NostrWalletConnectLightningClient(_nostrClientPool, uri, network);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user