mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-29 06:38:45 +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:
jwinterm
@@ -0,0 +1,215 @@
|
||||
import "package:hash_wallet/core/key_service.dart";
|
||||
import "package:hash_wallet/core/trade_monitor.dart";
|
||||
import "package:hash_wallet/store/anonpay/anonpay_transactions_store.dart";
|
||||
import "package:hash_wallet/store/app_store.dart";
|
||||
import "package:hash_wallet/store/dashboard/order_filter_store.dart";
|
||||
import "package:hash_wallet/store/dashboard/orders_store.dart";
|
||||
import "package:hash_wallet/store/dashboard/payjoin_transactions_store.dart";
|
||||
import "package:hash_wallet/store/dashboard/trade_filter_store.dart";
|
||||
import "package:hash_wallet/store/dashboard/trades_store.dart";
|
||||
import "package:hash_wallet/store/dashboard/transaction_filter_store.dart";
|
||||
import "package:hash_wallet/store/settings_store.dart";
|
||||
import "package:hash_wallet/view_model/dashboard/balance_view_model.dart";
|
||||
import "package:hash_wallet/view_model/dashboard/dashboard_view_model.dart";
|
||||
import "package:hash_wallet/wownero/wownero.dart" as wow;
|
||||
import "package:cw_core/account.dart";
|
||||
import "package:cw_core/balance.dart";
|
||||
import "package:cw_core/balance_card_style_settings.dart";
|
||||
import "package:cw_core/crypto_currency.dart";
|
||||
import "package:cw_core/db/sqlite.dart" as sqlite;
|
||||
import "package:cw_core/transaction_history.dart";
|
||||
import "package:cw_core/transaction_info.dart";
|
||||
import "package:cw_core/wallet_base.dart";
|
||||
import "package:cw_core/wallet_info.dart";
|
||||
import "package:cw_core/wallet_type.dart";
|
||||
import "package:flutter_test/flutter_test.dart";
|
||||
import "package:mobx/mobx.dart" show ObservableList, ObservableMap;
|
||||
import "package:mocktail/mocktail.dart";
|
||||
import "package:shared_preferences/shared_preferences.dart";
|
||||
import "package:sqflite_common_ffi/sqflite_ffi.dart";
|
||||
|
||||
class _MockBalanceViewModel extends Mock implements BalanceViewModel {}
|
||||
|
||||
class _MockTradeMonitor extends Mock implements TradeMonitor {}
|
||||
|
||||
class _MockAppStore extends Mock implements AppStore {}
|
||||
|
||||
class _MockTradesStore extends Mock implements TradesStore {}
|
||||
|
||||
class _MockTradeFilterStore extends Mock implements TradeFilterStore {}
|
||||
|
||||
class _MockOrderFilterStore extends Mock implements OrderFilterStore {}
|
||||
|
||||
class _MockTransactionFilterStore extends Mock implements TransactionFilterStore {}
|
||||
|
||||
class _MockSettingsStore extends Mock implements SettingsStore {}
|
||||
|
||||
class _MockOrdersStore extends Mock implements OrdersStore {}
|
||||
|
||||
class _MockAnonpayTransactionsStore extends Mock implements AnonpayTransactionsStore {}
|
||||
|
||||
class _MockPayjoinTransactionsStore extends Mock implements PayjoinTransactionsStore {}
|
||||
|
||||
class _MockKeyService extends Mock implements KeyService {}
|
||||
|
||||
class _MockWallet extends Mock
|
||||
implements WalletBase<Balance, TransactionHistoryBase<TransactionInfo>, TransactionInfo> {}
|
||||
|
||||
class _MockWalletInfo extends Mock implements WalletInfo {}
|
||||
|
||||
class _MockTransactionHistory extends Mock implements TransactionHistoryBase<TransactionInfo> {}
|
||||
|
||||
class _MockWownero extends Mock implements wow.Wownero {}
|
||||
|
||||
class _MockWowneroAccountList extends Mock implements wow.WowneroAccountList {}
|
||||
|
||||
class _MockWowneroWalletDetails extends Mock implements wow.WowneroWalletDetails {}
|
||||
|
||||
class _MockWowneroBalance extends Mock implements wow.WowneroBalance {}
|
||||
|
||||
class _DashboardViewModelProbe extends DashboardViewModelBase {
|
||||
_DashboardViewModelProbe({
|
||||
required super.balanceViewModel,
|
||||
required super.accountListViewModelFactory,
|
||||
required super.tradeMonitor,
|
||||
required super.appStore,
|
||||
required super.tradesStore,
|
||||
required super.tradeFilterStore,
|
||||
required super.orderFilterStore,
|
||||
required super.transactionFilterStore,
|
||||
required super.settingsStore,
|
||||
required super.ordersStore,
|
||||
required super.anonpayTransactionsStore,
|
||||
required super.payjoinTransactionsStore,
|
||||
required super.sharedPreferences,
|
||||
required super.keyService,
|
||||
});
|
||||
|
||||
bool _loadRealCards = false;
|
||||
|
||||
void enableRealCardLoading() => _loadRealCards = true;
|
||||
|
||||
@override
|
||||
void loadFilterItems() {}
|
||||
|
||||
@override
|
||||
Future<void> loadCardDesigns() => _loadRealCards ? super.loadCardDesigns() : Future<void>.value();
|
||||
|
||||
@override
|
||||
Future<bool> isBackgroundSyncEnabled() async => false;
|
||||
|
||||
@override
|
||||
Future<bool> isBatteryOptimizationEnabled() async => false;
|
||||
}
|
||||
|
||||
void main() {
|
||||
late DatabaseFactory? originalDatabaseFactory;
|
||||
late Database? originalDatabase;
|
||||
late wow.Wownero? originalWownero;
|
||||
|
||||
setUpAll(() {
|
||||
originalDatabaseFactory = databaseFactoryOrNull;
|
||||
sqfliteFfiInit();
|
||||
databaseFactory = databaseFactoryFfi;
|
||||
});
|
||||
|
||||
tearDownAll(() {
|
||||
databaseFactoryOrNull = originalDatabaseFactory;
|
||||
});
|
||||
|
||||
setUp(() async {
|
||||
originalDatabase = sqlite.db;
|
||||
originalWownero = wow.wownero;
|
||||
sqlite.db = await databaseFactory.openDatabase(inMemoryDatabasePath);
|
||||
await sqlite.db!.execute("""
|
||||
CREATE TABLE ${BalanceCardStyleSettings.tableName} (
|
||||
walletInfoId INTEGER,
|
||||
accountIndex INTEGER DEFAULT -1,
|
||||
gradientIndex INTEGER DEFAULT -1,
|
||||
useSpecialDesign BOOLEAN DEFAULT FALSE,
|
||||
hidden BOOLEAN DEFAULT FALSE,
|
||||
backgroundImagePath TEXT DEFAULT "",
|
||||
iconStyleIndex INTEGER DEFAULT 0,
|
||||
isGradientOnly BOOLEAN DEFAULT FALSE,
|
||||
cardOrder INTEGER DEFAULT 0,
|
||||
PRIMARY KEY (walletInfoId, accountIndex)
|
||||
)
|
||||
""");
|
||||
});
|
||||
|
||||
tearDown(() async {
|
||||
wow.wownero = originalWownero;
|
||||
await sqlite.db?.close();
|
||||
sqlite.db = originalDatabase;
|
||||
});
|
||||
|
||||
test("Wownero keeps every account card and maps the selected account", () async {
|
||||
SharedPreferences.setMockInitialValues(<String, Object>{});
|
||||
final sharedPreferences = await SharedPreferences.getInstance();
|
||||
final wallet = _MockWallet();
|
||||
final walletInfo = _MockWalletInfo();
|
||||
final transactionHistory = _MockTransactionHistory();
|
||||
final appStore = _MockAppStore();
|
||||
final settingsStore = _MockSettingsStore();
|
||||
final tradesStore = _MockTradesStore();
|
||||
final tradeMonitor = _MockTradeMonitor();
|
||||
final wowneroAdapter = _MockWownero();
|
||||
final accountList = _MockWowneroAccountList();
|
||||
final walletDetails = _MockWowneroWalletDetails();
|
||||
final wowneroBalance = _MockWowneroBalance();
|
||||
final accounts = ObservableList.of(<Account>[
|
||||
Account(id: 0, label: "Primary", balance: "1.0"),
|
||||
Account(id: 1, label: "Savings", balance: "2.0"),
|
||||
]);
|
||||
|
||||
wow.wownero = wowneroAdapter;
|
||||
when(() => appStore.wallet).thenReturn(wallet);
|
||||
when(() => wallet.hasNativeAccounts).thenReturn(true);
|
||||
when(() => wallet.name).thenReturn("Wownero Wallet");
|
||||
when(() => wallet.id).thenReturn("wownero-wallet");
|
||||
when(() => wallet.type).thenReturn(WalletType.wownero);
|
||||
when(() => wallet.currency).thenReturn(CryptoCurrency.wow);
|
||||
when(() => wallet.walletInfo).thenReturn(walletInfo);
|
||||
when(() => walletInfo.internalId).thenReturn(42);
|
||||
when(() => walletInfo.showSeedBackupReminder).thenReturn(false);
|
||||
when(() => wallet.transactionHistory).thenReturn(transactionHistory);
|
||||
when(() => transactionHistory.transactions)
|
||||
.thenReturn(ObservableMap<String, TransactionInfo>());
|
||||
when(() => wowneroAdapter.getAccountList(wallet)).thenReturn(accountList);
|
||||
when(() => accountList.accounts).thenReturn(accounts);
|
||||
when(() => wowneroAdapter.getCurrentAccount(wallet)).thenReturn(accounts[1]);
|
||||
when(() => wowneroAdapter.getWowneroWalletDetails(wallet)).thenReturn(walletDetails);
|
||||
when(() => walletDetails.account).thenReturn(accounts[1]);
|
||||
when(() => walletDetails.balance).thenReturn(wowneroBalance);
|
||||
when(() => settingsStore.mwebAlwaysScan).thenReturn(false);
|
||||
when(() => tradesStore.trades).thenReturn(const []);
|
||||
when(() => tradeMonitor.monitorActiveTrades(any())).thenReturn(null);
|
||||
|
||||
final viewModel = _DashboardViewModelProbe(
|
||||
balanceViewModel: _MockBalanceViewModel(),
|
||||
accountListViewModelFactory: () => null,
|
||||
tradeMonitor: tradeMonitor,
|
||||
appStore: appStore,
|
||||
tradesStore: tradesStore,
|
||||
tradeFilterStore: _MockTradeFilterStore(),
|
||||
orderFilterStore: _MockOrderFilterStore(),
|
||||
transactionFilterStore: _MockTransactionFilterStore(),
|
||||
settingsStore: settingsStore,
|
||||
ordersStore: _MockOrdersStore(),
|
||||
anonpayTransactionsStore: _MockAnonpayTransactionsStore(),
|
||||
payjoinTransactionsStore: _MockPayjoinTransactionsStore(),
|
||||
sharedPreferences: sharedPreferences,
|
||||
keyService: _MockKeyService(),
|
||||
);
|
||||
|
||||
expect(viewModel.cardAccountIndices, <int>[0, 1]);
|
||||
expect(viewModel.currentCardAccountIndex, 1);
|
||||
|
||||
viewModel.enableRealCardLoading();
|
||||
await viewModel.loadCardDesigns();
|
||||
|
||||
expect(viewModel.cardOrder, <int, int>{0: 0, 1: 1});
|
||||
expect(viewModel.cardDesigns, hasLength(2));
|
||||
expect(viewModel.currentCardDesign, same(viewModel.cardDesigns[1]));
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user