1 files changed, 15 insertions, 12 deletions
diff --git a/cmd/goal/accountsList.go b/cmd/goal/accountsList.go
index bf58c6f8e..0fa2f4bff 100644
--- a/cmd/goal/accountsList.go
+++ b/cmd/goal/accountsList.go
@@ -25,7 +25,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/algorand/go-algorand/daemon/algod/api/spec/v1"
+	generatedV2 "github.com/algorand/go-algorand/daemon/algod/api/server/v2/generated"
 	"github.com/algorand/go-algorand/data/basics"
 	"github.com/algorand/go-algorand/libgoal"
 )
@@ -205,7 +205,7 @@ func (accountList *AccountsList) loadList() {
 	}
 }
 
-func (accountList *AccountsList) outputAccount(addr string, acctInfo v1.Account, multisigInfo *libgoal.MultisigInfo) {
+func (accountList *AccountsList) outputAccount(addr string, acctInfo generatedV2.Account, multisigInfo *libgoal.MultisigInfo) {
 	if acctInfo.Address == "" {
 		fmt.Printf("[n/a]\t%s\t%s\t[n/a] microAlgos", accountList.getNameByAddress(addr), addr)
 	} else {
@@ -225,25 +225,28 @@ func (accountList *AccountsList) outputAccount(addr string, acctInfo v1.Account,
 	if multisigInfo != nil {
 		fmt.Printf("\t[%d/%d multisig]", multisigInfo.Threshold, len(multisigInfo.PKs))
 	}
-	if len(acctInfo.AssetParams) > 0 {
+	if acctInfo.CreatedAssets != nil && len(*acctInfo.CreatedAssets) > 0 {
 		var out []string
-		for curid, params := range acctInfo.AssetParams {
-			_, unitName := unicodePrintable(params.UnitName)
-			out = append(out, fmt.Sprintf("%d (%d %s)", curid, params.Total, unitName))
+		for _, asset := range *acctInfo.CreatedAssets {
+			var unitName string
+			if asset.Params.UnitName != nil {
+				_, unitName = unicodePrintable(*asset.Params.UnitName)
+			}
+			out = append(out, fmt.Sprintf("%d (%d %s)", asset.Index, asset.Params.Total, unitName))
 		}
 		fmt.Printf("\t[created asset IDs: %s]", strings.Join(out, ", "))
 	}
-	if len(acctInfo.AppParams) > 0 {
+	if acctInfo.CreatedApps != nil && len(*acctInfo.CreatedApps) > 0 {
 		var out []string
-		for aid := range acctInfo.AppParams {
-			out = append(out, fmt.Sprintf("%d", aid))
+		for _, app := range *acctInfo.CreatedApps {
+			out = append(out, fmt.Sprintf("%d", app.Id))
 		}
 		fmt.Printf("\t[created app IDs: %s]", strings.Join(out, ", "))
 	}
-	if len(acctInfo.AppLocalStates) > 0 {
+	if acctInfo.AppsLocalState != nil && len(*acctInfo.AppsLocalState) > 0 {
 		var out []string
-		for aid := range acctInfo.AppLocalStates {
-			out = append(out, fmt.Sprintf("%d", aid))
+		for _, app := range *acctInfo.AppsLocalState {
+			out = append(out, fmt.Sprintf("%d", app.Id))
 		}
 		fmt.Printf("\t[opted in app IDs: %s]", strings.Join(out, ", "))
 	}