use GOBIN instead of GOPATH when installing stackup-bundler

0xFableOrg · Sep 29, 2023 · e16c573 · e16c573
1 parent 6082374
commit e16c573
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/account_abstraction.py b/account_abstraction.py
@@ -61,9 +61,12 @@ def setup():
     log_file = "logs/install_bundler.log"
     print(f"Installing stackup bundler. Logging to {log_file}")
 
+    env = {**os.environ, "GOBIN": os.path.abspath("bin")}
+
     lib.run_roll_log(
         "install stackup bundler",
         f"go install {github_url}@{version}",
+        env=env,
         log_file=log_file)
 
     # === build paymaster dependencies ===

diff --git a/deps.py b/deps.py
@@ -215,10 +215,6 @@ def go_path_setup():
     if os.path.isfile("bin/go"):
         os.environ.pop("GOROOT", None)  # works if GOROOT isn't set
 
-    # make sure that GOPATH is set in PATH (this is needed for 4337 bundler)
-    gopath = lib.run("get GOPATH", "go env GOPATH").strip()
-    lib.prepend_to_path(gopath + "/bin")
-
 
 ####################################################################################################