fix fee grant for os keyring backend

ProgramCpp · ProgramCpp · commit 580df6ca597c · 2023-07-08T01:05:38.000-05:00
diff --git a/cmd/git-credential-gitopia/main.go b/cmd/git-credential-gitopia/main.go
@@ -51,7 +51,7 @@ func handleGetAction() {
 		return
 	}
 
-	wallet, err := wallet.InitWallet()
+	wallet, err := wallet.InitWallet(nil)
 	if err != nil {
 		log.Debugf(err.Error())
 		return
diff --git a/cmd/git-remote-gitopia/gitopia.go b/cmd/git-remote-gitopia/gitopia.go
@@ -15,6 +15,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/query"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	"github.com/cosmos/cosmos-sdk/x/feegrant"
 	"github.com/gitopia/git-remote-gitopia/config"
 	core "github.com/gitopia/git-remote-gitopia/core"
 	"github.com/gitopia/git-remote-gitopia/core/wallet"
@@ -35,8 +36,9 @@ const (
 )
 
 type GitopiaHandler struct {
-	grpcConn    *grpc.ClientConn
-	queryClient gitopiatypes.QueryClient
+	grpcConn       *grpc.ClientConn
+	queryClient    gitopiatypes.QueryClient
+	feegrantClient feegrant.QueryClient
 
 	chainId              string
 	remoteUserId         string
@@ -66,6 +68,7 @@ func (h *GitopiaHandler) Initialize(remote *core.Remote) error {
 
 	h.queryClient = gitopiatypes.NewQueryClient(h.grpcConn)
 	serviceClient := tmservice.NewServiceClient(h.grpcConn)
+	h.feegrantClient = feegrant.NewQueryClient(h.grpcConn)
 
 	// Get chain id for signing transaction
 	nodeInfoRes, err := serviceClient.GetNodeInfo(context.Background(), &tmservice.GetNodeInfoRequest{})
@@ -173,7 +176,7 @@ func (h *GitopiaHandler) Push(remote *core.Remote, refsToPush []core.RefToPush)
 	var err error
 
 	if h.wallet == nil {
-		h.wallet, err = wallet.InitWallet()
+		h.wallet, err = wallet.InitWallet(h.feegrantClient)
 		if err != nil {
 			return nil, err
 		}
diff --git a/core/wallet/gitopia_wallet.go b/core/wallet/gitopia_wallet.go
@@ -45,13 +45,14 @@ type GitopiaWalletFile struct {
 }
 
 type GitopiaWallet struct {
-	walletFile GitopiaWalletFile
-	privateKey cryptotypes.PrivKey
-	address    string
-	secType    secretType
+	walletFile     GitopiaWalletFile
+	privateKey     cryptotypes.PrivKey
+	address        string
+	secType        secretType
+	feeGranterAddr string
 }
 
-func InitGitopiaWallet() (Wallet, error) {
+func InitGitopiaWallet(feegrantClient feegrant.QueryClient) (Wallet, error) {
 	var buffer []byte
 	var err error
 	gw := GitopiaWallet{}
@@ -84,6 +85,15 @@ func InitGitopiaWallet() (Wallet, error) {
 	}
 	gw.address = sdk.AccAddress(gw.privateKey.PubKey().Address()).String()
 
+	fr, _ := feegrantClient.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{
+		Granter: config.FeeGranterAddr,
+		Grantee: gw.address,
+	})
+
+	if fr != nil {
+		gw.feeGranterAddr = fr.Allowance.Granter
+	}
+
 	return gw, nil
 }
 
@@ -170,15 +180,8 @@ func (gw GitopiaWallet) SignAndBroadcast(grpcConn *grpc.ClientConn, msgs []sdk.M
 	}
 	txBuilder.SetFeeAmount(fee)
 
-	// check fee grant exists
-	fqc := feegrant.NewQueryClient(grpcConn)
-	fr, _ := fqc.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{
-		Granter: config.FeeGranterAddr,
-		Grantee: gw.Address(),
-	})
-
-	if fr != nil {
-		feeGranterAddr, err := sdk.AccAddressFromBech32(config.FeeGranterAddr)
+	if gw.feeGranterAddr != "" {
+		feeGranterAddr, err := sdk.AccAddressFromBech32(gw.feeGranterAddr)
 		if err != nil {
 			return err
 		}
diff --git a/core/wallet/ledger.go b/core/wallet/ledger.go
@@ -30,12 +30,13 @@ import (
 )
 
 type Ledger struct {
-	privateKey cryptotypes.LedgerPrivKey
-	address    string
-	secType    secretType
+	privateKey     cryptotypes.LedgerPrivKey
+	address        string
+	secType        secretType
+	feeGranterAddr string
 }
 
-func InitLedgerWallet() (Wallet, error) {
+func InitLedgerWallet(feegrantClient feegrant.QueryClient) (Wallet, error) {
 	ledgerPrivKey, err := ledger.NewPrivKeySecp256k1Unsafe(hd.BIP44Params{
 		Purpose:      44,
 		CoinType:     118,
@@ -47,10 +48,23 @@ func InitLedgerWallet() (Wallet, error) {
 		return nil, errors.Wrap(err, "error generating ledger key")
 	}
 
+	addr := sdk.AccAddress(ledgerPrivKey.PubKey().Address()).String()
+
+	fr, _ := feegrantClient.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{
+		Granter: config.FeeGranterAddr,
+		Grantee: addr,
+	})
+
+	feeGranter := ""
+	if fr != nil {
+		feeGranter = fr.Allowance.Granter
+	}
+
 	return Ledger{
-		privateKey: ledgerPrivKey,
-		secType:    LEDGER,
-		address:    sdk.AccAddress(ledgerPrivKey.PubKey().Address()).String(),
+		privateKey:     ledgerPrivKey,
+		secType:        LEDGER,
+		address:        addr,
+		feeGranterAddr: feeGranter,
 	}, nil
 }
 
@@ -147,15 +161,8 @@ func (l Ledger) SignAndBroadcast(grpcConn *grpc.ClientConn, msgs []sdk.Msg) erro
 	}
 	txBuilder.SetFeeAmount(fee)
 
-	// check fee grant exists
-	fqc := feegrant.NewQueryClient(grpcConn)
-	fr, _ := fqc.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{
-		Granter: config.FeeGranterAddr,
-		Grantee: l.Address(),
-	})
-
-	if fr != nil {
-		feeGranterAddr, err := sdk.AccAddressFromBech32(config.FeeGranterAddr)
+	if l.feeGranterAddr != "" {
+		feeGranterAddr, err := sdk.AccAddressFromBech32(l.feeGranterAddr)
 		if err != nil {
 			return err
 		}
diff --git a/core/wallet/os_keyring.go b/core/wallet/os_keyring.go
@@ -13,6 +13,7 @@ import (
 	sdkkeyring "github.com/cosmos/cosmos-sdk/crypto/keyring"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/x/feegrant"
 	"github.com/gitopia/git-remote-gitopia/config"
 	glib "github.com/gitopia/gitopia-go"
 	"github.com/gitopia/gitopia-go/logger"
@@ -59,7 +60,7 @@ type OSKeyring struct {
 	secType secretType
 }
 
-func InitOSKeyringWallet() (Wallet, error) {
+func InitOSKeyringWallet(feegrantClient feegrant.QueryClient) (Wallet, error) {
 	var key string
 	var backend string
 
@@ -84,12 +85,26 @@ func InitOSKeyringWallet() (Wallet, error) {
 	l := logrus.New()
 	l.SetOutput(os.Stderr)
 	ctx := logger.ContextWithValue(context.Background(), l)
-	glib.WithGitopiaAddr(config.GRPCHost)
+	glib.WithAppName(AppName)
 	glib.WithGasPrices(config.GasPrices)
+	glib.WithGitopiaAddr(config.GRPCHost)
+	glib.WithChainId(config.ChainId)
+	glib.WithTmAddr(config.TmAddr)
+
 	cc, err := glib.GetClientContextWithOptions(AppName, key, backend)
 	if err != nil {
 		return nil, errors.Wrap(err, "error creating cosmos client context")
 	}
+
+	fr, _ := feegrantClient.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{
+		Granter: config.FeeGranterAddr,
+		Grantee: cc.FromAddress.String(),
+	})
+
+	if fr != nil {
+		cc.WithFeeGranterAddress(sdk.MustAccAddressFromBech32(fr.Allowance.Granter))
+	}
+
 	txf := tx.NewFactoryCLI(cc, &pflag.FlagSet{}).WithGasAdjustment(GAS_ADJUSTMENT)
 	gc, err := glib.NewClient(ctx, cc, txf)
 	if err != nil {
diff --git a/core/wallet/wallet.go b/core/wallet/wallet.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/x/feegrant"
 	"google.golang.org/grpc"
 )
 
@@ -25,12 +26,13 @@ type Wallet interface {
 	Address() string
 }
 
-func InitWallet() (Wallet, error) {
-	wallet, err := InitOSKeyringWallet()
+// TODO: make options optional
+func InitWallet(feegrantClient feegrant.QueryClient) (Wallet, error) {
+	wallet, err := InitOSKeyringWallet(feegrantClient)
 	if errors.Is(err, ErrGitopiaKeyNotConfigured) {
-		wallet, err = InitGitopiaWallet()
+		wallet, err = InitGitopiaWallet(feegrantClient)
 		if err != nil {
-			wallet, err = InitLedgerWallet()
+			wallet, err = InitLedgerWallet(feegrantClient)
 			if err != nil {
 				return nil, fmt.Errorf("fatal: Gitopia wallet is not configured! Set gitopia key or use Ledger")
 			}

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func handleGetAction() {`
`51`	`51`	`return`
`52`	`52`	`}`
`53`	`53`
`54`		`- wallet, err := wallet.InitWallet()`
	`54`	`+ wallet, err := wallet.InitWallet(nil)`
`55`	`55`	`if err != nil {`
`56`	`56`	`log.Debugf(err.Error())`
`57`	`57`	`return`