diff --git a/Makefile b/Makefile index b73c5b6cb..f1843b87c 100644 --- a/Makefile +++ b/Makefile @@ -328,7 +328,7 @@ start-caddy: start-motr: motr @echo "(start-proxy) Starting proxy server" - ./build/motrd proxy + ./build/motrd start ############################################################################### ### help ### diff --git a/app/app.go b/app/app.go index fb7c47141..70ec67fd5 100644 --- a/app/app.go +++ b/app/app.go @@ -134,6 +134,17 @@ import ( ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper" ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint" + "github.com/spf13/cast" + globalfee "github.com/strangelove-ventures/globalfee/x/globalfee" + globalfeekeeper "github.com/strangelove-ventures/globalfee/x/globalfee/keeper" + globalfeetypes "github.com/strangelove-ventures/globalfee/x/globalfee/types" + poa "github.com/strangelove-ventures/poa" + poakeeper "github.com/strangelove-ventures/poa/keeper" + poamodule "github.com/strangelove-ventures/poa/module" + tokenfactory "github.com/strangelove-ventures/tokenfactory/x/tokenfactory" + tokenfactorykeeper "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/keeper" + tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types" + did "github.com/onsonr/sonr/x/did" didkeeper "github.com/onsonr/sonr/x/did/keeper" didtypes "github.com/onsonr/sonr/x/did/types" @@ -149,16 +160,6 @@ import ( vault "github.com/onsonr/sonr/x/vault" vaultkeeper "github.com/onsonr/sonr/x/vault/keeper" vaulttypes "github.com/onsonr/sonr/x/vault/types" - "github.com/spf13/cast" - globalfee "github.com/strangelove-ventures/globalfee/x/globalfee" - globalfeekeeper "github.com/strangelove-ventures/globalfee/x/globalfee/keeper" - globalfeetypes "github.com/strangelove-ventures/globalfee/x/globalfee/types" - poa "github.com/strangelove-ventures/poa" - poakeeper "github.com/strangelove-ventures/poa/keeper" - poamodule "github.com/strangelove-ventures/poa/module" - tokenfactory "github.com/strangelove-ventures/tokenfactory/x/tokenfactory" - tokenfactorykeeper "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/keeper" - tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types" ) const appName = "sonr" @@ -926,11 +927,12 @@ func NewChainApp( ), did.NewAppModule(appCodec, app.DidKeeper, app.NFTKeeper), - vault.NewAppModule(appCodec, app.VaultKeeper), - macaroon.NewAppModule(appCodec, app.MacaroonKeeper), - service.NewAppModule(appCodec, app.ServiceKeeper), - oracle.NewAppModule(appCodec, app.OracleKeeper), + macaroon.NewAppModule(appCodec, app.MacaroonKeeper, app.DidKeeper), + vault.NewAppModule(appCodec, app.VaultKeeper, app.DidKeeper), + + service.NewAppModule(appCodec, app.ServiceKeeper, app.DidKeeper, app.MacaroonKeeper), + oracle.NewAppModule(appCodec, app.OracleKeeper, app.DidKeeper, app.MacaroonKeeper), ) // BasicModuleManager defines the module BasicManager is in charge of setting up basic, diff --git a/cmd/motrd/proxy.go b/cmd/motrd/proxy.go index e9b4cba1d..c0fe54093 100644 --- a/cmd/motrd/proxy.go +++ b/cmd/motrd/proxy.go @@ -13,7 +13,7 @@ import ( func NewProxyCmd() *cobra.Command { return &cobra.Command{ - Use: "proxy", + Use: "start", Short: "Starts the DWN proxy server for the local IPFS node", Run: func(cmd *cobra.Command, args []string) { // Echo instance diff --git a/pkg/nebula/assets/config.pkl b/pkg/nebula/assets/static.pkl similarity index 100% rename from pkg/nebula/assets/config.pkl rename to pkg/nebula/assets/static.pkl diff --git a/pkg/nebula/nebula.go b/pkg/nebula/nebula.go index 617eeb43f..8cde2b5f9 100644 --- a/pkg/nebula/nebula.go +++ b/pkg/nebula/nebula.go @@ -14,7 +14,7 @@ import ( //go:embed assets var embeddedFiles embed.FS -//go:embed assets/config.pkl +//go:embed assets/static.pkl var config []byte func getHTTPFS() (http.FileSystem, error) { diff --git a/pkl/uiux.pkl b/pkl/uiux.pkl index 6198e8355..5217a5d31 100644 --- a/pkl/uiux.pkl +++ b/pkl/uiux.pkl @@ -4,6 +4,11 @@ module models import "package://pkg.pkl-lang.org/pkl-go/pkl.golang@0.5.0#/go.pkl" + +// ╭───────────────────────────────────────────────────────────╮ +// │ General Components │ +// ╰───────────────────────────────────────────────────────────╯ + typealias FormState = "initial" | "error" | "success" | "warning" class Image { @@ -27,6 +32,20 @@ class Button { href: String } +class Input { + label: String + type: String + placeholder: String + value: String? + error: String? + help: String? + required: Bool +} + +// ╭───────────────────────────────────────────────────────────╮ +// │ Homepage Components │ +// ╰───────────────────────────────────────────────────────────╯ + class Stats { firstValue: String firstLabel: String @@ -58,3 +77,58 @@ class Footer { hero : Hero stats : Stats + +// ╭───────────────────────────────────────────────────────────╮ +// │ Registration Components │ +// ╰───────────────────────────────────────────────────────────╯ + +class RegistrationForm { + title: String + description: String + state: FormState + inputs: List +} + +registrationForm : RegistrationForm = new RegistrationForm { + title = "Register"; + description = "Create your Sonr account"; + state = "initial"; + inputs = [ + new Input { + label = "Username"; + type = "text"; + placeholder = "Enter your username"; + value = ""; + error = ""; + help = ""; + required = true; + }, + new Input { + label = "Email"; + type = "email"; + placeholder = "Enter your email"; + value = ""; + error = ""; + help = ""; + required = true; + }, + new Input { + label = "Password"; + type = "password"; + placeholder = "Enter your password"; + value = ""; + error = ""; + help = ""; + required = true; + }, + new Input { + label = "Confirm Password"; + type = "password"; + placeholder = "Confirm your password"; + value = ""; + error = ""; + help = ""; + required = true; + } + ]; +}; diff --git a/x/macaroon/depinject.go b/x/macaroon/depinject.go index 9ca006cf9..951be39ea 100644 --- a/x/macaroon/depinject.go +++ b/x/macaroon/depinject.go @@ -3,20 +3,19 @@ package module import ( "os" - "github.com/cosmos/cosmos-sdk/codec" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" - - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "cosmossdk.io/core/address" "cosmossdk.io/core/appmodule" "cosmossdk.io/core/store" "cosmossdk.io/depinject" "cosmossdk.io/log" + "github.com/cosmos/cosmos-sdk/codec" + 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" + stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" modulev1 "github.com/onsonr/sonr/api/macaroon/module/v1" + didkeeper "github.com/onsonr/sonr/x/did/keeper" "github.com/onsonr/sonr/x/macaroon/keeper" ) @@ -41,6 +40,7 @@ type ModuleInputs struct { Cdc codec.Codec StoreService store.KVStoreService AddressCodec address.Codec + DidKeeper didkeeper.Keeper StakingKeeper stakingkeeper.Keeper SlashingKeeper slashingkeeper.Keeper @@ -57,7 +57,7 @@ func ProvideModule(in ModuleInputs) ModuleOutputs { govAddr := authtypes.NewModuleAddress(govtypes.ModuleName).String() k := keeper.NewKeeper(in.Cdc, in.StoreService, log.NewLogger(os.Stderr), govAddr) - m := NewAppModule(in.Cdc, k) + m := NewAppModule(in.Cdc, k, in.DidKeeper) return ModuleOutputs{Module: m, Keeper: k, Out: depinject.Out{}} } diff --git a/x/macaroon/keeper/keeper_test.go b/x/macaroon/keeper/keeper_test.go index ee0bc3560..248297a1c 100644 --- a/x/macaroon/keeper/keeper_test.go +++ b/x/macaroon/keeper/keeper_test.go @@ -3,12 +3,9 @@ package keeper_test import ( "testing" - "github.com/stretchr/testify/require" - "github.com/stretchr/testify/suite" - + "cosmossdk.io/core/store" "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" - "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/testutil" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" @@ -23,9 +20,10 @@ import ( minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/suite" - "cosmossdk.io/core/store" - + didkeeper "github.com/onsonr/sonr/x/did/keeper" module "github.com/onsonr/sonr/x/macaroon" "github.com/onsonr/sonr/x/macaroon/keeper" "github.com/onsonr/sonr/x/macaroon/types" @@ -49,6 +47,7 @@ type testFixture struct { appModule *module.AppModule accountkeeper authkeeper.AccountKeeper + didk didkeeper.Keeper bankkeeper bankkeeper.BaseKeeper stakingKeeper *stakingkeeper.Keeper mintkeeper mintkeeper.Keeper @@ -82,7 +81,7 @@ func SetupTest(t *testing.T) *testFixture { f.k = keeper.NewKeeper(encCfg.Codec, storeService, logger, f.govModAddr) f.msgServer = keeper.NewMsgServerImpl(f.k) f.queryServer = keeper.NewQuerier(f.k) - f.appModule = module.NewAppModule(encCfg.Codec, f.k) + f.appModule = module.NewAppModule(encCfg.Codec, f.k, f.didk) return f } diff --git a/x/macaroon/module.go b/x/macaroon/module.go index 449fda7cb..ddcaba0b4 100644 --- a/x/macaroon/module.go +++ b/x/macaroon/module.go @@ -4,23 +4,20 @@ import ( "context" "encoding/json" - "github.com/gorilla/mux" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - - abci "github.com/cometbft/cometbft/abci/types" - "cosmossdk.io/client/v2/autocli" errorsmod "cosmossdk.io/errors" - + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" + "github.com/gorilla/mux" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + didkeeper "github.com/onsonr/sonr/x/did/keeper" "github.com/onsonr/sonr/x/macaroon/keeper" "github.com/onsonr/sonr/x/macaroon/types" - // this line is used by starport scaffolding # 1 ) const ( @@ -47,16 +44,19 @@ type AppModule struct { AppModuleBasic keeper keeper.Keeper + didk didkeeper.Keeper } // NewAppModule constructor func NewAppModule( cdc codec.Codec, keeper keeper.Keeper, + didkeeper didkeeper.Keeper, ) *AppModule { return &AppModule{ AppModuleBasic: AppModuleBasic{cdc: cdc}, keeper: keeper, + didk: didkeeper, } } diff --git a/x/oracle/depinject.go b/x/oracle/depinject.go index 3308a1020..6e5fa178f 100644 --- a/x/oracle/depinject.go +++ b/x/oracle/depinject.go @@ -3,20 +3,20 @@ package module import ( "os" - "github.com/cosmos/cosmos-sdk/codec" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" - - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "cosmossdk.io/core/address" "cosmossdk.io/core/appmodule" "cosmossdk.io/core/store" "cosmossdk.io/depinject" "cosmossdk.io/log" + "github.com/cosmos/cosmos-sdk/codec" + 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" + stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" modulev1 "github.com/onsonr/sonr/api/oracle/module/v1" + didkeeper "github.com/onsonr/sonr/x/did/keeper" + macaroonkeeper "github.com/onsonr/sonr/x/macaroon/keeper" "github.com/onsonr/sonr/x/oracle/keeper" ) @@ -42,6 +42,8 @@ type ModuleInputs struct { StoreService store.KVStoreService AddressCodec address.Codec + DidKeeper didkeeper.Keeper + MacaroonKeeper macaroonkeeper.Keeper StakingKeeper stakingkeeper.Keeper SlashingKeeper slashingkeeper.Keeper } @@ -57,7 +59,7 @@ func ProvideModule(in ModuleInputs) ModuleOutputs { govAddr := authtypes.NewModuleAddress(govtypes.ModuleName).String() k := keeper.NewKeeper(in.Cdc, in.StoreService, log.NewLogger(os.Stderr), govAddr) - m := NewAppModule(in.Cdc, k) + m := NewAppModule(in.Cdc, k, in.DidKeeper, in.MacaroonKeeper) return ModuleOutputs{Module: m, Keeper: k, Out: depinject.Out{}} } diff --git a/x/oracle/keeper/keeper_test.go b/x/oracle/keeper/keeper_test.go index f4e8135a4..a0eb510db 100644 --- a/x/oracle/keeper/keeper_test.go +++ b/x/oracle/keeper/keeper_test.go @@ -3,12 +3,9 @@ package keeper_test import ( "testing" - "github.com/stretchr/testify/require" - "github.com/stretchr/testify/suite" - + "cosmossdk.io/core/store" "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" - "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/testutil" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" @@ -23,9 +20,11 @@ import ( minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/suite" - "cosmossdk.io/core/store" - + didkeeper "github.com/onsonr/sonr/x/did/keeper" + macaroonkeeper "github.com/onsonr/sonr/x/macaroon/keeper" module "github.com/onsonr/sonr/x/oracle" "github.com/onsonr/sonr/x/oracle/keeper" "github.com/onsonr/sonr/x/oracle/types" @@ -50,6 +49,8 @@ type testFixture struct { accountkeeper authkeeper.AccountKeeper bankkeeper bankkeeper.BaseKeeper + didkeeper didkeeper.Keeper + mack macaroonkeeper.Keeper stakingKeeper *stakingkeeper.Keeper mintkeeper mintkeeper.Keeper @@ -82,8 +83,7 @@ func SetupTest(t *testing.T) *testFixture { f.k = keeper.NewKeeper(encCfg.Codec, storeService, logger, f.govModAddr) f.msgServer = keeper.NewMsgServerImpl(f.k) f.queryServer = keeper.NewQuerier(f.k) - f.appModule = module.NewAppModule(encCfg.Codec, f.k) - + f.appModule = module.NewAppModule(encCfg.Codec, f.k, f.didkeeper, f.mack) return f } diff --git a/x/oracle/module.go b/x/oracle/module.go index 0fc130b09..2493ce207 100644 --- a/x/oracle/module.go +++ b/x/oracle/module.go @@ -4,23 +4,21 @@ import ( "context" "encoding/json" - "github.com/gorilla/mux" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - - abci "github.com/cometbft/cometbft/abci/types" - "cosmossdk.io/client/v2/autocli" errorsmod "cosmossdk.io/errors" - + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" + "github.com/gorilla/mux" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + didkeeper "github.com/onsonr/sonr/x/did/keeper" + macaroonkeeper "github.com/onsonr/sonr/x/macaroon/keeper" "github.com/onsonr/sonr/x/oracle/keeper" "github.com/onsonr/sonr/x/oracle/types" - // this line is used by starport scaffolding # 1 ) const ( @@ -47,16 +45,22 @@ type AppModule struct { AppModuleBasic keeper keeper.Keeper + didk didkeeper.Keeper + mack macaroonkeeper.Keeper } // NewAppModule constructor func NewAppModule( cdc codec.Codec, keeper keeper.Keeper, + didkeeper didkeeper.Keeper, + macaroonkeeper macaroonkeeper.Keeper, ) *AppModule { return &AppModule{ AppModuleBasic: AppModuleBasic{cdc: cdc}, keeper: keeper, + didk: didkeeper, + mack: macaroonkeeper, } } diff --git a/x/service/depinject.go b/x/service/depinject.go index af2b6cd63..d3b0a8452 100644 --- a/x/service/depinject.go +++ b/x/service/depinject.go @@ -3,20 +3,20 @@ package module import ( "os" - "github.com/cosmos/cosmos-sdk/codec" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" - - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "cosmossdk.io/core/address" "cosmossdk.io/core/appmodule" "cosmossdk.io/core/store" "cosmossdk.io/depinject" "cosmossdk.io/log" + "github.com/cosmos/cosmos-sdk/codec" + 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" + stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" modulev1 "github.com/onsonr/sonr/api/service/module/v1" + didkeeper "github.com/onsonr/sonr/x/did/keeper" + macaroonkeeper "github.com/onsonr/sonr/x/macaroon/keeper" "github.com/onsonr/sonr/x/service/keeper" ) @@ -42,6 +42,8 @@ type ModuleInputs struct { StoreService store.KVStoreService AddressCodec address.Codec + DidKeeper didkeeper.Keeper + MacaroonKeeper macaroonkeeper.Keeper StakingKeeper stakingkeeper.Keeper SlashingKeeper slashingkeeper.Keeper } @@ -57,7 +59,7 @@ func ProvideModule(in ModuleInputs) ModuleOutputs { govAddr := authtypes.NewModuleAddress(govtypes.ModuleName).String() k := keeper.NewKeeper(in.Cdc, in.StoreService, log.NewLogger(os.Stderr), govAddr) - m := NewAppModule(in.Cdc, k) + m := NewAppModule(in.Cdc, k, in.DidKeeper, in.MacaroonKeeper) return ModuleOutputs{Module: m, Keeper: k, Out: depinject.Out{}} } diff --git a/x/service/keeper/keeper_test.go b/x/service/keeper/keeper_test.go index a3682f6eb..e9910786c 100644 --- a/x/service/keeper/keeper_test.go +++ b/x/service/keeper/keeper_test.go @@ -3,12 +3,9 @@ package keeper_test import ( "testing" - "github.com/stretchr/testify/require" - "github.com/stretchr/testify/suite" - + "cosmossdk.io/core/store" "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" - "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/testutil" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" @@ -23,9 +20,11 @@ import ( minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/suite" - "cosmossdk.io/core/store" - + didkeeper "github.com/onsonr/sonr/x/did/keeper" + macaroonkeeper "github.com/onsonr/sonr/x/macaroon/keeper" module "github.com/onsonr/sonr/x/service" "github.com/onsonr/sonr/x/service/keeper" "github.com/onsonr/sonr/x/service/types" @@ -50,6 +49,8 @@ type testFixture struct { accountkeeper authkeeper.AccountKeeper bankkeeper bankkeeper.BaseKeeper + didkeeper didkeeper.Keeper + mack macaroonkeeper.Keeper stakingKeeper *stakingkeeper.Keeper mintkeeper mintkeeper.Keeper @@ -82,7 +83,7 @@ func SetupTest(t *testing.T) *testFixture { f.k = keeper.NewKeeper(encCfg.Codec, storeService, logger, f.govModAddr) f.msgServer = keeper.NewMsgServerImpl(f.k) f.queryServer = keeper.NewQuerier(f.k) - f.appModule = module.NewAppModule(encCfg.Codec, f.k) + f.appModule = module.NewAppModule(encCfg.Codec, f.k, f.didkeeper, f.mack) return f } diff --git a/x/service/module.go b/x/service/module.go index 6013e10c8..fde54eb7b 100644 --- a/x/service/module.go +++ b/x/service/module.go @@ -4,23 +4,21 @@ import ( "context" "encoding/json" - "github.com/gorilla/mux" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - - abci "github.com/cometbft/cometbft/abci/types" - "cosmossdk.io/client/v2/autocli" errorsmod "cosmossdk.io/errors" - + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" + "github.com/gorilla/mux" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + didkeeper "github.com/onsonr/sonr/x/did/keeper" + macaroonkeeper "github.com/onsonr/sonr/x/macaroon/keeper" "github.com/onsonr/sonr/x/service/keeper" "github.com/onsonr/sonr/x/service/types" - // this line is used by starport scaffolding # 1 ) const ( @@ -47,16 +45,22 @@ type AppModule struct { AppModuleBasic keeper keeper.Keeper + didk didkeeper.Keeper + mack macaroonkeeper.Keeper } // NewAppModule constructor func NewAppModule( cdc codec.Codec, keeper keeper.Keeper, + didkeeper didkeeper.Keeper, + macaroonkeeper macaroonkeeper.Keeper, ) *AppModule { return &AppModule{ AppModuleBasic: AppModuleBasic{cdc: cdc}, keeper: keeper, + didk: didkeeper, + mack: macaroonkeeper, } } diff --git a/x/vault/depinject.go b/x/vault/depinject.go index 5be80d7a0..6be9ebf3d 100644 --- a/x/vault/depinject.go +++ b/x/vault/depinject.go @@ -3,18 +3,16 @@ package module import ( "os" - "github.com/cosmos/cosmos-sdk/codec" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" - - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "cosmossdk.io/core/address" "cosmossdk.io/core/appmodule" "cosmossdk.io/core/store" "cosmossdk.io/depinject" "cosmossdk.io/log" + "github.com/cosmos/cosmos-sdk/codec" + 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" + stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" modulev1 "github.com/onsonr/sonr/api/vault/module/v1" didkeeper "github.com/onsonr/sonr/x/did/keeper" @@ -59,7 +57,7 @@ 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) - m := NewAppModule(in.Cdc, k) + m := NewAppModule(in.Cdc, k, in.DidKeeper) return ModuleOutputs{Module: m, Keeper: k, Out: depinject.Out{}} } diff --git a/x/vault/keeper/keeper_test.go b/x/vault/keeper/keeper_test.go index 36838e623..59911d6c4 100644 --- a/x/vault/keeper/keeper_test.go +++ b/x/vault/keeper/keeper_test.go @@ -3,12 +3,9 @@ package keeper_test import ( "testing" - "github.com/stretchr/testify/require" - "github.com/stretchr/testify/suite" - + "cosmossdk.io/core/store" "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" - "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/testutil" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" @@ -23,8 +20,8 @@ import ( minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - - "cosmossdk.io/core/store" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/suite" didkeeper "github.com/onsonr/sonr/x/did/keeper" module "github.com/onsonr/sonr/x/vault" @@ -84,7 +81,7 @@ func SetupTest(t *testing.T) *testFixture { f.k = keeper.NewKeeper(encCfg.Codec, storeService, logger, f.govModAddr, f.didk) f.msgServer = keeper.NewMsgServerImpl(f.k) f.queryServer = keeper.NewQuerier(f.k) - f.appModule = module.NewAppModule(encCfg.Codec, f.k) + f.appModule = module.NewAppModule(encCfg.Codec, f.k, f.didk) return f } diff --git a/x/vault/module.go b/x/vault/module.go index 5f63f2846..d82a33199 100644 --- a/x/vault/module.go +++ b/x/vault/module.go @@ -4,25 +4,20 @@ import ( "context" "encoding/json" - "github.com/gorilla/mux" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - - abci "github.com/cometbft/cometbft/abci/types" - "cosmossdk.io/client/v2/autocli" errorsmod "cosmossdk.io/errors" - + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" + "github.com/gorilla/mux" + "github.com/grpc-ecosystem/grpc-gateway/runtime" didkeeper "github.com/onsonr/sonr/x/did/keeper" - "github.com/onsonr/sonr/x/vault/keeper" "github.com/onsonr/sonr/x/vault/types" - // this line is used by starport scaffolding # 1 ) const ( @@ -56,6 +51,7 @@ type AppModule struct { func NewAppModule( cdc codec.Codec, keeper keeper.Keeper, + didkeeper didkeeper.Keeper, ) *AppModule { return &AppModule{ AppModuleBasic: AppModuleBasic{cdc: cdc},