mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-27 06:18:50 +01:00
Rebase node-sqlite-migration onto dev
Squashed migration of node Hive→SQLite, default-node handling, isPow/proxy support, arbitrum node updates, and related fixes. Replays node-sqlite-migration on top of current dev without the amount-refactor merge that the original branch carried. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -14,7 +14,6 @@ class NodeSwitchingService {
|
||||
NodeSwitchingService({
|
||||
required this.appStore,
|
||||
required this.settingsStore,
|
||||
required this.nodeSource,
|
||||
});
|
||||
|
||||
static const int _healthCheckIntervalSeconds = 30;
|
||||
@@ -38,7 +37,6 @@ class NodeSwitchingService {
|
||||
|
||||
final AppStore appStore;
|
||||
final SettingsStore settingsStore;
|
||||
final Box<Node> nodeSource;
|
||||
|
||||
final Map<WalletType, List<dynamic>> _usedNodeKeys = {};
|
||||
|
||||
@@ -118,13 +116,13 @@ class NodeSwitchingService {
|
||||
WalletType walletType,
|
||||
) async {
|
||||
for (final node in nodes) {
|
||||
if (!_usedNodeKeys[walletType]!.contains(node.key)) {
|
||||
if (!_usedNodeKeys[walletType]!.contains(node.id)) {
|
||||
final isActive = await node.requestNode();
|
||||
if (isActive) {
|
||||
return node;
|
||||
} else {
|
||||
printV('Node ${node.uriRaw} is not active. Marking as used.');
|
||||
_usedNodeKeys[walletType]!.add(node.key);
|
||||
_usedNodeKeys[walletType]!.add(node.id);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -157,7 +155,7 @@ class NodeSwitchingService {
|
||||
final currentNode = settingsStore.getCurrentNode(nodeWalletType, chainId: chainId);
|
||||
|
||||
// Get all trusted nodes for this wallet type
|
||||
final trustedNodes = nodeSource.values
|
||||
final trustedNodes = (await Node.getAll())
|
||||
.where((node) => node.type == nodeWalletType && node.isEnabledForAutoSwitching)
|
||||
.toList();
|
||||
|
||||
@@ -171,8 +169,8 @@ class NodeSwitchingService {
|
||||
_usedNodeKeys.putIfAbsent(nodeWalletType, () => []);
|
||||
|
||||
// Add current node to used list if not already there
|
||||
if (!_usedNodeKeys[nodeWalletType]!.contains(currentNode.key)) {
|
||||
_usedNodeKeys[nodeWalletType]!.add(currentNode.key);
|
||||
if (!_usedNodeKeys[nodeWalletType]!.contains(currentNode.id)) {
|
||||
_usedNodeKeys[nodeWalletType]!.add(currentNode.id);
|
||||
}
|
||||
|
||||
// Try to find an active unused node
|
||||
@@ -199,8 +197,8 @@ class NodeSwitchingService {
|
||||
}
|
||||
|
||||
// Ensure the selected node is marked as used
|
||||
if (!_usedNodeKeys[nodeWalletType]!.contains(nextNode.key)) {
|
||||
_usedNodeKeys[nodeWalletType]!.add(nextNode.key);
|
||||
if (!_usedNodeKeys[nodeWalletType]!.contains(nextNode.id)) {
|
||||
_usedNodeKeys[nodeWalletType]!.add(nextNode.id);
|
||||
}
|
||||
|
||||
printV(
|
||||
|
||||
Reference in New Issue
Block a user