Prep/beta release

examples/generators/production_python_smart_contract_python/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/deploy_config.py.j2

@@ -16,7 +16,7 @@ def deploy() -> None:
     deployer_ = algorand.account.from_environment("DEPLOYER")
 
     factory = algorand.client.get_typed_app_factory(
-        {{ contract_name.split('_')|map('capitalize')|join }}Factory, default_sender=deployer_.address
+        {{ contract_name.split('_')|map('capitalize')|join }}Factory, default_sender=deployer_.addr
     )
 
     app_client, result = factory.deploy(
@@ -31,7 +31,7 @@ def deploy() -> None:
         algorand.send.payment(
             algokit_utils.PaymentParams(
                 amount=algokit_utils.AlgoAmount(algo=1),
-                sender=deployer_.address,
+                sender=deployer_.addr,
                 receiver=app_client.app_address,
             )
         )

examples/generators/production_python_smart_contract_python/pyproject.toml

@@ -8,13 +8,13 @@ package-mode = false
 
 [tool.poetry.dependencies]
 python = "^3.12"
-algokit-utils = "^4.0.0"
+algokit-utils = "^5.0.0a13"
 python-dotenv = "^1.0.0"
 algorand-python = "^3"
-algorand-python-testing = "^1"
+algorand-python-testing = {git = "https://github.com/algorandfoundation/algorand-python-testing.git", branch = "refactor/util-v5"}
 
 [tool.poetry.group.dev.dependencies]
-algokit-client-generator = "^2.1.0"
+algokit-client-generator = "^3.0.0a3"
 black = {extras = ["d"], version = "*"}
 ruff = "^0.9.4"
 mypy = "^1"
@@ -59,9 +59,8 @@ disallow_any_unimported = true
 disallow_any_expr = true
 disallow_any_decorated = true
 disallow_any_explicit = true
-untyped_calls_exclude = ["algosdk"]
 # Remove if you prefer to use mypy's default behavior against 
-# untyped algosdk types
+# untyped types
 [[tool.mypy.overrides]]
 module = "tests.*"
 disallow_any_expr = false

examples/generators/production_python_smart_contract_python/smart_contracts/cool_contract/deploy_config.py

@@ -16,7 +16,7 @@ def deploy() -> None:
     deployer_ = algorand.account.from_environment("DEPLOYER")
 
     factory = algorand.client.get_typed_app_factory(
-        CoolContractFactory, default_sender=deployer_.address
+        CoolContractFactory, default_sender=deployer_.addr
     )
 
     app_client, result = factory.deploy(
@@ -31,7 +31,7 @@ def deploy() -> None:
         algorand.send.payment(
             algokit_utils.PaymentParams(
                 amount=algokit_utils.AlgoAmount(algo=1),
-                sender=deployer_.address,
+                sender=deployer_.addr,
                 receiver=app_client.app_address,
             )
         )

examples/generators/production_python_smart_contract_python/smart_contracts/hello_world/deploy_config.py

@@ -16,7 +16,7 @@ def deploy() -> None:
     deployer_ = algorand.account.from_environment("DEPLOYER")
 
     factory = algorand.client.get_typed_app_factory(
-        HelloWorldFactory, default_sender=deployer_.address
+        HelloWorldFactory, default_sender=deployer_.addr
     )
 
     app_client, result = factory.deploy(
@@ -31,7 +31,7 @@ def deploy() -> None:
         algorand.send.payment(
             algokit_utils.PaymentParams(
                 amount=algokit_utils.AlgoAmount(algo=1),
-                sender=deployer_.address,
+                sender=deployer_.addr,
                 receiver=app_client.app_address,
             )
         )

examples/generators/production_python_smart_contract_python/tests/hello_world_client_test.py

@@ -1,9 +1,9 @@
 import algokit_utils
 import pytest
 from algokit_utils import (
+    AddressWithSigners,
     AlgoAmount,
     AlgorandClient,
-    SigningAccount,
 )
 
 from smart_contracts.artifacts.hello_world.hello_world_client import (
@@ -13,20 +13,20 @@
 
 
 @pytest.fixture()
-def deployer(algorand_client: AlgorandClient) -> SigningAccount:
+def deployer(algorand_client: AlgorandClient) -> AddressWithSigners:
     account = algorand_client.account.from_environment("DEPLOYER")
     algorand_client.account.ensure_funded_from_environment(
-        account_to_fund=account.address, min_spending_balance=AlgoAmount.from_algo(10)
+        account_to_fund=account.addr, min_spending_balance=AlgoAmount.from_algo(10)
     )
     return account
 
 
 @pytest.fixture()
 def hello_world_client(
-    algorand_client: AlgorandClient, deployer: SigningAccount
+    algorand_client: AlgorandClient, deployer: AddressWithSigners
 ) -> HelloWorldClient:
     factory = algorand_client.client.get_typed_app_factory(
-        HelloWorldFactory, default_sender=deployer.address
+        HelloWorldFactory, default_sender=deployer.addr
     )
 
     client, _ = factory.deploy(
@@ -52,4 +52,4 @@ def test_simulate_says_hello_with_correct_budget_consumed(
     )
     assert result.returns[0].value == "Hello, World"
     assert result.returns[1].value == "Hello, Jane"
-    assert result.simulate_response["txn-groups"][0]["app-budget-consumed"] < 100
+    assert result.simulate_response.txn_groups[0].app_budget_consumed < 100

examples/generators/production_python_smart_contract_typescript/jest.config.ts

@@ -5,10 +5,14 @@
 import type { Config } from 'jest'
 
 const config: Config = {
-  preset: 'ts-jest',
+  preset: 'ts-jest/presets/default-esm',
   verbose: true,
   transform: {
-    '^.+\\.tsx?$': 'ts-jest',
+    '^.+\\.tsx?$': ['ts-jest', { useESM: true }],
+  },
+  extensionsToTreatAsEsm: ['.ts'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
   },
   testPathIgnorePatterns: ['node_modules', '.venv', 'coverage'],
   testTimeout: 10000,

examples/generators/production_python_smart_contract_typescript/package.json

@@ -3,28 +3,29 @@
   "version": "1.0.0",
   "description": "Smart contract deployer",
   "main": "index.ts",
+  "type": "module",
   "scripts": {
-    "deploy": "ts-node-dev --transpile-only --watch .env -r dotenv/config smart_contracts/index.ts",
-    "deploy:ci": "ts-node --transpile-only -r dotenv/config smart_contracts/index.ts",
-    "test": "jest --coverage",
+    "deploy": "tsx watch -r dotenv/config smart_contracts/index.ts",
+    "deploy:ci": "tsx -r dotenv/config smart_contracts/index.ts",
+    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage",
     "format": "prettier --write ."
   },
   "engines": {
     "node": ">=20.0",
     "npm": ">=9.0"
   },
   "dependencies": {
-    "@algorandfoundation/algokit-utils": "^9.0.0",
-    "@algorandfoundation/algokit-utils-debug": "^1.0.2",
-    "algosdk": "^3.0.0"
+    "@algorandfoundation/algokit-utils": "^10.0.0-alpha.27",
+    "@algorandfoundation/algokit-utils-debug": "^2.0.0-alpha.2"
   },
   "devDependencies": {
-    "@algorandfoundation/algokit-client-generator": "^6.0.0",
+    "@algorandfoundation/algokit-client-generator": "^7.0.0-alpha.5",
     "@types/jest": "^29.5.11",
     "dotenv": "^16.0.3",
     "prettier": "^2.8.4",
     "ts-jest": "^29.1.1",
-    "ts-node-dev": "^2.0.0",
-    "typescript": "^4.9.5"
+    "ts-node": "^10.9.2",
+    "tsx": "^4.19.3",
+    "typescript": "^5.7.3"
   }
 }

examples/generators/production_python_smart_contract_typescript/pyproject.toml

@@ -8,10 +8,10 @@ package-mode = false
 
 [tool.poetry.dependencies]
 python = "^3.12"
-algokit-utils = "^4.0.0"
+algokit-utils = "^5.0.0a13"
 python-dotenv = "^1.0.0"
 algorand-python = "^3"
-algorand-python-testing = "^1"
+algorand-python-testing = {git = "https://github.com/algorandfoundation/algorand-python-testing.git", branch = "refactor/util-v5"}
 
 [tool.poetry.group.dev.dependencies]
 black = {extras = ["d"], version = "*"}
@@ -53,9 +53,8 @@ disallow_any_unimported = true
 disallow_any_expr = true
 disallow_any_decorated = true
 disallow_any_explicit = true
-untyped_calls_exclude = ["algosdk"]
 # Remove if you prefer to use mypy's default behavior against 
-# untyped algosdk types
+# untyped types
 [[tool.mypy.overrides]]
 module = "tests.*"
 disallow_any_expr = false

examples/generators/production_python_smart_contract_typescript/smart_contracts/index.ts

@@ -1,5 +1,6 @@
 import * as fs from 'fs'
 import * as path from 'path'
+import { fileURLToPath, pathToFileURL } from 'url'
 import { consoleLogger } from '@algorandfoundation/algokit-utils/types/logging'
 import { Config } from '@algorandfoundation/algokit-utils'
 // import { registerDebugEventHandlers } from '@algorandfoundation/algokit-utils-debug' // Uncomment to enable persisting artifacts required by AlgoKit AVM Debugger
@@ -15,13 +16,16 @@ Config.configure({
 // registerDebugEventHandlers() // Uncomment to enable persisting artifacts required by AlgoKit AVM Debugger
 
 // base directory
-const baseDir = path.resolve(__dirname)
+const baseDir = path.dirname(fileURLToPath(import.meta.url))
 
 // function to validate and dynamically import a module
 async function importDeployerIfExists(dir: string) {
-  const deployerPath = path.resolve(dir, 'deploy-config')
-  if (fs.existsSync(deployerPath + '.ts') || fs.existsSync(deployerPath + '.js')) {
-    const deployer = await import(deployerPath)
+  const tsPath = path.resolve(dir, 'deploy-config.ts')
+  const jsPath = path.resolve(dir, 'deploy-config.js')
+  const deployerPath = fs.existsSync(tsPath) ? tsPath : fs.existsSync(jsPath) ? jsPath : undefined
+
+  if (deployerPath) {
+    const deployer = await import(pathToFileURL(deployerPath).href)
     return { ...deployer, name: path.basename(dir) }
   }
   return null

examples/generators/production_python_smart_contract_typescript/tests/hello-world.spec.ts

@@ -1,8 +1,7 @@
 import { algorandFixture } from '@algorandfoundation/algokit-utils/testing'
 import { HelloWorldFactory } from '../smart_contracts/artifacts/hello_world/HelloWorldClient'
-import { Account, Algodv2, Indexer } from 'algosdk'
 import { Config } from '@algorandfoundation/algokit-utils'
-import { TransactionSignerAccount } from '@algorandfoundation/algokit-utils/types/account'
+import { AddressWithSigners } from '@algorandfoundation/algokit-utils/transact'
 
 describe('hello world contract', () => {
   const localnet = algorandFixture()
@@ -14,7 +13,7 @@ describe('hello world contract', () => {
   })
   beforeEach(localnet.newScope)
 
-  const deploy = async (account: Account & TransactionSignerAccount) => {
+  const deploy = async (account: AddressWithSigners) => {
     const factory = localnet.algorand.client.getTypedAppFactory(HelloWorldFactory, {
       defaultSender: account.addr,
       defaultSigner: account.signer,

examples/generators/production_python_smart_contract_typescript/tsconfig.json

@@ -14,8 +14,8 @@
     "forceConsistentCasingInFileNames": true,
     "allowJs": false,
     "allowSyntheticDefaultImports": true,
-    "module": "CommonJS",
-    "moduleResolution": "Node",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true

examples/generators/starter_python_smart_contract_python/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/deploy_config.py.j2

@@ -16,7 +16,7 @@ def deploy() -> None:
     deployer_ = algorand.account.from_environment("DEPLOYER")
 
     factory = algorand.client.get_typed_app_factory(
-        {{ contract_name.split('_')|map('capitalize')|join }}Factory, default_sender=deployer_.address
+        {{ contract_name.split('_')|map('capitalize')|join }}Factory, default_sender=deployer_.addr
     )
 
     app_client, result = factory.deploy(
@@ -31,7 +31,7 @@ def deploy() -> None:
         algorand.send.payment(
             algokit_utils.PaymentParams(
                 amount=algokit_utils.AlgoAmount(algo=1),
-                sender=deployer_.address,
+                sender=deployer_.addr,
                 receiver=app_client.app_address,
             )
         )

examples/generators/starter_python_smart_contract_python/pyproject.toml

@@ -8,13 +8,13 @@ package-mode = false
 
 [tool.poetry.dependencies]
 python = "^3.12"
-algokit-utils = "^4.0.0"
+algokit-utils = "^5.0.0a13"
 python-dotenv = "^1.0.0"
 algorand-python = "^3"
-algorand-python-testing = "^1"
+algorand-python-testing = {git = "https://github.com/algorandfoundation/algorand-python-testing.git", branch = "refactor/util-v5"}
 
 [tool.poetry.group.dev.dependencies]
-algokit-client-generator = "^2.1.0"
+algokit-client-generator = "^3.0.0a3"
 puyapy = "*"
 
 [build-system]

examples/generators/starter_python_smart_contract_python/smart_contracts/cool_contract/deploy_config.py

@@ -16,7 +16,7 @@ def deploy() -> None:
     deployer_ = algorand.account.from_environment("DEPLOYER")
 
     factory = algorand.client.get_typed_app_factory(
-        CoolContractFactory, default_sender=deployer_.address
+        CoolContractFactory, default_sender=deployer_.addr
     )
 
     app_client, result = factory.deploy(
@@ -31,7 +31,7 @@ def deploy() -> None:
         algorand.send.payment(
             algokit_utils.PaymentParams(
                 amount=algokit_utils.AlgoAmount(algo=1),
-                sender=deployer_.address,
+                sender=deployer_.addr,
                 receiver=app_client.app_address,
             )
         )

examples/generators/starter_python_smart_contract_python/smart_contracts/hello_world/deploy_config.py

@@ -16,7 +16,7 @@ def deploy() -> None:
     deployer_ = algorand.account.from_environment("DEPLOYER")
 
     factory = algorand.client.get_typed_app_factory(
-        HelloWorldFactory, default_sender=deployer_.address
+        HelloWorldFactory, default_sender=deployer_.addr
     )
 
     app_client, result = factory.deploy(
@@ -31,7 +31,7 @@ def deploy() -> None:
         algorand.send.payment(
             algokit_utils.PaymentParams(
                 amount=algokit_utils.AlgoAmount(algo=1),
-                sender=deployer_.address,
+                sender=deployer_.addr,
                 receiver=app_client.app_address,
             )
         )

examples/generators/starter_python_smart_contract_typescript/package.json

@@ -3,25 +3,25 @@
   "version": "1.0.0",
   "description": "Smart contract deployer",
   "main": "index.ts",
+  "type": "module",
   "scripts": {
-    "deploy": "ts-node-dev --transpile-only --watch .env -r dotenv/config smart_contracts/index.ts",
-    "deploy:ci": "ts-node --transpile-only -r dotenv/config smart_contracts/index.ts",
+    "deploy": "tsx watch -r dotenv/config smart_contracts/index.ts",
+    "deploy:ci": "tsx -r dotenv/config smart_contracts/index.ts",
     "format": "prettier --write ."
   },
   "engines": {
     "node": ">=20.0",
     "npm": ">=9.0"
   },
   "dependencies": {
-    "@algorandfoundation/algokit-utils": "^9.0.0",
-    "@algorandfoundation/algokit-utils-debug": "^1.0.2",
-    "algosdk": "^3.0.0"
+    "@algorandfoundation/algokit-utils": "^10.0.0-alpha.27",
+    "@algorandfoundation/algokit-utils-debug": "^2.0.0-alpha.2"
   },
   "devDependencies": {
-    "@algorandfoundation/algokit-client-generator": "^6.0.0",
+    "@algorandfoundation/algokit-client-generator": "^7.0.0-alpha.5",
     "dotenv": "^16.0.3",
     "prettier": "^2.8.4",
-    "ts-node-dev": "^2.0.0",
-    "typescript": "^4.9.5"
+    "tsx": "^4.19.3",
+    "typescript": "^5.7.3"
   }
 }

examples/generators/starter_python_smart_contract_typescript/pyproject.toml

@@ -8,10 +8,10 @@ package-mode = false
 
 [tool.poetry.dependencies]
 python = "^3.12"
-algokit-utils = "^4.0.0"
+algokit-utils = "^5.0.0a13"
 python-dotenv = "^1.0.0"
 algorand-python = "^3"
-algorand-python-testing = "^1"
+algorand-python-testing = {git = "https://github.com/algorandfoundation/algorand-python-testing.git", branch = "refactor/util-v5"}
 
 [tool.poetry.group.dev.dependencies]
 puyapy = "*"