mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-27 06:18:50 +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:
@@ -40,11 +40,11 @@ jobs:
|
||||
# carry the `ubuntu-latest` label, so this works on either platform.
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
# Cake Labs' prebuilt build image with Flutter 3.32.0, Go 1.24.1, NDK r28,
|
||||
# Cake Labs' prebuilt build image with Flutter 3.41.9, Go 1.24.1, NDK r28,
|
||||
# Rust nightly, and all the C++ build deps (boost, openssl, libsodium,
|
||||
# libzmq, unbound, icu) preinstalled. Saves us from doing the simplybs
|
||||
# source-bootstrap dance that ate 9GB on jw-laptop.
|
||||
image: ghcr.io/cake-tech/cake_wallet:debian13-flutter3.32.0-ndkr28-go1.24.1-ruststablenightly
|
||||
image: ghcr.io/cake-tech/cake_wallet:debian13-flutter3.41.9-ndkr28-go1.24.1-ruststablenightly
|
||||
env:
|
||||
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
|
||||
# cake_wallet build profile name, retained from upstream — internal
|
||||
@@ -122,8 +122,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"
|
||||
wget -q https://github.com/MrCyjaneK/monero_c/releases/download/v0.18.4.6-RC1/release-bundle.zip
|
||||
wget -q 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
|
||||
ls x86_64-linux-gnu/
|
||||
popd
|
||||
@@ -205,7 +209,7 @@ jobs:
|
||||
awk -F"'" '/^const (trocador[A-Za-z]*) = / { split($1, a, " "); v = (length($2) ? "set (" length($2) " chars)" : "EMPTY"); print a[2] ": " v }' lib/.secrets.g.dart # lengths only; values never reach the log
|
||||
|
||||
# Initialize Flutter SDK once before parallel-ish work happens. flutter
|
||||
# precache for Flutter 3.32.0 hits a 404 on flutter_gpu.zip (asset not
|
||||
# precache for Flutter 3.41.9 hits a 404 on flutter_gpu.zip (asset not
|
||||
# actually published at the path Flutter constructs); the `|| true`
|
||||
# absorbs that — desktop Linux build doesn't need flutter_gpu.
|
||||
- name: Initialize Flutter SDK
|
||||
|
||||
Reference in New Issue
Block a user