From a1a95096bac43f5704058786516eae6005c536b8 Mon Sep 17 00:00:00 2001 From: Sami Ahmed Date: Sat, 1 Aug 2026 15:41:30 -0700 Subject: [PATCH] Revert "[grade=A] feat(snapshot): compile-in canonical tip-SHA for chain recovery" This reverts commit 4c562758cd5d37b5ee99be7cca6b58b488a77e2f. --- CHANGELOG.md | 14 ------------ 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 | 2 +- packaging/scoop/triangles.json | 4 ++-- .../CryptographicTriangles.TrianglesQt.yaml | 4 ++-- snap/snapcraft.yaml | 10 ++++----- src/checkpoints.cpp | 22 ++++++------------- src/clientversion.h | 2 +- 13 files changed, 27 insertions(+), 49 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3199117..4bf9516 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,20 +5,6 @@ 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.2.1] - 2026-08-01 - -### Added -- **Canonical UTXO snapshot at chain tip 2,224,763.** The operator - snapshot `utxo-snapshot-2224763.utx` (SHA256 - `a7ea62ad4e158faf07973e5cd1539c1895154c4e28685a3eb7af458a001037b7`, - generated by `triangles-cli dumputxoset` on DNS2, signed in - `manifest.json` by wallet `TUJ8fne8yf4BEypsp6kENY2dCkivFuXhka`) is - now compiled into `mapSnapshotHashes` so a fresh daemon can load it - directly instead of walking the 989 MB `bootstrap.dat` at ~26 - blocks/sec. Cuts sync time from ~24 hours to ~5 minutes. Critical - for un-sticking the chain: only SAMI-PC has a non-zero wallet - balance (10,166 TRI) and needs to reach the tip to start staking. - ## [6.2.0] - 2026-08-01 ### Fixed diff --git a/packaging/appimage/build-appimage.sh b/packaging/appimage/build-appimage.sh index c541d0c..1bc5526 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.2.1" +VERSION="6.2.0" 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 a01143c..ac7d551 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.2.1" +VERSION="6.2.0" 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 2af3276..84d8bab 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:22.04 AS builder -ARG VERSION=6.2.1 +ARG VERSION=6.2.0 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.2.1 +ARG VERSION=6.2.0 LABEL maintainer="Cryptographic Triangles Team" LABEL description="Cryptographic Triangles (TRI) headless daemon" -LABEL version="6.2.1" +LABEL version="6.2.0" 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 232fb6b..6b7e695 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.2.1 + image: cryptographic-triangles/trianglesd:6.2.0 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 66a3fa9..d9b5c78 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.2.1/Cryptographic-Triangles-v6.2.1-linux-x64-qt + url: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.2.0/Cryptographic-Triangles-v6.2.0-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.2.1/Cryptographic-Triangles-v6.2.1-linux-x64-daemon + url: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.2.0/Cryptographic-Triangles-v6.2.0-linux-x64-daemon sha256: 4d2ab25d61127d6aff3e6f3069556d04f4b823f8849e97629c12871ad4779517 dest-filename: trianglesd-linux diff --git a/packaging/rpm/build-rpm.sh b/packaging/rpm/build-rpm.sh index 0277550..f40267c 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.2.1" +VERSION="6.2.0" 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 101b7a1..f7cdf31 100644 --- a/packaging/rpm/triangles.spec +++ b/packaging/rpm/triangles.spec @@ -1,5 +1,5 @@ Name: triangles -Version: 6.2.1 +Version: 6.2.0 Release: 1%{?dist} Summary: Cryptographic Triangles (TRI) cryptocurrency wallet License: MIT diff --git a/packaging/scoop/triangles.json b/packaging/scoop/triangles.json index 99d803b..f51c856 100644 --- a/packaging/scoop/triangles.json +++ b/packaging/scoop/triangles.json @@ -1,11 +1,11 @@ { - "version": "6.2.1", + "version": "6.2.0", "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.2.1/Cryptographic-Triangles-6.2.1-win-x64.zip", + "url": "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.2.0/Cryptographic-Triangles-6.2.0-win-x64.zip", "hash": "6f002a669a7e92aaf3d8dd7b1ae80f06a086c99a15ca05cf107665009ffc06b7" } }, diff --git a/packaging/winget/CryptographicTriangles.TrianglesQt.yaml b/packaging/winget/CryptographicTriangles.TrianglesQt.yaml index 1e975af..2e579d7 100644 --- a/packaging/winget/CryptographicTriangles.TrianglesQt.yaml +++ b/packaging/winget/CryptographicTriangles.TrianglesQt.yaml @@ -1,5 +1,5 @@ PackageIdentifier: CryptographicTriangles.TrianglesQt -PackageVersion: 6.2.1 +PackageVersion: 6.2.0 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.2.1/Cryptographic-Triangles-6.2.1-win-x64.zip + InstallerUrl: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.2.0/Cryptographic-Triangles-6.2.0-win-x64.zip InstallerSha256: 6F002A669A7E92AAF3D8DD7B1AE80F06A086C99A15CA05CF107665009FFC06B7 ManifestType: singleton ManifestVersion: 1.6.0 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index a0c212a..d16ad69 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: triangles base: core22 -version: '6.2.1' +version: '6.2.0' 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.2.1/Cryptographic-Triangles-v6.2.1-linux-x64-qt + source: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.2.0/Cryptographic-Triangles-v6.2.0-linux-x64-qt source-type: file organize: - Cryptographic-Triangles-v6.2.1-linux-x64-qt: bin/triangles-qt + Cryptographic-Triangles-v6.2.0-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.2.1/Cryptographic-Triangles-v6.2.1-linux-x64-daemon + source: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v6.2.0/Cryptographic-Triangles-v6.2.0-linux-x64-daemon source-type: file organize: - Cryptographic-Triangles-v6.2.1-linux-x64-daemon: bin/trianglesd + Cryptographic-Triangles-v6.2.0-linux-x64-daemon: bin/trianglesd desktop-entry: plugin: dump diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 99b6149..8c644ba 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -64,14 +64,6 @@ namespace Checkpoints // mapCheckpoints / mapCheckpointsTestnet. static std::map mapSnapshotHashes = { { 2206004, uint256("0x1419282dae817315ee1b955543f6248233fe5800f5e8488734a0ece5bd6781ea")}, - // v6.2.1 — canonical snapshot at current chain tip 2,224,763, generated - // 2026-07-30 by the operator via `triangles-cli dumputxoset` on DNS2. - // SHA256 verified against manifest.json on SAMI-PC. Blockhash matches - // DNS2/DNS3 chain tip. Snapshot is signed by wallet - // TUJ8fne8yf4BEypsp6kENY2dCkivFuXhka per manifest.json. Use this to - // skip the 24-hour bootstrap.dat walk on SAMI-PC (the only node with - // a non-zero wallet balance) and unstick the chain. - { 2224763, uint256("0xa7ea62ad4e158faf07973e5cd1539c1895154c4e28685a3eb7af458a001037b7")}, }; static std::map mapSnapshotHashesTestnet = { @@ -361,14 +353,14 @@ namespace Checkpoints bool SetCheckpointPrivKey(std::string strPrivKey) { - (void)strPrivKey; - return error("SetCheckpointPrivKey: synchronized checkpoints are disabled"); + (void)strPrivKey; + return error("SetCheckpointPrivKey: synchronized checkpoints are disabled"); } bool SendSyncCheckpoint(uint256 hashCheckpoint) { - (void)hashCheckpoint; - return error("SendSyncCheckpoint: synchronized checkpoints are disabled"); + (void)hashCheckpoint; + return error("SendSyncCheckpoint: synchronized checkpoints are disabled"); } // Is the sync-checkpoint outside maturity window? @@ -389,11 +381,11 @@ const std::string CSyncCheckpoint::strMasterPubKey = ""; std::string CSyncCheckpoint::strMasterPrivKey = ""; // triangles: verify signature of sync-checkpoint message -// The master-key system is disabled. Reject these legacy messages instead of -// treating unsigned data as authenticated if a dispatcher is added later. +// The master-key system is disabled. Reject these legacy messages instead of +// treating unsigned data as authenticated if a dispatcher is added later. bool CSyncCheckpoint::CheckSignature() { - return error("CSyncCheckpoint::CheckSignature: synchronized checkpoints are disabled"); + return error("CSyncCheckpoint::CheckSignature: synchronized checkpoints are disabled"); } // triangles: process synchronized checkpoint diff --git a/src/clientversion.h b/src/clientversion.h index a7c2f42..a029a2d 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -8,7 +8,7 @@ // 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 2 -#define CLIENT_VERSION_REVISION 1 +#define CLIENT_VERSION_REVISION 0 #define CLIENT_VERSION_BUILD 0 // Converts the parameter X to a string after macro replacement on X has been performed.