Skip to content

Commit

Permalink
Merge pull request #2737 from CounterpartyXCP/mergemaster
Browse files Browse the repository at this point in the history
Merge `master` in `develop`
  • Loading branch information
ouziel-slama authored Nov 19, 2024
2 parents 66f5cb8 + 0645546 commit 50a9178
Show file tree
Hide file tree
Showing 12 changed files with 64 additions and 38 deletions.
2 changes: 1 addition & 1 deletion apiary.apib
Original file line number Diff line number Diff line change
Expand Up @@ -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/",
Expand Down
2 changes: 1 addition & 1 deletion counterparty-core/counterpartycore/lib/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
4 changes: 2 additions & 2 deletions counterparty-core/counterpartycore/lib/messages/fairmint.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions counterparty-core/counterpartycore/lib/messages/fairminter.py
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,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):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/",
Expand Down
2 changes: 1 addition & 1 deletion counterparty-core/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
counterparty-rs==10.7.1
2 changes: 1 addition & 1 deletion counterparty-rs/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion counterparty-rs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion counterparty-wallet/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 4 additions & 26 deletions release-notes/release-notes-v10.7.1.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release Notes - Counterparty Core v10.7.1 (2024-11-??)

# 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

Expand All @@ -11,38 +11,16 @@

## Bugfixes

- Fix CORS headers for OPTIONS requests
- Fix rounding error on normalized quantity
- Use `null` instead of `''` for `asset_longname` and `asset_parent` fields
- Correctly catch `ValueError` in unpack endpoint
- Correctly catch `InvalidBase58Error` in compose endpoints
- Correctly catch `BitcoindRPCError` in get transaction info endpoint
- Fix typo in dispenser error messages (`has` -> `have`)
- Fix get balances endpoint when using `sort=asset`
- Catch all errors when using unpack endpoint with invalid data
- Restart RSFetcher when it returns `None`
- Clean up blocks without ledger hash before starting catch-up
- Don't inject details before publishing events with ZMQ
- Don't raise error on unpack exceptions

## Codebase


## API

- Add `sort` parameter for the get holders endpoint (sortable fields: `quantity`, `holding_type`, and `status`)
- Exclude blocks that are not finished being parsed
- Optimize events counts endpoints with `events_count` table
- Add route `/v2/utxos/withbalances` to check if utxos have balances
- Add `type` parameter for get balances endpoints (`all`, `utxo` or `address`)

## CLI

- Support the `SENTRY_SAMPLE_RATE` environment variable to set the Sentry sample rate
- Show help if no actions are provided
- Fix and rename `--check-asset-conservation` flag to `--skip-asset-conservation-check`

# Credits

* droplister
* Ouziel Slama
* Adam Krellenstein

48 changes: 48 additions & 0 deletions release-notes/release-notes-v10.7.2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Release Notes - Counterparty Core v10.7.2 (2024-11-??)



# Upgrading


# ChangeLog

## Protocol Changes

## Bugfixes

- Fix CORS headers for OPTIONS requests
- Fix rounding error on normalized quantity
- Use `null` instead of `''` for `asset_longname` and `asset_parent` fields
- Correctly catch `ValueError` in unpack endpoint
- Correctly catch `InvalidBase58Error` in compose endpoints
- Correctly catch `BitcoindRPCError` in get transaction info endpoint
- Fix typo in dispenser error messages (`has` -> `have`)
- Fix get balances endpoint when using `sort=asset`
- Catch all errors when using unpack endpoint with invalid data
- Restart RSFetcher when it returns `None`
- Clean up blocks without ledger hash before starting catch-up
- Don't inject details before publishing events with ZMQ

## Codebase


## API

- Add `sort` parameter for the get holders endpoint (sortable fields: `quantity`, `holding_type`, and `status`)
- Exclude blocks that are not finished being parsed
- Optimize events counts endpoints with `events_count` table
- Add route `/v2/utxos/withbalances` to check if utxos have balances
- Add `type` parameter for get balances endpoints (`all`, `utxo` or `address`)

## CLI

- Support the `SENTRY_SAMPLE_RATE` environment variable to set the Sentry sample rate
- Show help if no actions are provided
- Fix and rename `--check-asset-conservation` flag to `--skip-asset-conservation-check`

# Credits

* droplister
* Ouziel Slama
* Adam Krellenstein

0 comments on commit 50a9178

Please sign in to comment.