feat: configurable fee collector for DeductFeeDecorator #407
Conversation
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
JimLarson
added
enhancement
|
Lint failure expected. |
|
Should be cherry-picked onto a "release" branch. Following past precedent, which it's unnecessary to improve upon, we'll branch |
gibson042
approved these changes
Mar 8, 2024
x/auth/ante/fee.go
Outdated
| return NewDeductFeeDecoratorWithName(ak, bk, fk, tfc, types.FeeCollectorName) | ||
| } | ||
|
|
||
| // NewDeductFeeDecorator returns a DeductFeeDecorator using a custom fee collector module account. |
There was a problem hiding this comment.
Suggested change
| // NewDeductFeeDecorator returns a DeductFeeDecorator using a custom fee collector module account. | |
| // NewDeductFeeDecoratorWithName returns a DeductFeeDecorator using a custom fee collector module account. |
gibson042
reviewed
Mar 8, 2024
x/auth/ante/fee_test.go
Outdated
| tx, err := s.CreateTestTx(privs, accNums, accSeqs, s.ctx.ChainID()) | ||
| s.Require().NoError(err) | ||
|
|
||
| // Set account with sufficient funds |
There was a problem hiding this comment.
Suggested change
| // Set account with sufficient funds | |
| // Set transacting account with sufficient funds |
x/auth/ante/fee_test.go
Outdated
Comment on lines
184
to
188
| dfd := ante.NewDeductFeeDecoratorWithName(s.app.AccountKeeper, s.app.BankKeeper, nil, nil, altCollectorName) | ||
| antehandler := sdk.ChainAnteDecorators(dfd) | ||
|
|
||
| _, err = antehandler(s.ctx, tx, false) | ||
| s.Require().NoError(err) |
There was a problem hiding this comment.
Suggested change
| dfd := ante.NewDeductFeeDecoratorWithName(s.app.AccountKeeper, s.app.BankKeeper, nil, nil, altCollectorName) | |
| antehandler := sdk.ChainAnteDecorators(dfd) | |
| _, err = antehandler(s.ctx, tx, false) | |
| s.Require().NoError(err) | |
| // Run the transaction through a handler chain that deducts fees into altCollectorAcc. | |
| dfd := ante.NewDeductFeeDecoratorWithName(s.app.AccountKeeper, s.app.BankKeeper, nil, nil, altCollectorName) | |
| antehandler := sdk.ChainAnteDecorators(dfd) | |
| _, err = antehandler(s.ctx, tx, false) | |
| s.Require().NoError(err) |
Comment on lines
+190
to
+192
| s.Require().True(s.app.BankKeeper.GetAllBalances(s.ctx, feeCollectorAcc.GetAddress()).Empty()) | ||
| newAltBalance := s.app.BankKeeper.GetAllBalances(s.ctx, altCollectorAcc.GetAddress()) | ||
| s.Require().True(newAltBalance.IsAllGTE(altBalance)) |
There was a problem hiding this comment.
Suggested change
| s.Require().True(s.app.BankKeeper.GetAllBalances(s.ctx, feeCollectorAcc.GetAddress()).Empty()) | |
| newAltBalance := s.app.BankKeeper.GetAllBalances(s.ctx, altCollectorAcc.GetAddress()) | |
| s.Require().True(newAltBalance.IsAllGTE(altBalance)) | |
| // Assert that feeCollectorAcc is still empty but the altCollectorAcc balance has increased. | |
| newFeeCollectorBalance := s.app.BankKeeper.GetAllBalances(s.ctx, feeCollectorAcc.GetAddress()) | |
| s.Require().True(newFeeCollectorBalance.Empty()) | |
| newAltBalance := s.app.BankKeeper.GetAllBalances(s.ctx, altCollectorAcc.GetAddress()) | |
| s.Require().True(newAltBalance.IsAllGTE(altBalance)) | |
| s.Require().False(newAltBalance.IsEqual(altBalance)) |
JimLarson
added a commit
that referenced
this pull request
Mar 8, 2024
* feat: configurable fee collector for DeductFeeDecorator * docs: update changelog with PR number * test: ensure increment of alt account, comments
JimLarson
added a commit
to Agoric/agoric-sdk
that referenced
this pull request
Mar 9, 2024
Functionality "upstreamed" in agoric-labs/cosmos-sdk#407.
michaelfig
pushed a commit
to Agoric/agoric-sdk
that referenced
this pull request
Mar 11, 2024
Functionality "upstreamed" in agoric-labs/cosmos-sdk#407.
gibson042
pushed a commit
to Agoric/agoric-sdk
that referenced
this pull request
Mar 11, 2024
Functionality "upstreamed" in agoric-labs/cosmos-sdk#407.
gibson042
pushed a commit
to Agoric/agoric-sdk
that referenced
this pull request
Mar 11, 2024
Functionality "upstreamed" in agoric-labs/cosmos-sdk#407.
JeancarloBarrios
pushed a commit
that referenced
this pull request
Sep 28, 2024
* feat: configurable fee collector for DeductFeeDecorator * docs: update changelog with PR number * test: ensure increment of alt account, comments
JeancarloBarrios
pushed a commit
that referenced
this pull request
Sep 28, 2024
* feat: configurable fee collector for DeductFeeDecorator * docs: update changelog with PR number * test: ensure increment of alt account, comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Refs: Agoric/agoric-sdk#9036
Make the fee collector module name in
DeductFeeDecoratorconfigurable.Pulls a customization from Agoric/agoric-sdk into agoric-labs/cosmos-sdk so it can evolve along with cosmos-sdk.
Author Checklist
All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.
I have...
!to the type prefix if API or client breaking changeCHANGELOG.mdReviewers Checklist
All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.
I have...
!in the type prefix if API or client breaking change