mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-11-01 07:04:08 +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:
@@ -1,3 +1,3 @@
|
||||
FROM --platform=linux/amd64 ghcr.io/cake-tech/cake_wallet:debian13-flutter3.32.0-ndkr28-go1.24.1-ruststablenightly
|
||||
FROM --platform=linux/amd64 ghcr.io/cake-tech/cake_wallet:debian13-flutter3.41.9-ndkr28-go1.24.1-ruststablenightly
|
||||
|
||||
WORKDIR /w
|
||||
|
||||
@@ -1,9 +1,23 @@
|
||||
ARG BASE_IMAGE
|
||||
FROM --platform=linux/amd64 ${BASE_IMAGE} AS build
|
||||
|
||||
RUN mkdir -p /w/scripts/android
|
||||
COPY scripts/functions.sh /w/scripts/functions.sh
|
||||
COPY scripts/prepare_moneroc.sh /w/scripts/prepare_moneroc.sh
|
||||
COPY scripts/android/build_monero_all.sh /w/scripts/android/build_monero_all.sh
|
||||
|
||||
ARG UID=10001
|
||||
ARG GID=10001
|
||||
ARG USER=builder
|
||||
RUN groupadd -g "$GID" "$USER" && \
|
||||
useradd -m -u "$UID" -g "$GID" -s /bin/bash "$USER"
|
||||
|
||||
RUN sudo chown $UID:$GID -R /w /root
|
||||
USER builder
|
||||
|
||||
ARG COIN
|
||||
ARG TARGET
|
||||
ENV COIN=$COIN
|
||||
ENV TARGET=$TARGET
|
||||
RUN /w/scripts/android/build_monero_all.sh \
|
||||
&& rm -rf /w/scripts/monero_c/contrib \
|
||||
/w/scripts/monero_c/.git \
|
||||
|
||||
@@ -3,6 +3,8 @@ FROM --platform=linux/amd64 ${BASE_IMAGE} AS build
|
||||
|
||||
RUN mkdir -p /w/scripts/android
|
||||
COPY pubspec_base.yaml /w/pubspec.yaml
|
||||
COPY pubspec_overrides.yaml /w/pubspec_overrides.yaml
|
||||
COPY pubspec_overrides.yaml /w/cw_mweb/pubspec_overrides.yaml
|
||||
COPY cw_mweb/pubspec.yaml /w/cw_mweb/pubspec.yaml
|
||||
COPY cw_mweb/ffigen_config.yaml /w/cw_mweb/ffigen_config.yaml
|
||||
COPY cw_mweb/go /w/cw_mweb/go
|
||||
|
||||
@@ -4,6 +4,7 @@ FROM --platform=linux/amd64 ${BASE_IMAGE} AS build
|
||||
RUN mkdir -p /w/scripts/android
|
||||
COPY scripts/prepare_reown.sh /w/scripts/prepare_reown.sh
|
||||
COPY scripts/android/build_reown_deps.sh /w/scripts/android/build_reown_deps.sh
|
||||
RUN cd $(dirname $(which flutter)) && git checkout 3.32.0
|
||||
RUN /w/scripts/android/build_reown_deps.sh \
|
||||
&& rm -rf /w/scripts/reown_flutter/packages/reown_core/.dart_tool \
|
||||
&& rm -rf /w/scripts/reown_flutter/packages/reown_sign/.dart_tool \
|
||||
|
||||
@@ -4,7 +4,22 @@ FROM --platform=linux/amd64 ${BASE_IMAGE} AS build
|
||||
|
||||
COPY scripts/prepare_torch.sh /w/scripts/prepare_torch.sh
|
||||
COPY scripts/android/build_torch.sh /w/scripts/android/build_torch.sh
|
||||
RUN /w/scripts/android/build_torch.sh && rm -rf /w/scripts/torch_dart/simplybs
|
||||
ARG UID=10001
|
||||
ARG GID=10001
|
||||
ARG USER=builder
|
||||
RUN groupadd -g "$GID" "$USER" && \
|
||||
useradd -m -u "$UID" -g "$GID" -s /bin/bash "$USER"
|
||||
|
||||
RUN sudo chown $UID:$GID -R /w /root
|
||||
USER builder
|
||||
|
||||
ARG TARGET
|
||||
RUN if [ -n "$TARGET" ]; then \
|
||||
/w/scripts/android/build_torch.sh "$TARGET"; \
|
||||
else \
|
||||
/w/scripts/android/build_torch.sh; \
|
||||
fi \
|
||||
&& rm -rf /w/scripts/torch_dart/simplybs
|
||||
|
||||
FROM --platform=linux/amd64 alpine
|
||||
COPY --from=build /w /w
|
||||
|
||||
Reference in New Issue
Block a user