Skip to content

Commit

Permalink
Merge branch 'master' into release/v0.41.5
Browse files Browse the repository at this point in the history
  • Loading branch information
AurelienFT authored Feb 3, 2025
2 parents 0207494 + f568eb9 commit 1422ed8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- [2553](https://github.com/FuelLabs/fuel-core/pull/2553): Scaffold global merkle root storage crate.
- [2598](https://github.com/FuelLabs/fuel-core/pull/2598): Add initial test suite for global merkle root storage updates.
- [2635](https://github.com/FuelLabs/fuel-core/pull/2635): Add metrics to gas price service
- [2664](https://github.com/FuelLabs/fuel-core/pull/2664): Add print with all information when a transaction is refused because of a collision.

### Fixed
- [2632](https://github.com/FuelLabs/fuel-core/pull/2632): Improved performance of certain async trait impls in the gas price service.
Expand Down
9 changes: 9 additions & 0 deletions crates/services/txpool_v2/src/pool/collisions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@ where

for (collision, reason) in self.iter() {
if !is_better_than_collision(tx, collision, storage)? {
tracing::info!(
"Transaction {} collided with {} because of {:?}",
tx.id(),
storage
.get(collision)
.map(|d| d.transaction.id().to_string())
.unwrap_or(String::from("Error")),
reason
);
if let Some(reason) = reason.first() {
return Err(reason.clone());
} else {
Expand Down

0 comments on commit 1422ed8

Please sign in to comment.