@@ -109,18 +109,17 @@ func (dfd feeMarketCheckDecorator) anteHandle(ctx sdk.Context, tx sdk.Tx, simula
109109 return ctx , errorsmod .Wrapf (feemarkettypes .ErrTooManyFeeCoins , "got length %d" , len (feeCoins ))
110110 }
111111
112- var feeCoin sdk.Coin
113- if simulate && len (feeCoins ) == 0 {
114- // if simulating and user did not provider a fee - create a dummy value for them
115- feeCoin = sdk .NewCoin (params .FeeDenom , sdkmath .OneInt ())
116- } else {
117- feeCoin = feeCoins [0 ]
112+ // if simulating - create a dummy zero value for the user
113+ payCoin := sdk .NewCoin (params .FeeDenom , sdkmath .ZeroInt ())
114+ if ! simulate {
115+ payCoin = feeCoins [0 ]
118116 }
117+
119118 feeGas := int64 (feeTx .GetGas ())
120119
121- minGasPrice , err := dfd .feemarketKeeper .GetMinGasPrice (ctx , feeCoin .GetDenom ())
120+ minGasPrice , err := dfd .feemarketKeeper .GetMinGasPrice (ctx , payCoin .GetDenom ())
122121 if err != nil {
123- return ctx , errorsmod .Wrapf (err , "unable to get min gas price for denom %s" , feeCoin .GetDenom ())
122+ return ctx , errorsmod .Wrapf (err , "unable to get min gas price for denom %s" , payCoin .GetDenom ())
124123 }
125124
126125 ctx .Logger ().Info ("fee deduct ante handle" ,
@@ -132,19 +131,19 @@ func (dfd feeMarketCheckDecorator) anteHandle(ctx sdk.Context, tx sdk.Tx, simula
132131 ctx = ctx .WithMinGasPrices (sdk .NewDecCoins (minGasPrice ))
133132
134133 if ! simulate {
135- _ , _ , err := CheckTxFee (ctx , minGasPrice , feeCoin , feeGas , true )
134+ _ , _ , err := CheckTxFee (ctx , minGasPrice , payCoin , feeGas , true )
136135 if err != nil {
137136 return ctx , errorsmod .Wrapf (err , "error checking fee" )
138137 }
139138 }
140139
141140 // escrow the entire amount that the account provided as fee (feeCoin)
142- err = dfd .EscrowFunds (ctx , tx , feeCoin )
141+ err = dfd .EscrowFunds (ctx , tx , payCoin )
143142 if err != nil {
144143 return ctx , errorsmod .Wrapf (err , "error escrowing funds" )
145144 }
146145
147- priorityFee , err := dfd .resolveTxPriorityCoins (ctx , feeCoin , params .FeeDenom )
146+ priorityFee , err := dfd .resolveTxPriorityCoins (ctx , payCoin , params .FeeDenom )
148147 if err != nil {
149148 return ctx , errorsmod .Wrapf (err , "error resolving fee priority" )
150149 }
@@ -194,7 +193,8 @@ func (dfd feeMarketCheckDecorator) EscrowFunds(ctx sdk.Context, sdkTx sdk.Tx, pr
194193 return sdkerrors .ErrInvalidRequest .Wrap ("fee grants are not enabled" )
195194 } else if ! bytes .Equal (feeGranter , feePayer ) {
196195 if ! providedFee .IsNil () {
197- err := dfd .feegrantKeeper .UseGrantedFees (ctx , feeGranter , feePayer , sdk .NewCoins (providedFee ), sdkTx .GetMsgs ())
196+ err := dfd .feegrantKeeper .UseGrantedFees (ctx , feeGranter , feePayer , sdk .NewCoins (providedFee ),
197+ sdkTx .GetMsgs ())
198198 if err != nil {
199199 return errorsmod .Wrapf (err , "%s does not allow to pay fees for %s" , feeGranter , feePayer )
200200 }
0 commit comments