algorand-python-testing 0.3.0b10__tar.gz → 0.4.0b2__tar.gz

{algorand_python_testing-0.3.0b10 → algorand_python_testing-0.4.0b2}/CHANGELOG.md

@@ -1,4 +1,38 @@
 # CHANGELOG
+## v0.4.0-beta.2 (2024-08-27)
+
+## v0.4.0-beta.1 (2024-08-27)
+
+### Feature
+
+* add support for frozen on asset holdings, including a new ledger function `update_asset_holdings` for setting asset holding balances and frozen states ([`d777ca0`](https://github.com/algorandfoundation/algorand-python-testing/commit/d777ca0a318a8ade7a20363c9ce77fe8a8bf5d68))
+
+* expand accepted types when interacting with accounts, applications and assets ([`f448a97`](https://github.com/algorandfoundation/algorand-python-testing/commit/f448a97cb154c9f90ecf42c599b240f12928af20))
+
+  wip
+
+* replaced `account_exists` with `account_is_funded` as the later is more useful ([`4d08690`](https://github.com/algorandfoundation/algorand-python-testing/commit/4d086903eb93a70ce1d485cdd7b12d8472ef16db))
+
+### Fix
+
+* use correct type for Globals.caller_application_id ([`a30d85a`](https://github.com/algorandfoundation/algorand-python-testing/commit/a30d85a4416dfc2c5d901f3ace2265384ef60c01))
+
+* do not allow specifying `address` for applications, it is derived from the app_id ([`00fe1bc`](https://github.com/algorandfoundation/algorand-python-testing/commit/00fe1bc8ea247dcc36b01154db36b984b151e396))
+
+* do not treat asset and application ids as possible foreign array indexes ([`94a989f`](https://github.com/algorandfoundation/algorand-python-testing/commit/94a989f77169da2ae437c629cd5f4d8a872263f6))
+
+* removed incorrect deduction in `algopy.op.balance` ([`76e67c5`](https://github.com/algorandfoundation/algorand-python-testing/commit/76e67c5e3dd1cda388a2a948d452ba89805add6a))
+
+* ensure all comparable types return `NotImplemented` when a comparison is not possible ([`b055fa6`](https://github.com/algorandfoundation/algorand-python-testing/commit/b055fa68531e0b7923773ec10c2097a3d64b9dbe))
+
+* `arc4_prefix` annotated to also accept `algopy.Bytes` ([`40328ca`](https://github.com/algorandfoundation/algorand-python-testing/commit/40328ca3701b3e255193e206e8a7b1bdb441a346))
+
+### Documentation
+
+* include usage of `algopy_testing_context` in README.md quick start ([`4702f60`](https://github.com/algorandfoundation/algorand-python-testing/commit/4702f60cfe7d09956a5ae6dbdcd72da29fdda808))
+
+## v0.3.0 (2024-08-22)
+
 ## v0.3.0-beta.10 (2024-08-22)
 
 ## v0.3.0-beta.9 (2024-08-22)

{algorand_python_testing-0.3.0b10 → algorand_python_testing-0.4.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: algorand-python-testing
-Version: 0.3.0b10
+Version: 0.4.0b2
 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
@@ -55,17 +55,18 @@ Alternatively, if you want to start from scratch:
     ```python
     from algopy_testing import algopy_testing_context
     from your_contract import YourContract
-
+    
     def test_your_contract():
-        # Arrange
-        contract = YourContract()
-        expected_result = ... # Your expected result here
-
-        # Act
-        result = contract.your_method()  # Your test code here
-
-        # Assert
-        assert result == expected_result
+        with algopy_testing_context() as context:
+            # Arrange
+            contract = YourContract()
+            expected_result = ... # Your expected result here
+    
+            # Act
+            result = contract.your_method(context.any.uint64())  # Your test code here
+    
+            # Assert
+            assert result == expected_result
     ```
 
 5. Run your tests using your preferred Python testing framework (e.g., pytest, unittest)

{algorand_python_testing-0.3.0b10 → algorand_python_testing-0.4.0b2}/README.md

@@ -32,17 +32,18 @@ Alternatively, if you want to start from scratch:
     ```python
     from algopy_testing import algopy_testing_context
     from your_contract import YourContract
-
+    
     def test_your_contract():
-        # Arrange
-        contract = YourContract()
-        expected_result = ... # Your expected result here
-
-        # Act
-        result = contract.your_method()  # Your test code here
-
-        # Assert
-        assert result == expected_result
+        with algopy_testing_context() as context:
+            # Arrange
+            contract = YourContract()
+            expected_result = ... # Your expected result here
+    
+            # Act
+            result = contract.your_method(context.any.uint64())  # Your test code here
+    
+            # Assert
+            assert result == expected_result
     ```
 
 5. Run your tests using your preferred Python testing framework (e.g., pytest, unittest)

{algorand_python_testing-0.3.0b10 → algorand_python_testing-0.4.0b2}/docs/testing-guide/avm-types.md

@@ -103,7 +103,7 @@ asset = context.ledger.get_asset(asset_id=random_asset.id)
 
 # Update an asset
 context.ledger.update_asset(
-    asset_id=random_asset.id,
+    random_asset,
     name=...,  # Optional: New asset name
     total=...,  # Optional: New total supply
     decimals=...,  # Optional: Number of decimals
@@ -130,7 +130,7 @@ account = algopy.Account(raw_address) # zero address by default
 # Generate a random account
 random_account = context.any.account(
     address=str(raw_address),  # Optional: Specify a custom address, defaults to a random address
-    opted_asset_balances=...,  # Optional: Specify opted asset balances as dict of algopy.UInt64 as key and algopy.UInt64 as value
+    opted_asset_balances={},  # Optional: Specify opted asset balances as dict of assets to balance
     opted_apps=[],  # Optional: Specify opted apps as sequence of algopy.Application objects
     balance=...,  # Optional: Specify an initial balance
     min_balance=...,  # Optional: Specify a minimum balance
@@ -145,7 +145,7 @@ random_account = context.any.account(
 # Generate a random account that is opted into a specific asset
 mock_asset = context.any.asset()
 mock_account = context.any.account(
-    opted_asset_balances={mock_asset.id: algopy.UInt64(123)}
+    opted_asset_balances={mock_asset: 123}
 )
 
 # Get an account by address
@@ -153,7 +153,7 @@ account = context.ledger.get_account(str(mock_account))
 
 # Update an account
 context.ledger.update_account(
-    str(mock_account),
+    mock_account,
     balance=...,  # Optional: New balance
     min_balance=...,  # Optional: New minimum balance
     auth_address=context.any.account(),  # Optional: New auth address
@@ -181,7 +181,6 @@ application = algopy.Application()
 
 # Generate a random application
 random_app = context.any.application(
-    address=...,  # Optional: Specify a custom address for the application
     approval_program=algopy.Bytes(b''),  # Optional: Specify a custom approval program
     clear_state_program=algopy.Bytes(b''),  # Optional: Specify a custom clear state program
     global_num_uint=algopy.UInt64(1),  # Optional: Number of global uint values
@@ -197,7 +196,7 @@ app = context.ledger.get_app(app_id=random_app.id)
 
 # Update an application
 context.ledger.update_app(
-    app_id=random_app.id,
+    random_app,
     approval_program=...,  # Optional: New approval program
     clear_state_program=...,  # Optional: New clear state program
     global_num_uint=...,  # Optional: New number of global uint values

{algorand_python_testing-0.3.0b10 → algorand_python_testing-0.4.0b2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "algorand-python-testing"
-version = "0.3.0-beta.10"
+version = "0.4.0-beta.2"
 description = 'Algorand Python testing library'
 readme = "README.md"
 requires-python = ">=3.12"

{algorand_python_testing-0.3.0b10 → algorand_python_testing-0.4.0b2}/src/_algopy_testing/__init__.py

@@ -25,9 +25,6 @@ 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,
-# context, and arc4_prexif from utils (make utils private)
 __all__ = [
     "ARC4Contract",
     "ARC4ValueGenerator",

{algorand_python_testing-0.3.0b10 → algorand_python_testing-0.4.0b2}/src/_algopy_testing/arc4.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import dataclasses
 import decimal
+import functools
 import types
 import typing
 
@@ -169,7 +170,8 @@ class _ABIEncoded(BytesBacked):
     def __eq__(self, other: object) -> bool:
         if isinstance(other, _ABIEncoded):
             return self._type_info == other._type_info and self.bytes == other.bytes
-        return NotImplemented
+        else:
+            return NotImplemented
 
     def __hash__(self) -> int:
         return hash(self.bytes)
@@ -234,7 +236,11 @@ class String(_ABIEncoded):
         return String(as_string(other) + self.native)
 
     def __eq__(self, other: String | str) -> bool:  # type: ignore[override]
-        return self.native == as_string(other)
+        try:
+            other_string = as_string(other)
+        except TypeError:
+            return NotImplemented
+        return self.native == other_string
 
     def __bool__(self) -> bool:
         """Returns `True` if length is not zero."""
@@ -294,47 +300,12 @@ class _UIntN(_ABIEncoded, typing.Generic[_TBitSize], metaclass=_UIntNMeta):
         bytes_value = int_to_bytes(value, self._type_info.max_bytes_len)
         self._value = as_bytes(bytes_value)
 
-    def __eq__(  # type: ignore[override]
-        self,
-        other: UIntN[_TBitSize] | BigUIntN[_TBitSize] | algopy.UInt64 | algopy.BigUInt | int,
-    ) -> bool:
-        raise NotImplementedError
-
-    def __ne__(  # type: ignore[override]
-        self,
-        other: UIntN[_TBitSize] | BigUIntN[_TBitSize] | algopy.UInt64 | algopy.BigUInt | int,
-    ) -> bool:
-        raise NotImplementedError
-
-    def __le__(
-        self,
-        other: UIntN[_TBitSize] | BigUIntN[_TBitSize] | algopy.UInt64 | algopy.BigUInt | int,
-    ) -> bool:
-        raise NotImplementedError
-
-    def __lt__(
-        self,
-        other: UIntN[_TBitSize] | BigUIntN[_TBitSize] | algopy.UInt64 | algopy.BigUInt | int,
-    ) -> bool:
-        raise NotImplementedError
-
-    def __ge__(
-        self,
-        other: UIntN[_TBitSize] | BigUIntN[_TBitSize] | algopy.UInt64 | algopy.BigUInt | int,
-    ) -> bool:
-        raise NotImplementedError
-
-    def __gt__(
-        self,
-        other: UIntN[_TBitSize] | BigUIntN[_TBitSize] | algopy.UInt64 | algopy.BigUInt | int,
-    ) -> bool:
-        raise NotImplementedError
-
     def __bool__(self) -> bool:
         """Returns `True` if not equal to zero."""
         raise NotImplementedError
 
 
+@functools.total_ordering
 class UIntN(_UIntN, typing.Generic[_TBitSize]):  # type: ignore[type-arg]
     """An ARC4 UInt consisting of the number of bits specified.
 
@@ -349,22 +320,18 @@ class UIntN(_UIntN, typing.Generic[_TBitSize]):  # type: ignore[type-arg]
         return algopy.UInt64(int.from_bytes(self._value))
 
     def __eq__(self, other: object) -> bool:
-        return as_int64(self.native) == as_int(other, max=None)
-
-    def __ne__(self, other: object) -> bool:
-        return as_int64(self.native) != as_int(other, max=None)
-
-    def __le__(self, other: object) -> bool:
-        return as_int64(self.native) <= as_int(other, max=None)
+        try:
+            other_int = as_int64(other)
+        except (TypeError, ValueError):
+            return NotImplemented
+        return as_int64(self.native) == other_int
 
     def __lt__(self, other: object) -> bool:
-        return as_int64(self.native) < as_int(other, max=None)
-
-    def __ge__(self, other: object) -> bool:
-        return as_int64(self.native) >= as_int(other, max=None)
-
-    def __gt__(self, other: object) -> bool:
-        return as_int64(self.native) > as_int(other, max=None)
+        try:
+            other_int = as_int64(other)
+        except (TypeError, ValueError):
+            return NotImplemented
+        return as_int64(self.native) < other_int
 
     def __bool__(self) -> bool:
         return bool(self.native)
@@ -376,6 +343,7 @@ class UIntN(_UIntN, typing.Generic[_TBitSize]):  # type: ignore[type-arg]
         return _arc4_repr(self)
 
 
+@functools.total_ordering
 class BigUIntN(_UIntN, typing.Generic[_TBitSize]):  # type: ignore[type-arg]
     """An ARC4 UInt consisting of the number of bits specified.
 
@@ -390,22 +358,18 @@ class BigUIntN(_UIntN, typing.Generic[_TBitSize]):  # type: ignore[type-arg]
         return algopy.BigUInt.from_bytes(self._value)
 
     def __eq__(self, other: object) -> bool:
-        return as_int512(self.native) == as_int(other, max=None)
-
-    def __ne__(self, other: object) -> bool:
-        return as_int512(self.native) != as_int(other, max=None)
-
-    def __le__(self, other: object) -> bool:
-        return as_int512(self.native) <= as_int(other, max=None)
+        try:
+            other_int = as_int512(other)
+        except (TypeError, ValueError):
+            return NotImplemented
+        return as_int512(self.native) == other_int
 
     def __lt__(self, other: object) -> bool:
-        return as_int512(self.native) < as_int(other, max=None)
-
-    def __ge__(self, other: object) -> bool:
-        return as_int512(self.native) >= as_int(other, max=None)
-
-    def __gt__(self, other: object) -> bool:
-        return as_int512(self.native) > as_int(other, max=None)
+        try:
+            other_int = as_int512(other)
+        except (TypeError, ValueError):
+            return NotImplemented
+        return as_int512(self.native) < other_int
 
     def __bool__(self) -> bool:
         return bool(self.native)
@@ -749,8 +713,11 @@ class Address(StaticArray[Byte, typing.Literal[32]]):
         `Account` or `str`"""
         if isinstance(other, Address | Account):
             return self.bytes == other.bytes
-        other_bytes: bytes = algosdk.encoding.decode_address(other)
-        return self.bytes == other_bytes
+        elif isinstance(other, str):
+            other_bytes: bytes = algosdk.encoding.decode_address(other)
+            return self.bytes == other_bytes
+        else:
+            return NotImplemented
 
     def __str__(self) -> str:
         return str(self.native)

{algorand_python_testing-0.3.0b10 → algorand_python_testing-0.4.0b2}/src/_algopy_testing/context_helpers/ledger_context.py

@@ -6,7 +6,12 @@ from collections import defaultdict
 from _algopy_testing.constants import MAX_BOX_SIZE
 from _algopy_testing.models.account import Account
 from _algopy_testing.primitives.uint64 import UInt64
-from _algopy_testing.utils import as_bytes, assert_address_is_valid, get_default_global_fields
+from _algopy_testing.utils import (
+    as_bytes,
+    assert_address_is_valid,
+    convert_stack_to_native,
+    get_default_global_fields,
+)
 
 if typing.TYPE_CHECKING:
     import algopy
@@ -58,37 +63,61 @@ class LedgerContext:
         assert_address_is_valid(address)
         return algopy.Account(address)
 
-    def account_exists(self, address: str) -> bool:
-        """Check if an account exists.
+    def account_is_funded(self, account: algopy.Account | str) -> bool:
+        """Check if an account has funds.
 
         Args:
             address (str): The account address.
 
         Returns:
-            bool: True if the account exists, False otherwise.
+            bool: True if the account has an algo balance > 0, False otherwise.
         """
+        address = _get_address(account)
         assert_address_is_valid(address)
-        return address in self._account_data
+        return self._account_data[address].fields["balance"] > 0
 
     def update_account(
         self,
-        address: str,
-        opted_asset_balances: dict[int, algopy.UInt64] | None = None,
+        account: algopy.Account | str,
         **account_fields: typing.Unpack[AccountFields],
     ) -> None:
         """Update account fields.
 
         Args:
-            address (str): The account address.
-            opted_asset_balances (dict[int, algopy.UInt64] | None): The opted asset balances .
+            account: The account.
             **account_fields: The fields to update.
         """
+        address = _get_address(account)
         assert_address_is_valid(address)
         self._account_data[address].fields.update(account_fields)
 
-        if opted_asset_balances is not None:
-            for asset_id, balance in opted_asset_balances.items():
-                self._account_data[address].opted_asset_balances[UInt64(asset_id)] = balance
+    def update_asset_holdings(
+        self,
+        asset: algopy.Asset | algopy.UInt64 | int,
+        account: algopy.Account | str,
+        *,
+        balance: algopy.UInt64 | int | None = None,
+        frozen: bool | None = None,
+    ) -> None:
+        """Update asset holdings for account, only specified values will be updated.
+
+        Account will also be opted-in to asset
+        """
+        from _algopy_testing.models.account import AssetHolding
+
+        address = _get_address(account)
+        account_data = self._account_data[address]
+        asset_id = _get_asset_id(asset)
+        asset = self.get_asset(asset_id)
+
+        holdings = account_data.opted_assets.setdefault(
+            asset_id,
+            AssetHolding(balance=UInt64(), frozen=asset.default_frozen),
+        )
+        if balance is not None:
+            holdings.balance = UInt64(int(balance))
+        if frozen is not None:
+            holdings.frozen = frozen
 
     def get_asset(self, asset_id: algopy.UInt64 | int) -> algopy.Asset:
         """Get an asset by ID.
@@ -104,13 +133,13 @@ class LedgerContext:
         """
         import algopy
 
-        asset_id = int(asset_id) if isinstance(asset_id, algopy.UInt64) else asset_id
+        asset_id = _get_asset_id(asset_id)
         if asset_id not in self._asset_data:
             raise ValueError("Asset not found in testing context!")
 
         return algopy.Asset(asset_id)
 
-    def asset_exists(self, asset_id: algopy.UInt64 | int) -> bool:
+    def asset_exists(self, asset: algopy.Asset | algopy.UInt64 | int) -> bool:
         """Check if an asset exists.
 
         Args:
@@ -119,12 +148,12 @@ class LedgerContext:
         Returns:
             bool: True if the asset exists, False otherwise.
         """
-        import algopy
-
-        asset_id = int(asset_id) if isinstance(asset_id, algopy.UInt64) else asset_id
+        asset_id = _get_asset_id(asset)
         return asset_id in self._asset_data
 
-    def update_asset(self, asset_id: int, **asset_fields: typing.Unpack[AssetFields]) -> None:
+    def update_asset(
+        self, asset: algopy.Asset | algopy.UInt64 | int, **asset_fields: typing.Unpack[AssetFields]
+    ) -> None:
         """Update asset fields.
 
         Args:
@@ -134,6 +163,7 @@ class LedgerContext:
         Raises:
             ValueError: If the asset is not found.
         """
+        asset_id = _get_asset_id(asset)
         if asset_id not in self._asset_data:
             raise ValueError("Asset not found in testing context!")
         self._asset_data[asset_id].update(asset_fields)
@@ -154,28 +184,30 @@ class LedgerContext:
         app_data = self._get_app_data(app_id)
         return algopy.Application(app_data.app_id)
 
-    def app_exists(self, app_id: algopy.UInt64 | int) -> bool:
+    def app_exists(self, app: algopy.Application | algopy.UInt64 | int) -> bool:
         """Check if an application exists.
 
         Args:
-            app (algopy.UInt64 | int): The application ID.
+            app: The application to check.
 
         Returns:
             bool: True if the application exists, False otherwise.
         """
-        app_id = _get_app_id(app_id)
+        app_id = _get_app_id(app)
         return app_id in self._app_data
 
     def update_app(
-        self, app_id: int, **application_fields: typing.Unpack[ApplicationFields]
+        self,
+        app: algopy.Application | algopy.UInt64 | int,
+        **application_fields: typing.Unpack[ApplicationFields],
     ) -> None:
         """Update application fields.
 
         Args:
-            app_id (int): The application ID.
+            app: The application to update.
             **application_fields: The fields to update.
         """
-        app_data = self._get_app_data(app_id)
+        app_data = self._get_app_data(app)
         app_data.fields.update(application_fields)
 
     def get_global_state(
@@ -198,7 +230,7 @@ class LedgerContext:
         self,
         app: algopy.Contract | algopy.Application | algopy.UInt64 | int,
         key: bytes | algopy.Bytes,
-        value: int | bytes | None,
+        value: algopy.Bytes | algopy.UInt64 | int | bytes | None,
     ) -> None:
         """Set global state for an application.
 
@@ -213,7 +245,7 @@ class LedgerContext:
             if key_bytes in global_state:
                 del global_state[key_bytes]
         else:
-            global_state[key_bytes] = value
+            global_state[key_bytes] = convert_stack_to_native(value)
 
     def get_local_state(
         self,
@@ -242,7 +274,7 @@ class LedgerContext:
         app: algopy.Contract | algopy.Application | algopy.UInt64 | int,
         account: algopy.Account | str,
         key: algopy.Bytes | bytes,
-        value: int | bytes | None,
+        value: algopy.Bytes | algopy.UInt64 | int | bytes | None,
     ) -> None:
         """Set local state for an application and account.
 
@@ -260,7 +292,7 @@ class LedgerContext:
             if composite_key in local_state:
                 del local_state[composite_key]
         else:
-            local_state[composite_key] = value
+            local_state[composite_key] = convert_stack_to_native(value)
 
     def get_box(
         self,
@@ -372,16 +404,14 @@ class LedgerContext:
             **global_fields: The fields to patch.
 
         Raises:
-            AttributeError: If invalid fields are provided.
+            ValueError: If invalid fields are provided.
         """
         from _algopy_testing.op.global_values import GlobalFields
 
         invalid_keys = global_fields.keys() - GlobalFields.__annotations__.keys()
 
         if invalid_keys:
-            raise AttributeError(
-                f"Invalid field(s) found during patch for `Global`: {', '.join(invalid_keys)}"
-            )
+            raise ValueError(f"Invalid Global fields: {', '.join(invalid_keys)}")
 
         self._global_fields.update(global_fields)
 
@@ -450,3 +480,14 @@ def _get_app_id(app: algopy.UInt64 | algopy.Application | algopy.Contract | int)
     else:
         raise TypeError("invalid type")
     return app_id
+
+
+def _get_address(account: algopy.Account | str) -> str:
+    return account if isinstance(account, str) else account.public_key
+
+
+def _get_asset_id(asset: algopy.Asset | algopy.UInt64 | int) -> int:
+    from _algopy_testing.models import Asset
+
+    asset_id = asset.id if isinstance(asset, Asset) else asset
+    return int(asset_id)

{algorand_python_testing-0.3.0b10 → algorand_python_testing-0.4.0b2}/src/_algopy_testing/models/account.py

@@ -33,39 +33,42 @@ class AccountFields(typing.TypedDict, total=False):
 
 
 def get_empty_account() -> AccountContextData:
-    zero = UInt64()
     return AccountContextData(
         fields={
-            "balance": zero,
+            "balance": UInt64(),
             "min_balance": UInt64(DEFAULT_ACCOUNT_MIN_BALANCE),
             "auth_address": Account(),
-            "total_num_uint": zero,
-            "total_num_byte_slice": zero,
-            "total_extra_app_pages": zero,
-            "total_apps_created": zero,
-            "total_apps_opted_in": zero,
-            "total_assets_created": zero,
-            "total_assets": zero,
-            "total_boxes": zero,
-            "total_box_bytes": zero,
-        }
+            "total_num_uint": UInt64(),
+            "total_num_byte_slice": UInt64(),
+            "total_extra_app_pages": UInt64(),
+            "total_apps_created": UInt64(),
+            "total_apps_opted_in": UInt64(),
+            "total_assets_created": UInt64(),
+            "total_assets": UInt64(),
+            "total_boxes": UInt64(),
+            "total_box_bytes": UInt64(),
+        },
     )
 
 
+@dataclasses.dataclass
+class AssetHolding:
+    balance: algopy.UInt64
+    frozen: bool
+
+
 @dataclasses.dataclass
 class AccountContextData:
     """Stores account-related information.
 
     Attributes:
-        opted_asset_balances (dict[int, algopy.UInt64]): Mapping of asset IDs to balances.
-        opted_apps (dict[int, algopy.UInt64]): Mapping of application IDs to instances.
+        opted_assets (dict[int, AssetHolding]): Mapping of asset IDs to holdings.
+        opted_apps (dict[int, algopy.Application]): Mapping of application IDs to instances.
         fields (AccountFields): Additional account fields.
     """
 
-    opted_asset_balances: dict[algopy.UInt64, algopy.UInt64] = dataclasses.field(
-        default_factory=dict
-    )
-    opted_apps: dict[algopy.UInt64, algopy.Application] = dataclasses.field(default_factory=dict)
+    opted_assets: dict[int, AssetHolding] = dataclasses.field(default_factory=dict)
+    opted_apps: dict[int, algopy.Application] = dataclasses.field(default_factory=dict)
     fields: AccountFields = dataclasses.field(default_factory=AccountFields)  # type: ignore[arg-type]
 
 
@@ -96,7 +99,7 @@ class Account(BytesBacked):
         from _algopy_testing.models import Application, Asset
 
         if isinstance(asset_or_app, Asset):
-            return asset_or_app.id in self.data.opted_asset_balances
+            return asset_or_app.id in self.data.opted_assets
         elif isinstance(asset_or_app, Application):
             return asset_or_app.id in self.data.opted_apps
 
@@ -131,13 +134,12 @@ class Account(BytesBacked):
         return self.public_key
 
     def __eq__(self, other: object) -> bool:
-        match other:
-            case Account() as other_acc:
-                return self._public_key == other_acc._public_key
-            case str() as other_str:
-                return self.public_key == other_str
-            case _:
-                return NotImplemented
+        if isinstance(other, Account):
+            return self._public_key == other._public_key
+        elif isinstance(other, str):
+            return self.public_key == other
+        else:
+            return NotImplemented
 
     def __bool__(self) -> bool:
         return bool(self._public_key) and self._public_key != algosdk.encoding.decode_address(