Skip to content

Commit 22bde9a

Browse files
authored
refactor!: rename SourceMap to ProgramSourceMap to align with ts and move to algokit common (#241)
* refactor!: rename SourceMap to ProgramSourceMap to align with ts and move to algokit common * refactor: unused ReadableAddress * chore: regen docs
1 parent 08a8459 commit 22bde9a

File tree

26 files changed

+253
-187
lines changed

26 files changed

+253
-187
lines changed

docs/markdown/autoapi/algokit_utils/accounts/kmd_account_manager/index.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ if no predicate is provided.
3333
* **sender** – Optional sender address to use this signer for (aka a rekeyed account)
3434
* **Returns:**
3535
The signing account or None if no matching wallet or account was found
36-
* **Raises:**
37-
**Exception** – If error received while exporting the private key from KMD
3836

3937
#### get_or_create_wallet_account(name: str, fund_with: [algokit_utils.models.amount.AlgoAmount](../../models/amount/index.md#algokit_utils.models.amount.AlgoAmount) | None = None) → algokit_transact.signer.AddressWithSigners
4038

docs/markdown/autoapi/algokit_utils/applications/app_client/index.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,11 @@ The default sender address
263263

264264
The default transaction signer
265265

266-
#### approval_source_map *: algokit_algosdk.source_map.SourceMap | None* *= None*
266+
#### approval_source_map *: algokit_common.ProgramSourceMap | None* *= None*
267267

268268
The approval source map
269269

270-
#### clear_source_map *: algokit_algosdk.source_map.SourceMap | None* *= None*
270+
#### clear_source_map *: algokit_common.ProgramSourceMap | None* *= None*
271271

272272
The clear source map
273273

@@ -292,10 +292,10 @@ methods for calling application methods, managing state, and handling transactio
292292
account="SIGNERACCOUNT",
293293
private_key="SIGNERPRIVATEKEY",
294294
),
295-
approval_source_map=SourceMap(
295+
approval_source_map=ProgramSourceMap(
296296
source="APPROVALSOURCE",
297297
),
298-
clear_source_map=SourceMap(
298+
clear_source_map=ProgramSourceMap(
299299
source="CLEARSOURCE",
300300
),
301301
)
@@ -395,7 +395,7 @@ Normalize an application specification to ARC-56 format.
395395
spec = AppClient.normalise_app_spec(app_spec_json)
396396
```
397397

398-
#### *static* from_network(app_spec: algokit_abi.arc56.Arc56Contract | algokit_abi.arc32.Arc32Contract | str, algorand: [algokit_utils.algorand.AlgorandClient](../../algorand/index.md#algokit_utils.algorand.AlgorandClient), app_name: str | None = None, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, approval_source_map: algokit_algosdk.source_map.SourceMap | None = None, clear_source_map: algokit_algosdk.source_map.SourceMap | None = None) → [AppClient](#algokit_utils.applications.app_client.AppClient)
398+
#### *static* from_network(app_spec: algokit_abi.arc56.Arc56Contract | algokit_abi.arc32.Arc32Contract | str, algorand: [algokit_utils.algorand.AlgorandClient](../../algorand/index.md#algokit_utils.algorand.AlgorandClient), app_name: str | None = None, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, approval_source_map: algokit_common.ProgramSourceMap | None = None, clear_source_map: algokit_common.ProgramSourceMap | None = None) → [AppClient](#algokit_utils.applications.app_client.AppClient)
399399

400400
Create an AppClient instance from network information.
401401

@@ -422,16 +422,16 @@ Create an AppClient instance from network information.
422422
account="SIGNERACCOUNT",
423423
private_key="SIGNERPRIVATEKEY",
424424
),
425-
approval_source_map=SourceMap(
425+
approval_source_map=ProgramSourceMap(
426426
source="APPROVALSOURCE",
427427
),
428-
clear_source_map=SourceMap(
428+
clear_source_map=ProgramSourceMap(
429429
source="CLEARSOURCE",
430430
),
431431
)
432432
```
433433

434-
#### *static* from_creator_and_name(creator_address: str, app_name: str, app_spec: algokit_abi.arc56.Arc56Contract | algokit_abi.arc32.Arc32Contract | str, algorand: [algokit_utils.algorand.AlgorandClient](../../algorand/index.md#algokit_utils.algorand.AlgorandClient), default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, approval_source_map: algokit_algosdk.source_map.SourceMap | None = None, clear_source_map: algokit_algosdk.source_map.SourceMap | None = None, ignore_cache: bool | None = None, app_lookup_cache: [algokit_utils.applications.app_deployer.ApplicationLookup](../app_deployer/index.md#algokit_utils.applications.app_deployer.ApplicationLookup) | None = None) → [AppClient](#algokit_utils.applications.app_client.AppClient)
434+
#### *static* from_creator_and_name(creator_address: str, app_name: str, app_spec: algokit_abi.arc56.Arc56Contract | algokit_abi.arc32.Arc32Contract | str, algorand: [algokit_utils.algorand.AlgorandClient](../../algorand/index.md#algokit_utils.algorand.AlgorandClient), default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, approval_source_map: algokit_common.ProgramSourceMap | None = None, clear_source_map: algokit_common.ProgramSourceMap | None = None, ignore_cache: bool | None = None, app_lookup_cache: [algokit_utils.applications.app_deployer.ApplicationLookup](../app_deployer/index.md#algokit_utils.applications.app_deployer.ApplicationLookup) | None = None) → [AppClient](#algokit_utils.applications.app_client.AppClient)
435435

436436
Create an AppClient instance from creator address and application name.
437437

@@ -482,7 +482,7 @@ Compile the application’s TEAL code.
482482
* **Returns:**
483483
The compilation result
484484

485-
#### clone(app_name: str | None = \_MISSING, default_sender: str | None = \_MISSING, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = \_MISSING, approval_source_map: algokit_algosdk.source_map.SourceMap | None = \_MISSING, clear_source_map: algokit_algosdk.source_map.SourceMap | None = \_MISSING) → [AppClient](#algokit_utils.applications.app_client.AppClient)
485+
#### clone(app_name: str | None = \_MISSING, default_sender: str | None = \_MISSING, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = \_MISSING, approval_source_map: algokit_common.ProgramSourceMap | None = \_MISSING, clear_source_map: algokit_common.ProgramSourceMap | None = \_MISSING) → [AppClient](#algokit_utils.applications.app_client.AppClient)
486486

487487
Create a cloned AppClient instance with optionally overridden parameters.
488488

docs/markdown/autoapi/algokit_utils/applications/app_factory/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ various return properties like transaction, confirmation and deleteResult.
260260
})
261261
```
262262

263-
#### get_app_client_by_id(app_id: int, app_name: str | None = None, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, approval_source_map: algokit_algosdk.source_map.SourceMap | None = None, clear_source_map: algokit_algosdk.source_map.SourceMap | None = None) → [algokit_utils.applications.app_client.AppClient](../app_client/index.md#algokit_utils.applications.app_client.AppClient)
263+
#### get_app_client_by_id(app_id: int, app_name: str | None = None, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, approval_source_map: algokit_common.ProgramSourceMap | None = None, clear_source_map: algokit_common.ProgramSourceMap | None = None) → [algokit_utils.applications.app_client.AppClient](../app_client/index.md#algokit_utils.applications.app_client.AppClient)
264264

265265
Returns a new AppClient client for an app instance of the given ID.
266266

@@ -278,7 +278,7 @@ Returns a new AppClient client for an app instance of the given ID.
278278
app_client = factory.get_app_client_by_id(app_id=123)
279279
```
280280

