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:
@@ -22,8 +22,6 @@ migrate_working_dir/
|
||||
#.vscode/
|
||||
|
||||
# Flutter/Dart/Pub related
|
||||
# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
|
||||
/pubspec.lock
|
||||
**/doc/api/
|
||||
.dart_tool/
|
||||
.flutter-plugins
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
include: package:flutter_lints/flutter.yaml
|
||||
|
||||
# Additional information about this file can be found at
|
||||
# https://dart.dev/guides/language/analysis-options
|
||||
@@ -54,8 +54,10 @@ abstract class DogeCoinWalletBase extends ElectrumWallet with Store {
|
||||
initialAddresses: initialAddresses,
|
||||
initialRegularAddressIndex: initialRegularAddressIndex,
|
||||
initialChangeAddressIndex: initialChangeAddressIndex,
|
||||
mainHdByType: mainHdByType,
|
||||
sideHdByType: sideHdByType,
|
||||
mainHdByTypeAndAccount: mainHdByTypeAndAccount,
|
||||
sideHdByTypeAndAccount: sideHdByTypeAndAccount,
|
||||
accountIndexes: [currentAccountIndex],
|
||||
currentAccountIndex: currentAccountIndex,
|
||||
legacyMainHd: mainHd,
|
||||
legacySideHd: sideHd,
|
||||
network: network,
|
||||
@@ -68,7 +70,7 @@ abstract class DogeCoinWalletBase extends ElectrumWallet with Store {
|
||||
}
|
||||
|
||||
@override
|
||||
int get networkDustAmount => 100000000; // 1 DOGE = 1e8 koinu
|
||||
BigInt get networkDustAmount => BigInt.from(100000000); // 1 DOGE = 1e8 koinu
|
||||
|
||||
static int estimatedDogeCoinTransactionSize(int inputsCount, int outputsCounts) =>
|
||||
inputsCount * 180 + outputsCounts * 34 + 10;
|
||||
|
||||
@@ -13,8 +13,10 @@ class DogeCoinWalletAddresses = DogeCoinWalletAddressesBase with _$DogeCoinWalle
|
||||
abstract class DogeCoinWalletAddressesBase extends ElectrumWalletAddresses with Store {
|
||||
DogeCoinWalletAddressesBase(
|
||||
WalletInfo walletInfo, {
|
||||
required super.mainHdByType,
|
||||
required super.sideHdByType,
|
||||
required super.mainHdByTypeAndAccount,
|
||||
required super.sideHdByTypeAndAccount,
|
||||
required super.accountIndexes,
|
||||
required super.currentAccountIndex,
|
||||
required super.legacyMainHd,
|
||||
required super.legacySideHd,
|
||||
required super.network,
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:bip39/bip39.dart';
|
||||
import 'package:collection/collection.dart';
|
||||
import 'package:cw_bitcoin/bitcoin_mnemonics_bip39.dart';
|
||||
import 'package:cw_core/encryption_file_utils.dart';
|
||||
import 'package:cw_core/pathForWallet.dart';
|
||||
import 'package:cw_core/unspent_coins_info.dart';
|
||||
import 'package:cw_core/wallet_base.dart';
|
||||
import 'package:cw_core/wallet_info.dart';
|
||||
import 'package:cw_core/wallet_service.dart';
|
||||
import 'package:cw_core/wallet_type.dart';
|
||||
@@ -100,29 +98,6 @@ class DogeCoinWalletService extends WalletService<
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> rename(String currentName, String password, String newName) async {
|
||||
final currentWalletInfo = await WalletInfo.get(currentName, getType());
|
||||
if (currentWalletInfo == null) {
|
||||
throw Exception('Wallet not found');
|
||||
}
|
||||
final currentWallet = await DogeCoinWalletBase.open(
|
||||
password: password,
|
||||
name: currentName,
|
||||
walletInfo: currentWalletInfo,
|
||||
unspentCoinsInfo: unspentCoinsInfoSource,
|
||||
encryptionFileUtils: encryptionFileUtilsFor(isDirect));
|
||||
|
||||
await currentWallet.renameWalletFiles(newName);
|
||||
await saveBackup(newName);
|
||||
|
||||
final newWalletInfo = currentWalletInfo;
|
||||
newWalletInfo.id = WalletBase.idFor(newName, getType());
|
||||
newWalletInfo.name = newName;
|
||||
|
||||
await newWalletInfo.save();
|
||||
}
|
||||
|
||||
@override
|
||||
Future<DogeCoinWallet> restoreFromHardwareWallet(DogeCoinNewWalletCredentials credentials) {
|
||||
throw UnimplementedError(
|
||||
|
||||
@@ -15,8 +15,8 @@ dependencies:
|
||||
bip39: ^1.0.6
|
||||
bip32: ^2.0.0
|
||||
path_provider: ^2.0.11
|
||||
mobx: ^2.0.7+4
|
||||
flutter_mobx: ^2.0.6+1
|
||||
mobx: ^2.6.0
|
||||
flutter_mobx: ^2.3.0
|
||||
cw_core:
|
||||
path: ../cw_core
|
||||
cw_bitcoin:
|
||||
@@ -25,21 +25,22 @@ dependencies:
|
||||
blockchain_utils:
|
||||
git:
|
||||
url: https://github.com/cake-tech/blockchain_utils
|
||||
ref: cake-update-v2
|
||||
ref: 59fdf29d72068e0522a96a8953ed7272833a9f57
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
sdk: flutter
|
||||
build_runner: ^2.4.15
|
||||
mobx_codegen: ^2.0.7
|
||||
hive_generator: ^2.0.1
|
||||
build_runner: ^2.15.0
|
||||
mobx_codegen: ^2.7.7
|
||||
# hive_generator: ^2.0.1
|
||||
hive: 2.0.1
|
||||
|
||||
dependency_overrides:
|
||||
watcher: ^1.1.0
|
||||
bitcoin_base:
|
||||
git:
|
||||
url: https://github.com/cake-tech/bitcoin_base
|
||||
ref: cake-update-v11
|
||||
ref: 4e41f96f4838139895c65c3f49109d05af5d46aa
|
||||
|
||||
|
||||
# For information on the generic Dart part of this file, see the
|
||||
|
||||
+1
@@ -0,0 +1 @@
|
||||
../pubspec_overrides.yaml
|
||||
Reference in New Issue
Block a user