@algorandfoundation/algokit-utils 6.1.0-beta.1 → 6.1.0-beta.3

package/network-client.mjs

@@ -1,90 +1,54 @@
-import algosdk from 'algosdk';
-import { AlgoHttpClientWithRetry } from './types/algo-http-client-with-retry.mjs';
+import { ClientManager } from './types/client-manager.mjs';
 
-var Indexer = algosdk.Indexer;
-var Kmd = algosdk.Kmd;
-var IntDecoding = algosdk.IntDecoding;
-/** Retrieve configurations from environment variables when defined or get defaults (expects to be called from a Node.js environment not algod-side) */
+/**
+ * @deprecated Use `ClientManager.getConfigFromEnvironmentOrLocalNet()` instead.
+ *
+ * Retrieve configurations from environment variables when defined or get defaults (expects to be called from a Node.js environment not algod-side)
+ */
 function getConfigFromEnvOrDefaults() {
-    if (!process || !process.env) {
-        throw new Error('Attempt to get default algod configuration from a non Node.js context; supply the config instead');
-    }
-    const algodConfig = !process.env.ALGOD_SERVER
-        ? getDefaultLocalNetConfig('algod')
-        : { server: process.env.ALGOD_SERVER, port: process.env.ALGOD_PORT, token: process.env.ALGOD_TOKEN };
-    const indexerConfig = !process.env.INDEXER_SERVER
-        ? getDefaultLocalNetConfig('indexer')
-        : {
-            server: process.env.INDEXER_SERVER,
-            port: process.env.INDEXER_PORT,
-            token: process.env.INDEXER_TOKEN,
-        };
-    return {
-        algodConfig,
-        indexerConfig,
-        kmdConfig: process && process.env && process.env.ALGOD_SERVER
-            ? { ...algodConfig, port: process?.env?.KMD_PORT ?? '4002' }
-            : getDefaultLocalNetConfig('kmd'),
-    };
+    return ClientManager.getConfigFromEnvironmentOrLocalNet();
 }
-/** Retrieve the algod configuration from environment variables (expects to be called from a Node.js environment not algod-side) */
+/**
+ * @deprecated Use `ClientManager.getAlgodConfigFromEnvironment()` instead.
+ *
+ * Retrieve the algod configuration from environment variables (expects to be called from a Node.js environment not algod-side)
+ */
 function getAlgodConfigFromEnvironment() {
-    if (!process || !process.env) {
-        throw new Error('Attempt to get default algod configuration from a non Node.js context; supply the config instead');
-    }
-    if (!process.env.ALGOD_SERVER) {
-        throw new Error('Attempt to get default algod configuration without specifying ALGOD_SERVER in the environment variables');
-    }
-    return {
-        server: process.env.ALGOD_SERVER,
-        port: process.env.ALGOD_PORT,
-        token: process.env.ALGOD_TOKEN,
-    };
+    return ClientManager.getAlgodConfigFromEnvironment();
 }
-/** Retrieve the indexer configuration from environment variables (expects to be called from a Node.js environment not algod-side) */
+/**
+ * @deprecated Use `ClientManager.getIndexerConfigFromEnvironment()` instead.
+ *
+ * Retrieve the indexer configuration from environment variables (expects to be called from a Node.js environment not algod-side)
+ */
 function getIndexerConfigFromEnvironment() {
-    if (!process || !process.env) {
-        throw new Error('Attempt to get default indexer configuration from a non Node.js context; supply the config instead');
-    }
-    if (!process.env.INDEXER_SERVER) {
-        throw new Error('Attempt to get default indexer configuration without specifying INDEXER_SERVER in the environment variables');
-    }
-    return {
-        server: process.env.INDEXER_SERVER,
-        port: process.env.INDEXER_PORT,
-        token: process.env.INDEXER_TOKEN,
-    };
+    return ClientManager.getIndexerConfigFromEnvironment();
 }
-/** Returns the Algorand configuration to point to the AlgoNode service
+/**
+ * @deprecated Use `ClientManager.getAlgoNodeConfig(network, config)` instead.
+ *
+ * Returns the Algorand configuration to point to the AlgoNode service
  *
  * @param network Which network to connect to - TestNet or MainNet
  * @param config Which algod config to return - Algod or Indexer
  */
 function getAlgoNodeConfig(network, config) {
-    return {
-        server: `https://${network}-${config === 'algod' ? 'api' : 'idx'}.algonode.cloud/`,
-        port: 443,
-    };
+    return ClientManager.getAlgoNodeConfig(network, config);
 }
-/** Returns the Algorand configuration to point to the default LocalNet
+/**
+ * @deprecated Use `ClientManager.getDefaultLocalNetConfig(configOrPort)` instead.
+ *
+ * Returns the Algorand configuration to point to the default LocalNet
  *
  * @param configOrPort Which algod config to return - algod, kmd, or indexer OR a port number
  */
 function getDefaultLocalNetConfig(configOrPort) {
-    return {
-        server: `http://localhost`,
-        port: configOrPort === 'algod' ? 4001 : configOrPort === 'indexer' ? 8980 : configOrPort === 'kmd' ? 4002 : configOrPort,
-        token: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
-    };
+    return ClientManager.getDefaultLocalNetConfig(configOrPort);
 }
