Merge pull request #88 from relaystr/nip-44

nip-44
relaystr · Dec 25, 2024 · 693fdc8 · 693fdc8
2 parents 141cc69 + bb39373
commit 693fdc8
Show file tree

Hide file tree

Showing 10 changed files with 1,539 additions and 291 deletions.
diff --git a/packages/ndk/example/nwc/make_invoice.dart b/packages/ndk/example/nwc/make_invoice.dart
@@ -13,7 +13,7 @@ void main() async {
   final nwcUri = Platform.environment['NWC_URI']!;
   final connection = await ndk.nwc.connect(nwcUri);
 
-  final amount = 1000;
+  final amount = 21;
   final description = "hello";
   final response = await ndk.nwc
       .makeInvoice(connection, amountSats: amount, description: description);

diff --git a/packages/ndk/example/nwc/notifications.dart b/packages/ndk/example/nwc/notifications.dart
@@ -13,6 +13,7 @@ void main() async {
   var nwcUri = Platform.environment['NWC_URI']!;
   final connection = await ndk.nwc.connect(nwcUri);
 
+  print("waiting for ${connection.isLegacyNotifications()?"legacy ":""}notifications");
   await for (final notification in connection.notificationStream.stream) {
     print('notification ${notification.type} amount: ${notification.amount}');
   }

diff --git a/packages/ndk/lib/domain_layer/usecases/nwc/nwc.dart b/packages/ndk/lib/domain_layer/usecases/nwc/nwc.dart
@@ -1,8 +1,11 @@
 import 'dart:async';
 import 'dart:convert';
 
+import 'package:elliptic/elliptic.dart' as elliptic;
+
 import 'package:ndk/ndk.dart';
 import 'package:ndk/shared/nips/nip04/nip04.dart';
+import 'package:ndk/shared/nips/nip44/nip44.dart';
 
 import 'consts/nwc_kind.dart';
 import 'consts/nwc_method.dart';
@@ -187,18 +190,21 @@ class Nwc {
   Future<void> _onNotification(
       Nip01Event event, NwcConnection connection) async {
     if (event.content != "") {
-      // TODO
-      //   var decrypted = Nip44.decrypt(
-      //       connection.uri.secret, connection.uri.walletPubkey, event.content);
-      //   Map<String, dynamic> data;
-      //   data = json.decode(decrypted);
-      //   if (data.containsKey("notification_type") &&
-      //       data['notification'] != null) {
-      //     NwcNotification notification = NwcNotification.fromMap(data['notification']);
-      //     connection.notificationStream.add(notification);
-      //   } else if (data.containsKey("error")) {
-      //     // TODO ??
-      //   }
+      final decrypted = await Nip44.decryptMessage(
+        event.content,
+        connection.uri.secret,
+        connection.uri.walletPubkey,
+      );
+      Map<String, dynamic> data;
+      data = json.decode(decrypted);
+      if (data.containsKey("notification_type") &&
+          data['notification'] != null) {
+        NwcNotification notification =
+            NwcNotification.fromMap(data['notification']);
+        connection.notificationStream.add(notification);
+      } else if (data.containsKey("error")) {
+        // TODO ??
+      }
     }
   }
 

diff --git a/packages/ndk/lib/domain_layer/usecases/nwc/nwc_connection.dart b/packages/ndk/lib/domain_layer/usecases/nwc/nwc_connection.dart
@@ -39,6 +39,7 @@ class NwcConnection {
     return _signer!;
   }
 
+  /// does this connection only support legacy notifications
   bool isLegacyNotifications() {
     return supportedVersions.length == 1 && supportedVersions.first == "0.0" ||
         !supportedVersions.any((e) => e != "0.0");

diff --git a/packages/ndk/lib/objectbox-model.json b/packages/ndk/lib/objectbox-model.json