Merge branch 'master' into nip-44

packages/amber/android/build.gradle

@@ -48,7 +48,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 23
+        minSdkVersion 21
     }
 
     dependencies {

packages/amber/pubspec.lock

@@ -238,14 +238,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
-  flat_buffers:
-    dependency: transitive
-    description:
-      name: flat_buffers
-      sha256: "380bdcba5664a718bfd4ea20a45d39e13684f5318fcd8883066a55e21f37f4c3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "23.5.26"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -470,22 +462,6 @@ packages:
       relative: true
     source: path
     version: "0.2.0-dev005"
-  objectbox:
-    dependency: transitive
-    description:
-      name: objectbox
-      sha256: ea823f4bf1d0a636e7aa50b43daabb64dd0fbd80b85a033016ccc1bc4f76f432
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.3"
-  objectbox_generator:
-    dependency: "direct dev"
-    description:
-      name: objectbox_generator
-      sha256: "96da521f2cef455cd524f8854e31d64495c50711ad5f1e2cf3142a8e527bc75f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.3"
   package_config:
     dependency: transitive
     description:
@@ -723,6 +699,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.1"
+  web_socket_client:
+    dependency: transitive
+    description:
+      name: web_socket_client
+      sha256: "0ec5230852349191188c013112e4d2be03e3fc83dbe80139ead9bf3a136e53b5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.5"
   webdriver:
     dependency: transitive
     description:

packages/amber/pubspec.yaml

@@ -5,7 +5,6 @@ homepage: https://github.com/relaystr/ndk
 
 environment:
   sdk: ">=3.2.1 <4.0.0"
-  flutter: ">=3.3.0"
 
 platforms:
   android:
@@ -19,7 +18,7 @@ dependencies:
   ndk: ^0.2.0-dev002
 
 #dependency_overrides:
-#  ndk:
+#   ndk:
 #    path: ../ndk
 
 dev_dependencies:
@@ -30,7 +29,6 @@ dev_dependencies:
   mockito: ^5.0.17
   integration_test:
     sdk: flutter
-  objectbox_generator: any
 
 flutter:
   plugin:

packages/ndk/README.md

@@ -170,8 +170,9 @@ await for (final event in response.stream) {
 - [x] Lists ([NIP-51](https://github.com/nostr-protocol/nips/blob/master/51.md))
 - [x] Relay List Metadata ([NIP-65](https://github.com/nostr-protocol/nips/blob/master/65.md))
 - [x] Wallet Connect API ([NIP-47](https://github.com/nostr-protocol/nips/blob/master/47.md))
+- [X] Zaps ([NIP-57](https://github.com/nostr-protocol/nips/blob/master/57.md))
+- [x] Authentication of clients to relays ([NIP-42](https://github.com/nostr-protocol/nips/blob/master/42.md))
 - [ ] Bech Encoding support ([NIP-19](https://github.com/nostr-protocol/nips/blob/master/19.md))
-- [ ] Zaps (private, public, anon, non-zap) ([NIP-57](https://github.com/nostr-protocol/nips/blob/master/57.md))
 - [ ] Badges ([NIP-58](https://github.com/nostr-protocol/nips/blob/master/58.md))
 
 ## Performance

packages/ndk/example/zaps/README.md

@@ -0,0 +1,11 @@
+# running the examples
+
+For zapping example `zap.dart` you need a `nostr+walletconnect://...` uri from your NWC wallet service provider.
+
+see https://github.com/getAlby/awesome-nwc for more info how to get a wallet supporting NWC
+
+`NWC_URI=nostr+walletconnect://.... dart zap.dart`
+
+for more logging
+
+`NWC_URI=nostr+walletconnect://.... dart --enable-asserts zap.dart`

packages/ndk/example/zaps/receipts_for_event.dart

@@ -0,0 +1,32 @@
+// ignore_for_file: avoid_print
+
+import 'package:ndk/ndk.dart';
+
+void main() async {
+  final ndk = Ndk.defaultConfig();
+
+  print("fetching zap receipts for single event ");
+  final receipts = await ndk.zaps.fetchZappedReceipts(
+      pubKey:
+          "787338757fc25d65cd929394d5e7713cf43638e8d259e8dcf5c73b834eb851f2",
+      eventId:
+          "906a0c5920b59e5754d0df5164bfea2a8d48ce5d73beaa1e854b3e6725e3288a").toList();
+
+  // Sort eventReceipts by amountSats in descending order
+  receipts
+      .sort((a, b) => (b.amountSats ?? 0).compareTo(a.amountSats ?? 0));
+
+  int eventSum = 0;
+  for (var receipt in receipts) {
+    String? sender;
+    if (receipt.sender!=null) {
+      Metadata? metadata = await ndk.metadata.loadMetadata(receipt.sender!);
+      sender = metadata?.name;
+    }
+    print("${sender!=null?"from ${sender} ":""} ${receipt.amountSats} sats ${receipt.comment}");
+    eventSum += receipt.amountSats ?? 0;
+  }
+  print("${receipts.length} receipts, total of $eventSum sats");
+
+  await ndk.destroy();
+}

packages/ndk/example/zaps/receipts_for_profile.dart

@@ -0,0 +1,30 @@
+// ignore_for_file: avoid_print
+
+import 'package:ndk/ndk.dart';
+
+void main() async {
+  final ndk = Ndk.defaultConfig();
+
+  print("fetching zap receipts for profile ");
+  final profileReceipts = await ndk.zaps.fetchZappedReceipts(
+    pubKey: "30782a8323b7c98b172c5a2af7206bb8283c655be6ddce11133611a03d5f1177",
+  ).toList();
+
+  // Sort profileReceipts by amountSats in descending order
+  profileReceipts
+      .sort((a, b) => (b.amountSats ?? 0).compareTo(a.amountSats ?? 0));
+
+  int profileSum = 0;
+  for (var receipt in profileReceipts) {
+    String? sender;
+    if (receipt.sender!=null) {
+      Metadata? metadata = await ndk.metadata.loadMetadata(receipt.sender!);
+      sender = metadata?.name;
+    }
+    print("${sender!=null?"from ${sender} ":""} ${receipt.amountSats} sats ${receipt.comment}");
+    profileSum += receipt.amountSats ?? 0;
+  }
+  print("${profileReceipts.length} receipts, total of $profileSum sats");
+
+  await ndk.destroy();
+}

packages/ndk/example/zaps/zap.dart

@@ -0,0 +1,53 @@
+// ignore_for_file: avoid_print
+
+import 'dart:io';
+
+import 'package:ndk/domain_layer/usecases/zaps/zap_receipt.dart';
+import 'package:ndk/domain_layer/usecases/zaps/zaps.dart';
+import 'package:ndk/ndk.dart';
+import 'package:ndk/shared/nips/nip01/bip340.dart';
+import 'package:ndk/shared/nips/nip01/key_pair.dart';
+
+void main() async {
+  // We use an empty bootstrap relay list,
+  // since NWC will provide the relay we connect to so we don't need default relays
+  final ndk = Ndk(NdkConfig(
+      eventVerifier: Bip340EventVerifier(),
+      cache: MemCacheManager(),
+      logLevel: Logger.logLevels.trace));
+
+      // You need an NWC_URI env var or to replace with your NWC uri connection
+  final nwcUri = Platform.environment['NWC_URI']!;
+  final connection = await ndk.nwc.connect(nwcUri);
+  KeyPair key = Bip340.generatePrivateKey();
+  final amount = 21;
+  final lnurl = "opensats@vlt.ge";
+  final comment = "enjoy this zap from NDK";
+
+  ZapResponse response = await ndk.zaps.zap(
+    nwcConnection: connection,
+    lnurl: lnurl,
+    comment: comment,
+    amountSats: amount,
+    fetchZapReceipt: true,
+    signer: Bip340EventSigner(privateKey: key.privateKey, publicKey: key.publicKey),
+    relays: ["wss://relay.damus.io"],
+    pubKey: "787338757fc25d65cd929394d5e7713cf43638e8d259e8dcf5c73b834eb851f2",
+    eventId: "906a0c5920b59e5754d0df5164bfea2a8d48ce5d73beaa1e854b3e6725e3288a"
+  );
+
+  if (response.payInvoiceResponse!=null && response.payInvoiceResponse!.preimage.isNotEmpty) {
+    print("Payed $amount to $lnurl, preimage = ${response.payInvoiceResponse!
+        .preimage}");
+
+    print("Waiting for Zap Receipt...");
+    ZapReceipt? receipt = await response.zapReceipt;
+    if (receipt!=null) {
+      print("Receipt : $receipt");
+    } else {
+      print("No Receipt");
+    }
+  }
+
+  await ndk.destroy();
+}

packages/ndk/lib/data_layer/data_sources/http_request.dart

@@ -11,8 +11,9 @@ class HttpRequestDS {
   /// make a get request to the given url
   Future<Map<String, dynamic>> jsonRequest(String url) async {
     http.Response response = await _client
-        .get(Uri.parse(url), headers: {"Accept": "application/json"});
+        .get(Uri.parse(url).replace(scheme: 'https'), headers: {"Accept": "application/json"});
 
+    print(response);
     if (response.statusCode != 200) {
       return throw Exception(
           "error fetching STATUS: ${response.statusCode}, Link: $url");

packages/ndk/lib/data_layer/repositories/lnurl_http_impl.dart

@@ -0,0 +1,36 @@
+import 'package:ndk/domain_layer/repositories/lnurl_transport.dart';
+import 'package:ndk/domain_layer/usecases/lnurl/lnurl_response.dart';
+
+import '../../domain_layer/repositories/nip_05_repo.dart';
+import '../../shared/logger/logger.dart';
+import '../data_sources/http_request.dart';
+
+/// implementation of the [Nip05Repository] interface with http
+class LnurlTransportHttpImpl implements LnurlTransport {
+  final HttpRequestDS httpDS;
+
+  /// constructor
+  LnurlTransportHttpImpl(this.httpDS);
+
+  @override
+  Future<LnurlResponse?> requestLnurlResponse(String lnurl) async {
+    try {
+      final response = await httpDS.jsonRequest(lnurl);
+      return LnurlResponse.fromJson(response);
+    } catch (e) {
+      Logger.log.w(e);
+      return null;
+    }
+  }
+
+  @override
+  Future<Map<String,dynamic>?> fetchInvoice(String callbacklink) async {
+    try {
+      return await httpDS.jsonRequest(callbacklink);
+    } catch (e) {
+      Logger.log.d(e);
+      return null;
+    }
+  }
+
+}

packages/ndk/lib/data_layer/repositories/nostr_transport/websocket_client_nostr_transport.dart

@@ -22,7 +22,7 @@ class WebSocketClientNostrTransport implements NostrTransport {
     Completer completer = Completer();
     ready = completer.future;
     _websocketDS.ws.connection.listen((state) {
-      Logger.log.d("${_websocketDS.url} connection state changed to $state");
+      Logger.log.t("${_websocketDS.url} connection state changed to $state");
       switch (state) {
         case Connected() || Reconnected():
           completer.complete();

packages/ndk/lib/data_layer/repositories/nostr_transport/websocket_client_nostr_transport_factory.dart

@@ -3,7 +3,6 @@ import 'package:web_socket_client/web_socket_client.dart';
 
 import '../../../domain_layer/repositories/nostr_transport.dart';
 import '../../../shared/helpers/relay_helper.dart';
-import '../../../shared/logger/logger.dart';
 import '../../data_sources/websocket_client.dart';
 
 class WebSocketClientNostrTransportFactory implements NostrTransportFactory {

packages/ndk/lib/domain_layer/entities/nip_01_event.dart

@@ -131,17 +131,7 @@ class Nip01Event {
 
   /// return first `e` tag found
   String? getEId() {
-    for (var tag in tags) {
-      if (tag.length > 1) {
-        var key = tag[0];
-        var value = tag[1];
-
-        if (key == "e") {
-          return value;
-        }
-      }
-    }
-    return null;
+    return getFirstTag("e");
   }
 
   /// return all tags that match given `tag`
@@ -189,12 +179,17 @@ class Nip01Event {
 
   /// return first found `d` tag
   String? getDtag() {
+    return getFirstTag("d");
+  }
+
+  /// Get first tag matching given name
+  String? getFirstTag(String name) {
     for (var tag in tags) {
       if (tag.length > 1) {
         var key = tag[0];
         var value = tag[1];
 
-        if (key == "d") {
+        if (key == name) {
           return value;
         }
       }

packages/ndk/lib/domain_layer/entities/relay_info.dart

@@ -30,7 +30,7 @@ class RelayInfo {
   RelayInfo._(this.name, this.description, this.pubKey, this.contact, this.nips,
       this.software, this.version, this.icon);
 
-  factory RelayInfo.fromJson(Map<dynamic, dynamic> json, String url) {
+  factory RelayInfo.fromJson(Map<String, dynamic> json, String url) {
     final String name = json["name"] ?? '';
     final String description = json["description"] ?? "";
     final String pubKey = json["pubkey"] ?? "";
@@ -56,7 +56,7 @@ class RelayInfo {
         headers: {'Accept': 'application/nostr+json'},
       );
       final decodedResponse =
-          jsonDecode(utf8.decode(response.bodyBytes)) as Map;
+          jsonDecode(utf8.decode(response.bodyBytes)) as Map<String,dynamic>;
       return RelayInfo.fromJson(decodedResponse, uri.toString());
     } catch (e) {
       Logger.log.d(e);

packages/ndk/lib/domain_layer/repositories/lnurl_transport.dart

@@ -0,0 +1,11 @@
+import 'package:ndk/domain_layer/usecases/lnurl/lnurl_response.dart';
+import 'package:ndk/ndk.dart';
+
+/// transport to get the lnurl response
+abstract class LnurlTransport {
+  ///  network request to get theLnurl response and invoices
+  Future<LnurlResponse?> requestLnurlResponse(String lnurl);
+
+  /// fetch an invoice from lnurl callback endpoint
+  Future<Map<String,dynamic>?> fetchInvoice(String callbacklink);
+}