From bb397cd3eea5d9dacc1e6c2e5a18b2a059ba4145 Mon Sep 17 00:00:00 2001
From: fosse <matt.cfosse@gmail.com>
Date: Thu, 7 Sep 2023 11:34:22 -0400
Subject: [PATCH 1/7] pownode refactor

---
 cw_core/lib/pow_node.dart                     | 272 +++++++++---------
 cw_core/lib/wallet_base.dart                  |   2 +-
 cw_nano/lib/nano_client.dart                  |   4 +-
 cw_nano/lib/nano_wallet.dart                  |   2 +-
 lib/di.dart                                   |  10 +-
 lib/entities/default_settings_migration.dart  |  14 +-
 lib/entities/node_list.dart                   |   8 +-
 lib/main.dart                                 |  10 +-
 lib/router.dart                               |   2 +-
 .../nodes/pow_node_create_or_edit_page.dart   |   2 +-
 .../screens/nodes/widgets/pow_node_form.dart  |   3 +-
 .../nodes/widgets/pow_node_list_row.dart      |   3 +-
 lib/store/settings_store.dart                 |  14 +-
 .../pow_node_create_or_edit_view_model.dart   |  12 +-
 .../node_list/pow_node_list_view_model.dart   |  14 +-
 15 files changed, 187 insertions(+), 185 deletions(-)

diff --git a/cw_core/lib/pow_node.dart b/cw_core/lib/pow_node.dart
index 1e98bc323..9963dc0cb 100644
--- a/cw_core/lib/pow_node.dart
+++ b/cw_core/lib/pow_node.dart
@@ -1,159 +1,159 @@
-import 'dart:io';
-import 'package:cw_core/keyable.dart';
-import 'dart:convert';
-import 'package:http/http.dart' as http;
-import 'package:hive/hive.dart';
-import 'package:cw_core/hive_type_ids.dart';
-import 'package:cw_core/wallet_type.dart';
-import 'package:http/io_client.dart' as ioc;
+// import 'dart:io';
+// import 'package:cw_core/keyable.dart';
+// import 'dart:convert';
+// import 'package:http/http.dart' as http;
+// import 'package:hive/hive.dart';
+// import 'package:cw_core/hive_type_ids.dart';
+// import 'package:cw_core/wallet_type.dart';
+// import 'package:http/io_client.dart' as ioc;
 
-part 'pow_node.g.dart';
+// part 'pow_node.g.dart';
 
-Uri createUriFromElectrumAddress(String address) => Uri.tryParse('tcp://$address')!;
+// Uri createUriFromElectrumAddress(String address) => Uri.tryParse('tcp://$address')!;
 
-@HiveType(typeId: PowNode.typeId)
-class PowNode extends HiveObject with Keyable {
-  PowNode({
-    this.login,
-    this.password,
-    this.useSSL,
-    this.trusted = false,
-    this.socksProxyAddress,
-    String? uri,
-    WalletType? type,
-  }) {
-    if (uri != null) {
-      uriRaw = uri;
-    }
-    if (type != null) {
-      this.type = type;
-    }
-  }
+// @HiveType(typeId: PowNode.typeId)
+// class PowNode extends HiveObject with Keyable {
+//   PowNode({
+//     this.login,
+//     this.password,
+//     this.useSSL,
+//     this.trusted = false,
+//     this.socksProxyAddress,
+//     String? uri,
+//     WalletType? type,
+//   }) {
+//     if (uri != null) {
+//       uriRaw = uri;
+//     }
+//     if (type != null) {
+//       this.type = type;
+//     }
+//   }
 
-  PowNode.fromMap(Map<String, Object?> map)
-      : uriRaw = map['uri'] as String? ?? '',
-        login = map['login'] as String?,
-        password = map['password'] as String?,
-        useSSL = map['useSSL'] as bool?,
-        trusted = map['trusted'] as bool? ?? false,
-        socksProxyAddress = map['socksProxyPort'] as String?;
+//   PowNode.fromMap(Map<String, Object?> map)
+//       : uriRaw = map['uri'] as String? ?? '',
+//         login = map['login'] as String?,
+//         password = map['password'] as String?,
+//         useSSL = map['useSSL'] as bool?,
+//         trusted = map['trusted'] as bool? ?? false,
+//         socksProxyAddress = map['socksProxyPort'] as String?;
 
-  static const typeId = POW_NODE_TYPE_ID;
-  static const boxName = 'PowNodes';
+//   static const typeId = POW_NODE_TYPE_ID;
+//   static const boxName = 'PowNodes';
 
-  @HiveField(0, defaultValue: '')
-  late String uriRaw;
+//   @HiveField(0, defaultValue: '')
+//   late String uriRaw;
 
-  @HiveField(1)
-  String? login;
+//   @HiveField(1)
+//   String? login;
 
-  @HiveField(2)
-  String? password;
+//   @HiveField(2)
+//   String? password;
 
-  @HiveField(3, defaultValue: 0)
-  late int typeRaw;
+//   @HiveField(3, defaultValue: 0)
+//   late int typeRaw;
 
-  @HiveField(4)
-  bool? useSSL;
+//   @HiveField(4)
+//   bool? useSSL;
 
-  @HiveField(5, defaultValue: false)
-  bool trusted;
+//   @HiveField(5, defaultValue: false)
+//   bool trusted;
 
-  @HiveField(6)
-  String? socksProxyAddress;
+//   @HiveField(6)
+//   String? socksProxyAddress;
 
-  bool get isSSL => useSSL ?? false;
+//   bool get isSSL => useSSL ?? false;
 
-  bool get useSocksProxy => socksProxyAddress == null ? false : socksProxyAddress!.isNotEmpty;
+//   bool get useSocksProxy => socksProxyAddress == null ? false : socksProxyAddress!.isNotEmpty;
 
-  Uri get uri {
-    switch (type) {
-      case WalletType.monero:
-        return Uri.http(uriRaw, '');
-      case WalletType.bitcoin:
-        return createUriFromElectrumAddress(uriRaw);
-      case WalletType.litecoin:
-        return createUriFromElectrumAddress(uriRaw);
-      case WalletType.haven:
-        return Uri.http(uriRaw, '');
-      case WalletType.ethereum:
-        return Uri.https(uriRaw, '');
-      case WalletType.nano:
-      case WalletType.banano:
-        if (uriRaw.contains("https") || uriRaw.endsWith("443") || isSSL) {
-          return Uri.https(uriRaw, '');
-        } else {
-          return Uri.http(uriRaw, '');
-        }
-      default:
-        throw Exception('Unexpected type ${type.toString()} for Node uri');
-    }
-  }
+//   Uri get uri {
+//     switch (type) {
+//       case WalletType.monero:
+//         return Uri.http(uriRaw, '');
+//       case WalletType.bitcoin:
+//         return createUriFromElectrumAddress(uriRaw);
+//       case WalletType.litecoin:
+//         return createUriFromElectrumAddress(uriRaw);
+//       case WalletType.haven:
+//         return Uri.http(uriRaw, '');
+//       case WalletType.ethereum:
+//         return Uri.https(uriRaw, '');
+//       case WalletType.nano:
+//       case WalletType.banano:
+//         if (uriRaw.contains("https") || uriRaw.endsWith("443") || isSSL) {
+//           return Uri.https(uriRaw, '');
+//         } else {
+//           return Uri.http(uriRaw, '');
+//         }
+//       default:
+//         throw Exception('Unexpected type ${type.toString()} for Node uri');
+//     }
+//   }
 
-  @override
-  bool operator ==(other) =>
-      other is PowNode &&
-      (other.uriRaw == uriRaw &&
-          other.login == login &&
-          other.password == password &&
-          other.typeRaw == typeRaw &&
-          other.useSSL == useSSL &&
-          other.trusted == trusted &&
-          other.socksProxyAddress == socksProxyAddress);
+//   @override
+//   bool operator ==(other) =>
+//       other is PowNode &&
+//       (other.uriRaw == uriRaw &&
+//           other.login == login &&
+//           other.password == password &&
+//           other.typeRaw == typeRaw &&
+//           other.useSSL == useSSL &&
+//           other.trusted == trusted &&
+//           other.socksProxyAddress == socksProxyAddress);
 
-  @override
-  int get hashCode =>
-      uriRaw.hashCode ^
-      login.hashCode ^
-      password.hashCode ^
-      typeRaw.hashCode ^
-      useSSL.hashCode ^
-      trusted.hashCode ^
-      socksProxyAddress.hashCode;
+//   @override
+//   int get hashCode =>
+//       uriRaw.hashCode ^
+//       login.hashCode ^
+//       password.hashCode ^
+//       typeRaw.hashCode ^
+//       useSSL.hashCode ^
+//       trusted.hashCode ^
+//       socksProxyAddress.hashCode;
 
-  @override
-  dynamic get keyIndex {
-    _keyIndex ??= key;
-    return _keyIndex;
-  }
+//   @override
+//   dynamic get keyIndex {
+//     _keyIndex ??= key;
+//     return _keyIndex;
+//   }
 
-  WalletType get type => deserializeFromInt(typeRaw);
+//   WalletType get type => deserializeFromInt(typeRaw);
 
-  set type(WalletType type) => typeRaw = serializeToInt(type);
+//   set type(WalletType type) => typeRaw = serializeToInt(type);
 
-  dynamic _keyIndex;
+//   dynamic _keyIndex;
 
-  Future<bool> requestNode() async {
-    try {
-      switch (type) {
-        case WalletType.nano:
-          return requestNanoPowNode();
-        default:
-          return false;
-      }
-    } catch (_) {
-      return false;
-    }
-  }
+//   Future<bool> requestNode() async {
+//     try {
+//       switch (type) {
+//         case WalletType.nano:
+//           return requestNanoPowNode();
+//         default:
+//           return false;
+//       }
+//     } catch (_) {
+//       return false;
+//     }
+//   }
 
-  Future<bool> requestNanoPowNode() async {
-    return http
-        .post(
-      uri,
-      headers: {'Content-type': 'application/json'},
-      body: json.encode(
-        {
-          "action": "work_generate",
-          "hash": "0000000000000000000000000000000000000000000000000000000000000000",
-        },
-      ),
-    )
-        .then((http.Response response) {
-      if (response.statusCode == 200) {
-        return true;
-      } else {
-        return false;
-      }
-    });
-  }
-}
+//   Future<bool> requestNanoPowNode() async {
+//     return http
+//         .post(
+//       uri,
+//       headers: {'Content-type': 'application/json'},
+//       body: json.encode(
+//         {
+//           "action": "work_generate",
+//           "hash": "0000000000000000000000000000000000000000000000000000000000000000",
+//         },
+//       ),
+//     )
+//         .then((http.Response response) {
+//       if (response.statusCode == 200) {
+//         return true;
+//       } else {
+//         return false;
+//       }
+//     });
+//   }
+// }
diff --git a/cw_core/lib/wallet_base.dart b/cw_core/lib/wallet_base.dart
index 42fb22e75..5d0e388a1 100644
--- a/cw_core/lib/wallet_base.dart
+++ b/cw_core/lib/wallet_base.dart
@@ -60,7 +60,7 @@ abstract class WalletBase<
   Future<void> connectToNode({required Node node});
 
   // there is a default definition here because only coins with a pow node (nano based) need to override this
