From 4ab9d24a1e4c06d149c7a6a3688fadb48464fe4e Mon Sep 17 00:00:00 2001 From: faza Date: Thu, 18 May 2023 01:29:27 +0400 Subject: [PATCH] fix fee grant check --- core/wallet/gitopia_wallet.go | 7 ++----- core/wallet/ledger.go | 7 ++----- core/wallet/os_keyring.go | 7 ++----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/core/wallet/gitopia_wallet.go b/core/wallet/gitopia_wallet.go index 72b61f7..2fe0794 100644 --- a/core/wallet/gitopia_wallet.go +++ b/core/wallet/gitopia_wallet.go @@ -172,15 +172,12 @@ func (gw GitopiaWallet) SignAndBroadcast(grpcConn *grpc.ClientConn, msgs []sdk.M // check fee grant exists fqc := feegrant.NewQueryClient(grpcConn) - fr, err := fqc.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{ + fr, _ := fqc.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{ Granter: config.FeeGranterAddr, Grantee: gw.Address(), }) - if err != nil { - return err - } - if fr.Allowance != nil { + if fr != nil { feeGranterAddr, err := sdk.AccAddressFromBech32(config.FeeGranterAddr) if err != nil { return err diff --git a/core/wallet/ledger.go b/core/wallet/ledger.go index 0f3f404..672320b 100644 --- a/core/wallet/ledger.go +++ b/core/wallet/ledger.go @@ -149,15 +149,12 @@ func (l Ledger) SignAndBroadcast(grpcConn *grpc.ClientConn, msgs []sdk.Msg) erro // check fee grant exists fqc := feegrant.NewQueryClient(grpcConn) - fr, err := fqc.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{ + fr, _ := fqc.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{ Granter: config.FeeGranterAddr, Grantee: l.Address(), }) - if err != nil { - return err - } - if fr.Allowance != nil { + if fr != nil { feeGranterAddr, err := sdk.AccAddressFromBech32(config.FeeGranterAddr) if err != nil { return err diff --git a/core/wallet/os_keyring.go b/core/wallet/os_keyring.go index 85d45e4..adce4b3 100644 --- a/core/wallet/os_keyring.go +++ b/core/wallet/os_keyring.go @@ -167,15 +167,12 @@ func (o OSKeyring) SignAndBroadcast(grpcConn *grpc.ClientConn, msgs []sdk.Msg) e // check fee grant exists fqc := feegrant.NewQueryClient(grpcConn) - fr, err := fqc.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{ + fr, _ := fqc.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{ Granter: config.FeeGranterAddr, Grantee: o.Address(), }) - if err != nil { - return err - } - if fr.Allowance != nil { + if fr != nil { feeGranterAddr, err := sdk.AccAddressFromBech32(config.FeeGranterAddr) if err != nil { return err