Merge pull request #15 from git-remote-gitopia/fix-os-keyring-feegrant-regression-error

Author: gitopia1c2zfrmhra3spfrc2m5ft64hef30guf60lvtcm3

CHANGELOG.md

@@ -2,12 +2,13 @@
 
 All notable changes will be documented here.
 
-## [v1.7.0] - UNRELEASED
+## [v1.7.0] - 2023-07-29
 
 - Command to initialize lfs config
   - `git gitopia lfs init <remote_name>`
 - Performance improvements in fetch
 - Show progress in fetch and push
+- Give priority to wallet balance over feegrant
 
 ## [v1.6.0] - 2023-06-07
 

core/wallet/gitopia_wallet.go

@@ -87,21 +87,25 @@ func InitGitopiaWallet(bankClient banktypes.QueryClient, feegrantClient feegrant
 	gw.address = sdk.AccAddress(gw.privateKey.PubKey().Address()).String()
 
 	if bankClient != nil && feegrantClient != nil {
-		b, _ := bankClient.Balance(context.Background(), &banktypes.QueryBalanceRequest{
+		b, err := bankClient.Balance(context.Background(), &banktypes.QueryBalanceRequest{
 			Address: gw.address,
 			Denom:   config.Denom,
 		})
+		if err != nil {
+			return nil, errors.New("error querying for balance")
+		}
 
 		// Use fee grant only when balance is zero
 		if b.Balance.Amount.IsZero() {
 			fr, _ := feegrantClient.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{
 				Granter: config.FeeGranterAddr,
 				Grantee: gw.address,
 			})
-
-			if fr != nil {
-				gw.feeGranterAddr = fr.Allowance.Granter
+			if fr == nil {
+				return nil, errors.New("no feegrant available")
 			}
+
+			gw.feeGranterAddr = fr.Allowance.Granter
 		}
 	}
 

core/wallet/ledger.go

@@ -53,21 +53,25 @@ func InitLedgerWallet(bankClient banktypes.QueryClient, feegrantClient feegrant.
 
 	feeGranter := ""
 	if bankClient != nil && feegrantClient != nil {
-		b, _ := bankClient.Balance(context.Background(), &banktypes.QueryBalanceRequest{
+		b, err := bankClient.Balance(context.Background(), &banktypes.QueryBalanceRequest{
 			Address: addr,
 			Denom:   config.Denom,
 		})
+		if err != nil {
+			return nil, errors.New("error querying for balance")
+		}
 
 		// Use fee grant only when balance is zero
 		if b.Balance.Amount.IsZero() {
 			fr, _ := feegrantClient.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{
 				Granter: config.FeeGranterAddr,
 				Grantee: addr,
 			})
-
-			if fr != nil {
-				feeGranter = fr.Allowance.Granter
+			if fr == nil {
+				return nil, errors.New("no feegrant available")
 			}
+
+			feeGranter = fr.Allowance.Granter
 		}
 	}
 

core/wallet/os_keyring.go

@@ -97,21 +97,25 @@ func InitOSKeyringWallet(bankClient banktypes.QueryClient, feegrantClient feegra
 	}
 
 	if bankClient != nil && feegrantClient != nil {
-		b, _ := bankClient.Balance(context.Background(), &banktypes.QueryBalanceRequest{
+		b, err := bankClient.Balance(context.Background(), &banktypes.QueryBalanceRequest{
 			Address: cc.FromAddress.String(),
 			Denom:   config.Denom,
 		})
+		if err != nil {
+			return nil, errors.New("error querying for balance")
+		}
 
 		// Use fee grant only when balance is zero
 		if b.Balance.Amount.IsZero() {
 			fr, _ := feegrantClient.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{
 				Granter: config.FeeGranterAddr,
 				Grantee: cc.FromAddress.String(),
 			})
-
-			if fr != nil {
-				cc.WithFeeGranterAddress(sdk.MustAccAddressFromBech32(fr.Allowance.Granter))
+			if fr == nil {
+				return nil, errors.New("no feegrant available")
 			}
+
+			cc = cc.WithFeeGranterAddress(sdk.MustAccAddressFromBech32(fr.Allowance.Granter))
 		}
 	}