281-
#### get_app_client_by_creator_and_name(creator_address: str, app_name: str, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, ignore_cache: bool | None = None, app_lookup_cache: [algokit_utils.applications.app_deployer.ApplicationLookup](../app_deployer/index.md#algokit_utils.applications.app_deployer.ApplicationLookup) | None = None, approval_source_map: algokit_algosdk.source_map.SourceMap | None = None, clear_source_map: algokit_algosdk.source_map.SourceMap | None = None) → [algokit_utils.applications.app_client.AppClient](../app_client/index.md#algokit_utils.applications.app_client.AppClient)
281+
#### get_app_client_by_creator_and_name(creator_address: str, app_name: str, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, ignore_cache: bool | None = None, app_lookup_cache: [algokit_utils.applications.app_deployer.ApplicationLookup](../app_deployer/index.md#algokit_utils.applications.app_deployer.ApplicationLookup) | None = None, approval_source_map: algokit_common.ProgramSourceMap | None = None, clear_source_map: algokit_common.ProgramSourceMap | None = None) → [algokit_utils.applications.app_client.AppClient](../app_client/index.md#algokit_utils.applications.app_client.AppClient)
282282

283283
Returns a new AppClient client, resolving the app by creator address and name
284284
using AlgoKit app deployment semantics (i.e. looking for the app creation transaction note).

