Nostr Preferences

lib/bloc/app_blocs.dart

@@ -4,6 +4,7 @@ import 'package:breez/bloc/connect_pay/connect_pay_bloc.dart';
 import 'package:breez/bloc/fastbitcoins/fastbitcoins_bloc.dart';
 import 'package:breez/bloc/lnurl/lnurl_bloc.dart';
 import 'package:breez/bloc/marketplace/marketplace_bloc.dart';
+import 'package:breez/bloc/nostr/nostr_bloc.dart';
 import 'package:breez/bloc/payment_options/payment_options_bloc.dart';
 import 'package:breez/bloc/podcast_clip/podcast_clip_bloc.dart';
 import 'package:breez/bloc/podcast_history/podcast_history_bloc.dart';
@@ -26,6 +27,7 @@ class AppBlocs {
   final InvoiceBloc invoicesBloc;
   final ConnectPayBloc connectPayBloc;
   final BackupBloc backupBloc;
+  final NostrBloc nostrBloc;
   final MarketplaceBloc marketplaceBloc;
   final FastbitcoinsBloc fastbitcoinsBloc;
   final LSPBloc lspBloc;
@@ -74,6 +76,7 @@ class AppBlocs {
         blocsByType);
     MarketplaceBloc marketplaceBloc =
         _registerBloc(MarketplaceBloc(), blocsByType);
+    NostrBloc nostrBloc = _registerBloc(NostrBloc(), blocsByType);
     LSPBloc lspBloc =
         _registerBloc(LSPBloc(accountBloc.accountStream), blocsByType);
     LNUrlBloc lnurlBloc = _registerBloc(LNUrlBloc(), blocsByType);
@@ -110,6 +113,7 @@ class AppBlocs {
         invoicesBloc,
         connectPayBloc,
         backupBloc,
+        nostrBloc,
         marketplaceBloc,
         fastbitcoinsBloc,
         lspBloc,
@@ -129,6 +133,7 @@ class AppBlocs {
       this.invoicesBloc,
       this.connectPayBloc,
       this.backupBloc,
+      this.nostrBloc,
       this.marketplaceBloc,
       this.fastbitcoinsBloc,
       this.lspBloc,

lib/bloc/marketplace/marketplace_bloc.dart

@@ -13,8 +13,10 @@ class MarketplaceBloc {
   Stream<List<VendorModel>> get vendorsStream => _vendorController.stream;
 
   bool _isSnortToggled;
+  SharedPreferences pref;
 
-  final _nostrSettingsController = BehaviorSubject<NostrSettings>();
+  final _nostrSettingsController =
+      BehaviorSubject<NostrSettings>.seeded(NostrSettings.start());
   Stream<NostrSettings> get nostrSettingsStream =>
       _nostrSettingsController.stream;
   Sink<NostrSettings> get nostrSettingsSettingsSink =>
@@ -28,13 +30,26 @@ class MarketplaceBloc {
   }
 
   _initNostrSettings() async {
-    _nostrSettingsController.add(NostrSettings.start());
+    pref = await SharedPreferences.getInstance();
+    var nostrSettings =
+        pref.getString(NostrSettings.NOSTR_SETTINGS_PREFERENCES_KEY);
+    if (nostrSettings != null) {
+      Map<String, dynamic> settings = json.decode(nostrSettings);
+      var nostrSetttingsModel = NostrSettings.fromJson(settings);
+      _nostrSettingsController.add(nostrSetttingsModel.copyWith(
+        enableNostr: nostrSetttingsModel.enableNostr,
+        isRememberPubKey: nostrSetttingsModel.isRememberPubKey,
+        isRememberSignEvent: nostrSetttingsModel.isRememberSignEvent,
+        isLoggedIn: nostrSetttingsModel.isLoggedIn,
+        relayList: nostrSetttingsModel.relayList,
+      ));
+    }
   }
 
   _listenNostrSettings() async {
-    SharedPreferences pref = await SharedPreferences.getInstance();
+    pref = await SharedPreferences.getInstance();
     nostrSettingsStream.listen((settings) async {
-      _isSnortToggled = settings.showSnort;
+      _isSnortToggled = settings.enableNostr;
       pref.setString(NostrSettings.NOSTR_SETTINGS_PREFERENCES_KEY,
           json.encode(settings.toJson()));
       await loadVendors();
@@ -48,6 +63,7 @@ class MarketplaceBloc {
     List<VendorModel> vendorList = vendorListFromJson(jsonVendors);
     if (_isSnortToggled) {
       vendorList.removeWhere((element) => element.displayName == "Snort");
+      vendorList.removeWhere((element) => element.displayName == "Primal");
       _vendorController.add(vendorList);
     } else {
       _vendorController.add(vendorListFromJson(jsonVendors));

lib/bloc/marketplace/nostr_settings.dart

@@ -1,43 +1,79 @@
-
-
 class NostrSettings {
-  final bool showSnort;
+  final bool enableNostr;
   final bool isRememberPubKey;
   final bool isRememberSignEvent;
+  final bool isLoggedIn;
+  List<String> relayList;
 
-  NostrSettings(
-      {this.showSnort = true,
-      this.isRememberPubKey = false,
-      this.isRememberSignEvent = false});
+  static List<String> defaultRelayList = [
+    "wss://relay.damus.io",
+    "wss://nostr1.tunnelsats.com",
+    "wss://nostr-pub.wellorder.net",
+    "wss://relay.nostr.info",
+    "wss://nostr-relay.wlvs.space",
+    "wss://nostr.bitcoiner.social",
+    "wss://nostr-01.bolt.observer",
+    "wss://relayer.fiatjaf.com",
+  ];
+
+  NostrSettings({
+    this.enableNostr = true,
+    this.isRememberPubKey = false,
+    this.isRememberSignEvent = false,
+    this.isLoggedIn = false,
+    this.relayList = const [],
+  });
 
   static const String NOSTR_SETTINGS_PREFERENCES_KEY = "nostr_settings";
 
-  NostrSettings.start()
-      : this(
-          showSnort: true,
-          isRememberPubKey: false,
-          isRememberSignEvent: false,
+// start should be done by retrieving the values set in sharedPreferences
+  NostrSettings.start({
+    bool enableNostr,
+    bool isRememberPubKey,
+    bool isRememberSignEvent,
+    bool isLoggedIn,
+    List<String> relayList,
+  }) : this(
+          enableNostr: enableNostr ?? true,
+          isRememberPubKey: isRememberPubKey ?? false,
+          isRememberSignEvent: isRememberSignEvent ?? false,
+          isLoggedIn: isLoggedIn ?? false,
+          relayList: relayList ?? defaultRelayList,
         );
 
-  NostrSettings copyWith(
-      {bool showSnort, bool isRememberPubKey, bool isRememberSignEvent}) {
+  NostrSettings copyWith({
+    bool enableNostr,
+    bool isRememberPubKey,
+    bool isRememberSignEvent,
+    bool isLoggedIn,
+    List<String> relayList,
+  }) {
     return NostrSettings(
-      showSnort: showSnort ?? this.showSnort,
+      enableNostr: enableNostr ?? this.enableNostr,
       isRememberPubKey: isRememberPubKey ?? this.isRememberPubKey,
       isRememberSignEvent: isRememberSignEvent ?? this.isRememberSignEvent,
+      isLoggedIn: isLoggedIn ?? this.isLoggedIn,
+      relayList: relayList ?? this.relayList,
     );
   }
 
   NostrSettings.fromJson(Map<String, dynamic> json)
       : this(
-          showSnort: json["showSnort"] ?? true,
+          enableNostr: json["enableNostr"] ?? true,
           isRememberPubKey: json["isRememberPubKey"] ?? false,
           isRememberSignEvent: json["isRememberSignEvent"] ?? false,
+          isLoggedIn: json["isLoggedIn"] ?? false,
+          relayList: (json["relayList"] as List<dynamic>)
+                  .map((item) => item.toString())
+                  .toList() ??
+              defaultRelayList,
         );
 
   Map<String, dynamic> toJson() => {
-        "showSnort": showSnort,
+        "enableNostr": enableNostr,
         "isRememberPubKey": isRememberPubKey,
         "isRememberSignEvent": isRememberSignEvent,
+        "isLoggedIn": isLoggedIn,
+        "relayList": relayList,
       };
 }

lib/bloc/nostr/nostr_actions.dart

@@ -8,21 +8,44 @@ class SignEvent extends AsyncAction {
   final Map<String, dynamic> eventObject;
   final String privateKey;
 
-  SignEvent(this.eventObject, this.privateKey);
+  SignEvent(
+    this.eventObject,
+    this.privateKey,
+  );
 }
 
 class GetRelays extends AsyncAction {}
 
 class Nip04Encrypt extends AsyncAction {
   final String data;
-  final String publicKey;
 
-  Nip04Encrypt(this.data, this.publicKey);
+  Nip04Encrypt(
+    this.data,
+  );
 }
 
 class Nip04Decrypt extends AsyncAction {
   final String encryptedData;
+
+  Nip04Decrypt(
+    this.encryptedData,
+  );
+}
+
+class StoreImportedPrivateKey extends AsyncAction {
   final String privateKey;
+  StoreImportedPrivateKey({
+    this.privateKey,
+  });
+}
+
+class DeleteKey extends AsyncAction {
+  DeleteKey();
+}
 
-  Nip04Decrypt(this.encryptedData, this.privateKey);
+class PublishRelays extends AsyncAction {
+  final List<String> userRelayList;
+  PublishRelays({
+    this.userRelayList,
+  });
 }