@algorandfoundation/algokit-utils 9.0.2-beta.1 → 9.1.0-beta.1

package/types/app-client.mjs

@@ -107,11 +107,29 @@ class AppClient {
      * })
      */
     constructor(params) {
+        /** Make the given call and catch any errors, augmenting with debugging information before re-throwing. */
+        this.handleCallErrors = async (e) => {
+            // Only handle errors for this app.
+            const appIdString = `app=${this._appId.toString()}`;
+            if (!e.message.includes(appIdString))
+                return e;
+            const logicError = await this.exposeLogicError(e);
+            if (logicError instanceof LogicError) {
+                let currentLine = logicError.teal_line - logicError.lines - 1;
+                const stackWithLines = logicError.stack
+                    ?.split('\n')
+                    .map((line) => `${(currentLine += 1)}: ${line}`)
+                    .join('\n');
+                Config.logger.error(`${logicError.message}\n\n${stackWithLines}`);
+            }
+            return logicError;
+        };
         this._appId = params.appId;
         this._appAddress = algosdk.getApplicationAddress(this._appId);
         this._appSpec = AppClient.normaliseAppSpec(params.appSpec);
         this._appName = params.appName ?? this._appSpec.name;
         this._algorand = params.algorand;
+        this._algorand.registerErrorTransformer(this.handleCallErrors);
         this._defaultSender = typeof params.defaultSender === 'string' ? Address.fromString(params.defaultSender) : params.defaultSender;
         this._defaultSigner = params.defaultSigner;
         this._approvalSourceMap = params.approvalSourceMap;
@@ -725,29 +743,29 @@ class AppClient {
             update: async (params) => {
                 const compiled = await this.compile(params);
                 return {
-                    ...(await this.handleCallErrors(async () => this._algorand.send.appUpdate(await this.params.bare.update(params)))),
+                    ...(await this._algorand.send.appUpdate(await this.params.bare.update(params))),
                     ...compiled,
                 };
             },
             /** Signs and sends an opt-in call */
             optIn: (params) => {
-                return this.handleCallErrors(() => this._algorand.send.appCall(this.params.bare.optIn(params)));
+                return this._algorand.send.appCall(this.params.bare.optIn(params));
             },
             /** Signs and sends a delete call */
             delete: (params) => {
-                return this.handleCallErrors(() => this._algorand.send.appDelete(this.params.bare.delete(params)));
+                return this._algorand.send.appDelete(this.params.bare.delete(params));
             },
             /** Signs and sends a clear state call */
             clearState: (params) => {
-                return this.handleCallErrors(() => this._algorand.send.appCall(this.params.bare.clearState(params)));
+                return this._algorand.send.appCall(this.params.bare.clearState(params));
             },
             /** Signs and sends a close out call */
             closeOut: (params) => {
-                return this.handleCallErrors(() => this._algorand.send.appCall(this.params.bare.closeOut(params)));
+                return this._algorand.send.appCall(this.params.bare.closeOut(params));
             },
             /** Signs and sends a call (defaults to no-op) */
             call: (params) => {
-                return this.handleCallErrors(() => this._algorand.send.appCall(this.params.bare.call(params)));
+                return this._algorand.send.appCall(this.params.bare.call(params));
             },
         };
     }
@@ -826,7 +844,7 @@ class AppClient {
             update: async (params) => {
                 const compiled = await this.compile(params);
                 return {
-                    ...(await this.handleCallErrors(async () => this.processMethodCallReturn(this._algorand.send.appUpdateMethodCall(await this.params.update({ ...params })), getArc56Method(params.method, this._appSpec)))),
+                    ...(await this.processMethodCallReturn(this._algorand.send.appUpdateMethodCall(await this.params.update({ ...params })), getArc56Method(params.method, this._appSpec))),
                     ...compiled,
                 };
             },
@@ -835,24 +853,24 @@ class AppClient {
              * @param params The parameters for the opt-in ABI method call
              * @returns The result of sending the opt-in ABI method call
              */
-            optIn: (params) => {
-                return this.handleCallErrors(async () => this.processMethodCallReturn(this._algorand.send.appCallMethodCall(await this.params.optIn(params)), getArc56Method(params.method, this._appSpec)));
+            optIn: async (params) => {
+                return this.processMethodCallReturn(this._algorand.send.appCallMethodCall(await this.params.optIn(params)), getArc56Method(params.method, this._appSpec));
             },
             /**
              * Sign and send transactions for a delete ABI call
              * @param params The parameters for the delete ABI method call
              * @returns The result of sending the delete ABI method call
              */
-            delete: (params) => {
-                return this.handleCallErrors(async () => this.processMethodCallReturn(this._algorand.send.appDeleteMethodCall(await this.params.delete(params)), getArc56Method(params.method, this._appSpec)));
+            delete: async (params) => {
+                return this.processMethodCallReturn(this._algorand.send.appDeleteMethodCall(await this.params.delete(params)), getArc56Method(params.method, this._appSpec));
             },
             /**
              * Sign and send transactions for a close out ABI call
              * @param params The parameters for the close out ABI method call
              * @returns The result of sending the close out ABI method call
              */
-            closeOut: (params) => {
-                return this.handleCallErrors(async () => this.processMethodCallReturn(this._algorand.send.appCallMethodCall(await this.params.closeOut(params)), getArc56Method(params.method, this._appSpec)));
+            closeOut: async (params) => {
+                return this.processMethodCallReturn(this._algorand.send.appCallMethodCall(await this.params.closeOut(params)), getArc56Method(params.method, this._appSpec));
             },
             /**
              * Sign and send transactions for a call (defaults to no-op)
@@ -902,7 +920,7 @@ class AppClient {
                         throw e;
                     }
                 }
-                return this.handleCallErrors(async () => this.processMethodCallReturn(this._algorand.send.appCallMethodCall(await this.params.call(params)), getArc56Method(params.method, this._appSpec)));
+                return this.processMethodCallReturn(this._algorand.send.appCallMethodCall(await this.params.call(params)), getArc56Method(params.method, this._appSpec));
             },
         };
     }
@@ -994,24 +1012,6 @@ class AppClient {
             args,
         };
     }
-    /** Make the given call and catch any errors, augmenting with debugging information before re-throwing. */
-    async handleCallErrors(call) {
-        try {
-            return await call();
-        }
-        catch (e) {
-            const logicError = await this.exposeLogicError(e);
-            if (logicError instanceof LogicError) {
-                let currentLine = logicError.teal_line - logicError.lines - 1;
-                const stackWithLines = logicError.stack
-                    ?.split('\n')
-                    .map((line) => `${(currentLine += 1)}: ${line}`)
-                    .join('\n');
-                Config.logger.error(`${logicError.message}\n\n${stackWithLines}`);
-            }
-            throw logicError;
-        }
-    }
     getBoxMethods() {
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         const that = this;