docs/markdown/autoapi/algokit_utils/clients/client_manager/index.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ Get an application factory for deploying smart contracts.
179179
* **Returns:**
180180
Application factory instance
181181

182-
#### get_app_client_by_id(app_spec: algokit_abi.arc56.Arc56Contract | str, app_id: int, app_name: str | None = None, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, approval_source_map: algokit_algosdk.source_map.SourceMap | None = None, clear_source_map: algokit_algosdk.source_map.SourceMap | None = None) → [algokit_utils.applications.app_client.AppClient](../../applications/app_client/index.md#algokit_utils.applications.app_client.AppClient)
182+
#### get_app_client_by_id(app_spec: algokit_abi.arc56.Arc56Contract | str, app_id: int, app_name: str | None = None, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, approval_source_map: algokit_common.ProgramSourceMap | None = None, clear_source_map: algokit_common.ProgramSourceMap | None = None) → [algokit_utils.applications.app_client.AppClient](../../applications/app_client/index.md#algokit_utils.applications.app_client.AppClient)
183183

184184
Get an application client for an existing application by ID.
185185

@@ -196,7 +196,7 @@ Get an application client for an existing application by ID.
196196
* **Returns:**
197197
Application client instance
198198

199-
#### get_app_client_by_network(app_spec: algokit_abi.arc56.Arc56Contract | str, app_name: str | None = None, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, approval_source_map: algokit_algosdk.source_map.SourceMap | None = None, clear_source_map: algokit_algosdk.source_map.SourceMap | None = None) → [algokit_utils.applications.app_client.AppClient](../../applications/app_client/index.md#algokit_utils.applications.app_client.AppClient)
199+
#### get_app_client_by_network(app_spec: algokit_abi.arc56.Arc56Contract | str, app_name: str | None = None, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, approval_source_map: algokit_common.ProgramSourceMap | None = None, clear_source_map: algokit_common.ProgramSourceMap | None = None) → [algokit_utils.applications.app_client.AppClient](../../applications/app_client/index.md#algokit_utils.applications.app_client.AppClient)
200200

201201
Get an application client for an existing application by network.
202202

@@ -212,7 +212,7 @@ Get an application client for an existing application by network.
212212
* **Returns:**
213213
Application client instance
214214

215-
#### get_app_client_by_creator_and_name(creator_address: str, app_name: str, app_spec: algokit_abi.arc56.Arc56Contract | str, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, ignore_cache: bool | None = None, app_lookup_cache: [algokit_utils.applications.app_deployer.ApplicationLookup](../../applications/app_deployer/index.md#algokit_utils.applications.app_deployer.ApplicationLookup) | None = None, approval_source_map: algokit_algosdk.source_map.SourceMap | None = None, clear_source_map: algokit_algosdk.source_map.SourceMap | None = None) → [algokit_utils.applications.app_client.AppClient](../../applications/app_client/index.md#algokit_utils.applications.app_client.AppClient)
215+
#### get_app_client_by_creator_and_name(creator_address: str, app_name: str, app_spec: algokit_abi.arc56.Arc56Contract | str, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, ignore_cache: bool | None = None, app_lookup_cache: [algokit_utils.applications.app_deployer.ApplicationLookup](../../applications/app_deployer/index.md#algokit_utils.applications.app_deployer.ApplicationLookup) | None = None, approval_source_map: algokit_common.ProgramSourceMap | None = None, clear_source_map: algokit_common.ProgramSourceMap | None = None) → [algokit_utils.applications.app_client.AppClient](../../applications/app_client/index.md#algokit_utils.applications.app_client.AppClient)
216216

