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:
@@ -41,7 +41,7 @@ abstract class PaymentViewModelBase with Store {
|
||||
return getChainIdByCryptoCurrency(_lastDetectionResult!.detectedCurrency!);
|
||||
}
|
||||
|
||||
return evm!.getChainIdByWalletType(detectedWalletType!);
|
||||
return evm?.getChainIdByWalletType(detectedWalletType!);
|
||||
}
|
||||
|
||||
@observable
|
||||
@@ -52,7 +52,7 @@ abstract class PaymentViewModelBase with Store {
|
||||
|
||||
@computed
|
||||
int? get currentChainId {
|
||||
if (!isEVMCompatibleChain(currentWalletType)) return null;
|
||||
if (!isEVMCompatibleChain(currentWalletType) || evm == null) return null;
|
||||
|
||||
return evm!.getSelectedChainId(appStore.wallet!);
|
||||
}
|
||||
@@ -74,12 +74,18 @@ abstract class PaymentViewModelBase with Store {
|
||||
return PaymentFlowResult.incompatible('Unable to detect address type');
|
||||
}
|
||||
|
||||
if (isEVMCompatibleChain(detectedWalletType!) && evm == null) {
|
||||
return PaymentFlowResult.incompatible(
|
||||
'Ethereum-compatible addresses are not supported in this app build.',
|
||||
);
|
||||
}
|
||||
|
||||
final currentWallet = appStore.wallet;
|
||||
|
||||
if (currentWallet != null &&
|
||||
currentWallet.type == detectedWalletType &&
|
||||
!isEVMCompatibleChain(detectedWalletType!)) {
|
||||
return PaymentFlowResult.currentWalletCompatible();
|
||||
return PaymentFlowResult.currentWalletCompatible(detectionResult);
|
||||
}
|
||||
|
||||
if (isEVMCompatibleChain(detectedWalletType!)) {
|
||||
@@ -106,7 +112,7 @@ abstract class PaymentViewModelBase with Store {
|
||||
|
||||
@action
|
||||
Future<void> selectChain() async {
|
||||
if (detectedWalletType == null) return;
|
||||
if (detectedWalletType == null || evm == null || detectedChainId == null) return;
|
||||
|
||||
final node =
|
||||
appStore.settingsStore.getCurrentNode(detectedWalletType!, chainId: detectedChainId);
|
||||
@@ -114,6 +120,13 @@ abstract class PaymentViewModelBase with Store {
|
||||
await evm!.selectChain(appStore.wallet!, detectedChainId!, node: node);
|
||||
}
|
||||
|
||||
void applyManualEvmSelection(AddressDetectionResult detection) {
|
||||
runInAction(() {
|
||||
_lastDetectionResult = detection;
|
||||
detectedWalletType = detection.detectedWalletType;
|
||||
});
|
||||
}
|
||||
|
||||
Future<List<WalletInfo>> getWalletsByType(WalletType walletType) async {
|
||||
return (await WalletInfo.getAll()).where((wallet) => wallet.type == walletType).toList();
|
||||
}
|
||||
@@ -155,7 +168,7 @@ class PaymentFlowResult {
|
||||
chainId = getChainIdByCryptoCurrency(addressDetectionResult.detectedCurrency!);
|
||||
}
|
||||
if (chainId == null && addressDetectionResult.detectedWalletType != null) {
|
||||
chainId = evm!.getChainIdByWalletType(addressDetectionResult.detectedWalletType!);
|
||||
chainId = evm?.getChainIdByWalletType(addressDetectionResult.detectedWalletType!);
|
||||
}
|
||||
|
||||
return PaymentFlowResult._(
|
||||
@@ -169,8 +182,12 @@ class PaymentFlowResult {
|
||||
}
|
||||
|
||||
/// Current wallet is compatible
|
||||
factory PaymentFlowResult.currentWalletCompatible() =>
|
||||
PaymentFlowResult._(type: PaymentFlowType.currentWalletCompatible);
|
||||
factory PaymentFlowResult.currentWalletCompatible(
|
||||
AddressDetectionResult addressDetectionResult) =>
|
||||
PaymentFlowResult._(
|
||||
type: PaymentFlowType.currentWalletCompatible,
|
||||
addressDetectionResult: addressDetectionResult,
|
||||
);
|
||||
|
||||
/// Single compatible wallet available
|
||||
factory PaymentFlowResult.singleWallet(
|
||||
@@ -181,8 +198,9 @@ class PaymentFlowResult {
|
||||
if (chainId == null && addressDetectionResult.detectedCurrency != null) {
|
||||
chainId = getChainIdByCryptoCurrency(addressDetectionResult.detectedCurrency!);
|
||||
}
|
||||
if (chainId == null) {
|
||||
chainId = evm!.getChainIdByWalletType(wallet.type);
|
||||
|
||||
if (chainId == null && isEVMCompatibleChain(wallet.type)) {
|
||||
chainId = evm?.getChainIdByWalletType(wallet.type);
|
||||
}
|
||||
|
||||
return PaymentFlowResult._(
|
||||
@@ -203,8 +221,8 @@ class PaymentFlowResult {
|
||||
if (chainId == null && addressDetectionResult.detectedCurrency != null) {
|
||||
chainId = getChainIdByCryptoCurrency(addressDetectionResult.detectedCurrency!);
|
||||
}
|
||||
if (chainId == null) {
|
||||
chainId = evm!.getChainIdByWalletType(wallets.first.type);
|
||||
if (chainId == null && isEVMCompatibleChain(wallets.first.type)) {
|
||||
chainId = evm?.getChainIdByWalletType(wallets.first.type);
|
||||
}
|
||||
|
||||
return PaymentFlowResult._(
|
||||
@@ -225,8 +243,8 @@ class PaymentFlowResult {
|
||||
if (chainId == null && addressDetectionResult.detectedCurrency != null) {
|
||||
chainId = getChainIdByCryptoCurrency(addressDetectionResult.detectedCurrency!);
|
||||
}
|
||||
if (chainId == null) {
|
||||
chainId = evm!.getChainIdByWalletType(walletType);
|
||||
if (chainId == null && isEVMCompatibleChain(walletType)) {
|
||||
chainId = evm?.getChainIdByWalletType(walletType);
|
||||
}
|
||||
|
||||
return PaymentFlowResult._(
|
||||
|
||||
Reference in New Issue
Block a user