From d82a74eefc93a3381fc417067f164150e6d73f6d Mon Sep 17 00:00:00 2001 From: Sami Ahmed Date: Wed, 8 Jul 2026 14:02:57 -0700 Subject: [PATCH] release: v6.1.6 Bumps clientversion from 6.1.5 to 6.1.6 and updates all packaging metadata (deb, rpm, docker, snap, flatpak, winget, scoop, appimage, root Dockerfile) to match. Adds a v6.1.6 section to CHANGELOG.md documenting the conditional Overview Total label and the 3-tier amount-column color rule that landed in this release. Restores the historic v6.1.5 entry in triangles.spec's %changelog after the bulk sed bumped it incorrectly. --- CHANGELOG.md | 27 +++++++++++++++++++ Dockerfile | 2 +- packaging/appimage/build-appimage.sh | 2 +- packaging/debian/build-deb.sh | 2 +- packaging/docker/Dockerfile | 6 ++--- packaging/docker/docker-compose.yml | 2 +- ...rg.cryptographic_triangles.TrianglesQt.yml | 4 +-- packaging/rpm/build-rpm.sh | 2 +- packaging/rpm/triangles.spec | 8 +++++- packaging/scoop/triangles.json | 4 +-- .../CryptographicTriangles.TrianglesQt.yaml | 4 +-- snap/snapcraft.yaml | 10 +++---- src/clientversion.h | 8 +++--- 13 files changed, 57 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20f9c5f..35a488c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,32 @@ All notable changes to Triangles (TRI) are documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [6.1.6] - 2026-07-08 + +### Changed +- Overview page UI: conditional color on the **Total** balance label. + Renders money-green (`#7CDB8A`) when the total is greater than zero + and brand-red (`#e32105`) when the wallet is empty. Previously a + static green stylesheet rule failed to cascade on some Qt builds, + leaving Total always red. +- Transactions list (and Overview recent-5 list) **amount column** now + uses a 3-tier color rule keyed off the existing `TransactionStatus` + state machine, so the amount color agrees with the status icon: + - 0 confirms (`Unconfirmed`) → grey (`#61280E`) + - 1–3 confirms (`Confirming`) → pale mint (`#C5EBC9`) + - 4+ confirms (`Confirmed`) → money-green (`#7CDB8A`) + - Conflicted → grey + - Negative amounts (spent) stay red across all tiers. +- Internal: added `COLOR_CONFIRMING` constant in `guiconstants.h`; + rewired both amount paint sites + (`overviewpage.cpp::TxViewDelegate::paint` and + `transactiontablemodel.cpp::ForegroundRole`) to share the rule. + +### Fixed +- `overviewpage.cpp` now includes `transactionrecord.h` so the + `TransactionStatus::Confirming` enum value is in scope (was + previously only forward-declared via `transactiontablemodel.h`). + ## [6.1.5] - 2026-07-08 ### Added @@ -65,6 +91,7 @@ Do not use. ### Added - Initial 6.x release line. C++20 modernization, embedded Tor/I2P support. +[6.1.6]: https://github.com/SamiAhmed7777/triangles_v5/compare/v6.1.5...v6.1.6 [6.1.5]: https://github.com/SamiAhmed7777/triangles_v5/compare/v6.1.4...v6.1.5 [6.1.4]: https://github.com/SamiAhmed7777/triangles_v5/compare/v6.1.3...v6.1.4 [6.1.3]: https://github.com/SamiAhmed7777/triangles_v5/compare/v6.1.2...v6.1.3 diff --git a/Dockerfile b/Dockerfile index 57ed39e..8dba432 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:22.04 LABEL maintainer="Cryptographic Triangles Team" LABEL description="Cryptographic Triangles (TRI) headless daemon" -LABEL version="6.1.5" +LABEL version="6.1.6" RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ diff --git a/packaging/appimage/build-appimage.sh b/packaging/appimage/build-appimage.sh index 9f0e9bf..da5088d 100644 --- a/packaging/appimage/build-appimage.sh +++ b/packaging/appimage/build-appimage.sh @@ -3,7 +3,7 @@ # Run on a Linux x64 system with appimagetool installed set -e -VERSION="6.1.5" +VERSION="6.1.6" APPDIR="Triangles-x86_64.AppDir" RELEASE_URL="https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${VERSION}" diff --git a/packaging/debian/build-deb.sh b/packaging/debian/build-deb.sh index 86ac5db..c603e3a 100644 --- a/packaging/debian/build-deb.sh +++ b/packaging/debian/build-deb.sh @@ -3,7 +3,7 @@ # Run from the packaging/debian directory set -e -VERSION="6.1.5" +VERSION="6.1.6" PKGDIR="triangles_${VERSION}-1_amd64" RELEASE_URL="https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${VERSION}" diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 17f06b2..31786db 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:22.04 AS builder -ARG VERSION=6.1.5 +ARG VERSION=6.1.6 ARG DEB_URL=https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${VERSION}/cryptographic-triangles-daemon_${VERSION}_amd64.deb RUN apt-get update && apt-get install -y --no-install-recommends \ @@ -13,11 +13,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # ---------- Runtime ---------- FROM ubuntu:22.04 -ARG VERSION=6.1.5 +ARG VERSION=6.1.6 LABEL maintainer="Cryptographic Triangles Team" LABEL description="Cryptographic Triangles (TRI) headless daemon" -LABEL version="6.1.5" +LABEL version="6.1.6" RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ diff --git a/packaging/docker/docker-compose.yml b/packaging/docker/docker-compose.yml index b538036..425e7dc 100644 --- a/packaging/docker/docker-compose.yml +++ b/packaging/docker/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: trianglesd: build: . - image: cryptographic-triangles/trianglesd:6.1.5 + image: cryptographic-triangles/trianglesd:6.1.6 container_name: trianglesd restart: unless-stopped ports: diff --git a/packaging/flatpak/org.cryptographic_triangles.TrianglesQt.yml b/packaging/flatpak/org.cryptographic_triangles.TrianglesQt.yml index c8b1786..323469d 100644 --- a/packaging/flatpak/org.cryptographic_triangles.TrianglesQt.yml +++ b/packaging/flatpak/org.cryptographic_triangles.TrianglesQt.yml @@ -25,7 +25,7 @@ modules: - install -Dm644 org.cryptographic_triangles.TrianglesQt.metainfo.xml /app/share/metainfo/org.cryptographic_triangles.TrianglesQt.metainfo.xml sources: - type: file - url: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.1.5/Cryptographic-Triangles-v6.1.5-linux-x64-qt + url: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.1.6/Cryptographic-Triangles-v6.1.6-linux-x64-qt sha256: ed220eb8d0b403f62cdac28988541fd1a27864491e233216f9c00a4c2537b4a3 dest-filename: triangles-qt-linux - type: file @@ -55,6 +55,6 @@ modules: - install -Dm755 trianglesd-linux /app/bin/trianglesd sources: - type: file - url: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.1.5/Cryptographic-Triangles-v6.1.5-linux-x64-daemon + url: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.1.6/Cryptographic-Triangles-v6.1.6-linux-x64-daemon sha256: 4d2ab25d61127d6aff3e6f3069556d04f4b823f8849e97629c12871ad4779517 dest-filename: trianglesd-linux diff --git a/packaging/rpm/build-rpm.sh b/packaging/rpm/build-rpm.sh index 057a6c6..3192da9 100644 --- a/packaging/rpm/build-rpm.sh +++ b/packaging/rpm/build-rpm.sh @@ -4,7 +4,7 @@ # Install build tools: sudo dnf install rpm-build rpmdevtools set -e -VERSION="6.1.5" +VERSION="6.1.6" RELEASE_URL="https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${VERSION}" echo "Building RPM for Triangles v${VERSION}..." diff --git a/packaging/rpm/triangles.spec b/packaging/rpm/triangles.spec index ca8381f..8138125 100644 --- a/packaging/rpm/triangles.spec +++ b/packaging/rpm/triangles.spec @@ -1,5 +1,5 @@ Name: triangles -Version: 6.1.5 +Version: 6.1.6 Release: 1%{?dist} Summary: Cryptographic Triangles (TRI) cryptocurrency wallet License: MIT @@ -44,6 +44,12 @@ install -Dm644 %{SOURCE2} %{buildroot}%{_datadir}/applications/triangles-qt.desk %{_datadir}/applications/triangles-qt.desktop %changelog +* Wed Jul 08 2026 Sami Ahmed - 6.1.6-1 +- 6.1.6 release. UI: Overview Total label now conditional (green when + total > 0, red when empty), Transactions amount column now 3-tier + (grey / pale mint / money-green) by confirmation depth. Plus + sigcache entry-size fix and Polish CI/build fixes. + * Wed Jul 08 2026 Sami Ahmed - 6.1.5-1 - 6.1.5 release. UI: olive-green for unconfirmed/immature stake balances. Wallet: close-hang on Windows from detached Tor/I2P threads fixed. diff --git a/packaging/scoop/triangles.json b/packaging/scoop/triangles.json index 5899de9..254a938 100644 --- a/packaging/scoop/triangles.json +++ b/packaging/scoop/triangles.json @@ -1,11 +1,11 @@ { - "version": "6.1.5", + "version": "6.1.6", "description": "Cryptographic Triangles (TRI) cryptocurrency wallet with PoS staking and encrypted messaging", "homepage": "https://cryptographic-triangles.org", "license": "MIT", "architecture": { "64bit": { - "url": "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.1.5/Cryptographic-Triangles-6.1.5-win-x64.zip", + "url": "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.1.6/Cryptographic-Triangles-6.1.6-win-x64.zip", "hash": "6f002a669a7e92aaf3d8dd7b1ae80f06a086c99a15ca05cf107665009ffc06b7" } }, diff --git a/packaging/winget/CryptographicTriangles.TrianglesQt.yaml b/packaging/winget/CryptographicTriangles.TrianglesQt.yaml index ffe236d..cf46901 100644 --- a/packaging/winget/CryptographicTriangles.TrianglesQt.yaml +++ b/packaging/winget/CryptographicTriangles.TrianglesQt.yaml @@ -1,5 +1,5 @@ PackageIdentifier: CryptographicTriangles.TrianglesQt -PackageVersion: 6.1.5 +PackageVersion: 6.1.6 PackageLocale: en-US Publisher: Cryptographic Triangles PublisherUrl: https://cryptographic-triangles.org @@ -27,7 +27,7 @@ Installers: - RelativeFilePath: triangles-qt.exe PortableCommandAlias: triangles-qt ArchiveBinariesDependOnPath: true - InstallerUrl: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.1.5/Cryptographic-Triangles-6.1.5-win-x64.zip + InstallerUrl: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.1.6/Cryptographic-Triangles-6.1.6-win-x64.zip InstallerSha256: 6F002A669A7E92AAF3D8DD7B1AE80F06A086C99A15CA05CF107665009FFC06B7 ManifestType: singleton ManifestVersion: 1.6.0 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 980ac30..f2649fb 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: triangles base: core22 -version: '6.1.5' +version: '6.1.6' summary: Cryptographic Triangles (TRI) cryptocurrency wallet description: | Privacy-focused cryptocurrency featuring Proof-of-Stake consensus, @@ -51,10 +51,10 @@ apps: parts: triangles: plugin: dump - source: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.1.5/Cryptographic-Triangles-v6.1.5-linux-x64-qt + source: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.1.6/Cryptographic-Triangles-v6.1.6-linux-x64-qt source-type: file organize: - Cryptographic-Triangles-v6.1.5-linux-x64-qt: bin/triangles-qt + Cryptographic-Triangles-v6.1.6-linux-x64-qt: bin/triangles-qt stage-packages: - libqt5widgets5 - libqt5gui5 @@ -73,10 +73,10 @@ parts: trianglesd: plugin: dump - source: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.1.5/Cryptographic-Triangles-v6.1.5-linux-x64-daemon + source: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.1.6/Cryptographic-Triangles-v6.1.6-linux-x64-daemon source-type: file organize: - Cryptographic-Triangles-v6.1.5-linux-x64-daemon: bin/trianglesd + Cryptographic-Triangles-v6.1.6-linux-x64-daemon: bin/trianglesd desktop-entry: plugin: dump diff --git a/src/clientversion.h b/src/clientversion.h index 6e078d2..c1abb2c 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -6,10 +6,10 @@ // // These need to be macros, as version.cpp's and triangles-qt.rc's voodoo requires it -#define CLIENT_VERSION_MAJOR 6 -#define CLIENT_VERSION_MINOR 1 -#define CLIENT_VERSION_REVISION 5 -#define CLIENT_VERSION_BUILD 0 +#define CLIENT_VERSION_MAJOR 6 +#define CLIENT_VERSION_MINOR 1 +#define CLIENT_VERSION_REVISION 6 +#define CLIENT_VERSION_BUILD 0 // Converts the parameter X to a string after macro replacement on X has been performed. // Don't merge these into one macro!