strideutils 0.9.1__tar.gz → 0.9.2__tar.gz

{strideutils-0.9.1 → strideutils-0.9.2}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.9.1
+current_version = 0.9.2
 commit = False
 tag = False
 

{strideutils-0.9.1 → strideutils-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: strideutils
-Version: 0.9.1
+Version: 0.9.2
 Summary: Utility functions for monitoring the Stride blockchain
 Author-email: Stride Labs <hello@stridelabs.co>
 License: MIT License

{strideutils-0.9.1 → strideutils-0.9.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "strideutils"
-version = "0.9.1"
+version = "0.9.2"
 authors = [
     {name = "Stride Labs", email = "hello@stridelabs.co"},
 ]

{strideutils-0.9.1 → strideutils-0.9.2}/strideutils/exec_tx.py

@@ -1,5 +1,6 @@
 import json
 import os
+import re
 import subprocess
 import time
 from dataclasses import dataclass
@@ -11,6 +12,13 @@ from strideutils import stride_requests
 from strideutils.stride_config import config
 
 WALLET_SETUP_COMMAND = "echo {mnemonic} | {binary} keys add {account_name} --recover --keyring-backend=test"
+_GAS_ESTIMATE_LINE = re.compile(r"gas estimate: \d+$")
+
+
+def _is_gas_estimate_only_stderr(stderr: str) -> bool:
+    """True when stderr contains only the normal --gas auto estimate line(s)."""
+    lines = [line.strip() for line in stderr.splitlines() if line.strip()]
+    return bool(lines) and all(_GAS_ESTIMATE_LINE.fullmatch(line) for line in lines)
 
 
 @dataclass
@@ -24,7 +32,11 @@ class TxResponse:
     raw_log: Optional[str] = None
 
 
-def restore_wallet(account_name: str = "wallet", mnemonic_var: str = "MNEMONIC", binary: str = "strided"):
+def restore_wallet(
+    account_name: str = "wallet",
+    mnemonic_var: str = "MNEMONIC",
+    binary: str = "strided",
+):
     """
     Restores a wallet in the keyring, using the mnemonic under the specified environment variable
     """
@@ -47,8 +59,10 @@ def execute_tx(command: str, api_endpoint: str = config.stride.api_endpoint) ->
     # Run the command in the shell and store the response
     output = subprocess.run(command, shell=True, capture_output=True, text=True)
 
-    # If there was stderr, return the response as failed
-    if not output.stdout or output.stderr:
+    if not output.stdout:
+        return TxResponse(stdout={}, stderr=output.stderr, raw_log=output.stderr or "")
+
+    if output.stderr and not _is_gas_estimate_only_stderr(output.stderr):
         return TxResponse(stdout={}, stderr=output.stderr, raw_log=output.stderr)
 
     # Cast the stdout and build the response

{strideutils-0.9.1 → strideutils-0.9.2}/strideutils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: strideutils
-Version: 0.9.1
+Version: 0.9.2
 Summary: Utility functions for monitoring the Stride blockchain
 Author-email: Stride Labs <hello@stridelabs.co>
 License: MIT License

{strideutils-0.9.1 → strideutils-0.9.2}/tests/test_exec_tx.py

@@ -54,7 +54,10 @@ MOCK_FAILED_TX_RESPONSE = MockTxResponse(
 
 def test_execute_tx_success() -> None:
     """Test successful transaction execution."""
-    with patch("subprocess.run") as mock_run, patch("strideutils.stride_requests.requests.get") as mock_get_tx:
+    with (
+        patch("subprocess.run") as mock_run,
+        patch("strideutils.stride_requests.requests.get") as mock_get_tx,
+    ):
         # Mock subprocess.run
         mock_process = MagicMock()
         mock_process.stdout = json.dumps(MOCK_SUCCESS_STDOUT)
@@ -85,7 +88,10 @@ def test_execute_tx_success() -> None:
 
 def test_execute_tx_failure() -> None:
     """Test failed transaction execution."""
-    with patch("subprocess.run") as mock_run, patch("strideutils.stride_requests.requests.get") as mock_get_tx:
+    with (
+        patch("subprocess.run") as mock_run,
+        patch("strideutils.stride_requests.requests.get") as mock_get_tx,
+    ):
         # Mock subprocess.run
         mock_process = MagicMock()
         mock_process.stdout = json.dumps(MOCK_SUCCESS_STDOUT)
@@ -105,6 +111,43 @@ def test_execute_tx_failure() -> None:
         assert response.raw_log == "transaction failed"
 
 
+def test_execute_tx_gas_estimate_stderr() -> None:
+    """Test that --gas auto stderr does not block tx parsing."""
+    with (
+        patch("subprocess.run") as mock_run,
+        patch("strideutils.stride_requests.requests.get") as mock_get_tx,
+    ):
+        mock_process = MagicMock()
+        mock_process.stdout = json.dumps(MOCK_SUCCESS_STDOUT)
+        mock_process.stderr = "gas estimate: 53873342\n"
+        mock_run.return_value = mock_process
+
+        mock_get_tx.return_value = MOCK_SUCCESS_TX_RESPONSE
+
+        response = execute_tx(MOCK_COMMAND, MOCK_API_ENDPOINT)
+
+        assert response.success is True
+        assert response.tx_hash == MOCK_TX_HASH
+        assert response.code == 0
+        assert response.raw_log == "transaction successful"
+        assert response.stderr == "gas estimate: 53873342\n"
+
+
+def test_execute_tx_gas_estimate_plus_real_error() -> None:
+    """Test that gas estimate stderr plus a real error still fails."""
+    with patch("subprocess.run") as mock_run:
+        mock_process = MagicMock()
+        mock_process.stdout = json.dumps(MOCK_SUCCESS_STDOUT)
+        mock_process.stderr = "gas estimate: 53873342\ninsufficient fees"
+        mock_run.return_value = mock_process
+
+        response = execute_tx(MOCK_COMMAND, MOCK_API_ENDPOINT)
+
+        assert response.success is False
+        assert response.tx_hash == ""
+        assert response.raw_log == "gas estimate: 53873342\ninsufficient fees"
+
+
 def test_execute_tx_subprocess_error() -> None:
     """Test handling of subprocess execution error."""
     with patch("subprocess.run") as mock_run:
@@ -213,7 +256,10 @@ def test_execute_tx_auto_append_flags() -> None:
         test_cases: List[Tuple[str, str]] = [
             ("base command", "base command -y --output json"),
             ("base command -y", "base command -y --output json"),
-            ("base command --output json", "base command --output json -y --output json"),
+            (
+                "base command --output json",
+                "base command --output json -y --output json",
+            ),
         ]
 
         for input_cmd, expected_cmd in test_cases: