@algorandfoundation/algokit-utils 6.2.1-beta.1 → 6.3.0-beta.1

package/transfer/transfer-algos.js

@@ -1,39 +1,30 @@
 'use strict';
 
-var algosdk = require('algosdk');
-var config = require('../config.js');
+var legacyBridge = require('../transaction/legacy-bridge.js');
 var transaction = require('../transaction/transaction.js');
 
 /**
- * Transfer ALGOs between two accounts.
+ * @deprecated Use `algorand.send.payment()` / `algorand.transaction.payment()` instead
+ *
+ * Transfer Algo between two accounts.
  * @param transfer The transfer definition
  * @param algod An algod client
  * @returns The transaction object and optionally the confirmation if it was sent to the chain (`skipSending` is `false` or unset)
  *
  * @example Usage example
  * ```typescript
- * await algokit.transferAlgos({ from, to, amount: algokit.algos(1) }, algod)
+ * await algokit.transferAlgos({ from, to, amount: algokit.algo(1) }, algod)
  * ```
  */
 async function transferAlgos(transfer, algod) {
-    const { from, to, amount, note, transactionParams, lease, ...sendParams } = transfer;
-    const transaction$1 = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
-        from: transaction.getSenderAddress(from),
-        to: transaction.getSenderAddress(to),
-        amount: amount.microAlgos,
-        note: transaction.encodeTransactionNote(note),
-        suggestedParams: await transaction.getTransactionParams(transactionParams, algod),
-        closeRemainderTo: undefined,
-        rekeyTo: undefined,
-    });
-    const encodedLease = transaction.encodeLease(lease);
-    if (encodedLease) {
-        transaction$1.addLease(encodedLease);
-    }
-    if (!sendParams.skipSending) {
-        config.Config.getLogger(sendParams.suppressLog).debug(`Transferring ${amount.microAlgos}µALGOs from ${transaction.getSenderAddress(from)} to ${transaction.getSenderAddress(to)}`);
-    }
-    return transaction.sendTransaction({ transaction: transaction$1, from, sendParams }, algod);
+    const params = {
+        sender: transaction.getSenderAddress(transfer.from),
+        receiver: transaction.getSenderAddress(transfer.to),
+        amount: transfer.amount,
+        note: transaction.encodeTransactionNote(transfer.note),
+        lease: transfer.lease,
+    };
+    return await legacyBridge.legacySendTransactionBridge(algod, transfer.from, transfer, params, (c) => c.payment, (c) => c.payment);
 }
 
 exports.transferAlgos = transferAlgos;

package/transfer/transfer-algos.js.map

@@ -1 +1 @@
-{"version":3,"file":"transfer-algos.js","sources":["../../src/transfer/transfer-algos.ts"],"sourcesContent":[null],"names":["transaction","getSenderAddress","encodeTransactionNote","getTransactionParams","encodeLease","Config","sendTransaction"],"mappings":";;;;;;AAOA;;;;;;;;;;AAUG;AACI,eAAe,aAAa,CAAC,QAA4B,EAAE,KAAc,EAAA;AAC9E,IAAA,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,GAAG,UAAU,EAAE,GAAG,QAAQ,CAAA;AAEpF,IAAA,MAAMA,aAAW,GAAG,OAAO,CAAC,2CAA2C,CAAC;AACtE,QAAA,IAAI,EAAEC,4BAAgB,CAAC,IAAI,CAAC;AAC5B,QAAA,EAAE,EAAEA,4BAAgB,CAAC,EAAE,CAAC;QACxB,MAAM,EAAE,MAAM,CAAC,UAAU;AACzB,QAAA,IAAI,EAAEC,iCAAqB,CAAC,IAAI,CAAC;AACjC,QAAA,eAAe,EAAE,MAAMC,gCAAoB,CAAC,iBAAiB,EAAE,KAAK,CAAC;AACrE,QAAA,gBAAgB,EAAE,SAAS;AAC3B,QAAA,OAAO,EAAE,SAAS;AACnB,KAAA,CAAC,CAAA;AAEF,IAAA,MAAM,YAAY,GAAGC,uBAAW,CAAC,KAAK,CAAC,CAAA;IACvC,IAAI,YAAY,EAAE;AAChB,QAAAJ,aAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA;KACnC;AAED,IAAA,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE;QAC3BK,aAAM,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,KAAK,CAC5C,CAAA,aAAA,EAAgB,MAAM,CAAC,UAAU,CAAe,YAAA,EAAAJ,4BAAgB,CAAC,IAAI,CAAC,CAAA,IAAA,EAAOA,4BAAgB,CAAC,EAAE,CAAC,CAAE,CAAA,CACpG,CAAA;KACF;AAED,IAAA,OAAOK,2BAAe,CAAC,eAAEN,aAAW,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,KAAK,CAAC,CAAA;AAClE;;;;"}
+{"version":3,"file":"transfer-algos.js","sources":["../../src/transfer/transfer-algos.ts"],"sourcesContent":[null],"names":["getSenderAddress","encodeTransactionNote","legacySendTransactionBridge"],"mappings":";;;;;AAQA;;;;;;;;;;;;AAYG;AACI,eAAe,aAAa,CAAC,QAA4B,EAAE,KAAc,EAAA;AAC9E,IAAA,MAAM,MAAM,GAAkB;AAC5B,QAAA,MAAM,EAAEA,4BAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC;AACvC,QAAA,QAAQ,EAAEA,4BAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvC,MAAM,EAAE,QAAQ,CAAC,MAAM;AACvB,QAAA,IAAI,EAAEC,iCAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC1C,KAAK,EAAE,QAAQ,CAAC,KAAK;KACtB,CAAA;AAED,IAAA,OAAO,MAAMC,wCAA2B,CACtC,KAAK,EACL,QAAQ,CAAC,IAAI,EACb,QAAQ,EACR,MAAM,EACN,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,EAChB,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CACjB,CAAA;AACH;;;;"}

