Merge branch 'dev' into resolves_issue_555

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
         target: [ "pi0", "pi2", "pi02w", "pi4" ]
     steps:
       - name: checkout seedsigner-os
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: "seedsigner/seedsigner-os"
           # use the os-ref input parameter in case of workflow_dispatch or default to main in case of cron triggers
@@ -42,7 +42,7 @@ jobs:
           fetch-depth: 0
 
       - name: checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # ref defaults to repo default-branch=dev (cron) or SHA of event (workflow_dispatch)
           path: "seedsigner-os/opt/rootfs-overlay/opt"
@@ -78,7 +78,7 @@ jobs:
           ls -la src
 
       - name: restore build cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         # Caching reduces the build time to ~50% (currently: ~30 mins instead of ~1 hour,
         # while consuming ~850 MB storage space).
         with:
@@ -89,10 +89,25 @@ jobs:
           restore-keys: |
             build-cache-${{ matrix.target }}-
 
+      - name: Create build container
+        run: |
+          cd seedsigner-os
+          docker build -t seedsigner-os-build .
+
       - name: build
         run: |
-          cd seedsigner-os/opt
-          ./build.sh --${{ matrix.target }} --skip-repo --no-clean
+          mkdir -p \
+            ~/.buildroot-ccache \
+            seedsigner-os/buildroot_dl
+          docker run \
+            --rm \
+            -v "$(pwd)/seedsigner-os/opt:/opt" \
+            -v "$(pwd)/seedsigner-os/images:/images" \
+            -v "$(pwd)/seedsigner-os/buildroot_dl:/buildroot_dl" \
+            -v "${HOME}/.buildroot-ccache:/root/.buildroot-ccache" \
+            seedsigner-os-build \
+            --${{ matrix.target }} --skip-repo --no-clean
+          sudo chown -R $USER:$USER seedsigner-os/images seedsigner-os/buildroot_dl ~/.buildroot-ccache/
 
       - name: list image (before rename)
         run: |
@@ -113,9 +128,9 @@ jobs:
           ls -la seedsigner-os/images
 
       - name: upload images
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: seedsigner_os_images
+          name: seedsigner_os_images-${{ matrix.target }}
           path: "seedsigner-os/images/*.img"
           if-no-files-found: error
           # maximum 90 days retention
@@ -127,14 +142,13 @@ jobs:
     needs: build
     steps:
       - name: download images
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: seedsigner_os_images
           path: images
 
       - name: list images
         run: |
-          ls -la images
+          ls -lRa images
 
       - name: get seedsigner latest commit hash
         id: get-seedsigner-hash
@@ -145,12 +159,14 @@ jobs:
       - name: write sha256sum
         run: |
           cd images
+          # each downloaded image is in its own subfolder
+          find . -name "*.img" -exec mv {} . \;
           sha256sum *.img > seedsigner_os.${{ env.source_hash }}.sha256
 
       - name: upload checksums
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: seedsigner_os_images
+          name: seedsigner_os_images_sha256
           path: "images/*.sha256"
           if-no-files-found: error
           # maximum 90 days retention

.github/workflows/tests.yml

