From 284047ab934cb34f62d924fbe140efdc00c2b53f Mon Sep 17 00:00:00 2001
From: swelf19 <62722506+swelf19@users.noreply.github.com>
Date: Mon, 20 May 2024 19:10:32 +0300
Subject: [PATCH] fixed bug with nil pointer exception during simulation (#80)

---
 x/feemarket/post/fee.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x/feemarket/post/fee.go b/x/feemarket/post/fee.go
index b3512c3..be8aee0 100644
--- a/x/feemarket/post/fee.go
+++ b/x/feemarket/post/fee.go
@@ -172,7 +172,7 @@ func (dfd FeeMarketDeductDecorator) DeductFeeAndTip(ctx sdk.Context, sdkTx sdk.T
 	var events sdk.Events
 
 	// deduct the fees and tip
-	if !fee.IsZero() {
+	if !fee.Amount.IsNil() && !fee.IsZero() {
 		err := DeductCoins(dfd.bankKeeper, ctx, deductFeesFromAcc, sdk.NewCoins(fee), distributeFees)
 		if err != nil {
 			return err
@@ -186,7 +186,7 @@ func (dfd FeeMarketDeductDecorator) DeductFeeAndTip(ctx sdk.Context, sdkTx sdk.T
 	}
 
 	proposer := sdk.AccAddress(ctx.BlockHeader().ProposerAddress)
-	if !tip.IsZero() {
+	if !tip.Amount.IsNil() && !tip.IsZero() {
 		err := SendTip(dfd.bankKeeper, ctx, deductFeesFromAcc.GetAddress(), proposer, sdk.NewCoins(tip))
 		if err != nil {
 			return err