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
6 changes: 3 additions & 3 deletions 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 mithril-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ fixed = "1.31.0"
hex = { workspace = true }
kes-summed-ed25519 = { version = "0.2.1", features = ["serde_enabled", "sk_clone_enabled"] }
mithril-merkle-tree = { path = "../internal/mithril-merkle-tree", version = "0.1.4" }
mithril-stm = { path = "../mithril-stm", version = "0.12.5", default-features = false }
mithril-stm = { path = "../mithril-stm", version = "0.12.6", default-features = false }
nom = "8.0.0"
rand_chacha = { workspace = true }
rand_core = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion mithril-signer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "mithril-signer"
version = "1.1.7"
version = "1.1.8"
description = "A Mithril Signer"
authors = { workspace = true }
edition = { workspace = true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,13 @@ impl FakeAggregatorRoutesState {
}
}

fn internal_server_error(err: StdError) -> Response {
(StatusCode::INTERNAL_SERVER_ERROR, Json(err.to_string())).into_response()
fn internal_server_error(err: StdError) -> (StatusCode, Json<String>) {
(StatusCode::INTERNAL_SERVER_ERROR, Json(err.to_string()))
}

async fn epoch_settings(state: State<FakeAggregatorRoutesState>) -> Result<Response, Response> {
async fn epoch_settings(
state: State<FakeAggregatorRoutesState>,
) -> Result<Response, (StatusCode, Json<String>)> {
slog::debug!(state.logger, "/epoch-settings");

if state.store.read().await.withhold_epoch_settings {
Expand Down
2 changes: 1 addition & 1 deletion mithril-stm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "mithril-stm"
version = "0.12.5"
version = "0.12.6"
edition = { workspace = true }
authors = { workspace = true }
homepage = { workspace = true }
Expand Down
3 changes: 2 additions & 1 deletion mithril-stm/src/circuits/halo2_ivc/embedded_assets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ use crate::signature_scheme::{SchnorrVerificationKey, StandardSchnorrSignature};
pub(crate) fn jubjub_base_from_raw_le_bytes(bytes: &[u8]) -> NativeField {
assert_eq!(bytes.len(), 32);
let mut limbs = [0u64; 4];
for (limb, chunk) in limbs.iter_mut().zip(bytes.chunks_exact(8)) {
let (chunks, _remainder) = bytes.as_chunks::<8>();
for (limb, chunk) in limbs.iter_mut().zip(chunks) {
let mut le_bytes = [0u8; 8];
le_bytes.copy_from_slice(chunk);
*limb = u64::from_le_bytes(le_bytes);
Expand Down
6 changes: 3 additions & 3 deletions mithril-stm/src/hash/poseidon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ impl FixedOutput for MidnightPoseidonDigest {
// The data is padded during the call to the update function
// so there should always be a multiple of 32 bytes in the buffer
// We are taking chunks of 32 u8 so it should be fine to unwrap
let poseidon_input = self
.buffer
.chunks_exact(32)
let (chunks, _remainder) = self.buffer.as_chunks::<32>();
let poseidon_input = chunks
.iter()
.map(|chunk| {
// The from_raw function performs a modular reduction so
// it will never fail even if the buffer value exceeds
Expand Down
2 changes: 1 addition & 1 deletion mithril-test-lab/mithril-end-to-end/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "mithril-end-to-end"
version = "0.5.12"
version = "0.5.13"
authors = { workspace = true }
edition = { workspace = true }
documentation = { workspace = true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ impl CardanoDbV2Command {
"--include-ancillary".to_string(),
"--allow-override".to_string(),
"--download-dir".to_string(),
format!("v2"),
"v2".to_string(),
hash.clone(),
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ pub async fn compute_mithril_stake_distribution_signatures(
Ok(signatures)
},
timeout,
format!("Compute signatures for MithrilStakeDistribution signed entity"),
"Compute signatures for MithrilStakeDistribution signed entity".to_string(),
format!("Computing signatures timeout after {timeout:?}")
)
}
Expand Down Expand Up @@ -184,7 +184,7 @@ pub async fn compute_immutable_files_signatures(
Ok((beacon, signatures))
},
timeout,
format!("Compute signatures for CardanoImmutableFiles signed entity"),
"Compute signatures for CardanoImmutableFiles signed entity".to_string(),
format!("Computing signatures timeout after {timeout:?}")
)
}
6 changes: 3 additions & 3 deletions mithril-test-lab/mithril-end-to-end/src/stress_test/wait.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pub async fn for_certificates(
.map_err(|e| anyhow!(e).context("Request first certificate failure"))
},
timeout,
format!("Waiting for certificates"),
"Waiting for certificates".to_string(),
format!("Aggregator did not get a response after {timeout:?} from '{url}'")
)
}
Expand All @@ -153,7 +153,7 @@ pub async fn for_mithril_stake_distribution_artifacts(
.map_err(|e| anyhow!(e).context("Request first mithril stake distribution failure"))
},
timeout,
format!("Waiting for mithril stake distribution artifacts"),
"Waiting for mithril stake distribution artifacts".to_string(),
format!("Aggregator did not get a response after {timeout:?} from '{url}'")
)
}
Expand All @@ -174,7 +174,7 @@ pub async fn for_immutable_files_artifacts(
.map_err(|e| anyhow!(e).context("Request first snapshot failure"))
},
timeout,
format!("Waiting for immutable files artifacts"),
"Waiting for immutable files artifacts".to_string(),
format!("Aggregator did not get a response after {timeout:?} from '{url}'")
)
}
Loading