@algorandfoundation/algokit-utils 7.0.0 → 8.0.0-beta.1

package/types/app-client.mjs

@@ -1,4 +1,4 @@
-import algosdk from 'algosdk';
+import algosdk, { Address } from 'algosdk';
 import { Buffer } from 'buffer';
 import { compileTeal, createApp, updateApp, callApp, getAppGlobalState, getAppLocalState, getAppBoxNames, getAppBoxValue, getAppBoxValueFromABIType } from '../app.mjs';
 import { replaceDeployTimeControlParams, performTemplateSubstitution, deployApp, getCreatorAppsByName } from '../app-deploy.mjs';
@@ -17,7 +17,7 @@ var AtomicTransactionComposer = algosdk.AtomicTransactionComposer;
 var getApplicationAddress = algosdk.getApplicationAddress;
 var Indexer = algosdk.Indexer;
 var OnApplicationComplete = algosdk.OnApplicationComplete;
-var SourceMap = algosdk.SourceMap;
+var SourceMap = algosdk.ProgramSourceMap;
 /**
  * Determines deploy time control (UPDATABLE, DELETABLE) value by inspecting application specification
  * @param approval TEAL Approval program, not the base64 version found on the appSpec
@@ -100,7 +100,7 @@ class AppClient {
         this._appSpec = AppClient.normaliseAppSpec(params.appSpec);
         this._appName = params.appName ?? this._appSpec.name;
         this._algorand = params.algorand;
-        this._defaultSender = params.defaultSender;
+        this._defaultSender = typeof params.defaultSender === 'string' ? Address.fromString(params.defaultSender) : params.defaultSender;
         this._defaultSigner = params.defaultSigner;
         this._approvalSourceMap = params.approvalSourceMap;
         this._clearSourceMap = params.clearSourceMap;
@@ -204,7 +204,7 @@ class AppClient {
     get appAddress() {
         return this._appAddress;
     }
-    /** The name of the app (from the ARC-32 / ARC-56 app spec). */
+    /** The name of the app (from the ARC-32 / ARC-56 app spec or override). */
     get appName() {
         return this._appName;
     }
@@ -457,7 +457,7 @@ class AppClient {
         const errorMessage = sourceInfo?.errorMessage;
         // If we have the source we can display the TEAL in the error message
         if (appSpec.source) {
-            let getLineForPc = (inputPc) => sourceMap?.getLineForPc?.(inputPc);
+            let getLineForPc = (inputPc) => sourceMap?.getLocationForPc?.(inputPc)?.line;
             // If the SourceMap is not defined, we need to provide our own function for going from a PC to TEAL based on ARC56 SourceInfo[]
             if (sourceMap === undefined) {
                 getLineForPc = (inputPc) => {
@@ -819,7 +819,7 @@ class AppClient {
         if (!sender && !this._defaultSender) {
             throw new Error(`No sender provided and no default sender present in app client for call to app ${this._appName}`);
         }
-        return sender ?? this._defaultSender;
+        return typeof sender === 'string' ? Address.fromString(sender) : (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
@@ -1024,7 +1024,7 @@ class ApplicationClient {
         }
         else {
             this._appId = 0;
-            this._creator = appIdentifier.creatorAddress;
+            this._creator = appIdentifier.creatorAddress?.toString();
             if (appIdentifier.findExistingUsing instanceof Indexer) {
                 this.indexer = appIdentifier.findExistingUsing;
             }
@@ -1035,7 +1035,7 @@ class ApplicationClient {
                 this.existingDeployments = appIdentifier.findExistingUsing;
             }
         }
-        this._appAddress = algosdk.getApplicationAddress(this._appId);
+        this._appAddress = algosdk.getApplicationAddress(this._appId).toString();
         this.sender = sender;
         this.params = params;
     }
@@ -1215,7 +1215,7 @@ class ApplicationClient {
             if (result.confirmation) {
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 this._appId = result.confirmation.applicationIndex;
-                this._appAddress = getApplicationAddress(this._appId);
+                this._appAddress = getApplicationAddress(this._appId).toString();
             }
             return { ...result, ...{ compiledApproval: approvalCompiled, compiledClear: clearCompiled } };
         }
@@ -1580,7 +1580,7 @@ class ApplicationClient {
             if (!app) {
                 return {
                     appId: 0,
-                    appAddress: getApplicationAddress(0),
+                    appAddress: getApplicationAddress(0).toString(),
                 };
             }
             return app;
@@ -1607,7 +1607,7 @@ class ApplicationClient {
                 .toString()
                 .split('\n'), 
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            (pc) => (isClear ? this._clearSourceMap : this._approvalSourceMap).getLineForPc(pc));
+            (pc) => (isClear ? this._clearSourceMap : this._approvalSourceMap)?.getLocationForPc(pc)?.line);
         else
             return e;
     }