feat(client/v2): factory (#20623)
Co-authored-by: Julien Robert <julien@rbrt.fr>
This commit is contained in:
co-authored by
Julien Robert
parent
8bbf51c5ca
commit
c8f4cf787b
@@ -2,6 +2,7 @@ package keyring
|
||||
|
||||
import (
|
||||
signingv1beta1 "cosmossdk.io/api/cosmos/tx/signing/v1beta1"
|
||||
"cosmossdk.io/core/address"
|
||||
|
||||
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
|
||||
authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
|
||||
@@ -21,15 +22,22 @@ type autoCLIKeyring interface {
|
||||
|
||||
// Sign signs the given bytes with the key with the given name.
|
||||
Sign(name string, msg []byte, signMode signingv1beta1.SignMode) ([]byte, error)
|
||||
|
||||
// KeyType returns the type of the key.
|
||||
KeyType(name string) (uint, error)
|
||||
|
||||
// KeyInfo given a key name or address returns key name, key address and key type.
|
||||
KeyInfo(name string) (string, string, uint, error)
|
||||
}
|
||||
|
||||
// NewAutoCLIKeyring wraps the SDK keyring and make it compatible with the AutoCLI keyring interfaces.
|
||||
func NewAutoCLIKeyring(kr Keyring) (autoCLIKeyring, error) {
|
||||
return &autoCLIKeyringAdapter{kr}, nil
|
||||
func NewAutoCLIKeyring(kr Keyring, ac address.Codec) (autoCLIKeyring, error) {
|
||||
return &autoCLIKeyringAdapter{kr, ac}, nil
|
||||
}
|
||||
|
||||
type autoCLIKeyringAdapter struct {
|
||||
Keyring
|
||||
ac address.Codec
|
||||
}
|
||||
|
||||
func (a *autoCLIKeyringAdapter) List() ([]string, error) {
|
||||
@@ -84,3 +92,40 @@ func (a *autoCLIKeyringAdapter) Sign(name string, msg []byte, signMode signingv1
|
||||
signBytes, _, err := a.Keyring.Sign(record.Name, msg, sdkSignMode)
|
||||
return signBytes, err
|
||||
}
|
||||
|
||||
func (a *autoCLIKeyringAdapter) KeyType(name string) (uint, error) {
|
||||
record, err := a.Keyring.Key(name)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
return uint(record.GetType()), nil
|
||||
}
|
||||
|
||||
func (a *autoCLIKeyringAdapter) KeyInfo(nameOrAddr string) (string, string, uint, error) {
|
||||
addr, err := a.ac.StringToBytes(nameOrAddr)
|
||||
if err != nil {
|
||||
// If conversion fails, it's likely a name, not an address
|
||||
record, err := a.Keyring.Key(nameOrAddr)
|
||||
if err != nil {
|
||||
return "", "", 0, err
|
||||
}
|
||||
addr, err = record.GetAddress()
|
||||
if err != nil {
|
||||
return "", "", 0, err
|
||||
}
|
||||
addrStr, err := a.ac.BytesToString(addr)
|
||||
if err != nil {
|
||||
return "", "", 0, err
|
||||
}
|
||||
return record.Name, addrStr, uint(record.GetType()), nil
|
||||
}
|
||||
|
||||
// If conversion succeeds, it's an address, get the key info by address
|
||||
record, err := a.Keyring.KeyByAddress(addr)
|
||||
if err != nil {
|
||||
return "", "", 0, err
|
||||
}
|
||||
|
||||
return record.Name, nameOrAddr, uint(record.GetType()), nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user