217217
Get an application client by creator address and name.
218218

@@ -316,7 +316,7 @@ Get a typed application client by creator address and name.
316316
)
317317
```
318318

319-
#### get_typed_app_client_by_id(typed_client: type[TypedAppClientT], \*, app_id: int, app_name: str | None = None, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, approval_source_map: algokit_algosdk.source_map.SourceMap | None = None, clear_source_map: algokit_algosdk.source_map.SourceMap | None = None) → TypedAppClientT
319+
#### get_typed_app_client_by_id(typed_client: type[TypedAppClientT], \*, app_id: int, app_name: str | None = None, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, approval_source_map: algokit_common.ProgramSourceMap | None = None, clear_source_map: algokit_common.ProgramSourceMap | None = None) → TypedAppClientT
320320

321321
Get a typed application client by ID.
322322

@@ -341,7 +341,7 @@ Get a typed application client by ID.
341341
)
342342
```
343343

344-
#### get_typed_app_client_by_network(typed_client: type[TypedAppClientT], \*, app_name: str | None = None, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, approval_source_map: algokit_algosdk.source_map.SourceMap | None = None, clear_source_map: algokit_algosdk.source_map.SourceMap | None = None) → TypedAppClientT
344+
#### get_typed_app_client_by_network(typed_client: type[TypedAppClientT], \*, app_name: str | None = None, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, approval_source_map: algokit_common.ProgramSourceMap | None = None, clear_source_map: algokit_common.ProgramSourceMap | None = None) → TypedAppClientT
345345

346346
Returns a new typed client, resolves the app ID for the current network.
347347

docs/markdown/autoapi/algokit_utils/errors/logic_error/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ kwargs) -> new dictionary initialized with the name=value pairs
5050

5151
### algokit_utils.errors.logic_error.parse_logic_error(error_str: str) → [LogicErrorData](#algokit_utils.errors.logic_error.LogicErrorData) | None
5252

53-
### *exception* algokit_utils.errors.logic_error.LogicError(\*, logic_error_str: str, program: str, source_map: AlgoSourceMap | None, transaction_id: str, message: str, pc: int, logic_error: Exception | None = None, traces: list[algokit_algod_client.models.SimulateTransactionResult] | None = None, get_line_for_pc: collections.abc.Callable[[int], int | None] | None = None)
53+
### *exception* algokit_utils.errors.logic_error.LogicError(\*, logic_error_str: str, program: str, source_map: ProgramSourceMap | None, transaction_id: str, message: str, pc: int, logic_error: Exception | None = None, traces: list[algokit_algod_client.models.SimulateTransactionResult] | None = None, get_line_for_pc: collections.abc.Callable[[int], int | None] | None = None)
5454

5555
Bases: `Exception`
5656

docs/markdown/autoapi/algokit_utils/models/application/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ The compiled hash
9999

100100
The compiled base64 to bytes
101101

102-
#### source_map *: algokit_algosdk.source_map.SourceMap | None*
102+
#### source_map *: algokit_common.ProgramSourceMap | None*
103103

104104
### *class* algokit_utils.models.application.AppCompilationResult
105105

@@ -117,10 +117,10 @@ The compiled clear state program
117117

118118
The source maps for the application
119119

120-
#### approval_source_map *: algokit_algosdk.source_map.SourceMap | None* *= None*
120+
#### approval_source_map *: algokit_common.ProgramSourceMap | None* *= None*
121121

122122
The source map for the approval program
123123

