Skip to content

chore: merge main#1531

Merged
Mirko-von-Leipzig merged 10 commits intonextfrom
mirko/merge-main
Jan 20, 2026
Merged

chore: merge main#1531
Mirko-von-Leipzig merged 10 commits intonextfrom
mirko/merge-main

Conversation

@Mirko-von-Leipzig
Copy link
Collaborator

This merges the main into next which include the v0.12.7 and v0.12.8 changes.

This was mostly smooth sailing, except the ntx fixes which were ported manually since the original v0.12 code has been refactored to the actor model. For reference these are the relevant changelog entries:

  • Network transaction builder now marks notes from any error as failed (#1508).
  • Network transaction builder now adheres to note limit set by protocol (#1508).

Mirko-von-Leipzig and others added 8 commits January 12, 2026 14:50
…dition fixed (#1508)

Fixes several issues:
- Race condition in the store's `apply_block`
  - A request cancellation (e.g. due to timeout from gRPC client) halts the process in some arbitrary location. 
  - Solved by moving the process to a spawned task so it isn't cancelled by the gRPC method.
- Ntx builder not adhering to the protocol note limit in the checker
- Ntx builder not notes from error'd txs as failed
- Improve telemetry more
This enables the trace feature in deadpool which is otherwise disabled by default.

This means that tracing hasn't worked inside any of our database interactions since these are passed into deadpool which only passes the span on if trace is enabled.
Copy link
Contributor

@bobbinth bobbinth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Thank you! I left one small question inline.

@Mirko-von-Leipzig Mirko-von-Leipzig merged commit d6e3c84 into next Jan 20, 2026
7 checks passed
@Mirko-von-Leipzig Mirko-von-Leipzig deleted the mirko/merge-main branch January 20, 2026 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants