refactor: other packages

Author: 1-leo

packages/ndk/lib/data_layer/models/nip_01_event_model.dart

@@ -14,6 +14,8 @@ class Nip01EventModel extends Nip01Event {
     required super.tags,
     required super.content,
     required super.sig,
+    super.validSig,
+    super.sources = const [],
   });
 
   factory Nip01EventModel.fromEntity(Nip01Event event) {

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

@@ -24,10 +24,10 @@ class Nip01Event {
   final String? sig;
 
   /// has signature been validated?
-  bool? validSig;
+  final bool? validSig;
 
   /// Relay that an event was received from
-  List<String> sources = [];
+  final List<String> sources;
 
   /// Creates a new Nostr event.
   ///
@@ -45,6 +45,8 @@ class Nip01Event {
     required this.tags,
     required this.content,
     required this.sig,
+    required this.validSig,
+    this.sources = const [],
     int createdAt = 0,
   }) {
     this.createdAt = (createdAt == 0)
@@ -60,16 +62,19 @@ class Nip01Event {
     List<List<String>>? tags,
     String? content,
     String? sig,
+    bool? validSig,
+    List<String>? sources,
   }) {
     return Nip01Event(
-      id: id ?? this.id,
-      pubKey: pubKey ?? this.pubKey,
-      createdAt: createdAt ?? this.createdAt,
-      kind: kind ?? this.kind,
-      tags: tags ?? this.tags,
-      content: content ?? this.content,
-      sig: sig ?? this.sig,
-    );
+        id: id ?? this.id,
+        pubKey: pubKey ?? this.pubKey,
+        createdAt: createdAt ?? this.createdAt,
+        kind: kind ?? this.kind,
+        tags: tags ?? this.tags,
+        content: content ?? this.content,
+        sig: sig ?? this.sig,
+        validSig: validSig ?? this.validSig,
+        sources: sources ?? this.sources);
   }
 
   // Individual events with the same "id" are equivalent

packages/nip07_event_signer/lib/src/nip07_event_signer_stub.dart

@@ -4,7 +4,7 @@ class Nip07EventSigner implements EventSigner {
   String? cachedPublicKey;
 
   Nip07EventSigner({this.cachedPublicKey});
-  
+
   @override
   bool canSign() {
     return false;
@@ -46,7 +46,7 @@ class Nip07EventSigner implements EventSigner {
   }
 
   @override
-  Future<void> sign(Nip01Event event) async {
+  Future<Nip01Event> sign(Nip01Event event) async {
     throw UnsupportedError('NIP-07 is not available on this platform');
   }
 }

packages/nip07_event_signer/lib/src/nip07_event_signer_web.dart

@@ -89,7 +89,7 @@ class Nip07EventSigner implements EventSigner {
   }
 
   @override
-  Future<void> sign(Nip01Event event) async {
+  Future<Nip01Event> sign(Nip01Event event) async {
     if (js.nostr == null) {
       throw Exception('NIP-07 extension not available');
     }
@@ -107,8 +107,6 @@ class Nip07EventSigner implements EventSigner {
     // Sign the event using NIP-07
     final signedEvent = await js.nostr!.signEvent(jsEvent).toDart;
 
-    // Update the original event with the signature and id
-    event.id = signedEvent.id!;
-    event.sig = signedEvent.sig!;
+    return event.copyWith(id: signedEvent.id!, sig: signedEvent.sig!);
   }
 }

packages/objectbox/lib/data_layer/db/object_box/schema/db_nip_01_event.dart

@@ -133,11 +133,12 @@ class DbNip01Event {
       createdAt: createdAt,
       kind: kind,
       tags: _tagsToList(tags),
+      id: nostrId,
+      sig: sig,
+      validSig: validSig,
+      sources: sources,
     );
-    ndkE.id = nostrId;
-    ndkE.sig = sig;
-    ndkE.validSig = validSig;
-    ndkE.sources = sources;
+
     return ndkE;
   }
 
@@ -150,7 +151,7 @@ class DbNip01Event {
       dbTags: _listToTags(ndkE.tags).map((tag) => tag.toString()).toList(),
     );
     dbE.nostrId = ndkE.id;
-    dbE.sig = ndkE.sig;
+    dbE.sig = ndkE.sig!;
     dbE.validSig = ndkE.validSig;
     dbE.sources = ndkE.sources;
     return dbE;

packages/rust_verifier/lib/data_layer/repositories/verifiers/rust_event_verifier.dart

@@ -48,6 +48,9 @@ class RustEventVerifier implements EventVerifier {
   @override
   Future<bool> verify(Nip01Event event) async {
     await _isInitialized.future;
+    if (event.sig == null) {
+      return false;
+    }
 
     return verifyNostrEvent(
       eventIdHex: event.id,
@@ -56,7 +59,7 @@ class RustEventVerifier implements EventVerifier {
       kind: event.kind,
       tags: event.tags,
       content: event.content,
-      signatureHex: event.sig,
+      signatureHex: event.sig!,
     );
   }
 }

packages/sembast_cache_manager/lib/src/ndk_extensions.dart

@@ -21,18 +21,16 @@ extension Nip01EventExtension on Nip01Event {
   }
 
   static Nip01Event fromJsonStorage(Map<String, Object?> json) {
-    final event = Nip01Event.fromJson(json);
-
     // Restore additional properties not handled by fromJson
-    if (json['validSig'] != null) {
-      event.validSig = json['validSig'] as bool?;
-    }
 
-    if (json['sources'] != null) {
-      event.sources = List<String>.from(json['sources'] as List);
-    }
+    final event = Nip01EventModel.fromJson(json);
 
-    return event;
+    return event.copyWith(
+      validSig: json['validSig'] as bool?,
+      sources: json['sources'] != null
+          ? List<String>.from(json['sources'] as List)
+          : const [],
+    );
   }
 }