From 8f87fd9912ef1198e638ba0afee292f49a808226 Mon Sep 17 00:00:00 2001 From: Ouziel Slama Date: Tue, 19 Nov 2024 11:06:43 +0000 Subject: [PATCH 1/3] Don't raise error on unpack error --- counterparty-core/counterpartycore/lib/messages/fairmint.py | 4 ++-- counterparty-core/counterpartycore/lib/messages/fairminter.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/counterparty-core/counterpartycore/lib/messages/fairmint.py b/counterparty-core/counterpartycore/lib/messages/fairmint.py index 57292f1a0c..578807f419 100644 --- a/counterparty-core/counterpartycore/lib/messages/fairmint.py +++ b/counterparty-core/counterpartycore/lib/messages/fairmint.py @@ -135,8 +135,8 @@ def unpack(message, return_dict=False): return {"asset": asset, "quantity": int(quantity)} return (asset, int(quantity)) - except Exception as e: - raise exceptions.UnpackError(f"Cannot unpack fair mint message: {e}") from e + except Exception: + return ("", 0) def parse(db, tx, message): diff --git a/counterparty-core/counterpartycore/lib/messages/fairminter.py b/counterparty-core/counterpartycore/lib/messages/fairminter.py index 21e15d8b6b..736bbf492c 100644 --- a/counterparty-core/counterpartycore/lib/messages/fairminter.py +++ b/counterparty-core/counterpartycore/lib/messages/fairminter.py @@ -382,8 +382,8 @@ def unpack(message, return_dict=False): bool(int(divisible)), description, ) - except Exception as e: - raise exceptions.UnpackError(f"Cannot unpack fair minter message: {e}") from e + except Exception: + return "", "", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.0, False, False, False, False, "" def parse(db, tx, message): From bcc08517707a677d7b726c8af25d2d47e08db509 Mon Sep 17 00:00:00 2001 From: Ouziel Slama Date: Tue, 19 Nov 2024 11:27:59 +0000 Subject: [PATCH 2/3] Bump version --- apiary.apib | 2 +- .../counterpartycore/lib/config.py | 2 +- .../test/regtest/apidoc/blueprint-template.md | 2 +- counterparty-core/requirements.txt | 2 +- counterparty-rs/Cargo.lock | 2 +- counterparty-rs/Cargo.toml | 2 +- counterparty-wallet/requirements.txt | 2 +- docker-compose.yml | 2 +- release-notes/release-notes-v10.7.1.md | 29 +++++++++++++++++++ 9 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 release-notes/release-notes-v10.7.1.md diff --git a/apiary.apib b/apiary.apib index 6721fa3f02..d4b8e7e1f9 100644 --- a/apiary.apib +++ b/apiary.apib @@ -1454,7 +1454,7 @@ Returns server information and the list of documented routes in JSON format. "result": { "server_ready": true, "network": "mainnet", - "version": "10.7.0", + "version": "10.7.1", "backend_height": 850214, "counterparty_height": 850214, "documentation": "https://counterpartycore.docs.apiary.io/", diff --git a/counterparty-core/counterpartycore/lib/config.py b/counterparty-core/counterpartycore/lib/config.py index 2d40a877bd..a99a700df3 100644 --- a/counterparty-core/counterpartycore/lib/config.py +++ b/counterparty-core/counterpartycore/lib/config.py @@ -5,7 +5,7 @@ # Semantic Version -__version__ = "10.7.0" # for hatch +__version__ = "10.7.1" # for hatch VERSION_STRING = __version__ version = VERSION_STRING.split("-")[0].split(".") VERSION_MAJOR = int(version[0]) diff --git a/counterparty-core/counterpartycore/test/regtest/apidoc/blueprint-template.md b/counterparty-core/counterpartycore/test/regtest/apidoc/blueprint-template.md index a53a3b0acb..170e901abc 100644 --- a/counterparty-core/counterpartycore/test/regtest/apidoc/blueprint-template.md +++ b/counterparty-core/counterpartycore/test/regtest/apidoc/blueprint-template.md @@ -158,7 +158,7 @@ Returns server information and the list of documented routes in JSON format. "result": { "server_ready": true, "network": "mainnet", - "version": "10.7.0", + "version": "10.7.1", "backend_height": 850214, "counterparty_height": 850214, "documentation": "https://counterpartycore.docs.apiary.io/", diff --git a/counterparty-core/requirements.txt b/counterparty-core/requirements.txt index ad95823b36..1114170602 100644 --- a/counterparty-core/requirements.txt +++ b/counterparty-core/requirements.txt @@ -35,4 +35,4 @@ yoyo-migrations==8.2.0 gunicorn==23.0.0 waitress==3.0.1 hypothesis==6.116.0 -counterparty-rs==10.7.0 \ No newline at end of file +counterparty-rs==10.7.1 \ No newline at end of file diff --git a/counterparty-rs/Cargo.lock b/counterparty-rs/Cargo.lock index a9ed5f7233..ba26ebf633 100644 --- a/counterparty-rs/Cargo.lock +++ b/counterparty-rs/Cargo.lock @@ -394,7 +394,7 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "counterparty-rs" -version = "10.7.0" +version = "10.7.1" dependencies = [ "bip32", "bitcoin", diff --git a/counterparty-rs/Cargo.toml b/counterparty-rs/Cargo.toml index 29cf2aeafb..9531ac4737 100644 --- a/counterparty-rs/Cargo.toml +++ b/counterparty-rs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "counterparty-rs" -version = "10.7.0" +version = "10.7.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/counterparty-wallet/requirements.txt b/counterparty-wallet/requirements.txt index da6e1ef623..cf589cd257 100644 --- a/counterparty-wallet/requirements.txt +++ b/counterparty-wallet/requirements.txt @@ -5,4 +5,4 @@ colorlog==6.8.0 python-dateutil==2.8.2 requests==2.32.0 termcolor==2.4.0 -counterparty-core==10.7.0 +counterparty-core==10.7.1 diff --git a/docker-compose.yml b/docker-compose.yml index e687b3abd4..4ec13628e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,7 +15,7 @@ x-addrindexrs-common: &addrindexrs-common restart: unless-stopped x-counterparty-common: &counterparty-common - image: counterparty/counterparty:v10.7.0 + image: counterparty/counterparty:v10.7.1 stop_grace_period: 1m volumes: - data:/root/.bitcoin diff --git a/release-notes/release-notes-v10.7.1.md b/release-notes/release-notes-v10.7.1.md new file mode 100644 index 0000000000..cea5753d90 --- /dev/null +++ b/release-notes/release-notes-v10.7.1.md @@ -0,0 +1,29 @@ +# Release Notes - Counterparty Core v10.7.1 (2024-11-19) + +This is a hotfix release that must be installed immediately. It fixes a bug in the parsing of Fairminters transactions that crashes the server. + +# Upgrading + + +# ChangeLog + +## Protocol Changes + +## Bugfixes + +- Don't raise error on unpack exceptions + +## Codebase + +## API + +## CLI + + +# Credits + +* OpenStamp +* DerpHerpenstein +* Ouziel Slama +* Wilfred Denton +* Adam Krellenstein From 4c2fcde112fdcc08b9597ecaa0971ffa67cb9a07 Mon Sep 17 00:00:00 2001 From: Ouziel Slama Date: Tue, 19 Nov 2024 11:37:58 +0000 Subject: [PATCH 3/3] tweak --- release-notes/release-notes-v10.7.1.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/release-notes/release-notes-v10.7.1.md b/release-notes/release-notes-v10.7.1.md index cea5753d90..f06ea84fc0 100644 --- a/release-notes/release-notes-v10.7.1.md +++ b/release-notes/release-notes-v10.7.1.md @@ -22,8 +22,5 @@ This is a hotfix release that must be installed immediately. It fixes a bug in t # Credits -* OpenStamp -* DerpHerpenstein * Ouziel Slama -* Wilfred Denton -* Adam Krellenstein +