feat: ADR-006: Subspaces module

.changeset/entries/1fd815be9372a13668455bb550707d515b63dd90fceb597e339f5e732b702bbb.yaml

@@ -0,0 +1,6 @@
+type: refactor
+module: x/profiles
+pull_request: 728
+description: Changed the subspace id type from string to uint64
+backward_compatible: false
+date: 2022-01-24T15:00:42.365992872Z

.changeset/entries/7804abd9534fe93894ef9a0bba10c1e28531dfd3420616246ebcdbe0c889326f.yaml

@@ -0,0 +1,6 @@
+type: feat
+module: x/subspaces
+pull_request: 728
+description: Added the new `x/subspaces` module
+backward_compatible: false
+date: 2022-01-24T11:13:39.102634771Z

app/app.go

@@ -8,6 +8,8 @@ import (
  "path/filepath"
  "strings"
 
+ "github.com/desmos-labs/desmos/v2/x/subspaces"
+
  "github.com/cosmos/cosmos-sdk/version"
 
  "github.com/cosmos/cosmos-sdk/x/auth/vesting"
@@ -84,6 +86,8 @@ import (
  "github.com/desmos-labs/desmos/v2/x/profiles"
  profileskeeper "github.com/desmos-labs/desmos/v2/x/profiles/keeper"
  profilestypes "github.com/desmos-labs/desmos/v2/x/profiles/types"
+ subspaceskeeper "github.com/desmos-labs/desmos/v2/x/subspaces/keeper"
+ subspacestypes "github.com/desmos-labs/desmos/v2/x/subspaces/types"
 
  authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
  bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
@@ -209,6 +213,7 @@ var (
 
  // Custom modules
  profiles.AppModuleBasic{},
+ subspaces.AppModuleBasic{},
  )
 
  // Module account permissions
@@ -268,7 +273,8 @@ type DesmosApp struct {
  ScopedWasmKeeper capabilitykeeper.ScopedKeeper
 
  // Custom modules
- ProfileKeeper profileskeeper.Keeper
+ SubspacesKeeper subspaceskeeper.Keeper
+ ProfileKeeper profileskeeper.Keeper
 
  // Module Manager
  mm *module.Manager
@@ -315,7 +321,7 @@ func NewDesmosApp(
  authzkeeper.StoreKey, wasm.StoreKey,
 
  // Custom modules
- profilestypes.StoreKey,
+ subspacestypes.StoreKey, profilestypes.StoreKey,
  )
  tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
  memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
@@ -405,17 +411,21 @@ func NewDesmosApp(
  )
  transferModule := ibctransfer.NewAppModule(app.TransferKeeper)
 
+ // Create subspaces keeper
+ app.SubspacesKeeper = subspaceskeeper.NewKeeper(app.appCodec, keys[subspacestypes.StoreKey])
+
  // Create profiles keeper
  app.ProfileKeeper = profileskeeper.NewKeeper(
  app.appCodec,
  keys[profilestypes.StoreKey],
  app.GetSubspace(profilestypes.ModuleName),
  app.AccountKeeper,
+ app.SubspacesKeeper,
  app.IBCKeeper.ChannelKeeper,
  &app.IBCKeeper.PortKeeper,
  scopedProfilesKeeper,
  )
- profilesModule := profiles.NewAppModule(appCodec, legacyAmino, app.ProfileKeeper, app.AccountKeeper, app.BankKeeper)
+ profilesModule := profiles.NewAppModule(appCodec, legacyAmino, app.ProfileKeeper, app.SubspacesKeeper, app.AccountKeeper, app.BankKeeper)
 
  // Create static IBC router, add transfer route, then set and seal it
  ibcRouter := porttypes.NewRouter()
@@ -513,6 +523,7 @@ func NewDesmosApp(
  wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper),
 
  // Custom modules
+ subspaces.NewAppModule(appCodec, app.SubspacesKeeper, app.AccountKeeper, app.BankKeeper),
  profilesModule,
  )
 
@@ -524,6 +535,7 @@ func NewDesmosApp(
  app.mm.SetOrderBeginBlockers(
  upgradetypes.ModuleName, capabilitytypes.ModuleName, minttypes.ModuleName, distrtypes.ModuleName, slashingtypes.ModuleName,
  evidencetypes.ModuleName, stakingtypes.ModuleName, ibchost.ModuleName,
+ // TODO: See if we need a BeginBlocker for the subspaces module
  )
  app.mm.SetOrderEndBlockers(crisistypes.ModuleName, govtypes.ModuleName, stakingtypes.ModuleName)
 
@@ -540,7 +552,7 @@ func NewDesmosApp(
  feegrant.ModuleName, wasm.ModuleName,
 
  // Custom modules
- profilestypes.ModuleName,
+ subspacestypes.ModuleName, profilestypes.ModuleName,
 
  crisistypes.ModuleName,
  )
@@ -575,7 +587,8 @@ func NewDesmosApp(
  wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper),
 
  // Custom modules
- profiles.NewAppModule(app.appCodec, legacyAmino, app.ProfileKeeper, app.AccountKeeper, app.BankKeeper),
+ subspaces.NewAppModule(app.appCodec, app.SubspacesKeeper, app.AccountKeeper, app.BankKeeper),
+ profiles.NewAppModule(app.appCodec, legacyAmino, app.ProfileKeeper, app.SubspacesKeeper, app.AccountKeeper, app.BankKeeper),
  )
 
  app.sm.RegisterStoreDecoders()
@@ -767,7 +780,8 @@ func (app *DesmosApp) RegisterTendermintService(clientCtx client.Context) {
 }
 
 func (app *DesmosApp) registerUpgradeHandlers() {
- app.UpgradeKeeper.SetUpgradeHandler("v2.3.1", func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+ app.UpgradeKeeper.SetUpgradeHandler("v3.0.0", func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+ // Nothing to do here for the x/subspaces module since the InitGenesis will be called
  return app.mm.RunMigrations(ctx, app.configurator, fromVM)
  })
 
@@ -776,8 +790,13 @@ func (app *DesmosApp) registerUpgradeHandlers() {
  panic(err)
  }
 
- if upgradeInfo.Name == "v2.3.1" && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
- storeUpgrades := storetypes.StoreUpgrades{}
+ if upgradeInfo.Name == "v3.0.0" && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
+ storeUpgrades := storetypes.StoreUpgrades{
+ Added: []string{
+ wasm.ModuleName,
+ subspacestypes.ModuleName,
+ },
+ }
 
  // Configure store loader that checks if version == upgradeHeight and applies store upgrades
  app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))

app/params/weights.go

@@ -2,13 +2,6 @@ package params
 
 // Default simulation operation weights for messages
 const (
- DefaultWeightMsgCreatePost int = 100
- DefaultWeightMsgEditPost int = 75
- DefaultWeightMsgAddReaction int = 80
- DefaultWeightMsgRemoveReaction int = 40
- DefaultWeightMsgAnswerPoll int = 20
- DefaultWeightMsgRegisterReaction int = 50
-
  DefaultWeightMsgSaveProfile int = 80
  DefaultWeightMsgDeleteProfile int = 20
  DefaultWeightMsgRequestDTagTransfer int = 85
@@ -21,14 +14,11 @@ const (
  DefaultWeightMsgBlockUser int = 50
  DefaultWeightMsgUnblockUser int = 50
 
- DefaultWeightMsgReportPost int = 50
-
- DefaultWeightMsgCreateSubspace int = 100
- DefaultWeightMsgEditSubspace int = 75
- DefaultWeightMsgAddAmin int = 40
- DefaultWeightMsgRemoveAdmin int = 40
- DefaultWeightMsgRegisterUser int = 60
- DefaultWeightMsgUnregisterUser int = 50
- DefaultWeightMsgBanUser int = 30
- DefaultWeightMsgUnbanUser int = 20
+ DefaultWeightMsgCreateSubspace int = 80
+ DefaultWeightMsgEditSubspace int = 30
+ DefaultWeightMsgCreateUserGroup int = 10
+ DefaultWeightMsgDeleteUserGroup int = 5
+ DefaultWeightMsgAddUserToUserGroup int = 7
+ DefaultWeightMsgRemoveUserFromUserGroup int = 3
+ DefaultWeightMsgSetPermissions int = 85
 )

app/sim_test.go

@@ -8,6 +8,8 @@ import (
  "path/filepath"
  "testing"
 
+ subspacestypes "github.com/desmos-labs/desmos/v2/x/subspaces/types"
+
  banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
  distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
  evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
@@ -217,10 +219,12 @@ func TestAppImportExport(t *testing.T) {
  {app.keys[govtypes.StoreKey], newApp.keys[govtypes.StoreKey], [][]byte{}},
  {app.keys[evidencetypes.StoreKey], newApp.keys[evidencetypes.StoreKey], [][]byte{}},
 
- {app.keys[profilestypes.StoreKey], newApp.keys[profilestypes.StoreKey], [][]byte{}},
  {app.keys[capabilitytypes.StoreKey], newApp.keys[capabilitytypes.StoreKey], [][]byte{}},
  {app.keys[ibchost.StoreKey], newApp.keys[ibchost.StoreKey], [][]byte{}},
  {app.keys[ibctransfertypes.StoreKey], newApp.keys[ibctransfertypes.StoreKey], [][]byte{}},
+
+ {app.keys[subspacestypes.StoreKey], newApp.keys[subspacestypes.StoreKey], [][]byte{}},
+ {app.keys[profilestypes.StoreKey], newApp.keys[profilestypes.StoreKey], [][]byte{}},
  }
 
  for _, skp := range storeKeysPrefixes {