From b0259dc8b123b24e0a7c1cba917dbaa9f93da2d5 Mon Sep 17 00:00:00 2001
From: danidrasovean <112827213+danidrasovean@users.noreply.github.com>
Date: Wed, 4 Mar 2026 15:39:08 +0200
Subject: [PATCH 1/2] Install golang based on system architecture

---
 multiversx_sdk_cli/config.py               |  6 +++---
 multiversx_sdk_cli/dependencies/modules.py | 20 +++++++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/multiversx_sdk_cli/config.py b/multiversx_sdk_cli/config.py
index 32bc427c..be7b6688 100644
--- a/multiversx_sdk_cli/config.py
+++ b/multiversx_sdk_cli/config.py
@@ -129,9 +129,9 @@ def get_defaults() -> dict[str, Any]:
     return {
         "dependencies.golang.resolution": "SDK",
         "dependencies.golang.tag": "go1.23.10",
-        "dependencies.golang.urlTemplate.linux": "https://golang.org/dl/{TAG}.linux-amd64.tar.gz",
-        "dependencies.golang.urlTemplate.osx": "https://golang.org/dl/{TAG}.darwin-amd64.tar.gz",
-        "dependencies.golang.urlTemplate.windows": "https://golang.org/dl/{TAG}.windows-amd64.zip",
+        "dependencies.golang.urlTemplate.linux": "https://golang.org/dl/{TAG}.linux-{ARCH}.tar.gz",
+        "dependencies.golang.urlTemplate.osx": "https://golang.org/dl/{TAG}.darwin-{ARCH}.tar.gz",
+        "dependencies.golang.urlTemplate.windows": "https://golang.org/dl/{TAG}.windows-{ARCH}.zip",
         "dependencies.testwallets.tag": "v1.0.0",
         "dependencies.testwallets.urlTemplate.linux": "https://github.com/multiversx/mx-sdk-testwallets/archive/{TAG}.tar.gz",
         "dependencies.testwallets.urlTemplate.osx": "https://github.com/multiversx/mx-sdk-testwallets/archive/{TAG}.tar.gz",
diff --git a/multiversx_sdk_cli/dependencies/modules.py b/multiversx_sdk_cli/dependencies/modules.py
index 3d2c4df9..5bb88ef2 100644
--- a/multiversx_sdk_cli/dependencies/modules.py
+++ b/multiversx_sdk_cli/dependencies/modules.py
@@ -1,4 +1,5 @@
 import logging
+import platform
 import os
 import shutil
 from os import path
@@ -122,13 +123,22 @@ def get_parent_directory(self) -> Path:
         return config.get_dependency_parent_directory(self.key)
 
     def _get_download_url(self, tag: str) -> str:
-        platform = workstation.get_platform()
+        plat = workstation.get_platform()
 
-        url = config.get_dependency_url(self.key, tag, platform)
+        url = config.get_dependency_url(self.key, tag, plat)
         if not url:
-            raise errors.PlatformNotSupported(self.key, platform)
-
-        url = url.replace("{TAG}", tag)
+            raise errors.PlatformNotSupported(self.key, plat)
+
+        machine = platform.machine().lower()
+        arch_map = {
+            "x86_64": "amd64",
+            "amd64": "amd64",
+            "aarch64": "arm64",
+            "arm64": "arm64",
+        }
+        arch = arch_map.get(machine, "amd64")
+
+        url = url.replace("{TAG}", tag).replace("{ARCH}", arch)
         return url
 
     def _get_archive_path(self, tag: str) -> Path:

From 2cdf22b022f7dfa36b2566d4337683c61c49e748 Mon Sep 17 00:00:00 2001
From: danidrasovean <112827213+danidrasovean@users.noreply.github.com>
Date: Thu, 5 Mar 2026 10:10:02 +0200
Subject: [PATCH 2/2] Cancel osx and windows update

---
 multiversx_sdk_cli/config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/multiversx_sdk_cli/config.py b/multiversx_sdk_cli/config.py
index be7b6688..fb0e0659 100644
--- a/multiversx_sdk_cli/config.py
+++ b/multiversx_sdk_cli/config.py
@@ -130,8 +130,8 @@ def get_defaults() -> dict[str, Any]:
         "dependencies.golang.resolution": "SDK",
         "dependencies.golang.tag": "go1.23.10",
         "dependencies.golang.urlTemplate.linux": "https://golang.org/dl/{TAG}.linux-{ARCH}.tar.gz",
-        "dependencies.golang.urlTemplate.osx": "https://golang.org/dl/{TAG}.darwin-{ARCH}.tar.gz",
-        "dependencies.golang.urlTemplate.windows": "https://golang.org/dl/{TAG}.windows-{ARCH}.zip",
+        "dependencies.golang.urlTemplate.osx": "https://golang.org/dl/{TAG}.darwin-amd64.tar.gz",
+        "dependencies.golang.urlTemplate.windows": "https://golang.org/dl/{TAG}.windows-amd64.zip",
         "dependencies.testwallets.tag": "v1.0.0",
         "dependencies.testwallets.urlTemplate.linux": "https://github.com/multiversx/mx-sdk-testwallets/archive/{TAG}.tar.gz",
         "dependencies.testwallets.urlTemplate.osx": "https://github.com/multiversx/mx-sdk-testwallets/archive/{TAG}.tar.gz",