Revert "feat: send payment transaction with algokit core"

Revert "feat: send payment transaction with algokit core"

Author: lempira

.github/workflows/build-python.yaml

@@ -22,7 +22,7 @@ jobs:
         uses: ./.github/actions/setup-poetry
 
       - name: Install dependencies
-        run: poetry install --no-interaction --without=experimental
+        run: poetry install --no-interaction
 
       - name: pytest + coverage
         shell: bash

poetry.lock

@@ -12,21 +12,6 @@ py-algorand-sdk = "^2.4.0"
 httpx = ">=0.23.1,<=0.28.1"
 typing-extensions = ">=4.6.0"
 
-[tool.poetry.group.experimental.dependencies]
-algokit-transact = [
-    # macOS
-    {url = "https://github.com/algorandfoundation/algokit-core/releases/download/python%2Falgokit_transact%401.0.0-alpha.10/algokit_transact-1.0.0a10-py3-none-macosx_10_12_x86_64.whl", markers = "sys_platform == 'darwin' and platform_machine == 'x86_64'"},
-    {url = "https://github.com/algorandfoundation/algokit-core/releases/download/python%2Falgokit_transact%401.0.0-alpha.10/algokit_transact-1.0.0a10-py3-none-macosx_11_0_arm64.whl", markers = "sys_platform == 'darwin' and platform_machine == 'arm64'"},
-
-    # Windows
-    {url = "https://github.com/algorandfoundation/algokit-core/releases/download/python%2Falgokit_transact%401.0.0-alpha.10/algokit_transact-1.0.0a10-py3-none-win_amd64.whl", markers = "sys_platform == 'win32' and platform_machine == 'AMD64'"},
-
-    # Linux - manylinux (for most common glibc-based distributions like Ubuntu, Debian, Fedora)
-    {url = "https://github.com/algorandfoundation/algokit-core/releases/download/python%2Falgokit_transact%401.0.0-alpha.10/algokit_transact-1.0.0a10-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", markers = "sys_platform == 'linux' and platform_machine == 'aarch64'"},
-    {url = "https://github.com/algorandfoundation/algokit-core/releases/download/python%2Falgokit_transact%401.0.0-alpha.10/algokit_transact-1.0.0a10-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", markers = "sys_platform == 'linux' and platform_machine == 'x86_64'"},
-]
-algokit-algod-api = {url = "https://github.com/algorandfoundation/algokit-core/releases/download/python%2Falgod_api%401.0.0-alpha.11/algokit_algod_api-1.0.0a11-py3-none-any.whl"}
-
 [tool.poetry.group.dev.dependencies]
 pytest = "^8"
 ruff = ">=0.1.6,<=0.11.8"
@@ -145,9 +130,7 @@ suppress-none-returning = true
 "tests/clients/test_algorand_client.py" = ["ERA001"]  
 "src/algokit_utils/_legacy_v2/**/*" = ["E501"]
 "tests/**/*" = ["PLR2004"]  
-"src/algokit_utils/__init__.py" = ["I001", "RUF022", "E402"]  # Ignore import sorting for __init__.py
-"src/algokit_utils/transactions/_algokit_core_bridge.py" = ["ANN001"]
-"src/algokit_utils/clients/_algokit_core_bridge.py" = ["ANN001", "ANN202","ANN204"]
+"src/algokit_utils/__init__.py" = ["I001", "RUF022"]  # Ignore import sorting for __init__.py
 
 [tool.poe.tasks]
 docs = ["docs-html-only", "docs-md-only"]
@@ -191,14 +174,6 @@ disallow_untyped_calls = false
 module = ["tests.transactions.test_transaction_composer"]
 disable_error_code = ["call-overload", "union-attr"]
 
-[[tool.mypy.overrides]]
-module = ["algokit_utils.clients._algokit_core_bridge"]
-disable_error_code = ["attr-defined", "no-untyped-def", "no-untyped-call"]
-
-[[tool.mypy.overrides]]
-module = ["algokit_utils.transactions._algokit_core_bridge"]
-disable_error_code = ["attr-defined", "no-untyped-def", "no-any-return"]
-
 [tool.semantic_release]
 version_toml = "pyproject.toml:tool.poetry.version"
 remove_dist = false

pyproject.toml