-  Future<void> connectToPowNode({required PowNode node}) async {}
+  Future<void> connectToPowNode({required Node node}) async {}
 
   Future<void> startSync();
 
diff --git a/cw_nano/lib/nano_client.dart b/cw_nano/lib/nano_client.dart
index 236ce68f3..72066afa2 100644
--- a/cw_nano/lib/nano_client.dart
+++ b/cw_nano/lib/nano_client.dart
@@ -18,7 +18,7 @@ class NanoClient {
       "nano_38713x95zyjsqzx6nm1dsom1jmm668owkeb9913ax6nfgj15az3nu8xkx579";
 
   Node? _node;
-  PowNode? _powNode;
+  Node? _powNode;
 
   bool connect(Node node) {
     try {
@@ -29,7 +29,7 @@ class NanoClient {
     }
   }
 
-  bool connectPow(PowNode node) {
+  bool connectPow(Node node) {
     try {
       _powNode = node;
       return true;
diff --git a/cw_nano/lib/nano_wallet.dart b/cw_nano/lib/nano_wallet.dart
index 78855334b..941406bb0 100644
--- a/cw_nano/lib/nano_wallet.dart
+++ b/cw_nano/lib/nano_wallet.dart
@@ -151,7 +151,7 @@ abstract class NanoWalletBase
   }
 
   @override
-  Future<void> connectToPowNode({required PowNode node}) async {
+  Future<void> connectToPowNode({required Node node}) async {
     _client.connectPow(node);
   }
 
diff --git a/lib/di.dart b/lib/di.dart
index 2573eb6dd..85e6bb87b 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -226,7 +226,7 @@ final getIt = GetIt.instance;
 var _isSetupFinished = false;
 late Box<WalletInfo> _walletInfoSource;
 late Box<Node> _nodeSource;
-late Box<PowNode> _powNodeSource;
+late Box<Node> _powNodeSource;
 late Box<Contact> _contactSource;
 late Box<Trade> _tradesSource;
 late Box<Template> _templates;
@@ -239,7 +239,7 @@ late Box<AnonpayInvoiceInfo> _anonpayInvoiceInfoSource;
 Future<void> setup({
   required Box<WalletInfo> walletInfoSource,
   required Box<Node> nodeSource,
-  required Box<PowNode> powNodeSource,
+  required Box<Node> powNodeSource,
   required Box<Contact> contactSource,
   required Box<Trade> tradesSource,
   required Box<Template> templates,
@@ -287,7 +287,7 @@ Future<void> setup({
   }
 
   getIt.registerFactory<Box<Node>>(() => _nodeSource);
-  getIt.registerFactory<Box<PowNode>>(() => _powNodeSource);
+  getIt.registerFactory<Box<Node>>(() => _powNodeSource, instanceName: Node.boxName + "pow");
 
   getIt.registerSingleton<FlutterSecureStorage>(FlutterSecureStorage());
   getIt.registerSingleton(AuthenticationStore());
@@ -756,8 +756,8 @@ Future<void> setup({
           editingNode: editingNode,
           isSelected: isSelected));
 
-  getIt.registerFactoryParam<PowNodeCreateOrEditPage, PowNode?, bool?>(
-      (PowNode? editingNode, bool? isSelected) => PowNodeCreateOrEditPage(
+  getIt.registerFactoryParam<PowNodeCreateOrEditPage, Node?, bool?>(
+      (Node? editingNode, bool? isSelected) => PowNodeCreateOrEditPage(
           nodeCreateOrEditViewModel: getIt.get<PowNodeCreateOrEditViewModel>(),
           editingNode: editingNode,
           isSelected: isSelected));
diff --git a/lib/entities/default_settings_migration.dart b/lib/entities/default_settings_migration.dart
index afc0131b8..37253d449 100644
--- a/lib/entities/default_settings_migration.dart
+++ b/lib/entities/default_settings_migration.dart
@@ -36,7 +36,7 @@ Future<void> defaultSettingsMigration(
     required SharedPreferences sharedPreferences,
     required FlutterSecureStorage secureStorage,
     required Box<Node> nodes,
-    required Box<PowNode> powNodes,
+    required Box<Node> powNodes,
     required Box<WalletInfo> walletInfoSource,
     required Box<Trade> tradeSource,
     required Box<Contact> contactSource}) async {
@@ -320,8 +320,8 @@ Node? getNanoDefaultNode({required Box<Node> nodes}) {
       nodes.values.firstWhereOrNull((node) => node.type == WalletType.nano);
 }
 
-PowNode? getNanoDefaultPowNode({required Box<PowNode> nodes}) {
-  return nodes.values.firstWhereOrNull((PowNode node) => node.uriRaw == nanoDefaultPowNodeUri) ??
+Node? getNanoDefaultPowNode({required Box<Node> nodes}) {
+  return nodes.values.firstWhereOrNull((Node node) => node.uriRaw == nanoDefaultPowNodeUri) ??
       nodes.values.firstWhereOrNull((node) => (node.type == WalletType.nano));
 }
 
@@ -495,7 +495,7 @@ Future<void> changeDefaultMoneroNode(
 }
 
 Future<void> checkCurrentNodes(
-    Box<Node> nodeSource, Box<PowNode> powNodeSource, SharedPreferences sharedPreferences) async {
+    Box<Node> nodeSource, Box<Node> powNodeSource, SharedPreferences sharedPreferences) async {
   final currentMoneroNodeId = sharedPreferences.getInt(PreferencesKey.currentNodeIdKey);
   final currentBitcoinElectrumSeverId =
       sharedPreferences.getInt(PreferencesKey.currentBitcoinElectrumSererIdKey);
@@ -559,10 +559,10 @@ Future<void> checkCurrentNodes(
   }
 
   if (currentNanoPowNodeServer == null) {
-    PowNode? node = powNodeSource.values
+    Node? node = powNodeSource.values
         .firstWhereOrNull((node) => node.uri.toString() == nanoDefaultPowNodeUri);
     if (node == null) {
-      node = PowNode(uri: nanoDefaultPowNodeUri, type: WalletType.nano);
+      node = Node(uri: nanoDefaultPowNodeUri, type: WalletType.nano);
       await powNodeSource.add(node);
     }
     await sharedPreferences.setInt(PreferencesKey.currentNanoPowNodeIdKey, node.key as int);
@@ -647,7 +647,7 @@ Future<void> changeNanoCurrentNodeToDefault(
 }
 
 Future<void> changeNanoCurrentPowNodeToDefault(
-    {required SharedPreferences sharedPreferences, required Box<PowNode> nodes}) async {
+    {required SharedPreferences sharedPreferences, required Box<Node> nodes}) async {
   final node = getNanoDefaultPowNode(nodes: nodes);
   final nodeId = node?.key as int? ?? 0;
   await sharedPreferences.setInt(PreferencesKey.currentNanoPowNodeIdKey, nodeId);
diff --git a/lib/entities/node_list.dart b/lib/entities/node_list.dart
index 636fedfdb..d9e03a1d9 100644
--- a/lib/entities/node_list.dart
+++ b/lib/entities/node_list.dart
@@ -101,14 +101,14 @@ Future<List<Node>> loadDefaultNanoNodes() async {
   return nodes;
 }
 
-Future<List<PowNode>> loadDefaultNanoPowNodes() async {
+Future<List<Node>> loadDefaultNanoPowNodes() async {
   final powNodesRaw = await rootBundle.loadString('assets/nano_pow_node_list.yml');
   final loadedPowNodes = loadYaml(powNodesRaw) as YamlList;
-  final nodes = <PowNode>[];
+  final nodes = <Node>[];
 
   for (final raw in loadedPowNodes) {
     if (raw is Map) {
-      final node = PowNode.fromMap(Map<String, Object>.from(raw));
+      final node = Node.fromMap(Map<String, Object>.from(raw));
       node.type = WalletType.nano;
       nodes.add(node);
     }
@@ -136,7 +136,7 @@ Future resetToDefault(Box<Node> nodeSource) async {
   await nodeSource.addAll(nodes);
 }
 
-Future resetPowToDefault(Box<PowNode> powNodeSource) async {
+Future resetPowToDefault(Box<Node> powNodeSource) async {
   final nanoPowNodes = await loadDefaultNanoPowNodes();
   final nodes = nanoPowNodes;
   await powNodeSource.clear();
diff --git a/lib/main.dart b/lib/main.dart
index 3ac83061a..c06e13d1d 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -83,9 +83,9 @@ Future<void> initializeAppConfigs() async {
     CakeHive.registerAdapter(NodeAdapter());
   }
 
-  if (!CakeHive.isAdapterRegistered(PowNode.typeId)) {
-    CakeHive.registerAdapter(PowNodeAdapter());
-  }
+  // if (!CakeHive.isAdapterRegistered(PowNode.typeId)) {
+  //   CakeHive.registerAdapter(PowNodeAdapter());
+  // }
 
   if (!CakeHive.isAdapterRegistered(TransactionDescription.typeId)) {
     CakeHive.registerAdapter(TransactionDescriptionAdapter());
@@ -138,7 +138,7 @@ Future<void> initializeAppConfigs() async {
   final ordersBoxKey = await getEncryptionKey(secureStorage: secureStorage, forKey: Order.boxKey);
   final contacts = await CakeHive.openBox<Contact>(Contact.boxName);
   final nodes = await CakeHive.openBox<Node>(Node.boxName);
-  final powNodes = await CakeHive.openBox<PowNode>(PowNode.boxName);
+  final powNodes = await CakeHive.openBox<Node>(Node.boxName + "pow");// must be different from Node.boxName
   final transactionDescriptions = await CakeHive.openBox<TransactionDescription>(
       TransactionDescription.boxName,
       encryptionKey: transactionDescriptionsBoxKey);
@@ -171,7 +171,7 @@ Future<void> initializeAppConfigs() async {
 Future<void> initialSetup(
     {required SharedPreferences sharedPreferences,
     required Box<Node> nodes,
-    required Box<PowNode> powNodes,
+    required Box<Node> powNodes,
     required Box<WalletInfo> walletInfoSource,
     required Box<Contact> contactSource,
     required Box<Trade> tradesSource,
diff --git a/lib/router.dart b/lib/router.dart
index d28657e39..b63550415 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -335,7 +335,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
       final args = settings.arguments as Map<String, dynamic>?;
       return CupertinoPageRoute<void>(
           builder: (_) => getIt.get<PowNodeCreateOrEditPage>(
-              param1: args?['editingNode'] as PowNode?, param2: args?['isSelected'] as bool?));
+              param1: args?['editingNode'] as Node?, param2: args?['isSelected'] as bool?));
 
     case Routes.accountCreation:
       return CupertinoPageRoute<String>(
diff --git a/lib/src/screens/nodes/pow_node_create_or_edit_page.dart b/lib/src/screens/nodes/pow_node_create_or_edit_page.dart
index b6fdb7b87..1ec813c98 100644
--- a/lib/src/screens/nodes/pow_node_create_or_edit_page.dart
+++ b/lib/src/screens/nodes/pow_node_create_or_edit_page.dart
@@ -83,7 +83,7 @@ class PowNodeCreateOrEditPage extends BasePage {
       );
       
   final PowNodeCreateOrEditViewModel nodeCreateOrEditViewModel;
-  final PowNode? editingNode;
+  final Node? editingNode;
   final bool? isSelected;
 
   @override
diff --git a/lib/src/screens/nodes/widgets/pow_node_form.dart b/lib/src/screens/nodes/widgets/pow_node_form.dart
index 0ac8fb825..558564c53 100644
--- a/lib/src/screens/nodes/widgets/pow_node_form.dart
+++ b/lib/src/screens/nodes/widgets/pow_node_form.dart
@@ -5,6 +5,7 @@ import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/widgets/standard_checkbox.dart';
 import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
 import 'package:cake_wallet/view_model/node_list/pow_node_create_or_edit_view_model.dart';
+import 'package:cw_core/node.dart';
 import 'package:cw_core/pow_node.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -66,7 +67,7 @@ class PowNodeForm extends StatelessWidget {
 
   final PowNodeCreateOrEditViewModel nodeViewModel;
   final GlobalKey<FormState> formKey;
-  final PowNode? editingNode;
+  final Node? editingNode;
 
   final TextEditingController _addressController;
   final TextEditingController _portController;
diff --git a/lib/src/screens/nodes/widgets/pow_node_list_row.dart b/lib/src/screens/nodes/widgets/pow_node_list_row.dart
index eebfbcc07..12f1575c6 100644
--- a/lib/src/screens/nodes/widgets/pow_node_list_row.dart
+++ b/lib/src/screens/nodes/widgets/pow_node_list_row.dart
@@ -3,6 +3,7 @@ import 'package:cake_wallet/src/screens/nodes/widgets/node_indicator.dart';
 import 'package:cake_wallet/src/widgets/standard_list.dart';
 import 'package:cake_wallet/themes/extensions/filter_theme.dart';
 import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
+import 'package:cw_core/node.dart';
 import 'package:cw_core/pow_node.dart';
 import 'package:flutter/material.dart';
 
@@ -14,7 +15,7 @@ class PowNodeListRow extends StandardListRow {
       required bool isSelected})
       : super(title: title, onTap: onTap, isSelected: isSelected);
 
-  final PowNode node;
+  final Node node;
 
   @override
   Widget buildLeading(BuildContext context) {
diff --git a/lib/store/settings_store.dart b/lib/store/settings_store.dart
index 4b95f9bf1..04a225d75 100644
--- a/lib/store/settings_store.dart
+++ b/lib/store/settings_store.dart
@@ -63,7 +63,7 @@ abstract class SettingsStoreBase with Store {
       required this.appVersion,
       required this.deviceName,
       required Map<WalletType, Node> nodes,
-      required Map<WalletType, PowNode> powNodes,
+      required Map<WalletType, Node> powNodes,
       required this.shouldShowYatPopup,
       required this.isBitcoinBuyEnabled,
       required this.actionlistDisplayMode,
@@ -86,7 +86,7 @@ abstract class SettingsStoreBase with Store {
       TransactionPriority? initialLitecoinTransactionPriority,
       TransactionPriority? initialEthereumTransactionPriority})
       : nodes = ObservableMap<WalletType, Node>.of(nodes),
-        powNodes = ObservableMap<WalletType, PowNode>.of(powNodes),
+        powNodes = ObservableMap<WalletType, Node>.of(powNodes),
         _sharedPreferences = sharedPreferences,
         _backgroundTasks = backgroundTasks,
         fiatCurrency = initialFiatCurrency,
@@ -477,7 +477,7 @@ abstract class SettingsStoreBase with Store {
   final BackgroundTasks _backgroundTasks;
 
   ObservableMap<WalletType, Node> nodes;
-  ObservableMap<WalletType, PowNode> powNodes;
+  ObservableMap<WalletType, Node> powNodes;
 
   Node getCurrentNode(WalletType walletType) {
     final node = nodes[walletType];
@@ -489,7 +489,7 @@ abstract class SettingsStoreBase with Store {
     return node;
   }
 
-  PowNode getCurrentPowNode(WalletType walletType) {
+  Node getCurrentPowNode(WalletType walletType) {
     final node = powNodes[walletType];
 
     if (node == null) {
@@ -509,7 +509,7 @@ abstract class SettingsStoreBase with Store {
 
   static Future<SettingsStore> load(
       {required Box<Node> nodeSource,
-      required Box<PowNode> powNodeSource,
+      required Box<Node> powNodeSource,
       required bool isBitcoinBuyEnabled,
       FiatCurrency initialFiatCurrency = FiatCurrency.usd,
       BalanceDisplayMode initialBalanceDisplayMode = BalanceDisplayMode.availableBalance,
@@ -645,7 +645,7 @@ abstract class SettingsStoreBase with Store {
         ? AutoGenerateSubaddressStatus.deserialize(raw: generateSubaddresses)
         : defaultAutoGenerateSubaddressStatus;
     final nodes = <WalletType, Node>{};
-    final powNodes = <WalletType, PowNode>{};
+    final powNodes = <WalletType, Node>{};
 
     if (moneroNode != null) {
       nodes[WalletType.monero] = moneroNode;
@@ -908,7 +908,7 @@ abstract class SettingsStoreBase with Store {
     nodes[walletType] = node;
   }
 
-  Future<void> _saveCurrentPowNode(PowNode node, WalletType walletType) async {
+  Future<void> _saveCurrentPowNode(Node node, WalletType walletType) async {
     switch (walletType) {
       case WalletType.nano:
         await _sharedPreferences.setInt(PreferencesKey.currentNanoPowNodeIdKey, node.key as int);
diff --git a/lib/view_model/node_list/pow_node_create_or_edit_view_model.dart b/lib/view_model/node_list/pow_node_create_or_edit_view_model.dart
index a963d40c0..c5448a68f 100644
--- a/lib/view_model/node_list/pow_node_create_or_edit_view_model.dart
+++ b/lib/view_model/node_list/pow_node_create_or_edit_view_model.dart
@@ -74,7 +74,7 @@ abstract class PowNodeCreateOrEditViewModelBase with Store {
   }
 
   final WalletType _walletType;
-  final Box<PowNode> _nodeSource;
+  final Box<Node> _nodeSource;
   final SettingsStore _settingsStore;
 
   @action
@@ -114,8 +114,8 @@ abstract class PowNodeCreateOrEditViewModelBase with Store {
   void setSocksProxyAddress(String val) => socksProxyAddress = val;
 
   @action
-  Future<void> save({PowNode? editingNode, bool saveAsCurrent = false}) async {
-    final node = PowNode(
+  Future<void> save({Node? editingNode, bool saveAsCurrent = false}) async {
+    final node = Node(
         uri: uri,
         type: _walletType,
         login: login,
@@ -145,7 +145,7 @@ abstract class PowNodeCreateOrEditViewModelBase with Store {
 
   @action
   Future<void> connect() async {
-    final node = PowNode(
+    final node = Node(
         uri: uri,
         type: _walletType,
         login: login,
@@ -162,7 +162,7 @@ abstract class PowNodeCreateOrEditViewModelBase with Store {
     }
   }
 
-  PowNode? _existingNode(PowNode node) {
+  Node? _existingNode(Node node) {
     final nodes = _nodeSource.values.toList();
     nodes.forEach((item) {
       item.login ??= '';
@@ -173,7 +173,7 @@ abstract class PowNodeCreateOrEditViewModelBase with Store {
   }
 
   @action
-  void setAsCurrent(PowNode node) => _settingsStore.powNodes[_walletType] = node;
+  void setAsCurrent(Node node) => _settingsStore.powNodes[_walletType] = node;
 
   @action
   Future<void> scanQRCodeForNewNode() async {
diff --git a/lib/view_model/node_list/pow_node_list_view_model.dart b/lib/view_model/node_list/pow_node_list_view_model.dart
index 0ab4ebcdf..a0e0fc78b 100644
--- a/lib/view_model/node_list/pow_node_list_view_model.dart
+++ b/lib/view_model/node_list/pow_node_list_view_model.dart
@@ -17,7 +17,7 @@ class PowNodeListViewModel = PowNodeListViewModelBase with _$PowNodeListViewMode
 
 abstract class PowNodeListViewModelBase with Store {
   PowNodeListViewModelBase(this._nodeSource, this._appStore)
-      : nodes = ObservableList<PowNode>(),
+      : nodes = ObservableList<Node>(),
         settingsStore = _appStore.settingsStore {
     _bindNodes();
 
@@ -27,7 +27,7 @@ abstract class PowNodeListViewModelBase with Store {
   }
 
   @computed
-  PowNode get currentNode {
+  Node get currentNode {
     final node = settingsStore.powNodes[_appStore.wallet!.type];
 
     if (node == null) {
@@ -41,15 +41,15 @@ abstract class PowNodeListViewModelBase with Store {
       S.current.change_current_node(uri) +
       '${uri.endsWith('.onion') || uri.contains('.onion:') ? '\n' + S.current.orbot_running_alert : ''}';
 
-  final ObservableList<PowNode> nodes;
+  final ObservableList<Node> nodes;
   final SettingsStore settingsStore;
-  final Box<PowNode> _nodeSource;
+  final Box<Node> _nodeSource;
   final AppStore _appStore;
 
   Future<void> reset() async {
     await resetPowToDefault(_nodeSource);
 
-    PowNode node;
+    Node node;
 
     switch (_appStore.wallet!.type) {
       case WalletType.nano:
@@ -63,9 +63,9 @@ abstract class PowNodeListViewModelBase with Store {
   }
 
   @action
-  Future<void> delete(PowNode node) async => node.delete();
+  Future<void> delete(Node node) async => node.delete();
 
-  Future<void> setAsCurrent(PowNode node) async =>
+  Future<void> setAsCurrent(Node node) async =>
       settingsStore.powNodes[_appStore.wallet!.type] = node;
 
   @action

From bda4684f50396912c865d48b78f41a7e669939cd Mon Sep 17 00:00:00 2001
From: fosse <matt.cfosse@gmail.com>
Date: Thu, 7 Sep 2023 12:05:27 -0400
Subject: [PATCH 2/7] nodes pages fixes

---
 .../screens/settings/manage_nodes_page.dart   |  3 +
 .../settings/manage_pow_nodes_page.dart       | 62 ++++++++++---------
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/lib/src/screens/settings/manage_nodes_page.dart b/lib/src/screens/settings/manage_nodes_page.dart
index 4b1034f2b..bd9b07467 100644
--- a/lib/src/screens/settings/manage_nodes_page.dart
+++ b/lib/src/screens/settings/manage_nodes_page.dart
@@ -42,6 +42,9 @@ class ManageNodesPage extends BasePage {
                     return nodeListViewModel.nodes.length;
                   },
                   itemBuilder: (_, index) {
+                    if (index > nodeListViewModel.nodes.length - 1) {
+                      return SizedBox();
+                    }
                     return Observer(
                       builder: (context) {
                         final node = nodeListViewModel.nodes[index];
diff --git a/lib/src/screens/settings/manage_pow_nodes_page.dart b/lib/src/screens/settings/manage_pow_nodes_page.dart
index 723695ac9..7392b670c 100644
--- a/lib/src/screens/settings/manage_pow_nodes_page.dart
+++ b/lib/src/screens/settings/manage_pow_nodes_page.dart
@@ -1,14 +1,11 @@
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/screens/nodes/widgets/node_list_row.dart';
 import 'package:cake_wallet/src/screens/nodes/widgets/pow_node_list_row.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/src/widgets/standard_list.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
-import 'package:cake_wallet/view_model/node_list/node_list_view_model.dart';
 import 'package:cake_wallet/view_model/node_list/pow_node_list_view_model.dart';
-import 'package:cw_core/node.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 
@@ -45,36 +42,43 @@ class ManagePowNodesPage extends BasePage {
                     return nodeListViewModel.nodes.length;
                   },
                   itemBuilder: (_, index) {
-                    final node = nodeListViewModel.nodes[index];
-                    final isSelected = node.keyIndex == nodeListViewModel.currentNode.keyIndex;
-                    final nodeListRow = PowNodeListRow(
-                      title: node.uriRaw,
-                      node: node,
-                      isSelected: isSelected,
-                      onTap: (_) async {
-                        if (isSelected) {
-                          return;
+                    return Observer(
+                      builder: (context) {
+                        if (index > nodeListViewModel.nodes.length - 1) {
+                          return SizedBox();
                         }
+                        final node = nodeListViewModel.nodes[index];
+                        final isSelected = node.keyIndex == nodeListViewModel.currentNode.keyIndex;
+                        final nodeListRow = PowNodeListRow(
+                          title: node.uriRaw,
+                          node: node,
+                          isSelected: isSelected,
+                          onTap: (_) async {
+                            if (isSelected) {
+                              return;
+                            }
 
-                        await showPopUp<void>(
-                            context: context,
-                            builder: (BuildContext context) {
-                              return AlertWithTwoActions(
-                                alertTitle: S.of(context).change_current_node_title,
-                                alertContent: nodeListViewModel.getAlertContent(node.uriRaw),
-                                leftButtonText: S.of(context).cancel,
-                                rightButtonText: S.of(context).change,
-                                actionLeftButton: () => Navigator.of(context).pop(),
-                                actionRightButton: () async {
-                                  await nodeListViewModel.setAsCurrent(node);
-                                  Navigator.of(context).pop();
-                                },
-                              );
-                            });
+                            await showPopUp<void>(
+                                context: context,
+                                builder: (BuildContext context) {
+                                  return AlertWithTwoActions(
+                                    alertTitle: S.of(context).change_current_node_title,
+                                    alertContent: nodeListViewModel.getAlertContent(node.uriRaw),
+                                    leftButtonText: S.of(context).cancel,
+                                    rightButtonText: S.of(context).change,
+                                    actionLeftButton: () => Navigator.of(context).pop(),
+                                    actionRightButton: () async {
+                                      await nodeListViewModel.setAsCurrent(node);
+                                      Navigator.of(context).pop();
+                                    },
+                                  );
+                                });
+                          },
+                        );
+
+                        return nodeListRow;
                       },
                     );
-
-                    return nodeListRow;
                   },
                 ),
               );

From 278ea2fc77185de7ae43ca301995c23f7e7980b9 Mon Sep 17 00:00:00 2001
From: fosse <matt.cfosse@gmail.com>
Date: Thu, 7 Sep 2023 12:10:17 -0400
Subject: [PATCH 3/7] observer fix

---
 lib/src/screens/settings/manage_nodes_page.dart     | 6 ++----
 lib/src/screens/settings/manage_pow_nodes_page.dart | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/src/screens/settings/manage_nodes_page.dart b/lib/src/screens/settings/manage_nodes_page.dart
index bd9b07467..682fad64e 100644
--- a/lib/src/screens/settings/manage_nodes_page.dart
+++ b/lib/src/screens/settings/manage_nodes_page.dart
@@ -34,17 +34,15 @@ class ManageNodesPage extends BasePage {
           SizedBox(height: 20),
           Observer(
             builder: (BuildContext context) {
+              int nodesLength = nodeListViewModel.nodes.length;
               return Flexible(
                 child: SectionStandardList(
                   sectionCount: 1,
                   dividerPadding: EdgeInsets.symmetric(horizontal: 24),
                   itemCounter: (int sectionIndex) {
-                    return nodeListViewModel.nodes.length;
+                    return nodesLength;
                   },
                   itemBuilder: (_, index) {
-                    if (index > nodeListViewModel.nodes.length - 1) {
-                      return SizedBox();
-                    }
                     return Observer(
                       builder: (context) {
                         final node = nodeListViewModel.nodes[index];
diff --git a/lib/src/screens/settings/manage_pow_nodes_page.dart b/lib/src/screens/settings/manage_pow_nodes_page.dart
index 7392b670c..e60813944 100644
--- a/lib/src/screens/settings/manage_pow_nodes_page.dart
+++ b/lib/src/screens/settings/manage_pow_nodes_page.dart
@@ -34,19 +34,17 @@ class ManagePowNodesPage extends BasePage {
           SizedBox(height: 20),
           Observer(
             builder: (BuildContext context) {
+              int nodesLength = nodeListViewModel.nodes.length;
               return Flexible(
                 child: SectionStandardList(
                   sectionCount: 1,
                   dividerPadding: EdgeInsets.symmetric(horizontal: 24),
                   itemCounter: (int sectionIndex) {
-                    return nodeListViewModel.nodes.length;
+                    return nodesLength;
                   },
                   itemBuilder: (_, index) {
                     return Observer(
                       builder: (context) {
-                        if (index > nodeListViewModel.nodes.length - 1) {
-                          return SizedBox();
-                        }
                         final node = nodeListViewModel.nodes[index];
                         final isSelected = node.keyIndex == nodeListViewModel.currentNode.keyIndex;
                         final nodeListRow = PowNodeListRow(

From e178a2e2a918d25c6750e132a05eb53649ffb813 Mon Sep 17 00:00:00 2001
From: fosse <matt.cfosse@gmail.com>
Date: Fri, 8 Sep 2023 09:09:08 -0400
Subject: [PATCH 4/7] ssl fix

---
 assets/nano_node_list.yml     |   4 +-
 assets/nano_pow_node_list.yml |   4 +-
 cw_core/lib/node.dart         |   2 +-
 cw_core/lib/pow_node.dart     | 159 ----------------------------------
 4 files changed, 7 insertions(+), 162 deletions(-)
 delete mode 100644 cw_core/lib/pow_node.dart

diff --git a/assets/nano_node_list.yml b/assets/nano_node_list.yml
index e7476c94f..63b4baec1 100644
--- a/assets/nano_node_list.yml
+++ b/assets/nano_node_list.yml
@@ -1,4 +1,6 @@
 -
-  uri: rpc.nano.to:443
+  uri: rpc.nano.to
+  useSSL: true
+  is_default: true
 -
   uri: node.perish.co:9076
\ No newline at end of file
diff --git a/assets/nano_pow_node_list.yml b/assets/nano_pow_node_list.yml
index 22aed967b..674518073 100644
--- a/assets/nano_pow_node_list.yml
+++ b/assets/nano_pow_node_list.yml
@@ -1,5 +1,7 @@
 -
-  uri: rpc.nano.to:443
+  uri: rpc.nano.to
+  useSSL: true
+  is_default: true
 -
   uri: workers.perish.co
 -
diff --git a/cw_core/lib/node.dart b/cw_core/lib/node.dart
index ec7c905dc..a07030d64 100644
--- a/cw_core/lib/node.dart
+++ b/cw_core/lib/node.dart
@@ -80,7 +80,7 @@ class Node extends HiveObject with Keyable {
         return Uri.https(uriRaw, '');
       case WalletType.nano:
       case WalletType.banano:
-        if (uriRaw.contains("https") || uriRaw.endsWith("443") || isSSL) {
+        if (isSSL) {
           return Uri.https(uriRaw, '');
         } else {
           return Uri.http(uriRaw, '');
diff --git a/cw_core/lib/pow_node.dart b/cw_core/lib/pow_node.dart
deleted file mode 100644
index 9963dc0cb..000000000
--- a/cw_core/lib/pow_node.dart
+++ /dev/null
@@ -1,159 +0,0 @@
-// import 'dart:io';
-// import 'package:cw_core/keyable.dart';
-// import 'dart:convert';
-// import 'package:http/http.dart' as http;
-// import 'package:hive/hive.dart';
-// import 'package:cw_core/hive_type_ids.dart';
-// import 'package:cw_core/wallet_type.dart';
-// import 'package:http/io_client.dart' as ioc;
-
-// part 'pow_node.g.dart';
-
-// Uri createUriFromElectrumAddress(String address) => Uri.tryParse('tcp://$address')!;
-
-// @HiveType(typeId: PowNode.typeId)
-// class PowNode extends HiveObject with Keyable {
-//   PowNode({
-//     this.login,
-//     this.password,
-//     this.useSSL,
-//     this.trusted = false,
-//     this.socksProxyAddress,
-//     String? uri,
-//     WalletType? type,
-//   }) {
-//     if (uri != null) {
-//       uriRaw = uri;
-//     }
-//     if (type != null) {
-//       this.type = type;
-//     }
-//   }
-
-//   PowNode.fromMap(Map<String, Object?> map)
-//       : uriRaw = map['uri'] as String? ?? '',
-//         login = map['login'] as String?,
-//         password = map['password'] as String?,
-//         useSSL = map['useSSL'] as bool?,
-//         trusted = map['trusted'] as bool? ?? false,
-//         socksProxyAddress = map['socksProxyPort'] as String?;
-
-//   static const typeId = POW_NODE_TYPE_ID;
-//   static const boxName = 'PowNodes';
-
-//   @HiveField(0, defaultValue: '')
-//   late String uriRaw;
-
-//   @HiveField(1)
-//   String? login;
-
-//   @HiveField(2)
-//   String? password;
-
-//   @HiveField(3, defaultValue: 0)
-//   late int typeRaw;
-
-//   @HiveField(4)
-//   bool? useSSL;
-
-//   @HiveField(5, defaultValue: false)
-//   bool trusted;
-
-//   @HiveField(6)
-//   String? socksProxyAddress;
-
-//   bool get isSSL => useSSL ?? false;
-
-//   bool get useSocksProxy => socksProxyAddress == null ? false : socksProxyAddress!.isNotEmpty;
-
-//   Uri get uri {
-//     switch (type) {
-//       case WalletType.monero:
-//         return Uri.http(uriRaw, '');
-//       case WalletType.bitcoin:
-//         return createUriFromElectrumAddress(uriRaw);
-//       case WalletType.litecoin:
-//         return createUriFromElectrumAddress(uriRaw);
-//       case WalletType.haven:
-//         return Uri.http(uriRaw, '');
-//       case WalletType.ethereum:
-//         return Uri.https(uriRaw, '');
-//       case WalletType.nano:
-//       case WalletType.banano:
-//         if (uriRaw.contains("https") || uriRaw.endsWith("443") || isSSL) {
-//           return Uri.https(uriRaw, '');
-//         } else {
-//           return Uri.http(uriRaw, '');
-//         }
-//       default:
-//         throw Exception('Unexpected type ${type.toString()} for Node uri');
-//     }
-//   }
-
-//   @override
-//   bool operator ==(other) =>
-//       other is PowNode &&
-//       (other.uriRaw == uriRaw &&
-//           other.login == login &&
-//           other.password == password &&
-//           other.typeRaw == typeRaw &&
-//           other.useSSL == useSSL &&
-//           other.trusted == trusted &&
-//           other.socksProxyAddress == socksProxyAddress);
-
-//   @override
-//   int get hashCode =>
-//       uriRaw.hashCode ^
-//       login.hashCode ^
-//       password.hashCode ^
-//       typeRaw.hashCode ^
-//       useSSL.hashCode ^
-//       trusted.hashCode ^
-//       socksProxyAddress.hashCode;
-
-//   @override
-//   dynamic get keyIndex {
-//     _keyIndex ??= key;
-//     return _keyIndex;
-//   }
-
-//   WalletType get type => deserializeFromInt(typeRaw);
-
-//   set type(WalletType type) => typeRaw = serializeToInt(type);
-
-//   dynamic _keyIndex;
-
-//   Future<bool> requestNode() async {
-//     try {
-//       switch (type) {
-//         case WalletType.nano:
-//           return requestNanoPowNode();
-//         default:
-//           return false;
-//       }
-//     } catch (_) {
-//       return false;
-//     }
-//   }
-
-//   Future<bool> requestNanoPowNode() async {
-//     return http
-//         .post(
-//       uri,
-//       headers: {'Content-type': 'application/json'},
-//       body: json.encode(
-//         {
-//           "action": "work_generate",
-//           "hash": "0000000000000000000000000000000000000000000000000000000000000000",
-//         },
-//       ),
-//     )
-//         .then((http.Response response) {
-//       if (response.statusCode == 200) {
-//         return true;
-//       } else {
-//         return false;
-//       }
-//     });
-//   }
-// }

From 2ff52d280c707d24c3731308f688c4533bb117e9 Mon Sep 17 00:00:00 2001
From: fosse <matt.cfosse@gmail.com>
Date: Fri, 8 Sep 2023 09:14:27 -0400
Subject: [PATCH 5/7] remove old references

---
 cw_core/lib/wallet_base.dart                                 | 1 -
 cw_nano/lib/nano_client.dart                                 | 5 -----
 cw_nano/lib/nano_wallet.dart                                 | 3 ---
 lib/di.dart                                                  | 1 -
 lib/entities/default_settings_migration.dart                 | 2 --
 lib/entities/node_list.dart                                  | 1 -
 lib/main.dart                                                | 1 -
 lib/router.dart                                              | 1 -
 lib/src/screens/nodes/node_create_or_edit_page.dart          | 1 -
 lib/src/screens/nodes/pow_node_create_or_edit_page.dart      | 1 -
 lib/src/screens/nodes/widgets/pow_node_form.dart             | 1 -
 lib/src/screens/nodes/widgets/pow_node_list_row.dart         | 1 -
 lib/store/settings_store.dart                                | 1 -
 .../node_list/pow_node_create_or_edit_view_model.dart        | 1 -
 lib/view_model/node_list/pow_node_list_view_model.dart       | 1 -
 15 files changed, 22 deletions(-)

diff --git a/cw_core/lib/wallet_base.dart b/cw_core/lib/wallet_base.dart
index 5d0e388a1..1da90a700 100644
--- a/cw_core/lib/wallet_base.dart
+++ b/cw_core/lib/wallet_base.dart
@@ -1,4 +1,3 @@
-import 'package:cw_core/pow_node.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cw_core/balance.dart';
 import 'package:cw_core/transaction_info.dart';
diff --git a/cw_nano/lib/nano_client.dart b/cw_nano/lib/nano_client.dart
index 72066afa2..01f9ba9f9 100644
--- a/cw_nano/lib/nano_client.dart
+++ b/cw_nano/lib/nano_client.dart
@@ -1,14 +1,9 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:math';
 
-import 'package:cw_core/crypto_currency.dart';
-import 'package:cw_core/erc20_token.dart';
-import 'package:cw_core/pow_node.dart';
 import 'package:cw_nano/nano_balance.dart';
 import 'package:cw_nano/nano_transaction_model.dart';
 import 'package:cw_nano/nano_util.dart';
-import 'package:flutter/services.dart';
 import 'package:http/http.dart' as http;
 import 'package:nanodart/nanodart.dart';
 import 'package:cw_core/node.dart';
diff --git a/cw_nano/lib/nano_wallet.dart b/cw_nano/lib/nano_wallet.dart
index 941406bb0..2d67c63d3 100644
--- a/cw_nano/lib/nano_wallet.dart
+++ b/cw_nano/lib/nano_wallet.dart
@@ -6,11 +6,9 @@ import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/node.dart';
 import 'package:cw_core/pathForWallet.dart';
 import 'package:cw_core/pending_transaction.dart';
-import 'package:cw_core/pow_node.dart';
 import 'package:cw_core/sync_status.dart';
 import 'package:cw_core/transaction_direction.dart';
 import 'package:cw_core/transaction_priority.dart';
-import 'package:cw_core/wallet_addresses.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:cw_nano/file.dart';
 import 'package:cw_core/nano_account.dart';
@@ -23,7 +21,6 @@ import 'package:cw_nano/nano_util.dart';
 import 'package:cw_nano/nano_wallet_keys.dart';
 import 'package:cw_nano/pending_nano_transaction.dart';
 import 'package:mobx/mobx.dart';
-import 'package:hive/hive.dart';
 import 'dart:async';
 import 'package:cw_nano/nano_wallet_addresses.dart';
 import 'package:cw_core/wallet_base.dart';
diff --git a/lib/di.dart b/lib/di.dart
index 85e6bb87b..9a58f54dd 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -93,7 +93,6 @@ import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
 import 'package:cake_wallet/view_model/wallet_restore_choose_derivation_view_model.dart';
 import 'package:cw_core/erc20_token.dart';
 import 'package:cw_core/nano_account.dart';
-import 'package:cw_core/pow_node.dart';
 import 'package:cw_core/unspent_coins_info.dart';
 import 'package:cake_wallet/core/backup_service.dart';
 import 'package:cw_core/wallet_service.dart';
diff --git a/lib/entities/default_settings_migration.dart b/lib/entities/default_settings_migration.dart
index 37253d449..7d1859492 100644
--- a/lib/entities/default_settings_migration.dart
+++ b/lib/entities/default_settings_migration.dart
@@ -3,8 +3,6 @@ import 'package:cake_wallet/bitcoin/bitcoin.dart';
 import 'package:cake_wallet/entities/exchange_api_mode.dart';
 import 'package:cw_core/pathForWallet.dart';
 import 'package:cake_wallet/entities/secret_store_key.dart';
-import 'package:cw_core/pow_node.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:hive/hive.dart';
 import 'package:path_provider/path_provider.dart';
diff --git a/lib/entities/node_list.dart b/lib/entities/node_list.dart
index d9e03a1d9..0641c0846 100644
--- a/lib/entities/node_list.dart
+++ b/lib/entities/node_list.dart
@@ -1,4 +1,3 @@
-import 'package:cw_core/pow_node.dart';
 import 'package:flutter/services.dart';
 import 'package:hive/hive.dart';
 import "package:yaml/yaml.dart";
diff --git a/lib/main.dart b/lib/main.dart
index c06e13d1d..05f2ec942 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -9,7 +9,6 @@ import 'package:cake_wallet/utils/exception_handler.dart';
 import 'package:cw_core/address_info.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cw_core/hive_type_ids.dart';
-import 'package:cw_core/pow_node.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
diff --git a/lib/router.dart b/lib/router.dart
index b63550415..799613903 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -57,7 +57,6 @@ import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.
 import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';
 import 'package:cake_wallet/wallet_type_utils.dart';
 import 'package:cw_core/nano_account.dart';
-import 'package:cw_core/pow_node.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/src/screens/nodes/node_create_or_edit_page.dart b/lib/src/screens/nodes/node_create_or_edit_page.dart
index 0c3a49b7a..8a446a0ab 100644
--- a/lib/src/screens/nodes/node_create_or_edit_page.dart
+++ b/lib/src/screens/nodes/node_create_or_edit_page.dart
@@ -7,7 +7,6 @@ import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/node_list/pow_node_create_or_edit_view_model.dart';
 import 'package:cw_core/node.dart';
-import 'package:cw_core/pow_node.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:mobx/mobx.dart';
diff --git a/lib/src/screens/nodes/pow_node_create_or_edit_page.dart b/lib/src/screens/nodes/pow_node_create_or_edit_page.dart
index 1ec813c98..5dc02d66a 100644
--- a/lib/src/screens/nodes/pow_node_create_or_edit_page.dart
+++ b/lib/src/screens/nodes/pow_node_create_or_edit_page.dart
@@ -7,7 +7,6 @@ import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/node_list/pow_node_create_or_edit_view_model.dart';
 import 'package:cw_core/node.dart';
-import 'package:cw_core/pow_node.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:mobx/mobx.dart';
diff --git a/lib/src/screens/nodes/widgets/pow_node_form.dart b/lib/src/screens/nodes/widgets/pow_node_form.dart
index 558564c53..f8f0ce67e 100644
--- a/lib/src/screens/nodes/widgets/pow_node_form.dart
+++ b/lib/src/screens/nodes/widgets/pow_node_form.dart
@@ -6,7 +6,6 @@ import 'package:cake_wallet/src/widgets/standard_checkbox.dart';
 import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
 import 'package:cake_wallet/view_model/node_list/pow_node_create_or_edit_view_model.dart';
 import 'package:cw_core/node.dart';
-import 'package:cw_core/pow_node.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:cake_wallet/generated/i18n.dart';
diff --git a/lib/src/screens/nodes/widgets/pow_node_list_row.dart b/lib/src/screens/nodes/widgets/pow_node_list_row.dart
index 12f1575c6..bd5493d4f 100644
--- a/lib/src/screens/nodes/widgets/pow_node_list_row.dart
+++ b/lib/src/screens/nodes/widgets/pow_node_list_row.dart
@@ -4,7 +4,6 @@ import 'package:cake_wallet/src/widgets/standard_list.dart';
 import 'package:cake_wallet/themes/extensions/filter_theme.dart';
 import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
 import 'package:cw_core/node.dart';
-import 'package:cw_core/pow_node.dart';
 import 'package:flutter/material.dart';
 
 class PowNodeListRow extends StandardListRow {
diff --git a/lib/store/settings_store.dart b/lib/store/settings_store.dart
index 04a225d75..9199b8e6a 100644
--- a/lib/store/settings_store.dart
+++ b/lib/store/settings_store.dart
@@ -11,7 +11,6 @@ import 'package:cake_wallet/entities/sort_balance_types.dart';
 import 'package:cake_wallet/view_model/settings/sync_mode.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/ethereum/ethereum.dart';
-import 'package:cw_core/pow_node.dart';
 import 'package:cw_core/transaction_priority.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/themes/theme_list.dart';
diff --git a/lib/view_model/node_list/pow_node_create_or_edit_view_model.dart b/lib/view_model/node_list/pow_node_create_or_edit_view_model.dart
index c5448a68f..430a986ad 100644
--- a/lib/view_model/node_list/pow_node_create_or_edit_view_model.dart
+++ b/lib/view_model/node_list/pow_node_create_or_edit_view_model.dart
@@ -1,7 +1,6 @@
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/entities/qr_scanner.dart';
 import 'package:cake_wallet/store/settings_store.dart';
-import 'package:cw_core/pow_node.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cw_core/node.dart';
diff --git a/lib/view_model/node_list/pow_node_list_view_model.dart b/lib/view_model/node_list/pow_node_list_view_model.dart
index a0e0fc78b..5467be31a 100644
--- a/lib/view_model/node_list/pow_node_list_view_model.dart
+++ b/lib/view_model/node_list/pow_node_list_view_model.dart
@@ -1,7 +1,6 @@
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/utils/mobx.dart';
-import 'package:cw_core/pow_node.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cw_core/wallet_base.dart';

From d4e36a503c2ffd013534cc3458c7b4d0f1629fd3 Mon Sep 17 00:00:00 2001
From: fosse <matt.cfosse@gmail.com>
Date: Fri, 8 Sep 2023 09:21:12 -0400
Subject: [PATCH 6/7] remove unused imports

---
 lib/src/screens/nodes/node_create_or_edit_page.dart | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/src/screens/nodes/node_create_or_edit_page.dart b/lib/src/screens/nodes/node_create_or_edit_page.dart
index 8a446a0ab..3525160e8 100644
--- a/lib/src/screens/nodes/node_create_or_edit_page.dart
+++ b/lib/src/screens/nodes/node_create_or_edit_page.dart
@@ -1,11 +1,9 @@
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/screens/nodes/widgets/node_form.dart';
-import 'package:cake_wallet/src/screens/nodes/widgets/pow_node_form.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
-import 'package:cake_wallet/view_model/node_list/pow_node_create_or_edit_view_model.dart';
 import 'package:cw_core/node.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';

From 7f1200ef5e648b1ebbd6ddbbf50da8d8ba89fba7 Mon Sep 17 00:00:00 2001
From: fosse <matt.cfosse@gmail.com>
Date: Fri, 8 Sep 2023 09:25:33 -0400
Subject: [PATCH 7/7] code cleanup

---
 lib/main.dart | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index 05f2ec942..05b97dbca 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -82,10 +82,6 @@ Future<void> initializeAppConfigs() async {
     CakeHive.registerAdapter(NodeAdapter());
   }
 
-  // if (!CakeHive.isAdapterRegistered(PowNode.typeId)) {
-  //   CakeHive.registerAdapter(PowNodeAdapter());
-  // }
-
   if (!CakeHive.isAdapterRegistered(TransactionDescription.typeId)) {
     CakeHive.registerAdapter(TransactionDescriptionAdapter());
   }