CHANGELOG: add 1.4.0

CHANGELOG.md

@@ -18,24 +18,9 @@
 
 # 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`).
+This release brings a minor `dfi` fix, a new `dfi` feature (custom compose merge file functionality), `dfi` enhancements (base image and end-user) and a ROOT.cern (`root`) patch release.
 
 ### 1.4.0 - Fixes
 
@@ -68,13 +53,11 @@ This release brings a minor `dfi` fix (`fetch`), a new `dfi` feature (custom com
 
 - 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))
+- Comment out "ethereum:0xbcca60bb61934080951369a648fb03df4f96263c/aUSDC" in default generated `fetch` config ([#322](https://gitea.evergreencrypto.co/EvergreenCrypto/docker-finance/pulls/322))
 
 ### 1.4.0 - Contributors
 

client/Dockerfiles/remote/docker-finance/finance/Dockerfile.archlinux

@@ -49,7 +49,6 @@ RUN pacman -Syu \
 
 # Base packages
 RUN pacman -Syu \
-  bash-completion \
   bc \
   csvkit \
   vim \

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.3
+RUN git clone --depth=1 https://github.com/apauley/hledger-flow -b v0.16.2
 
 WORKDIR /usr/local/src/hledger-flow
 RUN stack setup
@@ -58,7 +58,7 @@ RUN cabal v1-copy
 FROM hledger-iadd AS hledger
 
 WORKDIR /usr/local/src
-RUN git clone --depth=1 https://github.com/simonmichael/hledger -b 1.52
+RUN git clone --depth=1 https://github.com/simonmichael/hledger -b 1.51.2
 
 WORKDIR /usr/local/src/hledger
 RUN stack setup

client/docker-finance.yaml

@@ -20,7 +20,7 @@
 #
 
 # Release version (tag format)
-version: "v1.4.1"
+version: "v1.4.0"
 
 # Container dependencies (used by `version` command)
 # NOTE: this must stay inline with Dockerfiles
@@ -36,7 +36,6 @@ container:
         commands:
       base:
         packages:
-          - "bash-completion"
           - "bc"
           - "csvkit"
           - "vim"

client/src/docker/completion.bash

@@ -17,28 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-# TODO:
-#
-#  - Refactor using `bash-completion` "library" but keep backward compatibility,
-#    as this would otherwise break the "no more than 3 dependencies" approach to client-side `dfi`.
-#
-#  - When possible, add completion to existing `dfi` arguments that aren't completing
-#    * e.g., `dfi archlinux/${USER}:default edit type=` -> `dfi archlinux/${USER}:default edit type=rules...`
-#
-#  The not-so-straightforward resolution to this TODO hinges on the fact that
-#  the default delim for all `dfi` completion is the `=` character (which also exists in `COMP_WORDBREAKS`).
-#
-#  One resolution can be found in:
-#
-#    - https://github.com/scop/bash-completion/blob/c63826f8678e7d1fd36cf188bf1ba2eccaf2552e/completions-core/dd.bash
-#
-#  See also:
-#
-#   - https://github.com/scop/bash-completion/tree/main/completions-core
-#   - https://github.com/scop/bash-completion/blob/c63826f8678e7d1fd36cf188bf1ba2eccaf2552e/bash_completion#L1105-L1132
-#   - https://github.com/scop/bash-completion/blob/c63826f8678e7d1fd36cf188bf1ba2eccaf2552e/bash_completion#L1450-L1454
-#   - https://github.com/scop/bash-completion/blob/c63826f8678e7d1fd36cf188bf1ba2eccaf2552e/bash_completion#L2964-L2968
-
 # WARNING: because of completion, the docker-finance environment file
 # is never read. Ergo, for debugging, you'll need to run the following
 # with log-level 1 or 2:

container/src/finance/completion.bash

@@ -2,7 +2,7 @@
 
 # docker-finance | modern accounting for the power-user
 #
-# Copyright (C) 2024-2026 Aaron Fiore (Founder, Evergreen Crypto LLC)
+# Copyright (C) 2024-2025 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
@@ -17,28 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-# TODO:
-#
-#  - Refactor using `bash-completion` "library".
-#    * i.e., remove direct access to COMP* and use what's available, etc.
-#
-#  - Add completion to existing `dfi` arguments that aren't completing.
-#    * e.g., `dfi profile/subprofile edit type=` -> `dfi profile/subprofile edit type=rules...`
-#
-#  The not-so-straightforward resolution to this TODO hinges on the fact that
-#  the default delim for all `dfi` completion is the `=` character (which also exists in `COMP_WORDBREAKS`).
-#
-#  One resolution can be found in:
-#
-#    - https://github.com/scop/bash-completion/blob/c63826f8678e7d1fd36cf188bf1ba2eccaf2552e/completions-core/dd.bash
-#
-#  See also:
-#
-#   - https://github.com/scop/bash-completion/tree/main/completions-core
-#   - https://github.com/scop/bash-completion/blob/c63826f8678e7d1fd36cf188bf1ba2eccaf2552e/bash_completion#L1105-L1132
-#   - https://github.com/scop/bash-completion/blob/c63826f8678e7d1fd36cf188bf1ba2eccaf2552e/bash_completion#L1450-L1454
-#   - https://github.com/scop/bash-completion/blob/c63826f8678e7d1fd36cf188bf1ba2eccaf2552e/bash_completion#L2964-L2968
-
 # shellcheck disable=SC2154
 [ "$DOCKER_FINANCE_DEBUG" == 2 ] && set -xv
 

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

@@ -142,10 +142,6 @@ 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/blockchain-explorers/ethereum-based/rules.d/lending.d/compound.rules

@@ -1,6 +1,6 @@
 # docker-finance | modern accounting for the power-user
 #
-# Copyright (C) 2021-2026 Aaron Fiore (Founder, Evergreen Crypto LLC)
+# Copyright (C) 2021-2025 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
@@ -131,7 +131,6 @@ if %to_address (^0x39aa39c021dfbae8fac545936693ac917d5e7563$|^0x4ddc2d193948926d
 if %direction ^IN$
 & %contract_address ^0xc00e94cb662c3520282e6f5717214004a7f26888$
 & %from_address ^0x3d9819210a31b4961b30ef54be2aed79b9c9cd3b$
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:INCOME
   account2 income:%account_name:%subaccount_name:%blockchain:%symbol
   comment2 %date +0000,INCOME,%account_name:%subaccount_name:%blockchain,%symbol,%amount_,USD,,COMP rewards
 

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

@@ -1,2 +0,0 @@
-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,35 +36,16 @@ 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()
 {
-  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
+  lib_preprocess::assert_header "Timestamp;Date;Time;Type;Transaction ID;Fee;Fee unit;Address;Label;Amount;Amount unit;Fiat (USD);Other"
 
   # 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" \
@@ -83,7 +64,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
 
@@ -99,19 +80,7 @@ function parse()
 
        printf("%.8f", $10); printf OFS  # Amount        # TODO: more than 8 places for Ethereum, etc.?
        printf "\"" $11 "\"" OFS         # Amount unit
-
-       # Fiat (USD)
-       # NOTE: is already quoted since v25.9.1
-       fiat=$12
-       if (fiat ~ /^"/)
-         {
-           printf fiat OFS
-         }
-       else
-         {
-           printf "\"" fiat "\"" OFS
-         }
-
+       printf "\"" $12 "\"" OFS         # Fiat (USD)
        printf "\"" $13 "\"" OFS         # Other
 
        printf direction OFS
@@ -119,7 +88,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-2026 Aaron Fiore (Founder, Evergreen Crypto LLC)
+# Copyright (C) 2021-2025 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,16 +64,9 @@ 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)"
-
-  local _delim="$3"
-  [ -z "$_delim" ] && _delim=","
-
-  # TODO: consolidate regexp
-  [[ "$_header" =~ (^"${_column}"$|^"${_column}${_delim}"|"${_delim}${_column}${_delim}"|"${_delim}${_column}"$) ]] \
-    && return 0 || return 2
+  [[ "$_header" =~ (^${_column}$|^${_column},|,${_column},|,${_column}$) ]] && return 0 || return 2
 }
 
 # Assert header in given CSV header