-function getAlgoTokenHeader(server, token, defaultHeader) {
-    // Purestake uses a slightly different API key header than the default
-    if (server.includes('purestake.io') && typeof token === 'string')
-        return { 'X-API-Key': token };
-    // Because we override the default HTTP Client construction (to get retries) we need to put a string token into the standard header ourselves
-    return typeof token === 'string' ? { [defaultHeader ?? 'X-Algo-API-Token']: token } : token ?? {};
-}
-/** Returns an algod SDK client that automatically retries on idempotent calls
+/**
+ * @deprecated Use `ClientManager.getAlgodClient(config)` or `ClientManager.getAlgodClientFromEnvironment()` instead.
+ *
+ * Returns an algod SDK client that automatically retries transient failures on idempotent calls
  *
  * @param config The config if you want to override the default (getting config from process.env)
  * @example Default (load from environment variables)
@@ -112,11 +76,12 @@ function getAlgoTokenHeader(server, token, defaultHeader) {
  * ```
  */
 function getAlgoClient(config) {
-    const { token, server, port } = config ?? getAlgodConfigFromEnvironment();
-    const httpClientWithRetry = new AlgoHttpClientWithRetry(getAlgoTokenHeader(server, token), server, port);
-    return new algosdk.Algodv2(httpClientWithRetry, server);
+    return config ? ClientManager.getAlgodClient(config) : ClientManager.getAlgodClientFromEnvironment();
 }
