Squash merge develop into master

app/app.go

@@ -145,12 +145,9 @@ import (
 	tokenfactorykeeper "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/keeper"
 	tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types"
 
-	did "github.com/onsonr/hway/x/did"
-	didkeeper "github.com/onsonr/hway/x/did/keeper"
-	didtypes "github.com/onsonr/hway/x/did/types"
-	oracle "github.com/onsonr/hway/x/oracle"
-	oraclekeeper "github.com/onsonr/hway/x/oracle/keeper"
-	oracletypes "github.com/onsonr/hway/x/oracle/types"
+	did "github.com/onsonr/sonr/x/did"
+	didkeeper "github.com/onsonr/sonr/x/did/keeper"
+	didtypes "github.com/onsonr/sonr/x/did/types"
 )
 
 const appName = "sonr"
@@ -220,7 +217,6 @@ type SonrApp struct {
 	NFTKeeper          nftkeeper.Keeper
 	AuthzKeeper        authzkeeper.Keeper
 	FeeGrantKeeper     feegrantkeeper.Keeper
-	OracleKeeper       oraclekeeper.Keeper
 	interfaceRegistry  types.InterfaceRegistry
 	txConfig           client.TxConfig
 	appCodec           codec.Codec
@@ -361,7 +357,6 @@ func NewChainApp(
 		poa.StoreKey,
 		globalfeetypes.StoreKey,
 		packetforwardtypes.StoreKey,
-		oracletypes.StoreKey,
 		didtypes.StoreKey,
 	)
 
@@ -616,17 +611,12 @@ func NewChainApp(
 		appCodec,
 		sdkruntime.NewKVStoreService(keys[didtypes.StoreKey]),
 		app.AccountKeeper,
+		app.NFTKeeper,
+		app.StakingKeeper,
 		logger,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 
-	// Create the oracle Middleware Keeper
-	app.OracleKeeper = oraclekeeper.NewKeeper(
-		appCodec,
-		app.MsgServiceRouter(),
-		app.IBCKeeper.ChannelKeeper,
-	)
-
 	// Create the globalfee keeper
 	app.GlobalFeeKeeper = globalfeekeeper.NewKeeper(
 		appCodec,
@@ -882,9 +872,8 @@ func NewChainApp(
 			app.PacketForwardKeeper,
 			app.GetSubspace(packetforwardtypes.ModuleName),
 		),
-		oracle.NewAppModule(app.OracleKeeper),
 
-		did.NewAppModule(appCodec, app.DidKeeper),
+		did.NewAppModule(appCodec, app.DidKeeper, app.NFTKeeper),
 	)
 
 	// BasicModuleManager defines the module BasicManager is in charge of setting up basic,
@@ -932,7 +921,6 @@ func NewChainApp(
 		ibcfeetypes.ModuleName,
 		tokenfactorytypes.ModuleName,
 		packetforwardtypes.ModuleName,
-		oracletypes.ModuleName,
 		didtypes.ModuleName,
 	)
 
@@ -952,7 +940,6 @@ func NewChainApp(
 		ibcfeetypes.ModuleName,
 		tokenfactorytypes.ModuleName,
 		packetforwardtypes.ModuleName,
-		oracletypes.ModuleName,
 		didtypes.ModuleName,
 	)
 
@@ -981,7 +968,6 @@ func NewChainApp(
 		tokenfactorytypes.ModuleName,
 		globalfeetypes.ModuleName,
 		packetforwardtypes.ModuleName,
-		oracletypes.ModuleName,
 		didtypes.ModuleName,
 	}
 	app.ModuleManager.SetOrderInitGenesis(genesisModuleOrder...)
@@ -1122,6 +1108,9 @@ func NewChainApp(
 		_ = ctx
 
 	}
+
+	// Start the frontend
+	// go app.ServeFrontend()
 	return app
 }
 
@@ -1436,7 +1425,6 @@ func initParamsKeeper(
 	paramsKeeper.Subspace(globalfee.ModuleName)
 	paramsKeeper.Subspace(packetforwardtypes.ModuleName).
 		WithKeyTable(packetforwardtypes.ParamKeyTable())
-	paramsKeeper.Subspace(oracletypes.ModuleName)
 	paramsKeeper.Subspace(didtypes.ModuleName)
 
 	return paramsKeeper

app/decorators/msg_filter_test.go

@@ -10,8 +10,8 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/stretchr/testify/suite"
 
-	app "github.com/onsonr/hway/app"
-	"github.com/onsonr/hway/app/decorators"
+	app "github.com/onsonr/sonr/app"
+	"github.com/onsonr/sonr/app/decorators"
 )
 
 type AnteTestSuite struct {

app/encoding.go

@@ -9,7 +9,7 @@ import (
 
 	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 
-	"github.com/onsonr/hway/app/params"
+	"github.com/onsonr/sonr/app/params"
 )
 
 // MakeEncodingConfig creates a new EncodingConfig with all modules registered. For testing only

app/local.go

@@ -1,36 +0,0 @@
-package app
-
-import (
-	"github.com/ipfs/kubo/client/rpc"
-)
-
-var (
-	ChainID = "testnet"
-	ValAddr = "val1"
-)
-
-// Initialize initializes the local configuration values
-func init() {
-}
-
-// SetLocalContextSessionID sets the session ID for the local context
-func SetLocalValidatorAddress(address string) {
-	ValAddr = address
-}
-
-// SetLocalContextChainID sets the chain ID for the local
-func SetLocalChainID(id string) {
-	ChainID = id
-}
-
-// IPFSClient is an interface for interacting with an IPFS node.
-type IPFSClient = *rpc.HttpApi
-
-// NewLocalClient creates a new IPFS client that connects to the local IPFS node.
-func GetIPFSClient() (IPFSClient, error) {
-	rpcClient, err := rpc.NewLocalApi()
-	if err != nil {
-		return nil, err
-	}
-	return rpcClient, nil
-}

app/upgrades.go

@@ -5,8 +5,8 @@ import (
 
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 
-	"github.com/onsonr/hway/app/upgrades"
-	"github.com/onsonr/hway/app/upgrades/noop"
+	"github.com/onsonr/sonr/app/upgrades"
+	"github.com/onsonr/sonr/app/upgrades/noop"
 )
 
 // Upgrades list of chain upgrades
@@ -22,6 +22,7 @@ func (app *SonrApp) RegisterUpgradeHandlers() {
 
 	keepers := upgrades.AppKeepers{
 		AccountKeeper:         &app.AccountKeeper,
+		DidKeeper:             &app.DidKeeper,
 		ParamsKeeper:          &app.ParamsKeeper,
 		ConsensusParamsKeeper: &app.ConsensusParamsKeeper,
 		CapabilityKeeper:      app.CapabilityKeeper,

app/upgrades/noop/upgrades.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	"github.com/onsonr/hway/app/upgrades"
+	"github.com/onsonr/sonr/app/upgrades"
 )
 
 // NewUpgrade constructor

app/upgrades/types.go

@@ -14,10 +14,12 @@ import (
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper"
 	paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
+	didkeeper "github.com/onsonr/sonr/x/did/keeper"
 )
 
 type AppKeepers struct {
 	AccountKeeper         *authkeeper.AccountKeeper
+	DidKeeper             *didkeeper.Keeper
 	ParamsKeeper          *paramskeeper.Keeper
 	ConsensusParamsKeeper *consensusparamkeeper.Keeper
 	Codec                 codec.Codec