Improve set supply #8950
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -184,33 +184,6 @@ func (k BaseKeeper) GetSupply(ctx sdk.Context, denom string) sdk.Coin { | |
| return coin | ||
| } | ||
|
|
||
| // GetDenomMetaData retrieves the denomination metadata | ||
| func (k BaseKeeper) GetDenomMetaData(ctx sdk.Context, denom string) (types.Metadata, bool) { | ||
| store := ctx.KVStore(k.storeKey) | ||
|
|
@@ -354,7 +327,7 @@ func (k BaseKeeper) UndelegateCoinsFromModuleToAccount( | |
|
|
||
| // MintCoins creates new coins from thin air and adds it to the module account. | ||
| // It will panic if the module account does not exist or is unauthorized. | ||
| func (k BaseKeeper) MintCoins(ctx sdk.Context, moduleName string, amounts sdk.Coins) error { | ||
| acc := k.ak.GetModuleAccount(ctx, moduleName) | ||
| if acc == nil { | ||
| panic(sdkerrors.Wrapf(sdkerrors.ErrUnknownAddress, "module account %s does not exist", moduleName)) | ||
|
|
@@ -364,31 +337,33 @@ func (k BaseKeeper) MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) | |
| panic(sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "module account %s does not have permissions to mint tokens", moduleName)) | ||
| } | ||
|
|
||
| err := k.addCoins(ctx, acc.GetAddress(), amounts) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| var newSupply sdk.Coins | ||
| for _, amount := range amounts { | ||
| supply := k.GetSupply(ctx, amount.GetDenom()) | ||
| supply = supply.Add(amount) | ||
| newSupply = append(newSupply, supply) | ||
| } | ||
| k.setSupply(ctx, newSupply) | ||
|
|
||
| logger := k.Logger(ctx) | ||
| logger.Info("minted coins from module account", "amount", amounts.String(), "from", moduleName) | ||
|
|
||
| // emit mint event | ||
| ctx.EventManager().EmitEvent( | ||
| types.NewCoinMintEvent(acc.GetAddress(), amounts), | ||
| ) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // BurnCoins burns coins deletes coins from the balance of the module account. | ||
| // It will panic if the module account does not exist or is unauthorized. | ||
| func (k BaseKeeper) BurnCoins(ctx sdk.Context, moduleName string, amounts sdk.Coins) error { | ||
| acc := k.ak.GetModuleAccount(ctx, moduleName) | ||
| if acc == nil { | ||
| panic(sdkerrors.Wrapf(sdkerrors.ErrUnknownAddress, "module account %s does not exist", moduleName)) | ||
|
|
@@ -398,28 +373,40 @@ func (k BaseKeeper) BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) | |
| panic(sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "module account %s does not have permissions to burn tokens", moduleName)) | ||
| } | ||
|
|
||
| err := k.subUnlockedCoins(ctx, acc.GetAddress(), amounts) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| var newSupply sdk.Coins | ||
| for _, amount := range amounts { | ||
| supply := k.GetSupply(ctx, amount.GetDenom()) | ||
| supply = supply.Sub(amount) | ||
| newSupply = append(newSupply, supply) | ||
| } | ||
| k.setSupply(ctx, newSupply) | ||
|
|
||
| logger := k.Logger(ctx) | ||
| logger.Info("burned tokens from module account", "amount", amounts.String(), "from", moduleName) | ||
|
|
||
| // emit burn event | ||
| ctx.EventManager().EmitEvent( | ||
| types.NewCoinBurnEvent(acc.GetAddress(), amounts), | ||
| ) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (k BaseKeeper) setSupply(ctx sdk.Context, coins sdk.Coins) { | ||
aaronc marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| store := ctx.KVStore(k.storeKey) | ||
| supplyStore := prefix.NewStore(store, types.SupplyKey) | ||
|
|
||
| for i := range coins { | ||
| bz := k.cdc.MustMarshalBinaryBare(&coins[i]) | ||
|
There was a problem hiding this comment. Also noticing that this doesn't seem quite right. There's no need to serialize the whole There was a problem hiding this comment. This was the first approach I took, setSupply to get one coin, I can revert it. I agree on the coin serialization. Thanks! |
||
| supplyStore.Set([]byte(coins[i].GetDenom()), bz) | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. Why not keeping a loop here?
There was a problem hiding this comment. An argument could be made for doing all of this logic inline inside There was a problem hiding this comment. @jgimeno I wonder if there's value in making this |
||
|
|
||
| func (k BaseKeeper) trackDelegation(ctx sdk.Context, addr sdk.AccAddress, balance, amt sdk.Coins) error { | ||
| acc := k.ak.GetAccount(ctx, addr) | ||
| if acc == nil { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see a need to bundle this into Coins at all. Instead I think we should just be setting supply by denom in the above for loop. The whole Coins abstraction is just unnecessary here IMHO.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1 for inlining. The function is used only 2 times, so not a big trade off.