Merge pull request #5 from berty/chore/cherry-pick-PRs-1313-and-1316

chore: Cherry pick PRs for HasByName, etc. and fix GeyByAddress error type

tm2/pkg/crypto/keys/client/add.go

@@ -156,8 +156,7 @@ func execAdd(cfg *addCfg, args []string, io *commands.IO) error {
 			return err
 		}
 
-		_, err = kb.GetByName(name)
-		if err == nil {
+		if has, err := kb.HasByName(name); err == nil && has {
 			// account exists, ask for user confirmation
 			response, err2 := io.GetConfirmation(fmt.Sprintf("Override the existing name %s", name))
 			if err2 != nil {

tm2/pkg/crypto/keys/keybase.go

@@ -168,6 +168,30 @@ func (kb dbKeybase) List() ([]Info, error) {
 	return res, nil
 }
 
+// HasByNameOrAddress checks if a key with the name or bech32 string address is in the keybase.
+func (kb dbKeybase) HasByNameOrAddress(nameOrBech32 string) (bool, error) {
+	has, err := kb.HasByAddress(nameOrBech32)
+	if err != nil {
+		return kb.HasByName(nameOrBech32)
+	} else {
+		return has, nil
+	}
+}
+
+// HasByName checks if a key with the name is in the keybase.
+func (kb dbKeybase) HasByName(name string) (bool, error) {
+	return kb.db.Has(infoKey(name)), nil
+}
+
+// HasByAddress checks if a key with the bech32 string address is in the keybase.
+func (kb dbKeybase) HasByAddress(bech32Address string) (bool, error) {
+	addr, err := crypto.AddressFromBech32(bech32Address)
+	if err != nil {
+		return false, err
+	}
+	return kb.db.Has(addrKey(addr)), nil
+}
+
 // Get returns the public information about one key.
 func (kb dbKeybase) GetByNameOrAddress(nameOrBech32 string) (Info, error) {
 	addr, err := crypto.AddressFromBech32(nameOrBech32)
@@ -189,7 +213,7 @@ func (kb dbKeybase) GetByName(name string) (Info, error) {
 func (kb dbKeybase) GetByAddress(address crypto.Address) (Info, error) {
 	ik := kb.db.Get(addrKey(address))
 	if len(ik) == 0 {
-		return nil, fmt.Errorf("key with address %s not found", address)
+		return nil, keyerror.NewErrKeyNotFound(fmt.Sprintf("key with address %s not found", address))
 	}
 	bs := kb.db.Get(ik)
 	return readInfo(bs)

tm2/pkg/crypto/keys/keybase_test.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/gnolang/gno/tm2/pkg/crypto"
 	"github.com/gnolang/gno/tm2/pkg/crypto/ed25519"
+	"github.com/gnolang/gno/tm2/pkg/crypto/keys/keyerror"
 )
 
 func TestCreateAccountInvalidMnemonic(t *testing.T) {
@@ -99,6 +100,7 @@ func TestKeyManagement(t *testing.T) {
 	require.NoError(t, err)
 	_, err = cstore.GetByAddress(addr)
 	require.NotNil(t, err)
+	require.True(t, keyerror.IsErrKeyNotFound(err))
 
 	// list shows them in order
 	keyS, err := cstore.List()

tm2/pkg/crypto/keys/lazy_keybase.go

@@ -37,6 +37,36 @@ func (lkb lazyKeybase) List() ([]Info, error) {
 	return NewDBKeybase(db).List()
 }
 
+func (lkb lazyKeybase) HasByNameOrAddress(nameOrBech32 string) (bool, error) {
+	db, err := db.NewDB(lkb.name, dbBackend, lkb.dir)
+	if err != nil {
+		return false, err
+	}
+	defer db.Close()
+
+	return NewDBKeybase(db).HasByNameOrAddress(nameOrBech32)
+}
+
+func (lkb lazyKeybase) HasByName(name string) (bool, error) {
+	db, err := db.NewDB(lkb.name, dbBackend, lkb.dir)
+	if err != nil {
+		return false, err
+	}
+	defer db.Close()
+
+	return NewDBKeybase(db).HasByName(name)
+}
+
+func (lkb lazyKeybase) HasByAddress(bech32Address string) (bool, error) {
+	db, err := db.NewDB(lkb.name, dbBackend, lkb.dir)
+	if err != nil {
+		return false, err
+	}
+	defer db.Close()
+
+	return NewDBKeybase(db).HasByAddress(bech32Address)
+}
+
 func (lkb lazyKeybase) GetByNameOrAddress(nameOrBech32 string) (Info, error) {
 	db, err := db.NewDB(lkb.name, dbBackend, lkb.dir)
 	if err != nil {

tm2/pkg/crypto/keys/types.go

@@ -13,6 +13,9 @@ import (
 type Keybase interface {
 	// CRUD on the keystore
 	List() ([]Info, error)
+	HasByNameOrAddress(nameOrBech32 string) (bool, error)
+	HasByName(name string) (bool, error)
+	HasByAddress(bech32Address string) (bool, error)
 	GetByNameOrAddress(nameOrBech32 string) (Info, error)
 	GetByName(name string) (Info, error)
 	GetByAddress(address crypto.Address) (Info, error)