Problem: negative coin amount error when query supply liquid of non B…

…aseCoinUnit

CHANGELOG.md

@@ -13,6 +13,7 @@
 - [#1088](https://github.com/crypto-org-chain/chain-main/pull/1088) Upgrade solomachine to `v0.1.4` and ibc-go to `v8.5.1`.
 * [#1091](https://github.com/crypto-org-chain/chain-main/pull/1091) Update cometbft to `0.38.13`, sdk to `v0.50.10` and memiavl to latest.
 - [#1091](https://github.com/crypto-org-chain/chain-main/pull/1091) Upgrade cometbft to v0.38.13, cosmos-sdk to `v0.50.10`.
+- [#1097](https://github.com/crypto-org-chain/chain-main/pull/1097) Avoid negative coin amount error when query supply liquid of non BaseCoinUnit.
 
 *Dec 6, 2023*
 

x/supply/keeper/keeper.go

@@ -6,7 +6,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/crypto-org-chain/chain-main/v4/config"
 	"github.com/crypto-org-chain/chain-main/v4/x/supply/types"
 
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -92,7 +91,12 @@ func (k Keeper) GetVestingAccounts(ctx sdk.Context) types.VestingAccounts {
 
 // GetTotalSupply returns the current total supply in the system
 func (k Keeper) GetTotalSupply(ctx sdk.Context) sdk.Coins {
-	return sdk.NewCoins(k.bankKeeper.GetSupply(ctx, config.BaseCoinUnit))
+	var totalSupply sdk.Coins
+	k.bankKeeper.IterateTotalSupply(ctx, func(coin sdk.Coin) bool {
+		totalSupply = totalSupply.Add(coin)
+		return false
+	})
+	return totalSupply
 }
 
 // GetUnvestedSupply returns total unvested supply

x/supply/types/expected_keepers.go

@@ -11,6 +11,7 @@ import (
 type BankKeeper interface {
 	GetAllBalances(ctx context.Context, addr sdk.AccAddress) sdk.Coins
 	GetSupply(ctx context.Context, denom string) sdk.Coin
+	IterateTotalSupply(ctx context.Context, cb func(sdk.Coin) bool)
 	LockedCoins(ctx context.Context, addr sdk.AccAddress) sdk.Coins
 }