From a86558f4bbfe5e39de7cb953f3a699c6526f666c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20P=C5=99evr=C3=A1til?= Date: Mon, 1 Jul 2024 19:21:02 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=80=20Revert=20"=E2=9A=97=EF=B8=8F=20T?= =?UTF-8?q?ry=20to=20enforce=20Rosetta=20installation=20when=20needed"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 478c1807e9b64b39a5fc31dd05ebdbe8220591fa. --- wake/cli/__main__.py | 11 +---------- wake/compiler/solc_frontend/solc_runner.py | 11 +---------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/wake/cli/__main__.py b/wake/cli/__main__.py index 04f9a96f7..ba479ee62 100644 --- a/wake/cli/__main__.py +++ b/wake/cli/__main__.py @@ -257,17 +257,8 @@ def wake_solc() -> None: console.print(f"solc version {version} is not installed.") sys.exit(1) - if ( - platform.system() == "Darwin" - and platform.machine() == "arm64" - and version < "0.8.24" - ): - args = ["arch", "-x86_64", str(solc_path)] + sys.argv[1:] - else: - args = [str(solc_path)] + sys.argv[1:] - proc = subprocess.run( - args, + [str(solc_path)] + sys.argv[1:], stdin=None, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, diff --git a/wake/compiler/solc_frontend/solc_runner.py b/wake/compiler/solc_frontend/solc_runner.py index 75297837e..50c359a06 100644 --- a/wake/compiler/solc_frontend/solc_runner.py +++ b/wake/compiler/solc_frontend/solc_runner.py @@ -1,6 +1,5 @@ import asyncio import logging -import platform import subprocess from pathlib import Path from typing import Dict @@ -65,15 +64,7 @@ async def __run_solc( raise SolcCompilationError( f"solc version `{target_version}` is not installed." ) - - if ( - platform.system() == "Darwin" - and platform.machine() == "arm64" - and target_version < "0.8.24" - ): - args = ["arch", "-x86_64", str(path.resolve()), "--standard-json"] - else: - args = [str(path.resolve()), "--standard-json"] + args = [str(path.resolve()), "--standard-json"] allow_paths = ",".join( str(path) for path in self.__config.compiler.solc.allow_paths