@@ -9,10 +9,6 @@
     etc.
 """
 
-import importlib.util
-
-_EXPERIMENTAL_DEPENDENCIES_INSTALLED: bool | None = importlib.util.find_spec("algokit_algod_api") is not None
-
 # Core types and utilities that are commonly used
 from algokit_utils.applications import *  # noqa: F403
 from algokit_utils.assets import *  # noqa: F403

src/algokit_utils/__init__.py

@@ -13,7 +13,6 @@
 from algosdk.v2client.algod import AlgodClient
 from algosdk.v2client.indexer import IndexerClient
 
-from algokit_utils import _EXPERIMENTAL_DEPENDENCIES_INSTALLED
 from algokit_utils._legacy_v2.application_specification import ApplicationSpecification
 from algokit_utils.applications.app_deployer import ApplicationLookup
 from algokit_utils.applications.app_spec.arc56 import Arc56Contract
@@ -120,12 +119,7 @@ def __init__(self, clients_or_configs: AlgoClientConfigs | AlgoSdkClients, algor
                 if clients_or_configs.kmd_config
                 else None,
             )
-        if not _EXPERIMENTAL_DEPENDENCIES_INSTALLED:
-            self._algod = _clients.algod
-        else:
-            from algokit_utils.clients._algokit_core_bridge import AlgodClientWithCore
-
-            self._algod = AlgodClientWithCore(_clients.algod)  # type: ignore[assignment]
+        self._algod = _clients.algod
         self._indexer = _clients.indexer
         self._kmd = _clients.kmd
         self._algorand = algorand_client

src/algokit_utils/clients/_algokit_core_bridge.py

@@ -33,7 +33,7 @@ class LogicErrorData(TypedDict):
 def parse_logic_error(
     error_str: str,
 ) -> LogicErrorData | None:
-    match = re.search(LOGIC_ERROR, error_str, re.DOTALL)
+    match = re.match(LOGIC_ERROR, error_str)
     if match is None:
         return None
 

src/algokit_utils/clients/client_manager.py

@@ -22,7 +22,6 @@
 from algosdk.v2client.models.simulate_request import SimulateRequest
 from typing_extensions import deprecated
 
-from algokit_utils import _EXPERIMENTAL_DEPENDENCIES_INSTALLED
 from algokit_utils.applications.abi import ABIReturn, ABIValue
 from algokit_utils.applications.app_manager import AppManager
 from algokit_utils.applications.app_spec.arc56 import Method as Arc56Method
@@ -31,9 +30,6 @@
 from algokit_utils.models.transaction import SendParams, TransactionWrapper
 from algokit_utils.protocols.account import TransactionSignerAccountProtocol
 
-if _EXPERIMENTAL_DEPENDENCIES_INSTALLED:
-    from algokit_utils.transactions._algokit_core_bridge import build_payment_with_core
-
 if TYPE_CHECKING:
     from collections.abc import Callable
 
@@ -1865,17 +1861,6 @@ def send(
             )
         except algosdk.error.AlgodHTTPError as e:
             raise Exception(f"Transaction failed: {e}") from e
-        # We need this code to handle separately an exception thrown by the experimental AlgoKit Algod Client.
-        # However, we can't just import the dependency (as it may not be there) and
-        # we still need to re-throw the exception in all other cases.
-        except Exception as e:
-            if _EXPERIMENTAL_DEPENDENCIES_INSTALLED:
-                from algokit_algod_api.exceptions import BadRequestException
-
-                if isinstance(e, BadRequestException):
-                    raise Exception(f"Transaction failed: {e}") from e
-                raise e
-            raise e
 
     def _handle_simulate_error(self, simulate_response: SimulateAtomicTransactionResponse) -> None:
         # const failedGroup = simulateResponse?.txnGroups[0]
@@ -2265,10 +2250,7 @@ def _build_payment(
             "close_remainder_to": params.close_remainder_to,
         }
 
-        if _EXPERIMENTAL_DEPENDENCIES_INSTALLED:
-            return self._common_txn_build_step(lambda x: build_payment_with_core(**x), params, txn_params)
-        else:
-            return self._common_txn_build_step(lambda x: algosdk.transaction.PaymentTxn(**x), params, txn_params)
+        return self._common_txn_build_step(lambda x: algosdk.transaction.PaymentTxn(**x), params, txn_params)
 
     def _build_asset_create(
         self, params: AssetCreateParams, suggested_params: algosdk.transaction.SuggestedParams

src/algokit_utils/errors/logic_error.py

@@ -5,7 +5,7 @@
 import pytest
 from algosdk.transaction import OnComplete
 
-from algokit_utils import _EXPERIMENTAL_DEPENDENCIES_INSTALLED, SigningAccount
+from algokit_utils import SigningAccount
 from algokit_utils._legacy_v2.application_specification import ApplicationSpecification
 from algokit_utils.algorand import AlgorandClient
 from algokit_utils.applications.app_manager import AppManager
@@ -451,8 +451,8 @@ def test_payment_logging(
         )
     )
 
-    assert mock_debug.call_count == 1 if not _EXPERIMENTAL_DEPENDENCIES_INSTALLED else 2
-    log_message = mock_debug.call_args_list[0][0][0]
+    assert mock_debug.call_count == 1
+    log_message = mock_debug.call_args[0][0]
     assert "Sending 1,000,000 µALGO" in log_message
     assert sender.address in log_message
     assert receiver.address in log_message