fix(gnoclient): Return error when getting keypair information

gno.land/pkg/gnoclient/client_test.go

@@ -24,13 +24,13 @@ func TestRender(t *testing.T) {
 			sign: func(cfg SignCfg) (*std.Tx, error) {
 				return &std.Tx{}, nil
 			},
-			info: func() keys.Info {
+			info: func() (keys.Info, error) {
 				return &mockKeysInfo{
 					getAddress: func() crypto.Address {
 						adr, _ := crypto.AddressFromBech32("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5")
 						return adr
 					},
-				}
+				}, nil
 			},
 		},
 		RPCClient: &mockRPCClient{
@@ -63,13 +63,13 @@ func TestCallSingle(t *testing.T) {
 			sign: func(cfg SignCfg) (*std.Tx, error) {
 				return &std.Tx{}, nil
 			},
-			info: func() keys.Info {
+			info: func() (keys.Info, error) {
 				return &mockKeysInfo{
 					getAddress: func() crypto.Address {
 						adr, _ := crypto.AddressFromBech32("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5")
 						return adr
 					},
-				}
+				}, nil
 			},
 		},
 		RPCClient: &mockRPCClient{
@@ -117,13 +117,13 @@ func TestCallMultiple(t *testing.T) {
 			sign: func(cfg SignCfg) (*std.Tx, error) {
 				return &std.Tx{}, nil
 			},
-			info: func() keys.Info {
+			info: func() (keys.Info, error) {
 				return &mockKeysInfo{
 					getAddress: func() crypto.Address {
 						adr, _ := crypto.AddressFromBech32("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5")
 						return adr
 					},
-				}
+				}, nil
 			},
 		},
 		RPCClient: &mockRPCClient{
@@ -482,13 +482,13 @@ func TestClient_Send_Errors(t *testing.T) {
 			name: "Invalid To Address",
 			client: Client{
 				Signer: &mockSigner{
-					info: func() keys.Info {
+					info: func() (keys.Info, error) {
 						return &mockKeysInfo{
 							getAddress: func() crypto.Address {
 								adr, _ := crypto.AddressFromBech32("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5")
 								return adr
 							},
-						}
+						}, nil
 					},
 				},
 				RPCClient: &mockRPCClient{},
@@ -512,13 +512,13 @@ func TestClient_Send_Errors(t *testing.T) {
 			name: "Invalid Send Coins",
 			client: Client{
 				Signer: &mockSigner{
-					info: func() keys.Info {
+					info: func() (keys.Info, error) {
 						return &mockKeysInfo{
 							getAddress: func() crypto.Address {
 								adr, _ := crypto.AddressFromBech32("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5")
 								return adr
 							},
-						}
+						}, nil
 					},
 				},
 				RPCClient: &mockRPCClient{},
@@ -561,13 +561,13 @@ func TestRunSingle(t *testing.T) {
 			sign: func(cfg SignCfg) (*std.Tx, error) {
 				return &std.Tx{}, nil
 			},
-			info: func() keys.Info {
+			info: func() (keys.Info, error) {
 				return &mockKeysInfo{
 					getAddress: func() crypto.Address {
 						adr, _ := crypto.AddressFromBech32("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5")
 						return adr
 					},
-				}
+				}, nil
 			},
 		},
 		RPCClient: &mockRPCClient{
@@ -628,13 +628,13 @@ func TestRunMultiple(t *testing.T) {
 			sign: func(cfg SignCfg) (*std.Tx, error) {
 				return &std.Tx{}, nil
 			},
-			info: func() keys.Info {
+			info: func() (keys.Info, error) {
 				return &mockKeysInfo{
 					getAddress: func() crypto.Address {
 						adr, _ := crypto.AddressFromBech32("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5")
 						return adr
 					},
-				}
+				}, nil
 			},
 		},
 		RPCClient: &mockRPCClient{
@@ -849,13 +849,13 @@ func TestRunErrors(t *testing.T) {
 			name: "Invalid Empty Package",
 			client: Client{
 				Signer: &mockSigner{
-					info: func() keys.Info {
+					info: func() (keys.Info, error) {
 						return &mockKeysInfo{
 							getAddress: func() crypto.Address {
 								adr, _ := crypto.AddressFromBech32("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5")
 								return adr
 							},
-						}
+						}, nil
 					},
 				},
 				RPCClient: &mockRPCClient{},
@@ -1040,13 +1040,13 @@ func TestAddPackageErrors(t *testing.T) {
 			name: "Invalid Empty Package",
 			client: Client{
 				Signer: &mockSigner{
-					info: func() keys.Info {
+					info: func() (keys.Info, error) {
 						return &mockKeysInfo{
 							getAddress: func() crypto.Address {
 								adr, _ := crypto.AddressFromBech32("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5")
 								return adr
 							},
-						}
+						}, nil
 					},
 				},
 				RPCClient: &mockRPCClient{},

gno.land/pkg/gnoclient/client_txs.go

@@ -86,9 +86,14 @@
 			return nil, err
 		}
 
+		caller, err := c.Signer.Info()
+		if err != nil {
+			return nil, err
+		}
+
 		// Unwrap syntax sugar to vm.MsgCall slice
 		vmMsgs = append(vmMsgs, std.Msg(vm.MsgCall{
-			Caller:  c.Signer.Info().GetAddress(),
+			Caller:  caller.GetAddress(),
 			PkgPath: msg.PkgPath,
 			Func:    msg.FuncName,
 			Args:    msg.Args,
@@ -142,14 +147,17 @@
 			return nil, err
 		}
 
-		caller := c.Signer.Info().GetAddress()
+		caller, err := c.Signer.Info()
+		if err != nil {
+			return nil, err
+		}
 
 		msg.Package.Name = "main"
 		msg.Package.Path = ""
 
 		// Unwrap syntax sugar to vm.MsgCall slice
 		vmMsgs = append(vmMsgs, std.Msg(vm.MsgRun{
-			Caller:  caller,
+			Caller:  caller.GetAddress(),
 			Package: msg.Package,
 			Send:    send,
 		}))
@@ -201,9 +209,14 @@
 			return nil, err
 		}
 
+		caller, err := c.Signer.Info()
+		if err != nil {
+			return nil, err
+		}
+
 		// Unwrap syntax sugar to vm.MsgSend slice
 		vmMsgs = append(vmMsgs, std.Msg(bank.MsgSend{
-			FromAddress: c.Signer.Info().GetAddress(),
+			FromAddress: caller.GetAddress(),
 			ToAddress:   msg.ToAddress,
 			Amount:      send,
 		}))
@@ -255,11 +268,14 @@
 			return nil, err
 		}
 
-		caller := c.Signer.Info().GetAddress()
+		caller, err := c.Signer.Info()
+		if err != nil {
+			return nil, err
+		}
 
 		// Unwrap syntax sugar to vm.MsgCall slice
 		vmMsgs = append(vmMsgs, std.Msg(vm.MsgAddPackage{
-			Creator: caller,
+			Creator: caller.GetAddress(),
 			Package: msg.Package,
 			Deposit: deposit,
 		}))
@@ -284,10 +300,13 @@
 
 // signAndBroadcastTxCommit signs a transaction and broadcasts it, returning the result
 func (c *Client) signAndBroadcastTxCommit(tx std.Tx, accountNumber, sequenceNumber uint64) (*ctypes.ResultBroadcastTxCommit, error) {
-	caller := c.Signer.Info().GetAddress()
+	caller, err := c.Signer.Info()
+	if err != nil {
+		return nil, err
+	}
 
 	if sequenceNumber == 0 || accountNumber == 0 {
-		account, _, err := c.QueryAccount(caller)
+		account, _, err := c.QueryAccount(caller.GetAddress())
 		if err != nil {
 			return nil, errors.Wrap(err, "query account")
 		}

gno.land/pkg/gnoclient/mock_test.go

@@ -7,13 +7,14 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/crypto"
 	"github.com/gnolang/gno/tm2/pkg/crypto/hd"
 	"github.com/gnolang/gno/tm2/pkg/crypto/keys"
+	"github.com/gnolang/gno/tm2/pkg/errors"
 	"github.com/gnolang/gno/tm2/pkg/std"
 )
 
 // Signer mock
 type (
 	mockSign     func(cfg SignCfg) (*std.Tx, error)
-	mockInfo     func() keys.Info
+	mockInfo     func() (keys.Info, error)
 	mockValidate func() error
 )
 
@@ -30,11 +31,11 @@ func (m *mockSigner) Sign(cfg SignCfg) (*std.Tx, error) {
 	return nil, nil
 }
 
-func (m *mockSigner) Info() keys.Info {
+func (m *mockSigner) Info() (keys.Info, error) {
 	if m.info != nil {
 		return m.info()
 	}
-	return nil
+	return nil, errors.New("empty key info")
 }
 
 func (m *mockSigner) Validate() error {

gno.land/pkg/gnoclient/signer.go

@@ -12,7 +12,7 @@
 // Signer provides an interface for signing transactions.
 type Signer interface {
 	Sign(SignCfg) (*std.Tx, error) // Signs a transaction and returns a signed tx ready for broadcasting.
-	Info() keys.Info               // Returns key information, including the address.
+	Info() (keys.Info, error)      // Returns key information, including the address.
 	Validate() error               // Checks whether the signer is properly configured.
 }
 
@@ -35,9 +35,14 @@
 		return err
 	}
 
+	caller, err := s.Info()
+	if err != nil {
+		return err
+	}
+
 	// To verify if the password unlocks the account, sign a blank transaction.
 	msg := vm.MsgCall{
-		Caller: s.Info().GetAddress(),
+		Caller: caller.GetAddress(),
 	}
 	signCfg := SignCfg{
 		UnsignedTX: std.Tx{
@@ -53,12 +58,12 @@
 }
 
 // Info gets keypair information.
-func (s SignerFromKeybase) Info() keys.Info {
+func (s SignerFromKeybase) Info() (keys.Info, error) {
 	info, err := s.Keybase.GetByNameOrAddress(s.Account)
 	if err != nil {
-		panic("should not happen")
+		return nil, err
 	}
-	return info
+	return info, nil
 }
 
 // SignCfg provides the signing configuration, containing: