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:
jwinterm
2026-10-24 23:49:29 -04:00
1406 changed files with 81062 additions and 48972 deletions
+12 -8
View File
@@ -25,20 +25,24 @@ void startCheckConnectionReaction(WalletBase wallet, SettingsStore settingsStore
try {
final connectivityResult = await (Connectivity().checkConnectivity());
int? chainId;
if (isEVMCompatibleChain(wallet.type)) {
chainId = evm!.getSelectedChainId(wallet);
}
final node = settingsStore.getCurrentNode(wallet.type, chainId: chainId);
if (connectivityResult.contains(ConnectivityResult.none)) {
wallet.syncStatus = FailedSyncStatus();
return;
// Still try node even when OS says no network - it might be a LAN node.
if (!await node.requestNode()) {
wallet.syncStatus = FailedSyncStatus();
return;
}
}
if (wallet.type != WalletType.bitcoin &&
(wallet.syncStatus is LostConnectionSyncStatus ||
wallet.syncStatus is FailedSyncStatus)) {
int? chainId;
if (isEVMCompatibleChain(wallet.type)) {
chainId = evm!.getSelectedChainId(wallet);
}
final node = settingsStore.getCurrentNode(wallet.type, chainId: chainId);
final alive = await node.requestNode();
if (alive) {
@@ -75,6 +75,23 @@ void startAuthenticationStateChange(
);
return;
}
ledgerVM.suppressMoneroReconnectPrompt = true;
if (!monero!.hasGlobalLedgerConnection()) {
await showPopUp<void>(
context: context,
builder: (context) => AlertWithOneAction(
alertTitle: "Unexpected Error",
alertContent:
"Unexpected Error while trying to connect to the device (has no global LedgerConnection)",
buttonText: S.of(context).try_again,
buttonAction: Navigator.of(context).pop,
),
);
return;
}
showPopUp<void>(
context: context,
builder: (context) => AlertWithOneAction(
@@ -85,14 +102,17 @@ void startAuthenticationStateChange(
buttonAction: () => Navigator.of(context).pop(),
),
);
bool tryOpening = true;
var isConnected = false;
var tryOpening = true;
while (tryOpening) {
try {
await loadCurrentWallet();
isConnected = true;
tryOpening = false;
} on Exception catch (e) {
final ledgerErrorMessage = ledgerVM.interpretErrorCode(e.toString());
if (ledgerErrorMessage != null) {
if (ledgerErrorMessage != null && context.mounted) {
await showPopUp<void>(
context: context,
builder: (context) => AlertWithTwoActions(
@@ -116,16 +136,19 @@ void startAuthenticationStateChange(
}
getIt.get<BottomSheetService>().showNext();
await navigatorKey.currentState!
.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
if (isConnected) {
ledgerVM.suppressMoneroReconnectPrompt = false;
await navigatorKey.currentState!
.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
}
},
allowChangeWallet: true,
),
);
// await navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.connectDevices, (route) => false, arguments: ConnectDevicePageParams(walletType: walletType, onConnectDevice: onConnectDevice));
} else {
navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
unawaited(
navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false),
);
}
WidgetsBinding.instance.addPostFrameCallback((_) {
final linkViewModel = getIt.get<LinkViewModel>();
+6 -2
View File
@@ -8,14 +8,18 @@ void startOnCurrentNodeChangeReaction(AppStore appStore) {
_onCurrentNodeChangeReaction?.reaction.dispose();
appStore.settingsStore.nodes.observe((change) async {
try {
await appStore.wallet!.connectToNode(node: change.newValue!);
if(change.newValue?.type == appStore.wallet!.type) {
await appStore.wallet!.connectToNode(node: change.newValue!);
}
} catch (e) {
printV(e.toString());
}
});
appStore.settingsStore.powNodes.observe((change) async {
try {
await appStore.wallet!.connectToPowNode(node: change.newValue!);
if(change.newValue?.type == appStore.wallet!.type) {
await appStore.wallet!.connectToPowNode(node: change.newValue!);
}
} catch (e) {
printV(e.toString());
}
+28 -12
View File
@@ -3,6 +3,32 @@ import 'package:hash_wallet/src/screens/wallet_connect/services/chain_service/et
import 'package:cw_core/wallet_type.dart';
import 'package:hash_wallet/evm/evm.dart';
const List<WalletType> walletConnectCompatibleChains = [
WalletType.ethereum,
WalletType.polygon,
WalletType.base,
WalletType.arbitrum,
WalletType.bsc,
];
String walletConnectCompatibleChainsLabel() {
final names = walletConnectCompatibleChains.map(walletTypeToDisplayName).toList();
if (names.length <= 1) return names.join();
final head = names.sublist(0, names.length - 1).join(', ');
return '$head, and ${names.last}';
}
String networkDisplayName(WalletType type, int? chainId) {
if (evm != null && isEVMCompatibleChain(type)) {
final id = chainId ?? evm!.getChainIdByWalletType(type);
final info = evm!.getChainInfoByChainId(id);
if (info != null) {
return info.name;
}
}
return walletTypeToString(type);
}
bool isEVMCompatibleChain(WalletType walletType) {
switch (walletType) {
case WalletType.polygon:
@@ -43,18 +69,8 @@ bool isNFTACtivatedChain(WalletType walletType, {int? chainId}) {
}
}
bool isWalletConnectCompatibleChain(WalletType walletType) {
switch (walletType) {
case WalletType.polygon:
case WalletType.ethereum:
case WalletType.base:
case WalletType.arbitrum:
case WalletType.bsc:
return true;
default:
return false;
}
}
bool isWalletConnectCompatibleChain(WalletType walletType) =>
walletConnectCompatibleChains.contains(walletType);
String getChainNameSpaceAndIdBasedOnWalletType(WalletType walletType, {int? chainId}) {
if (chainId != null) {
+15
View File
@@ -26,6 +26,7 @@ bool isElectrumWallet(WalletType walletType) {
case WalletType.bitcoin:
case WalletType.litecoin:
case WalletType.bitcoinCash:
case WalletType.dogecoin:
return true;
default:
return false;
@@ -44,3 +45,17 @@ bool hasTokens(WalletType walletType) {
return false;
}
}
String tokenStandardFor(WalletType walletType) {
switch (walletType) {
case WalletType.ethereum:
case WalletType.polygon:
case WalletType.arbitrum:
case WalletType.base:
return 'ERC-20';
case WalletType.bsc:
return 'BEP-20';
default:
return walletTypeToString(walletType);
}
}