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

package/types/app-client.mjs

@@ -109,10 +109,35 @@ 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;
+            // We can't use the app ID in an error to identify new apps, so instead we check the programs
+            // to identify if this is the correct app
+            if (this.appId === 0n) {
+                if (e.sentTransactions === undefined)
+                    return e;
+                const txns = e.sentTransactions;
+                const txn = txns.find((t) => e.message.includes(t.txID()));
+                const programsDefinedAndEqual = (a, b) => {
+                    if (a === undefined || b === undefined)
+                        return false;
+                    if (a.length !== b.length)
+                        return false;
+                    for (let i = 0; i < a.length; i++) {
+                        if (a[i] !== b[i])
+                            return false;
+                    }
+                    return true;
+                };
+                if (!programsDefinedAndEqual(txn?.applicationCall?.clearProgram, this._lastCompiled.clear) ||
+                    !programsDefinedAndEqual(txn?.applicationCall?.approvalProgram, this._lastCompiled?.approval)) {
+                    return e;
+                }
+            }
+            else {
+                // 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;
@@ -132,6 +157,7 @@ class AppClient {
         this._algorand.registerErrorTransformer(this.handleCallErrors);
         this._defaultSender = typeof params.defaultSender === 'string' ? Address.fromString(params.defaultSender) : params.defaultSender;
         this._defaultSigner = params.defaultSigner;
+        this._lastCompiled = {};
         this._approvalSourceMap = params.approvalSourceMap;
         this._clearSourceMap = params.clearSourceMap;
         this._localStateMethods = (address) => this.getStateMethods(() => this.getLocalState(address), () => this._appSpec.state.keys.local, () => this._appSpec.state.maps.local);
@@ -507,9 +533,11 @@ class AppClient {
         const result = await AppClient.compile(this._appSpec, this._algorand.app, compilation);
         if (result.compiledApproval) {
             this._approvalSourceMap = result.compiledApproval.sourceMap;
+            this._lastCompiled.approval = result.compiledApproval.compiledBase64ToBytes;
         }
         if (result.compiledClear) {
             this._clearSourceMap = result.compiledClear.sourceMap;
+            this._lastCompiled.clear = result.compiledClear.compiledBase64ToBytes;
         }
         return result;
     }