Merge pull request #328 into master

76505b6a CHANGELOG: add 1.4.1 (Aaron Fiore)
c6703ad7 client: manifest: bump version to v1.4.1 (Aaron Fiore)

.gitea/workflows/dfi.yaml

@@ -23,6 +23,8 @@ run-name: ${{ gitea.actor }} ${{ gitea.event_name }} ${{ gitea.ref }} ${{ gitea.
 
 on:
   push:
+    branches:
+      - '**'
     paths:
       - 'client/**'
       - 'container/**'

CHANGELOG.md

@@ -18,6 +18,68 @@
 
 # Changelog (`docker-finance`)
 
+## 1.4.1 - 2026-03-18
+
+This patch release fixes broken `import` for Trezor Suite v25.9.1+ by adding new FS support and backward compatibility.
+
+### 1.4.1 - Fixes
+
+- Add bash quotes when testing column(s) of given header and add custom delim support (lib_preprocess) ([#326](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/326))
+
+- Add Trezor Suite v25.9.1+ FS support and backward compatibility ([#327](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/327))
+  * For devs (to generate new FS mockup), with `finance` image, run: `gen type=flow account=trezor dev=on confirm=no profile=<profile/subprofile>`
+
+### 1.4.1 - Contributors
+
+- Aaron Fiore
+
+## 1.4.0 - 2026-03-16
+
+This release brings a minor `dfi` fix (`fetch`), a new `dfi` feature (custom compose merge file functionality), `dfi` enhancements (base image and end-user), and patch releases for `hledger-flow` and ROOT.cern (`root`).
+
+### 1.4.0 - Fixes
+
+- Fix User-Agent when `fetch`ing prices ([#320](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/320))
+
+### 1.4.0 - Features
+
+- 🚨**Breaking**: Add custom compose merge file functionality ([#309](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/309)) ([#315](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/315))
+  * Like custom Dockerfile functionality, adds support for custom docker-compose.yml
+  * ⚠️ Run `gen type=compose` at least once for your respective existing image (e.g., `dfi archlinux/${USER}:default gen type=compose`)
+
+### 1.4.0 - Enhancements
+
+- Print locations of output for `reports` and `taxes` ([#310](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/310))
+
+- Remove defaulting to `/` when using `shell` ([#311](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/311))
+
+- Add 'Related "useful" packages' section to base `finance` (`archlinux`) image ([#312](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/312))
+  * For consistently useful packages that aren't dependencies
+  * Moves `calc` package from optional to this section
+    - If you previously uncommented the `calc` package in the custom build, run `gen type=build` to pickup the latest custom file or manually remove with `edit type=build` (otherwise, you'll simply re-install the package).
+
+- Add man page support to base `finance` (`archlinux`) and `dev-tools` images ([#313](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/313)) ([#314](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/314)) ([#319](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/319))
+
+- Don't run tags with Gitea CI Workflow ([#318](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/318))
+
+- Improve handling of non-200 responses when `fetch`ing prices ([#321](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/321))
+
+### 1.4.0 - Updates
+
+- Bump `root` to 6.38.04-1 ([#317](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/317))
+
+- Bump `hledger-flow` to v0.16.3 ([#324](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/324)) ([#325](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/325))
+
+### 1.4.0 - Refactoring
+
+- Run PHP linter, update fetch (blockchains) comments ([#316](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/316))
+
+- Comment out `"ethereum:0xbcca60bb61934080951369a648fb03df4f96263c/aUSDC"` in default generated `fetch` config ([#322](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/322))
+
+### 1.4.0 - Contributors
+
+- Aaron Fiore
+
 ## 1.3.0 - 2026-02-27
 
 This release focuses on `dfi` code/usage enhancements, a ROOT.cern (`root`) patch release and **breaking** changes to the `dfi` client-side default layout (filesystem).

client/Dockerfiles/remote/docker-finance/dev-tools/Dockerfile.dev-tools

@@ -1,6 +1,6 @@
 # docker-finance | modern accounting for the power-user
 #
-# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC)
+# Copyright (C) 2021-2024,2026 Aaron Fiore (Founder, Evergreen Crypto LLC)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,6 +22,10 @@ RUN apt-get update -y
 # Add builder user (for `composer` and non-root building)
 RUN useradd -m -s /bin/bash -r builder
 
+# Enable man page support
+RUN apt-get install man unminimize -y
+RUN yes | unminimize
+
 #
 # 'dev-tools' linters
 #

client/Dockerfiles/remote/hledger-suite/Dockerfile

@@ -27,7 +27,7 @@ RUN apt-get upgrade -y
 FROM haskell-build AS hledger-flow
 
 WORKDIR /usr/local/src
-RUN git clone --depth=1 https://github.com/apauley/hledger-flow -b v0.16.2
+RUN git clone --depth=1 https://github.com/apauley/hledger-flow -b v0.16.3
 
 WORKDIR /usr/local/src/hledger-flow
 RUN stack setup

client/Dockerfiles/remote/root/Dockerfile.archlinux

@@ -27,7 +27,7 @@ RUN sed -i 's/# %wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) NOPASSWD
 
 USER builder
 WORKDIR /home/builder
-RUN git clone --depth=1 https://gitlab.archlinux.org/archlinux/packaging/packages/root -b 6.38.02-1
+RUN git clone --depth=1 https://gitlab.archlinux.org/archlinux/packaging/packages/root -b 6.38.04-1
 
 WORKDIR /home/builder/root
 

client/conf.d/container/fetch/fetch.yaml.in

@@ -115,7 +115,7 @@ version: @DOCKER_FINANCE_VERSION@
           - "arbitrum:0xff970a61a04b1ca14834a43f5de4533ebddb5cc8/USDC.e"
 
           # Aave V2 USDC
-          - "ethereum:0xbcca60bb61934080951369a648fb03df4f96263c/aUSDC"
+          #- "ethereum:0xbcca60bb61934080951369a648fb03df4f96263c/aUSDC" # TODO: 2026-03-13: upstream has started to return 'Time range too large for period "5m". Would generate 10272 candles, max is 10000. Use a larger period or smaller time range.' which appears to be a server-side(?) problem. Commenting out here for now in order to not break CI.
           #- "polygon:0x625e7708f30ca75bfd92586e17077590c60eb4cd/aUSDC"
 
           # Gemini USD

client/docker-finance.yaml

@@ -20,7 +20,7 @@
 #
 
 # Release version (tag format)
-version: "v1.3.0"
+version: "v1.4.1"
 
 # Container dependencies (used by `version` command)
 # NOTE: this must stay inline with Dockerfiles

client/src/docker/lib/internal/lib_gen.bash

@@ -122,10 +122,10 @@ function lib_gen::__parse_args()
   \e[37;2m#\e[0m
 
   \e[37;2m# Generate all client related and all flow related for profile/subprofile called 'parent/child'\e[0m
-  $ $global_usage type${global_arg_delim_2}env${global_arg_delim_3}build${global_arg_delim_3}superscript${global_arg_delim_3}flow profile${global_arg_delim_2}parent${global_arg_delim_1}child
+  $ $global_usage type${global_arg_delim_2}env${global_arg_delim_3}build${global_arg_delim_3}compose${global_arg_delim_3}superscript${global_arg_delim_3}flow profile${global_arg_delim_2}parent${global_arg_delim_1}child
 
   \e[37;2m# Same command as above but without confirmations and with developer mockups\e[0m
-  $ $global_usage type${global_arg_delim_2}env${global_arg_delim_3}build${global_arg_delim_3}superscript${global_arg_delim_3}flow profile${global_arg_delim_2}parent${global_arg_delim_1}child confirm${global_arg_delim_2}false dev${global_arg_delim_2}true
+  $ $global_usage type${global_arg_delim_2}env${global_arg_delim_3}build${global_arg_delim_3}compose${global_arg_delim_3}superscript${global_arg_delim_3}flow profile${global_arg_delim_2}parent${global_arg_delim_1}child confirm${global_arg_delim_2}false dev${global_arg_delim_2}true
 
   \e[37;2m# Generate only the given configurations for 'parent/child'\e[0m
   $ $global_usage type${global_arg_delim_2}flow profile${global_arg_delim_2}parent${global_arg_delim_1}child config${global_arg_delim_2}fetch${global_arg_delim_3}hledger${global_arg_delim_3}meta${global_arg_delim_3}subscript

container/src/finance/lib/internal/fetch/blockchains/fetch.php

@@ -2,7 +2,7 @@
 
 // docker-finance | modern accounting for the power-user
 //
-// Copyright (C) 2021-2025 Aaron Fiore (Founder, Evergreen Crypto LLC)
+// Copyright (C) 2021-2026 Aaron Fiore (Founder, Evergreen Crypto LLC)
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -77,9 +77,11 @@ namespace dfi\blockchains
                 $metadata->set_year($this->get_env()->get_env('API_FETCH_YEAR'));
 
                 // Reconstruct subaccount directory for out directory
-                // API_OUT_DIR format: hledger-flow/profiles/parent_profile/child_profile/import/child_profile/account/subaccount/1-in/year
+                // API_OUT_DIR format: flow/profiles/parent_profile/child_profile/import/child_profile/account/subaccount/1-in/year
                 $path = explode('/', $this->get_env()->get_env('API_OUT_DIR'));
-                $path = array_filter($path, function ($element) { return $element !== '';});  // Clear out extra / that get turned into nulls
+                $path = array_filter($path, function ($element) {
+                    return $element !== '';
+                });  // Clear out extra '/' that get turned into nulls
                 $head_end = $path;
                 $tail_end = $path;
 

container/src/finance/lib/internal/fetch/prices/internal/base.php

@@ -153,8 +153,9 @@ namespace dfi\prices\internal
          */
         protected function request_impl(string $url, array $header): mixed
         {
+            $version = preg_replace('/^v/', '', $this->get_env()->get_env('API_VERSION'));
             $headers = array(
-              'User-Agent: docker-finance /' . $this->get_env()->get_env('API_VERSION'),
+              'User-Agent: docker-finance/' . $version,
               'Accept: application/json',
               'Content-Type: application/json',
             );
@@ -360,16 +361,17 @@ namespace dfi\prices\internal
                     $code = $e->getCode();
                     $message = $e->getMessage();
 
-                    $print = "server sent error '{$message}' with code '{$code}' for '{$asset['id']}'"
+                    $print = "server sent error '{$message}' with code '{$code}' for '{$asset['id']}'";
-                        . " - retrying in '{$timer}' seconds";
 
                     switch ($code) {
-                        // CoinGecko's unrecoverable error (paid plan needed)
+                        case 400:
-                        case 10012:
+                            utils\CLI::throw_fatal($print);
+                            break;
+                        case 10012: // CoinGecko's unrecoverable error (paid plan needed)
                             utils\CLI::throw_fatal($print);
                             break;
                         default:
-                            utils\CLI::print_warning($print);
+                            utils\CLI::print_warning($print . " - retrying in '{$timer}' seconds");
                             break;
                     }
 

container/src/finance/lib/internal/fetch/prices/internal/prices/crypto.php

@@ -2,7 +2,7 @@
 
 // docker-finance | modern accounting for the power-user
 //
-// Copyright (C) 2021-2025 Aaron Fiore (Founder, Evergreen Crypto LLC)
+// Copyright (C) 2021-2026 Aaron Fiore (Founder, Evergreen Crypto LLC)
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -182,6 +182,14 @@ namespace dfi\prices\internal\prices\crypto
             }
 
             $response = $this->request_impl($url, $header);
+            if (array_key_exists('statusCode', $response)) {
+                switch ($response['statusCode']) {
+                    case 200:
+                        break;
+                    default:
+                        throw new \Exception($response['message'], $response['statusCode']);
+                }
+            }
             if (array_key_exists('error', $response)) {
                 throw new \Exception($response['error']);
             }

container/src/finance/lib/internal/lib_hledger.bash

@@ -142,6 +142,10 @@ function lib_hledger::__hledger-import()
 {
   lib_hledger::__parse_hledger-import "$@"
 
+  # TODO: v0.16.3+: add `--new-files-only` only if hledger-flow adds support for
+  # tracking changes to rules and preprocess files. The tracking *must* apply to
+  # all repo files and any/all custom files. Currently, only *modified* time of
+  # source files compared to *modified* time of target files are tracked.
   time hledger-flow import \
     "$(dirname $global_child_profile_journal)" \
     --start-year "$global_arg_year"

container/src/hledger-flow/accounts/trezor/template/trezor/model/1-in/mockup/2026/one-1:wallet-1_BTC.csv

@@ -0,0 +1,2 @@
+Timestamp,Date,Time,Type,Transaction ID,Fee,Fee unit,Address,Label,Amount,Amount unit,Fiat (USD),Other
+1773852733,3/18/2026,9:52:13 AM GMT-7,SENT,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX123,0.00001234,BTC,bc1qXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX123,New FS tx,0.00012345,BTC,"8.81",

container/src/hledger-flow/accounts/trezor/trezor-shared.bash

@@ -36,16 +36,35 @@ source "${DOCKER_FINANCE_CONTAINER_REPO}/src/hledger-flow/lib/lib_preprocess.bas
 
 [ -z "$global_in_filename" ] && exit 1
 
+function reseat_fs()
+{
+  [ -z $1 ] && exit 1
+  local -r _fs="$1"
+  local -r _header="Timestamp${_fs}Date${_fs}Time${_fs}Type${_fs}Transaction ID${_fs}Fee${_fs}Fee unit${_fs}Address${_fs}Label${_fs}Amount${_fs}Amount unit${_fs}Fiat (USD)${_fs}Other"
+  echo "$_header"
+}
+
 function parse()
 {
-  lib_preprocess::assert_header "Timestamp;Date;Time;Type;Transaction ID;Fee;Fee unit;Address;Label;Amount;Amount unit;Fiat (USD);Other"
+  local _gawk=("gawk")
+  local _fs _header
+
+  _header="$(reseat_fs ";")"
+  if lib_preprocess::test_header "$_header"; then
+    _fs="FS=;"
+  else
+    # Since v25.9.1
+    _header="$(reseat_fs ",")"
+    lib_preprocess::assert_header "$_header"
+    _gawk+=("--csv")
+  fi
 
   # Get subaccount(s) from filename
   local _subaccount
   _subaccount="$(echo $global_in_filename | cut -d'_' -f1)"
 
   # NOTE: subaccount (account label) is entered within the app
-  gawk \
+  "${_gawk[@]}" \
     -v global_year="$global_year" \
     -v global_subaccount="$global_subaccount" \
     -v subaccount="$_subaccount" \
@@ -64,7 +83,7 @@ function parse()
        # skip                           # Date (N/A)
        # skip                           # Time (N/A)
 
-       # Type                                           # TODO: are there more types?
+       # Type (TODO: are there more types?)
        direction=($4 ~ /^RECV$/ ? "IN" : "OUT")
        printf $4 OFS
 
@@ -80,7 +99,19 @@ function parse()
 
        printf("%.8f", $10); printf OFS  # Amount        # TODO: more than 8 places for Ethereum, etc.?
        printf "\"" $11 "\"" OFS         # Amount unit
-       printf "\"" $12 "\"" OFS         # Fiat (USD)
+
+       # Fiat (USD)
+       # NOTE: is already quoted since v25.9.1
+       fiat=$12
+       if (fiat ~ /^"/)
+         {
+           printf fiat OFS
+         }
+       else
+         {
+           printf "\"" fiat "\"" OFS
+         }
+
        printf "\"" $13 "\"" OFS         # Other
 
        printf direction OFS
@@ -88,7 +119,7 @@ function parse()
 
        printf "\n"
 
-    }' FS=\; OFS=, "$global_in_path" >"$global_out_path"
+    }' "$_fs" OFS=, "$global_in_path" >"$global_out_path"
 }
 
 function main()

container/src/hledger-flow/lib/lib_preprocess.bash

@@ -2,7 +2,7 @@
 
 # docker-finance | modern accounting for the power-user
 #
-# Copyright (C) 2021-2025 Aaron Fiore (Founder, Evergreen Crypto LLC)
+# Copyright (C) 2021-2026 Aaron Fiore (Founder, Evergreen Crypto LLC)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -64,9 +64,16 @@ echo -e "    \e[32m│     └─\e[37;2m ${global_in_filename}\e[0m"
 function lib_preprocess::test_header()
 {
   local _column="$1"
+
   local _header
   _header="$(lib_preprocess::__sanitize_header $2)"
-  [[ "$_header" =~ (^${_column}$|^${_column},|,${_column},|,${_column}$) ]] && return 0 || return 2
+
+  local _delim="$3"
+  [ -z "$_delim" ] && _delim=","
+
+  # TODO: consolidate regexp
+  [[ "$_header" =~ (^"${_column}"$|^"${_column}${_delim}"|"${_delim}${_column}${_delim}"|"${_delim}${_column}"$) ]] \
+    && return 0 || return 2
 }
 
 # Assert header in given CSV header