From de5e0ad89d378c131e6c4b152cf57c129dce0213 Mon Sep 17 00:00:00 2001 From: marston Date: Fri, 28 Jun 2024 11:26:10 -0400 Subject: [PATCH 01/11] storage module version bump --- app/upgrades/v4/upgrades.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index 51036db1..a2cd50ec 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -192,7 +192,7 @@ func (u *Upgrade) Handler() upgradetypes.UpgradeHandler { return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { ctx.Logger().Info("\nNow updating the Jackal Protocol to:\n\n █████╗ ██████╗ █████╗ ██████╗██╗ █████╗ \n██╔══██╗██╔════╝██╔══██╗██╔════╝██║██╔══██╗\n███████║██║ ███████║██║ ██║███████║\n██╔══██║██║ ██╔══██║██║ ██║██╔══██║\n██║ ██║╚██████╗██║ ██║╚██████╗██║██║ ██║\n╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═════╝╚═╝╚═╝ ╚═╝\n \n") - fromVM[storagemoduletypes.ModuleName] = 5 + fromVM[storagemoduletypes.ModuleName] = 7 fidMerkleMap := UpdateFiles(ctx, u.sk) From 8cf763788406b920a24521656f5b57e6a11d9832 Mon Sep 17 00:00:00 2001 From: marston Date: Fri, 28 Jun 2024 15:47:46 -0400 Subject: [PATCH 02/11] module version bumps --- app/upgrades/v4/upgrades.go | 3 +++ x/jklmint/keeper/migrations.go | 4 ++-- x/jklmint/legacy/v3/store.go | 6 +++--- x/jklmint/module.go | 2 +- x/storage/legacy/v5/store.go | 2 +- x/storage/module.go | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index a2cd50ec..053343aa 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -6,6 +6,8 @@ import ( "fmt" "strconv" + jklminttypes "github.com/jackalLabs/canine-chain/v4/x/jklmint/types" + notificationsmoduletypes "github.com/jackalLabs/canine-chain/v4/x/notifications/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" @@ -193,6 +195,7 @@ func (u *Upgrade) Handler() upgradetypes.UpgradeHandler { ctx.Logger().Info("\nNow updating the Jackal Protocol to:\n\n █████╗ ██████╗ █████╗ ██████╗██╗ █████╗ \n██╔══██╗██╔════╝██╔══██╗██╔════╝██║██╔══██╗\n███████║██║ ███████║██║ ██║███████║\n██╔══██║██║ ██╔══██║██║ ██║██╔══██║\n██║ ██║╚██████╗██║ ██║╚██████╗██║██║ ██║\n╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═════╝╚═╝╚═╝ ╚═╝\n \n") fromVM[storagemoduletypes.ModuleName] = 7 + fromVM[jklminttypes.ModuleName] = 6 fidMerkleMap := UpdateFiles(ctx, u.sk) diff --git a/x/jklmint/keeper/migrations.go b/x/jklmint/keeper/migrations.go index 627b18ca..e4231c32 100644 --- a/x/jklmint/keeper/migrations.go +++ b/x/jklmint/keeper/migrations.go @@ -23,12 +23,12 @@ func NewMigrator(keeper Keeper, legacy exported.Subspace) Migrator { } } -// Migrate1to2 migrates from version 2 to 3. +// Migrate2to3 migrates from version 2 to 3. func (m Migrator) Migrate2to3(ctx sdk.Context) error { return v210.MigrateStore(ctx, &m.k.paramSpace) } -// Migrate1to2 migrates from version 2 to 3. +// Migrate3to4 migrates from version 2 to 3. func (m Migrator) Migrate3to4(ctx sdk.Context) error { return v3.MigrateStore(ctx, m.legacySubspace, &m.k.paramSpace) } diff --git a/x/jklmint/legacy/v3/store.go b/x/jklmint/legacy/v3/store.go index 50ebbeae..1d682724 100644 --- a/x/jklmint/legacy/v3/store.go +++ b/x/jklmint/legacy/v3/store.go @@ -22,9 +22,9 @@ func MigrateStore(ctx sdk.Context, legacy exported.Subspace, paramsSubspace *par DevGrantsRatio: 8, StorageProviderRatio: 12, StakerRatio: 80, - TokensPerBlock: currParams.TokensPerBlock, // TODO: Double check this - MintDecrease: 6, // TODO: Double check this - StorageStipendAddress: types.DefaultStorageStipend, + TokensPerBlock: 3442500, + MintDecrease: 6, + StorageStipendAddress: "jkl1scpjepy0vgdpku7dwev20yxmvcezakv24k9arn", } paramsSubspace.SetParamSet(ctx, &t) diff --git a/x/jklmint/module.go b/x/jklmint/module.go index fe56c0af..0a552f0c 100644 --- a/x/jklmint/module.go +++ b/x/jklmint/module.go @@ -186,7 +186,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw } // ConsensusVersion implements ConsensusVersion. -func (AppModule) ConsensusVersion() uint64 { return 4 } +func (AppModule) ConsensusVersion() uint64 { return 5 } // BeginBlock executes all ABCI BeginBlock logic respective to the capability module. func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) { diff --git a/x/storage/legacy/v5/store.go b/x/storage/legacy/v5/store.go index d66e33f6..bc4fd3d1 100644 --- a/x/storage/legacy/v5/store.go +++ b/x/storage/legacy/v5/store.go @@ -23,7 +23,7 @@ func MigrateStore(ctx sdk.Context, legacySubspace exported.Subspace, paramsSubsp PricePerTbPerMonth: 15, AttestFormSize: 5, AttestMinToPass: 3, - CollateralPrice: 10_000_000_000, + CollateralPrice: currParams.CollateralPrice, CheckWindow: 100, ReferralCommission: 25, PolRatio: 40, diff --git a/x/storage/module.go b/x/storage/module.go index d96d8964..187446b6 100644 --- a/x/storage/module.go +++ b/x/storage/module.go @@ -199,7 +199,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw } // ConsensusVersion implements ConsensusVersion. -func (AppModule) ConsensusVersion() uint64 { return 6 } +func (AppModule) ConsensusVersion() uint64 { return 7 } // BeginBlock executes all ABCI BeginBlock logic respective to the capability module. func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) { // Every x blocks we check for proven deals From d84ddb5c294155f272e0f13ec35a2ece93918ac3 Mon Sep 17 00:00:00 2001 From: marston Date: Fri, 28 Jun 2024 16:11:22 -0400 Subject: [PATCH 03/11] adding logging --- app/upgrades/v4/upgrades.go | 15 ++++++++++----- x/jklmint/keeper/migrations.go | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index 053343aa..ccd8ac21 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -60,6 +60,8 @@ type MerkleContents struct { } func UpdateFileTree(ctx sdk.Context, fk *filetreemodulekeeper.Keeper, merkleMap map[string][]byte) { + ctx.Logger().Info("Migrating filetree formatting...") + allFiles := fk.GetAllFiles(ctx) for _, file := range allFiles { @@ -99,6 +101,8 @@ func UpdateFileTree(ctx sdk.Context, fk *filetreemodulekeeper.Keeper, merkleMap } func UpdatePaymentInfo(ctx sdk.Context, sk *storagekeeper.Keeper) { + ctx.Logger().Info("Updating all user payment information...") + paymentInfo := sk.GetAllStoragePaymentInfo(ctx) for _, info := range paymentInfo { @@ -119,6 +123,7 @@ func UpdatePaymentInfo(ctx sdk.Context, sk *storagekeeper.Keeper) { } func UpdateFiles(ctx sdk.Context, sk *storagekeeper.Keeper) map[string][]byte { + ctx.Logger().Info("Updating all files to Universal Files...") fidMerkle := make(map[string][]byte) allDeals := sk.GetAllLegacyActiveDeals(ctx) @@ -197,17 +202,17 @@ func (u *Upgrade) Handler() upgradetypes.UpgradeHandler { fromVM[storagemoduletypes.ModuleName] = 7 fromVM[jklminttypes.ModuleName] = 6 + newVM, err := u.mm.RunMigrations(ctx, u.configurator, fromVM) + if err != nil { + return newVM, err + } + fidMerkleMap := UpdateFiles(ctx, u.sk) UpdateFileTree(ctx, u.fk, fidMerkleMap) UpdatePaymentInfo(ctx, u.sk) // updating payment info with values at time of upgrade - newVM, err := u.mm.RunMigrations(ctx, u.configurator, fromVM) - if err != nil { - return newVM, err - } - return newVM, err } } diff --git a/x/jklmint/keeper/migrations.go b/x/jklmint/keeper/migrations.go index e4231c32..667cb59f 100644 --- a/x/jklmint/keeper/migrations.go +++ b/x/jklmint/keeper/migrations.go @@ -28,7 +28,7 @@ func (m Migrator) Migrate2to3(ctx sdk.Context) error { return v210.MigrateStore(ctx, &m.k.paramSpace) } -// Migrate3to4 migrates from version 2 to 3. +// Migrate3to4 migrates from version 3 to 4. func (m Migrator) Migrate3to4(ctx sdk.Context) error { return v3.MigrateStore(ctx, m.legacySubspace, &m.k.paramSpace) } From ad05543d337d00d54004f56b9caef459a5ce6677 Mon Sep 17 00:00:00 2001 From: marston Date: Fri, 28 Jun 2024 16:35:16 -0400 Subject: [PATCH 04/11] ? --- app/upgrades/v4/upgrades.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index ccd8ac21..47bba551 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -199,8 +199,8 @@ func (u *Upgrade) Handler() upgradetypes.UpgradeHandler { return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { ctx.Logger().Info("\nNow updating the Jackal Protocol to:\n\n █████╗ ██████╗ █████╗ ██████╗██╗ █████╗ \n██╔══██╗██╔════╝██╔══██╗██╔════╝██║██╔══██╗\n███████║██║ ███████║██║ ██║███████║\n██╔══██║██║ ██╔══██║██║ ██║██╔══██║\n██║ ██║╚██████╗██║ ██║╚██████╗██║██║ ██║\n╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═════╝╚═╝╚═╝ ╚═╝\n \n") - fromVM[storagemoduletypes.ModuleName] = 7 - fromVM[jklminttypes.ModuleName] = 6 + fromVM[storagemoduletypes.ModuleName] = 6 + fromVM[jklminttypes.ModuleName] = 5 newVM, err := u.mm.RunMigrations(ctx, u.configurator, fromVM) if err != nil { From 1103206afe892e72afa9c9f8ade00b137591bd0b Mon Sep 17 00:00:00 2001 From: marston Date: Fri, 28 Jun 2024 16:38:32 -0400 Subject: [PATCH 05/11] ? --- app/upgrades/v4/upgrades.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index 47bba551..fc4e7fdc 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -200,7 +200,7 @@ func (u *Upgrade) Handler() upgradetypes.UpgradeHandler { ctx.Logger().Info("\nNow updating the Jackal Protocol to:\n\n █████╗ ██████╗ █████╗ ██████╗██╗ █████╗ \n██╔══██╗██╔════╝██╔══██╗██╔════╝██║██╔══██╗\n███████║██║ ███████║██║ ██║███████║\n██╔══██║██║ ██╔══██║██║ ██║██╔══██║\n██║ ██║╚██████╗██║ ██║╚██████╗██║██║ ██║\n╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═════╝╚═╝╚═╝ ╚═╝\n \n") fromVM[storagemoduletypes.ModuleName] = 6 - fromVM[jklminttypes.ModuleName] = 5 + fromVM[jklminttypes.ModuleName] = 4 newVM, err := u.mm.RunMigrations(ctx, u.configurator, fromVM) if err != nil { From ad60443970bd671bbc64d38ea465501db0b52585 Mon Sep 17 00:00:00 2001 From: marston Date: Fri, 28 Jun 2024 16:48:01 -0400 Subject: [PATCH 06/11] ?? --- app/upgrades/v4/upgrades.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index fc4e7fdc..c94720a3 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -200,7 +200,7 @@ func (u *Upgrade) Handler() upgradetypes.UpgradeHandler { ctx.Logger().Info("\nNow updating the Jackal Protocol to:\n\n █████╗ ██████╗ █████╗ ██████╗██╗ █████╗ \n██╔══██╗██╔════╝██╔══██╗██╔════╝██║██╔══██╗\n███████║██║ ███████║██║ ██║███████║\n██╔══██║██║ ██╔══██║██║ ██║██╔══██║\n██║ ██║╚██████╗██║ ██║╚██████╗██║██║ ██║\n╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═════╝╚═╝╚═╝ ╚═╝\n \n") fromVM[storagemoduletypes.ModuleName] = 6 - fromVM[jklminttypes.ModuleName] = 4 + fromVM[jklminttypes.ModuleName] = 3 newVM, err := u.mm.RunMigrations(ctx, u.configurator, fromVM) if err != nil { From 13fc08611cd1e7a1722854384c775c3399d585b2 Mon Sep 17 00:00:00 2001 From: marston Date: Fri, 28 Jun 2024 17:02:39 -0400 Subject: [PATCH 07/11] ??? --- app/upgrades/v4/upgrades.go | 2 +- x/jklmint/keeper/migrations.go | 8 ++++---- x/jklmint/legacy/{v3 => v4}/params.go | 2 +- x/jklmint/legacy/{v3 => v4}/params.pb.go | 2 +- x/jklmint/legacy/{v3 => v4}/store.go | 4 ++-- x/jklmint/module.go | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename x/jklmint/legacy/{v3 => v4}/params.go (99%) rename x/jklmint/legacy/{v3 => v4}/params.pb.go (99%) rename x/jklmint/legacy/{v3 => v4}/store.go (94%) diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index c94720a3..fc4e7fdc 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -200,7 +200,7 @@ func (u *Upgrade) Handler() upgradetypes.UpgradeHandler { ctx.Logger().Info("\nNow updating the Jackal Protocol to:\n\n █████╗ ██████╗ █████╗ ██████╗██╗ █████╗ \n██╔══██╗██╔════╝██╔══██╗██╔════╝██║██╔══██╗\n███████║██║ ███████║██║ ██║███████║\n██╔══██║██║ ██╔══██║██║ ██║██╔══██║\n██║ ██║╚██████╗██║ ██║╚██████╗██║██║ ██║\n╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═════╝╚═╝╚═╝ ╚═╝\n \n") fromVM[storagemoduletypes.ModuleName] = 6 - fromVM[jklminttypes.ModuleName] = 3 + fromVM[jklminttypes.ModuleName] = 4 newVM, err := u.mm.RunMigrations(ctx, u.configurator, fromVM) if err != nil { diff --git a/x/jklmint/keeper/migrations.go b/x/jklmint/keeper/migrations.go index 667cb59f..ef0cd71b 100644 --- a/x/jklmint/keeper/migrations.go +++ b/x/jklmint/keeper/migrations.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/jackalLabs/canine-chain/v4/x/jklmint/exported" v210 "github.com/jackalLabs/canine-chain/v4/x/jklmint/legacy/v210" - v3 "github.com/jackalLabs/canine-chain/v4/x/jklmint/legacy/v3" + "github.com/jackalLabs/canine-chain/v4/x/jklmint/legacy/v4" ) // Migrator is a struct for handling in-place store migrations. @@ -28,7 +28,7 @@ func (m Migrator) Migrate2to3(ctx sdk.Context) error { return v210.MigrateStore(ctx, &m.k.paramSpace) } -// Migrate3to4 migrates from version 3 to 4. -func (m Migrator) Migrate3to4(ctx sdk.Context) error { - return v3.MigrateStore(ctx, m.legacySubspace, &m.k.paramSpace) +// Migrate4to5 migrates from version 4 to 5. +func (m Migrator) Migrate4to5(ctx sdk.Context) error { + return v4.MigrateStore(ctx, m.legacySubspace, &m.k.paramSpace) } diff --git a/x/jklmint/legacy/v3/params.go b/x/jklmint/legacy/v4/params.go similarity index 99% rename from x/jklmint/legacy/v3/params.go rename to x/jklmint/legacy/v4/params.go index 46d9d842..cd61d137 100644 --- a/x/jklmint/legacy/v3/params.go +++ b/x/jklmint/legacy/v4/params.go @@ -1,4 +1,4 @@ -package v3 +package v4 import ( "fmt" diff --git a/x/jklmint/legacy/v3/params.pb.go b/x/jklmint/legacy/v4/params.pb.go similarity index 99% rename from x/jklmint/legacy/v3/params.pb.go rename to x/jklmint/legacy/v4/params.pb.go index b10a42f7..1854b591 100644 --- a/x/jklmint/legacy/v3/params.pb.go +++ b/x/jklmint/legacy/v4/params.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: canine_chain/jklmint/params.proto -package v3 +package v4 import ( fmt "fmt" diff --git a/x/jklmint/legacy/v3/store.go b/x/jklmint/legacy/v4/store.go similarity index 94% rename from x/jklmint/legacy/v3/store.go rename to x/jklmint/legacy/v4/store.go index 1d682724..3f7908eb 100644 --- a/x/jklmint/legacy/v3/store.go +++ b/x/jklmint/legacy/v4/store.go @@ -1,4 +1,4 @@ -package v3 +package v4 import ( sdk "github.com/cosmos/cosmos-sdk/types" @@ -12,7 +12,7 @@ import ( // 1. setting up the next reason id and report id keys for existing subspaces // 2. setting up the module params func MigrateStore(ctx sdk.Context, legacy exported.Subspace, paramsSubspace *paramstypes.Subspace) error { - ctx.Logger().Error("MIGRATING MINT STORE!") + ctx.Logger().Info("MIGRATING MINT STORE!") // Set the module params var currParams Params legacy.GetParamSet(ctx, &currParams) diff --git a/x/jklmint/module.go b/x/jklmint/module.go index 0a552f0c..071174bc 100644 --- a/x/jklmint/module.go +++ b/x/jklmint/module.go @@ -158,7 +158,7 @@ func (am AppModule) RegisterServices(cfg module.Configurator) { panic(err) } - err = cfg.RegisterMigration(types.ModuleName, 3, m.Migrate3to4) + err = cfg.RegisterMigration(types.ModuleName, 4, m.Migrate4to5) if err != nil { panic(err) } From bda6ac0f30119a8fdee74ac64f1c0c7bec72ec1e Mon Sep 17 00:00:00 2001 From: marston Date: Fri, 28 Jun 2024 17:11:19 -0400 Subject: [PATCH 08/11] ???????? --- x/jklmint/keeper/migrations.go | 6 ------ x/jklmint/legacy/v210/store.go | 23 ----------------------- x/jklmint/module.go | 7 +------ 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 x/jklmint/legacy/v210/store.go diff --git a/x/jklmint/keeper/migrations.go b/x/jklmint/keeper/migrations.go index ef0cd71b..488a054c 100644 --- a/x/jklmint/keeper/migrations.go +++ b/x/jklmint/keeper/migrations.go @@ -5,7 +5,6 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/jackalLabs/canine-chain/v4/x/jklmint/exported" - v210 "github.com/jackalLabs/canine-chain/v4/x/jklmint/legacy/v210" "github.com/jackalLabs/canine-chain/v4/x/jklmint/legacy/v4" ) @@ -23,11 +22,6 @@ func NewMigrator(keeper Keeper, legacy exported.Subspace) Migrator { } } -// Migrate2to3 migrates from version 2 to 3. -func (m Migrator) Migrate2to3(ctx sdk.Context) error { - return v210.MigrateStore(ctx, &m.k.paramSpace) -} - // Migrate4to5 migrates from version 4 to 5. func (m Migrator) Migrate4to5(ctx sdk.Context) error { return v4.MigrateStore(ctx, m.legacySubspace, &m.k.paramSpace) diff --git a/x/jklmint/legacy/v210/store.go b/x/jklmint/legacy/v210/store.go deleted file mode 100644 index 94416426..00000000 --- a/x/jklmint/legacy/v210/store.go +++ /dev/null @@ -1,23 +0,0 @@ -package v210 - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - v3 "github.com/jackalLabs/canine-chain/v4/x/jklmint/legacy/v3" -) - -// MigrateStore performs in-place store migrations from v1 to v2 -// The things done here are the following: -// 1. setting up the next reason id and report id keys for existing subspaces -// 2. setting up the module params -func MigrateStore(ctx sdk.Context, paramsSubspace *paramstypes.Subspace) error { - ctx.Logger().Error("MIGRATING MINT STORE!") - // Set the module params - params := v3.DefaultParams() - - params.ProviderRatio = 0 - - paramsSubspace.SetParamSet(ctx, ¶ms) - - return nil -} diff --git a/x/jklmint/module.go b/x/jklmint/module.go index 071174bc..ec127f23 100644 --- a/x/jklmint/module.go +++ b/x/jklmint/module.go @@ -153,12 +153,7 @@ func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterQueryServer(cfg.QueryServer(), am.keeper) m := keeper.NewMigrator(am.keeper, am.legacySubspace) - err := cfg.RegisterMigration(types.ModuleName, 2, m.Migrate2to3) - if err != nil { - panic(err) - } - - err = cfg.RegisterMigration(types.ModuleName, 4, m.Migrate4to5) + err := cfg.RegisterMigration(types.ModuleName, 4, m.Migrate4to5) if err != nil { panic(err) } From b69c02b4b3718864ab900919cda8e0e72ff25789 Mon Sep 17 00:00:00 2001 From: marston Date: Fri, 28 Jun 2024 17:19:53 -0400 Subject: [PATCH 09/11] ??????????????? --- app/upgrades/v4/upgrades.go | 2 +- x/storage/module.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index fc4e7fdc..42a901d4 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -199,7 +199,7 @@ func (u *Upgrade) Handler() upgradetypes.UpgradeHandler { return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { ctx.Logger().Info("\nNow updating the Jackal Protocol to:\n\n █████╗ ██████╗ █████╗ ██████╗██╗ █████╗ \n██╔══██╗██╔════╝██╔══██╗██╔════╝██║██╔══██╗\n███████║██║ ███████║██║ ██║███████║\n██╔══██║██║ ██╔══██║██║ ██║██╔══██║\n██║ ██║╚██████╗██║ ██║╚██████╗██║██║ ██║\n╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═════╝╚═╝╚═╝ ╚═╝\n \n") - fromVM[storagemoduletypes.ModuleName] = 6 + fromVM[storagemoduletypes.ModuleName] = 5 fromVM[jklminttypes.ModuleName] = 4 newVM, err := u.mm.RunMigrations(ctx, u.configurator, fromVM) diff --git a/x/storage/module.go b/x/storage/module.go index 187446b6..d96d8964 100644 --- a/x/storage/module.go +++ b/x/storage/module.go @@ -199,7 +199,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw } // ConsensusVersion implements ConsensusVersion. -func (AppModule) ConsensusVersion() uint64 { return 7 } +func (AppModule) ConsensusVersion() uint64 { return 6 } // BeginBlock executes all ABCI BeginBlock logic respective to the capability module. func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) { // Every x blocks we check for proven deals From 2091ad2ed2579d89ed358e5dd38b1563d783fdc4 Mon Sep 17 00:00:00 2001 From: marston Date: Fri, 28 Jun 2024 17:38:49 -0400 Subject: [PATCH 10/11] adjusting legacy merkles --- app/upgrades/v4/upgrades.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index 42a901d4..4d125ca1 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -56,7 +56,7 @@ type FidContents struct { } type MerkleContents struct { - Merkles [][]byte `json:"merkles"` + Merkles [][]byte `json:"legacyMerkles"` } func UpdateFileTree(ctx sdk.Context, fk *filetreemodulekeeper.Keeper, merkleMap map[string][]byte) { @@ -87,6 +87,16 @@ func UpdateFileTree(ctx sdk.Context, fk *filetreemodulekeeper.Keeper, merkleMap } + /** + { + "fids": ["fid1", "fid2", "fid3"] + } + + { + "legacyMerkles": ["merkle1", "merkle2", "merkle3"] + } + */ + merkleContents := MerkleContents{Merkles: merkles} merkleContentBytes, err := json.Marshal(merkleContents) From d443c08bdb881ddd85b5d6c2c1ef328f704403ef Mon Sep 17 00:00:00 2001 From: marston Date: Fri, 28 Jun 2024 23:31:22 -0400 Subject: [PATCH 11/11] fixing unit tests with weird coin issues --- x/jklmint/keeper/mint_test.go | 2 +- .../keeper/grpc_query_active_deals_test.go | 4 +++- x/storage/keeper/grpc_query_find_file_test.go | 8 +++++-- x/storage/keeper/keeper_test.go | 22 ++++++++++++++++++ x/storage/keeper/msg_server_buy_storage.go | 12 +++++++--- .../keeper/msg_server_buy_storage_test.go | 23 +++++++++++-------- x/storage/keeper/msg_server_post_file_test.go | 4 +++- x/storage/keeper/msg_server_proofs_test.go | 4 +++- .../keeper/msg_server_upgrade_storage_test.go | 4 +++- x/storage/keeper/providers_test.go | 4 ++-- x/storage/keeper/utils_test.go | 4 ++-- 11 files changed, 67 insertions(+), 24 deletions(-) diff --git a/x/jklmint/keeper/mint_test.go b/x/jklmint/keeper/mint_test.go index c8dcee51..93467bef 100644 --- a/x/jklmint/keeper/mint_test.go +++ b/x/jklmint/keeper/mint_test.go @@ -75,7 +75,7 @@ func (suite *MintTestSuite) TestNoProviderBlockMint() { supplyAfter, err := app.BankKeeper.TotalSupply(sdk.WrapSDKContext(ctx), &types.QueryTotalSupplyRequest{}) suite.Require().NoError(err) suite.Require().Equal(1, len(supplyAfter.Supply)) - suite.Require().Equal(sdk.NewInt(419999), supplyAfter.Supply.AmountOf(denom)) + suite.Require().Equal(sdk.NewInt(4199999), supplyAfter.Supply.AmountOf(denom)) // After BlockMint we now have exactly 3.6JKL in the fee collector account } diff --git a/x/storage/keeper/grpc_query_active_deals_test.go b/x/storage/keeper/grpc_query_active_deals_test.go index bf9a00cb..62db07fc 100644 --- a/x/storage/keeper/grpc_query_active_deals_test.go +++ b/x/storage/keeper/grpc_query_active_deals_test.go @@ -101,7 +101,9 @@ func (suite *KeeperTestSuite) TestAllFiles() { MaxContractAgeInBlocks: 100, PricePerTbPerMonth: 8, CollateralPrice: 2, - CheckWindow: 10, + CheckWindow: 11, + ReferralCommission: 25, + PolRatio: 40, }) merkle := []byte("merkle") diff --git a/x/storage/keeper/grpc_query_find_file_test.go b/x/storage/keeper/grpc_query_find_file_test.go index ae21b6de..5e87504e 100644 --- a/x/storage/keeper/grpc_query_find_file_test.go +++ b/x/storage/keeper/grpc_query_find_file_test.go @@ -28,12 +28,16 @@ func (suite *KeeperTestSuite) TestFindFile() { DepositAccount: depoAccount, ProofWindow: 50, ChunkSize: 1024, - PriceFeed: "jklprice", MissesToBurn: 3, + PriceFeed: "jklprice", MaxContractAgeInBlocks: 100, PricePerTbPerMonth: 8, + AttestFormSize: 0, + AttestMinToPass: 0, CollateralPrice: 2, - CheckWindow: 10, + CheckWindow: 11, + PolRatio: 40, + ReferralCommission: 25, }) merkle := []byte("merkle") diff --git a/x/storage/keeper/keeper_test.go b/x/storage/keeper/keeper_test.go index f6bb1b20..ce088f6e 100644 --- a/x/storage/keeper/keeper_test.go +++ b/x/storage/keeper/keeper_test.go @@ -5,6 +5,8 @@ import ( "testing" "time" + "github.com/jackalLabs/canine-chain/v4/testutil" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" @@ -63,6 +65,26 @@ func setupMsgServer(suite *KeeperTestSuite) (types.MsgServer, keeper.Keeper, goc k := suite.storageKeeper storage.InitGenesis(suite.ctx, *k, *types.DefaultGenesis()) ctx := sdk.WrapSDKContext(suite.ctx) + + testAddresses, err := testutil.CreateTestAddresses("cosmos", 3) + suite.Require().NoError(err) + + depoAccount := testAddresses[0] + + k.SetParams(suite.ctx, types.Params{ + DepositAccount: depoAccount, + ProofWindow: 50, + ChunkSize: 1024, + PriceFeed: "jklprice", + MissesToBurn: 3, + MaxContractAgeInBlocks: 100, + PricePerTbPerMonth: 15, + CollateralPrice: 2, + CheckWindow: 11, + ReferralCommission: 25, + PolRatio: 40, + }) + return keeper.NewMsgServerImpl(*k), *k, ctx } diff --git a/x/storage/keeper/msg_server_buy_storage.go b/x/storage/keeper/msg_server_buy_storage.go index 04d1a2c0..4f1447db 100644 --- a/x/storage/keeper/msg_server_buy_storage.go +++ b/x/storage/keeper/msg_server_buy_storage.go @@ -99,6 +99,7 @@ func (k msgServer) BuyStorage(goCtx context.Context, msg *types.MsgBuyStorage) ( } pol := sdk.NewDec(params.PolRatio).QuoInt64(100) + discount := sdk.NewDec(0) fmt.Printf("POL: %d / %f\n", params.PolRatio, pol.MustFloat64()) if referred { @@ -107,9 +108,11 @@ func (k msgServer) BuyStorage(goCtx context.Context, msg *types.MsgBuyStorage) ( var hour int64 = 1000 * 60 * 60 if duration.Milliseconds() > 365*24*hour { p = p.Mul(sdk.MustNewDecFromStr("0.95")) + discount = sdk.NewDec(5).QuoInt64(100) // 5% discount pol = pol.Sub(sdk.MustNewDecFromStr("0.05")) } else { p = p.Mul(sdk.MustNewDecFromStr("0.90")) + discount = sdk.NewDec(10).QuoInt64(100) // 10% discount pol = pol.Sub(sdk.MustNewDecFromStr("0.1")) } @@ -141,10 +144,13 @@ func (k msgServer) BuyStorage(goCtx context.Context, msg *types.MsgBuyStorage) ( } refDec := sdk.NewDec(params.ReferralCommission).QuoInt64(100) - fmt.Printf("refcom: %d", params.ReferralCommission) - spr := sdk.NewDec(1).Sub(refDec).Sub(pol) // whatever is left from pol and referrals + fmt.Printf("RATIOS!\nref: %d\npol: %d\ndiscount: %d\n", refDec.MulInt64(100).TruncateInt64(), pol.MulInt64(100).TruncateInt64(), discount.MulInt64(100).TruncateInt64()) + spr := sdk.NewDec(1).Sub(refDec).Sub(pol).Sub(discount) // whatever is left from pol and referrals - fmt.Printf("storageprovider ratio: %d\n", spr.TruncateInt().Int64()) + // 1 - 0.25 = 0.75 + // + + fmt.Printf("storageprovider ratio: %d\n", spr.MulInt64(100).TruncateInt().Int64()) storageProviderCut := toPay.Amount.ToDec().Mul(spr) spcToken := sdk.NewCoin(toPay.Denom, storageProviderCut.TruncateInt()) diff --git a/x/storage/keeper/msg_server_buy_storage_test.go b/x/storage/keeper/msg_server_buy_storage_test.go index d868a109..7e011475 100644 --- a/x/storage/keeper/msg_server_buy_storage_test.go +++ b/x/storage/keeper/msg_server_buy_storage_test.go @@ -32,7 +32,7 @@ func (suite *KeeperTestSuite) TestBuyStorage() { MaxContractAgeInBlocks: 100, PricePerTbPerMonth: 15, CollateralPrice: 2, - CheckWindow: 10, + CheckWindow: 11, ReferralCommission: 25, PolRatio: 40, }) @@ -134,7 +134,7 @@ func (suite *KeeperTestSuite) TestBuyStorage() { Referral: depoAccount, }, expErr: false, - tokens: 25312499, + tokens: 19687499, expErrMsg: "", }, { @@ -254,7 +254,7 @@ func (suite *KeeperTestSuite) TestBuyStorageValues() { MaxContractAgeInBlocks: 100, PricePerTbPerMonth: 15, CollateralPrice: 2, - CheckWindow: 10, + CheckWindow: 11, ReferralCommission: 25, PolRatio: 40, }) @@ -315,7 +315,13 @@ func (suite *KeeperTestSuite) TestBuyStorageReferralValues() { err = suite.bankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, testAcc, coins) suite.Require().NoError(err) - suite.storageKeeper.SetParams(suite.ctx, types.Params{ + providerAccount, err := types.GetTokenHolderAccount() + suite.Require().NoError(err) + + bal := suite.bankKeeper.GetBalance(suite.ctx, providerAccount, "ujkl") + suite.Require().Equal(int64(0), bal.Amount.Int64()) + + k.SetParams(suite.ctx, types.Params{ DepositAccount: depoAccount, ProofWindow: 50, ChunkSize: 1024, @@ -324,7 +330,7 @@ func (suite *KeeperTestSuite) TestBuyStorageReferralValues() { MaxContractAgeInBlocks: 100, PricePerTbPerMonth: 15, CollateralPrice: 2, - CheckWindow: 10, + CheckWindow: 11, ReferralCommission: 25, PolRatio: 40, }) @@ -342,12 +348,9 @@ func (suite *KeeperTestSuite) TestBuyStorageReferralValues() { }) suite.Require().NoError(err) - cost := float64(suite.storageKeeper.GetStorageCost(suite.ctx, bytes/1_000_000_000, days*24).Int64()) // * 0.90 + cost := float64(suite.storageKeeper.GetStorageCost(suite.ctx, bytes/1_000_000_000, days*24).Int64()) * 0.9 - providerAccount, err := types.GetTokenHolderAccount() - suite.Require().NoError(err) - - bal := suite.bankKeeper.GetBalance(suite.ctx, providerAccount, "ujkl") + bal = suite.bankKeeper.GetBalance(suite.ctx, providerAccount, "ujkl") suite.Require().Equal(int64(cost*0.35), bal.Amount.Int64()) polAccount, err := types.GetPOLAccount() diff --git a/x/storage/keeper/msg_server_post_file_test.go b/x/storage/keeper/msg_server_post_file_test.go index d1c7b126..eba7e37f 100644 --- a/x/storage/keeper/msg_server_post_file_test.go +++ b/x/storage/keeper/msg_server_post_file_test.go @@ -31,7 +31,9 @@ func (suite *KeeperTestSuite) TestPostFile() { MaxContractAgeInBlocks: 100, PricePerTbPerMonth: 8, CollateralPrice: 2, - CheckWindow: 10, + CheckWindow: 11, + ReferralCommission: 25, + PolRatio: 40, }) suite.storageKeeper.SetProviders(suite.ctx, types.Providers{ diff --git a/x/storage/keeper/msg_server_proofs_test.go b/x/storage/keeper/msg_server_proofs_test.go index fa82b90c..6b79b4ac 100644 --- a/x/storage/keeper/msg_server_proofs_test.go +++ b/x/storage/keeper/msg_server_proofs_test.go @@ -137,7 +137,9 @@ func (suite *KeeperTestSuite) TestPostProof() { MaxContractAgeInBlocks: 100, PricePerTbPerMonth: 8, CollateralPrice: 2, - CheckWindow: 10, + CheckWindow: 11, + PolRatio: 40, + ReferralCommission: 25, }) // Init Provider diff --git a/x/storage/keeper/msg_server_upgrade_storage_test.go b/x/storage/keeper/msg_server_upgrade_storage_test.go index ad7bb79c..c8c41773 100644 --- a/x/storage/keeper/msg_server_upgrade_storage_test.go +++ b/x/storage/keeper/msg_server_upgrade_storage_test.go @@ -30,7 +30,9 @@ func (suite *KeeperTestSuite) TestUpgradeStorage() { MaxContractAgeInBlocks: 100, PricePerTbPerMonth: 8, CollateralPrice: 2, - CheckWindow: 10, + CheckWindow: 11, + ReferralCommission: 25, + PolRatio: 40, }) cases := []struct { diff --git a/x/storage/keeper/providers_test.go b/x/storage/keeper/providers_test.go index 998f0369..77a51053 100644 --- a/x/storage/keeper/providers_test.go +++ b/x/storage/keeper/providers_test.go @@ -44,7 +44,7 @@ func (suite *KeeperTestSuite) TestSetProviders() { // testing providers.go file func (suite *KeeperTestSuite) TestInitProviders() { suite.SetupSuite() - msgSrvr, _, ctx := setupMsgServer(suite) + msgSrvr, k, ctx := setupMsgServer(suite) testAddresses, err := testutil.CreateTestAddresses("cosmos", 1) suite.Require().NoError(err) @@ -83,7 +83,7 @@ func (suite *KeeperTestSuite) TestInitProviders() { coin := suite.bankKeeper.GetBalance(suite.ctx, userAcc, "ujkl") - suite.Require().Equal(sdk.NewInt(0), coin.Amount) + suite.Require().Equal(deposit.Amount.SubRaw(k.GetParams(suite.ctx).CollateralPrice).Int64(), coin.Amount.Int64()) shutdownMsg := types.MsgShutdownProvider{ Creator: user, diff --git a/x/storage/keeper/utils_test.go b/x/storage/keeper/utils_test.go index 15a9909a..3b25ec12 100644 --- a/x/storage/keeper/utils_test.go +++ b/x/storage/keeper/utils_test.go @@ -114,13 +114,13 @@ func (suite *KeeperTestSuite) TestGetStorageCost() { name: "10GB for 5months", gbs: 10, months: 5, - expected: sdk.NewInt(555555), + expected: sdk.NewInt(1041666), }, { name: "5GB for 24months", gbs: 5, months: 24, - expected: sdk.NewInt(1111111), + expected: sdk.NewInt(2083333), }, }