From d2b7ba7e3762e7b1ce2cd432118d9120df6052ac Mon Sep 17 00:00:00 2001
From: Bianca Ialangi <bianca.ialangi@multiversx.com>
Date: Thu, 10 Apr 2025 19:34:00 +0300
Subject: [PATCH] fix local build - add wasm-opt

---
 Dockerfile                                            | 11 +++++++++--
 integration_tests/previous_builds.py                  |  4 ++--
 .../build_metadata.py                                 |  4 ++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index af6b576..fbf7b35 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,9 @@
 FROM ubuntu:22.04
 
 # Constants
-ARG VERSION_RUST="1.85.0"
-ARG VERSION_SC_META="0.57.0"
+ARG VERSION_RUST="1.86.0"
+ARG VERSION_SC_META="0.57.1"
+ARG VERSION_WASM_OPT="0.116.1"
 ARG TARGETPLATFORM
 
 # Install system dependencies
@@ -29,6 +30,10 @@ RUN wget -O rustup.sh https://sh.rustup.rs && \
 RUN PATH="/rust/bin:${PATH}" CARGO_HOME=/rust RUSTUP_HOME=/rust cargo install multiversx-sc-meta --version ${VERSION_SC_META} --locked && \
     rm -rf /rust/registry
 
+# Install wasm-opt
+RUN PATH="/rust/bin:${PATH}" CARGO_HOME=/rust RUSTUP_HOME=/rust cargo install wasm-opt --version ${VERSION_WASM_OPT} --locked && \
+    rm -rf /rust/registry
+
 COPY "multiversx_sdk_rust_contract_builder" "/multiversx_sdk_rust_contract_builder"
 
 ENV PATH="/rust/bin:${PATH}"
@@ -37,6 +42,7 @@ ENV RUSTUP_HOME="/rust"
 ENV PYTHONPATH=/
 ENV BUILD_METADATA_VERSION_RUST=${VERSION_RUST}
 ENV BUILD_METADATA_VERSION_SC_META=${VERSION_SC_META}
+ENV BUILD_METADATA_VERSION_WASM_OPT=${VERSION_WASM_OPT}
 ENV BUILD_METADATA_TARGETPLATFORM=${TARGETPLATFORM}
 
 # Additional arguments (must be provided at "docker run"):
@@ -50,3 +56,4 @@ ENTRYPOINT ["python", "/multiversx_sdk_rust_contract_builder/main.py", \
 LABEL frozen="yes"
 LABEL rust=${VERSION_RUST}
 LABEL sc_meta=${VERSION_SC_META}
+LABEL wasm_opt=${VERSION_WASM_OPT}
diff --git a/integration_tests/previous_builds.py b/integration_tests/previous_builds.py
index 6acee46..83d3d72 100644
--- a/integration_tests/previous_builds.py
+++ b/integration_tests/previous_builds.py
@@ -59,8 +59,8 @@ def __init__(self, name: str,
         packaged_src_url=None,
         contract_name=None,
         expected_code_hashes={
-            "sov-esdt-safe": "34f6479356b2621328bbfac0f0e0833a55a8bd1948b5a0e2500fd66291f0ad88",
-            "fee-market": "0b81078e61efd692ebb3f83b437da9cf83ffff7843aeb0a66a71b5ddff3b2fb2"
+            "sov-esdt-safe": "ed622fd3b9ca435ec62b1df9f3b03ab8d4d14c2be4f24aff8eac5c12fed85859",
+            "fee-market": "ff0c9020182455c742565094c116ed1539fb48fcce6ecea7f0b326616ae15927"
         },
         docker_image="sdk-rust-contract-builder:next"
     ),
diff --git a/multiversx_sdk_rust_contract_builder/build_metadata.py b/multiversx_sdk_rust_contract_builder/build_metadata.py
index 42c23d1..c475fa0 100644
--- a/multiversx_sdk_rust_contract_builder/build_metadata.py
+++ b/multiversx_sdk_rust_contract_builder/build_metadata.py
@@ -7,10 +7,12 @@ def __init__(
         self,
         version_rust: str,
         version_sc_meta: str,
+        version_wasm_opt: str,
         target_platform: str,
     ):
         self.version_rust = version_rust
         self.version_sc_meta = version_sc_meta
+        self.version_wasm_opt = version_wasm_opt
         self.target_platform = target_platform
 
     @classmethod
@@ -18,6 +20,7 @@ def from_env(cls) -> 'BuildMetadata':
         return BuildMetadata(
             version_rust=os.environ["BUILD_METADATA_VERSION_RUST"],
             version_sc_meta=os.environ["BUILD_METADATA_VERSION_SC_META"],
+            version_wasm_opt=os.environ["BUILD_METADATA_VERSION_WASM_OPT"],
             target_platform=os.environ["BUILD_METADATA_TARGETPLATFORM"],
         )
 
@@ -25,5 +28,6 @@ def to_dict(self) -> Dict[str, str]:
         return {
             "versionRust": self.version_rust,
             "versionScTool": self.version_sc_meta,
+            "versionWasmOpt": self.version_wasm_opt,
             "targetPlatform": self.target_platform,
         }