package/transfer/transfer-algos.mjs

@@ -1,37 +1,28 @@
-import algosdk from 'algosdk';
-import { Config } from '../config.mjs';
-import { getSenderAddress, encodeTransactionNote, getTransactionParams, encodeLease, sendTransaction } from '../transaction/transaction.mjs';
+import { legacySendTransactionBridge } from '../transaction/legacy-bridge.mjs';
+import { getSenderAddress, encodeTransactionNote } from '../transaction/transaction.mjs';
 
 /**
- * Transfer ALGOs between two accounts.
+ * @deprecated Use `algorand.send.payment()` / `algorand.transaction.payment()` instead
+ *
+ * Transfer Algo between two accounts.
  * @param transfer The transfer definition
  * @param algod An algod client
  * @returns The transaction object and optionally the confirmation if it was sent to the chain (`skipSending` is `false` or unset)
  *
  * @example Usage example
  * ```typescript
- * await algokit.transferAlgos({ from, to, amount: algokit.algos(1) }, algod)
+ * await algokit.transferAlgos({ from, to, amount: algokit.algo(1) }, algod)
  * ```
  */
 async function transferAlgos(transfer, algod) {
-    const { from, to, amount, note, transactionParams, lease, ...sendParams } = transfer;
-    const transaction = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
-        from: getSenderAddress(from),
-        to: getSenderAddress(to),
-        amount: amount.microAlgos,
-        note: encodeTransactionNote(note),
-        suggestedParams: await getTransactionParams(transactionParams, algod),
-        closeRemainderTo: undefined,
-        rekeyTo: undefined,
-    });
-    const encodedLease = encodeLease(lease);
-    if (encodedLease) {
-        transaction.addLease(encodedLease);
-    }
-    if (!sendParams.skipSending) {
-        Config.getLogger(sendParams.suppressLog).debug(`Transferring ${amount.microAlgos}µALGOs from ${getSenderAddress(from)} to ${getSenderAddress(to)}`);
-    }
-    return sendTransaction({ transaction, from, sendParams }, algod);
+    const params = {
+        sender: getSenderAddress(transfer.from),
+        receiver: getSenderAddress(transfer.to),
+        amount: transfer.amount,
+        note: encodeTransactionNote(transfer.note),
+        lease: transfer.lease,
+    };
+    return await legacySendTransactionBridge(algod, transfer.from, transfer, params, (c) => c.payment, (c) => c.payment);
 }
 
 export { transferAlgos };