@@ -26,12 +26,12 @@ jobs:
         python-version: ["3.10", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # Needs to also pull the seedsigner-translations repo
           submodules: recursive
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -63,9 +63,9 @@ jobs:
       - name: Coverage report
         run: coverage report
       - name: Archive CI Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ci-artifacts
+          name: ci-artifacts-${{ matrix.python-version }}
           path: artifacts/**
           retention-days: 10
         # Upload also when tests fail. The workflow result (red/green) will

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "src/seedsigner/resources/seedsigner-translations"]
 	path = src/seedsigner/resources/seedsigner-translations
 	url = https://github.com/SeedSigner/seedsigner-translations.git
-	branch = 0.8.5-rc1
+	branch = dev
 [submodule "seedsigner-screenshots"]
 	path = seedsigner-screenshots
 	url = https://github.com/SeedSigner/seedsigner-screenshots.git

README.md

@@ -159,7 +159,7 @@ The result should confirm that 1 key was *either* imported or updated. *Ignore*
 
 Next, you will run the *verify* command on the signature (.sig) file. (*Verify* must be run from inside the same folder that you downloaded the files into earlier. The `*`'s in this command will auto-fill the version from your current folder, so it should be copied and pasted as-is.)   
 ```
-gpg --verify seedsigner.0.7.*.sha256.txt.sig
+gpg --verify seedsigner.0.8.*.sha256.txt.sig
 ```
 
 When the verify command completes successfully, it should display output like this:

l10n/messages.pot

@@ -1,14 +1,14 @@
 # Translations template for seedsigner.
-# Copyright (C) 2024 ORGANIZATION
+# Copyright (C) 2025 ORGANIZATION
 # This file is distributed under the same license as the seedsigner project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2025.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: seedsigner 0.8.5\n"
+"Project-Id-Version: seedsigner 0.8.5-rc1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-11-03 14:15-0600\n"
+"POT-Creation-Date: 2025-01-19 10:20-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -36,16 +36,6 @@ msgstr ""
 msgid "sats"
 msgstr ""
 
-#. The abbreviated label for the special key <del> on a standard keyboard.
-#: src/seedsigner/gui/keyboard.py
-msgid "del"
-msgstr ""
-
-#. The abbreviated label for the special key <space> on a standard keyboard.
-#: src/seedsigner/gui/keyboard.py
-msgid "space"
-msgstr ""
-
 #: src/seedsigner/gui/toast.py
 msgid ""
 "You can remove\n"
@@ -121,9 +111,8 @@ msgid "OP_RETURN"
 msgstr ""
 
 #. Label for a change output in the PSBT Overview flow diagram
-#. Used in a sentence describing the address type (change or receive)
 #: src/seedsigner/gui/screens/psbt_screens.py
-#: src/seedsigner/views/psbt_views.py src/seedsigner/views/seed_views.py
+#: src/seedsigner/views/psbt_views.py
 msgid "change"
 msgstr ""
 
@@ -204,15 +193,19 @@ msgstr ""
 msgid "Darker"
 msgstr ""
 
-#: src/seedsigner/gui/screens/screen.py src/seedsigner/views/seed_views.py
+#: src/seedsigner/gui/screens/screen.py
+#: src/seedsigner/gui/screens/seed_screens.py
+#: src/seedsigner/views/seed_views.py
 msgid "Success!"
 msgstr ""
 
-#: src/seedsigner/gui/screens/screen.py src/seedsigner/views/seed_views.py
+#: src/seedsigner/gui/screens/screen.py
+#: src/seedsigner/gui/screens/seed_screens.py
+#: src/seedsigner/views/seed_views.py
 msgid "OK"
 msgstr ""
 
-#: src/seedsigner/gui/screens/screen.py src/seedsigner/views/psbt_views.py
+#: src/seedsigner/gui/screens/screen.py
 msgid "Caution"
 msgstr ""
 
@@ -391,6 +384,25 @@ msgstr ""
 msgid "Checking address {}"
 msgstr ""
 
+#: src/seedsigner/gui/screens/seed_screens.py
+msgid "Address Verified"
+msgstr ""
+
+#. Describes the address type (change or receive)
+#: src/seedsigner/gui/screens/seed_screens.py
+msgid "change address"
+msgstr ""
+
+#. Describes the address type (change or receive)
+#: src/seedsigner/gui/screens/seed_screens.py
+msgid "receive address"
+msgstr ""
+
+#. Describes the address index (e.g. "index 7")
+#: src/seedsigner/gui/screens/seed_screens.py
+msgid "index {}"
+msgstr ""
+
 #: src/seedsigner/gui/screens/seed_screens.py
 msgid "Multisig Verification"
 msgstr ""
@@ -517,11 +529,12 @@ msgstr ""
 msgid "Build Final Word"
 msgstr ""
 
-#. Number of BIP-39 seed words, and the entropy -- in bits, contained within.
+#. Final word calc. `mnemonic_length` = 12 or 24. `num_bits` = 7 or 3 (bits of
+#. entropy in final word).
 #: src/seedsigner/gui/screens/tools_screens.py
 msgid ""
-"The {}th word is built from {} more entropy bits plus auto-calculated "
-"checksum."
+"The {mnemonic_length}th word is built from {num_bits} more entropy bits "
+"plus auto-calculated checksum."
 msgstr ""
 
 #. current coin-flip number vs total flips (e.g. flip 3 of 4)
@@ -744,6 +757,10 @@ msgstr ""
 msgid "BIP-85 child seeds"
 msgstr ""
 
+#: src/seedsigner/models/settings_definition.py
+msgid "Electrum seeds"
+msgstr ""
+
 #: src/seedsigner/models/settings_definition.py
 msgid "Native Segwit only"
 msgstr ""
@@ -874,18 +891,16 @@ msgstr ""
 
 #. Variable is either "change" or "self-transfer".
 #: src/seedsigner/views/psbt_views.py
-msgid ""
-"PSBT's {} address could not be verified with your multisig wallet "
-"descriptor."
+msgid "PSBT's {} address could not be verified from wallet descriptor."
 msgstr ""
 
+#. Variable is either "change" or "self-transfer".
 #: src/seedsigner/views/psbt_views.py
-msgid "Suspicious PSBT"
+msgid "PSBT's {} address could not be generated from your seed."
 msgstr ""
 
-#. Variable is either "change" or "self-transfer".
 #: src/seedsigner/views/psbt_views.py
-msgid "PSBT's {} address could not be generated from your seed."
+msgid "Suspicious PSBT"
 msgstr ""
 
 #: src/seedsigner/views/psbt_views.py
@@ -1262,30 +1277,6 @@ msgstr ""
 msgid "Can't validate a single sig addr without specifying a seed"
 msgstr ""
 
-#: src/seedsigner/views/seed_views.py
-msgid "multisig"
-msgstr ""
-
-#. Inserts the seed fingerprint
-#: src/seedsigner/views/seed_views.py
-msgid "seed {}"
-msgstr ""
-
-#. Used in a sentence describing the address type (change or receive)
-#: src/seedsigner/views/seed_views.py
-msgid "receive"
-msgstr ""
-
-#. Address verification success message (e.g. "bc1qabc = seed 12345678's
-#. receive address #0.")
-#: src/seedsigner/views/seed_views.py
-msgid "{} = {}'s {} address #{}."
-msgstr ""
-
-#: src/seedsigner/views/seed_views.py
-msgid "Address Verified"
-msgstr ""
-
 #: src/seedsigner/views/seed_views.py
 msgid "Scan Descriptor"
 msgstr ""
@@ -1456,10 +1447,13 @@ msgstr ""
 msgid "Back to Main Menu"
 msgstr ""
 
+#. The network setting (mainnet/testnet/regtest) doesn't match the provided
+#. derivation path
 #: src/seedsigner/views/view.py
 msgid "Network Mismatch"
 msgstr ""
 
+#. Button option to alter a setting
 #: src/seedsigner/views/view.py
 msgid "Change Setting"
 msgstr ""