mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-28 06:28:41 +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:
@@ -176,28 +176,28 @@ jobs:
|
||||
'
|
||||
|
||||
# ---- Flutter, pinned -------------------------------------------------
|
||||
# Every other platform builds on 3.32.0: Linux and Android inside the
|
||||
# cake_wallet debian13-flutter3.32.0 image, iOS by installing it
|
||||
# Every other platform builds on 3.41.9: Linux and Android inside the
|
||||
# cake_wallet debian13-flutter3.41.9 image, iOS by installing it
|
||||
# explicitly. Windows was the one that took whatever the runner happened
|
||||
# to have, and on 2026-09-19 that was 3.38.5 / Dart 3.10.4. Dart 3.10
|
||||
# removed the _macros package, so `flutter pub get` could not solve
|
||||
# hive_generator against build_resolvers and the build died at exit 69
|
||||
# long before it compiled anything. A build machine's drifting toolchain
|
||||
# must not decide which dependencies resolve.
|
||||
- name: Require Flutter 3.32.0
|
||||
- name: Require Flutter 3.41.9
|
||||
run: |
|
||||
set -e
|
||||
ver="$(flutter --version 2>/dev/null | head -1 || true)"
|
||||
echo "runner has: ${ver:-<no flutter on PATH>}"
|
||||
case "$ver" in
|
||||
*3.32.0*) exit 0 ;;
|
||||
*3.41.9*) exit 0 ;;
|
||||
esac
|
||||
cat >&2 <<'MSG'
|
||||
|
||||
Refusing to build: this runner's Flutter is not the pinned 3.32.0.
|
||||
Refusing to build: this runner's Flutter is not the pinned 3.41.9.
|
||||
|
||||
Every other platform is pinned, Linux and Android by the
|
||||
cake_wallet debian13-flutter3.32.0 image and iOS by installing it,
|
||||
cake_wallet debian13-flutter3.41.9 image and iOS by installing it,
|
||||
so a drifted Windows SDK breaks this platform alone and does it
|
||||
during dependency resolution rather than at compile time.
|
||||
|
||||
@@ -289,8 +289,12 @@ jobs:
|
||||
echo "monero_c TAG: $MONERO_C_TAG"
|
||||
mkdir -p "scripts/monero_c/release/$MONERO_C_TAG"
|
||||
pushd "scripts/monero_c/release/$MONERO_C_TAG"
|
||||
curl -fsSL -O https://github.com/MrCyjaneK/monero_c/releases/download/v0.18.4.6-RC1/release-bundle.zip
|
||||
curl -fsSL -O https://github.com/MrCyjaneK/monero_c/releases/download/v0.18.4.6-RC2/release-bundle.zip
|
||||
unzip -q release-bundle.zip
|
||||
# RC2 nests everything under an inner v0.18.4.6-*/ dir; strip it.
|
||||
shopt -s nullglob
|
||||
for inner in v0.18.4.6-*/; do mv "$inner"* . && rmdir "$inner"; done
|
||||
shopt -u nullglob
|
||||
rm release-bundle.zip
|
||||
echo "=== bundle contents (top level) ==="
|
||||
ls
|
||||
|
||||
Reference in New Issue
Block a user