124-
#### clear_source_map *: algokit_algosdk.source_map.SourceMap | None* *= None*
124+
#### clear_source_map *: algokit_common.ProgramSourceMap | None* *= None*
125125

126126
The source map for the clear state program

docs/markdown/autoapi/algokit_utils/protocols/typed_clients/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
## Module Contents
1010

11-
### *class* algokit_utils.protocols.typed_clients.TypedAppClientProtocol(\*, app_id: int, app_name: str | None = None, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, algorand: [algokit_utils.algorand.AlgorandClient](../../algorand/index.md#algokit_utils.algorand.AlgorandClient), approval_source_map: algokit_algosdk.source_map.SourceMap | None = None, clear_source_map: algokit_algosdk.source_map.SourceMap | None = None)
11+
### *class* algokit_utils.protocols.typed_clients.TypedAppClientProtocol(\*, app_id: int, app_name: str | None = None, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, algorand: [algokit_utils.algorand.AlgorandClient](../../algorand/index.md#algokit_utils.algorand.AlgorandClient), approval_source_map: algokit_common.ProgramSourceMap | None = None, clear_source_map: algokit_common.ProgramSourceMap | None = None)
1212

1313
Bases: `Protocol`
1414

1515
App Client protocol
1616

1717
#### *classmethod* from_creator_and_name(\*, creator_address: str, app_name: str, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, ignore_cache: bool | None = None, app_lookup_cache: [ApplicationLookup](../../applications/app_deployer/index.md#algokit_utils.applications.app_deployer.ApplicationLookup) | None = None, algorand: [algokit_utils.algorand.AlgorandClient](../../algorand/index.md#algokit_utils.algorand.AlgorandClient)) → typing_extensions.Self
1818

19-
#### *classmethod* from_network(\*, app_name: str | None = None, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, approval_source_map: algokit_algosdk.source_map.SourceMap | None = None, clear_source_map: algokit_algosdk.source_map.SourceMap | None = None, algorand: [algokit_utils.algorand.AlgorandClient](../../algorand/index.md#algokit_utils.algorand.AlgorandClient)) → typing_extensions.Self
19+
#### *classmethod* from_network(\*, app_name: str | None = None, default_sender: str | None = None, default_signer: algokit_utils.protocols.signer.TransactionSigner | None = None, approval_source_map: algokit_common.ProgramSourceMap | None = None, clear_source_map: algokit_common.ProgramSourceMap | None = None, algorand: [algokit_utils.algorand.AlgorandClient](../../algorand/index.md#algokit_utils.algorand.AlgorandClient)) → typing_extensions.Self
2020

2121
### *class* algokit_utils.protocols.typed_clients.TypedAppFactoryProtocol(algorand: [algokit_utils.algorand.AlgorandClient](../../algorand/index.md#algokit_utils.algorand.AlgorandClient), \*\*kwargs: Any)
2222

src/algokit_algosdk/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
logicsig,
2323
mnemonic,
2424
multisig,
25-
source_map,
2625
transaction,
2726
)
2827

@@ -35,6 +34,5 @@
3534
"logicsig",
3635
"mnemonic",
3736
"multisig",
38-
"source_map",
3937
"transaction",
4038
]

src/algokit_algosdk/error.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,6 @@ def __init__(self) -> None:
118118
super().__init__("decimals must be between 0 and 19, inclusive")
119119

120120

121-
class SourceMapVersionError(Exception):
122-
def __init__(self, version: int) -> None:
123-
super().__init__(f"unsupported source map version: {version}")
124-
125-
126121
class EmptyAddressError(Exception):
127122
def __init__(self) -> None:
128123
super().__init__(
@@ -142,7 +137,9 @@ def __init__(self) -> None:
142137

143138
class ZeroAddressError(Exception):
144139
def __init__(self) -> None:
145-
super().__init__("For the zero address, please specify AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY5HFKQ")
140+
super().__init__(
141+
"For the zero address, please specify AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY5HFKQ"
142+
)
146143

147144

148145
class KeyregOnlineTxnInitError(Exception):

0 commit comments

Comments
 (0)