more nip67 code

Author: Kukks

NNostr.Client/NNostr.Client.csproj

@@ -6,7 +6,7 @@
         <Nullable>enable</Nullable>
         <LangVersion>11</LangVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageVersion>0.0.48</PackageVersion>
+        <PackageVersion>0.0.49</PackageVersion>
         <Title>Nostr Client</Title>
         <Description>A client for Nostr</Description>
         <Copyright>MIT</Copyright>

NNostr.Client/NostrExtensions.cs

@@ -93,6 +93,13 @@ public static NostrEvent SetReferencedEvent(this NostrEvent nostrEvent, string e
         public static void SetTag(this NostrEvent nostrEvent, string identifier, params string[] data) =>
             nostrEvent.SetTag<NostrEvent, NostrEventTag>(identifier, data);
 
+        public static NostrEvent SetTag(this NostrEvent nostrEvent, string identifier, string data)
+        {
+            nostrEvent.SetTag(identifier, new[] {data});
+            return nostrEvent;
+            
+        }
+
         public static void SetTag<TNostrEvent, TEventTag>(this TNostrEvent nostrEvent, string identifier,
             params string[] data) where TNostrEvent : BaseNostrEvent<TEventTag> where TEventTag : NostrEventTag, new()
         {

NNostr.Client/Protocols/NIP67.cs

@@ -1,3 +1,5 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
 using System.Web;
 using NBitcoin.Secp256k1;
 
@@ -8,7 +10,7 @@ public static class NIP67
     public static int EventKind = 33194;
     public record NIP67UriPayload(
         ECXOnlyPubKey Pubkey,
-        ECPrivKey Secret,
+        string Secret,
         string[] Relays,
         string[] RequiredCommands,
         string[] OptionalCommands,
@@ -18,7 +20,7 @@ public record NIP67UriPayload(
         public override string ToString()
         {
             var result =
-                $"nostr+walletauth://{Pubkey.ToHex()}?relay={string.Join("&relay=", Relays)}&secret={Secret.CreateXOnlyPubKey().ToHex()}&required_commands={string.Join(" ", RequiredCommands)}";
+                $"{UriScheme}://{Pubkey.ToHex()}?relay={string.Join("&relay=", Relays)}&secret={Secret}&required_commands={string.Join(" ", RequiredCommands)}";
 
             if(OptionalCommands.Length > 0)
                 result += $"&optional_commands={string.Join(" ", OptionalCommands)}";
@@ -37,15 +39,76 @@ public override string ToString()
 
     public static NIP67UriPayload ParseUri(Uri uri)
     {
+        if (!uri.Scheme.Equals(UriScheme, StringComparison.InvariantCultureIgnoreCase))
+            throw new ArgumentException("Invalid scheme", nameof(uri));
         var query = HttpUtility.ParseQueryString(uri.Query);
 
         var relays = query.GetValues("relay") ?? Array.Empty<string>();
-        var secret = NostrExtensions.ParseKey(query["secret"]);
+        var secret = query["secret"];
         var requiredCommands = query.GetValues("required_commands")?.SelectMany(s => s.Split(" ")).Distinct().ToArray() ?? Array.Empty<string>();
         var optionalCommands = query.GetValues("optional_commands")?.SelectMany(s => s.Split(" ")).Distinct().ToArray() ?? Array.Empty<string>();
         var budget = query.GetValues("budget")?.FirstOrDefault();
         var identity = query.GetValues("identity")?.FirstOrDefault();
 
         return new NIP67UriPayload(NostrExtensions.ParsePubKey(uri.Host), secret, relays, requiredCommands, optionalCommands, budget, identity);
     }
+
+    public record Nip67ConfirmationEventContent()
+    {
+          //format is :
+     /*
+      *{
+    "secret": "b8a30fafa48d4795b6c0eec169a383de", // string, the secret from the URI
+    "commands": [ // array of strings, commands that the wallet agrees to support
+        "pay_invoice",
+        "pay_keysend",
+        "make_invoice",
+        "lookup_invoice",
+        "list_transactions",
+    ],
+    "relay": "wss://relay.damus.io", // Optional string, alternative relay that the wallet will use
+    "lud16": "[email protected]", // Optional string, user's lightning address
+}
+      * 
+      */
+     [JsonPropertyName("secret")]
+     public string Secret { get; set; }
+     
+     [JsonPropertyName("commands")]
+     public string[] Commands { get; set; }
+     [JsonPropertyName("relay")]
+     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+     public string? Relay { get; set; }
+     [JsonPropertyName("lud16")]
+     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+     public string? Lud16 { get; set; }
+     
+     
+    }
+    public static async Task<NostrEvent> ConstructNip67ConfirmationEvent(NIP67UriPayload payload,Nip67ConfirmationEventContent conf,ECPrivKey key)
+    {
+        var confirmationEvent = new NostrEvent()
+        {
+            Kind = EventKind,
+            Content = JsonSerializer.Serialize(conf),
+
+        }.SetTag("d", payload.Pubkey.ToHex());
+        await confirmationEvent.EncryptNip04EventAsync(key, null, true);
+        return confirmationEvent;
+    }
+    
+    public static async Task<(Uri Nip47Url, Nip67ConfirmationEventContent Nip67Payload)> Nip47FromNip67Event(NostrEvent e, ECPrivKey key, Uri? relay = null)
+    {
+        if(e.Kind != EventKind)
+            throw new ArgumentException("Invalid event kind", nameof(e));
+
+        var content = await e.DecryptNip04EventAsync(key, null, true);
+        
+        var payload = JsonSerializer.Deserialize<Nip67ConfirmationEventContent>(content);
+        relay ??= new Uri(payload.Relay ?? throw new ArgumentException("Relay is required"));
+        
+        return (NIP47.CreateUri(e.GetPublicKey(), key,relay, lud16:payload.Lud16), payload);
+    }
+    
+    
 }

NNostr.Tests/ClientTests.cs

@@ -23,6 +23,11 @@ public NostrWalletCOnnectTests()
     public async Task CanParseUri()
     {
 
+        var nwa = "nostr+walletauth://58c79c9e299fc2f8f153774c88a7be24b65c59d65ed1bca4525c58c9c656c793?relay=wss%3A%2F%2Frelay.mutinywallet.com%2F&secret=96f6569301468799&required_commands=pay_invoice&identity=71bfa9cbf84110de617e959021b08c69524fcaa1033ffd062abd0ae2657ba24c";
+        var nwaPayload = NIP67.ParseUri(new Uri(nwa));
+        
+        
+        
         var uri = new Uri("");
         var result = NIP47.ParseUri(uri);