Merge remote-tracking branch 'origin/main' into decoupling

Author: aorumbayev

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 <!--next-version-placeholder-->
 
+## v4.2.3 (2025-12-15)
+
+### Fix
+
+* Update urllib3 for audit issue ([#239](https://github.com/algorandfoundation/algokit-utils-py/issues/239)) ([`ab36d0c`](https://github.com/algorandfoundation/algokit-utils-py/commit/ab36d0cfca8998db7837f6a98c2be994c6af4f27))
+* Enable LocalNet dispensing after 30000 rounds ([#226](https://github.com/algorandfoundation/algokit-utils-py/issues/226)) ([`d1f8693`](https://github.com/algorandfoundation/algokit-utils-py/commit/d1f8693a6b6253f2dff9a34ba0e474109e789d40))
+* Use extra pages available when deploying ([#217](https://github.com/algorandfoundation/algokit-utils-py/issues/217)) ([`afda7ac`](https://github.com/algorandfoundation/algokit-utils-py/commit/afda7ac85a32ef676c5cbefa3616e93af8f81265))
+
+### Documentation
+
+* Remove html docs and gh pages; tweak md docstrings to convert to regular python code blocks ([#205](https://github.com/algorandfoundation/algokit-utils-py/issues/205)) ([`4db24ba`](https://github.com/algorandfoundation/algokit-utils-py/commit/4db24ba4e3193ea442a4b3492cf041c030551b1d))
+
 ## v4.2.2 (2025-10-15)
 
 ### Fix

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "algokit-utils"
-version = "4.2.2"
+version = "4.2.3"
 description = "Utilities for Algorand development for use by AlgoKit"
 authors = [
   { name = "Algorand Foundation", email = "contact@algorand.foundation" },

src/algokit_utils/accounts/kmd_account_manager.py

@@ -69,7 +69,39 @@ def get_wallet_account(
 
         :raises Exception: If error received while exporting the private key from KMD
         """
+        return self._find_wallet_account(
+            wallet_name,
+            predicate,
+            sender,
+        )
+
+    def _find_matching_address(
+        self,
+        addresses: list[str],
+        predicate_or_address: Callable[[dict[str, Any]], bool] | str | None,
+    ) -> str | None:
+        """Find a matching address from a list based on a predicate, specific address, or return the first one."""
+        if not addresses:
+            return None
+
+        if callable(predicate_or_address):
+            for address in addresses:
+                account_info = self._client_manager.algod.account_information(address)
+                if predicate_or_address(to_wire(account_info)):
+                    return address
+            return None
+
+        if isinstance(predicate_or_address, str):
+            return predicate_or_address if predicate_or_address in addresses else None
+
+        return addresses[0]
 
+    def _find_wallet_account(
+        self,
+        wallet_name: str,
+        predicate_or_address: Callable[[dict[str, Any]], bool] | str | None = None,
+        sender: str | None = None,
+    ) -> AddressWithSigners | None:
         kmd_client = self.kmd()
         wallets = kmd_client.list_wallets().wallets or []
         wallet = next((w for w in wallets if w.name == wallet_name), None)
@@ -80,16 +112,7 @@ def get_wallet_account(
         wallet_handle = kmd_client.init_wallet_handle(InitWalletHandleTokenRequest(wallet_id, "")).wallet_handle_token
         addresses = kmd_client.list_keys_in_wallet(ListKeysRequest(wallet_handle)).addresses or []
 
-        matched_address = None
-        if predicate:
-            for address in addresses:
-                account_info = self._client_manager.algod.account_information(address)
-                if predicate(to_wire(account_info)):
-                    matched_address = address
-                    break
-        else:
-            matched_address = next(iter(addresses), None)
-
+        matched_address = self._find_matching_address(addresses, predicate_or_address)
         if not matched_address:
             return None
 
@@ -171,11 +194,15 @@ def get_localnet_dispenser_account(self) -> AddressWithSigners:
         if not self._client_manager.is_localnet():
             raise Exception("Can't get LocalNet dispenser account from non LocalNet network")
 
-        dispenser = self.get_wallet_account(
-            "unencrypted-default-wallet",
-            lambda a: a["status"] != "Offline" and a["amount"] > 1_000_000_000,  # noqa: PLR2004
-        )
-        if not dispenser:
-            raise Exception("Error retrieving LocalNet dispenser account; couldn't find the default account in KMD")
+        genesis_response = self._client_manager.algod.get_genesis()
+        dispenser_addresses = [a.addr for a in genesis_response.alloc if a.comment == "Wallet1"]
+
+        if dispenser_addresses:
+            dispenser = self._find_wallet_account(
+                "unencrypted-default-wallet",
+                dispenser_addresses[0],
+            )
+            if dispenser:
+                return dispenser
 
-        return dispenser
+        raise Exception("Error retrieving LocalNet dispenser account; couldn't find the default account in KMD")

src/algokit_utils/applications/app_deployer.py

@@ -317,9 +317,9 @@ def deploy(self, deployment: AppDeployParams) -> AppDeployResult:
 
         existing_approval = base64.b64encode(existing_app_record.approval_program).decode()
         existing_clear = base64.b64encode(existing_app_record.clear_state_program).decode()
-        existing_extra_pages = calculate_extra_program_pages(
-            existing_app_record.approval_program, existing_app_record.clear_state_program
-        )
+        extra_pages = existing_app_record.extra_program_pages or 0
+
+        calculate_extra_program_pages(existing_app_record.approval_program, existing_app_record.clear_state_program)
 
         new_approval = base64.b64encode(approval_program).decode()
         new_clear = base64.b64encode(clear_program).decode()
@@ -335,7 +335,7 @@ def deploy(self, deployment: AppDeployParams) -> AppDeployResult:
             < (deployment.create_params.schema.get("local_byte_slices", 0) if deployment.create_params.schema else 0)
             or existing_app_record.global_byte_slices
             < (deployment.create_params.schema.get("global_byte_slices", 0) if deployment.create_params.schema else 0)
-            or existing_extra_pages < new_extra_pages
+            or extra_pages < new_extra_pages
         )
 
         if is_schema_break:

tests/applications/test_app_factory.py

@@ -271,6 +271,36 @@ def test_deploy_app_update_detects_extra_pages_as_breaking_change(
     assert small_client.app_id != large_client.app_id
 
 
+def test_deploy_app_update_detects_extra_page_surplus_as_non_breaking_change(
+    algorand: AlgorandClient, funded_account: AddressWithSigners
+) -> None:
+    small_app_spec = (Path(__file__).parent.parent / "artifacts" / "extra_pages_test" / "small.arc56.json").read_text()
+    large_app_spec = (Path(__file__).parent.parent / "artifacts" / "extra_pages_test" / "large.arc56.json").read_text()
+    factory = algorand.client.get_app_factory(
+        app_spec=small_app_spec,
+        default_sender=funded_account.addr,
+    )
+    small_client, create_deploy_result = factory.deploy(
+        compilation_params={
+            "updatable": True,
+        },
+        create_params=AppClientBareCallCreateParams(extra_program_pages=1),
+    )
+    assert create_deploy_result.operation_performed == OperationPerformed.Create
+    assert create_deploy_result.create_result
+
+    factory._app_spec = arc56.Arc56Contract.from_json(large_app_spec)  # noqa: SLF001
+    large_client, update_deploy_result = factory.deploy(
+        compilation_params={
+            "updatable": True,
+        },
+        on_schema_break=OnSchemaBreak.AppendApp,
+        on_update=OnUpdate.UpdateApp,
+    )
+    assert update_deploy_result.operation_performed == OperationPerformed.Update
+    assert small_client.app_id == large_client.app_id
+
+
 def test_deploy_app_update_abi(factory: AppFactory) -> None:
     _, create_deploy_result = factory.deploy(
         compilation_params={