Revert "fix: revert Finschia#952 (Finschia#984)"

This reverts commit ea50f75.
0Tech · Aug 9, 2023 · 170140a · 170140a
1 parent 2d437b0
commit 170140a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/client/grpc/tmservice/service_test.go b/client/grpc/tmservice/service_test.go
@@ -152,7 +152,7 @@ func (s IntegrationTestSuite) TestQueryBlockResultsByHeight() {
 	s.Require().Equal(0, len(txResult))
 
 	beginBlock := blockResultsRes.GetResBeginBlock()
-	s.Require().Equal(11, len(beginBlock.Events)) // coinbase event (6) + transfer mintModule to feeCollectorName(5)
+	s.Require().Equal(7, len(beginBlock.Events)) // coinbase event (6) + transfer mintModule to feeCollectorName(5) - foundation abci (4)
 
 	endBlock := blockResultsRes.GetResEndBlock()
 	s.Require().Equal(0, len(endBlock.Events))

diff --git a/x/foundation/keeper/internal/treasury.go b/x/foundation/keeper/internal/treasury.go
@@ -9,11 +9,17 @@ import (
 func (k Keeper) CollectFoundationTax(ctx sdk.Context) error {
 	feeCollector := k.authKeeper.GetModuleAccount(ctx, k.feeCollectorName).GetAddress()
 	feesCollectedInt := k.bankKeeper.GetAllBalances(ctx, feeCollector)
+	if feesCollectedInt.Empty() {
+		return nil
+	}
 	feesCollected := sdk.NewDecCoinsFromCoins(feesCollectedInt...)
 
 	// calculate the tax
 	taxRatio := k.GetFoundationTax(ctx)
 	tax, _ := feesCollected.MulDecTruncate(taxRatio).TruncateDecimal()
+	if tax.Empty() {
+		return nil
+	}
 
 	// collect the tax
 	if err := k.FundTreasury(ctx, feeCollector, tax); err != nil {