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:
+21
-9
@@ -1,17 +1,29 @@
|
||||
#!/bin/bash
|
||||
set -x -e
|
||||
cd $(dirname $0)
|
||||
set -e
|
||||
cd "$(dirname "$0")"
|
||||
cd ..
|
||||
|
||||
for i in cw_core cw_monero cw_wownero cw_bitcoin cw_bitcoin_cash cw_dogecoin cw_evm cw_nano;
|
||||
do
|
||||
dart fix --apply $i/
|
||||
dart format --line-length=100 $i/
|
||||
if [[ ! "x$ABORT_ON_CHANGE" == "x" ]];
|
||||
then
|
||||
if [[ ! -z "$(git status --porcelain -- $(find $i))" ]];
|
||||
then
|
||||
echo "Please run scripts/lint.sh ($i has changes)"
|
||||
{
|
||||
# files modified after the lints got enabled and committed
|
||||
git log --since="2026-07-14 23:59:59" --name-only --diff-filter=d --format="" -- "$i"
|
||||
# uncommitted files (assumed to have been modified after the 29th)
|
||||
git diff --name-only --diff-filter=d HEAD -- "$i"
|
||||
} | grep '\.dart$' | sort -u | while IFS= read -r file; do
|
||||
echo $file
|
||||
if [[ -f "$file" ]]; then
|
||||
dart fix --apply "$file" && dart format --line-length=100 "$file"
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ -n "$ABORT_ON_CHANGE" ]]; then
|
||||
DART_CHANGES=$(git status --porcelain -- "$i" | grep '\.dart$' || true)
|
||||
|
||||
if [[ -n "$DART_CHANGES" ]]; then
|
||||
echo "Please run scripts/lint.sh"
|
||||
echo "changes in $i:"
|
||||
echo "$DART_CHANGES"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user