Skip to content

Commit 3641383

Browse files
authored
Merge pull request #37 from gitopia/faza/fix-fee-grant-check
fix fee grant check
2 parents 3e02519 + 4ab9d24 commit 3641383

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

core/wallet/gitopia_wallet.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,15 +172,12 @@ func (gw GitopiaWallet) SignAndBroadcast(grpcConn *grpc.ClientConn, msgs []sdk.M
172172

173173
// check fee grant exists
174174
fqc := feegrant.NewQueryClient(grpcConn)
175-
fr, err := fqc.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{
175+
fr, _ := fqc.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{
176176
Granter: config.FeeGranterAddr,
177177
Grantee: gw.Address(),
178178
})
179-
if err != nil {
180-
return err
181-
}
182179

183-
if fr.Allowance != nil {
180+
if fr != nil {
184181
feeGranterAddr, err := sdk.AccAddressFromBech32(config.FeeGranterAddr)
185182
if err != nil {
186183
return err

core/wallet/ledger.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,12 @@ func (l Ledger) SignAndBroadcast(grpcConn *grpc.ClientConn, msgs []sdk.Msg) erro
149149

150150
// check fee grant exists
151151
fqc := feegrant.NewQueryClient(grpcConn)
152-
fr, err := fqc.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{
152+
fr, _ := fqc.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{
153153
Granter: config.FeeGranterAddr,
154154
Grantee: l.Address(),
155155
})
156-
if err != nil {
157-
return err
158-
}
159156

160-
if fr.Allowance != nil {
157+
if fr != nil {
161158
feeGranterAddr, err := sdk.AccAddressFromBech32(config.FeeGranterAddr)
162159
if err != nil {
163160
return err

core/wallet/os_keyring.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,12 @@ func (o OSKeyring) SignAndBroadcast(grpcConn *grpc.ClientConn, msgs []sdk.Msg) e
167167

168168
// check fee grant exists
169169
fqc := feegrant.NewQueryClient(grpcConn)
170-
fr, err := fqc.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{
170+
fr, _ := fqc.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{
171171
Granter: config.FeeGranterAddr,
172172
Grantee: o.Address(),
173173
})
174-
if err != nil {
175-
return err
176-
}
177174

178-
if fr.Allowance != nil {
175+
if fr != nil {
179176
feeGranterAddr, err := sdk.AccAddressFromBech32(config.FeeGranterAddr)
180177
if err != nil {
181178
return err

0 commit comments

Comments
 (0)