package/transfer/transfer-algos.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"transfer-algos.mjs","sources":["../../src/transfer/transfer-algos.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAOA;;;;;;;;;;AAUG;AACI,eAAe,aAAa,CAAC,QAA4B,EAAE,KAAc,EAAA;AAC9E,IAAA,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,GAAG,UAAU,EAAE,GAAG,QAAQ,CAAA;AAEpF,IAAA,MAAM,WAAW,GAAG,OAAO,CAAC,2CAA2C,CAAC;AACtE,QAAA,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;AAC5B,QAAA,EAAE,EAAE,gBAAgB,CAAC,EAAE,CAAC;QACxB,MAAM,EAAE,MAAM,CAAC,UAAU;AACzB,QAAA,IAAI,EAAE,qBAAqB,CAAC,IAAI,CAAC;AACjC,QAAA,eAAe,EAAE,MAAM,oBAAoB,CAAC,iBAAiB,EAAE,KAAK,CAAC;AACrE,QAAA,gBAAgB,EAAE,SAAS;AAC3B,QAAA,OAAO,EAAE,SAAS;AACnB,KAAA,CAAC,CAAA;AAEF,IAAA,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,CAAA;IACvC,IAAI,YAAY,EAAE;AAChB,QAAA,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA;KACnC;AAED,IAAA,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE;QAC3B,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,KAAK,CAC5C,CAAA,aAAA,EAAgB,MAAM,CAAC,UAAU,CAAe,YAAA,EAAA,gBAAgB,CAAC,IAAI,CAAC,CAAA,IAAA,EAAO,gBAAgB,CAAC,EAAE,CAAC,CAAE,CAAA,CACpG,CAAA;KACF;AAED,IAAA,OAAO,eAAe,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,KAAK,CAAC,CAAA;AAClE;;;;"}
+{"version":3,"file":"transfer-algos.mjs","sources":["../../src/transfer/transfer-algos.ts"],"sourcesContent":[null],"names":[],"mappings":";;;AAQA;;;;;;;;;;;;AAYG;AACI,eAAe,aAAa,CAAC,QAA4B,EAAE,KAAc,EAAA;AAC9E,IAAA,MAAM,MAAM,GAAkB;AAC5B,QAAA,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC;AACvC,QAAA,QAAQ,EAAE,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvC,MAAM,EAAE,QAAQ,CAAC,MAAM;AACvB,QAAA,IAAI,EAAE,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC1C,KAAK,EAAE,QAAQ,CAAC,KAAK;KACtB,CAAA;AAED,IAAA,OAAO,MAAM,2BAA2B,CACtC,KAAK,EACL,QAAQ,CAAC,IAAI,EACb,QAAQ,EACR,MAAM,EACN,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,EAChB,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CACjB,CAAA;AACH;;;;"}

package/transfer/transfer.d.ts