-/** Returns an indexer SDK client that automatically retries on idempotent calls
+/**
+ * @deprecated Use `ClientManager.getIndexerClient(config, overrideIntDecoding)` or `ClientManager.getIndexerClientFromEnvironment(overrideIntDecoding)` instead.
+ *
+ * Returns an indexer SDK client that automatically retries transient failures on idempotent calls
  *
  * @param config The config if you want to override the default (getting config from process.env)
  * @param overrideIntDecoding Override the default int decoding for responses, uses MIXED by default to avoid lost precision for big integers
@@ -148,15 +113,14 @@ function getAlgoClient(config) {
  * ```
  */
 function getAlgoIndexerClient(config, overrideIntDecoding) {
-    const { token, server, port } = config ?? getIndexerConfigFromEnvironment();
-    const httpClientWithRetry = new AlgoHttpClientWithRetry(getAlgoTokenHeader(server, token, 'X-Indexer-API-Token'), 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 config
+        ? ClientManager.getIndexerClient(config, overrideIntDecoding)
+        : ClientManager.getIndexerClientFromEnvironment(overrideIntDecoding);
 }
 /**
- * Returns a KMD SDK client that automatically retries on idempotent calls
+ * @deprecated Use `ClientManager.getKmdClient(config)` or `ClientManager.getKmdClientFromEnvironment()` instead.
+ *
+ * Returns a KMD SDK client that automatically retries transient failures on idempotent calls.
  *
  * KMD client allows you to export private keys, which is useful to get the default account in a LocalNet network.
  *
@@ -173,18 +137,15 @@ function getAlgoIndexerClient(config, overrideIntDecoding) {
  * ```
  */
 function getAlgoKmdClient(config) {
-    const { token, server } = config ?? getAlgodConfigFromEnvironment();
-    // We can only use Kmd on the LocalNet otherwise it's not exposed so this makes some assumptions
-    // (e.g. same token and server as algod and port 4002 by default)
-    return new Kmd(token, server, process?.env?.KMD_PORT ?? '4002');
+    return config ? ClientManager.getKmdClient(config) : ClientManager.getKmdClientFromEnvironment();
 }
+/** @deprecated Use `await algorandClient.client.isTestNet()` or `await new ClientManager({ algod }).isTestNet()` instead. */
 async function isTestNet(algod) {
-    const params = await algod.getTransactionParams().do();
-    return ['testnet-v1.0', 'testnet-v1', 'testnet'].includes(params.genesisID);
+    return await new ClientManager({ algod }).isTestNet();
 }
+/** @deprecated Use `await algorandClient.client.isMainNet()` or `await new ClientManager({ algod }).isMainNet()` instead. */
 async function isMainNet(algod) {
-    const params = await algod.getTransactionParams().do();
-    return ['mainnet-v1.0', 'mainnet-v1', 'mainnet'].includes(params.genesisID);
+    return await new ClientManager({ algod }).isMainNet();
 }
 
 export { getAlgoClient, getAlgoIndexerClient, getAlgoKmdClient, getAlgoNodeConfig, getAlgodConfigFromEnvironment, getConfigFromEnvOrDefaults, getDefaultLocalNetConfig, getIndexerConfigFromEnvironment, isMainNet, isTestNet };

package/network-client.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"network-client.mjs","sources":["../src/network-client.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"network-client.mjs","sources":["../src/network-client.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAQA;;;;AAIG;SACa,0BAA0B,GAAA;AACxC,IAAA,OAAO,aAAa,CAAC,kCAAkC,EAAE,CAAA;AAC3D,CAAC;AAED;;;;AAIG;SACa,6BAA6B,GAAA;AAC3C,IAAA,OAAO,aAAa,CAAC,6BAA6B,EAAE,CAAA;AACtD,CAAC;AAED;;;;AAIG;SACa,+BAA+B,GAAA;AAC7C,IAAA,OAAO,aAAa,CAAC,+BAA+B,EAAE,CAAA;AACxD,CAAC;AAED;;;;;;;AAOG;AACa,SAAA,iBAAiB,CAAC,OAA8B,EAAE,MAA2B,EAAA;IAC3F,OAAO,aAAa,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;AACzD,CAAC;AAED;;;;;;AAMG;AACG,SAAU,wBAAwB,CAAC,YAAkD,EAAA;AACzF,IAAA,OAAO,aAAa,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAA;AAC7D,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6BG;AACG,SAAU,aAAa,CAAC,MAAyB,EAAA;AACrD,IAAA,OAAO,MAAM,GAAG,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC,6BAA6B,EAAE,CAAA;AACtG,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiCG;AACa,SAAA,oBAAoB,CAAC,MAAyB,EAAE,mBAAiC,EAAA;AAC/F,IAAA,OAAO,MAAM;UACT,aAAa,CAAC,gBAAgB,CAAC,MAAM,EAAE,mBAAmB,CAAC;AAC7D,UAAE,aAAa,CAAC,+BAA+B,CAAC,mBAAmB,CAAC,CAAA;AACxE,CAAC;AAED;;;;;;;;;;;;;;;;;;AAkBG;AACG,SAAU,gBAAgB,CAAC,MAAyB,EAAA;AACxD,IAAA,OAAO,MAAM,GAAG,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC,2BAA2B,EAAE,CAAA;AAClG,CAAC;AAED;AACO,eAAe,SAAS,CAAC,KAAc,EAAA;IAC5C,OAAO,MAAM,IAAI,aAAa,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,SAAS,EAAE,CAAA;AACvD,CAAC;AAED;AACO,eAAe,SAAS,CAAC,KAAc,EAAA;IAC5C,OAAO,MAAM,IAAI,aAAa,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,SAAS,EAAE,CAAA;AACvD;;;;"}

package/package.json

@@ -6,7 +6,7 @@
     "**"
   ],
   "name": "@algorandfoundation/algokit-utils",
-  "version": "6.1.0-beta.1",
+  "version": "6.1.0-beta.3",
   "private": false,
   "description": "A set of core Algorand utilities written in TypeScript and released via npm that make it easier to build solutions on Algorand.",
   "author": "Algorand Foundation",
@@ -37,7 +37,8 @@
   },
   "overrides": {
     "semver": "7.5.2",
-    "eslint-plugin-prettier": "5.0.0"
+    "eslint-plugin-prettier": "5.0.0",
+    "braces": "3.0.3"
   },
   "dependencies": {
     "buffer": "^6.0.3"

package/testing/account.d.ts

@@ -1,17 +1,15 @@
 import algosdk from 'algosdk';
+import { AlgorandClient } from '../';
 import { GetTestAccountParams } from '../types/testing';
 import Account = algosdk.Account;
-import Algodv2 = algosdk.Algodv2;
-import Kmd = algosdk.Kmd;
 /**
  * Creates an ephemeral Algorand account for the purposes of testing.
  * Returns a newly created random test account that is funded from the dispenser
  * DO NOT USE THIS TO CREATE A MAINNET ACCOUNT!
  * Note: By default this will log the mnemonic of the account.
  * @param param0 The config for the test account to generate
- * @param algod An algod client
- * @param kmd A KMD client, if not specified then a default KMD client will be loaded from environment variables
+ * @param algorand An AlgorandClient client
  * @returns The account, with private key loaded
  */
-export declare function getTestAccount({ suppressLog, initialFunds, accountGetter }: GetTestAccountParams, algod: Algodv2, kmd?: Kmd): Promise<Account>;
+export declare function getTestAccount({ suppressLog, initialFunds, accountGetter }: GetTestAccountParams, algorand: AlgorandClient): Promise<Account>;
 //# sourceMappingURL=account.d.ts.map

package/testing/account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../src/testing/account.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAA;AAG7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;AAChC,OAAO,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;AAChC,OAAO,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;AAExB;;;;;;;;;GASG;AACH,wBAAsB,cAAc,CAClC,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE,oBAAoB,EAClE,KAAK,EAAE,OAAO,EACd,GAAG,CAAC,EAAE,GAAG,GACR,OAAO,CAAC,OAAO,CAAC,CAgBlB"}
+{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../src/testing/account.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAE,cAAc,EAAU,MAAM,KAAK,CAAA;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;AAEhC;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE,oBAAoB,EAClE,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,OAAO,CAAC,CAmBlB"}

package/testing/account.js

@@ -1,9 +1,7 @@
 'use strict';
 
 var algosdk = require('algosdk');
-var transferAlgos = require('../transfer/transfer-algos.js');
 var config = require('../config.js');
-var getDispenserAccount = require('../account/get-dispenser-account.js');
 
 /**
  * Creates an ephemeral Algorand account for the purposes of testing.
@@ -11,16 +9,15 @@ var getDispenserAccount = require('../account/get-dispenser-account.js');
  * DO NOT USE THIS TO CREATE A MAINNET ACCOUNT!
  * Note: By default this will log the mnemonic of the account.
  * @param param0 The config for the test account to generate
- * @param algod An algod client
- * @param kmd A KMD client, if not specified then a default KMD client will be loaded from environment variables
+ * @param algorand An AlgorandClient client
  * @returns The account, with private key loaded
  */
-async function getTestAccount({ suppressLog, initialFunds, accountGetter }, algod, kmd) {
-    const account = accountGetter ? await accountGetter(algod, kmd) : algosdk.generateAccount();
+async function getTestAccount({ suppressLog, initialFunds, accountGetter }, algorand) {
+    const account = accountGetter ? await accountGetter(algorand) : algosdk.generateAccount();
     config.Config.getLogger(suppressLog).info(`New test account created with address '${account.addr}' and mnemonic '${algosdk.secretKeyToMnemonic(account.sk)}'.`);
-    const dispenser = await getDispenserAccount.getDispenserAccount(algod, kmd);
-    await transferAlgos.transferAlgos({ from: dispenser, to: account.addr, amount: initialFunds, note: 'Funding test account', suppressLog }, algod);
-    const accountInfo = await algod.accountInformation(account.addr).do();
+    const dispenser = await algorand.account.dispenserFromEnvironment();
+    await algorand.send.payment({ sender: dispenser.addr, receiver: account.addr, amount: initialFunds, note: 'Funding test account' }, { suppressLog });
+    const accountInfo = await algorand.account.getInformation(account.addr);
     config.Config.getLogger(suppressLog).info('Test account funded; account balance: %d µAlgos', accountInfo.amount);
     return account;
 }

package/testing/account.js.map

@@ -1 +1 @@
-{"version":3,"file":"account.js","sources":["../../src/testing/account.ts"],"sourcesContent":[null],"names":["Config","getDispenserAccount","transferAlgos"],"mappings":";;;;;;;AAQA;;;;;;;;;AASG;AACI,eAAe,cAAc,CAClC,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAwB,EAClE,KAAc,EACd,GAAS,EAAA;IAET,MAAM,OAAO,GAAG,aAAa,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,eAAe,EAAE,CAAA;IAE3FA,aAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAChC,CAAA,uCAAA,EAA0C,OAAO,CAAC,IAAI,CAAmB,gBAAA,EAAA,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAI,EAAA,CAAA,CACrH,CAAA;IAED,MAAM,SAAS,GAAG,MAAMC,uCAAmB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IAEvD,MAAMC,2BAAa,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,sBAAsB,EAAE,WAAW,EAAE,EAAE,KAAK,CAAC,CAAA;AAElI,IAAA,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,CAAA;AAErE,IAAAF,aAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,iDAAiD,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;AAEzG,IAAA,OAAO,OAAO,CAAA;AAChB;;;;"}
+{"version":3,"file":"account.js","sources":["../../src/testing/account.ts"],"sourcesContent":[null],"names":["Config"],"mappings":";;;;;AAKA;;;;;;;;AAQG;AACI,eAAe,cAAc,CAClC,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAwB,EAClE,QAAwB,EAAA;AAExB,IAAA,MAAM,OAAO,GAAG,aAAa,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,eAAe,EAAE,CAAA;IAEzFA,aAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAChC,CAAA,uCAAA,EAA0C,OAAO,CAAC,IAAI,CAAmB,gBAAA,EAAA,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAI,EAAA,CAAA,CACrH,CAAA;IAED,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,wBAAwB,EAAE,CAAA;AAEnE,IAAA,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CACzB,EAAE,MAAM,EAAE,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,sBAAsB,EAAE,EACtG,EAAE,WAAW,EAAE,CAChB,CAAA;AAED,IAAA,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAEvE,IAAAA,aAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,iDAAiD,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;AAEzG,IAAA,OAAO,OAAO,CAAA;AAChB;;;;"}

package/testing/account.mjs

@@ -1,7 +1,5 @@
 import algosdk from 'algosdk';
-import { transferAlgos } from '../transfer/transfer-algos.mjs';
 import { Config } from '../config.mjs';
-import { getDispenserAccount } from '../account/get-dispenser-account.mjs';
 
 /**
  * Creates an ephemeral Algorand account for the purposes of testing.
@@ -9,16 +7,15 @@ import { getDispenserAccount } from '../account/get-dispenser-account.mjs';
  * DO NOT USE THIS TO CREATE A MAINNET ACCOUNT!
  * Note: By default this will log the mnemonic of the account.
  * @param param0 The config for the test account to generate
- * @param algod An algod client
- * @param kmd A KMD client, if not specified then a default KMD client will be loaded from environment variables
+ * @param algorand An AlgorandClient client
  * @returns The account, with private key loaded
  */
-async function getTestAccount({ suppressLog, initialFunds, accountGetter }, algod, kmd) {
-    const account = accountGetter ? await accountGetter(algod, kmd) : algosdk.generateAccount();
+async function getTestAccount({ suppressLog, initialFunds, accountGetter }, algorand) {
+    const account = accountGetter ? await accountGetter(algorand) : algosdk.generateAccount();
     Config.getLogger(suppressLog).info(`New test account created with address '${account.addr}' and mnemonic '${algosdk.secretKeyToMnemonic(account.sk)}'.`);
-    const dispenser = await getDispenserAccount(algod, kmd);
-    await transferAlgos({ from: dispenser, to: account.addr, amount: initialFunds, note: 'Funding test account', suppressLog }, algod);
-    const accountInfo = await algod.accountInformation(account.addr).do();
+    const dispenser = await algorand.account.dispenserFromEnvironment();
+    await algorand.send.payment({ sender: dispenser.addr, receiver: account.addr, amount: initialFunds, note: 'Funding test account' }, { suppressLog });
+    const accountInfo = await algorand.account.getInformation(account.addr);
     Config.getLogger(suppressLog).info('Test account funded; account balance: %d µAlgos', accountInfo.amount);
     return account;
 }

package/testing/account.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"account.mjs","sources":["../../src/testing/account.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AAQA;;;;;;;;;AASG;AACI,eAAe,cAAc,CAClC,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAwB,EAClE,KAAc,EACd,GAAS,EAAA;IAET,MAAM,OAAO,GAAG,aAAa,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,eAAe,EAAE,CAAA;IAE3F,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAChC,CAAA,uCAAA,EAA0C,OAAO,CAAC,IAAI,CAAmB,gBAAA,EAAA,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAI,EAAA,CAAA,CACrH,CAAA;IAED,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IAEvD,MAAM,aAAa,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,sBAAsB,EAAE,WAAW,EAAE,EAAE,KAAK,CAAC,CAAA;AAElI,IAAA,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,CAAA;AAErE,IAAA,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,iDAAiD,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;AAEzG,IAAA,OAAO,OAAO,CAAA;AAChB;;;;"}
+{"version":3,"file":"account.mjs","sources":["../../src/testing/account.ts"],"sourcesContent":[null],"names":[],"mappings":";;;AAKA;;;;;;;;AAQG;AACI,eAAe,cAAc,CAClC,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAwB,EAClE,QAAwB,EAAA;AAExB,IAAA,MAAM,OAAO,GAAG,aAAa,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,eAAe,EAAE,CAAA;IAEzF,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAChC,CAAA,uCAAA,EAA0C,OAAO,CAAC,IAAI,CAAmB,gBAAA,EAAA,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAI,EAAA,CAAA,CACrH,CAAA;IAED,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,wBAAwB,EAAE,CAAA;AAEnE,IAAA,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CACzB,EAAE,MAAM,EAAE,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,sBAAsB,EAAE,EACtG,EAAE,WAAW,EAAE,CAChB,CAAA;AAED,IAAA,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAEvE,IAAA,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,iDAAiD,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;AAEzG,IAAA,OAAO,OAAO,CAAA;AAChB;;;;"}

package/testing/fixtures/algorand-fixture.d.ts

@@ -5,9 +5,10 @@ import { AlgorandFixture, AlgorandFixtureConfig } from '../../types/testing';
  * By default it tests against an environment variable specified client
  *  if the standard environment variables are specified, otherwise against
  *  a default LocalNet instance, but you can pass in an algod, indexer
- *  and/or kmd if you want to test against an explicitly defined network.
+ *  and/or kmd (or their respective config) if you want to test against
+ * an explicitly defined network.
  *
- * @example
+ * @example No config
  * ```typescript
  * const algorand = algorandFixture()
  *
@@ -19,11 +20,28 @@ import { AlgorandFixture, AlgorandFixtureConfig } from '../../types/testing';
  * })
  * ```
  *
+ * @example With config
+ * ```typescript
+ * const algorand = algorandFixture({
+ *  algod: new Algodv2('localhost', 12345, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
+ *  // ...
+ * })
+ *
+ * beforeEach(algorand.beforeEach, 10_000)
+ *
+ * test('My test', async () => {
+ *     const {algod, indexer, testAccount, ...} = algorand.context
+ *     // test things...
+ * })
+ * ```
+ *
  * @param fixtureConfig The fixture configuration
  * @returns The fixture
  */
 export declare function algorandFixture(fixtureConfig?: AlgorandFixtureConfig): AlgorandFixture;
 /**
+ * @deprecated Config can be passed in directly to fixture config now.
+ *
  * Creates a test fixture for automated testing against Algorand.
  * By default it tests against an environment variable specified client
  *  if the standard environment variables are specified, otherwise against

package/testing/fixtures/algorand-fixture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"algorand-fixture.d.ts","sourceRoot":"","sources":["../../../src/testing/fixtures/algorand-fixture.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAuD,MAAM,qBAAqB,CAAA;AAKjI;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,eAAe,CAAC,aAAa,CAAC,EAAE,qBAAqB,GAAG,eAAe,CAAA;AAEvF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,eAAe,CAAC,aAAa,EAAE,qBAAqB,GAAG,SAAS,EAAE,MAAM,EAAE,UAAU,GAAG,eAAe,CAAA"}
+{"version":3,"file":"algorand-fixture.d.ts","sourceRoot":"","sources":["../../../src/testing/fixtures/algorand-fixture.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAuD,MAAM,qBAAqB,CAAA;AAKjI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAgB,eAAe,CAAC,aAAa,CAAC,EAAE,qBAAqB,GAAG,eAAe,CAAA;AAEvF;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,eAAe,CAAC,aAAa,EAAE,qBAAqB,GAAG,SAAS,EAAE,MAAM,EAAE,UAAU,GAAG,eAAe,CAAA"}

package/testing/fixtures/algorand-fixture.js

@@ -1,59 +1,40 @@
 'use strict';
 
 var types_algorandClient = require('../../types/algorand-client.js');
+var types_clientManager = require('../../types/client-manager.js');
 var account = require('../account.js');
 var indexer = require('../indexer.js');
 var transactionLogger = require('../transaction-logger.js');
-var networkClient = require('../../network-client.js');
 var amount = require('../../amount.js');
 var indexerLookup = require('../../indexer-lookup.js');
 var config = require('../../config.js');
 
-/**
- * Creates a test fixture for automated testing against Algorand.
- * By default it tests against an environment variable specified client
- *  if the standard environment variables are specified, otherwise against
- *  a default LocalNet instance, but you can pass in an algod, indexer
- *  and/or kmd if you want to test against an explicitly defined network.
- *
- * @example
- * ```typescript
- * const algorand = algorandFixture(undefined, getConfigFromEnvOrDefaults())
- *
- * beforeEach(algorand.beforeEach, 10_000)
- *
- * test('My test', async () => {
- *     const {algod, indexer, testAccount, ...} = algorand.context
- *     // test things...
- * })
- * ```
- *
- * @param fixtureConfig The fixture configuration
- * @param config The algo configuration
- * @returns The fixture
- */
 function algorandFixture(fixtureConfig, config$1) {
-    config$1 = config$1 || networkClient.getConfigFromEnvOrDefaults();
-    const algod = fixtureConfig?.algod ?? networkClient.getAlgoClient(config$1.algodConfig);
-    const indexer$1 = fixtureConfig?.indexer ?? networkClient.getAlgoIndexerClient(config$1.indexerConfig);
-    const kmd = fixtureConfig?.kmd ?? networkClient.getAlgoKmdClient(config$1.kmdConfig);
+    fixtureConfig = { ...fixtureConfig, ...config$1 };
+    if (!fixtureConfig.algod || !fixtureConfig.indexer || !fixtureConfig.kmd) {
+        fixtureConfig = { ...types_clientManager.ClientManager.getConfigFromEnvironmentOrLocalNet(), ...fixtureConfig };
+    }
+    const algod = fixtureConfig.algod ?? types_clientManager.ClientManager.getAlgodClient(fixtureConfig.algodConfig);
+    const indexer$1 = fixtureConfig.indexer ?? types_clientManager.ClientManager.getIndexerClient(fixtureConfig.indexerConfig);
+    const kmd = fixtureConfig.kmd ?? types_clientManager.ClientManager.getKmdClient(fixtureConfig.kmdConfig);
     let context;
     let algorandClient;
     const beforeEach = async () => {
         config.Config.configure({ debug: true });
         const transactionLogger$1 = new transactionLogger.TransactionLogger();
         const transactionLoggerAlgod = transactionLogger$1.capture(algod);
-        const acc = await account.getTestAccount({ initialFunds: fixtureConfig?.testAccountFunding ?? amount.algos(10), suppressLog: true }, transactionLoggerAlgod, kmd);
         algorandClient = algorandClient ?? types_algorandClient.AlgorandClient.fromClients({ algod: transactionLoggerAlgod, indexer: indexer$1, kmd });
+        const acc = await account.getTestAccount({ initialFunds: fixtureConfig?.testAccountFunding ?? amount.algos(10), suppressLog: true }, algorandClient);
         algorandClient.setSignerFromAccount(acc).setDefaultValidityWindow(1000).setSuggestedParamsTimeout(0);
         const testAccount = { ...acc, signer: algorandClient.account.getSigner(acc.addr) };
         context = {
+            algorand: algorandClient,
             algod: transactionLoggerAlgod,
             indexer: indexer$1,
             kmd: kmd,
             testAccount,
             generateAccount: async (params) => {
-                const account$1 = await account.getTestAccount(params, transactionLoggerAlgod, kmd);
+                const account$1 = await account.getTestAccount(params, algorandClient);
                 algorandClient.setSignerFromAccount(account$1);
                 return { ...account$1, signer: algorandClient.account.getSigner(account$1.addr) };
             },

package/testing/fixtures/algorand-fixture.js.map

@@ -1 +1 @@
-{"version":3,"file":"algorand-fixture.js","sources":["../../../src/testing/fixtures/algorand-fixture.ts"],"sourcesContent":[null],"names":["config","getConfigFromEnvOrDefaults","getAlgoClient","indexer","getAlgoIndexerClient","getAlgoKmdClient","Config","transactionLogger","TransactionLogger","getTestAccount","algos","AlgorandClient","account","runWhenIndexerCaughtUp","lookupTransactionById"],"mappings":";;;;;;;;;;;AAiEA;;;;;;;;;;;;;;;;;;;;;;AAsBG;AACa,SAAA,eAAe,CAAC,aAAqC,EAAEA,QAAmB,EAAA;AACxF,IAAAA,QAAM,GAAGA,QAAM,IAAIC,wCAA0B,EAAE,CAAA;AAE/C,IAAA,MAAM,KAAK,GAAG,aAAa,EAAE,KAAK,IAAIC,2BAAa,CAACF,QAAM,CAAC,WAAW,CAAC,CAAA;AACvE,IAAA,MAAMG,SAAO,GAAG,aAAa,EAAE,OAAO,IAAIC,kCAAoB,CAACJ,QAAM,CAAC,aAAa,CAAC,CAAA;AACpF,IAAA,MAAM,GAAG,GAAG,aAAa,EAAE,GAAG,IAAIK,8BAAgB,CAACL,QAAM,CAAC,SAAS,CAAC,CAAA;AACpE,IAAA,IAAI,OAAsC,CAAA;AAC1C,IAAA,IAAI,cAA8B,CAAA;AAElC,IAAA,MAAM,UAAU,GAAG,YAAW;QAC5BM,aAAM,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;AACjC,QAAA,MAAMC,mBAAiB,GAAG,IAAIC,mCAAiB,EAAE,CAAA;QACjD,MAAM,sBAAsB,GAAGD,mBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC/D,MAAM,GAAG,GAAG,MAAME,sBAAc,CAC9B,EAAE,YAAY,EAAE,aAAa,EAAE,kBAAkB,IAAIC,YAAK,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,EACnF,sBAAsB,EACtB,GAAG,CACJ,CAAA;AACD,QAAA,cAAc,GAAG,cAAc,IAAIC,mCAAc,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,sBAAsB,WAAER,SAAO,EAAE,GAAG,EAAE,CAAC,CAAA;AAC9G,QAAA,cAAc,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAA;AACpG,QAAA,MAAM,WAAW,GAAG,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAA;AAClF,QAAA,OAAO,GAAG;AACR,YAAA,KAAK,EAAE,sBAAsB;AAC7B,YAAA,OAAO,EAAEA,SAAO;AAChB,YAAA,GAAG,EAAE,GAAG;YACR,WAAW;AACX,YAAA,eAAe,EAAE,OAAO,MAA4B,KAAI;gBACtD,MAAMS,SAAO,GAAG,MAAMH,sBAAc,CAAC,MAAM,EAAE,sBAAsB,EAAE,GAAG,CAAC,CAAA;AACzE,gBAAA,cAAc,CAAC,oBAAoB,CAACG,SAAO,CAAC,CAAA;AAC5C,gBAAA,OAAO,EAAE,GAAGA,SAAO,EAAE,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC,SAAS,CAACA,SAAO,CAAC,IAAI,CAAC,EAAE,CAAA;aAC9E;AACD,YAAA,iBAAiB,EAAEL,mBAAiB;YACpC,cAAc,EAAE,MAAMA,mBAAiB,CAAC,cAAc,CAACJ,SAAO,CAAC;AAC/D,YAAA,yBAAyB,EAAE,CAAC,aAAqB,KAAKU,8BAAsB,CAAC,MAAMC,mCAAqB,CAAC,aAAa,EAAEX,SAAO,CAAC,CAAC;SAClI,CAAA;AACH,KAAC,CAAA;IAED,OAAO;AACL,QAAA,IAAI,OAAO,GAAA;AACT,YAAA,OAAO,OAAO,CAAA;SACf;AACD,QAAA,IAAI,QAAQ,GAAA;AACV,YAAA,OAAO,cAAc,CAAA;SACtB;QACD,UAAU;KACX,CAAA;AACH;;;;"}
+{"version":3,"file":"algorand-fixture.js","sources":["../../../src/testing/fixtures/algorand-fixture.ts"],"sourcesContent":[null],"names":["config","ClientManager","indexer","Config","transactionLogger","TransactionLogger","AlgorandClient","getTestAccount","algos","account","runWhenIndexerCaughtUp","lookupTransactionById"],"mappings":"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"}

package/testing/fixtures/algorand-fixture.mjs

@@ -1,57 +1,38 @@
 import { AlgorandClient } from '../../types/algorand-client.mjs';
+import { ClientManager } from '../../types/client-manager.mjs';
 import { getTestAccount } from '../account.mjs';
 import { runWhenIndexerCaughtUp } from '../indexer.mjs';
 import { TransactionLogger } from '../transaction-logger.mjs';
-import { getConfigFromEnvOrDefaults, getAlgoClient, getAlgoIndexerClient, getAlgoKmdClient } from '../../network-client.mjs';
 import { algos } from '../../amount.mjs';
 import { lookupTransactionById } from '../../indexer-lookup.mjs';
 import { Config } from '../../config.mjs';
 
-/**
- * Creates a test fixture for automated testing against Algorand.
- * By default it tests against an environment variable specified client
- *  if the standard environment variables are specified, otherwise against
- *  a default LocalNet instance, but you can pass in an algod, indexer
- *  and/or kmd if you want to test against an explicitly defined network.
- *
- * @example
- * ```typescript
- * const algorand = algorandFixture(undefined, getConfigFromEnvOrDefaults())
- *
- * beforeEach(algorand.beforeEach, 10_000)
- *
- * test('My test', async () => {
- *     const {algod, indexer, testAccount, ...} = algorand.context
- *     // test things...
- * })
- * ```
- *
- * @param fixtureConfig The fixture configuration
- * @param config The algo configuration
- * @returns The fixture
- */
 function algorandFixture(fixtureConfig, config) {
-    config = config || getConfigFromEnvOrDefaults();
-    const algod = fixtureConfig?.algod ?? getAlgoClient(config.algodConfig);
-    const indexer = fixtureConfig?.indexer ?? getAlgoIndexerClient(config.indexerConfig);
-    const kmd = fixtureConfig?.kmd ?? getAlgoKmdClient(config.kmdConfig);
+    fixtureConfig = { ...fixtureConfig, ...config };
+    if (!fixtureConfig.algod || !fixtureConfig.indexer || !fixtureConfig.kmd) {
+        fixtureConfig = { ...ClientManager.getConfigFromEnvironmentOrLocalNet(), ...fixtureConfig };
+    }
+    const algod = fixtureConfig.algod ?? ClientManager.getAlgodClient(fixtureConfig.algodConfig);
+    const indexer = fixtureConfig.indexer ?? ClientManager.getIndexerClient(fixtureConfig.indexerConfig);
+    const kmd = fixtureConfig.kmd ?? ClientManager.getKmdClient(fixtureConfig.kmdConfig);
     let context;
     let algorandClient;
     const beforeEach = async () => {
         Config.configure({ debug: true });
         const transactionLogger = new TransactionLogger();
         const transactionLoggerAlgod = transactionLogger.capture(algod);
-        const acc = await getTestAccount({ initialFunds: fixtureConfig?.testAccountFunding ?? algos(10), suppressLog: true }, transactionLoggerAlgod, kmd);
         algorandClient = algorandClient ?? AlgorandClient.fromClients({ algod: transactionLoggerAlgod, indexer, kmd });
+        const acc = await getTestAccount({ initialFunds: fixtureConfig?.testAccountFunding ?? algos(10), suppressLog: true }, algorandClient);
         algorandClient.setSignerFromAccount(acc).setDefaultValidityWindow(1000).setSuggestedParamsTimeout(0);
         const testAccount = { ...acc, signer: algorandClient.account.getSigner(acc.addr) };
         context = {
+            algorand: algorandClient,
             algod: transactionLoggerAlgod,
             indexer: indexer,
             kmd: kmd,
             testAccount,
             generateAccount: async (params) => {
-                const account = await getTestAccount(params, transactionLoggerAlgod, kmd);
+                const account = await getTestAccount(params, algorandClient);
                 algorandClient.setSignerFromAccount(account);
                 return { ...account, signer: algorandClient.account.getSigner(account.addr) };
             },

package/testing/fixtures/algorand-fixture.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"algorand-fixture.mjs","sources":["../../../src/testing/fixtures/algorand-fixture.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;AAiEA;;;;;;;;;;;;;;;;;;;;;;AAsBG;AACa,SAAA,eAAe,CAAC,aAAqC,EAAE,MAAmB,EAAA;AACxF,IAAA,MAAM,GAAG,MAAM,IAAI,0BAA0B,EAAE,CAAA;AAE/C,IAAA,MAAM,KAAK,GAAG,aAAa,EAAE,KAAK,IAAI,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;AACvE,IAAA,MAAM,OAAO,GAAG,aAAa,EAAE,OAAO,IAAI,oBAAoB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;AACpF,IAAA,MAAM,GAAG,GAAG,aAAa,EAAE,GAAG,IAAI,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;AACpE,IAAA,IAAI,OAAsC,CAAA;AAC1C,IAAA,IAAI,cAA8B,CAAA;AAElC,IAAA,MAAM,UAAU,GAAG,YAAW;QAC5B,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;AACjC,QAAA,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAA;QACjD,MAAM,sBAAsB,GAAG,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC/D,MAAM,GAAG,GAAG,MAAM,cAAc,CAC9B,EAAE,YAAY,EAAE,aAAa,EAAE,kBAAkB,IAAI,KAAK,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,EACnF,sBAAsB,EACtB,GAAG,CACJ,CAAA;AACD,QAAA,cAAc,GAAG,cAAc,IAAI,cAAc,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,sBAAsB,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAA;AAC9G,QAAA,cAAc,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAA;AACpG,QAAA,MAAM,WAAW,GAAG,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAA;AAClF,QAAA,OAAO,GAAG;AACR,YAAA,KAAK,EAAE,sBAAsB;AAC7B,YAAA,OAAO,EAAE,OAAO;AAChB,YAAA,GAAG,EAAE,GAAG;YACR,WAAW;AACX,YAAA,eAAe,EAAE,OAAO,MAA4B,KAAI;gBACtD,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,MAAM,EAAE,sBAAsB,EAAE,GAAG,CAAC,CAAA;AACzE,gBAAA,cAAc,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAA;AAC5C,gBAAA,OAAO,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAA;aAC9E;AACD,YAAA,iBAAiB,EAAE,iBAAiB;YACpC,cAAc,EAAE,MAAM,iBAAiB,CAAC,cAAc,CAAC,OAAO,CAAC;AAC/D,YAAA,yBAAyB,EAAE,CAAC,aAAqB,KAAK,sBAAsB,CAAC,MAAM,qBAAqB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;SAClI,CAAA;AACH,KAAC,CAAA;IAED,OAAO;AACL,QAAA,IAAI,OAAO,GAAA;AACT,YAAA,OAAO,OAAO,CAAA;SACf;AACD,QAAA,IAAI,QAAQ,GAAA;AACV,YAAA,OAAO,cAAc,CAAA;SACtB;QACD,UAAU;KACX,CAAA;AACH;;;;"}
+{"version":3,"file":"algorand-fixture.mjs","sources":["../../../src/testing/fixtures/algorand-fixture.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/transaction/transaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../src/transaction/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAA;AAI7B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EACL,+BAA+B,EAC/B,oCAAoC,EACpC,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,eAAe,EACf,iBAAiB,EAClB,MAAM,sBAAsB,CAAA;AAG7B,OAAO,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;AAChC,OAAO,yBAAyB,GAAG,OAAO,CAAC,yBAAyB,CAAA;AACpE,OAAO,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;AAClC,OAAO,eAAe,GAAG,OAAO,CAAC,eAAe,CAAA;AAChD,OAAO,WAAW,GAAG,OAAO,CAAC,WAAW,CAAA;AAExC,OAAO,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAA;AAE5D,eAAO,MAAM,0BAA0B,KAAK,CAAA;AAC5C,eAAO,MAAM,+BAA+B,IAAI,CAAA;AAChD,eAAO,MAAM,+BAA+B,IAAI,CAAA;AAEhD;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,UAAU,GAAG,SAAS,CAcpF;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,CA0B/E;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,WAAqB,MAAM,GAAG,mBAAmB,WAE7E,CAAA;AAWD;;;;;;;;;GASG;AACH,eAAO,MAAM,wBAAwB,gBACtB,qBAAqB,GAAG,iBAAiB,GAAG,WAAW,GAAG,QAAQ,qBAAqB,CAAC,kBACrF,mBAAmB,KAClC,QAAQ,qBAAqB,CAkB/B,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,yDAMrC,CAAA;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,gBAAuB,WAAW,UAAU,mBAAmB,wBAQ1F,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,SACpB;IACJ,WAAW,EAAE,WAAW,CAAA;IACxB,IAAI,EAAE,mBAAmB,CAAA;IACzB,UAAU,CAAC,EAAE,qBAAqB,CAAA;CACnC,SACM,OAAO,KACb,QAAQ,qBAAqB,CAwC/B,CAAA;AA0DD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,OAAO,CAAC,yBAAyB,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,8CAmP5G;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,6BAA6B,YAA4B,+BAA+B,SAAS,OAAO,kDA+HpH,CAAA;AAED;;;;;GAKG;AACH,wBAAsB,sCAAsC,CAAC,GAAG,EAAE,yBAAyB,EAAE,KAAK,EAAE,OAAO,iCAO1G;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,cAA8B,sBAAsB,SAAS,OAAO,mEAgCvG,CAAA;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,mBAAmB,kBACf,MAAM,mBACJ,MAAM,GAAG,MAAM,SACzB,OAAO,KACb,QAAQ,SAAS,0BAA0B,CA4C7C,CAAA;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,GAAG,eAAe,EAAE,gBAAgB,EAAE,UAAU,QAgBjH;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,eAAe,GAAG,WAAW,EACjE,WAAW,EAAE,CAAC,EACd,UAAU,EAAE;IAAE,GAAG,CAAC,EAAE,UAAU,CAAC;IAAC,MAAM,CAAC,EAAE,UAAU,CAAA;CAAE,KAatD;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,eAAe,GAAG,SAAS,EAAE,KAAK,EAAE,OAAO;;;;;;;GAE7F;AAED;;;;GAIG;AACH,wBAAgB,wCAAwC,CAAC,GAAG,EAAE,yBAAyB,mCAMtF"}
+{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../src/transaction/transaction.ts"],"names":[],"mappings":"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"}

package/transaction/transaction.js

@@ -85,14 +85,6 @@ function encodeLease(lease) {
 const getSenderAddress = function (sender) {
     return typeof sender === 'string' ? sender : 'addr' in sender ? sender.addr : sender.address();
 };
-const memoize = (fn) => {
-    const cache = new Map();
-    const cached = function (val) {
-        return cache.has(val) ? cache.get(val) : cache.set(val, fn.call(this, val)) && cache.get(val);
-    };
-    cached.cache = cache;
-    return cached;
-};
 /**
  * Given a transaction in a variety of supported formats, returns a TransactionWithSigner object ready to be passed to an
  * AtomicTransactionComposer's addTransaction method.
@@ -123,6 +115,14 @@ const getTransactionWithSigner = async (transaction, defaultSender) => {
                 signer: getSenderTransactionSigner(defaultSender),
             };
 };
+const memoize = (fn) => {
+    const cache = new Map();
+    const cached = function (val) {
+        return cache.has(val) ? cache.get(val) : cache.set(val, fn.call(this, val)) && cache.get(val);
+    };
+    cached.cache = cache;
+    return cached;
+};
 /**
  * Returns a `TransactionSigner` for the given transaction sender.
  * This function has memoization, so will return the same transaction signer for a given sender.