Skip to content

feat: upgrade did module to v0.50.x #878

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

Merged
merged 18 commits into from
Apr 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion ante/expected_keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
)

type DidKeeper interface {
GetParams(ctx sdk.Context) (params didtypes.FeeParams)
GetParams(ctx context.Context) (didtypes.FeeParams, error)
}

type ResourceKeeper interface {
Expand Down
15 changes: 9 additions & 6 deletions ante/fee_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,8 @@ var _ = Describe("Fee tests on DeliverTx", func() {
Expect(err).To(BeNil(), "Tx errored when fee payer had sufficient funds and provided sufficient fee while subtracting tax on deliverTx")

// get fee params
feeParams := s.app.DidKeeper.GetParams(s.ctx)
feeParams, err := s.app.DidKeeper.GetParams(s.ctx)
Expect(err).To(BeNil())

// check balance of fee payer
balance := s.app.BankKeeper.GetBalance(s.ctx, addr1, didtypes.BaseMinimalDenom)
Expand All @@ -324,7 +325,7 @@ var _ = Describe("Fee tests on DeliverTx", func() {
Expect(err).To(BeNil())

// check that supply was deflated
burnt := cheqdante.GetBurnFeePortion(feeParams.BurnFactor.Amount, sdk.NewCoins(feeParams.CreateDid))
burnt := cheqdante.GetBurnFeePortion(feeParams.BurnFactor, sdk.NewCoins(feeParams.CreateDid))
Expect(supplyBeforeDeflation.Sub(supplyAfterDeflation...)).To(Equal(burnt), "Supply was not deflated")

// check that reward has been sent to the fee collector
Expand Down Expand Up @@ -1391,7 +1392,8 @@ var _ = Describe("Fee abstraction along with fee market", func() {
Expect(err).To(BeNil(), "Tx errored when fee payer had sufficient funds and provided sufficient fee while subtracting tax on deliverTx")

// get fee params
feeParams := s.app.DidKeeper.GetParams(s.ctx)
feeParams, err := s.app.DidKeeper.GetParams(s.ctx)
Expect(err).To(BeNil())

// check balance of fee payer
balance := s.app.BankKeeper.GetBalance(s.ctx, addr1, didtypes.BaseMinimalDenom)
Expand All @@ -1402,7 +1404,7 @@ var _ = Describe("Fee abstraction along with fee market", func() {
Expect(err).To(BeNil())

// check that supply was deflated
burnt := cheqdante.GetBurnFeePortion(feeParams.BurnFactor.Amount, sdk.NewCoins(feeParams.CreateDid))
burnt := cheqdante.GetBurnFeePortion(feeParams.BurnFactor, sdk.NewCoins(feeParams.CreateDid))
Expect(supplyBeforeDeflation.Sub(supplyAfterDeflation...)).To(Equal(burnt), "Supply was not deflated")

// check that reward has been sent to the fee collector
Expand Down Expand Up @@ -1523,7 +1525,8 @@ var _ = Describe("Fee abstraction along with fee market", func() {
Expect(err).To(BeNil(), "Tx errored when fee payer had sufficient funds and provided sufficient fee while subtracting tax on deliverTx")

// get fee params
feeParams := s.app.DidKeeper.GetParams(s.ctx)
feeParams, err := s.app.DidKeeper.GetParams(s.ctx)
Expect(err).To(BeNil())

// check balance of fee payer
balance := s.app.BankKeeper.GetBalance(s.ctx, addr1, didtypes.BaseMinimalDenom)
Expand All @@ -1534,7 +1537,7 @@ var _ = Describe("Fee abstraction along with fee market", func() {
Expect(err).To(BeNil())

// check that supply was deflated
burnt := cheqdante.GetBurnFeePortion(feeParams.BurnFactor.Amount, sdk.NewCoins(feeParams.CreateDid))
burnt := cheqdante.GetBurnFeePortion(feeParams.BurnFactor, sdk.NewCoins(feeParams.CreateDid))
Expect(supplyBeforeDeflation.Sub(supplyAfterDeflation...)).To(Equal(burnt), "Supply was not deflated")

// check that reward has been sent to the fee collector
Expand Down
9 changes: 6 additions & 3 deletions ante/testutil_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@ func createTestApp(isCheckTx bool) (*cheqdapp.TestApp, sdk.Context, error) {

// cheqd specific params
didFeeParams := didtypes.DefaultGenesis().FeeParams
app.DidKeeper.SetParams(ctx, *didFeeParams)
err = app.DidKeeper.SetParams(ctx, *didFeeParams)
if err != nil {
return nil, sdk.Context{}, err
}
resourceFeeParams := resourcetypes.DefaultGenesis().FeeParams
app.ResourceKeeper.SetParams(ctx, *resourceFeeParams)
err = app.FeeMarketKeeper.SetParams(ctx, types.NewParams(DefaultWindow, DefaultAlpha, DefaultBeta, DefaultGamma, DefaultDelta,
Expand Down Expand Up @@ -217,8 +220,8 @@ func (s *AnteTestSuite) CreateTestTx(privs []cryptotypes.PrivKey, accNums []uint
}

// SetDidFeeParams is a helper function to set did fee params.
func (s *AnteTestSuite) SetDidFeeParams(feeParams didtypes.FeeParams) {
s.app.DidKeeper.SetParams(s.ctx, feeParams)
func (s *AnteTestSuite) SetDidFeeParams(feeParams didtypes.FeeParams) error {
return s.app.DidKeeper.SetParams(s.ctx, feeParams)
}

// SetResourceFeeParams is a helper function to set resource fee params.
Expand Down
5 changes: 4 additions & 1 deletion ante/tx_msg_filters.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,10 @@ func GetResourceTaxableMsgFee(ctx sdk.Context, msg *resourcetypes.MsgCreateResou
}

func checkFeeParamsFromSubspace(ctx sdk.Context, didKeeper DidKeeper, resourceKeeper ResourceKeeper) bool {
didParams := didKeeper.GetParams(ctx)
didParams, err := didKeeper.GetParams(ctx)
if err != nil {
return false
}
TaxableMsgFees[MsgCreateDidDoc] = sdk.NewCoins(didParams.CreateDid)
TaxableMsgFees[MsgUpdateDidDoc] = sdk.NewCoins(didParams.UpdateDid)
TaxableMsgFees[MsgDeactivateDidDoc] = sdk.NewCoins(didParams.DeactivateDid)
Expand Down
74 changes: 38 additions & 36 deletions api/cheqd/did/v2/fee.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading