Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = ["crates/*"]
resolver = "2"

[workspace.package]
version = "0.16.3"
version = "0.17.0"
edition = "2021"
rust-version = "1.87"
authors = ["init4"]
Expand Down Expand Up @@ -34,19 +34,19 @@ debug = false
incremental = false

[workspace.dependencies]
signet-bundle = { version = "0.16.3", path = "crates/bundle" }
signet-constants = { version = "0.16.3", path = "crates/constants" }
signet-evm = { version = "0.16.3", path = "crates/evm" }
signet-extract = { version = "0.16.3", path = "crates/extract" }
signet-journal = { version = "0.16.3", path = "crates/journal" }
signet-node = { version = "0.16.3", path = "crates/node" }
signet-orders = { version = "0.16.3", path = "crates/orders" }
signet-sim = { version = "0.16.3", path = "crates/sim" }
signet-types = { version = "0.16.3", path = "crates/types" }
signet-tx-cache = { version = "0.16.3", path = "crates/tx-cache" }
signet-zenith = { version = "0.16.3", path = "crates/zenith" }
signet-bundle = { version = "0.17.0", path = "crates/bundle" }
signet-constants = { version = "0.17.0", path = "crates/constants" }
signet-evm = { version = "0.17.0", path = "crates/evm" }
signet-extract = { version = "0.17.0", path = "crates/extract" }
signet-journal = { version = "0.17.0", path = "crates/journal" }
signet-node = { version = "0.17.0", path = "crates/node" }
signet-orders = { version = "0.17.0", path = "crates/orders" }
signet-sim = { version = "0.17.0", path = "crates/sim" }
signet-types = { version = "0.17.0", path = "crates/types" }
signet-tx-cache = { version = "0.17.0", path = "crates/tx-cache" }
signet-zenith = { version = "0.17.0", path = "crates/zenith" }

signet-test-utils = { version = "0.16.3", path = "crates/test-utils" }
signet-test-utils = { version = "0.17.0", path = "crates/test-utils" }

# trevm
trevm = { version = "0.34.2", features = ["full_env_cfg", "asyncdb"] }
Expand Down
17 changes: 10 additions & 7 deletions crates/tx-cache/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -418,15 +418,18 @@ pub struct TxKey {
}

/// The query object keys for the bundle GET endpoint.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
///
/// Cursor for the `block_number_index` GSI: paginates bundles for a given
/// target block in score-descending order.
#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
#[serde(rename_all = "camelCase")]
pub struct BundleKey {
/// The bundle id
/// The bundle id.
pub id: Uuid,
/// The bundle score
/// The bundle score.
pub score: u64,
/// The global bundle score key
pub global_bundle_score_key: String,
/// The bundle's target block number.
pub target_block_number: u64,
}

/// The query object keys for the order GET endpoint.
Expand Down Expand Up @@ -586,9 +589,9 @@ mod tests {

let cache_response = CacheResponse::paginated(
BundleList { bundles: vec![dummy_bundle_with_id(uuid)] },
BundleKey { id: uuid, score: 100, global_bundle_score_key: "gbsk".to_string() },
BundleKey { id: uuid, score: 100, target_block_number: 42 },
);
let expected_json = r#"{"bundles":[{"id":"5932d4bb-58d9-41a9-851d-8dd7f04ccc33","bundle":{"txs":[],"blockNumber":"0x0","replacementUuid":"5932d4bb-58d9-41a9-851d-8dd7f04ccc33"}}],"nextCursor":{"id":"5932d4bb-58d9-41a9-851d-8dd7f04ccc33","score":100,"globalBundleScoreKey":"gbsk"}}"#;
let expected_json = r#"{"bundles":[{"id":"5932d4bb-58d9-41a9-851d-8dd7f04ccc33","bundle":{"txs":[],"blockNumber":"0x0","replacementUuid":"5932d4bb-58d9-41a9-851d-8dd7f04ccc33"}}],"nextCursor":{"id":"5932d4bb-58d9-41a9-851d-8dd7f04ccc33","score":100,"targetBlockNumber":42}}"#;
let serialized = serde_json::to_string(&cache_response).unwrap();
assert_eq!(serialized, expected_json);
let deserialized =
Expand Down