chore: Add Keybase HasByNameOrAddress, HasByName and HasByAddress

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

@@ -156,8 +156,7 @@
  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,26 @@
  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) {
+ address, err := crypto.AddressFromBech32(nameOrBech32)
+ if err != nil {
+ return kb.HasByName(nameOrBech32)
+ } else {
+ return kb.HasByAddress(address)
+ }
+}
+
+// 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 address is in the keybase.
+func (kb dbKeybase) HasByAddress(address crypto.Address) (bool, error) {
+ return kb.db.Has(addrKey(address)), nil
+}
+
 // Get returns the public information about one key.
 func (kb dbKeybase) GetByNameOrAddress(nameOrBech32 string) (Info, error) {
  addr, err := crypto.AddressFromBech32(nameOrBech32)

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) {
@@ -80,8 +81,9 @@ func TestKeyManagement(t *testing.T) {
  assert.Empty(t, l)
 
  // create some keys
- _, err = cstore.GetByName(n1)
- require.Error(t, err)
+ has, err := cstore.HasByName(n1)
+ require.NoError(t, err)
+ require.False(t, has)
  i, err := cstore.CreateAccount(n1, mn1, bip39Passphrase, p1, 0, 0)
  require.NoError(t, err)
  require.Equal(t, n1, i.GetName())
@@ -91,14 +93,21 @@ func TestKeyManagement(t *testing.T) {
  // we can get these keys
  i2, err := cstore.GetByName(n2)
  require.NoError(t, err)
- _, err = cstore.GetByName(n3)
- require.NotNil(t, err)
- _, err = cstore.GetByAddress(toAddr(i2))
+ has, err = cstore.HasByName(n3)
+ require.NoError(t, err)
+ require.False(t, has)
+ has, err = cstore.HasByAddress(toAddr(i2))
+ require.NoError(t, err)
+ require.True(t, has)
+ // Also check with HasByNameOrAddress
+ has, err = cstore.HasByNameOrAddress(crypto.AddressToBech32(toAddr(i2)))
  require.NoError(t, err)
+ require.True(t, has)
  addr, err := crypto.AddressFromBech32("g1frtkxv37nq7arvyz5p0mtjqq7hwuvd4dnt892p")
  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()
@@ -117,8 +126,9 @@ func TestKeyManagement(t *testing.T) {
  keyS, err = cstore.List()
  require.NoError(t, err)
  require.Equal(t, 1, len(keyS))
- _, err = cstore.GetByName(n1)
- require.Error(t, err)
+ has, err = cstore.HasByName(n1)
+ require.NoError(t, err)
+ require.False(t, has)
 
  // create an offline key
  o1 := "offline"
@@ -368,8 +378,9 @@ func TestSeedPhrase(t *testing.T) {
  // now, let us delete this key
  err = cstore.Delete(n1, p1, false)
  require.Nil(t, err, "%+v", err)
- _, err = cstore.GetByName(n1)
- require.NotNil(t, err)
+ has, err := cstore.HasByName(n1)
+ require.NoError(t, err)
+ require.False(t, has)
 }
 
 func ExampleNew() {

tm2/pkg/crypto/keys/lazy_keybase.go

@@ -37,6 +37,36 @@
  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(address crypto.Address) (bool, error) {
+ db, err := db.NewDB(lkb.name, dbBackend, lkb.dir)
+ if err != nil {
+ return false, err
+ }
+ defer db.Close()
+
+ return NewDBKeybase(db).HasByAddress(address)
+}
+
 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(address crypto.Address) (bool, error)
  GetByNameOrAddress(nameOrBech32 string) (Info, error)
  GetByName(name string) (Info, error)
  GetByAddress(address crypto.Address) (Info, error)