Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
SupernaviX committed Jan 21, 2025
1 parent 044ea10 commit 7b5c7ba
Show file tree
Hide file tree
Showing 12 changed files with 822 additions and 558 deletions.
947 changes: 559 additions & 388 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion firefly-balius/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ edition = "2021"
repository = "https://github.com/blockfrost/firefly-cardano"

[dependencies]
balius-sdk = { git = "https://github.com/txpipe/balius.git", rev = "a72601f" }
balius-sdk = { git = "https://github.com/txpipe/balius.git", rev = "cf2791d" }
18 changes: 9 additions & 9 deletions firefly-cardanoconnect/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ edition = "2021"
repository = "https://github.com/SundaeSwap-finance/firefly-cardano"

[dependencies]
aide = { version = "0.13", features = ["axum"] }
aide = { version = "0.14", features = ["axum", "axum-json", "axum-query"] }
anyhow = "1"
async-trait = "0.1"
axum = { version = "0.7", features = ["macros", "ws"] }
balius-runtime = { git = "https://github.com/txpipe/balius.git", rev = "a72601f" }
axum = { version = "0.8", features = ["macros", "ws"] }
balius-runtime = { git = "https://github.com/txpipe/balius.git", rev = "cf2791d" }
blockfrost = { git = "https://github.com/SupernaviX/blockfrost-rust.git", rev = "cfa7a5e", default-features = false, features = ["rustls-tls"] }
blockfrost-openapi = "0.1.69"
clap = { version = "4", features = ["derive"] }
chrono = "0.4"
dashmap = "6"
futures = "0.3"
pallas-addresses = "0.31"
pallas-codec = "0.31"
pallas-crypto = "0.31"
pallas-primitives = "0.31"
pallas-network = "0.31"
pallas-traverse = "0.31"
pallas-addresses = "0.32"
pallas-codec = "0.32"
pallas-crypto = "0.32"
pallas-primitives = "0.32"
pallas-network = "0.32"
pallas-traverse = "0.32"
firefly-server = { path = "../firefly-server" }
hex = "0.4"
minicbor = "0.25"
Expand Down
8 changes: 4 additions & 4 deletions firefly-cardanoconnect/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,18 +113,18 @@ async fn main() -> Result<()> {
.api_route("/contracts/deploy", post(deploy_contract))
.api_route("/contracts/invoke", post(invoke_contract))
.api_route("/transactions", post(submit_transaction))
.api_route("/transactions/:id", get(get_operation_status))
.api_route("/transactions/{id}", get(get_operation_status))
.api_route("/eventstreams", post(create_stream).get(list_streams))
.api_route(
"/eventstreams/:streamId",
"/eventstreams/{streamId}",
get(get_stream).patch(update_stream).delete(delete_stream),
)
.api_route(
"/eventstreams/:streamId/listeners",
"/eventstreams/{streamId}/listeners",
post(create_listener).get(list_listeners),
)
.api_route(
"/eventstreams/:streamId/listeners/:listenerId",
"/eventstreams/{streamId}/listeners/{listenerId}",
get(get_listener).delete(delete_listener),
)
.api_route("/chain/tip", get(get_chain_tip))
Expand Down
15 changes: 8 additions & 7 deletions firefly-cardanoconnect/src/routes/ws.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ async fn send_batch(socket: &mut WebSocket, topic: &str, batch: Batch) -> Result
.collect(),
};
let outgoing_json = serde_json::to_string(&outgoing_batch)?;
socket.send(Message::Text(outgoing_json)).await?;
socket.send(Message::Text(outgoing_json.into())).await?;

