feature/dwn sw js (#1103)

- **feat(macaroon): add  and  to macaroon genesis**
- **refactor: move schema definitions to dedicated file**
- **feat: remove Session model**
- **refactor: move session middleware to internal package**

x/vault/depinject.go

@@ -9,6 +9,7 @@ import (
 	"cosmossdk.io/depinject"
 	"cosmossdk.io/log"
 	"github.com/cosmos/cosmos-sdk/codec"
+	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
@@ -41,6 +42,7 @@ type ModuleInputs struct {
 	StoreService store.KVStoreService
 	AddressCodec address.Codec
 
+	AccountKeeper  authkeeper.AccountKeeper
 	DidKeeper      didkeeper.Keeper
 	StakingKeeper  stakingkeeper.Keeper
 	SlashingKeeper slashingkeeper.Keeper
@@ -56,7 +58,7 @@ type ModuleOutputs struct {
 func ProvideModule(in ModuleInputs) ModuleOutputs {
 	govAddr := authtypes.NewModuleAddress(govtypes.ModuleName).String()
 
-	k := keeper.NewKeeper(in.Cdc, in.StoreService, log.NewLogger(os.Stderr), govAddr, in.DidKeeper)
+	k := keeper.NewKeeper(in.Cdc, in.StoreService, log.NewLogger(os.Stderr), govAddr, in.AccountKeeper, in.DidKeeper)
 	m := NewAppModule(in.Cdc, k, in.DidKeeper)
 
 	return ModuleOutputs{Module: m, Keeper: k, Out: depinject.Out{}}

x/vault/keeper/keeper.go

@@ -10,6 +10,7 @@ import (
 	"cosmossdk.io/orm/model/ormdb"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	"github.com/ipfs/kubo/client/rpc"
@@ -34,7 +35,8 @@ type Keeper struct {
 
 	ipfsClient *rpc.HttpApi
 
-	DIDKeeper didkeeper.Keeper
+	AccountKeeper authkeeper.AccountKeeper
+	DIDKeeper     didkeeper.Keeper
 }
 
 // NewKeeper creates a new Keeper instance
@@ -43,6 +45,7 @@ func NewKeeper(
 	storeService storetypes.KVStoreService,
 	logger log.Logger,
 	authority string,
+	authKeeper authkeeper.AccountKeeper,
 	didk didkeeper.Keeper,
 ) Keeper {
 	logger = logger.With(log.ModuleKey, "x/"+types.ModuleName)
@@ -65,11 +68,12 @@ func NewKeeper(
 
 	ipfsClient, _ := rpc.NewLocalApi()
 	k := Keeper{
-		cdc:       cdc,
-		logger:    logger,
-		DIDKeeper: didk,
-		Params:    collections.NewItem(sb, types.ParamsKey, "params", codec.CollValue[types.Params](cdc)),
-		OrmDB:     store,
+		cdc:           cdc,
+		logger:        logger,
+		DIDKeeper:     didk,
+		AccountKeeper: authKeeper,
+		Params:        collections.NewItem(sb, types.ParamsKey, "params", codec.CollValue[types.Params](cdc)),
+		OrmDB:         store,
 
 		ipfsClient: ipfsClient,
 		authority:  authority,

x/vault/keeper/keeper_test.go

@@ -78,7 +78,7 @@ func SetupTest(t *testing.T) *testFixture {
 	registerBaseSDKModules(f, encCfg, storeService, logger, require)
 
 	// Setup Keeper.
-	f.k = keeper.NewKeeper(encCfg.Codec, storeService, logger, f.govModAddr, f.didk)
+	f.k = keeper.NewKeeper(encCfg.Codec, storeService, logger, f.govModAddr, f.accountkeeper, f.didk)
 	f.msgServer = keeper.NewMsgServerImpl(f.k)
 	f.queryServer = keeper.NewQuerier(f.k)
 	f.appModule = module.NewAppModule(encCfg.Codec, f.k, f.didk)

x/vault/module.go

@@ -56,6 +56,7 @@ func NewAppModule(
 	return &AppModule{
 		AppModuleBasic: AppModuleBasic{cdc: cdc},
 		keeper:         keeper,
+		didk:           didkeeper,
 	}
 }
 

x/vault/types/params.go

@@ -2,6 +2,8 @@ package types
 
 import (
 	"encoding/json"
+
+	"github.com/onsonr/sonr/pkg/orm"
 )
 
 // DefaultParams returns default module parameters.
@@ -32,14 +34,14 @@ func (p Params) Validate() error {
 // DefaultSchema returns the default schema
 func DefaultSchema() *Schema {
 	return &Schema{
-		Version:    1,
-		Account:    "++, id, name, address, publicKey, chainCode, index, controller, createdAt",
-		Asset:      "++, id, name, symbol, decimals, chainCode, createdAt",
-		Chain:      "++, id, name, networkId, chainCode, createdAt",
-		Credential: "++, id, subject, controller, attestationType, origin, label, deviceId, credentialId, publicKey, transport, signCount, userPresent, userVerified, backupEligible, backupState, cloneWarning, createdAt, updatedAt",
-		Jwk:        "++, kty, crv, x, y, n, e",
-		Grant:      "++, subject, controller, origin, token, scopes, createdAt, updatedAt",
-		Keyshare:   "++, id, data, role, createdAt, lastRefreshed",
-		Profile:    "++, id, subject, controller, originUri, publicMetadata, privateMetadata, createdAt, updatedAt",
+		Version:    orm.SCHEMA_VERSION,
+		Account:    orm.AccountSchema(),
+		Asset:      orm.AssetSchema(),
+		Chain:      orm.ChainSchema(),
+		Credential: orm.CredentialSchema(),
+		Jwk:        orm.JwkSchema(),
+		Grant:      orm.GrantSchema(),
+		Keyshare:   orm.KeyshareSchema(),
+		Profile:    orm.ProfileSchema(),
 	}
 }