Improve platform architecture management for Vyper compiler (#1776)

* Only log Vyper downloaded on success * add architecture checks for vyper compiler on mac and improve logging
ethereum · Jan 2, 2025 · 401b8ea · 401b8ea
1 parent d554973
commit 401b8ea
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 20 deletions.
diff --git a/packages/lib-sourcify/test/compiler/vyperCompiler.ts b/packages/lib-sourcify/test/compiler/vyperCompiler.ts
@@ -10,7 +10,10 @@ import { logDebug, logError, logWarn } from '../../src/lib/logger';
 const HOST_VYPER_REPO = 'https://github.com/vyperlang/vyper/releases/download/';
 
 export function findVyperPlatform(): string | false {
-  if (process.platform === 'darwin') {
+  if (
+    process.platform === 'darwin' &&
+    (process.arch === 'x64' || process.arch === 'arm64')
+  ) {
     return 'darwin';
   }
   if (process.platform === 'linux' && process.arch === 'x64') {
@@ -37,13 +40,20 @@ export async function useVyperCompiler(
   vyperJsonInput: VyperJsonInput,
 ): Promise<VyperOutput> {
   const vyperPlatform = findVyperPlatform();
-  let vyperPath;
-  if (vyperPlatform) {
-    vyperPath = await getVyperExecutable(vyperRepoPath, vyperPlatform, version);
+  if (!vyperPlatform) {
+    throw new Error('Vyper is not supported on this machine.');
   }
 
+  const vyperPath = await getVyperExecutable(
+    vyperRepoPath,
+    vyperPlatform,
+    version,
+  );
+
   if (!vyperPath) {
-    throw new Error('Vyper path not found');
+    throw new Error(
+      'Vyper path not found. Maybe an incorrect version was provided.',
+    );
   }
 
   let compiled: string | undefined;
@@ -102,11 +112,13 @@ export async function getVyperExecutable(
     version,
     fileName,
   );
-  logDebug('Downloaded vyper', {
-    version,
-    vyperPath,
-    platform,
-  });
+  if (success) {
+    logDebug('Downloaded vyper', {
+      version,
+      vyperPath,
+      platform,
+    });
+  }
   if (success && !validateVyperPath(vyperPath)) {
     logError('Cannot validate vyper', {
       version,

diff --git a/services/server/src/server/services/compiler/local/vyperCompiler.ts b/services/server/src/server/services/compiler/local/vyperCompiler.ts
@@ -10,7 +10,10 @@ import { asyncExec, fetchWithBackoff } from "./common";
 const HOST_VYPER_REPO = "https://github.com/vyperlang/vyper/releases/download/";
 
 export function findVyperPlatform(): string | false {
-  if (process.platform === "darwin") {
+  if (
+    process.platform === "darwin" &&
+    (process.arch === "x64" || process.arch === "arm64")
+  ) {
     return "darwin";
   }
   if (process.platform === "linux" && process.arch === "x64") {
@@ -37,13 +40,20 @@ export async function useVyperCompiler(
   vyperJsonInput: VyperJsonInput,
 ): Promise<VyperOutput> {
   const vyperPlatform = findVyperPlatform();
-  let vyperPath;
-  if (vyperPlatform) {
-    vyperPath = await getVyperExecutable(vyperRepoPath, vyperPlatform, version);
+  if (!vyperPlatform) {
+    throw new Error("Vyper is not supported on this machine.");
   }
 
+  const vyperPath = await getVyperExecutable(
+    vyperRepoPath,
+    vyperPlatform,
+    version,
+  );
+
   if (!vyperPath) {
-    throw new Error("Vyper path not found");
+    throw new Error(
+      "Vyper path not found. Maybe an incorrect version was provided.",
+    );
   }
 
   let compiled: string | undefined;
@@ -112,11 +122,13 @@ export async function getVyperExecutable(
     version,
     fileName,
   );
-  logger.debug("Downloaded vyper", {
-    version,
-    vyperPath,
-    platform,
-  });
+  if (success) {
+    logger.debug("Downloaded vyper", {
+      version,
+      vyperPath,
+      platform,
+    });
+  }
   if (success && !validateVyperPath(vyperPath)) {
     logger.error("Cannot validate vyper", {
       version,