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:
+15
-15
@@ -7,9 +7,9 @@ import 'package:hive/hive.dart';
|
||||
import 'order_provider_description.dart';
|
||||
import 'order_source_description.dart';
|
||||
|
||||
part 'order.g.dart';
|
||||
part 'order.part.dart';
|
||||
|
||||
@HiveType(typeId: Order.typeId)
|
||||
// @HiveType(typeId: Order.typeId)
|
||||
class Order extends HiveObject {
|
||||
Order({
|
||||
required this.id,
|
||||
@@ -37,45 +37,45 @@ class Order extends HiveObject {
|
||||
static const boxName = 'Orders';
|
||||
static const boxKey = 'ordersBoxKey';
|
||||
|
||||
@HiveField(0, defaultValue: '')
|
||||
// @HiveField(0, defaultValue: '')
|
||||
String id;
|
||||
|
||||
@HiveField(1, defaultValue: '')
|
||||
// @HiveField(1, defaultValue: '')
|
||||
String transferId;
|
||||
|
||||
@HiveField(2)
|
||||
// @HiveField(2)
|
||||
String? from;
|
||||
|
||||
@HiveField(3)
|
||||
// @HiveField(3)
|
||||
String? to;
|
||||
|
||||
@HiveField(4, defaultValue: '')
|
||||
// @HiveField(4, defaultValue: '')
|
||||
late String stateRaw;
|
||||
|
||||
TradeState get state => TradeState.deserialize(raw: stateRaw);
|
||||
|
||||
@HiveField(5)
|
||||
// @HiveField(5)
|
||||
DateTime createdAt;
|
||||
|
||||
@HiveField(6, defaultValue: '')
|
||||
// @HiveField(6, defaultValue: '')
|
||||
String amount;
|
||||
|
||||
@HiveField(7, defaultValue: '')
|
||||
// @HiveField(7, defaultValue: '')
|
||||
String receiveAddress;
|
||||
|
||||
@HiveField(8, defaultValue: '')
|
||||
// @HiveField(8, defaultValue: '')
|
||||
String walletId;
|
||||
|
||||
@HiveField(9, defaultValue: 0)
|
||||
// @HiveField(9, defaultValue: 0)
|
||||
late int providerRaw;
|
||||
|
||||
@HiveField(10, defaultValue: '')
|
||||
// @HiveField(10, defaultValue: '')
|
||||
String? receiveAmount;
|
||||
|
||||
@HiveField(11, defaultValue: 0)
|
||||
// @HiveField(11, defaultValue: 0)
|
||||
late int? sourceRaw;
|
||||
|
||||
@HiveField(12, defaultValue: '')
|
||||
// @HiveField(12, defaultValue: '')
|
||||
String? quantity;
|
||||
|
||||
OrderSourceDescription get source => OrderSourceDescription.deserialize(raw: sourceRaw ?? 0);
|
||||
|
||||
Reference in New Issue
Block a user