mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-31 06:58:42 +01:00
Merge upstream Cake Wallet v6.5.0
Catches up from the May 12 fork point (v6.1.2+23) through v6.5.0: 535 upstream commits, including the Monero silent-open fix, Monero on Trezor, Ledger/Trezor BLE fixes, the new seed and history screens, quick Bitcoin sync, git-pinned dependencies (pubspec_overrides.yaml), frozen Hive adapters (*.part.dart), monero_c v0.18.4.6-RC2 and Flutter 3.41.9. Merged with both sides normalized first (import rename, 100-column format), which took the conflict count from 614 paths to 322. The procedure is now scripts/upstream_sync.sh. Kept from Hash Bags: - WalletType enum order and Hive IDs. SQLite stores WalletType.index and our order differs from upstream's; taking theirs would reread saved wallets as other chains. Our frozen adapter keeps the shipped IDs. - The 1.0.2 legacy PIN and wallet-password decode and self-heal. - Removed chains (Solana, Tron, Zano, Zcash, Decred, Haven) and the new Robinhood chain stay out; Cake Pay and non-Trocador swaps stay out. - Default nodes (node.wownero.org, sethforprivacy, Blockstream, bysh.me), converted to upstream's isDefault node-list key; Wownero is back in the node reset list. - Privacy: address resolvers limited to domain-anchored sources again; prices.neroswap.com for fiat; upstream's charts tab, which reads prices.cakewallet.com, sits behind FeatureFlag.isChartsEnabled = false. - Lightning stays behind FeatureFlag.isLightningEnabled, including upstream's new post-seed Lightning username step. - Our icon pipeline, branding and bundle identifiers. Twelve new upstream widget tests are skipped: test and code are unchanged from v6.5.0 apart from renames (not rerun on a pristine upstream checkout; upstream's top_bar_test does not compile against its own TopBar). flutter analyze lib: 0 errors; flutter test: 345 passed, 12 skipped; flutter build bundle compiles. Built with Flutter 3.41.9.
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