Merge pull request #547 from oasisprotocol/amela/show-eth-addr

feat(cmd/account): Show Eth addr and name if avaliable

Author: amela

cmd/account/show/show.go

@@ -54,17 +54,21 @@ var (
 			c, err := connection.Connect(ctx, npa.Network)
 			cobra.CheckErr(err)
 
-			addr, _, err := common.ResolveLocalAccountOrAddress(npa.Network, targetAddress)
+			nativeAddr, ethAddr, err := common.ResolveLocalAccountOrAddress(npa.Network, targetAddress)
 			cobra.CheckErr(err)
 
+			if name := common.FindAccountName(nativeAddr.String()); name != "" {
+				fmt.Printf("Name:             %s\n", name)
+			}
+
 			height, err := common.GetActualHeight(
 				ctx,
 				c.Consensus().Core(),
 			)
 			cobra.CheckErr(err)
 
 			ownerQuery := &staking.OwnerQuery{
-				Owner:  addr.ConsensusAddress(),
+				Owner:  nativeAddr.ConsensusAddress(),
 				Height: height,
 			}
 
@@ -73,8 +77,10 @@ var (
 
 			consensusAccount, err := c.Consensus().Staking().Account(ctx, ownerQuery)
 			cobra.CheckErr(err)
-
-			fmt.Printf("Address: %s\n", addr)
+			if ethAddr != nil {
+				fmt.Printf("Ethereum address: %s\n", ethAddr)
+			}
+			fmt.Printf("Native address:   %s\n", nativeAddr)
 			fmt.Println()
 			fmt.Printf("=== CONSENSUS LAYER (%s) ===\n", npa.NetworkName)
 			fmt.Printf("  Nonce: %d\n", consensusAccount.General.Nonce)
@@ -93,7 +99,7 @@ var (
 
 			prettyPrintAccountBalanceAndDelegationsFrom(
 				npa.Network,
-				addr,
+				nativeAddr,
 				consensusAccount.General,
 				outgoingDelegations,
 				outgoingDebondingDelegations,
@@ -105,7 +111,7 @@ var (
 				fmt.Println("  Allowances for this Account:")
 				prettyPrintAllowances(
 					npa.Network,
-					addr,
+					nativeAddr,
 					consensusAccount.General.Allowances,
 					"    ",
 					os.Stdout,
@@ -123,7 +129,7 @@ var (
 					fmt.Println("  Active Delegations to this Account:")
 					prettyPrintDelegationsTo(
 						npa.Network,
-						addr,
+						nativeAddr,
 						consensusAccount.Escrow.Active,
 						incomingDelegations,
 						"    ",
@@ -135,7 +141,7 @@ var (
 					fmt.Println("  Debonding Delegations to this Account:")
 					prettyPrintDelegationsTo(
 						npa.Network,
-						addr,
+						nativeAddr,
 						consensusAccount.Escrow.Debonding,
 						incomingDebondingDelegations,
 						"    ",
@@ -177,7 +183,7 @@ var (
 				}
 
 				// Query runtime account when a ParaTime has been configured.
-				rtBalances, err := c.Runtime(npa.ParaTime).Accounts.Balances(ctx, round, *addr)
+				rtBalances, err := c.Runtime(npa.ParaTime).Accounts.Balances(ctx, round, *nativeAddr)
 				cobra.CheckErr(err)
 
 				var hasNonZeroBalance bool
@@ -187,7 +193,7 @@ var (
 					}
 				}
 
-				nonce, err := c.Runtime(npa.ParaTime).Accounts.Nonce(ctx, round, *addr)
+				nonce, err := c.Runtime(npa.ParaTime).Accounts.Nonce(ctx, round, *nativeAddr)
 				cobra.CheckErr(err)
 				hasNonZeroNonce := nonce > 0
 
@@ -214,17 +220,17 @@ var (
 							ctx,
 							round,
 							&consensusaccounts.DelegationsQuery{
-								From: *addr,
+								From: *nativeAddr,
 							},
 						)
 						rtUndelegations, _ := c.Runtime(npa.ParaTime).ConsensusAccounts.Undelegations(
 							ctx,
 							round,
 							&consensusaccounts.UndelegationsQuery{
-								To: *addr,
+								To: *nativeAddr,
 							},
 						)
-						prettyPrintParaTimeDelegations(ctx, c, height, npa, addr, rtDelegations, rtUndelegations, "  ", os.Stdout)
+						prettyPrintParaTimeDelegations(ctx, c, height, npa, nativeAddr, rtDelegations, rtUndelegations, "  ", os.Stdout)
 					}
 				}
 			}

cmd/common/helpers.go

@@ -47,3 +47,9 @@ func GenAccountNames() types.AccountNames {
 
 	return an
 }
+
+// FindAccountName finds account's name (if exists).
+func FindAccountName(address string) string {
+	an := GenAccountNames()
+	return an[address]
+}

examples/account/show-eth.out

@@ -1,4 +1,6 @@
-Address: oasis1qzplmfaeywvtc2qnylyhk0uzcxr4y5s3euhaug7q
+Name:             eric
+Ethereum address: 0xA3243B310CfA8D4b008780BC87E0bb9f6d4FDA06
+Native address:   oasis1qzplmfaeywvtc2qnylyhk0uzcxr4y5s3euhaug7q
 
 === CONSENSUS LAYER (testnet) ===
   Nonce: 0

examples/account/show-mainnet.out

@@ -1,4 +1,5 @@
-Address: oasis1qzzd6khm3acqskpxlk9vd5044cmmcce78y5l6000
+Name:             test:cory
+Native address:   oasis1qzzd6khm3acqskpxlk9vd5044cmmcce78y5l6000
 
 === CONSENSUS LAYER (mainnet) ===
   Nonce: 0

examples/account/show-named-pool.out

@@ -1,4 +1,4 @@
-Address: oasis1qqnv3peudzvekhulf8v3ht29z4cthkhy7gkxmph5
+Native address:   oasis1qqnv3peudzvekhulf8v3ht29z4cthkhy7gkxmph5
 
 === CONSENSUS LAYER (testnet) ===
   Nonce: 0

examples/account/show-named.out

@@ -1,4 +1,5 @@
-Address: oasis1qq84sc4q0shp5c5klwklqu59evz2mg59hveg7dqx
+Name:             orlando
+Native address:   oasis1qq84sc4q0shp5c5klwklqu59evz2mg59hveg7dqx
 
 === CONSENSUS LAYER (testnet) ===
   Nonce: 0

examples/account/show-no-paratime.out

@@ -1,4 +1,5 @@
-Address: oasis1qzplmfaeywvtc2qnylyhk0uzcxr4y5s3euhaug7q
+Name:             eric
+Native address:   oasis1qzplmfaeywvtc2qnylyhk0uzcxr4y5s3euhaug7q
 
 === CONSENSUS LAYER (testnet) ===
   Nonce: 0

examples/account/show-oasis.out

@@ -1,4 +1,5 @@
-Address: oasis1qzzd6khm3acqskpxlk9vd5044cmmcce78y5l6000
+Name:             test:cory
+Native address:   oasis1qzzd6khm3acqskpxlk9vd5044cmmcce78y5l6000
 
 === CONSENSUS LAYER (testnet) ===
   Nonce: 0

examples/account/show-testnet.out

@@ -1,4 +1,5 @@
-Address: oasis1qzzd6khm3acqskpxlk9vd5044cmmcce78y5l6000
+Name:             test:cory
+Native address:   oasis1qzzd6khm3acqskpxlk9vd5044cmmcce78y5l6000
 
 === CONSENSUS LAYER (testnet) ===
   Nonce: 0

examples/account/show.out

@@ -1,4 +1,5 @@
-Address: oasis1qp87hflmelnpqhzcqcw8rhzakq4elj7jzv090p3e
+Name:             oscar
+Native address:   oasis1qp87hflmelnpqhzcqcw8rhzakq4elj7jzv090p3e
 
 === CONSENSUS LAYER (testnet) ===
   Nonce: 2