Merge pull request #2678 from SatoshiPortal/develop

v6.13.0

Author: ethicnology

.dockerignore

@@ -20,3 +20,42 @@ app-*.aab
 .tmp_apk_diff/
 reproducibility/bullbitcoin_*_verification/
 reproducibility/reproducibility_test_*/
+
+# Secrets — must never enter a build image layer, even one that's later
+# deleted (secrets baked into an intermediate layer persist in the image
+# cache/registry history). .gitignore already excludes these from commits;
+# .dockerignore does not inherit .gitignore, so they need their own entries.
+# NOTE: dockerignore patterns follow Go filepath.Match, NOT gitignore: a bare
+# `*.keystore` matches only at the context root, so nested paths need `**/`.
+# Two keystores are re-included below (the `!` lines): debug.keystore for
+# debug/local builds, and beta-upload.keystore so build.gradle can sign the beta
+# channel inside the image — the CI runner is already the secret boundary there.
+# android/key-beta.properties is not matched by any exclude here, so it too
+# stays available for beta signing. Everything else keeps secrets out of layers.
+**/.env
+android/key.properties
+**/*.keystore
+**/*.jks
+!android/app/debug.keystore
+!android/app/beta-upload.keystore
+
+# Stale host-generated code. Most of these are gitignored and regenerated inside
+# the image by `make build-runner` / `make translations`; .dockerignore doesn't
+# inherit .gitignore, so without these entries a locally generated (and possibly
+# stale) file gets COPYed in ahead of the in-image regeneration. (`**/*.g.dart`
+# also matches one tracked file, packages/bull_ui_catalogue/lib/main.directories.g.dart,
+# but that's a widgetbook-catalogue artifact the app APK build never uses, so
+# excluding it from the build context is harmless.)
+lib/generated/
+**/*.freezed.dart
+**/*.g.dart
+untranslated-messages.txt
+integration_test/all_test.dart
+
+# Editor/scratch/log artifacts irrelevant to the build
+**/*.swp
+bull_logs.tsv
+
+# Host-extracted build artifacts that don't match the BULL-*.apk/aab globs
+# above (e.g. verification-workflow output named without an extension)
+BULL-release-*

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.44.2"
+  "flutter": "3.44.9"
 }

.git-blame-ignore-revs

@@ -0,0 +1,6 @@
+# Revisions listed here are skipped by `git blame`.
+# Configure once locally:  git config blame.ignoreRevsFile .git-blame-ignore-revs
+# GitHub honors this file automatically in its blame UI.
+
+# style: apply Dart tall-style formatter across the codebase (Dart 3.7+ tall style)
+9c1106069896c703b6a99816218c35bad36e2eac

.git_hooks/pre-commit

@@ -34,7 +34,8 @@ if echo "$staged" | grep -q '\.dart$'; then
   # Run analyze and dart fix in parallel; they are independent read-only checks.
   analyzeOut="$(mktemp)"
   fixOut="$(mktemp)"
-  trap 'rm -f "$analyzeOut" "$fixOut"' EXIT
+  fmtOut="$(mktemp)"
+  trap 'rm -f "$analyzeOut" "$fixOut" "$fmtOut"' EXIT
 
   start=$SECONDS
 
@@ -44,10 +45,26 @@ if echo "$staged" | grep -q '\.dart$'; then
   $DART fix --dry-run >"$fixOut" 2>&1 &
   fixPid=$!
 
+  # Format check on staged Dart source only (check-only, like analyze/fix
+  # above — never rewrites the working tree). Generated files are excluded so
+  # regenerated output can't fail the commit: by suffix and by /generated/
+  # path segment (drift schema snapshots). `dart format` ignores the analyzer's
+  # `exclude:`, so the filter lives here — keep the regex in sync with the
+  # format-check target in the makefile (which CI invokes). xargs -r no-ops when
+  # the staged set is all-generated. Exits non-zero if any staged file is
+  # unformatted.
+  # $DART is intentionally unquoted: the fallback sets DART="fvm dart" (two
+  # words), and quoting it makes xargs exec a literal binary named "fvm dart"
+  # (exit 127). Word splitting here matches the `$DART fix` call above.
+  echo "$staged" | grep '\.dart$' | grep -vE '\.(g|freezed|gr|config|mocks|steps)\.dart$|/generated/' \
+    | xargs -r $DART format --output=none --set-exit-if-changed >"$fmtOut" 2>&1 &
+  fmtPid=$!
+
   wait $analyzePid; analyzeExit=$?
   wait $fixPid;     fixExit=$?
+  wait $fmtPid;     fmtExit=$?
 
-  echo "analyze + dart fix took $((SECONDS - start))s (parallel)"
+  echo "analyze + dart fix + format took $((SECONDS - start))s (parallel)"
 
   if [ $analyzeExit -ne 0 ]; then
     cat "$analyzeOut"
@@ -60,8 +77,14 @@ if echo "$staged" | grep -q '\.dart$'; then
     echo "dart fix has suggestions, run \`dart fix --apply\` and commit the result."
     exit 1
   fi
+
+  if [ $fmtExit -ne 0 ]; then
+    cat "$fmtOut"
+    echo "dart format found unformatted staged files, run \`dart format .\` and commit the result."
+    exit 1
+  fi
 else
-  echo "No Dart/pub files staged — skipping analyze + dart fix."
+  echo "No Dart/pub files staged — skipping analyze + dart fix + format."
 fi
 
 # bull_ui import boundary: feature UI built on the design system must import

.github/actions/flutter-setup/action.yml

@@ -0,0 +1,118 @@
+# Shared Flutter toolchain setup for the analyze_and_test jobs. Both jobs pay
+# this prefix (checks needs generated code for analyze/tests; integration needs
+# it to build the app), so it lives here to keep the two copies from drifting.
+#
+# Cache notes: keys derive from lockfiles, so they self-invalidate when deps
+# change. When both parallel jobs miss the same key (lockfile just changed),
+# both build and both try to save — the first save wins, the second logs a
+# benign "cache already exists" warning. No restore-keys on the pub cache on
+# purpose: it holds the bull_sdk git clone, and a fuzzy fallback can restore a
+# checkout from an OLDER lock whose pinned commit differs; pub then resolves
+# against that stale clone and `pub get --enforce-lockfile` fails wanting to
+# drop deps. The exact key already pins the commit via pubspec.lock.
+name: Flutter setup
+description: FVM + pub caches, FVM install, deps, build_runner, translations
+
+inputs:
+  cargo-cache:
+    description: Also restore the Cargo cache (only the integration job compiles the FRB native crates)
+    required: false
+    default: 'false'
+
+runs:
+  using: composite
+  steps:
+    # runner.arch is in the FVM key because the SDK is native binaries — an
+    # x64 SDK restored on an arm64 runner is broken. pub/cargo caches hold
+    # sources only (arch-independent), so they keep os-only keys and stay
+    # shared across arches.
+    - name: Cache Flutter SDK (FVM)
+      uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+      with:
+        path: ~/fvm/versions
+        key: fvm-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.fvmrc') }}
+
+    - name: Cache pub (hosted + git deps)
+      uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+      with:
+        path: ~/.pub-cache
+        key: pub-${{ runner.os }}-${{ hashFiles('pubspec.lock') }}
+
+    - name: Cache Cargo (FRB native crates)
+      if: ${{ inputs.cargo-cache == 'true' }}
+      uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+      with:
+        path: |
+          ~/.cargo/registry
+          ~/.cargo/git
+        key: cargo-${{ runner.os }}-${{ hashFiles('pubspec.lock') }}
+        restore-keys: cargo-${{ runner.os }}-
+
+    - name: Install FVM
+      shell: bash
+      run: |
+        case "$(uname -m)" in
+          x86_64) fvm_arch=x64 ;;
+          aarch64|arm64) fvm_arch=arm64 ;;
+          *) echo "Unsupported FVM architecture: $(uname -m)" >&2; exit 1 ;;
+        esac
+        archive="$RUNNER_TEMP/fvm-4.1.2-linux-${fvm_arch}.tar.gz"
+        curl --retry 5 --retry-all-errors -fL \
+          "https://github.com/conceptadev/fvm/releases/download/4.1.2/fvm-4.1.2-linux-${fvm_arch}.tar.gz" \
+          -o "$archive"
+        mkdir -p "$HOME/fvm/bin"
+        # Extract the whole tree, not just `fvm/fvm`: the two release archives
+        # have different layouts. x64 ships a self-contained binary, arm64 a
+        # launcher script that execs `src/dart` relative to its own directory —
+        # unpacking the launcher alone yields `exec: .../src/dart: not found`
+        # on every fvm invocation.
+        tar -xzf "$archive" -C "$HOME/fvm/bin" --strip-components=1
+        chmod +x "$HOME/fvm/bin/fvm"
+        if [ -f "$HOME/fvm/bin/src/dart" ]; then
+          chmod +x "$HOME/fvm/bin/src/dart"
+        fi
+        # Prove the launcher actually runs before anything depends on it.
+        "$HOME/fvm/bin/fvm" --version
+        echo "$HOME/fvm/bin" >> $GITHUB_PATH
+
+    - name: Check Flutter version
+      shell: bash
+      run: make fvm-check
+
+    - name: Get dependencies
+      shell: bash
+      run: make deps
+
+    # build_runner's incremental cache — RESTORE ONLY. PR jobs never save (a sha-keyed save per push would blow the 10GB repo cache quota and evict the FVM/pub/cargo caches); only the cache-warmer workflow saves, on develop pushes, so all PRs restore develop's latest warm snapshot.
+    # ALL gitignored generated source files are cached alongside .dart_tool/build so the restored state is self-consistent (outputs present + asset graph present); build_runner hashes inputs itself and regenerates what changed.
+    # The suffix list MUST cover every gitignored to-source output: build_runner trusts .dart_tool/build and will NOT regenerate an output whose file is missing from disk (it reports "N skipped"), so a suffix left out here is silently absent after restore and breaks the build — that is how the missing assets.gen.dart (flutter_gen, *.gen.dart ≠ *.g.dart) incident happened.
+    # *.gr.dart / *.config.dart match nothing today but are pre-listed to mirror the format-filter regex (makefile format-check), so adding auto_route/injectable later cannot reproduce the incident; *.steps.dart is deliberately NOT cached — drift schema snapshots are git-tracked, and restoring a tracked file would overwrite the checkout (same reason main.directories.g.dart is excluded below).
+    # Arch is in the key defensively: the build cache holds kernel/asset hashes we don't want shared across arches.
+    # The key embeds hashFiles of this action and the warmer workflow, so any edit to either file self-busts the cache instead of restoring a stale pre-edit snapshot — no manual version token to bump (this replaced the short-lived -v2- token).
+    # Keep path + key in sync with the save step in cache-warmer.yml.
+    - name: Restore build_runner cache
+      uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+      with:
+        path: |
+          .dart_tool/build
+          **/*.g.dart
+          **/*.freezed.dart
+          **/*.mocks.dart
+          **/*.gen.dart
+          **/*.gr.dart
+          **/*.config.dart
+          !packages/bull_ui_catalogue/lib/main.directories.g.dart
+        key: buildrunner-${{ hashFiles('.github/actions/flutter-setup/action.yml', '.github/workflows/cache-warmer.yml') }}-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pubspec.lock') }}-${{ github.sha }}
+        restore-keys: buildrunner-${{ hashFiles('.github/actions/flutter-setup/action.yml', '.github/workflows/cache-warmer.yml') }}-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pubspec.lock') }}-
+
+    - name: Generate code (build_runner)
+      shell: bash
+      run: make build-runner
+
+    - name: Generate translations
+      shell: bash
+      run: make translations
+
+    - name: Disk telemetry (for trimming free-disk later)
+      shell: bash
+      run: df -h /