Adds ICQHost and Oracle Module

CHANGELOG.md

@@ -40,6 +40,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Features
 
 * Allow marker's transfer authority to prevent transfer of restricted coin with deny list on send [#1518](https://github.com/provenance-io/provenance/issues/1518).
+* Add ICQHost and Oracle module to allow cross chain oracle queries [#1497](https://github.com/provenance-io/provenance/issues/1497).
 * New `GetByAddr` metadata query [#1443](https://github.com/provenance-io/provenance/issues/1443).
 * Add Trigger module queries to stargate whitelist for smart contracts [#1636](https://github.com/provenance-io/provenance/issues/1636)
 * Added the saffron upgrade handlers [PR 1648](https://github.com/provenance-io/provenance/pull/1648).

app/app.go

@@ -17,6 +17,9 @@ import (
 	"github.com/rakyll/statik/fs"
 	"github.com/spf13/cast"
 	"github.com/spf13/viper"
+	icq "github.com/strangelove-ventures/async-icq/v6"
+	icqkeeper "github.com/strangelove-ventures/async-icq/v6/keeper"
+	icqtypes "github.com/strangelove-ventures/async-icq/v6/types"
 
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/libs/log"
@@ -153,6 +156,9 @@ import (
 	namekeeper "github.com/provenance-io/provenance/x/name/keeper"
 	nametypes "github.com/provenance-io/provenance/x/name/types"
 	namewasm "github.com/provenance-io/provenance/x/name/wasm"
+	oraclekeeper "github.com/provenance-io/provenance/x/oracle/keeper"
+	oraclemodule "github.com/provenance-io/provenance/x/oracle/module"
+	oracletypes "github.com/provenance-io/provenance/x/oracle/types"
 	rewardkeeper "github.com/provenance-io/provenance/x/reward/keeper"
 	rewardmodule "github.com/provenance-io/provenance/x/reward/module"
 	rewardtypes "github.com/provenance-io/provenance/x/reward/types"
@@ -207,6 +213,7 @@ var (
 		ibc.AppModuleBasic{},
 		ibctransfer.AppModuleBasic{},
 		ica.AppModuleBasic{},
+		icq.AppModuleBasic{},
 		ibchooks.AppModuleBasic{},
 
 		marker.AppModuleBasic{},
@@ -217,6 +224,7 @@ var (
 		msgfeesmodule.AppModuleBasic{},
 		rewardmodule.AppModuleBasic{},
 		triggermodule.AppModuleBasic{},
+		oraclemodule.AppModuleBasic{},
 		holdmodule.AppModuleBasic{},
 	)
 
@@ -238,6 +246,7 @@ var (
 		wasm.ModuleName:           {authtypes.Burner},
 		rewardtypes.ModuleName:    nil,
 		triggertypes.ModuleName:   nil,
+		oracletypes.ModuleName:    nil,
 	}
 )
 
@@ -295,11 +304,13 @@ type App struct {
 	QuarantineKeeper quarantinekeeper.Keeper
 	SanctionKeeper   sanctionkeeper.Keeper
 	TriggerKeeper    triggerkeeper.Keeper
+	OracleKeeper     oraclekeeper.Keeper
 
 	IBCKeeper      *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
 	IBCHooksKeeper *ibchookskeeper.Keeper
 	ICAHostKeeper  *icahostkeeper.Keeper
 	TransferKeeper *ibctransferkeeper.Keeper
+	ICQKeeper      icqkeeper.Keeper
 
 	MarkerKeeper    markerkeeper.Keeper
 	MetadataKeeper  metadatakeeper.Keeper
@@ -313,6 +324,8 @@ type App struct {
 	ScopedIBCKeeper      capabilitykeeper.ScopedKeeper
 	ScopedTransferKeeper capabilitykeeper.ScopedKeeper
 	ScopedICAHostKeeper  capabilitykeeper.ScopedKeeper
+	ScopedICQKeeper      capabilitykeeper.ScopedKeeper
+	ScopedOracleKeeper   capabilitykeeper.ScopedKeeper
 
 	TransferStack    *ibchooks.IBCMiddleware
 	Ics20WasmHooks   *ibchooks.WasmHooks
@@ -370,6 +383,7 @@ func New(
 		ibchost.StoreKey,
 		ibctransfertypes.StoreKey,
 		icahosttypes.StoreKey,
+		icqtypes.StoreKey,
 		ibchookstypes.StoreKey,
 
 		metadatatypes.StoreKey,
@@ -382,6 +396,7 @@ func New(
 		quarantine.StoreKey,
 		sanction.StoreKey,
 		triggertypes.StoreKey,
+		oracletypes.StoreKey,
 		hold.StoreKey,
 	)
 	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
@@ -417,6 +432,8 @@ func New(
 	scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)
 	scopedWasmKeeper := app.CapabilityKeeper.ScopeToModule(wasm.ModuleName)
 	scopedICAHostKeeper := app.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName)
+	scopedICQKeeper := app.CapabilityKeeper.ScopeToModule(icqtypes.ModuleName)
+	scopedOracleKeeper := app.CapabilityKeeper.ScopeToModule(oracletypes.ModuleName)
 
 	// capability keeper must be sealed after scope to module registrations are completed.
 	app.CapabilityKeeper.Seal()
@@ -558,6 +575,14 @@ func New(
 	icaModule := ica.NewAppModule(nil, app.ICAHostKeeper)
 	icaHostIBCModule := icahost.NewIBCModule(*app.ICAHostKeeper)
 
+	app.ICQKeeper = icqkeeper.NewKeeper(
+		appCodec, keys[icqtypes.StoreKey], app.GetSubspace(icqtypes.ModuleName),
+		app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper,
+		scopedICQKeeper, app.BaseApp,
+	)
+	icqModule := icq.NewAppModule(app.ICQKeeper)
+	icqIBCModule := icq.NewIBCModule(app.ICQKeeper)
+
 	// Init CosmWasm module
 	wasmDir := filepath.Join(homePath, "data", "wasm")
 
@@ -617,6 +642,19 @@ func New(
 	app.Ics20WasmHooks.ContractKeeper = app.WasmKeeper // app.ContractKeeper -- this changes in the next version of wasm to a permissioned keeper
 	app.IBCHooksKeeper.ContractKeeper = app.ContractKeeper
 
+	app.ScopedOracleKeeper = scopedOracleKeeper
+	app.OracleKeeper = *oraclekeeper.NewKeeper(
+		appCodec,
+		keys[oracletypes.StoreKey],
+		keys[oracletypes.MemStoreKey],
+		app.IBCKeeper.ChannelKeeper,
+		app.IBCKeeper.ChannelKeeper,
+		&app.IBCKeeper.PortKeeper,
+		scopedOracleKeeper,
+		wasmkeeper.Querier(app.WasmKeeper),
+	)
+	oracleModule := oraclemodule.NewAppModule(appCodec, app.OracleKeeper, app.AccountKeeper, app.BankKeeper, app.IBCKeeper.ChannelKeeper)
+
 	unsanctionableAddrs := make([]sdk.AccAddress, 0, len(maccPerms)+1)
 	for mName := range maccPerms {
 		unsanctionableAddrs = append(unsanctionableAddrs, authtypes.NewModuleAddress(mName))
@@ -648,7 +686,9 @@ func New(
 	ibcRouter.
 		AddRoute(ibctransfertypes.ModuleName, app.TransferStack).
 		AddRoute(wasm.ModuleName, wasm.NewIBCHandler(app.WasmKeeper, app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ChannelKeeper)).
-		AddRoute(icahosttypes.SubModuleName, icaHostIBCModule)
+		AddRoute(icahosttypes.SubModuleName, icaHostIBCModule).
+		AddRoute(icqtypes.ModuleName, icqIBCModule).
+		AddRoute(oracletypes.ModuleName, oracleModule)
 	app.IBCKeeper.SetRouter(ibcRouter)
 
 	// Create evidence Keeper for to register the IBC light client misbehavior evidence route
@@ -699,12 +739,14 @@ func New(
 		wasm.NewAppModule(appCodec, app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper),
 		rewardmodule.NewAppModule(appCodec, app.RewardKeeper, app.AccountKeeper, app.BankKeeper),
 		triggermodule.NewAppModule(appCodec, app.TriggerKeeper, app.AccountKeeper, app.BankKeeper),
+		oracleModule,
 		holdmodule.NewAppModule(appCodec, app.HoldKeeper),
 
 		// IBC
 		ibc.NewAppModule(app.IBCKeeper),
 		ibchooks.NewAppModule(app.AccountKeeper, *app.IBCHooksKeeper),
 		ibctransfer.NewAppModule(*app.TransferKeeper),
+		icqModule,
 		icaModule,
 	)
 
@@ -739,9 +781,11 @@ func New(
 		paramstypes.ModuleName,
 		msgfeestypes.ModuleName,
 		metadatatypes.ModuleName,
+		oracletypes.ModuleName,
 		wasm.ModuleName,
 		ibchookstypes.ModuleName,
 		ibctransfertypes.ModuleName,
+		icqtypes.ModuleName,
 		nametypes.ModuleName,
 		vestingtypes.ModuleName,
 		quarantine.ModuleName,
@@ -764,11 +808,13 @@ func New(
 		distrtypes.ModuleName,
 		authz.ModuleName,
 		metadatatypes.ModuleName,
+		oracletypes.ModuleName,
 		nametypes.ModuleName,
 		genutiltypes.ModuleName,
 		ibchost.ModuleName,
 		ibchookstypes.ModuleName,
 		ibctransfertypes.ModuleName,
+		icqtypes.ModuleName,
 		msgfeestypes.ModuleName,
 		wasm.ModuleName,
 		slashingtypes.ModuleName,
@@ -818,12 +864,14 @@ func New(
 
 		ibchost.ModuleName,
 		ibctransfertypes.ModuleName,
+		icqtypes.ModuleName,
 		icatypes.ModuleName,
 		ibchookstypes.ModuleName,
 		// wasm after ibc transfer
 		wasm.ModuleName,
 		rewardtypes.ModuleName,
 		triggertypes.ModuleName,
+		oracletypes.ModuleName,
 
 		// no-ops
 		paramstypes.ModuleName,
@@ -856,6 +904,7 @@ func New(
 
 		ibchookstypes.ModuleName,
 		icatypes.ModuleName,
+		icqtypes.ModuleName,
 		wasm.ModuleName,
 
 		attributetypes.ModuleName,
@@ -865,6 +914,7 @@ func New(
 		nametypes.ModuleName,
 		rewardtypes.ModuleName,
 		triggertypes.ModuleName,
+		oracletypes.ModuleName,
 
 		// Last due to v0.44 issue: https://github.com/cosmos/cosmos-sdk/issues/10591
 		authtypes.ModuleName,
@@ -899,6 +949,7 @@ func New(
 		msgfeesmodule.NewAppModule(appCodec, app.MsgFeesKeeper, app.interfaceRegistry),
 		rewardmodule.NewAppModule(appCodec, app.RewardKeeper, app.AccountKeeper, app.BankKeeper),
 		triggermodule.NewAppModule(appCodec, app.TriggerKeeper, app.AccountKeeper, app.BankKeeper),
+		oraclemodule.NewAppModule(appCodec, app.OracleKeeper, app.AccountKeeper, app.BankKeeper, app.IBCKeeper.ChannelKeeper),
 		holdmodule.NewAppModule(appCodec, app.HoldKeeper),
 		provwasm.NewWrapper(appCodec, app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.NameKeeper),
 
@@ -991,6 +1042,7 @@ func New(
 
 	app.ScopedIBCKeeper = scopedIBCKeeper
 	app.ScopedTransferKeeper = scopedTransferKeeper
+	app.ScopedICQKeeper = scopedICQKeeper
 	app.ScopedICAHostKeeper = scopedICAHostKeeper
 
 	return app
@@ -1219,6 +1271,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(ibctransfertypes.ModuleName)
 	paramsKeeper.Subspace(ibchost.ModuleName)
 	paramsKeeper.Subspace(icahosttypes.SubModuleName)
+	paramsKeeper.Subspace(icqtypes.ModuleName)
 	paramsKeeper.Subspace(ibchookstypes.ModuleName)
 
 	return paramsKeeper

app/params/weights.go

@@ -35,4 +35,7 @@ const (
 	// Trigger
 	DefaultWeightSubmitCreateTrigger  int = 95
 	DefaultWeightSubmitDestroyTrigger int = 5
+	// Oracle
+	DefaultWeightUpdateOracle    int = 25
+	DefaultWeightSendOracleQuery int = 75
 )

app/sim_test.go

@@ -13,6 +13,7 @@ import (
 	"testing"
 	"time"
 
+	icqtypes "github.com/strangelove-ventures/async-icq/v6/types"
 	"github.com/stretchr/testify/require"
 
 	abci "github.com/tendermint/tendermint/abci/types"
@@ -73,6 +74,7 @@ func ProvAppStateFn(cdc codec.JSONCodec, simManager *module.SimulationManager) s
 	return func(r *rand.Rand, accs []simtypes.Account, config simtypes.Config) (json.RawMessage, []simtypes.Account, string, time.Time) {
 		appState, simAccs, chainID, genesisTimestamp := sdksim.AppStateFn(cdc, simManager)(r, accs, config)
 		appState = appStateWithICA(appState, cdc)
+		appState = appStateWithICQ(appState, cdc)
 		return appState, simAccs, chainID, genesisTimestamp
 	}
 }
@@ -96,6 +98,25 @@ func appStateWithICA(appState json.RawMessage, cdc codec.JSONCodec) json.RawMess
 	return appState
 }
 
+// appStateWithICA checks the given appState for an ica entry. If it's not found, it's populated with the defaults.
+func appStateWithICQ(appState json.RawMessage, cdc codec.JSONCodec) json.RawMessage {
+	rawState := make(map[string]json.RawMessage)
+	err := json.Unmarshal(appState, &rawState)
+	if err != nil {
+		panic(fmt.Sprintf("error unmarshalling appstate: %v", err))
+	}
+	icqGenJSON, icqGenFound := rawState[icqtypes.ModuleName]
+	if !icqGenFound || len(icqGenJSON) == 0 {
+		icqGenState := icqtypes.DefaultGenesis()
+		rawState[icqtypes.ModuleName] = cdc.MustMarshalJSON(icqGenState)
+		appState, err = json.Marshal(rawState)
+		if err != nil {
+			panic(fmt.Sprintf("error marshalling appstate: %v", err))
+		}
+	}
+	return appState
+}
+
 func TestFullAppSimulation(t *testing.T) {
 	config, db, dir, logger, skip, err := sdksim.SetupSimulation("leveldb-app-sim", "Simulation")
 	if skip {

app/upgrades.go

@@ -3,6 +3,8 @@ package app
 import (
 	"fmt"
 
+	icqtypes "github.com/strangelove-ventures/async-icq/v6/types"
+
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -16,6 +18,7 @@ import (
 	"github.com/provenance-io/provenance/x/hold"
 	ibchookstypes "github.com/provenance-io/provenance/x/ibchooks/types"
 	msgfeetypes "github.com/provenance-io/provenance/x/msgfees/types"
+	oracletypes "github.com/provenance-io/provenance/x/oracle/types"
 	triggertypes "github.com/provenance-io/provenance/x/trigger/types"
 )
 
@@ -106,12 +109,13 @@ var upgrades = map[string]appUpgrade{
 			app.IBCHooksKeeper.SetParams(ctx, ibchookstypes.DefaultParams())
 
 			removeInactiveValidatorDelegations(ctx, app)
+			setupICQ(ctx, app)
 
 			return vm, nil
 		},
-		Added: []string{hold.ModuleName, ibchookstypes.ModuleName},
+		Added: []string{icqtypes.ModuleName, oracletypes.ModuleName, ibchookstypes.ModuleName, hold.ModuleName},
 	},
-	"saffron": { // upgrade for v1.17.0
+	"saffron": { // upgrade for v1.17.0,
 		Handler: func(ctx sdk.Context, app *App, vm module.VersionMap) (module.VersionMap, error) {
 			var err error
 			vm, err = runModuleMigrations(ctx, app, vm)
@@ -123,10 +127,11 @@ var upgrades = map[string]appUpgrade{
 			app.IBCHooksKeeper.SetParams(ctx, ibchookstypes.DefaultParams())
 
 			removeInactiveValidatorDelegations(ctx, app)
+			setupICQ(ctx, app)
 
 			return vm, nil
 		},
-		Added: []string{hold.ModuleName, ibchookstypes.ModuleName},
+		Added: []string{icqtypes.ModuleName, oracletypes.ModuleName, ibchookstypes.ModuleName, hold.ModuleName},
 	},
 	// TODO - Add new upgrade definitions here.
 }
@@ -314,3 +319,10 @@ func fixNameIndexEntries(ctx sdk.Context, app *App) {
 func setAccountDataNameRecord(ctx sdk.Context, accountK attributetypes.AccountKeeper, nameK attributetypes.NameKeeper) (err error) {
 	return attributekeeper.EnsureModuleAccountAndAccountDataNameRecord(ctx, accountK, nameK)
 }
+
+// setupICQ sets the correct default values for ICQKeeper
+func setupICQ(ctx sdk.Context, app *App) {
+	ctx.Logger().Info("Updating ICQ params")
+	app.ICQKeeper.SetParams(ctx, icqtypes.NewParams(true, []string{"/provenance.oracle.v1.Query/Oracle"}))
+	ctx.Logger().Info("Done updating ICQ params")
+}

app/upgrades_test.go

@@ -422,6 +422,8 @@ func (s *UpgradeTestSuite) TestSaffronRC1() {
 	expInLog := []string{
 		"INF Starting module migrations. This may take a significant amount of time to complete. Do not restart node.",
 		"INF removing all delegations from validators that have been inactive (unbonded) for 21 days",
+		"INF Updating ICQ params",
+		"INF Done updating ICQ params",
 	}
 
 	s.AssertUpgradeHandlerLogs("saffron-rc1", expInLog, nil)
@@ -434,6 +436,8 @@ func (s *UpgradeTestSuite) TestSaffron() {
 	expInLog := []string{
 		"INF Starting module migrations. This may take a significant amount of time to complete. Do not restart node.",
 		"INF removing all delegations from validators that have been inactive (unbonded) for 21 days",
+		"INF Updating ICQ params",
+		"INF Done updating ICQ params",
 	}
 
 	s.AssertUpgradeHandlerLogs("saffron", expInLog, nil)