algorand-python-testing 0.3.0b7__tar.gz → 0.3.0b8__tar.gz

{algorand_python_testing-0.3.0b7 → algorand_python_testing-0.3.0b8}/CHANGELOG.md

@@ -1,4 +1,10 @@
 # CHANGELOG
+## v0.3.0-beta.8 (2024-08-22)
+
+### Feature
+
+* include ARC4 results in log, and handle > 15 ARC4 arguments (#18) ([`fd83ee8`](https://github.com/algorandfoundation/algorand-python-testing/commit/fd83ee8525a393d4a1a66f20acdb661906d84b51))
+
 ## v0.3.0-beta.7 (2024-08-21)
 
 ## v0.3.0-beta.6 (2024-08-21)

{algorand_python_testing-0.3.0b7 → algorand_python_testing-0.3.0b8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: algorand-python-testing
-Version: 0.3.0b7
+Version: 0.3.0b8
 Summary: Algorand Python testing library
 Project-URL: Documentation, https://github.com/algorandfoundation/puya/tree/main/algopy_testing#README.md
 Project-URL: Issues, https://github.com/algorandfoundation/puya/issues

{algorand_python_testing-0.3.0b7 → algorand_python_testing-0.3.0b8}/docs/testing-guide/arc4-types.md

@@ -12,7 +12,6 @@ For all `algopy.arc4` types with and without respective _value generator_, insta
 
 ```{testsetup}
 import algopy
-import algopy_testing
 from algopy_testing import algopy_testing_context
 
 # Create the context manager for snippets below

{algorand_python_testing-0.3.0b7 → algorand_python_testing-0.3.0b8}/docs/testing-guide/avm-types.md

@@ -8,7 +8,6 @@ For 'primitive `algopy` types such as `Account`, `Application`, `Asset`, `UInt64
 
 ```{testsetup}
 import algopy
-import algopy_testing
 from algopy_testing import algopy_testing_context
 
 # Create the context manager for snippets below

{algorand_python_testing-0.3.0b7 → algorand_python_testing-0.3.0b8}/docs/testing-guide/opcodes.md

@@ -6,7 +6,6 @@ The [coverage](coverage.md) file provides a comprehensive list of all opcodes an
 
 ```{testsetup}
 import algopy
-import algopy_testing
 from algopy_testing import algopy_testing_context
 
 # Create the context manager for snippets below
@@ -29,7 +28,7 @@ The following opcodes are demonstrated:
 -   `op.ecdsa_verify`
 
 ```{testcode}
-import algopy.op as op
+from algopy import op
 
 # SHA256 hash
 data = algopy.Bytes(b"Hello, World!")
@@ -59,7 +58,7 @@ The following opcodes are demonstrated:
 -   `op.setbit_uint64`
 
 ```{testcode}
-import algopy.op as op
+from algopy import op
 
 # Addition with carry
 result, carry = op.addw(algopy.UInt64(2**63), algopy.UInt64(2**63))
@@ -80,7 +79,7 @@ These types necessitate interaction with the transaction context:
 ### algopy.op.Global
 
 ```{testcode}
-import algopy.op as op
+from algopy import op
 
 class MyContract(algopy.ARC4Contract):
     @algopy.arc4.abimethod
@@ -102,12 +101,12 @@ assert result == algopy.UInt64(101000)
 ### algopy.op.Txn
 
 ```{testcode}
-import algopy.op as op
+from algopy import op
 
 class MyContract(algopy.ARC4Contract):
     @algopy.arc4.abimethod
-    def check_txn_fields(self) -> algopy.Bytes:
-        return op.Txn.sender
+    def check_txn_fields(self) -> algopy.arc4.Address:
+        return algopy.arc4.Address(op.Txn.sender)
 
 ... # setup context (below assumes available under 'ctx' variable)
 
@@ -121,7 +120,7 @@ assert result == custom_sender
 ### algopy.op.AssetHoldingGet
 
 ```{testcode}
-import algopy.op as op
+from algopy import op
 
 class AssetContract(algopy.ARC4Contract):
     @algopy.arc4.abimethod
@@ -141,7 +140,7 @@ assert result == algopy.UInt64(5000)
 ### algopy.op.AppGlobal
 
 ```{testcode}
-import algopy.op as op
+from algopy import op
 
 class StateContract(algopy.ARC4Contract):
     @algopy.arc4.abimethod
@@ -162,7 +161,7 @@ assert stored_value == 42
 ### algopy.op.Block
 
 ```{testcode}
-import algopy.op as op
+from algopy import op
 
 class BlockInfoContract(algopy.ARC4Contract):
     @algopy.arc4.abimethod
@@ -180,7 +179,7 @@ assert seed == algopy.op.itob(123456)
 ### algopy.op.AcctParamsGet
 
 ```{testcode}
-import algopy.op as op
+from algopy import op
 
 class AccountParamsContract(algopy.ARC4Contract):
     @algopy.arc4.abimethod
@@ -205,7 +204,7 @@ class AppParamsContract(algopy.ARC4Contract):
     def get_app_creator(self, app_id: algopy.Application) -> algopy.arc4.Address:
         creator, exists = algopy.op.AppParamsGet.app_creator(app_id)
         assert exists
-        return creator
+        return algopy.arc4.Address(creator)
 
 ... # setup context (below assumes available under 'ctx' variable)
 
@@ -218,8 +217,7 @@ assert creator == context.default_sender
 ### algopy.op.AssetParamsGet
 
 ```{testcode}
-from algopy_testing import algopy_testing_context
-import algopy.op as op
+from algopy import op
 
 class AssetParamsContract(algopy.ARC4Contract):
     @algopy.arc4.abimethod
@@ -239,8 +237,7 @@ assert total == algopy.UInt64(1000000)
 ### algopy.op.Box
 
 ```{testcode}
-from algopy_testing import algopy_testing_context
-import algopy.op as op
+from algopy import op
 
 class BoxStorageContract(algopy.ARC4Contract):
     @algopy.arc4.abimethod
@@ -329,23 +326,22 @@ assert result == 11
 ```{testcode}
 from unittest.mock import patch, MagicMock
 import algopy
-from algopy_testing.primitives import Bytes
 
 def test_mock_vrf_verify():
-    mock_result = (Bytes(b'mock_output'), True)
+    mock_result = (algopy.Bytes(b'mock_output'), True)
     with patch('algopy.op.vrf_verify', return_value=mock_result) as mock_vrf_verify:
         result = algopy.op.vrf_verify(
             algopy.op.VrfVerify.VrfAlgorand,
-            Bytes(b'proof'),
-            Bytes(b'message'),
-            Bytes(b'public_key')
+            algopy.Bytes(b'proof'),
+            algopy.Bytes(b'message'),
+            algopy.Bytes(b'public_key')
         )
     assert result == mock_result
     mock_vrf_verify.assert_called_once_with(
         algopy.op.VrfVerify.VrfAlgorand,
-        Bytes(b'proof'),
-        Bytes(b'message'),
-        Bytes(b'public_key')
+        algopy.Bytes(b'proof'),
+        algopy.Bytes(b'message'),
+        algopy.Bytes(b'public_key')
     )
 
 test_mock_vrf_verify()
@@ -356,19 +352,18 @@ test_mock_vrf_verify()
 ```{testcode}
 from unittest.mock import patch, MagicMock
 import algopy
-from algopy_testing.primitives import Bytes
 
 def test_mock_elliptic_curve_decompress():
-    mock_result = (Bytes(b'x_coord'), Bytes(b'y_coord'))
+    mock_result = (algopy.Bytes(b'x_coord'), algopy.Bytes(b'y_coord'))
     with patch('algopy.op.EllipticCurve.decompress', return_value=mock_result) as mock_decompress:
         result = algopy.op.EllipticCurve.decompress(
             algopy.op.EC.BN254g1,
-            Bytes(b'compressed_point')
+            algopy.Bytes(b'compressed_point')
         )
     assert result == mock_result
     mock_decompress.assert_called_once_with(
         algopy.op.EC.BN254g1,
-        Bytes(b'compressed_point')
+        algopy.Bytes(b'compressed_point')
     )
 
 test_mock_elliptic_curve_decompress()

{algorand_python_testing-0.3.0b7 → algorand_python_testing-0.3.0b8}/docs/testing-guide/signature-testing.md

@@ -4,7 +4,6 @@ Test Algorand smart signatures (LogicSigs) with ease using the Algorand Python T
 
 ```{testsetup}
 import algopy
-import algopy_testing
 from algopy_testing import algopy_testing_context
 
 # Create the context manager for snippets below

{algorand_python_testing-0.3.0b7 → algorand_python_testing-0.3.0b8}/docs/testing-guide/state-management.md

@@ -4,7 +4,6 @@
 
 ```{testsetup}
 import algopy
-import algopy_testing
 from algopy_testing import algopy_testing_context
 
 # Create the context manager for snippets below

{algorand_python_testing-0.3.0b7 → algorand_python_testing-0.3.0b8}/docs/testing-guide/transactions.md

@@ -115,8 +115,8 @@ from algopy_testing import AlgopyTestContext, algopy_testing_context
 
 class SimpleContract(algopy.ARC4Contract):
     @algopy.arc4.abimethod
-    def check_sender(self) -> algopy.Bytes:
-        return algopy.Txn.sender
+    def check_sender(self) -> algopy.arc4.Address:
+        return algopy.arc4.Address(algopy.Txn.sender)
 ...
 
 # Create a contract instance

{algorand_python_testing-0.3.0b7 → algorand_python_testing-0.3.0b8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "algorand-python-testing"
-version = "0.3.0-beta.7"
+version = "0.3.0-beta.8"
 description = 'Algorand Python testing library'
 readme = "README.md"
 requires-python = ">=3.12"
@@ -41,7 +41,7 @@ Source = "https://github.com/algorandfoundation/puya/tree/main/algopy_testing"
 allow-direct-references = true
 
 [tool.hatch.build.targets.wheel]
-packages = ["src/algopy", 'src/algopy_testing']
+packages = ["src/algopy", 'src/algopy_testing', 'src/_algopy_testing']
 
 [[tool.hatch.envs.all.matrix]]
 python = ["3.12"]
@@ -126,7 +126,6 @@ clean_dist = "rm -rf dist"
 
 # docs environment
 [tool.hatch.envs.docs]
-detached = true
 path = ".venv.docs"
 type = "virtual"
 python = "3.12"
@@ -141,13 +140,13 @@ dependencies = [
     "ipykernel",
     "pytest",
     "py-algorand-sdk",
-    "algokit-utils",
-    "pycryptodomex>=3.6.0,<4",
-    "pynacl>=1.4.0,<2",
-    "ecdsa>=0.17.0",
-    "coincurve>=19.0.1",
-    "algorand-python",
-    "algorand-python-testing @ {root:uri}",
+]
+# environment has algopy_testing included as an editable dependency
+# however it also includes the package dependencies
+# the stubs can't be in the same as the project when it is editable
+# so explicitly remove them
+post-install-commands = [
+  "hatch run docs:pip uninstall -y algorand-python",
 ]
 
 [tool.hatch.envs.docs.scripts]

{algorand_python_testing-0.3.0b7 → algorand_python_testing-0.3.0b8}/src/_algopy_testing/__init__.py

@@ -1,14 +1,11 @@
 from _algopy_testing import arc4, gtxn, itxn
-from _algopy_testing._context_helpers.context_storage import algopy_testing_context
-from _algopy_testing._context_helpers.ledger_context import LedgerContext
-from _algopy_testing._context_helpers.txn_context import TransactionContext
-from _algopy_testing._itxn_loader import ITxnGroupLoader, ITxnLoader
-from _algopy_testing._value_generators.arc4 import ARC4ValueGenerator
-from _algopy_testing._value_generators.avm import AVMValueGenerator
-from _algopy_testing._value_generators.txn import TxnValueGenerator
 from _algopy_testing.context import AlgopyTestContext
+from _algopy_testing.context_helpers.context_storage import algopy_testing_context
+from _algopy_testing.context_helpers.ledger_context import LedgerContext
+from _algopy_testing.context_helpers.txn_context import TransactionContext
 from _algopy_testing.decorators.subroutine import subroutine
 from _algopy_testing.enums import OnCompleteAction, TransactionType
+from _algopy_testing.itxn_loader import ITxnGroupLoader, ITxnLoader
 from _algopy_testing.models import (
     Account,
     Application,
@@ -24,6 +21,9 @@ from _algopy_testing.models import (
 )
 from _algopy_testing.primitives import BigUInt, Bytes, String, UInt64
 from _algopy_testing.state import Box, BoxMap, BoxRef, GlobalState, LocalState
+from _algopy_testing.value_generators.arc4 import ARC4ValueGenerator
+from _algopy_testing.value_generators.avm import AVMValueGenerator
+from _algopy_testing.value_generators.txn import TxnValueGenerator
 
 # TODO: clean up and ensure only algopy_testing namespace specific user facing abstractions
 # are exposed Only keep the _value_generators, ledger_context, txn_context,

{algorand_python_testing-0.3.0b7 → algorand_python_testing-0.3.0b8}/src/_algopy_testing/arc4.py

@@ -8,11 +8,6 @@ import typing
 import algosdk
 from Cryptodome.Hash import SHA512
 
-from _algopy_testing._mutable import (
-    MutableBytes,
-    add_mutable_callback,
-    set_item_on_mutate,
-)
 from _algopy_testing.constants import (
     ARC4_RETURN_PREFIX,
     BITS_IN_BYTE,
@@ -21,6 +16,11 @@ from _algopy_testing.constants import (
     UINT512_SIZE,
 )
 from _algopy_testing.models.account import Account
+from _algopy_testing.mutable import (
+    MutableBytes,
+    add_mutable_callback,
+    set_item_on_mutate,
+)
 from _algopy_testing.primitives import Bytes
 from _algopy_testing.protocols import BytesBacked
 from _algopy_testing.utils import (
@@ -62,6 +62,8 @@ __all__ = [
     "UInt8",
     "UIntN",
     "abi_call",
+    "arc4_create",
+    "arc4_update",
     "arc4_signature",
     "emit",
 ]
@@ -216,7 +218,7 @@ class String(_ABIEncoded):
                     f"value must be a string or String type, not {type(value).__name__!r}"
                 )
 
-        self._value = len(bytes_value).to_bytes(_ABI_LENGTH_SIZE) + bytes_value
+        self._value = as_bytes(_encode_length(len(bytes_value)) + bytes_value)
 
     @property
     def native(self) -> algopy.String:
@@ -533,25 +535,12 @@ class Byte(UIntN[typing.Literal[8]]):
 
 
 UInt8: typing.TypeAlias = UIntN[typing.Literal[8]]
-"""An ARC4 UInt8."""
-
 UInt16: typing.TypeAlias = UIntN[typing.Literal[16]]
-"""An ARC4 UInt16."""
-
 UInt32: typing.TypeAlias = UIntN[typing.Literal[32]]
-"""An ARC4 UInt32."""
-
 UInt64: typing.TypeAlias = UIntN[typing.Literal[64]]
-"""An ARC4 UInt64."""
-
 UInt128: typing.TypeAlias = BigUIntN[typing.Literal[128]]
-"""An ARC4 UInt128."""
-
 UInt256: typing.TypeAlias = BigUIntN[typing.Literal[256]]
-"""An ARC4 UInt256."""
-
 UInt512: typing.TypeAlias = BigUIntN[typing.Literal[512]]
-"""An ARC4 UInt512."""
 
 
 class _BoolTypeInfo(_TypeInfo):
@@ -665,6 +654,8 @@ class StaticArray(
         super().__init__()
         items = _check_is_arc4(_items)
         for item in items:
+            if len(items) != self._type_info.size:
+                raise TypeError(f"expected {self._type_info.size} items, not {len(items)}")
             if self._type_info.item_type != item._type_info:
                 raise TypeError(
                     f"item must be of type {self._type_info.item_type!r}, not {item._type_info!r}"
@@ -735,10 +726,10 @@ class Address(StaticArray[Byte, typing.Literal[32]]):
                 bytes_value = algosdk.encoding.decode_address(value)
             except Exception as e:
                 raise ValueError(f"cannot encode the following address: {value!r}") from e
+        elif isinstance(value, Account):
+            bytes_value = value.bytes.value
         else:
-            bytes_value = (
-                value.bytes.value if isinstance(value, Account) else as_bytes(value, max_size=32)
-            )
+            bytes_value = as_bytes(value)
         if len(bytes_value) != 32:
             raise ValueError(f"expected 32 bytes, got: {len(bytes_value)}")
         self._value = bytes_value
@@ -1124,14 +1115,6 @@ class Struct(MutableBytes, _ABIEncoded, metaclass=_StructMeta):  # type: ignore[
         tuple_value = tuple_type.from_bytes(value)
         return cls(*tuple_value.native)
 
-    @classmethod
-    def from_log(cls, log: algopy.Bytes, /) -> typing.Self:
-        """Load an ABI type from application logs, checking for the ABI return prefix
-        `0x151f7c75`"""
-        if log[:4] == ARC4_RETURN_PREFIX:
-            return cls.from_bytes(log[4:])
-        raise ValueError("ABI return prefix not found")
-
     @property
     def bytes(self) -> algopy.Bytes:
         """Get the underlying bytes[]"""
@@ -1212,7 +1195,7 @@ def native_value_to_arc4(value: object) -> _ABIEncoded:  # noqa: PLR0911
     if isinstance(value, algopy.String):
         return String(value)
     if isinstance(value, tuple):
-        return Tuple(value)
+        return Tuple(tuple(map(native_value_to_arc4, value)))
     raise TypeError(f"Unsupported type: {type(value).__name__}")
 
 

{algorand_python_testing-0.3.0b7 → algorand_python_testing-0.3.0b8}/src/_algopy_testing/context.py

@@ -4,8 +4,8 @@ import typing
 
 import algosdk
 
-from _algopy_testing._context_helpers import LedgerContext, TransactionContext
-from _algopy_testing._value_generators import AlgopyValueGenerator
+from _algopy_testing.context_helpers import LedgerContext, TransactionContext
+from _algopy_testing.value_generators import AlgopyValueGenerator
 
 if typing.TYPE_CHECKING:
     from collections.abc import Sequence

algorand_python_testing-0.3.0b8/src/_algopy_testing/context_helpers/__init__.py

@@ -0,0 +1,13 @@
+from _algopy_testing.context_helpers.context_storage import (
+    algopy_testing_context,
+    lazy_context,
+)
+from _algopy_testing.context_helpers.ledger_context import LedgerContext
+from _algopy_testing.context_helpers.txn_context import TransactionContext
+
+__all__ = [
+    "LedgerContext",
+    "TransactionContext",
+    "algopy_testing_context",
+    "lazy_context",
+]

{algorand_python_testing-0.3.0b7/src/_algopy_testing/_context_helpers → algorand_python_testing-0.3.0b8/src/_algopy_testing/context_helpers}/context_storage.py

@@ -9,13 +9,13 @@ if typing.TYPE_CHECKING:
 
     import algopy
 
-    from _algopy_testing._context_helpers.ledger_context import LedgerContext
-    from _algopy_testing._context_helpers.txn_context import TransactionContext, TransactionGroup
-    from _algopy_testing._value_generators import AlgopyValueGenerator
     from _algopy_testing.context import AlgopyTestContext
+    from _algopy_testing.context_helpers.ledger_context import LedgerContext
+    from _algopy_testing.context_helpers.txn_context import TransactionContext, TransactionGroup
     from _algopy_testing.models.account import AccountContextData
     from _algopy_testing.models.application import ApplicationContextData
     from _algopy_testing.models.asset import AssetFields
+    from _algopy_testing.value_generators import AlgopyValueGenerator
 
 _var: ContextVar[AlgopyTestContext] = ContextVar("_var")
 
@@ -47,7 +47,7 @@ class _InternalContext:
     def any(self) -> AlgopyValueGenerator:
         return self.value.any
 
-    def get_active_txn_fields(self) -> dict[str, typing.Any]:
+    def get_active_txn_overrides(self) -> dict[str, typing.Any]:
         active_group = self.txn._active_group
         if active_group is None:
             return {}

{algorand_python_testing-0.3.0b7/src/_algopy_testing/_context_helpers → algorand_python_testing-0.3.0b8/src/_algopy_testing/context_helpers}/txn_context.py

@@ -5,7 +5,7 @@ import typing
 
 import algosdk
 
-from _algopy_testing._itxn_loader import ITxnGroupLoader
+from _algopy_testing import gtxn
 from _algopy_testing.decorators.arc4 import (
     check_routing_conditions,
     create_abimethod_txns,
@@ -14,22 +14,20 @@ from _algopy_testing.decorators.arc4 import (
     get_ordered_args,
 )
 from _algopy_testing.enums import OnCompleteAction
+from _algopy_testing.gtxn import TransactionBase
+from _algopy_testing.itxn import InnerTransaction, submit_txns
+from _algopy_testing.itxn_loader import ITxnGroupLoader, ITxnLoader
+from _algopy_testing.models import Application
+from _algopy_testing.primitives import UInt64
 
 if typing.TYPE_CHECKING:
     from collections.abc import Callable, Iterator, Sequence
 
     import algopy
 
-    from _algopy_testing._itxn_loader import InnerTransactionResultType
+    from _algopy_testing.itxn_loader import InnerTransactionResultType
     from _algopy_testing.models.txn_fields import ActiveTransactionFields
 
-from _algopy_testing import gtxn
-from _algopy_testing._itxn_loader import ITxnLoader
-from _algopy_testing.gtxn import TransactionBase
-from _algopy_testing.itxn import InnerTransaction, submit_txns
-from _algopy_testing.models import Application
-from _algopy_testing.primitives import UInt64
-
 TReturn = typing.TypeVar("TReturn")
 TParamSpec = typing.ParamSpec("TParamSpec")
 
@@ -71,19 +69,19 @@ class TransactionContext:
     @contextlib.contextmanager
     def _maybe_implicit_txn_group(
         self, gtxns: typing.Sequence[algopy.gtxn.TransactionBase]
-    ) -> Iterator[None]:
+    ) -> Iterator[TransactionGroup]:
         """Only creates a group if there isn't one already active."""
-        active_group = self._active_group
-        if not active_group:
-            ctx: typing.ContextManager[None] = self.create_group(gtxns)
-        else:
+        expected_app_id = gtxns[-1].app_id.id
+        with self._get_or_create_group() as active_group:
             if not active_group.txns:
                 active_group._set_txn_group(gtxns)
-            elif gtxns[-1].app_id != active_group.active_app_id:
-                raise ValueError("Executing contract has different app_id than active txn")
-            ctx = contextlib.nullcontext()
-        with ctx:
-            yield
+            elif expected_app_id != active_group.active_app_id:
+                from _algopy_testing.context_helpers import lazy_context
+
+                app_data = lazy_context.get_app_data(active_group.active_app_id)
+                if not (app_data.is_creating and expected_app_id == 0):
+                    raise ValueError("Executing contract has different app_id than active txn")
+            yield active_group
 
     def defer_app_call(
         self,
@@ -113,6 +111,7 @@ class TransactionContext:
             raise ValueError("The provided method must be an instance method of an ARC4 contract")
 
         app_id = contract.__app_id__
+        allow_actions = arc4_metadata.allow_actions or [OnCompleteAction.NoOp]
         # Handle ABI methods
         if arc4_metadata.arc4_signature:
             ordered_args = get_ordered_args(fn, args, kwargs)
@@ -120,11 +119,11 @@ class TransactionContext:
                 app_id=app_id,
                 arc4_signature=arc4_metadata.arc4_signature,
                 args=ordered_args,
-                allow_actions=arc4_metadata.allow_actions or [OnCompleteAction.NoOp],
+                allow_actions=allow_actions,
             )
         # Handle bare methods
         else:
-            txns = create_baremethod_txns(app_id)
+            txns = create_baremethod_txns(app_id, allow_actions)
 
         return DeferredAppCall(app_id=app_id, txns=txns, method=method, args=args, kwargs=kwargs)
 
@@ -165,7 +164,7 @@ class TransactionContext:
             active_txn_index = processed_gtxns.index(last_app_call_txn)
 
         previous_group = self._active_group
-        self._active_group = TransactionGroup(
+        active_group = self._active_group = TransactionGroup(
             txns=processed_gtxns,
             active_txn_index=active_txn_index,
             active_txn_overrides=typing.cast(dict[str, typing.Any], active_txn_overrides),
@@ -173,10 +172,21 @@ class TransactionContext:
         try:
             yield
         finally:
-            if self._active_group.txns:
-                self._groups.append(self._active_group)
+            if active_group.txns:
+                self._groups.append(active_group)
             self._active_group = previous_group
 
+    @contextlib.contextmanager
+    def _get_or_create_group(self) -> Iterator[TransactionGroup]:
+        if not self._active_group:
+            ctx: typing.ContextManager[None] = self.create_group()
+        else:
+            ctx = contextlib.nullcontext()
+        with ctx:
+            active_group = self._active_group
+            assert active_group is not None
+            yield active_group
+
     @property
     def last_group(self) -> TransactionGroup:
         if not self._groups:
@@ -212,9 +222,7 @@ class TransactionGroup:
             self.active_txn_index = 0
             return
         if not all(isinstance(txn, gtxn.TransactionBase) for txn in txns):
-            raise ValueError(
-                "All transactions must be instances of TransactionBase or DeferredAppCall"
-            )
+            raise ValueError("All transactions must be instances of TransactionBase")
 
         if len(txns) > algosdk.constants.TX_GROUP_LIMIT:
             raise ValueError(