@algorandfoundation/algokit-utils 7.0.0 → 7.0.2

package/types/app-client.mjs

@@ -5,7 +5,7 @@ import { replaceDeployTimeControlParams, performTemplateSubstitution, deployApp,
 import { Config } from '../config.mjs';
 import { legacySendTransactionBridge } from '../transaction/legacy-bridge.mjs';
 import { getSenderAddress, encodeTransactionNote } from '../transaction/transaction.mjs';
-import { binaryStartsWith } from '../util.mjs';
+import { asJson, binaryStartsWith } from '../util.mjs';
 import { UPDATABLE_TEMPLATE_NAME, DELETABLE_TEMPLATE_NAME } from './app.mjs';
 import { getArc56Method, getArc56ReturnValue, getABITupleFromABIStruct, getABIDecodedValue, getABIEncodedValue } from './app-arc56.mjs';
 import { arc32ToArc56 } from './app-spec.mjs';
@@ -180,7 +180,7 @@ class AppClient {
         const availableAppSpecNetworks = Object.keys(appSpec.networks ?? {});
         const networkIndex = availableAppSpecNetworks.findIndex((n) => networkNames.includes(n));
         if (networkIndex === -1) {
-            throw new Error(`No app ID found for network ${JSON.stringify(networkNames)} in the app spec`);
+            throw new Error(`No app ID found for network ${asJson(networkNames)} in the app spec`);
         }
         const appId = BigInt(appSpec.networks[networkIndex].appID);
         return new AppClient({ ...params, appId, appSpec });
@@ -474,8 +474,8 @@ class AppClient {
             getLineForPc);
         }
         if (errorMessage) {
-            const appId = JSON.stringify(e).match(/(?<=app=)\d+/)?.[0] || '';
-            const txId = JSON.stringify(e).match(/(?<=transaction )\S+(?=:)/)?.[0];
+            const appId = asJson(e).match(/(?<=app=)\d+/)?.[0] || '';
+            const txId = asJson(e).match(/(?<=transaction )\S+(?=:)/)?.[0];
             const error = new Error(`Runtime error when executing ${appSpec.name} (appId: ${appId}) in transaction ${txId}: ${errorMessage}`);
             error.cause = e;
             return error;
@@ -817,15 +817,15 @@ class AppClient {
      * if none provided and throws an error if neither provided */
     getSender(sender) {
         if (!sender && !this._defaultSender) {
-            throw new Error(`No sender provided and no default sender present in app client for call to app ${this._appName}`);
+            throw new Error(`No sender provided and no default sender present in app factory for call to app ${this._appName}`);
         }
         return sender ?? this._defaultSender;
     }
     /** Returns the signer for a call, using the provided signer or the `defaultSigner`
-     * if no signer was provided and the call will use default sender
+     * if no signer was provided and the sender resolves to the default sender, the call will use default signer
      * or `undefined` otherwise (so the signer is resolved from `AlgorandClient`) */
     getSigner(sender, signer) {
-        return signer ?? (!sender ? this._defaultSigner : undefined);
+        return signer ?? (!sender || sender === this._defaultSender ? this._defaultSigner : undefined);
     }
     getBareParams(params, onComplete) {
         return {