Mirroristas/planetmint-go
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint-go.git synced 2025-03-30 15:08:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix fee deduction, distribution test case (#117)

Browse Source 
Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>
This commit is contained in:
Lorenz Herzberger 2023-10-03 13:27:11 +02:00 committed by GitHub
parent 4db2fbc43f
commit 7c31fb1d68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/ante/deduct_fee_decorator.go
View File

@ -4,7 +4,6 @@ import (
"fmt"
errorsmod "cosmossdk.io/errors"
sdkmath "cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@ -45,22 +44,22 @@ func checkTxFee(ctx sdk.Context, tx sdk.Tx) (sdk.Coins, error) {
}
feeCoins := feeTx.GetFee()
gas := feeTx.GetGas()
if ctx.IsCheckTx() {
// min-gas-prices is used to determine which coins are to be deducted and if they are provided as fee
minGasPrices := ctx.MinGasPrices()
if !minGasPrices.IsZero() {
requiredFees := make(sdk.Coins, len(minGasPrices))
// Determine the required fees by multiplying each required minimum gas
// price by the gas limit, where fee = ceil(minGasPrice * gasLimit).
glDec := sdkmath.LegacyNewDec(int64(gas))
for i, gp := range minGasPrices {
fee := gp.Amount.Mul(glDec)
requiredFees[i] = sdk.NewCoin(gp.Denom, fee.Ceil().RoundInt())
feeDenoms := feeCoins.Denoms()
if len(feeDenoms) != 1 {
return nil, errorsmod.Wrapf(sdkerrors.ErrInvalidCoins, "fee must be exactly one coin; got: %s", feeDenoms)
}
gasDenom := minGasPrices.GetDenomByIndex(0)
if !sdk.SliceContains[string](feeDenoms, gasDenom) {
return nil, errorsmod.Wrapf(sdkerrors.ErrInvalidCoins, "received wrong fee denom; got: %s required: %s", feeDenoms[0], gasDenom)
}
requiredFees := sdk.Coins{sdk.NewCoin(gasDenom, sdk.OneInt())}
if !feeCoins.IsAnyGTE(requiredFees) {
return nil, errorsmod.Wrapf(sdkerrors.ErrInsufficientFee, "insufficient fees; got: %s required: %s", feeCoins, requiredFees)
}
@ -159,11 +158,7 @@ func (dfd DeductFeeDecorator) deductFees(bankKeeper authtypes.BankKeeper, ctx sd
return errorsmod.Wrapf(sdkerrors.ErrInsufficientFee, "invalid fee amount: %s", fees)
}
// take exactly on token as fee no matter what is provided
denoms := fees.Denoms()
feesToCollect := sdk.Coins{sdk.NewCoin(denoms[0], sdk.OneInt())}
err := bankKeeper.SendCoinsFromAccountToModule(ctx, acc.GetAddress(), authtypes.FeeCollectorName, feesToCollect)
err := bankKeeper.SendCoinsFromAccountToModule(ctx, acc.GetAddress(), authtypes.FeeCollectorName, fees)
if err != nil {
return errorsmod.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error())
}

9
tests/e2e/dao/suite.go
View File

@ -120,18 +120,19 @@ func (s *E2ETestSuite) TestDistributeCollectedFees() {
err = s.network.WaitForNextBlock()
s.Require().NoError(err)
// assert that alice has 0 of 2 paid fee tokens based on 5000 stake of 15000 total stake
// assert that alice has 6 of 20 paid fee tokens based on 5000 stake of 15000 total stake
out, err := clitestutil.ExecTestCLICmd(val.ClientCtx, bank.GetBalancesCmd(), []string{
aliceAddr.String(),
})
assert.NotContains(s.T(), out.String(), "node0token")
assert.Contains(s.T(), out.String(), "node0token")
assert.Contains(s.T(), out.String(), "6")
s.Require().NoError(err)
// assert that bob has 1 of 2 paid fee tokens based on 10000 stake of 15000 total stake
// assert that bob has 13 of 20 paid fee tokens based on 10000 stake of 15000 total stake
out, err = clitestutil.ExecTestCLICmd(val.ClientCtx, bank.GetBalancesCmd(), []string{
bobAddr.String(),
})
assert.Contains(s.T(), out.String(), "1")
assert.Contains(s.T(), out.String(), "node0token")
assert.Contains(s.T(), out.String(), "13")
s.Require().NoError(err)
}