From 7956fb35f7a6fc2fefee8a0d0f4ab80bf7abb0cf Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Tue, 14 Feb 2023 16:51:56 -0300 Subject: [PATCH] fix: x/gov ChargeDeposit delete deposits --- x/gov/keeper/deposit.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/x/gov/keeper/deposit.go b/x/gov/keeper/deposit.go index 90e394617fa2..eae18f7cdb94 100644 --- a/x/gov/keeper/deposit.go +++ b/x/gov/keeper/deposit.go @@ -174,22 +174,22 @@ func (keeper Keeper) ChargeDeposit(ctx sdk.Context, proposalID uint64, destAddre rate := sdk.MustNewDecFromStr(proposalCancelRate) var cancellationCharges sdk.Coins - for _, deposits := range keeper.GetDeposits(ctx, proposalID) { - depositerAddress := sdk.MustAccAddressFromBech32(deposits.Depositor) + for _, deposit := range keeper.GetDeposits(ctx, proposalID) { + depositerAddress := sdk.MustAccAddressFromBech32(deposit.Depositor) var remainingAmount sdk.Coins - for _, deposit := range deposits.Amount { - burnAmount := sdk.NewDecFromInt(deposit.Amount).Mul(rate).TruncateInt() + for _, coins := range deposit.Amount { + burnAmount := sdk.NewDecFromInt(coins.Amount).Mul(rate).TruncateInt() // remaining amount = deposits amount - burn amount remainingAmount = remainingAmount.Add( sdk.NewCoin( - deposit.Denom, - deposit.Amount.Sub(burnAmount), + coins.Denom, + coins.Amount.Sub(burnAmount), ), ) cancellationCharges = cancellationCharges.Add( sdk.NewCoin( - deposit.Denom, + coins.Denom, burnAmount, ), ) @@ -203,6 +203,8 @@ func (keeper Keeper) ChargeDeposit(ctx sdk.Context, proposalID uint64, destAddre return err } } + + store.Delete(types.DepositKey(deposit.ProposalId, depositerAddress)) } // burn the cancellation fee or sent the cancellation charges to destination address. @@ -232,8 +234,6 @@ func (keeper Keeper) ChargeDeposit(ctx sdk.Context, proposalID uint64, destAddre } } - store.Delete(types.DepositsKey(proposalID)) - return nil }