Merge pull request #48 from algorandfoundation/update-langspec

feat: update langspec to 4.3.0

Author: boblat

pyproject.toml

@@ -32,7 +32,7 @@ dependencies = [
     "coincurve>=19.0.1",
     # TODO: uncomment below and remove direct git reference once puya 5.0 is released
     # "algorand-python>=3",
-    "algorand-python@git+https://github.com/algorandfoundation/[email protected].11#subdirectory=stubs",
+    "algorand-python@git+https://github.com/algorandfoundation/[email protected].12#subdirectory=stubs",
 ]
 
 [project.urls]
@@ -54,7 +54,7 @@ python = "3.12"
 dependencies = [
     # TODO: uncomment below and remove direct git reference once puya 5.0 is released
     # "puyapy>=5",
-    "puyapy@git+https://github.com/algorandfoundation/[email protected].11",
+    "puyapy@git+https://github.com/algorandfoundation/[email protected].12",
     "pytest>=7.4",
     "pytest-mock>=3.10.0",
     "pytest-xdist[psutil]>=3.3",
@@ -138,7 +138,7 @@ dependencies = [
     "algokit-utils>=3.0.0",
     # TODO: uncomment below and remove direct git reference once puya 5.0 is released
     # "puyapy>=5",
-    "puyapy@git+https://github.com/algorandfoundation/[email protected].11",
+    "puyapy@git+https://github.com/algorandfoundation/[email protected].12",
 ]
 
 [tool.hatch.envs.test.scripts]
@@ -191,7 +191,7 @@ post-install-commands = [
 dependencies = [
     # TODO: uncomment below and remove direct git reference once puya 5.0 is released
     # "algorand-python>=3",
-    "algorand-python@git+https://github.com/algorandfoundation/[email protected].11#subdirectory=stubs",
+    "algorand-python@git+https://github.com/algorandfoundation/[email protected].12#subdirectory=stubs",
     "pytest>=7.4",
     "pytest-mock>=3.10.0",
     "pytest-xdist[psutil]>=3.3",

src/_algopy_testing/models/application.py

@@ -25,6 +25,7 @@ class ApplicationFields(typing.TypedDict, total=False):
     local_num_bytes: algopy.UInt64
     extra_program_pages: algopy.UInt64
     creator: algopy.Account
+    version: algopy.UInt64
 
 
 AccountKey = str

src/_algopy_testing/models/contract.py

@@ -94,7 +94,7 @@ def __init_subclass__(
             algopy.urange | tuple[int | algopy.urange, ...] | list[int | algopy.urange] | None
         ) = None,
         state_totals: StateTotals | None = None,
-        avm_version: int = 10,
+        avm_version: int = 11,
     ):
         cls._name = name or cls.__name__
         cls._scratch_slots = scratch_slots

src/_algopy_testing/models/txn_fields.py

@@ -84,6 +84,7 @@ class ApplicationCallFields(ActiveTransactionFields, total=False):
     approval_program: Sequence[algopy.Bytes]
     clear_state_program: Sequence[algopy.Bytes]
     created_app: algopy.Application
+    reject_version: algopy.UInt64
 
 
 class KeyRegistrationFields(TransactionBaseFields, total=False):
@@ -153,6 +154,7 @@ class TransactionFields(  # type: ignore[misc]
     "local_num_bytes": UInt64,
     "extra_program_pages": UInt64,
     "vote_first": UInt64,
+    "reject_version": UInt64,
     "vote_last": UInt64,
     "vote_key_dilution": UInt64,
     "created_app": Application,
@@ -505,6 +507,10 @@ def num_logs(self) -> algopy.UInt64:
     def logs(self) -> Callable[[algopy.UInt64 | int], algopy.Bytes]:
         return _create_array_accessor(self._logs)
 
+    @property
+    def reject_version(self) -> algopy.UInt64:
+        return self.fields["reject_version"]  # type: ignore[return-value]
+
     def __getattr__(self, name: str) -> object:
         try:
             return self.fields[name]

src/_algopy_testing/op/pure.py

@@ -31,7 +31,7 @@ def bsqrt(a: BigUInt | int, /) -> BigUInt:
 def btoi(a: Bytes | bytes, /) -> UInt64:
     a_bytes = as_bytes(a)
     if len(a_bytes) > 8:
-        raise ValueError(f"btoi arg too long, got [{len(a_bytes)}]bytes")
+        raise ValueError(f"btoi arg too long, got {len(a_bytes)} bytes")
     return UInt64(int.from_bytes(a_bytes))
 
 

src/_algopy_testing/value_generators/avm.py

@@ -168,6 +168,7 @@ def application(
             "local_num_bytes": _algopy_testing.UInt64(0),
             "extra_program_pages": _algopy_testing.UInt64(0),
             "creator": lazy_context.value.default_sender,
+            "version": _algopy_testing.UInt64(0),
         }
 
         # Merge provided fields with defaults, prioritizing provided fields

tests/arc4/conftest.py

@@ -6,7 +6,7 @@
 from tests.common import AVMInvoker, create_avm_invoker
 
 ARTIFACTS_DIR = Path(__file__).parent / ".." / "artifacts"
-APP_SPEC = ARTIFACTS_DIR / "Arc4PrimitiveOps" / "data" / "Arc4PrimitiveOpsContract.arc32.json"
+APP_SPEC = ARTIFACTS_DIR / "Arc4PrimitiveOps" / "data" / "Arc4PrimitiveOpsContract.arc56.json"
 
 
 @pytest.fixture(scope="module")

tests/arc4/test_arc4_method_signature.py

@@ -19,7 +19,7 @@
 from tests.common import AVMInvoker, create_avm_invoker
 
 ARTIFACTS_DIR = Path(__file__).parent / ".." / "artifacts"
-APP_SPEC = ARTIFACTS_DIR / "Arc4ABIMethod" / "data" / "SignaturesContract.arc32.json"
+APP_SPEC = ARTIFACTS_DIR / "Arc4ABIMethod" / "data" / "SignaturesContract.arc56.json"
 _FUNDED_ACCOUNT_SPENDING = 1234
 
 

tests/arc4/test_bool.py

@@ -59,7 +59,10 @@ def test_string_from_log_invalid_prefix(
 ) -> None:
     with pytest.raises(
         algokit_utils.LogicError,
-        match=re.compile("(assert failed)|(extraction start \\d+ is beyond length)"),
+        match=re.compile(
+            "(application log value is not the result of an ABI return)|"
+            "(extraction start \\d+ is beyond length)"
+        ),
     ):
         get_avm_result("verify_bool_from_log", a=prefix + value)
     with pytest.raises(ValueError, match="ABI return prefix not found"):

tests/arc4/test_string.py

@@ -120,7 +120,10 @@ def test_string_from_log_invalid_prefix(
     value = int_to_bytes(len(value), 2) + value
     with pytest.raises(
         algokit_utils.LogicError,
-        match=re.compile("(assert failed)|(extraction start \\d+ is beyond length)"),
+        match=re.compile(
+            "(application log value is not the result of an ABI return)|"
+            "(extraction start \\d+ is beyond length)"
+        ),
     ):
         get_avm_result("verify_string_from_log", a=prefix + value)
     with pytest.raises(ValueError, match="ABI return prefix not found"):