From ef20b49cd07e22411c981b548d81ed47023931ab Mon Sep 17 00:00:00 2001 From: marston Date: Sun, 5 Jan 2025 23:19:00 -0500 Subject: [PATCH] changing proof window --- app/upgrades/v440/commont_test.go | 5 +++-- app/upgrades/v440/upgrade_test.go | 1 - app/upgrades/v440/upgrades.go | 17 ++++++++++++++++- x/jklmint/keeper/mint.go | 4 ++-- x/jklmint/module.go | 1 - 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/app/upgrades/v440/commont_test.go b/app/upgrades/v440/commont_test.go index d90436e0..e3ac1305 100644 --- a/app/upgrades/v440/commont_test.go +++ b/app/upgrades/v440/commont_test.go @@ -2,9 +2,10 @@ package v440_test import ( "fmt" - mintkeeper "github.com/jackalLabs/canine-chain/v4/x/jklmint/keeper" "testing" + mintkeeper "github.com/jackalLabs/canine-chain/v4/x/jklmint/keeper" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/golang/mock/gomock" @@ -180,7 +181,7 @@ func (suite *UpgradeTestKeeper) SetupSuite() { func (suite *UpgradeTestKeeper) reset() { storageKeeper, filetreeKeeper, _, _, encCfg, ctx := SetUpKeepers(suite.T()) - + _ = suite.mintKeeper queryHelper := baseapp.NewQueryServerTestHelper(ctx, encCfg.InterfaceRegistry) types.RegisterQueryServer(queryHelper, filetreeKeeper) queryClient := types.NewQueryClient(queryHelper) diff --git a/app/upgrades/v440/upgrade_test.go b/app/upgrades/v440/upgrade_test.go index eb95e0a3..ab240fef 100644 --- a/app/upgrades/v440/upgrade_test.go +++ b/app/upgrades/v440/upgrade_test.go @@ -26,5 +26,4 @@ func (suite *UpgradeTestKeeper) TestUpgrade() { }) suite.Require().Equal(25000, i) - } diff --git a/app/upgrades/v440/upgrades.go b/app/upgrades/v440/upgrades.go index a4487c40..e01d040a 100644 --- a/app/upgrades/v440/upgrades.go +++ b/app/upgrades/v440/upgrades.go @@ -2,6 +2,7 @@ package v440 import ( _ "embed" + storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" @@ -41,11 +42,25 @@ func (u *Upgrade) Name() string { // Handler implements upgrades.Upgrade func (u *Upgrade) Handler() upgradetypes.UpgradeHandler { return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - + var newWindow int64 = 7200 params := u.mk.GetParams(ctx) params.TokensPerBlock = 3_830_000 u.mk.SetParams(ctx, params) + storageParams := u.sk.GetParams(ctx) + oldProofWindow := storageParams.ProofWindow + + storageParams.CheckWindow = 300 + storageParams.ProofWindow = newWindow + u.sk.SetParams(ctx, storageParams) + + files := u.sk.GetAllFileByMerkle(ctx) + for _, file := range files { + if file.ProofInterval == oldProofWindow { // updating default files to the new window + file.ProofInterval = newWindow + u.sk.SetFile(ctx, file) + } + } err := upgrades.RecoverFiles(ctx, u.sk, UpgradeData, plan.Height, "v4.4.0") if err != nil { return nil, err diff --git a/x/jklmint/keeper/mint.go b/x/jklmint/keeper/mint.go index cf02dc53..8613557d 100644 --- a/x/jklmint/keeper/mint.go +++ b/x/jklmint/keeper/mint.go @@ -95,10 +95,10 @@ func (k Keeper) BlockMint(ctx sdk.Context) { mintedNum := params.TokensPerBlock // minted, found := k.GetMintedBlock(ctx, ctx.BlockHeight()-1) - //if found { + // if found { // mintedNum = minted.Minted //} - //var bpy int64 = (365 * 24 * 60 * 60) / 6 + // var bpy int64 = (365 * 24 * 60 * 60) / 6 // //newMintForBlock := utils.GetMintForBlock(mintedNum, bpy, params.MintDecrease) // diff --git a/x/jklmint/module.go b/x/jklmint/module.go index f14531fe..ec127f23 100644 --- a/x/jklmint/module.go +++ b/x/jklmint/module.go @@ -157,7 +157,6 @@ func (am AppModule) RegisterServices(cfg module.Configurator) { if err != nil { panic(err) } - } // RegisterInvariants registers the capability module's invariants.