@@ -4,7 +4,10 @@ import { AlgoRekeyParams, EnsureFundedParams, EnsureFundedReturnType, TransferAs
 import Algodv2 = algosdk.Algodv2;
 import Kmd = algosdk.Kmd;
 /**
- * Funds a given account using a funding source such that it has a certain amount of algos free to spend (accounting for ALGOs locked in minimum balance requirement).
+ * @deprecated Use `algorand.account.ensureFunded()` / `algorand.account.ensureFundedFromEnvironment()`
+ * / `algorand.account.ensureFundedFromTestNetDispenserApi()` instead
+ *
+ * Funds a given account using a funding source such that it has a certain amount of Algo free to spend (accounting for Algo locked in minimum balance requirement).
  *
  * https://developer.algorand.org/docs/get-details/accounts/#minimum-balance
  *
@@ -17,6 +20,8 @@ import Kmd = algosdk.Kmd;
  */
 export declare function ensureFunded<T extends EnsureFundedParams>(funding: T, algod: Algodv2, kmd?: Kmd): Promise<EnsureFundedReturnType | undefined>;
 /**
+ * @deprecated Use `algorand.send.assetTransfer()` / `algorand.transaction.assetTransfer()` instead
+ *
  * Transfer asset between two accounts.
  * @param transfer The transfer definition
  * @param algod An algod client
@@ -29,6 +34,8 @@ export declare function ensureFunded<T extends EnsureFundedParams>(funding: T, a
  */
 export declare function transferAsset(transfer: TransferAssetParams, algod: Algodv2): Promise<SendTransactionResult>;
 /**
+ * @deprecated Use `algorand.account.rekeyAccount()` instead
+ *
  * Rekey an account to a new address.
  *
  * **Note:** Please be careful with this function and be sure to read the [official rekey guidance](https://developer.algorand.org/docs/get-details/accounts/rekey/).

package/transfer/transfer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transfer.d.ts","sourceRoot":"","sources":["../../src/transfer/transfer.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAA;AAQ7B,OAAO,EAAE,qBAAqB,EAAmB,MAAM,sBAAsB,CAAA;AAC7E,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAGpH,OAAO,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;AAChC,OAAO,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;AA+DxB;;;;;;;;;;;GAWG;AACH,wBAAsB,YAAY,CAAC,CAAC,SAAS,kBAAkB,EAC7D,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,OAAO,EACd,GAAG,CAAC,EAAE,GAAG,GACR,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CAkC7C;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,mBAAmB,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,qBAAqB,CAAC,CA0BjH;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,YAAY,CAAC,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAuBzG"}
+{"version":3,"file":"transfer.d.ts","sourceRoot":"","sources":["../../src/transfer/transfer.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAA;AAK7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACpH,OAAO,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;AAChC,OAAO,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;AAExB;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,YAAY,CAAC,CAAC,SAAS,kBAAkB,EAC7D,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,OAAO,EACd,GAAG,CAAC,EAAE,GAAG,GACR,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CA2C7C;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,mBAAmB,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAiBjH;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,YAAY,CAAC,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAgBzG"}

package/transfer/transfer.js

@@ -1,41 +1,15 @@
 'use strict';
 
-var algosdk = require('algosdk');
-var amount = require('../amount.js');
-var config = require('../config.js');
+var legacyBridge = require('../transaction/legacy-bridge.js');
 var transaction = require('../transaction/transaction.js');
-var types_accountManager = require('../types/account-manager.js');
-var types_clientManager = require('../types/client-manager.js');
+var types_algorandClient = require('../types/algorand-client.js');
 var types_dispenserClient = require('../types/dispenser-client.js');
-var util = require('../util.js');
-var transferAlgos = require('./transfer-algos.js');
 
-async function fundUsingDispenserApi(dispenserClient, addressToFund, fundAmount) {
-    const response = await dispenserClient.fund(addressToFund, fundAmount);
-    return { transactionId: response.txId, amount: response.amount };
-}
-async function fundUsingTransfer({ algod, addressToFund, funding, fundAmount, transactionParams, sendParams, note, kmd, }) {
-    if (funding.fundingSource instanceof types_dispenserClient.TestNetDispenserApiClient) {
-        throw new Error('Dispenser API client is not supported in this context.');
-    }
-    const from = funding.fundingSource ?? (await new types_accountManager.AccountManager(new types_clientManager.ClientManager({ algod, kmd })).dispenserFromEnvironment());
-    const amount$1 = amount.microAlgos(Math.max(fundAmount, funding.minFundingIncrement?.microAlgos ?? 0));
-    const response = await transferAlgos.transferAlgos({
-        from,
-        to: addressToFund,
-        note: note ?? 'Funding account to meet minimum requirement',
-        amount: amount$1,
-        transactionParams: transactionParams,
-        lease: funding.lease,
-        ...sendParams,
-    }, algod);
-    return {
-        transactionId: response.transaction.txID(),
-        amount: Number(response.transaction.amount),
-    };
-}
 /**
- * Funds a given account using a funding source such that it has a certain amount of algos free to spend (accounting for ALGOs locked in minimum balance requirement).
+ * @deprecated Use `algorand.account.ensureFunded()` / `algorand.account.ensureFundedFromEnvironment()`
+ * / `algorand.account.ensureFundedFromTestNetDispenserApi()` instead
+ *
+ * Funds a given account using a funding source such that it has a certain amount of Algo free to spend (accounting for Algo locked in minimum balance requirement).
  *
  * https://developer.algorand.org/docs/get-details/accounts/#minimum-balance
  *
@@ -47,33 +21,41 @@ async function fundUsingTransfer({ algod, addressToFund, funding, fundAmount, tr
  * - `undefined` if no funds were needed.
  */
 async function ensureFunded(funding, algod, kmd) {
-    const { accountToFund, fundingSource, minSpendingBalance, minFundingIncrement, transactionParams, note, ...sendParams } = funding;
-    const addressToFund = typeof accountToFund === 'string' ? accountToFund : transaction.getSenderAddress(accountToFund);
-    const accountInfo = await algod.accountInformation(addressToFund).do();
-    const balance = Number(accountInfo.amount);
-    const minimumBalanceRequirement = amount.microAlgos(Number(accountInfo['min-balance']));
-    const currentSpendingBalance = amount.microAlgos(balance - minimumBalanceRequirement.microAlgos);
-    const fundAmount = util.calculateFundAmount(minSpendingBalance.microAlgos, currentSpendingBalance.microAlgos, minFundingIncrement?.microAlgos ?? 0);
-    if (fundAmount !== null) {
-        if ((await new types_clientManager.ClientManager({ algod }).isTestNet()) && fundingSource instanceof types_dispenserClient.TestNetDispenserApiClient) {
-            return await fundUsingDispenserApi(fundingSource, addressToFund, fundAmount);
-        }
-        else {
-            return await fundUsingTransfer({
-                algod,
-                addressToFund,
-                funding,
-                fundAmount,
-                transactionParams,
-                sendParams,
-                note,
-                kmd,
-            });
-        }
+    const algorand = types_algorandClient.AlgorandClient.fromClients({ algod, kmd });
+    if (funding.fundingSource instanceof types_dispenserClient.TestNetDispenserApiClient) {
+        const result = await algorand.account.ensureFundedFromTestNetDispenserApi(transaction.getSenderAddress(funding.accountToFund), funding.fundingSource, funding.minSpendingBalance, {
+            minFundingIncrement: funding.minFundingIncrement,
+        });
+        if (!result)
+            return undefined;
+        return {
+            amount: result.amountFunded.microAlgo,
+            transactionId: result.transactionId,
+        };
+    }
+    else {
+        const sender = funding.fundingSource ?? (await algorand.account.dispenserFromEnvironment());
+        algorand.setSignerFromAccount(sender);
+        const result = await algorand.account.ensureFunded(transaction.getSenderAddress(funding.accountToFund), transaction.getSenderAddress(sender), funding.minSpendingBalance, {
+            minFundingIncrement: funding.minFundingIncrement,
+            note: transaction.encodeTransactionNote(funding.note),
+            staticFee: funding.fee,
+            lease: funding.lease,
+            maxFee: funding.maxFee,
+            maxRoundsToWaitForConfirmation: funding.maxRoundsToWaitForConfirmation,
+            suppressLog: funding.suppressLog,
+        });
+        return result
+            ? {
+                amount: result.amountFunded.microAlgo,
+                transactionId: result.txIds[0],
+            }
+            : undefined;
     }
-    return undefined;
 }
 /**
+ * @deprecated Use `algorand.send.assetTransfer()` / `algorand.transaction.assetTransfer()` instead
+ *
  * Transfer asset between two accounts.
  * @param transfer The transfer definition
  * @param algod An algod client
@@ -85,28 +67,19 @@ async function ensureFunded(funding, algod, kmd) {
  * ```
  */
 async function transferAsset(transfer, algod) {
-    const { from, to, assetId, amount, transactionParams, clawbackFrom, note, lease, ...sendParams } = transfer;
-    const transaction$1 = algosdk.makeAssetTransferTxnWithSuggestedParamsFromObject({
-        from: transaction.getSenderAddress(from),
-        to: transaction.getSenderAddress(to),
-        closeRemainderTo: undefined,
-        revocationTarget: clawbackFrom ? transaction.getSenderAddress(clawbackFrom) : undefined,
-        amount: amount,
-        note: transaction.encodeTransactionNote(note),
-        assetIndex: assetId,
-        suggestedParams: await transaction.getTransactionParams(transactionParams, algod),
-        rekeyTo: undefined,
-    });
-    const encodedLease = transaction.encodeLease(lease);
-    if (encodedLease) {
-        transaction$1.addLease(encodedLease);
-    }
-    if (!sendParams.skipSending) {
-        config.Config.getLogger(sendParams.suppressLog).debug(`Transferring ASA (${assetId}) of amount ${amount} from ${transaction.getSenderAddress(from)} to ${transaction.getSenderAddress(to)}`);
-    }
-    return transaction.sendTransaction({ transaction: transaction$1, from, sendParams }, algod);
+    return legacyBridge.legacySendTransactionBridge(algod, transfer.from, transfer, {
+        assetId: BigInt(transfer.assetId),
+        sender: transaction.getSenderAddress(transfer.from),
+        receiver: transaction.getSenderAddress(transfer.to),
+        clawbackTarget: transfer.clawbackFrom ? transaction.getSenderAddress(transfer.clawbackFrom) : undefined,
+        amount: BigInt(transfer.amount),
+        note: transaction.encodeTransactionNote(transfer.note),
+        lease: transfer.lease,
+    }, (c) => c.assetTransfer, (c) => c.assetTransfer);
 }
 /**
+ * @deprecated Use `algorand.account.rekeyAccount()` instead
+ *
  * Rekey an account to a new address.
  *
  * **Note:** Please be careful with this function and be sure to read the [official rekey guidance](https://developer.algorand.org/docs/get-details/accounts/rekey/).
@@ -121,24 +94,14 @@ async function transferAsset(transfer, algod) {
  * ```
  */
 async function rekeyAccount(rekey, algod) {
-    const { from, rekeyTo, note, transactionParams, lease, ...sendParams } = rekey;
-    const transaction$1 = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
-        from: transaction.getSenderAddress(from),
-        to: transaction.getSenderAddress(from),
-        rekeyTo: transaction.getSenderAddress(rekeyTo),
-        amount: 0,
-        note: transaction.encodeTransactionNote(note),
-        suggestedParams: await transaction.getTransactionParams(transactionParams, algod),
-        closeRemainderTo: undefined,
-    });
-    const encodedLease = transaction.encodeLease(lease);
-    if (encodedLease) {
-        transaction$1.addLease(encodedLease);
-    }
-    if (!sendParams.skipSending) {
-        config.Config.getLogger(sendParams.suppressLog).debug(`Rekeying ${transaction.getSenderAddress(from)} to ${transaction.getSenderAddress(rekeyTo)}`);
-    }
-    return transaction.sendTransaction({ transaction: transaction$1, from, sendParams }, algod);
+    return legacyBridge.legacySendTransactionBridge(algod, rekey.from, rekey, {
+        sender: transaction.getSenderAddress(rekey.from),
+        receiver: transaction.getSenderAddress(rekey.from),
+        amount: (0).microAlgo(),
+        rekeyTo: typeof rekey.rekeyTo === 'string' ? rekey.rekeyTo : transaction.getSenderAddress(rekey.rekeyTo),
+        note: transaction.encodeTransactionNote(rekey.note),
+        lease: rekey.lease,
+    }, (c) => c.payment, (c) => c.payment);
 }
 
 exports.ensureFunded = ensureFunded;

package/transfer/transfer.js.map

@@ -1 +1 @@
-{"version":3,"file":"transfer.js","sources":["../../src/transfer/transfer.ts"],"sourcesContent":[null],"names":["TestNetDispenserApiClient","AccountManager","ClientManager","amount","microAlgos","transferAlgos","getSenderAddress","calculateFundAmount","transaction","encodeTransactionNote","getTransactionParams","encodeLease","Config","sendTransaction"],"mappings":"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"}
+{"version":3,"file":"transfer.js","sources":["../../src/transfer/transfer.ts"],"sourcesContent":[null],"names":["AlgorandClient","TestNetDispenserApiClient","getSenderAddress","encodeTransactionNote","legacySendTransactionBridge"],"mappings":"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"}

package/transfer/transfer.mjs

@@ -1,39 +1,13 @@
-import algosdk from 'algosdk';
-import { microAlgos } from '../amount.mjs';
-import { Config } from '../config.mjs';
-import { getSenderAddress, encodeTransactionNote, getTransactionParams, encodeLease, sendTransaction } from '../transaction/transaction.mjs';
-import { AccountManager } from '../types/account-manager.mjs';
-import { ClientManager } from '../types/client-manager.mjs';
+import { legacySendTransactionBridge } from '../transaction/legacy-bridge.mjs';
+import { getSenderAddress, encodeTransactionNote } from '../transaction/transaction.mjs';
+import { AlgorandClient } from '../types/algorand-client.mjs';
 import { TestNetDispenserApiClient } from '../types/dispenser-client.mjs';