let Some(response) = read_message(socket).await? else {
bail!("socket was closed after sending a batch");
Expand Down Expand Up @@ -103,7 +103,7 @@ async fn send_operation(socket: &mut WebSocket, op: Operation) -> Result<()> {
error_message: op.status.error_message().map(|m| m.to_string()),
};
let outgoing_json = serde_json::to_string(&operation)?;
socket.send(Message::Text(outgoing_json)).await?;
socket.send(Message::Text(outgoing_json.into())).await?;
Ok(())
}
fn systemtime_to_rfc3339(value: SystemTime) -> String {
Expand Down Expand Up @@ -145,22 +145,23 @@ async fn read_message(socket: &mut WebSocket) -> Result<Option<IncomingMessage>>
warn!("socket has been closed");
return Ok(None);
};
let data = match message.context("could not read websocket message")? {
let message = message.context("could not read websocket message")?;
let data: &[u8] = match &message {
Message::Ping(_) | Message::Pong(_) => {
continue;
}
Message::Close(frame) => {
let reason = frame
.map(|f| f.reason.into_owned())
.as_ref()
.map(|f| f.reason.to_owned())
.unwrap_or("socket was closed".into());
warn!("socket was closed: {}", reason);
return Ok(None);
}
Message::Binary(bytes) => bytes,
Message::Text(string) => string.into_bytes(),
Message::Text(string) => string.as_bytes(),
};
let incoming =
serde_json::from_slice(&data).context("could not parse websocket message")?;
let incoming = serde_json::from_slice(data).context("could not parse websocket message")?;
return Ok(Some(incoming));
}
}
Expand Down
12 changes: 6 additions & 6 deletions firefly-cardanosigner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ edition = "2021"
repository = "https://github.com/SundaeSwap-finance/firefly-cardano"

[dependencies]
aide = { version = "0.13", features = ["axum"] }
axum = "0.7"
aide = { version = "0.14", features = ["axum", "axum-json"] }
axum = "0.8"
anyhow = "1"
bech32 = "0.11"
clap = { version = "4", features = ["derive"] }
firefly-server = { path = "../firefly-server" }
hex = "0.4"
minicbor = "0.25"
pallas-addresses = "0.31"
pallas-crypto = "0.31"
pallas-primitives = "0.31"
pallas-wallet = "0.31"
pallas-addresses = "0.32"
pallas-crypto = "0.32"
pallas-primitives = "0.32"
pallas-wallet = "0.32"
rand = "0.8"
schemars = "0.8"
serde = "1"
Expand Down
12 changes: 6 additions & 6 deletions firefly-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ edition = "2021"
repository = "https://github.com/SundaeSwap-finance/firefly-cardano"

[dependencies]
aide = { version = "0.13", features = ["axum"] }
axum = "0.7"
aide = { version = "0.14", features = ["axum", "axum-json"] }
axum = "0.8"
anyhow = "1"
convert_case = "0.6"
duration-str = "0.11"
convert_case = "0.7"
duration-str = "0.12"
figment = { version = "0.10", features = ["yaml", "env"] }
home = "0.5"
itertools = "0.13"
itertools = "0.14"
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
schemars = "0.8"
serde = "1"
Expand All @@ -21,4 +21,4 @@ tokio = "1"
tower-http = { version = "0.6", features = ["trace"] }
tracing = "0.1"
tracing-subscriber = "0.3"
utoipa-swagger-ui = { version = "8", features = ["axum"] }
utoipa-swagger-ui = { version = "9", features = ["axum"] }
2 changes: 1 addition & 1 deletion firefly-server/src/apitypes/no_content.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ impl OperationOutput for NoContent {
type Inner = Self;

fn inferred_responses(
_ctx: &mut aide::gen::GenContext,
_ctx: &mut aide::generate::GenContext,
_operation: &mut openapi::Operation,
) -> Vec<(Option<u16>, openapi::Response)> {
vec![(Some(204), openapi::Response::default())]
Expand Down
2 changes: 1 addition & 1 deletion scripts/deploy-contract/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ serde = { version = "1", features = ["derive"] }
tokio = { version = "1", features = ["full"] }
uuid = { version = "1", features = ["v4"] }
wat = "1"
wit-component = "0.221"
wit-component = "0.223"
Loading

0 comments on commit 7b5c7ba

Please sign in to comment.