feat(macaroon): add transaction allowlist/denylist caveats

app/app.go

@@ -151,9 +151,6 @@ import (
 	macaroon "github.com/onsonr/sonr/x/macaroon"
 	macaroonkeeper "github.com/onsonr/sonr/x/macaroon/keeper"
 	macaroontypes "github.com/onsonr/sonr/x/macaroon/types"
-	oracle "github.com/onsonr/sonr/x/oracle"
-	oraclekeeper "github.com/onsonr/sonr/x/oracle/keeper"
-	oracletypes "github.com/onsonr/sonr/x/oracle/types"
 	service "github.com/onsonr/sonr/x/service"
 	servicekeeper "github.com/onsonr/sonr/x/service/keeper"
 	servicetypes "github.com/onsonr/sonr/x/service/types"
@@ -241,7 +238,6 @@ type SonrApp struct {
 	VaultKeeper        vaultkeeper.Keeper
 	MacaroonKeeper     macaroonkeeper.Keeper
 	ServiceKeeper      servicekeeper.Keeper
-	OracleKeeper       oraclekeeper.Keeper
 	sm                 *module.SimulationManager
 	BasicModuleManager module.BasicManager
 	ModuleManager      *module.Manager
@@ -377,7 +373,6 @@ func NewChainApp(
 		vaulttypes.StoreKey,
 		macaroontypes.StoreKey,
 		servicetypes.StoreKey,
-		oracletypes.StoreKey,
 	)
 
 	tkeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey)
@@ -668,14 +663,6 @@ func NewChainApp(
 		app.NFTKeeper,
 	)
 
-	// Create the oracle Keeper
-	app.OracleKeeper = oraclekeeper.NewKeeper(
-		appCodec,
-		sdkruntime.NewKVStoreService(keys[oracletypes.StoreKey]),
-		logger,
-		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
-	)
-
 	// Create the globalfee keeper
 	app.GlobalFeeKeeper = globalfeekeeper.NewKeeper(
 		appCodec,
@@ -938,7 +925,6 @@ func NewChainApp(
 		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,
@@ -990,7 +976,6 @@ func NewChainApp(
 		vaulttypes.ModuleName,
 		macaroontypes.ModuleName,
 		servicetypes.ModuleName,
-		oracletypes.ModuleName,
 	)
 
 	app.ModuleManager.SetOrderEndBlockers(
@@ -1013,7 +998,6 @@ func NewChainApp(
 		vaulttypes.ModuleName,
 		macaroontypes.ModuleName,
 		servicetypes.ModuleName,
-		oracletypes.ModuleName,
 	)
 
 	// NOTE: The genutils module must occur after staking so that pools are
@@ -1045,7 +1029,6 @@ func NewChainApp(
 		vaulttypes.ModuleName,
 		macaroontypes.ModuleName,
 		servicetypes.ModuleName,
-		oracletypes.ModuleName,
 	}
 	app.ModuleManager.SetOrderInitGenesis(genesisModuleOrder...)
 	app.ModuleManager.SetOrderExportGenesis(genesisModuleOrder...)
@@ -1508,7 +1491,6 @@ func initParamsKeeper(
 	paramsKeeper.Subspace(vaulttypes.ModuleName)
 	paramsKeeper.Subspace(macaroontypes.ModuleName)
 	paramsKeeper.Subspace(servicetypes.ModuleName)
-	paramsKeeper.Subspace(oracletypes.ModuleName)
 
 	return paramsKeeper
 }