-import { calculateFundAmount } from '../util.mjs';
-import { transferAlgos } from './transfer-algos.mjs';
 
-async function fundUsingDispenserApi(dispenserClient, addressToFund, fundAmount) {
-    const response = await dispenserClient.fund(addressToFund, fundAmount);
-    return { transactionId: response.txId, amount: response.amount };
-}
-async function fundUsingTransfer({ algod, addressToFund, funding, fundAmount, transactionParams, sendParams, note, kmd, }) {
-    if (funding.fundingSource instanceof TestNetDispenserApiClient) {
-        throw new Error('Dispenser API client is not supported in this context.');
-    }
-    const from = funding.fundingSource ?? (await new AccountManager(new ClientManager({ algod, kmd })).dispenserFromEnvironment());
-    const amount = microAlgos(Math.max(fundAmount, funding.minFundingIncrement?.microAlgos ?? 0));
-    const response = await transferAlgos({
-        from,
-        to: addressToFund,
-        note: note ?? 'Funding account to meet minimum requirement',
-        amount: amount,
-        transactionParams: transactionParams,
-        lease: funding.lease,
-        ...sendParams,
-    }, algod);
-    return {
-        transactionId: response.transaction.txID(),
-        amount: Number(response.transaction.amount),
-    };
-}
 /**
- * Funds a given account using a funding source such that it has a certain amount of algos free to spend (accounting for ALGOs locked in minimum balance requirement).
+ * @deprecated Use `algorand.account.ensureFunded()` / `algorand.account.ensureFundedFromEnvironment()`
+ * / `algorand.account.ensureFundedFromTestNetDispenserApi()` instead
+ *
+ * Funds a given account using a funding source such that it has a certain amount of Algo free to spend (accounting for Algo locked in minimum balance requirement).
  *
  * https://developer.algorand.org/docs/get-details/accounts/#minimum-balance
  *
@@ -45,33 +19,41 @@ async function fundUsingTransfer({ algod, addressToFund, funding, fundAmount, tr
  * - `undefined` if no funds were needed.
  */
 async function ensureFunded(funding, algod, kmd) {
-    const { accountToFund, fundingSource, minSpendingBalance, minFundingIncrement, transactionParams, note, ...sendParams } = funding;
-    const addressToFund = typeof accountToFund === 'string' ? accountToFund : getSenderAddress(accountToFund);
-    const accountInfo = await algod.accountInformation(addressToFund).do();
-    const balance = Number(accountInfo.amount);
-    const minimumBalanceRequirement = microAlgos(Number(accountInfo['min-balance']));
-    const currentSpendingBalance = microAlgos(balance - minimumBalanceRequirement.microAlgos);
-    const fundAmount = calculateFundAmount(minSpendingBalance.microAlgos, currentSpendingBalance.microAlgos, minFundingIncrement?.microAlgos ?? 0);
-    if (fundAmount !== null) {
-        if ((await new ClientManager({ algod }).isTestNet()) && fundingSource instanceof TestNetDispenserApiClient) {
-            return await fundUsingDispenserApi(fundingSource, addressToFund, fundAmount);
-        }
-        else {
-            return await fundUsingTransfer({
-                algod,
-                addressToFund,
-                funding,
-                fundAmount,
-                transactionParams,
-                sendParams,
-                note,
-                kmd,
-            });
-        }
+    const algorand = AlgorandClient.fromClients({ algod, kmd });
+    if (funding.fundingSource instanceof TestNetDispenserApiClient) {
+        const result = await algorand.account.ensureFundedFromTestNetDispenserApi(getSenderAddress(funding.accountToFund), funding.fundingSource, funding.minSpendingBalance, {
+            minFundingIncrement: funding.minFundingIncrement,
+        });
+        if (!result)
+            return undefined;
+        return {
+            amount: result.amountFunded.microAlgo,
+            transactionId: result.transactionId,
+        };
+    }
+    else {
+        const sender = funding.fundingSource ?? (await algorand.account.dispenserFromEnvironment());
+        algorand.setSignerFromAccount(sender);
+        const result = await algorand.account.ensureFunded(getSenderAddress(funding.accountToFund), getSenderAddress(sender), funding.minSpendingBalance, {
+            minFundingIncrement: funding.minFundingIncrement,
+            note: encodeTransactionNote(funding.note),
+            staticFee: funding.fee,
+            lease: funding.lease,
+            maxFee: funding.maxFee,
+            maxRoundsToWaitForConfirmation: funding.maxRoundsToWaitForConfirmation,
+            suppressLog: funding.suppressLog,
+        });
+        return result
+            ? {
+                amount: result.amountFunded.microAlgo,
+                transactionId: result.txIds[0],
+            }
+            : undefined;
     }
-    return undefined;
 }
 /**
+ * @deprecated Use `algorand.send.assetTransfer()` / `algorand.transaction.assetTransfer()` instead
+ *
  * Transfer asset between two accounts.
  * @param transfer The transfer definition
  * @param algod An algod client
@@ -83,28 +65,19 @@ async function ensureFunded(funding, algod, kmd) {
  * ```
  */
 async function transferAsset(transfer, algod) {
-    const { from, to, assetId, amount, transactionParams, clawbackFrom, note, lease, ...sendParams } = transfer;
-    const transaction = algosdk.makeAssetTransferTxnWithSuggestedParamsFromObject({
-        from: getSenderAddress(from),
-        to: getSenderAddress(to),
-        closeRemainderTo: undefined,
-        revocationTarget: clawbackFrom ? getSenderAddress(clawbackFrom) : undefined,
-        amount: amount,
-        note: encodeTransactionNote(note),
-        assetIndex: assetId,
-        suggestedParams: await getTransactionParams(transactionParams, algod),
-        rekeyTo: undefined,
-    });
-    const encodedLease = encodeLease(lease);
-    if (encodedLease) {
-        transaction.addLease(encodedLease);
-    }
-    if (!sendParams.skipSending) {
-        Config.getLogger(sendParams.suppressLog).debug(`Transferring ASA (${assetId}) of amount ${amount} from ${getSenderAddress(from)} to ${getSenderAddress(to)}`);
-    }
-    return sendTransaction({ transaction, from, sendParams }, algod);
+    return legacySendTransactionBridge(algod, transfer.from, transfer, {
+        assetId: BigInt(transfer.assetId),
+        sender: getSenderAddress(transfer.from),
+        receiver: getSenderAddress(transfer.to),
+        clawbackTarget: transfer.clawbackFrom ? getSenderAddress(transfer.clawbackFrom) : undefined,
+        amount: BigInt(transfer.amount),
+        note: encodeTransactionNote(transfer.note),
+        lease: transfer.lease,
+    }, (c) => c.assetTransfer, (c) => c.assetTransfer);
 }
 /**
+ * @deprecated Use `algorand.account.rekeyAccount()` instead
+ *
  * Rekey an account to a new address.
  *
  * **Note:** Please be careful with this function and be sure to read the [official rekey guidance](https://developer.algorand.org/docs/get-details/accounts/rekey/).
@@ -119,24 +92,14 @@ async function transferAsset(transfer, algod) {
  * ```
  */
 async function rekeyAccount(rekey, algod) {
-    const { from, rekeyTo, note, transactionParams, lease, ...sendParams } = rekey;
-    const transaction = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
-        from: getSenderAddress(from),
-        to: getSenderAddress(from),
-        rekeyTo: getSenderAddress(rekeyTo),
-        amount: 0,
-        note: encodeTransactionNote(note),
-        suggestedParams: await getTransactionParams(transactionParams, algod),
-        closeRemainderTo: undefined,
-    });
-    const encodedLease = encodeLease(lease);
-    if (encodedLease) {
-        transaction.addLease(encodedLease);
-    }
-    if (!sendParams.skipSending) {
-        Config.getLogger(sendParams.suppressLog).debug(`Rekeying ${getSenderAddress(from)} to ${getSenderAddress(rekeyTo)}`);
-    }
-    return sendTransaction({ transaction, from, sendParams }, algod);
+    return legacySendTransactionBridge(algod, rekey.from, rekey, {
+        sender: getSenderAddress(rekey.from),
+        receiver: getSenderAddress(rekey.from),
+        amount: (0).microAlgo(),
+        rekeyTo: typeof rekey.rekeyTo === 'string' ? rekey.rekeyTo : getSenderAddress(rekey.rekeyTo),
+        note: encodeTransactionNote(rekey.note),
+        lease: rekey.lease,
+    }, (c) => c.payment, (c) => c.payment);
 }
 
 export { ensureFunded, rekeyAccount, transferAsset };

package/transfer/transfer.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"transfer.mjs","sources":["../../src/transfer/transfer.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"transfer.mjs","sources":["../../src/transfer/transfer.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}