Merge pull request #1 from HaoyangLiu/haoyang/deps

R4R: Change the condition for fee preprocessing
irisnet · Oct 30, 2018 · 3ee68d6 · 3ee68d6
2 parents c0aa619 + dae61b3
commit 3ee68d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
@@ -687,7 +687,7 @@ func (app *BaseApp) runTx(mode RunTxMode, txBytes []byte, tx sdk.Tx) (result sdk
 	}
 
 	// run the fee handler
-	if app.feePreprocessHandler != nil && mode == RunTxModeCheck {
+	if app.feePreprocessHandler != nil && ctx.BlockHeight() != 0 {
 		err := app.feePreprocessHandler(ctx, tx)
 		if err != nil {
 			return sdk.ErrInvalidCoins(err.Error()).Result()