feat: implement approve oracle upgrade tx

app/app.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/x/authz"
 	"github.com/medibloc/panacea-core/v2/x/oracle"
+	oracleclient "github.com/medibloc/panacea-core/v2/x/oracle/client"
 	oraclekeeper "github.com/medibloc/panacea-core/v2/x/oracle/keeper"
 	oracletypes "github.com/medibloc/panacea-core/v2/x/oracle/types"
 
@@ -162,6 +163,7 @@ func getGovProposalHandlers() []govclient.ProposalHandler {
 		upgradeclient.ProposalHandler,
 		upgradeclient.CancelProposalHandler,
 		// this line is used by starport scaffolding # stargate/app/govProposalHandler
+		oracleclient.ProposalHandler,
 	)
 	govProposalHandlers = append(govProposalHandlers, wasmclient.ProposalHandlers...)
 
@@ -440,6 +442,7 @@ func New(
 		keys[oracletypes.MemStoreKey],
 		app.GetSubspace(oracletypes.ModuleName),
 	)
+	govRouter.AddRoute(oracletypes.RouterKey, oracle.NewOracleProposalHandler(app.oracleKeeper))
 
 	app.datadealKeeper = *datadealkeeper.NewKeeper(
 		appCodec,

proto/panacea/oracle/v2/oracle.proto

@@ -40,3 +40,32 @@ message OracleRegistration {
   string oracle_commission_max_change_rate = 10 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
   bytes encrypted_oracle_priv_key = 11;
 }
+
+// OracleUpgrade defines the states of oracle upgrade
+message OracleUpgrade {
+  string unique_id = 1;
+  string oracle_address = 2;
+  // Node public key is a pair with a node private key which is generated in SGX by each oracle.
+  // This key is used to share the oracle private key from other oracles.
+  bytes node_pub_key = 3;
+  // Anyone can validate that the node key pair is generated in SGX using this node key remote report.
+  bytes node_pub_key_remote_report = 4;
+  // An oracle to be upgraded must report a trusted block info which was used to initialize its light client with a new version of oracle.
+  // Other oracles will validate whether this trusted block info is correct,
+  //   in order to prevent malicious operators from making the oracle look at a malicious chain node.
+  // Other oracles don't have to worry about whether this block info was set by a malicious operator,
+  //   because this message has to be generated inside SGX.
+  // Also, after this oracle upgrade is complete, the light client is protected from malicious operators by SGX.
+  int64 trusted_block_height = 5;
+  bytes trusted_block_hash = 6;
+  bytes encrypted_oracle_priv_key = 7;
+}
+
+// OracleUpgradeInfo defines the info of oracle upgrade, which includes the target height of upgrade and unique ID of the new version of oracle
+message OracleUpgradeInfo {
+  option (gogoproto.equal) = true;
+
+  string unique_id = 1;
+
+  int64 height = 2;
+}

proto/panacea/oracle/v2/proposal.proto

@@ -0,0 +1,25 @@
+syntax = "proto3";
+package panacea.oracle.v2;
+
+option go_package = "github.com/medibloc/panacea-core/x/oracle/types";
+option (gogoproto.goproto_getters_all) = false;
+
+import "gogoproto/gogo.proto";
+
+// Plan defines upgrade plan information.
+message Plan {
+  option (gogoproto.equal) = true;
+
+  string unique_id = 1;
+
+  int64 height = 2;
+}
+
+// OracleUpgradeProposal defines the information required for a proposal.
+message OracleUpgradeProposal {
+  option (gogoproto.equal) = true;
+
+  string title       = 1;
+  string description = 2;
+  Plan   plan        = 3 [(gogoproto.nullable) = false];
+}

proto/panacea/oracle/v2/query.proto

@@ -32,6 +32,16 @@ service Query {
     option (google.api.http).get = "/panacea/oracle/v2/oracle-registrations/{unique_id}/{oracle_address}";
   }
 
+  // OracleUpgradeInfo returns OracleUpgradeInfo of oracle module.
+  rpc OracleUpgradeInfo(QueryOracleUpgradeInfoRequest) returns (QueryOracleUpgradeInfoResponse) {
+    option (google.api.http).get = "/panacea/oracle/v2/oracle-upgrade-info";
+  }
+
+  // OracleUpgrade returns the information related to oracle upgrade
+  rpc OracleUpgrade(QueryOracleUpgradeRequest) returns (QueryOracleUpgradeResponse) {
+    option (google.api.http).get = "/panacea/oracle/v2/oracle-upgrades/{unique_id}/{oracle_address}";
+  }
+
   // Params returns params of oracle module.
   rpc Params(QueryOracleParamsRequest) returns (QueryParamsResponse) {
     option (google.api.http).get = "/panacea/oracle/v2/params";
@@ -82,6 +92,25 @@ message QueryOracleRegistrationResponse {
   OracleRegistration oracle_registration = 1;
 }
 
+// QueryOracleUpgradeInfoRequest is the request type for the Query/OracleUpgradeInfo RPC method.
+message QueryOracleUpgradeInfoRequest {}
+
+// QueryOracleUpgradeInfoRequest is the response type for the Query/OracleUpgradeInfo RPC method.
+message QueryOracleUpgradeInfoResponse {
+  OracleUpgradeInfo oracle_upgrade_info = 1;
+}
+
+// QueryOracleUpgradeRequest is the request type for the Query/OracleUpgrade RPC method.
+message QueryOracleUpgradeRequest {
+  string unique_id = 1;
+  string oracle_address = 2;
+}
+
+// QueryOracleUpgradeResponse is the response type for the Query/OracleUpgrade RPC method.
+message QueryOracleUpgradeResponse {
+  OracleUpgrade oracle_upgrade = 1;
+}
+
 // QueryOracleParamsRequest is the request type for the Query/OracleParams RPC method.
 message QueryOracleParamsRequest {}
 

proto/panacea/oracle/v2/tx.proto

@@ -18,8 +18,14 @@ service Msg {
   // ApproveOracleRegistration defines a method to approve oracle registration
   rpc ApproveOracleRegistration(MsgApproveOracleRegistration) returns (MsgApproveOracleRegistrationResponse);
 
-  // UpgradeOracle defines a method for upgrade of oracle.
+  // UpgradeOracleInfo defines a method to update oracle info
   rpc UpdateOracleInfo(MsgUpdateOracleInfo) returns (MsgUpdateOracleInfoResponse);
+
+  // UpgradeOracle defines a method for upgrade of oracle
+  rpc UpgradeOracle(MsgUpgradeOracle) returns (MsgUpgradeOracleResponse);
+
+  // ApproveOracleUpgrade defines a method for approval of oracle upgrade
+  rpc ApproveOracleUpgrade(MsgApproveOracleUpgrade) returns (MsgApproveOracleUpgradeResponse);
 }
 
 // MsgRegisterOracle defines the Msg/RegisterOracle request type.
@@ -42,12 +48,13 @@ message MsgRegisterOracleResponse {
 
 // MsgApproveOracleRegistration defines the Msg/ApproveOracleRegistration
 message MsgApproveOracleRegistration {
-  ApproveOracleRegistration approve_oracle_registration = 1;
+  ApprovalSharingOracleKey approval_sharing_oracle_key = 1;
   bytes signature = 2;
 }
 
-// ApproveOracleRegistration defines for oracle registration approval
-message ApproveOracleRegistration {
+// ApprovalSharingOracleKey defines approval for sharing oracle key encrypted with target oracle's node public key
+message ApprovalSharingOracleKey {
+  // approver's unique ID
   string unique_id = 1;
   string approver_oracle_address = 2;
   string target_oracle_address = 3;
@@ -62,9 +69,31 @@ message MsgApproveOracleRegistrationResponse {
 message MsgUpdateOracleInfo {
   string oracle_address = 1;  // panacea1.. account address
   string endpoint = 2;
-  string oracle_commission_rate = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",(gogoproto.nullable) = true];
+  string oracle_commission_rate = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = true];
 }
 
 // MsgUpdateOracleInfoResponse defines the Msg/UpdateOracleInfo
 message MsgUpdateOracleInfoResponse {
 }
+
+// MsgUpgradeOracle defines the Msg/UpgradeOracle
+message MsgUpgradeOracle {
+  string unique_id = 1;
+  string oracle_address = 2;  // panacea1.. account address
+  bytes node_pub_key = 3;
+  bytes node_pub_key_remote_report = 4;
+  int64 trusted_block_height = 5;
+  bytes trusted_block_hash = 6;
+}
+
+// MsgUpgradeOracleResponse defines the response of Msg/UpgradeOracle
+message MsgUpgradeOracleResponse {}
+
+// MsgApproveOracleUpgrade defines the Msg/ApproveOracleUpgrade
+message MsgApproveOracleUpgrade {
+  ApprovalSharingOracleKey approval_sharing_oracle_key = 1;
+  bytes signature = 2;
+}
+
+// MsgApproveOracleUpgradeResponse defines the response of Msg/ApproveOracleUpgrade
+message MsgApproveOracleUpgradeResponse {}

x/oracle/abci.go

@@ -0,0 +1,31 @@
+package oracle
+
+import (
+	"errors"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/medibloc/panacea-core/v2/x/oracle/keeper"
+	"github.com/medibloc/panacea-core/v2/x/oracle/types"
+)
+
+func EndBlocker(ctx sdk.Context, keeper keeper.Keeper) {
+	handlerOracleUpgrade(ctx, keeper)
+}
+
+func handlerOracleUpgrade(ctx sdk.Context, keeper keeper.Keeper) {
+	upgradeInfo, err := keeper.GetOracleUpgradeInfo(ctx)
+	if err != nil {
+		if errors.Is(err, types.ErrOracleUpgradeInfoNotFound) {
+			return
+		} else {
+			panic(err)
+		}
+	}
+
+	if upgradeInfo.ShouldExecute(ctx) {
+		if err := keeper.ApplyUpgrade(ctx, upgradeInfo); err != nil {
+			panic(err)
+		}
+		keeper.RemoveOracleUpgradeInfo(ctx)
+	}
+}

x/oracle/abci_test.go

@@ -0,0 +1,83 @@
+package oracle_test
+
+import (
+	"encoding/base64"
+	"testing"
+
+	"github.com/btcsuite/btcd/btcec"
+	"github.com/medibloc/panacea-core/v2/types/testsuite"
+	"github.com/medibloc/panacea-core/v2/x/oracle"
+	"github.com/medibloc/panacea-core/v2/x/oracle/types"
+	"github.com/stretchr/testify/suite"
+)
+
+type abciTestSuite struct {
+	testsuite.TestSuite
+
+	uniqueID string
+}
+
+func TestAbciTestSuite(t *testing.T) {
+	suite.Run(t, new(abciTestSuite))
+}
+
+func (suite *abciTestSuite) BeforeTest(_, _ string) {
+	ctx := suite.Ctx
+	suite.uniqueID = "uniqueID"
+
+	oraclePrivKey, err := btcec.NewPrivateKey(btcec.S256())
+	suite.Require().NoError(err)
+
+	suite.OracleKeeper.SetParams(ctx, types.Params{
+		OraclePublicKey:          base64.StdEncoding.EncodeToString(oraclePrivKey.PubKey().SerializeCompressed()),
+		OraclePubKeyRemoteReport: base64.StdEncoding.EncodeToString([]byte("oraclePubKeyRemoteReport")),
+		UniqueId:                 suite.uniqueID,
+	})
+}
+
+func (suite *abciTestSuite) TestOracleUpgradeSuccess() {
+	ctx := suite.Ctx
+	ctx = ctx.WithBlockHeight(1)
+
+	suite.Require().Equal(suite.uniqueID, suite.OracleKeeper.GetParams(ctx).UniqueId)
+
+	upgradeUniqueID := "upgradeUniqueID"
+
+	upgradeInfo := &types.OracleUpgradeInfo{
+		UniqueId: upgradeUniqueID,
+		Height:   10,
+	}
+
+	suite.Require().NoError(suite.OracleKeeper.SetOracleUpgradeInfo(ctx, upgradeInfo))
+
+	ctx = ctx.WithBlockHeight(10)
+
+	oracle.EndBlocker(ctx, suite.OracleKeeper)
+
+	suite.Require().Equal(upgradeUniqueID, suite.OracleKeeper.GetParams(ctx).UniqueId)
+
+	_, err := suite.OracleKeeper.GetOracleUpgradeInfo(ctx)
+	suite.Require().Error(err, types.ErrOracleUpgradeInfoNotFound)
+}
+
+func (suite *abciTestSuite) TestOracleUpgradeFailedBeforeReachUpgradeHeight() {
+	ctx := suite.Ctx
+	ctx = ctx.WithBlockHeight(1)
+
+	suite.Require().Equal(suite.uniqueID, suite.OracleKeeper.GetParams(ctx).UniqueId)
+
+	upgradeUniqueID := "upgradeUniqueID"
+
+	upgradeInfo := &types.OracleUpgradeInfo{
+		UniqueId: upgradeUniqueID,
+		Height:   10,
+	}
+
+	suite.Require().NoError(suite.OracleKeeper.SetOracleUpgradeInfo(ctx, upgradeInfo))
+
+	ctx = ctx.WithBlockHeight(9)
+
+	oracle.EndBlocker(ctx, suite.OracleKeeper)
+
+	suite.Require().Equal(suite.uniqueID, suite.OracleKeeper.GetParams(ctx).UniqueId)
+}

x/oracle/client/cli/query.go

@@ -23,6 +23,7 @@ func GetQueryCmd(queryRoute string) *cobra.Command {
 	cmd.AddCommand(CmdGetOracle())
 	cmd.AddCommand(CmdGetOracleRegistrations())
 	cmd.AddCommand(CmdGetOracleRegistration())
+	cmd.AddCommand(CmdGetOracleUpgradeInfo())
 	cmd.AddCommand(CmdGetParams())
 
 	return cmd

x/oracle/client/cli/queryOracleUpgradeInfo.go

@@ -0,0 +1,35 @@
+package cli
+
+import (
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/medibloc/panacea-core/v2/x/oracle/types"
+	"github.com/spf13/cobra"
+)
+
+func CmdGetOracleUpgradeInfo() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "oracle-upgrade-info",
+		Short: "Query an oracle upgrade information",
+		Args:  cobra.ExactArgs(0),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			queryClient := types.NewQueryClient(clientCtx)
+
+			res, err := queryClient.OracleUpgradeInfo(cmd.Context(), &types.QueryOracleUpgradeInfoRequest{})
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+
+	return cmd
+}

x/oracle/client/cli/tx.go

@@ -32,6 +32,7 @@ func GetTxCmd() *cobra.Command {
 
 	cmd.AddCommand(CmdRegisterOracle())
 	cmd.AddCommand(CmdUpdateOracleInfo())
+	cmd.AddCommand(CmdUpgradeOracle())
 
 	return cmd
 }