Merge pull request #199 from multiversx/fix-queries

Fix contract query (parameter preparation and error reporting)

multiversx_sdk_cli/_version.py

@@ -1 +1 @@
-__version__ = "5.1.0"
+__version__ = "5.1.1"

multiversx_sdk_cli/contracts.py

@@ -20,7 +20,7 @@
 
 
 class INetworkProvider(Protocol):
-    def query_contract(self, query: Any) -> Any:
+    def query_contract(self, query: Any) -> 'IContractQueryResponse':
         ...
 
 
@@ -50,11 +50,17 @@ def get_encoded_arguments(self) -> Sequence[str]:
 
     def get_caller(self) -> Optional[Address]:
         return self.caller
-    
+
     def get_value(self) -> int:
         return self.value
 
 
+class IContractQueryResponse(Protocol):
+    return_data: List[str]
+    return_code: str
+    return_message: str
+
+
 class SmartContract:
     def __init__(self, address: Optional[Address] = None, bytecode=None, metadata=None):
         self.address = Address(address)
@@ -176,12 +182,17 @@ def query(
         return [self._interpret_return_data(data) for data in return_data]
 
     def query_detailed(self, proxy: INetworkProvider, function: str, arguments: List[Any],
-                        value: int = 0, caller: Optional[Address] = None) -> Any:
+                       value: int = 0, caller: Optional[Address] = None) -> Any:
         arguments = arguments or []
+        # Temporary workaround, until we use sdk-core's serializer.
+        prepared_arguments = [bytes.fromhex(_prepare_argument(arg)) for arg in arguments]
 
-        query = ContractQuery(self.address, function, value, arguments, caller)
+        query = ContractQuery(self.address, function, value, prepared_arguments, caller)
 
         response = proxy.query_contract(query)
+        # Temporary workaround, until we add "isSuccess" on the response class.
+        if response.return_code != "ok":
+            raise RuntimeError(f"Query failed: {response.return_message}")
         return response
 
     def _interpret_return_data(self, data: str) -> Any:

setup.py

@@ -2,7 +2,7 @@
 
 import setuptools
 
-VERSION = "5.1.0"
+VERSION = "5.1.1"
 
 try:
     with open('./multiversx_sdk_cli/_version.py', 'wt') as versionfile: