@algorandfoundation/algokit-utils 6.3.0-beta.1 → 7.0.0-alpha.2

package/types/client-manager.d.ts

@@ -1,12 +1,13 @@
 import algosdk from 'algosdk';
-import { AppLookup } from './app';
-import { AppDetails, AppDetailsBase, AppSpecAppDetailsBase, ApplicationClient, ResolveAppByCreatorAndNameBase, ResolveAppByIdBase } from './app-client';
+import { AlgorandClientInterface } from './algorand-client-interface';
+import { AppClient, AppClientParams, ResolveAppClientByCreatorAndName } from './app-client';
+import { AppFactory, AppFactoryParams } from './app-factory';
 import { TestNetDispenserApiClient, TestNetDispenserApiClientParams } from './dispenser-client';
-import { AlgoClientConfig, AlgoConfig } from './network-client';
+import { Expand } from './expand';
+import { AlgoClientConfig, AlgoConfig, NetworkDetails } from './network-client';
 import Kmd = algosdk.Kmd;
 import Indexer = algosdk.Indexer;
 import Algodv2 = algosdk.Algodv2;
-import IntDecoding = algosdk.IntDecoding;
 /** Clients from algosdk that interact with the official Algorand APIs */
 export interface AlgoSdkClients {
     /** Algod client, see https://developer.algorand.org/docs/rest-apis/algod/ */
@@ -16,24 +17,28 @@ export interface AlgoSdkClients {
     /** Optional KMD client, see https://developer.algorand.org/docs/rest-apis/kmd/ */
     kmd?: algosdk.Kmd;
 }
-/** Details of the current network. */
-export interface NetworkDetails {
-    /** Whether or not the network is TestNet. */
-    isTestNet: boolean;
-    /** Whether or not the network is MainNet. */
-    isMainNet: boolean;
-    /** Whether or not the network is LocalNet. */
-    isLocalNet: boolean;
-    /** The genesis ID of the current network. */
-    genesisId: string;
-    /** The base64 genesis hash of the current network. */
-    genesisHash: string;
-}
+/** Params to get an app factory from `ClientManager`. */
+export type ClientAppFactoryParams = Expand<Omit<AppFactoryParams, 'algorand'>>;
+/** Params to get an app client by creator address and name from `ClientManager`. */
+export type ClientResolveAppClientByCreatorAndNameParams = Expand<Omit<ResolveAppClientByCreatorAndName, 'algorand'>>;
+/** Params to get an app client by ID from `ClientManager`. */
+export type ClientAppClientParams = Expand<Omit<AppClientParams, 'algorand'>>;
+/** Params to get an app client by network from `ClientManager`. */
+export type ClientAppClientByNetworkParams = Expand<Omit<AppClientParams, 'algorand' | 'appId'>>;
+/** Params to get a typed app client by creator address and name from `ClientManager`. */
+export type ClientTypedAppClientByCreatorAndNameParams = Expand<Omit<ResolveAppClientByCreatorAndName, 'algorand' | 'appSpec'>>;
+/** Params to get a typed app client by ID from `ClientManager`. */
+export type ClientTypedAppClientParams = Expand<Omit<AppClientParams, 'algorand' | 'appSpec'>>;
+/** Params to get a typed app client by network from `ClientManager`. */
+export type ClientTypedAppClientByNetworkParams = Expand<Omit<AppClientParams, 'algorand' | 'appSpec' | 'appId'>>;
+/** Params to get a typed app factory from `ClientManager`. */
+export type ClientTypedAppFactoryParams = Expand<Omit<AppFactoryParams, 'algorand' | 'appSpec'>>;
 /** Exposes access to various API clients. */
 export declare class ClientManager {
     private _algod;
     private _indexer?;
     private _kmd?;
+    private _algorand?;
     /**
      * algosdk clients or config for interacting with the official Algorand APIs.
      * @param clientsOrConfig The clients or config to use
@@ -54,11 +59,13 @@ export declare class ClientManager {
      * const clientManager = new ClientManager({ algodConfig, indexerConfig, kmdConfig })
      * ```
      */
-    constructor(clientsOrConfig: AlgoConfig | AlgoSdkClients);
+    constructor(clientsOrConfig: AlgoConfig | AlgoSdkClients, algorandClient?: AlgorandClientInterface);
     /** Returns an algosdk Algod API client. */
     get algod(): algosdk.Algodv2;
     /** Returns an algosdk Indexer API client or throws an error if it's not been provided. */
     get indexer(): algosdk.Indexer;
+    /** Returns an algosdk Indexer API client or `undefined` if it's not been provided. */
+    get indexerIfPresent(): algosdk.Indexer | undefined;
     /** Returns an algosdk KMD API client or throws an error if it's not been provided. */
     get kmd(): algosdk.Kmd;
     private _getNetworkPromise;
@@ -127,28 +134,82 @@ export declare class ClientManager {
      */
     getTestNetDispenserFromEnvironment(params?: Omit<TestNetDispenserApiClientParams, 'authToken'>): TestNetDispenserApiClient;
     /**
-     * Returns a new `ApplicationClient` client, resolving the app by creator address and name.
-     * @param details The details to resolve the app by creator address and name
-     * @param cachedAppLookup A cached app lookup that matches a name to on-chain details; either this is needed or indexer is required to be passed in to this manager on construction.
-     * @returns The `ApplicationClient`
+     * Returns a new `AppFactory` client
+     * @example Basic example
+     * ```typescript
+     * const factory = algorand.client.getAppFactory({
+     *   appSpec: '{/* ARC-56 or ARC-32 compatible JSON *\/}',
+     * })
+     * ```
+     * @example Advanced example
+     * ```typescript
+     * const factory = algorand.client.getAppFactory({
+     *   appSpec: parsedAppSpec_AppSpec_or_Arc56Contract,
+     *   defaultSender: "SENDERADDRESS",
+     *   appName: "OverriddenAppName",
+     *   version: "2.0.0",
+     *   updatable: true,
+     *   deletable: false,
+     *   deployTimeParams: { ONE: 1, TWO: 'value' }
+     * })
+     * ```
+     */
+    getAppFactory(params: ClientAppFactoryParams): AppFactory;
+    /**
+     * Returns a new `AppClient` client for managing calls and state for an ARC-32/ARC-56 app.
+     * This method resolves the app ID by looking up the creator address and name
+     * using AlgoKit app deployment semantics (i.e. looking for the app creation transaction note).
+     * @param params The parameters to create the app client
+     * @example Basic
+     * ```typescript
+     * const appClient = algorand.client.getAppClientByCreatorAndName({
+     *   appSpec: '{/* ARC-56 or ARC-32 compatible JSON *\}',
+     *   // appId resolved by looking for app ID of named app by this creator
+     *   creatorAddress: 'CREATORADDRESS',
+     * })
+     * ```
+     * @returns The `AppClient`
+     */
+    getAppClientByCreatorAndName(params: ClientResolveAppClientByCreatorAndNameParams): Promise<AppClient>;
+    /**
+     * Returns a new `AppClient` client for managing calls and state for an ARC-32/ARC-56 app.
+     * @param params The parameters to create the app client
+     * @example Basic
+     * ```typescript
+     * const appClient = algorand.client.getAppClientById({
+     *   appSpec: '{/* ARC-56 or ARC-32 compatible JSON *\}',
+     *   appId: 12345n,
+     * })
+     * ```
+     * @returns The `AppClient`
      */
-    getAppClientByCreatorAndName(details: AppClientByCreatorAndNameDetails, cachedAppLookup?: AppLookup): ApplicationClient;
+    getAppClientById(params: ClientAppClientParams): AppClient;
     /**
-     * Returns a new `ApplicationClient` client, resolving the app by app ID.
-     * @param details The details to resolve the app by ID
-     * @returns The `ApplicationClient`
+     * Returns a new `AppClient` client for managing calls and state for an ARC-56 app.
+     * This method resolves the app ID for the current network based on
+     * pre-determined network-specific app IDs specified in the ARC-56 app spec.
+     *
+     * If no IDs are in the app spec or the network isn't recognised, an error is thrown.
+     * @param params The parameters to create the app client
+     * @example Basic
+     * ```typescript
+     * const appClient = algorand.client.getAppClientByNetwork({
+     *   appSpec: '{/* ARC-56 or ARC-32 compatible JSON *\}',
+     *   // appId resolved by using ARC-56 spec to find app ID for current network
+     * })
+     * ```
+     * @returns The `AppClient`
      */
-    getAppClientById(details: AppClientByIdDetails): ApplicationClient;
+    getAppClientByNetwork(params: ClientAppClientByNetworkParams): Promise<AppClient>;
     /**
      * Returns a new typed client, resolving the app by creator address and name.
      * @param typedClient The typed client type to use
-     * @param details The details to resolve the app by creator address and name
-     * @param cachedAppLookup A cached app lookup that matches a name to on-chain details; either this is needed or indexer is required to be passed in to this manager on construction.
-     * @example Use name in ARC-32 app spec
+     * @param params The params to resolve the app by creator address and name
+     * @example Use name in ARC-32 / ARC-56 app spec
      * ```typescript
      * const appClient = algorand.client.getTypedAppClientByCreatorAndName(MyContractClient, {
      *   creatorAddress: "CREATORADDRESS",
-     *   sender: alice,
+     *   defaultSender: alice,
      * })
      * ```
      * @example Specify name
@@ -156,26 +217,55 @@ export declare class ClientManager {
      * const appClient = algorand.client.getTypedAppClientByCreatorAndName(MyContractClient, {
      *   creatorAddress: "CREATORADDRESS",
      *   name: "contract-name",
-     *   sender: alice,
+     *   defaultSender: alice,
      * })
      * ```
      * @returns The typed client instance
      */
-    getTypedAppClientByCreatorAndName<TClient>(typedClient: TypedAppClient<TClient>, details: TypedAppClientByCreatorAndNameDetails, cachedAppLookup?: AppLookup): TClient;
+    getTypedAppClientByCreatorAndName<TClient extends TypedAppClient<InstanceType<TClient>>>(typedClient: TClient, params: ClientTypedAppClientByCreatorAndNameParams): Promise<InstanceType<TClient>>;
     /**
      * Returns a new typed client, resolving the app by app ID.
      * @param typedClient The typed client type to use
-     * @param details The details to resolve the app by ID
+     * @param params The params to resolve the app by ID
      * @example
      * ```typescript
      * const appClient = algorand.client.getTypedAppClientById(MyContractClient, {
-     *   id: 12345,
+     *   appId: 12345n,
+     *   defaultSender: alice,
+     * })
+     * ```
+     * @returns The typed client instance
+     */
+    getTypedAppClientById<TClient extends TypedAppClient<InstanceType<TClient>>>(typedClient: TClient, params: ClientTypedAppClientParams): InstanceType<TClient>;
+    /**
+     * Returns a new typed client, resolves the app ID for the current network based on
+     * pre-determined network-specific app IDs specified in the ARC-56 app spec.
+     *
+     * If no IDs are in the app spec or the network isn't recognised, an error is thrown.
+     * @param typedClient The typed client type to use
+     * @param params The params to resolve the app by network
+     * @example
+     * ```typescript
+     * const appClient = algorand.client.getTypedAppClientByNetwork(MyContractClient, {
+     *   defaultSender: alice,
+     * })
+     * ```
+     * @returns The typed client instance
+     */
+    getTypedAppClientByNetwork<TClient extends TypedAppClient<InstanceType<TClient>>>(typedClient: TClient, params?: ClientTypedAppClientByNetworkParams): Promise<InstanceType<TClient>>;
+    /**
+     * Returns a new typed app factory.
+     * @param typedFactory The typed factory type to use
+     * @param params The params to resolve the factory by
+     * @example
+     * ```typescript
+     * const appFactory = algorand.client.getTypedAppFactory(MyContractClient, {
      *   sender: alice,
      * })
      * ```
      * @returns The typed client instance
      */
-    getTypedAppClientById<TClient>(typedClient: TypedAppClient<TClient>, details: TypedAppClientByIdDetails): TClient;
+    getTypedAppFactory<TClient>(typedFactory: TypedAppFactory<TClient>, params?: ClientTypedAppFactoryParams): TClient;
     /**
      * Retrieve client configurations from environment variables when defined or get defaults (expects to be called from a Node.js environment)
      *
@@ -252,7 +342,6 @@ export declare class ClientManager {
      * Returns an indexer SDK client that automatically retries on idempotent calls
      *
      * @param config The config of the client
-     * @param overrideIntDecoding Override the default int decoding for responses, uses MIXED by default to avoid lost precision for big integers
      * @example AlgoNode (testnet)
      * ```typescript
      *  const indexer = ClientManager.getIndexerClient(ClientManager.getAlgoNodeConfig('testnet', 'indexer'))
@@ -268,16 +357,11 @@ export declare class ClientManager {
      *  const indexer = ClientManager.getIndexerClient({server: 'http://localhost', port: '8980', token: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'})
      *  await indexer.makeHealthCheck().do()
      * ```
-     * @example Override int decoding for responses
-     * ```typescript
-     *  const indexer = ClientManager.getIndexerClient(config, IntDecoding.BIGINT)
-     * ```
      */
-    static getIndexerClient(config: AlgoClientConfig, overrideIntDecoding?: IntDecoding): Indexer;
+    static getIndexerClient(config: AlgoClientConfig): Indexer;
     /**
      * Returns an indexer SDK client that automatically retries on idempotent calls loaded from environment variables (expects to be called from a Node.js environment).
      *
-     * @param overrideIntDecoding Override the default int decoding for responses, uses MIXED by default to avoid lost precision for big integers
      * @example
      *
      *  ```typescript
@@ -286,7 +370,7 @@ export declare class ClientManager {
      *  await indexer.makeHealthCheck().do()
      *  ```
      */
-    static getIndexerClientFromEnvironment(overrideIntDecoding?: IntDecoding): Indexer;
+    static getIndexerClientFromEnvironment(): Indexer;
     /**
      * Returns a KMD SDK client.
      *
@@ -314,22 +398,13 @@ export declare class ClientManager {
  * Interface to identify a typed client that can be used to interact with an application.
  */
 export interface TypedAppClient<TClient> {
-    new (details: AppDetails, algod: algosdk.Algodv2): TClient;
+    new (params: Omit<AppClientParams, 'appSpec'>): TClient;
+    fromNetwork(params: Omit<AppClientParams, 'appId' | 'appSpec'>): Promise<TClient>;
+    fromCreatorAndName(params: Omit<ResolveAppClientByCreatorAndName, 'appSpec'>): Promise<TClient>;
 }
 /**
- * Details to resolve an app client by creator address and name.
- */
-export type AppClientByCreatorAndNameDetails = AppSpecAppDetailsBase & AppDetailsBase & Omit<ResolveAppByCreatorAndNameBase, 'findExistingUsing'>;
-/**
- * Details to resolve a typed app creator address and name.
- */
-export type TypedAppClientByCreatorAndNameDetails = AppDetailsBase & Omit<ResolveAppByCreatorAndNameBase, 'findExistingUsing'>;
-/**
- * Details to resolve an app client by app ID.
+ * Interface to identify a typed factory that can be used to create and deploy an application.
  */
-export type AppClientByIdDetails = AppSpecAppDetailsBase & AppDetailsBase & ResolveAppByIdBase;
-/**
- * Details to resolve a typed app by app ID.
- */
-export type TypedAppClientByIdDetails = AppDetailsBase & ResolveAppByIdBase;
-//# sourceMappingURL=client-manager.d.ts.map
+export interface TypedAppFactory<TClient> {
+    new (params: Omit<AppFactoryParams, 'appSpec'>): TClient;
+}

package/types/client-manager.js

@@ -3,12 +3,12 @@
 var algosdk = require('algosdk');
 var types_algoHttpClientWithRetry = require('./algo-http-client-with-retry.js');
 var types_appClient = require('./app-client.js');
+var types_appFactory = require('./app-factory.js');
 var types_dispenserClient = require('./dispenser-client.js');
 var types_networkClient = require('./network-client.js');
 
 var Kmd = algosdk.Kmd;
 var Indexer = algosdk.Indexer;
-var IntDecoding = algosdk.IntDecoding;
 /** Exposes access to various API clients. */
 class ClientManager {
     /**
@@ -31,7 +31,7 @@ class ClientManager {
      * const clientManager = new ClientManager({ algodConfig, indexerConfig, kmdConfig })
      * ```
      */
-    constructor(clientsOrConfig) {
+    constructor(clientsOrConfig, algorandClient) {
         const _clients = 'algod' in clientsOrConfig
             ? clientsOrConfig
             : {
@@ -42,6 +42,7 @@ class ClientManager {
         this._algod = _clients.algod;
         this._indexer = _clients.indexer;
         this._kmd = _clients.kmd;
+        this._algorand = algorandClient;
     }
     /** Returns an algosdk Algod API client. */
     get algod() {
@@ -53,6 +54,10 @@ class ClientManager {
             throw new Error('Attempt to use Indexer client in AlgoKit instance with no Indexer configured');
         return this._indexer;
     }
+    /** Returns an algosdk Indexer API client or `undefined` if it's not been provided. */
+    get indexerIfPresent() {
+        return this._indexer;
+    }
     /** Returns an algosdk KMD API client or throws an error if it's not been provided. */
     get kmd() {
         if (!this._kmd)
@@ -74,11 +79,11 @@ class ClientManager {
         }
         const params = await this._getNetworkPromise;
         return {
-            isTestNet: ['testnet-v1.0', 'testnet-v1', 'testnet'].includes(params.genesisID),
-            isMainNet: ['mainnet-v1.0', 'mainnet-v1', 'mainnet'].includes(params.genesisID),
-            isLocalNet: ClientManager.genesisIdIsLocalNet(params.genesisID),
-            genesisId: params.genesisID,
-            genesisHash: params.genesisHash,
+            isTestNet: ['testnet-v1.0', 'testnet-v1', 'testnet'].includes(params.genesisID ?? 'unknown'),
+            isMainNet: ['mainnet-v1.0', 'mainnet-v1', 'mainnet'].includes(params.genesisID ?? 'unknown'),
+            isLocalNet: ClientManager.genesisIdIsLocalNet(params.genesisID ?? 'unknown'),
+            genesisId: params.genesisID ?? 'unknown',
+            genesisHash: params.genesisHash ? Buffer.from(params.genesisHash).toString('base64') : 'unknown',
         };
     }
     /**
@@ -148,32 +153,105 @@ class ClientManager {
         return new types_dispenserClient.TestNetDispenserApiClient(params ? { ...params, authToken: '' } : undefined);
     }
     /**
-     * Returns a new `ApplicationClient` client, resolving the app by creator address and name.
-     * @param details The details to resolve the app by creator address and name
-     * @param cachedAppLookup A cached app lookup that matches a name to on-chain details; either this is needed or indexer is required to be passed in to this manager on construction.
-     * @returns The `ApplicationClient`
+     * Returns a new `AppFactory` client
+     * @example Basic example
+     * ```typescript
+     * const factory = algorand.client.getAppFactory({
+     *   appSpec: '{/* ARC-56 or ARC-32 compatible JSON *\/}',
+     * })
+     * ```
+     * @example Advanced example
+     * ```typescript
+     * const factory = algorand.client.getAppFactory({
+     *   appSpec: parsedAppSpec_AppSpec_or_Arc56Contract,
+     *   defaultSender: "SENDERADDRESS",
+     *   appName: "OverriddenAppName",
+     *   version: "2.0.0",
+     *   updatable: true,
+     *   deletable: false,
+     *   deployTimeParams: { ONE: 1, TWO: 'value' }
+     * })
+     * ```
      */
-    getAppClientByCreatorAndName(details, cachedAppLookup) {
-        return new types_appClient.ApplicationClient({ ...details, resolveBy: 'creatorAndName', findExistingUsing: cachedAppLookup ?? this.indexer }, this._algod);
+    getAppFactory(params) {
+        if (!this._algorand) {
+            throw new Error('Attempt to get app factory from a ClientManager without an Algorand client');
+        }
+        return new types_appFactory.AppFactory({ ...params, algorand: this._algorand });
     }
     /**
-     * Returns a new `ApplicationClient` client, resolving the app by app ID.
-     * @param details The details to resolve the app by ID
-     * @returns The `ApplicationClient`
+     * Returns a new `AppClient` client for managing calls and state for an ARC-32/ARC-56 app.
+     * This method resolves the app ID by looking up the creator address and name
+     * using AlgoKit app deployment semantics (i.e. looking for the app creation transaction note).
+     * @param params The parameters to create the app client
+     * @example Basic
+     * ```typescript
+     * const appClient = algorand.client.getAppClientByCreatorAndName({
+     *   appSpec: '{/* ARC-56 or ARC-32 compatible JSON *\}',
+     *   // appId resolved by looking for app ID of named app by this creator
+     *   creatorAddress: 'CREATORADDRESS',
+     * })
+     * ```
+     * @returns The `AppClient`
+     */
+    getAppClientByCreatorAndName(params) {
+        if (!this._algorand) {
+            throw new Error('Attempt to get app client from a ClientManager without an Algorand client');
+        }
+        return types_appClient.AppClient.fromCreatorAndName({
+            ...params,
+            algorand: this._algorand,
+        });
+    }
+    /**
+     * Returns a new `AppClient` client for managing calls and state for an ARC-32/ARC-56 app.
+     * @param params The parameters to create the app client
+     * @example Basic
+     * ```typescript
+     * const appClient = algorand.client.getAppClientById({
+     *   appSpec: '{/* ARC-56 or ARC-32 compatible JSON *\}',
+     *   appId: 12345n,
+     * })
+     * ```
+     * @returns The `AppClient`
+     */
+    getAppClientById(params) {
+        if (!this._algorand) {
+            throw new Error('Attempt to get app client from a ClientManager without an Algorand client');
+        }
+        return new types_appClient.AppClient({ ...params, algorand: this._algorand });
+    }
+    /**
+     * Returns a new `AppClient` client for managing calls and state for an ARC-56 app.
+     * This method resolves the app ID for the current network based on
+     * pre-determined network-specific app IDs specified in the ARC-56 app spec.
+     *
+     * If no IDs are in the app spec or the network isn't recognised, an error is thrown.
+     * @param params The parameters to create the app client
+     * @example Basic
+     * ```typescript
+     * const appClient = algorand.client.getAppClientByNetwork({
+     *   appSpec: '{/* ARC-56 or ARC-32 compatible JSON *\}',
+     *   // appId resolved by using ARC-56 spec to find app ID for current network
+     * })
+     * ```
+     * @returns The `AppClient`
      */
-    getAppClientById(details) {
-        return new types_appClient.ApplicationClient({ ...details, resolveBy: 'id' }, this._algod);
+    async getAppClientByNetwork(params) {
+        if (!this._algorand) {
+            throw new Error('Attempt to get app client from a ClientManager without an Algorand client');
+        }
+        return types_appClient.AppClient.fromNetwork({ ...params, algorand: this._algorand });
     }
     /**
      * Returns a new typed client, resolving the app by creator address and name.
      * @param typedClient The typed client type to use
-     * @param details The details to resolve the app by creator address and name
-     * @param cachedAppLookup A cached app lookup that matches a name to on-chain details; either this is needed or indexer is required to be passed in to this manager on construction.
-     * @example Use name in ARC-32 app spec
+     * @param params The params to resolve the app by creator address and name
+     * @example Use name in ARC-32 / ARC-56 app spec
      * ```typescript
      * const appClient = algorand.client.getTypedAppClientByCreatorAndName(MyContractClient, {
      *   creatorAddress: "CREATORADDRESS",
-     *   sender: alice,
+     *   defaultSender: alice,
      * })
      * ```
      * @example Specify name
@@ -181,29 +259,74 @@ class ClientManager {
      * const appClient = algorand.client.getTypedAppClientByCreatorAndName(MyContractClient, {
      *   creatorAddress: "CREATORADDRESS",
      *   name: "contract-name",
-     *   sender: alice,
+     *   defaultSender: alice,
      * })
      * ```
      * @returns The typed client instance
      */
-    getTypedAppClientByCreatorAndName(typedClient, details, cachedAppLookup) {
-        return new typedClient({ ...details, resolveBy: 'creatorAndName', findExistingUsing: cachedAppLookup ?? this.indexer }, this._algod);
+    async getTypedAppClientByCreatorAndName(typedClient, params) {
+        if (!this._algorand) {
+            throw new Error('Attempt to get app client from a ClientManager without an Algorand client');
+        }
+        return typedClient.fromCreatorAndName({ ...params, algorand: this._algorand });
     }
     /**
      * Returns a new typed client, resolving the app by app ID.
      * @param typedClient The typed client type to use
-     * @param details The details to resolve the app by ID
+     * @param params The params to resolve the app by ID
      * @example
      * ```typescript
      * const appClient = algorand.client.getTypedAppClientById(MyContractClient, {
-     *   id: 12345,
+     *   appId: 12345n,
+     *   defaultSender: alice,
+     * })
+     * ```
+     * @returns The typed client instance
+     */
+    getTypedAppClientById(typedClient, params) {
+        if (!this._algorand) {
+            throw new Error('Attempt to get app client from a ClientManager without an Algorand client');
+        }
+        return new typedClient({ ...params, algorand: this._algorand });
+    }
+    /**
+     * Returns a new typed client, resolves the app ID for the current network based on
+     * pre-determined network-specific app IDs specified in the ARC-56 app spec.
+     *
+     * If no IDs are in the app spec or the network isn't recognised, an error is thrown.
+     * @param typedClient The typed client type to use
+     * @param params The params to resolve the app by network
+     * @example
+     * ```typescript
+     * const appClient = algorand.client.getTypedAppClientByNetwork(MyContractClient, {
+     *   defaultSender: alice,
+     * })
+     * ```
+     * @returns The typed client instance
+     */
+    getTypedAppClientByNetwork(typedClient, params) {
+        if (!this._algorand) {
+            throw new Error('Attempt to get app client from a ClientManager without an Algorand client');
+        }
+        return typedClient.fromNetwork({ ...params, algorand: this._algorand });
+    }
+    /**
+     * Returns a new typed app factory.
+     * @param typedFactory The typed factory type to use
+     * @param params The params to resolve the factory by
+     * @example
+     * ```typescript
+     * const appFactory = algorand.client.getTypedAppFactory(MyContractClient, {
      *   sender: alice,
      * })
      * ```
      * @returns The typed client instance
      */
-    getTypedAppClientById(typedClient, details) {
-        return new typedClient({ ...details, resolveBy: 'id' }, this._algod);
+    getTypedAppFactory(typedFactory, params) {
+        if (!this._algorand) {
+            throw new Error('Attempt to get app factory from a ClientManager without an Algorand client');
+        }
+        return new typedFactory({ ...params, algorand: this._algorand });
     }
     /**
      * Retrieve client configurations from environment variables when defined or get defaults (expects to be called from a Node.js environment)
@@ -324,7 +447,7 @@ class ClientManager {
      */
     static getAlgodClient(config) {
         const { token, server, port } = config;
-        const tokenHeader = typeof token === 'string' ? { 'X-Algo-API-Token': token } : token ?? {};
+        const tokenHeader = typeof token === 'string' ? { 'X-Algo-API-Token': token } : (token ?? {});
         const httpClientWithRetry = new types_algoHttpClientWithRetry.AlgoHttpClientWithRetry(tokenHeader, server, port);
         return new algosdk.Algodv2(httpClientWithRetry, server);
     }
@@ -345,7 +468,6 @@ class ClientManager {
      * Returns an indexer SDK client that automatically retries on idempotent calls
      *
      * @param config The config of the client
-     * @param overrideIntDecoding Override the default int decoding for responses, uses MIXED by default to avoid lost precision for big integers
      * @example AlgoNode (testnet)
      * ```typescript
      *  const indexer = ClientManager.getIndexerClient(ClientManager.getAlgoNodeConfig('testnet', 'indexer'))
@@ -361,24 +483,16 @@ class ClientManager {
      *  const indexer = ClientManager.getIndexerClient({server: 'http://localhost', port: '8980', token: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'})
      *  await indexer.makeHealthCheck().do()
      * ```
-     * @example Override int decoding for responses
-     * ```typescript
-     *  const indexer = ClientManager.getIndexerClient(config, IntDecoding.BIGINT)
-     * ```
      */
-    static getIndexerClient(config, overrideIntDecoding) {
+    static getIndexerClient(config) {
         const { token, server, port } = config;
-        const tokenHeader = typeof token === 'string' ? { 'X-Indexer-API-Token': token } : token ?? {};
+        const tokenHeader = typeof token === 'string' ? { 'X-Indexer-API-Token': token } : (token ?? {});
         const httpClientWithRetry = new types_algoHttpClientWithRetry.AlgoHttpClientWithRetry(tokenHeader, server, port);
-        const indexer = new Indexer(httpClientWithRetry);
-        // Use mixed int decoding by default so bigints don't have lost precision
-        indexer.setIntEncoding(overrideIntDecoding ?? IntDecoding.MIXED);
-        return indexer;
+        return new Indexer(httpClientWithRetry);
     }
     /**
      * Returns an indexer SDK client that automatically retries on idempotent calls loaded from environment variables (expects to be called from a Node.js environment).
      *
-     * @param overrideIntDecoding Override the default int decoding for responses, uses MIXED by default to avoid lost precision for big integers
      * @example
      *
      *  ```typescript
@@ -387,8 +501,8 @@ class ClientManager {
      *  await indexer.makeHealthCheck().do()
      *  ```
      */
-    static getIndexerClientFromEnvironment(overrideIntDecoding) {
-        return ClientManager.getIndexerClient(ClientManager.getIndexerConfigFromEnvironment(), overrideIntDecoding);
+    static getIndexerClientFromEnvironment() {
+        return ClientManager.getIndexerClient(ClientManager.getIndexerConfigFromEnvironment());
     }
     /**
      * Returns a KMD SDK client.