feat_: Update alias generated

- Changed from the 3-words name to be the compressed key with an ellipsis
- Update the shortened compressed key to be consistent with the alias

Author: ulisesmac

api/multiformat/utils.go

@@ -18,7 +18,7 @@ const (
 	secp256k1KeyType   = 0xe7
 	bls12p381g1KeyType = 0xea
 	bls12p381g2KeyType = 0xeb
-	legacyKeyLength    = 132
+	LegacyKeyLength    = 132
 )
 
 // SerializePublicKey serialises a non-serialised multibase encoded multicodec identified EC public key
@@ -70,7 +70,7 @@ func DeserializePublicKey(key, outputBase string) (string, error) {
 // SerializeLegacyKey converts a secp251k1 uncompressed key to
 // a base58 compressed key
 func SerializeLegacyKey(key string) (string, error) {
-	if len(key) != legacyKeyLength {
+	if len(key) != LegacyKeyLength {
 		return "", errors.New("invalid key length")
 	}
 

protocol/contact.go

@@ -15,6 +15,7 @@ import (
 	multiaccountscommon "github.com/status-im/status-go/multiaccounts/common"
 	"github.com/status-im/status-go/multiaccounts/settings"
 	"github.com/status-im/status-go/protocol/common"
+	"github.com/status-im/status-go/protocol/identity/alias"
 	"github.com/status-im/status-go/protocol/protobuf"
 	"github.com/status-im/status-go/protocol/verification"
 )
@@ -363,16 +364,8 @@ func BuildContactFromPublicKey(publicKey *ecdsa.PublicKey) (*Contact, error) {
 	return buildContact(id, publicKey)
 }
 
-func getShortenedCompressedKey(publicKey string) string {
-	if len(publicKey) > 9 {
-		firstPart := publicKey[0:3]
-		ellipsis := "..."
-		publicKeySize := len(publicKey)
-		lastPart := publicKey[publicKeySize-6 : publicKeySize]
-		abbreviatedKey := fmt.Sprintf("%s%s%s", firstPart, ellipsis, lastPart)
-		return abbreviatedKey
-	}
-	return ""
+func getShortenedCompressedKey(compressedKey string) string {
+	return alias.ShortenedCompressedKey(compressedKey)
 }
 
 func buildContact(publicKeyString string, publicKey *ecdsa.PublicKey) (*Contact, error) {

protocol/identity/alias/generate.go

@@ -2,11 +2,9 @@ package alias
 
 import (
 	"crypto/ecdsa"
-	"encoding/hex"
 	"fmt"
-	"strings"
 
-	"github.com/status-im/status-go/eth-node/crypto"
+	"github.com/status-im/status-go/api/multiformat"
 )
 
 const poly uint64 = 0xB8
@@ -32,16 +30,31 @@ func GenerateFromPublicKey(publicKey *ecdsa.PublicKey) string {
 // GenerateFromPublicKeyString returns the 3 words name given a public key
 // prefixed with 0x
 func GenerateFromPublicKeyString(publicKeyString string) (string, error) {
-	pk := strings.TrimPrefix(publicKeyString, "0x")
-	publicKeyBytes, err := hex.DecodeString(pk)
-	if err != nil {
-		return "", err
+	var fixedPublicKey string
+	if len(publicKeyString) == multiformat.LegacyKeyLength {
+		fixedPublicKey = publicKeyString
+	} else {
+		// Attempt to fix a maybe public key without the 0x prefix
+		if len(publicKeyString) >= 2 && publicKeyString[:2] != "0x" {
+			fixedPublicKey = "0x" + publicKeyString
+		} else {
+			return "", fmt.Errorf("invalid length of public key")
+		}
 	}
 
-	publicKey, err := crypto.UnmarshalPubkey(publicKeyBytes)
+	compressedKey, err := multiformat.SerializeLegacyKey(fixedPublicKey)
 	if err != nil {
 		return "", err
 	}
+	return ShortenedCompressedKey(compressedKey), nil
+}
 
-	return GenerateFromPublicKey(publicKey), nil
+func ShortenedCompressedKey(compressedKey string) string {
+	if len(compressedKey) > 12 {
+		prefix := compressedKey[0:8]
+		suffix := compressedKey[len(compressedKey)-5:]
+		return prefix + "…" + suffix
+	} else {
+		return ""
+	}
 }

protocol/identity/alias/generate_test.go

@@ -24,13 +24,13 @@ func TestGenerateFromPublicKeyString(t *testing.T) {
 		{
 			name:          "valid public key - start with 0x",
 			publicKey:     "0x04eedbaafd6adf4a9233a13e7b1c3c14461fffeba2e9054b8d456ce5f6ebeafadcbf3dce3716253fbc391277fa5a086b60b283daf61fb5b1f26895f456c2f31ae3",
-			alias:         "Darkorange Blue Bubblefish",
+			alias:         "zQ3shviW…k2bWB",
 			errorExpected: false,
 		},
 		{
 			name:          "valid public key - without 0x",
 			publicKey:     "04eedbaafd6adf4a9233a13e7b1c3c14461fffeba2e9054b8d456ce5f6ebeafadcbf3dce3716253fbc391277fa5a086b60b283daf61fb5b1f26895f456c2f31ae3",
-			alias:         "Darkorange Blue Bubblefish",
+			alias:         "zQ3shviW…k2bWB",
 			errorExpected: false,
 		},
 		{