harald/teepot
1
0
Fork 0
mirror of https://github.com/matter-labs/teepot.git synced 2025-07-21 15:13:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: bump rust version to 1.86

Browse source 
fixes the hardcoded `/usr/bin/strip` issue on macos

see https://github.com/rust-lang/rust/issues/131206

Signed-off-by: Harald Hoyer <harald@matterlabs.dev>
This commit is contained in:
Harald Hoyer 2025-04-07 13:41:53 +02:00
parent eb39705ff1
commit 0b8f1d54c7
Signed by: harald
GPG key ID: F519A1143B3FBE32
6 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bin/verify-era-proof-attestation/src/proof/types.rs
View file

@ -61,12 +61,12 @@ impl Proof {
pub fn is_permanently_ignored(&self) -> bool { pub fn is_permanently_ignored(&self) -> bool {
self.status self.status
.as_ref() .as_ref()
.map_or(false, |s| s.eq_ignore_ascii_case("permanently_ignored")) .is_some_and(|s| s.eq_ignore_ascii_case("permanently_ignored"))
} }
/// Check if the proof is failed or picked by a prover /// Check if the proof is failed or picked by a prover
pub fn is_failed_or_picked(&self) -> bool { pub fn is_failed_or_picked(&self) -> bool {
self.status.as_ref().map_or(false, |s| { self.status.as_ref().is_some_and(|s| {
s.eq_ignore_ascii_case("failed") || s.eq_ignore_ascii_case("picked_by_prover") s.eq_ignore_ascii_case("failed") || s.eq_ignore_ascii_case("picked_by_prover")
}) })
} }

2
crates/teepot-vault/src/client/mod.rs
View file

@ -222,7 +222,7 @@ impl TeeConnection {
if self if self
.args .args
.sgx_allowed_tcb_levels .sgx_allowed_tcb_levels
.map_or(true, |levels| !levels.contains(tcblevel)) .is_none_or(|levels| !levels.contains(tcblevel))
{ {
error!("Quote verification result: {}", tcblevel); error!("Quote verification result: {}", tcblevel);
return Err(Error::General(format!( return Err(Error::General(format!(

8
crates/teepot-vault/src/client/vault.rs
View file

@ -297,7 +297,7 @@ impl VaultConnection {
} }
/// set a secret in the vault /// set a secret in the vault
pub async fn store_secret<'de, T: serde::Serialize>( pub async fn store_secret<T: serde::Serialize>(
&self, &self,
val: T, val: T,
rel_path: &str, rel_path: &str,
@ -306,7 +306,7 @@ impl VaultConnection {
} }
/// set a secret in the vault for a different TEE /// set a secret in the vault for a different TEE
pub async fn store_secret_for_tee<'de, T: serde::Serialize>( pub async fn store_secret_for_tee<T: serde::Serialize>(
&self, &self,
tee_name: &str, tee_name: &str,
val: T, val: T,
@ -330,7 +330,7 @@ impl VaultConnection {
} }
/// get a secret from the vault /// get a secret from the vault
pub async fn load_secret<'de, T: serde::de::DeserializeOwned>( pub async fn load_secret<T: serde::de::DeserializeOwned>(
&self, &self,
rel_path: &str, rel_path: &str,
) -> Result<Option<T>, HttpResponseError> { ) -> Result<Option<T>, HttpResponseError> {
@ -338,7 +338,7 @@ impl VaultConnection {
} }
/// get a secret from the vault for a specific TEE /// get a secret from the vault for a specific TEE
pub async fn load_secret_for_tee<'de, T: serde::de::DeserializeOwned>( pub async fn load_secret_for_tee<T: serde::de::DeserializeOwned>(
&self, &self,
tee_name: &str, tee_name: &str,
rel_path: &str, rel_path: &str,

2
crates/teepot/src/quote/attestation.rs
View file

@ -81,7 +81,7 @@ pub fn get_quote_and_collateral(
} }
if tcblevel != TcbLevel::Ok if tcblevel != TcbLevel::Ok
&& allowed_tcb_levels.map_or(false, |levels| !levels.contains(tcblevel)) && allowed_tcb_levels.is_some_and(|levels| !levels.contains(tcblevel))
{ {
error!("Quote verification result: {}", tcblevel); error!("Quote verification result: {}", tcblevel);
bail!("Quote verification result: {}", tcblevel); bail!("Quote verification result: {}", tcblevel);

6
flake.lock generated
View file

@ -234,11 +234,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734661750, "lastModified": 1743993291,
"narHash": "sha256-BI58NBdimxu1lnpOrG9XxBz7Cwqy+qIf99zunWofX5w=", "narHash": "sha256-u8GHvduU1gCtoFXvTS/wGjH1ouv5S/GRGq6MAT+sG/k=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "7d3d910d5fd575e6e8c5600d83d54e5c47273bfe", "rev": "0cb3c8979c65dc6a5812dfe67499a8c7b8b4325b",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
rust-toolchain.toml
View file

@ -1,3 +1,3 @@
[toolchain] [toolchain]
channel = "1.83" channel = "1.86"
components = ["rustfmt", "clippy", "rust-src"] components = ["rustfmt", "clippy", "rust-src"]