Update MultiversX SDK: 0.47 => 0.50 (stable Rust) (#269)

* mx-sdk-rs => v0.50.1

* update cargo files

* allow reading contract code from mxsc.json files

* update test sets

* update Dockerfile: install stable Rust

* format

* Set Version: 0.1.62

---------

Co-authored-by: devops <[email protected]>

Author: bbyalcinkaya

Dockerfile

@@ -36,8 +36,8 @@ RUN python3 -m pip install --upgrade pip
 
 RUN wget -O rustup.sh https://sh.rustup.rs && \
     chmod +x rustup.sh && \
-    ./rustup.sh --verbose --default-toolchain nightly-2023-12-11 --target wasm32-unknown-unknown -y
+    ./rustup.sh --verbose --target wasm32-unknown-unknown -y
 
 ENV PATH="/home/${USER}/.cargo/bin:${PATH}"
 
-RUN cargo install multiversx-sc-meta --version ~0.47 --locked
+RUN cargo install multiversx-sc-meta --version ~0.50 --locked

deps/mx-sdk-rs

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "kmultiversx"
-version = "0.1.61"
+version = "0.1.62"
 description = "Python tools for Elrond semantics"
 authors = [
     "Runtime Verification, Inc. <[email protected]>",

kmultiversx/pyproject.toml

@@ -18,7 +18,14 @@
 from pyk.prelude.collections import set_of
 from pykwasm.kwasm_ast import KBytes, KInt, KString
 
-from kmultiversx.utils import flatten, kast_to_json_str, krun_config, load_wasm, read_mandos_runtime
+from kmultiversx.utils import (
+    flatten,
+    kast_to_json_str,
+    krun_config,
+    load_wasm,
+    load_wasm_from_mxsc,
+    read_mandos_runtime,
+)
 
 if TYPE_CHECKING:
     from pyk.kast.inner import KInner
@@ -445,7 +452,7 @@ def mandos_to_deploy_tx(tx: dict, filename: str, output_dir: str) -> KInner:
     value = mandos_int_to_kint(get_egld_value(tx))
     arguments = mandos_arguments_to_klist(tx['arguments'])
     gas_limit = mandos_int_to_kint(tx['gasLimit'])
-    gas_price = mandos_int_to_kint(tx['gasPrice'], default_when_empty=0)
+    gas_price = mandos_int_to_kint(tx.get('gasPrice', '0'), default_when_empty=0)
 
     code = get_contract_code(tx['contractCode'], filename)
     assert isinstance(code, str)
@@ -462,7 +469,7 @@ def mandos_to_call_tx(tx: dict) -> KInner:
     function = KWasmString(tx['function'])
     arguments = mandos_arguments_to_klist(tx.get('arguments', []))
     gas_limit = mandos_int_to_kint(tx['gasLimit'])
-    gas_price = mandos_int_to_kint(tx['gasPrice'], default_when_empty=0)
+    gas_price = mandos_int_to_kint(tx.get('gasPrice', '0'), default_when_empty=0)
 
     return KApply('callTx', [sender, to, value, esdt_value, function, arguments, gas_limit, gas_price])
 
@@ -574,6 +581,9 @@ def file_to_module_decl(filename: str, output_dir: str) -> KInner:
         return load_wasm(filename)
     if filename[-5:] == '.wast' or filename[-4:] == '.wat':
         return wat_file_to_module_decl(filename, output_dir)
+    if filename[-10:] == '.mxsc.json':
+        return load_wasm_from_mxsc(filename)
+
     raise ValueError(f'Filetype not yet supported: {filename}')
 
 
@@ -602,7 +612,7 @@ def get_external_file_path(test_file: str, rel_path_to_new_file: str) -> str:
 
 
 def get_contract_code(code: str, filename: str) -> Optional[str]:
-    if code[0:5] == 'file:':
+    if code[0:5] in ('file:', 'mxsc:'):
         return get_external_file_path(filename, code[5:])
     if code == '':
         return None

kmultiversx/src/kmultiversx/scenario.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import json
+from io import BytesIO
 from pathlib import Path
 from typing import TYPE_CHECKING, TypeVar
 
@@ -51,6 +52,14 @@ def load_wasm(filename: str) -> KInner:
         return wasm2kast.wasm2kast(f, filename)
 
 
+def load_wasm_from_mxsc(filename: str) -> KInner:
+    with open(filename, 'r') as f:
+        contract_json = json.load(f)
+        code_hex = contract_json['code']
+        code_bytes = bytes.fromhex(code_hex)
+        return wasm2kast.wasm2kast(BytesIO(code_bytes), filename)
+
+
 def krun_config(krun: KRun, conf: KInner, pipe_stderr: bool = False) -> KInner:
     conf_kore = krun.kast_to_kore(conf, sort=GENERATED_TOP_CELL)
     res_conf_kore = krun.run_pattern(conf_kore, pipe_stderr=pipe_stderr)

kmultiversx/src/kmultiversx/utils.py

@@ -1 +1 @@
-0.1.61
+0.1.62

package/version

@@ -9,8 +9,7 @@ publish = false
 path = "src/esdt_system_sc.rs"
 
 [dependencies.multiversx-sc]
-version = "0.43.4"
-path = "../../deps/mx-sdk-rs/framework/base"
+version = "0.50.1"
 
 [dev-dependencies.multiversx-sc-scenario]
 version = "0.43.4"

src/esdt-system-sc/Cargo.toml

@@ -9,5 +9,4 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.43.4"
-path = "../../../deps/mx-sdk-rs/framework/meta"
+version = "0.50.1"

src/esdt-system-sc/meta/Cargo.toml

@@ -19,8 +19,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.43.4"
-path = "../../../deps/mx-sdk-rs/framework/wasm-adapter"
+version = "0.50.1"
 
 [workspace]
 members = ["."]

src/esdt-system-sc/wasm/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2021"
 num-bigint = "0.4.2"
 
 [dependencies.multiversx-sc]
-version = "0.48.0"
+version = "0.50.1"
 
 [lib]
 path = "src/testapi.rs"