From 0db165e1a57c80c3d4cd31f0cad935d889c111be Mon Sep 17 00:00:00 2001 From: Arsenii Kulikov Date: Wed, 16 Oct 2024 15:37:10 +0400 Subject: [PATCH 1/2] fix: correctly handle b as pre-release in Vyper version --- crates/compilers/src/compilers/vyper/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/compilers/src/compilers/vyper/mod.rs b/crates/compilers/src/compilers/vyper/mod.rs index fa64c3edc..94f154bab 100644 --- a/crates/compilers/src/compilers/vyper/mod.rs +++ b/crates/compilers/src/compilers/vyper/mod.rs @@ -177,7 +177,7 @@ impl Vyper { trace!(?output); if output.status.success() { let stdout = String::from_utf8_lossy(&output.stdout); - Ok(Version::from_str(&stdout.trim().replace("rc", "-rc"))?) + Ok(Version::from_str(&stdout.trim().replace("rc", "-rc").replace("b", "-b"))?) } else { Err(SolcError::solc_output(&output)) } From e2946b05a520451c832b016828c2deda7ed1626a Mon Sep 17 00:00:00 2001 From: Arsenii Kulikov Date: Wed, 16 Oct 2024 15:43:32 +0400 Subject: [PATCH 2/2] a --- crates/compilers/src/compilers/vyper/mod.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/compilers/src/compilers/vyper/mod.rs b/crates/compilers/src/compilers/vyper/mod.rs index 94f154bab..1b3511241 100644 --- a/crates/compilers/src/compilers/vyper/mod.rs +++ b/crates/compilers/src/compilers/vyper/mod.rs @@ -177,7 +177,9 @@ impl Vyper { trace!(?output); if output.status.success() { let stdout = String::from_utf8_lossy(&output.stdout); - Ok(Version::from_str(&stdout.trim().replace("rc", "-rc").replace("b", "-b"))?) + Ok(Version::from_str( + &stdout.trim().replace("rc", "-rc").replace("b", "-b").replace("a", "-a"), + )?) } else { Err(SolcError::solc_output(&output)) }