Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v1.1.0 #272

Merged
merged 20 commits into from
Jan 2, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
x/mint poolincentives should go to airdrop module account
  • Loading branch information
Joe Bowman committed Dec 29, 2022
commit 09cfb8104a94456d5c0794029de396b75b6c7322
9 changes: 3 additions & 6 deletions x/mint/keeper/keeper.go
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"

airdroptypes "github.com/ingenuity-build/quicksilver/x/airdrop/types"
participationrewards "github.com/ingenuity-build/quicksilver/x/participationrewards/types"
)

@@ -159,16 +160,12 @@ func (k Keeper) DistributeMintedCoin(ctx sdk.Context, mintedCoin sdk.Coin) error
// allocate pool allocation ratio to pool-incentives module account account
poolIncentivesCoins := sdk.NewCoins(k.GetProportions(ctx, mintedCoin, proportions.PoolIncentives))
// temporary until we have incentives pool sorted :)
err = k.bankKeeper.BurnCoins(ctx, types.ModuleName, poolIncentivesCoins)

err = k.bankKeeper.SendCoinsFromModuleToModule(ctx, types.ModuleName, airdroptypes.ModuleName, poolIncentivesCoins)
if err != nil {
return err
}

// err = k.bankKeeper.SendCoinsFromModuleToModule(ctx, types.ModuleName, poolincentivestypes.ModuleName, poolIncentivesCoins)
// if err != nil {
// return err
// }

participationRewardCoin := k.GetProportions(ctx, mintedCoin, proportions.ParticipationRewards)
participationRewardCoins := sdk.NewCoins(participationRewardCoin)
participationRewardsAddress := k.accountKeeper.GetModuleAddress(participationrewards.ModuleName)