ICA Oracle

app/app.go

@@ -132,6 +132,9 @@ import (
 	icacallbacksmodule "github.com/Stride-Labs/stride/v12/x/icacallbacks"
 	icacallbacksmodulekeeper "github.com/Stride-Labs/stride/v12/x/icacallbacks/keeper"
 	icacallbacksmoduletypes "github.com/Stride-Labs/stride/v12/x/icacallbacks/types"
+	icaoracle "github.com/Stride-Labs/stride/v12/x/icaoracle"
+	icaoraclekeeper "github.com/Stride-Labs/stride/v12/x/icaoracle/keeper"
+	icaoracletypes "github.com/Stride-Labs/stride/v12/x/icaoracle/types"
 	ratelimitmodule "github.com/Stride-Labs/stride/v12/x/ratelimit"
 	ratelimitclient "github.com/Stride-Labs/stride/v12/x/ratelimit/client"
 	ratelimitmodulekeeper "github.com/Stride-Labs/stride/v12/x/ratelimit/keeper"
@@ -214,6 +217,7 @@ var (
 		claim.AppModuleBasic{},
 		ccvconsumer.AppModuleBasic{},
 		autopilot.AppModuleBasic{},
+		icaoracle.AppModuleBasic{},
 		tendermint.AppModuleBasic{},
 	)
 
@@ -299,8 +303,7 @@ type StrideApp struct {
 	ScopedICAHostKeeper       capabilitykeeper.ScopedKeeper
 	ScopedCCVConsumerKeeper   capabilitykeeper.ScopedKeeper
 
-	ScopedStakeibcKeeper capabilitykeeper.ScopedKeeper
-	StakeibcKeeper       stakeibcmodulekeeper.Keeper
+	StakeibcKeeper stakeibcmodulekeeper.Keeper
 
 	EpochsKeeper          epochsmodulekeeper.Keeper
 	InterchainqueryKeeper interchainquerykeeper.Keeper
@@ -310,6 +313,7 @@ type StrideApp struct {
 	ScopedratelimitKeeper capabilitykeeper.ScopedKeeper
 	RatelimitKeeper       ratelimitmodulekeeper.Keeper
 	ClaimKeeper           claimkeeper.Keeper
+	ICAOracleKeeper       icaoraclekeeper.Keeper
 
 	mm           *module.Manager
 	sm           *module.SimulationManager
@@ -353,6 +357,7 @@ func NewStrideApp(
 		ratelimitmoduletypes.StoreKey,
 		icacallbacksmoduletypes.StoreKey,
 		claimtypes.StoreKey,
+		icaoracletypes.StoreKey,
 		ccvconsumertypes.StoreKey,
 		crisistypes.StoreKey,
 		consensusparamtypes.StoreKey,
@@ -525,7 +530,7 @@ func NewStrideApp(
 	// )
 	// monitoringModule := monitoringp.NewAppModule(appCodec, app.MonitoringKeeper)
 
-	// Note: must be above app.StakeibcKeeper
+	// Note: must be above app.StakeibcKeeper and app.ICAOracleKeeper
 	app.ICAControllerKeeper = icacontrollerkeeper.NewKeeper(
 		appCodec, keys[icacontrollertypes.StoreKey], app.GetSubspace(icacontrollertypes.SubModuleName),
 		app.IBCKeeper.ChannelKeeper, // may be replaced with middleware such as ics29 fee
@@ -556,6 +561,21 @@ func NewStrideApp(
 	)
 	recordsModule := recordsmodule.NewAppModule(appCodec, app.RecordsKeeper, app.AccountKeeper, app.BankKeeper)
 
+	// Note: Must be above stakeibc keeper
+	app.ICAOracleKeeper = *icaoraclekeeper.NewKeeper(
+		appCodec,
+		keys[icaoracletypes.StoreKey],
+		app.GetSubspace(icaoracletypes.ModuleName),
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		app.IBCKeeper.ChannelKeeper, // ICS4Wrapper - Note: this technically should be ICAController but it doesn't implement ICS4
+		app.IBCKeeper.ClientKeeper,
+		app.IBCKeeper.ConnectionKeeper,
+		app.IBCKeeper.ChannelKeeper,
+		app.ICAControllerKeeper,
+		app.IcacallbacksKeeper,
+	)
+	icaoracleModule := icaoracle.NewAppModule(appCodec, app.ICAOracleKeeper)
+
 	stakeibcKeeper := stakeibcmodulekeeper.NewKeeper(
 		appCodec,
 		keys[stakeibcmoduletypes.StoreKey],
@@ -570,6 +590,7 @@ func NewStrideApp(
 		app.StakingKeeper,
 		app.IcacallbacksKeeper,
 		app.RatelimitKeeper,
+		app.ICAOracleKeeper,
 		app.ConsumerKeeper,
 	)
 	app.StakeibcKeeper = *stakeibcKeeper.SetHooks(
@@ -625,6 +646,7 @@ func NewStrideApp(
 	if err := app.IcacallbacksKeeper.SetICACallbacks(
 		app.StakeibcKeeper.Callbacks(),
 		app.RecordsKeeper.Callbacks(),
+		app.ICAOracleKeeper.Callbacks(),
 	); err != nil {
 		return nil
 	}
@@ -652,12 +674,14 @@ func NewStrideApp(
 
 	// Stack two (ICACallbacks Stack) contains
 	// - IBC
-	// - ICA
+	// - ICAController
+	// - ICAOracle
 	// - stakeibc
 	// - ICACallbacks
 	// - base app
 	var icacallbacksStack porttypes.IBCModule = icacallbacksIBCModule
 	icacallbacksStack = stakeibcmodule.NewIBCMiddleware(icacallbacksStack, app.StakeibcKeeper)
+	icacallbacksStack = icaoracle.NewIBCMiddleware(icacallbacksStack, app.ICAOracleKeeper)
 	icacallbacksStack = icacontroller.NewIBCMiddleware(icacallbacksStack, app.ICAControllerKeeper)
 
 	// Stack three contains
@@ -729,6 +753,7 @@ func NewStrideApp(
 		icacallbacksModule,
 		consumerModule,
 		autopilotModule,
+		icaoracleModule,
 	)
 
 	// During begin block slashing happens after distr.BeginBlocker so that
@@ -765,6 +790,7 @@ func NewStrideApp(
 		claimtypes.ModuleName,
 		ccvconsumertypes.ModuleName,
 		autopilottypes.ModuleName,
+		icaoracletypes.ModuleName,
 		consensusparamtypes.ModuleName,
 	)
 
@@ -798,6 +824,7 @@ func NewStrideApp(
 		claimtypes.ModuleName,
 		ccvconsumertypes.ModuleName,
 		autopilottypes.ModuleName,
+		icaoracletypes.ModuleName,
 		consensusparamtypes.ModuleName,
 	)
 
@@ -836,6 +863,7 @@ func NewStrideApp(
 		claimtypes.ModuleName,
 		ccvconsumertypes.ModuleName,
 		autopilottypes.ModuleName,
+		icaoracletypes.ModuleName,
 		consensusparamtypes.ModuleName,
 	)
 
@@ -1109,7 +1137,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(icacallbacksmoduletypes.ModuleName)
 	paramsKeeper.Subspace(ccvconsumertypes.ModuleName)
 	paramsKeeper.Subspace(autopilottypes.ModuleName)
-
+	paramsKeeper.Subspace(icaoracletypes.ModuleName)
 	paramsKeeper.Subspace(claimtypes.ModuleName)
 	return paramsKeeper
 }

app/apptesting/test_helpers.go

@@ -346,6 +346,14 @@ func CopyConnectionAndClientToPath(path *ibctesting.Path, pathToCopy *ibctesting
 	return path
 }
 
+// Helper function to change the state of a channel (i.e. to open/close it)
+func (s *AppTestHelper) UpdateChannelState(portId, channelId string, channelState channeltypes.State) {
+	channel, found := s.App.IBCKeeper.ChannelKeeper.GetChannel(s.Ctx, portId, channelId)
+	s.Require().True(found, "ica channel should have been found")
+	channel.State = channelState
+	s.App.IBCKeeper.ChannelKeeper.SetChannel(s.Ctx, portId, channelId, channel)
+}
+
 // Constructs an ICA Packet Acknowledgement compatible with ibc-go v5+
 func ICAPacketAcknowledgement(t *testing.T, msgType string, msgResponses []proto.Message) channeltypes.Acknowledgement {
 	txMsgData := &sdk.TxMsgData{

app/proposals_whitelisting.go

@@ -30,6 +30,8 @@ var WhiteListModule = map[string]struct{}{
 	"/cosmos.mint.v1beta1.MsgUpdateParams":         {},
 	"/cosmos.upgrade.v1beta1.MsgSoftwareUpgrade":   {},
 	"/cosmos.upgrade.v1beta1.MsgCancelUpgrade":     {},
+	"/stride.icaoracle.MsgToggleOracle":            {},
+	"/stride.icaoracle.MsgRemoveOracle":            {},
 }
 
 func IsModuleWhiteList(typeUrl string) bool {

app/upgrades.go

@@ -29,6 +29,7 @@ import (
 	autopilottypes "github.com/Stride-Labs/stride/v12/x/autopilot/types"
 	claimtypes "github.com/Stride-Labs/stride/v12/x/claim/types"
 	icacallbacktypes "github.com/Stride-Labs/stride/v12/x/icacallbacks/types"
+	icaoracletypes "github.com/Stride-Labs/stride/v12/x/icaoracle/types"
 	ratelimittypes "github.com/Stride-Labs/stride/v12/x/ratelimit/types"
 	recordtypes "github.com/Stride-Labs/stride/v12/x/records/types"
 	stakeibctypes "github.com/Stride-Labs/stride/v12/x/stakeibc/types"
@@ -193,6 +194,10 @@ func (app *StrideApp) setupUpgradeHandlers(appOpts servertypes.AppOptions) {
 		storeUpgrades = &storetypes.StoreUpgrades{
 			Added: []string{consumertypes.ModuleName},
 		}
+	case "v13":
+		storeUpgrades = &storetypes.StoreUpgrades{
+			Added: []string{icaoracletypes.ModuleName},
+		}
 	}
 
 	if storeUpgrades != nil {

dockernet/config.sh

@@ -15,7 +15,7 @@ STRIDE_LOGS=$LOGS/stride.log
 TX_LOGS=$DOCKERNET_HOME/logs/tx.log
 KEYS_LOGS=$DOCKERNET_HOME/logs/keys.log
 
-# List of hosts enabled
+# List of hosts enabled 
 HOST_CHAINS=() 
 
 # If no host zones are specified above:

dockernet/config/ica_host.json

@@ -17,7 +17,9 @@
                     "/cosmos.staking.v1beta1.MsgCancelUnbondingDelegation",
                     "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward",
                     "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress",
-                    "/ibc.applications.transfer.v1.MsgTransfer"
+                    "/ibc.applications.transfer.v1.MsgTransfer",
+                    "/cosmwasm.wasm.v1.MsgExecuteContract",
+                    "/cosmwasm.wasm.v1.MsgInstantiateContract"
                 ]
             }
         }

proto/cosmwasm/wasm/v1/cosmwasm.proto

@@ -0,0 +1,50 @@
+syntax = "proto3";
+package cosmwasm.wasm.v1;
+
+import "gogoproto/gogo.proto";
+import "cosmos/base/v1beta1/coin.proto";
+
+option go_package = "github.com/Stride-Labs/stride/v12/x/icaoracle/types";
+
+// MsgExecuteContract submits the given message data to a smart contract
+message MsgExecuteContract {
+  // Sender is the that actor that signed the messages
+  string sender = 1;
+  // Contract is the address of the smart contract
+  string contract = 2;
+  // Msg json encoded message to be passed to the contract
+  bytes msg = 3 [ (gogoproto.casttype) = "RawContractMessage" ];
+  // Funds coins that are transferred to the contract on execution
+  repeated cosmos.base.v1beta1.Coin funds = 5 [
+    (gogoproto.nullable) = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+}
+
+// MsgInstantiateContract create a new smart contract instance for the given
+// code id.
+message MsgInstantiateContract {
+  // Sender is the that actor that signed the messages
+  string sender = 1;
+  // Admin is an optional address that can execute migrations
+  string admin = 2;
+  // CodeID is the reference to the stored WASM code
+  uint64 code_id = 3 [ (gogoproto.customname) = "CodeID" ];
+  // Label is optional metadata to be stored with a contract instance.
+  string label = 4;
+  // Msg json encoded message to be passed to the contract on instantiation
+  bytes msg = 5 [ (gogoproto.casttype) = "RawContractMessage" ];
+  // Funds coins that are transferred to the contract on instantiation
+  repeated cosmos.base.v1beta1.Coin funds = 6 [
+    (gogoproto.nullable) = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+}
+
+// MsgInstantiateContractResponse return instantiation result data
+message MsgInstantiateContractResponse {
+  // Address is the bech32 address of the new contract instance.
+  string address = 1;
+  // Data contains bytes to returned from the contract
+  bytes data = 2;
+}

proto/stride/icaoracle/callbacks.proto

@@ -0,0 +1,15 @@
+syntax = "proto3";
+package stride.icaoracle;
+
+import "stride/icaoracle/icaoracle.proto";
+
+option go_package = "github.com/Stride-Labs/stride/v12/x/icaoracle/types";
+
+// Callback data for instantiating an oracle
+message InstantiateOracleCallback { string oracle_chain_id = 1; }
+
+// Callback data for updating a value in the oracle
+message UpdateOracleCallback {
+  string oracle_chain_id = 1;
+  Metric metric = 2;
+}

proto/stride/icaoracle/contract.proto

@@ -0,0 +1,20 @@
+syntax = "proto3";
+package stride.icaoracle;
+
+option go_package = "github.com/Stride-Labs/stride/v12/x/icaoracle/types";
+
+// InstanitateOracleContract is the contract-specific instantiate message
+message MsgInstantiateOracleContract { string admin_address = 1; }
+
+// ExecuteContractPostMetric is the contract-specific metric update message
+message MsgExecuteContractPostMetric { MsgPostMetric post_metric = 1; }
+
+// Body of PostMetric contract message
+message MsgPostMetric {
+  string key = 1;
+  string value = 2;
+  string metric_type = 3;
+  int64 update_time = 4;
+  int64 block_height = 5;
+  string attributes = 6;
+}

proto/stride/icaoracle/genesis.proto

@@ -0,0 +1,28 @@
+syntax = "proto3";
+package stride.icaoracle;
+
+import "gogoproto/gogo.proto";
+import "stride/icaoracle/icaoracle.proto";
+
+option go_package = "github.com/Stride-Labs/stride/v12/x/icaoracle/types";
+
+// Params defines the icaoracle module parameters.
+message Params {}
+
+// GenesisState defines the icaoracle module's genesis state.
+message GenesisState {
+  Params params = 1 [
+    (gogoproto.moretags) = "yaml:\"params\"",
+    (gogoproto.nullable) = false
+  ];
+
+  repeated Oracle oracles = 2 [
+    (gogoproto.moretags) = "yaml:\"oracles\"",
+    (gogoproto.nullable) = false
+  ];
+
+  repeated Metric metrics = 3 [
+    (gogoproto.moretags) = "yaml:\"metrics\"",
+    (gogoproto.nullable) = false
+  ];
+}

proto/stride/icaoracle/icaoracle.proto

@@ -0,0 +1,45 @@
+syntax = "proto3";
+package stride.icaoracle;
+
+import "gogoproto/gogo.proto";
+
+option go_package = "github.com/Stride-Labs/stride/v12/x/icaoracle/types";
+
+// Oracle structure stores context about the CW oracle sitting a different chain
+message Oracle {
+  string chain_id = 1;
+  string connection_id = 2;
+  string channel_id = 3;
+  string port_id = 4;
+  string ica_address = 5;
+  string contract_address = 6;
+  bool active = 7;
+}
+
+// MetricStatus indicates whether the Metric update ICA has been sent
+enum MetricStatus {
+  METRIC_STATUS_UNSPECIFIED = 0
+      [ (gogoproto.enumvalue_customname) = "UNSPECIFIED" ];
+  METRIC_STATUS_QUEUED = 1 [ (gogoproto.enumvalue_customname) = "QUEUED" ];
+  METRIC_STATUS_IN_PROGRESS = 2
+      [ (gogoproto.enumvalue_customname) = "IN_PROGRESS" ];
+}
+
+// Metric structure stores a generic metric using a key value structure
+// along with additional context
+message Metric {
+  string key = 1;
+  string value = 2;
+  string metric_type = 3;
+  int64 update_time = 4;
+  int64 block_height = 5;
+  string attributes = 6;
+  string destination_oracle = 7;
+  MetricStatus status = 8;
+}
+
+// Attributes associated with a RedemptionRate metric update
+message RedemptionRateAttributes {
+  string denom = 1;
+  string base_denom = 2;
+}