Display extra pages in goal info commands #2763
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,7 +31,7 @@ import ( | |
| "github.com/algorand/go-algorand/config" | ||
| "github.com/algorand/go-algorand/crypto" | ||
| "github.com/algorand/go-algorand/crypto/passphrase" | ||
| generatedV2 "github.com/algorand/go-algorand/daemon/algod/api/server/v2/generated" | ||
| algodAcct "github.com/algorand/go-algorand/data/account" | ||
| "github.com/algorand/go-algorand/data/basics" | ||
| "github.com/algorand/go-algorand/data/transactions" | ||
|
|
@@ -476,7 +476,7 @@ var listCmd = &cobra.Command{ | |
|
|
||
| // For each address, request information about it from algod | ||
| for _, addr := range addrs { | ||
| response, _ := client.AccountInformationV2(addr.Addr) | ||
| // it's okay to proceed without algod info | ||
|
|
||
| // Display this information to the user | ||
|
|
@@ -512,7 +512,7 @@ var infoCmd = &cobra.Command{ | |
| Run: func(cmd *cobra.Command, args []string) { | ||
| dataDir := ensureSingleDataDir() | ||
| client := ensureAlgodClient(dataDir) | ||
| response, err := client.AccountInformationV2(accountAddress) | ||
| if err != nil { | ||
| reportErrorf(errorRequestFail, err) | ||
| } | ||
|
|
@@ -524,36 +524,50 @@ var infoCmd = &cobra.Command{ | |
| }, | ||
| } | ||
|
|
||
| func printAccountInfo(client libgoal.Client, address string, account generatedV2.Account) bool { | ||
| var createdAssets []generatedV2.Asset | ||
| if account.CreatedAssets != nil { | ||
| createdAssets = make([]generatedV2.Asset, len(*account.CreatedAssets)) | ||
| for i, asset := range *account.CreatedAssets { | ||
| createdAssets[i] = asset | ||
| } | ||
| sort.Slice(createdAssets, func(i, j int) bool { | ||
| return createdAssets[i].Index < createdAssets[j].Index | ||
| }) | ||
| } | ||
|
|
||
| var heldAssets []generatedV2.AssetHolding | ||
| if account.Assets != nil { | ||
| heldAssets = make([]generatedV2.AssetHolding, len(*account.Assets)) | ||
| for i, assetHolding := range *account.Assets { | ||
| heldAssets[i] = assetHolding | ||
| } | ||
| sort.Slice(heldAssets, func(i, j int) bool { | ||
| return heldAssets[i].AssetId < heldAssets[j].AssetId | ||
| }) | ||
| } | ||
|
|
||
| var createdApps []generatedV2.Application | ||
| if account.CreatedApps != nil { | ||
| createdApps = make([]generatedV2.Application, len(*account.CreatedApps)) | ||
| for i, app := range *account.CreatedApps { | ||
| createdApps[i] = app | ||
| } | ||
| sort.Slice(createdApps, func(i, j int) bool { | ||
| return createdApps[i].Id < createdApps[j].Id | ||
| }) | ||
| } | ||
|
|
||
| var optedInApps []generatedV2.ApplicationLocalState | ||
| if account.AppsLocalState != nil { | ||
| optedInApps = make([]generatedV2.ApplicationLocalState, len(*account.AppsLocalState)) | ||
| for i, appLocalState := range *account.AppsLocalState { | ||
| optedInApps[i] = appLocalState | ||
| } | ||
| sort.Slice(optedInApps, func(i, j int) bool { | ||
| return optedInApps[i].Id < optedInApps[j].Id | ||
| }) | ||
| } | ||
|
|
||
| report := &strings.Builder{} | ||
| errorReport := &strings.Builder{} | ||
|
|
@@ -563,103 +577,116 @@ func printAccountInfo(client libgoal.Client, address string, account v1.Account) | |
| if len(createdAssets) == 0 { | ||
| fmt.Fprintln(report, "\t<none>") | ||
| } | ||
| for _, createdAsset := range createdAssets { | ||
| name := "<unnamed>" | ||
| if createdAsset.Params.Name != nil { | ||
| _, name = unicodePrintable(*createdAsset.Params.Name) | ||
|
Contributor
Author
There was a problem hiding this comment. It may be unnecessary to pipe the string fields through |
||
| } | ||
|
|
||
| units := "units" | ||
| if createdAsset.Params.UnitName != nil { | ||
| _, units = unicodePrintable(*createdAsset.Params.UnitName) | ||
| } | ||
|
|
||
| total := assetDecimalsFmt(createdAsset.Params.Total, uint32(createdAsset.Params.Decimals)) | ||
|
|
||
| url := "" | ||
| if createdAsset.Params.Url != nil { | ||
| _, safeURL := unicodePrintable(*createdAsset.Params.Url) | ||
| url = fmt.Sprintf(", %s", safeURL) | ||
| } | ||
|
|
||
| fmt.Fprintf(report, "\tID %d, %s, supply %s %s%s\n", createdAsset.Index, name, total, units, url) | ||
| } | ||
|
|
||
| fmt.Fprintln(report, "Held Assets:") | ||
| if len(heldAssets) == 0 { | ||
| fmt.Fprintln(report, "\t<none>") | ||
| } | ||
| for _, assetHolding := range heldAssets { | ||
| assetParams, err := client.AssetInformationV2(assetHolding.AssetId) | ||
| if err != nil { | ||
| hasError = true | ||
| fmt.Fprintf(errorReport, "Error: Unable to retrieve asset information for asset %d referred to by account %s: %v\n", assetHolding.AssetId, address, err) | ||
| fmt.Fprintf(report, "\tID %d, error\n", assetHolding.AssetId) | ||
| } | ||
|
|
||
| amount := assetDecimalsFmt(assetHolding.Amount, uint32(assetParams.Params.Decimals)) | ||
|
|
||
| assetName := "<unnamed>" | ||
| if assetParams.Params.Name != nil { | ||
| _, assetName = unicodePrintable(*assetParams.Params.Name) | ||
| } | ||
|
|
||
| unitName := "units" | ||
| if assetParams.Params.UnitName != nil { | ||
| _, unitName = unicodePrintable(*assetParams.Params.UnitName) | ||
| } | ||
|
|
||
| frozen := "" | ||
| if assetHolding.IsFrozen { | ||
| frozen = " (frozen)" | ||
| } | ||
|
|
||
| fmt.Fprintf(report, "\tID %d, %s, balance %s %s%s\n", assetHolding.AssetId, assetName, amount, unitName, frozen) | ||
| } | ||
|
|
||
| fmt.Fprintln(report, "Created Apps:") | ||
| if len(createdApps) == 0 { | ||
| fmt.Fprintln(report, "\t<none>") | ||
| } | ||
| for _, app := range createdApps { | ||
| allocatedInts := uint64(0) | ||
| allocatedBytes := uint64(0) | ||
| if app.Params.GlobalStateSchema != nil { | ||
| allocatedInts = app.Params.GlobalStateSchema.NumUint | ||
| allocatedBytes = app.Params.GlobalStateSchema.NumByteSlice | ||
| } | ||
|
|
||
| usedInts := uint64(0) | ||
| usedBytes := uint64(0) | ||
| if app.Params.GlobalState != nil { | ||
| for _, value := range *app.Params.GlobalState { | ||
| if basics.TealType(value.Value.Type) == basics.TealUintType { | ||
| usedInts++ | ||
| } else { | ||
| usedBytes++ | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extraPages := "" | ||
| if app.Params.ExtraProgramPages != nil && *app.Params.ExtraProgramPages != 0 { | ||
| plural := "" | ||
| if *app.Params.ExtraProgramPages != 1 { | ||
| plural = "s" | ||
| } | ||
| extraPages = fmt.Sprintf(", %d extra page%s", *app.Params.ExtraProgramPages, plural) | ||
| } | ||
|
|
||
| fmt.Fprintf(report, "\tID %d%s, global state used %d/%d uints, %d/%d byte slices\n", app.Id, extraPages, usedInts, allocatedInts, usedBytes, allocatedBytes) | ||
| } | ||
|
|
||
| fmt.Fprintln(report, "Opted In Apps:") | ||
| if len(optedInApps) == 0 { | ||
| fmt.Fprintln(report, "\t<none>") | ||
| } | ||
| for _, localState := range optedInApps { | ||
| allocatedInts := localState.Schema.NumUint | ||
| allocatedBytes := localState.Schema.NumByteSlice | ||
|
|
||
| usedInts := uint64(0) | ||
| usedBytes := uint64(0) | ||
| if localState.KeyValue != nil { | ||
| for _, value := range *localState.KeyValue { | ||
| if basics.TealType(value.Value.Type) == basics.TealUintType { | ||
| usedInts++ | ||
| } else { | ||
| usedBytes++ | ||
| } | ||
| } | ||
| } | ||
| fmt.Fprintf(report, "\tID %d, local state used %d/%d uints, %d/%d byte slices\n", localState.Id, usedInts, allocatedInts, usedBytes, allocatedBytes) | ||
| } | ||
|
|
||
| if hasError { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you summarize what we're doing with versioning that forces changes in this PR? We don't have to increment the version for changes like this, right? Maybe you're just migrating to the new version that we previously had to do?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually I had to upgrade to using the v2 endpoint because v1 does not return extra pages values for accounts.