refactor: unify address formatting context generation

Author: uniyalabhishek

cmd/account/show/allowances.go

@@ -62,8 +62,8 @@ func prettyPrintAllowanceDescriptions(
 	// element so we can align all values.
 	lenLongest := lenLongestString(beneficiaryFieldName, amountFieldName)
 
-	// Precompute address formatting context for efficiency (network-aware for paratime names).
-	addrCtx := common.GenAddressFormatContextForNetwork(network)
+	// Precompute address formatting context for efficiency.
+	addrCtx := common.GenAddressFormatContext()
 
 	for _, desc := range allowDescriptions {
 		prettyAddr := common.PrettyAddressWith(addrCtx, desc.beneficiary.String())

cmd/account/show/delegations.go

@@ -110,8 +110,8 @@ func prettyPrintDelegationDescriptions(
 		lenLongest = lenLongestString(addressFieldName, amountFieldName, endTimeFieldName)
 	}
 
-	// Precompute address formatting context for efficiency (network-aware for paratime names).
-	addrCtx := common.GenAddressFormatContextForNetwork(network)
+	// Precompute address formatting context for efficiency.
+	addrCtx := common.GenAddressFormatContext()
 
 	for _, desc := range delDescriptions {
 		prettyAddr := common.PrettyAddressWith(addrCtx, desc.address.String())

cmd/account/show/show.go

@@ -91,20 +91,23 @@ var (
 			nativeAddr, ethAddr, err := common.ResolveLocalAccountOrAddress(npa.Network, targetAddress)
 			cobra.CheckErr(err)
 			out.NativeAddress = nativeAddr
-			out.Name = common.FindAccountNameForNetwork(npa.Network, nativeAddr.String())
+			addrCtx := common.GenAddressFormatContext()
+			out.Name = addrCtx.Names[nativeAddr.String()]
 
-			// If eth address is not available, try to get it from wallet config (no unlock required).
+			// If eth address is not available, try to get it from locally-known mappings
+			// (wallet/addressbook/test accounts). No unlock required.
 			if ethAddr == nil {
-				for _, walletCfg := range cfg.Wallet.All {
-					if walletCfg.Address == nativeAddr.String() {
-						ethAddr = walletCfg.GetEthAddress()
-						break
-					}
+				if ethHex := addrCtx.Eth[nativeAddr.String()]; ethHex != "" && ethCommon.IsHexAddress(ethHex) {
+					eth := ethCommon.HexToAddress(ethHex)
+					ethAddr = &eth
 				}
 			}
 
 			// If eth address is still not available and the user selected a wallet account,
 			// load it (may require passphrase) to derive and persist eth_address metadata.
+			//
+			// NOTE: We only do this for an explicitly selected wallet account to avoid surprising
+			// interactive prompts when a user provides an arbitrary address.
 			if ethAddr == nil && walletNameForEth != "" {
 				if walletCfg, ok := cfg.Wallet.All[walletNameForEth]; ok && walletCfg.SupportsEthAddress() {
 					// Avoid prompting in non-interactive contexts (e.g. piping output).

cmd/common/helpers.go

@@ -3,12 +3,12 @@ package common
 import (
 	"fmt"
 	"os"
+	"sort"
 
 	ethCommon "github.com/ethereum/go-ethereum/common"
 	"github.com/spf13/cobra"
 
 	staking "github.com/oasisprotocol/oasis-core/go/staking/api"
-	configSdk "github.com/oasisprotocol/oasis-sdk/client-sdk/go/config"
 	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/helpers"
 	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/testing"
 	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/types"
@@ -46,17 +46,12 @@ func CheckForceErr(err interface{}) {
 	cobra.CheckErr(errMsg)
 }
 
-// GenAccountNames generates a map of all addresses -> account name for pretty printing.
-// Priority order (later entries overwrite earlier): test accounts < addressbook < wallet.
-// This ensures wallet identity takes precedence over addressbook labels for the same address.
+// GenAccountNames generates a map of all known native addresses -> account name for pretty printing.
+// It includes test accounts, configured networks (paratimes/ROFL defaults), addressbook and wallet.
+//
+// Priority order (later entries overwrite earlier):
+// test accounts < network entries < addressbook < wallet.
 func GenAccountNames() types.AccountNames {
-	return GenAccountNamesForNetwork(nil)
-}
-
-// GenAccountNamesForNetwork generates a map of all addresses -> account name for pretty printing,
-// including network-specific entries (paratimes, ROFL providers) when a network is provided.
-// Priority order (later entries overwrite earlier): test accounts < network entries < addressbook < wallet.
-func GenAccountNamesForNetwork(net *configSdk.Network) types.AccountNames {
 	an := types.AccountNames{}
 
 	// Test accounts have lowest priority.
@@ -65,15 +60,34 @@ func GenAccountNamesForNetwork(net *configSdk.Network) types.AccountNames {
 	}
 
 	// Network-derived entries (paratimes, ROFL providers) have second-lowest priority.
-	if net != nil {
+	cfg := config.Global()
+	netNames := make([]string, 0, len(cfg.Networks.All))
+	for name := range cfg.Networks.All {
+		netNames = append(netNames, name)
+	}
+	sort.Strings(netNames)
+	for _, netName := range netNames {
+		net := cfg.Networks.All[netName]
+		if net == nil {
+			continue
+		}
+
 		// Include ParaTime runtime addresses as paratime:<name>.
-		for ptName, pt := range net.ParaTimes.All {
+		ptNames := make([]string, 0, len(net.ParaTimes.All))
+		for ptName := range net.ParaTimes.All {
+			ptNames = append(ptNames, ptName)
+		}
+		sort.Strings(ptNames)
+		for _, ptName := range ptNames {
+			pt := net.ParaTimes.All[ptName]
+			if pt == nil {
+				continue
+			}
+
 			rtAddr := types.NewAddressFromConsensus(staking.NewRuntimeAddress(pt.Namespace()))
 			an[rtAddr.String()] = fmt.Sprintf("paratime:%s", ptName)
-		}
 
-		// Include ROFL default provider addresses as rofl:provider:<paratime>.
-		for ptName, pt := range net.ParaTimes.All {
+			// Include ROFL default provider addresses as rofl:provider:<paratime>.
 			if svc, ok := buildRoflProvider.DefaultRoflServices[pt.ID]; ok {
 				if svc.Provider != "" {
 					if a, _, err := helpers.ResolveEthOrOasisAddress(svc.Provider); err == nil && a != nil {
@@ -85,12 +99,12 @@ func GenAccountNamesForNetwork(net *configSdk.Network) types.AccountNames {
 	}
 
 	// Addressbook entries have medium priority.
-	for name, acc := range config.Global().AddressBook.All {
+	for name, acc := range cfg.AddressBook.All {
 		an[acc.GetAddress().String()] = name
 	}
 
 	// Wallet entries have highest priority.
-	for name, acc := range config.Global().Wallet.All {
+	for name, acc := range cfg.Wallet.All {
 		an[acc.GetAddress().String()] = name
 	}
 
@@ -103,27 +117,17 @@ func FindAccountName(address string) string {
 	return an[address]
 }
 
-// FindAccountNameForNetwork finds account's name in the context of a specific network.
-func FindAccountNameForNetwork(net *configSdk.Network, address string) string {
-	an := GenAccountNamesForNetwork(net)
-	return an[address]
-}
-
 // AddressFormatContext contains precomputed maps for address formatting.
 type AddressFormatContext struct {
 	// Names maps native address string to account name.
 	Names types.AccountNames
-	// Eth maps native address string to Ethereum hex address string (if known).
+	// Eth maps native address string to Ethereum hex address string, if known.
+	// This is optional metadata coming from wallet/addressbook/test accounts (and never derived from chain state).
 	Eth map[string]string
 }
 
 // GenAccountEthMap generates a map of native address string -> eth hex address (if known).
 func GenAccountEthMap() map[string]string {
-	return GenAccountEthMapForNetwork(nil)
-}
-
-// GenAccountEthMapForNetwork generates a map of native address string -> eth hex address (if known).
-func GenAccountEthMapForNetwork(_ *configSdk.Network) map[string]string {
 	eth := make(map[string]string)
 
 	// From test accounts.
@@ -152,15 +156,9 @@ func GenAccountEthMapForNetwork(_ *configSdk.Network) map[string]string {
 
 // GenAddressFormatContext builds both name and eth address maps for formatting.
 func GenAddressFormatContext() AddressFormatContext {
-	return GenAddressFormatContextForNetwork(nil)
-}
-
-// GenAddressFormatContextForNetwork builds both name and eth address maps for formatting,
-// including network-specific entries when a network is provided.
-func GenAddressFormatContextForNetwork(net *configSdk.Network) AddressFormatContext {
 	return AddressFormatContext{
-		Names: GenAccountNamesForNetwork(net),
-		Eth:   GenAccountEthMapForNetwork(net),
+		Names: GenAccountNames(),
+		Eth:   GenAccountEthMap(),
 	}
 }
 
@@ -233,10 +231,3 @@ func PrettyResolvedAddressWith(ctx AddressFormatContext, nativeAddr *types.Addre
 func PrettyAddress(addr string) string {
 	return PrettyAddressWith(GenAddressFormatContext(), addr)
 }
-
-// PrettyAddressForNetwork formats an address for display with network context.
-// This includes network-derived names like paratime addresses and ROFL providers.
-func PrettyAddressForNetwork(net *configSdk.Network, addr types.Address) string {
-	ctx := GenAddressFormatContextForNetwork(net)
-	return PrettyAddressWith(ctx, addr.String())
-}

cmd/common/json.go

@@ -173,8 +173,8 @@ func PrettyPrint(npa *NPASelection, prefix string, blob interface{}) string {
 		}
 		ctx = context.WithValue(ctx, signature.ContextKeySigContext, &sigCtx)
 
-		// Provide network-aware names and native->ETH mapping for address formatting.
-		addrCtx := GenAddressFormatContextForNetwork(npa.Network)
+		// Provide locally-known names and native->ETH mapping for address formatting.
+		addrCtx := GenAddressFormatContext()
 		ctx = context.WithValue(ctx, types.ContextKeyAccountNames, addrCtx.Names)
 		ctx = context.WithValue(ctx, types.ContextKeyAccountEthMap, addrCtx.Eth)
 

cmd/contract.go

@@ -59,7 +59,7 @@ var (
 			inst, err := conn.Runtime(npa.ParaTime).Contracts.Instance(ctx, client.RoundLatest, contracts.InstanceID(instanceID))
 			cobra.CheckErr(err)
 
-			addrCtx := common.GenAddressFormatContextForNetwork(npa.Network)
+			addrCtx := common.GenAddressFormatContext()
 
 			fmt.Printf("ID:              %d\n", inst.ID)
 			fmt.Printf("Code ID:         %d\n", inst.CodeID)
@@ -89,7 +89,7 @@ var (
 			code, err := conn.Runtime(npa.ParaTime).Contracts.Code(ctx, client.RoundLatest, contracts.CodeID(codeID))
 			cobra.CheckErr(err)
 
-			addrCtx := common.GenAddressFormatContextForNetwork(npa.Network)
+			addrCtx := common.GenAddressFormatContext()
 
 			fmt.Printf("ID:                 %d\n", code.ID)
 			fmt.Printf("Hash:               %s\n", code.Hash)

cmd/network/governance/list.go

@@ -27,7 +27,7 @@ var govListCmd = &cobra.Command{
 		conn, err := connection.Connect(ctx, npa.Network)
 		cobra.CheckErr(err)
 
-		addrCtx := common.GenAddressFormatContextForNetwork(npa.Network)
+		addrCtx := common.GenAddressFormatContext()
 
 		table := table.New()
 		table.Header("ID", "Kind", "Submitter", "Created At", "Closes At", "State")

cmd/network/governance/show.go

@@ -54,7 +54,7 @@ var (
 		Run: func(_ *cobra.Command, args []string) {
 			cfg := cliConfig.Global()
 			npa := common.GetNPASelection(cfg)
-			addrCtx := common.GenAddressFormatContextForNetwork(npa.Network)
+			addrCtx := common.GenAddressFormatContext()
 
 			// Determine the proposal ID to query.
 			proposalID, err := strconv.ParseUint(args[0], 10, 64)

cmd/network/show.go

@@ -49,7 +49,7 @@ func prettyPrintEntityNodes(ctx context.Context, npa *common.NPASelection, staki
 		return err
 	}
 
-	addrCtx := common.GenAddressFormatContextForNetwork(npa.Network)
+	addrCtx := common.GenAddressFormatContext()
 
 	fmt.Printf("=== ENTITY ===\n")
 

cmd/paratime/show.go

@@ -203,7 +203,7 @@ var (
 							fmt.Printf("Type:      %d\n", ethTx.Type())
 							toStr := "<contract creation>"
 							if to := ethTx.To(); to != nil {
-								addrCtx := common.GenAddressFormatContextForNetwork(npa.Network)
+								addrCtx := common.GenAddressFormatContext()
 								toStr = common.PrettyAddressWith(addrCtx, to.Hex())
 							}
 							fmt.Printf("To:        %s\n", toStr)