feat: 24h vote on new compass deployments (#1344)

# Related Github tickets

- VolumeFi#2617

# Testing completed

- [x] test coverage exists or has been added/updated
- [x] tested in a private testnet

# Breaking changes

- [x] I have checked my code for breaking changes
- [x] If there are breaking changes, there is a supporting migration.

Co-authored-by: Taariq Lewis <[email protected]>

Author: byte-bandit

app/app.go

@@ -599,6 +599,7 @@ func New(
 	app.EvmKeeper = *evmmodulekeeper.NewKeeper(
 		appCodec,
 		runtime.NewKVStoreService(keys[evmmoduletypes.StoreKey]),
+		authorityAddress,
 		app.ConsensusKeeper,
 		app.ValsetKeeper,
 		authcodec.NewBech32Codec(chainparams.ValidatorAddressPrefix),

proto/palomachain/paloma/evm/deploy_new_smart_contract_proposal.proto

@@ -3,7 +3,10 @@ package palomachain.paloma.evm;
 
 option go_package = "github.com/palomachain/paloma/v2/x/evm/types";
 
+// This message is deprecated, use MsgDeployNewSmartContractProposalV2.
 message DeployNewSmartContractProposal {
+  option deprecated = true;
+
   string title = 1;
   string description = 2;
 

proto/palomachain/paloma/evm/tx.proto

@@ -13,6 +13,10 @@ service Msg {
   rpc RemoveSmartContractDeployment(MsgRemoveSmartContractDeploymentRequest)
       returns (RemoveSmartContractDeploymentResponse);
 
+  // ===== Governance messages =====
+  rpc ProposeNewSmartContractDeployment(MsgDeployNewSmartContractProposalV2)
+      returns (google.protobuf.Empty);
+
   // ===== User Smart Contracts =====
   rpc UploadUserSmartContract(MsgUploadUserSmartContractRequest)
       returns (MsgUploadUserSmartContractResponse);
@@ -74,3 +78,13 @@ message MsgDeployUserSmartContractRequest {
 message MsgDeployUserSmartContractResponse {
   uint64 msg_id = 1;
 }
+
+message MsgDeployNewSmartContractProposalV2 {
+  option (cosmos.msg.v1.signer) = "metadata";
+  palomachain.paloma.valset.MsgMetadata metadata = 1
+      [ (gogoproto.nullable) = false ];
+  string authority = 2 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
+
+  string abiJSON = 3;
+  string bytecodeHex = 4;
+}

tests/integration/helper/fixture.go

@@ -379,6 +379,7 @@ func InitFixture(t ginkgo.FullGinkgoTInterface) *Fixture {
 	*evmKeeper = *evmmodulekeeper.NewKeeper(
 		appCodec,
 		runtime.NewKVStoreService(keys[evmmoduletypes.StoreKey]),
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 		consensusKeeper,
 		valsetKeeper,
 		authcodec.NewBech32Codec(params2.ValidatorAddressPrefix),

testutil/keeper/evm.go

@@ -37,6 +37,8 @@ func EvmKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
 	k := keeper.NewKeeper(
 		cdc,
 		runtime.NewKVStoreService(storeKey),
+		// authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		"",
 		nil,
 		mocks.NewValsetKeeper(t),
 		authcodec.NewBech32Codec(params2.ValidatorAddressPrefix),

x/evm/keeper/keeper.go

@@ -109,6 +109,7 @@ var _ valsettypes.OnSnapshotBuiltListener = &Keeper{}
 type Keeper struct {
 	cdc             codec.BinaryCodec
 	storeKey        corestore.KVStoreService
+	authority       string
 	ConsensusKeeper types.ConsensusKeeper
 	SchedulerKeeper types.SchedulerKeeper
 	Valset          types.ValsetKeeper
@@ -125,6 +126,7 @@ type Keeper struct {
 func NewKeeper(
 	cdc codec.BinaryCodec,
 	storeService corestore.KVStoreService,
+	authority string,
 	consensusKeeper types.ConsensusKeeper,
 	valsetKeeper types.ValsetKeeper, a address.Codec,
 	metrixKeeper types.MetrixKeeper,
@@ -133,6 +135,7 @@ func NewKeeper(
 	k := &Keeper{
 		cdc:             cdc,
 		storeKey:        storeService,
+		authority:       authority,
 		ConsensusKeeper: consensusKeeper,
 		Valset:          valsetKeeper,
 		msgSender: msgSender{

x/evm/keeper/msg_server.go

@@ -1,7 +1,12 @@
 package keeper
 
 import (
+	"context"
+
+	sdkerrors "cosmossdk.io/errors"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	"github.com/palomachain/paloma/v2/x/evm/types"
+	"google.golang.org/protobuf/types/known/emptypb"
 )
 
 type msgServer struct {
@@ -15,3 +20,25 @@ func NewMsgServerImpl(keeper Keeper) types.MsgServer {
 }
 
 var _ types.MsgServer = msgServer{}
+
+func (k msgServer) ProposeNewSmartContractDeployment(ctx context.Context, req *types.MsgDeployNewSmartContractProposalV2) (*emptypb.Empty, error) {
+	if err := req.ValidateBasic(); err != nil {
+		return nil, sdkerrors.Wrapf(govtypes.ErrInvalidSigner, "message validation failed: %v", err)
+	}
+	if req.Authority != req.Metadata.Creator {
+		return nil, sdkerrors.Wrapf(govtypes.ErrInvalidSigner, "creator mismatch; expected %s, got %s", k.authority, req.Metadata.Creator)
+	}
+	if req.Metadata.Creator != k.authority {
+		return nil, sdkerrors.Wrapf(govtypes.ErrInvalidSigner, "invalid authority; expected %s, got %s", k.authority, req.Metadata.Creator)
+	}
+	sc, err := k.SaveNewSmartContract(ctx, req.GetAbiJSON(), req.Bytecode())
+	if err != nil {
+		return nil, err
+	}
+
+	if err := k.SetAsCompassContract(ctx, sc); err != nil {
+		return nil, err
+	}
+
+	return &emptypb.Empty{}, nil
+}

x/evm/keeper/setup_test.go

@@ -12,6 +12,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/runtime"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authcodec "github.com/cosmos/cosmos-sdk/x/auth/codec"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	"github.com/palomachain/paloma/v2/app/params"
 	"github.com/palomachain/paloma/v2/testutil"
 	"github.com/palomachain/paloma/v2/x/evm/types"
@@ -56,6 +58,7 @@ func NewEvmKeeper(t testutil.TB) (*Keeper, mockedServices, sdk.Context) {
 	k := NewKeeper(
 		appCodec,
 		storeService,
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 		ms.ConsensusKeeper,
 		ms.ValsetKeeper,
 		authcodec.NewBech32Codec(params.ValidatorAddressPrefix),

x/evm/types/codec.go

@@ -15,12 +15,14 @@ func RegisterCodec(cdc *codec.LegacyAmino) {
 	cdc.RegisterConcrete(&RelayWeightsProposal{}, "evm/RelayWeightsProposal", nil)
 	cdc.RegisterConcrete(&SetFeeManagerAddressProposal{}, "evm/SetFeeManagerAddressProposal", nil)
 	cdc.RegisterConcrete(&SetSmartContractDeployersProposal{}, "evm/SetSmartContractDeployersProposal", nil)
+	cdc.RegisterConcrete(&MsgDeployNewSmartContractProposalV2{}, "evm/ProposeNewSmartContractDeployment", nil)
 }
 
 func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 	registry.RegisterImplementations(
 		(*sdk.Msg)(nil),
 		&MsgRemoveSmartContractDeploymentRequest{},
+		&MsgDeployNewSmartContractProposalV2{},
 	)
 	registry.RegisterImplementations(
 		(*govv1beta1types.Content)(nil),

x/evm/types/deploy_new_smart_contract_proposal.pb.go

@@ -9,8 +9,9 @@ import (
 
 // x/evm module sentinel errors
 var (
-	ErrSample  = sdkerrors.Register(ModuleName, 1100, "sample error")
-	ErrInvalid = sdkerrors.Register(ModuleName, 1200, "invalid")
+	ErrSample       = sdkerrors.Register(ModuleName, 1100, "sample error")
+	ErrInvalid      = sdkerrors.Register(ModuleName, 1200, "invalid")
+	ErrUnauthorized = sdkerrors.Register(ModuleName, 1300, "unauthorized")
 )
 
 var (

x/evm/types/errors.go

@@ -0,0 +1,65 @@
+package types
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/palomachain/paloma/v2/util/libmeta"
+)
+
+// nolint: exhaustruct
+var (
+	_ sdk.Msg = &MsgRemoveSmartContractDeploymentRequest{}
+	_ sdk.Msg = &MsgDeployNewSmartContractProposalV2{}
+)
+
+func (msg *MsgRemoveSmartContractDeploymentRequest) ValidateBasic() error {
+	return libmeta.ValidateBasic(msg)
+}
+
+func (msg *MsgRemoveSmartContractDeploymentRequest) GetSigners() []sdk.AccAddress {
+	return libmeta.GetSigners(msg)
+}
+
+func (msg *MsgRemoveSmartContractDeploymentRequest) Route() string { return RouterKey }
+
+func (msg *MsgRemoveSmartContractDeploymentRequest) Type() string {
+	return "remove_smart_contract_deployment"
+}
+
+func (msg *MsgRemoveSmartContractDeploymentRequest) GetSignBytes() []byte {
+	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg))
+}
+
+func (msg *MsgDeployNewSmartContractProposalV2) ValidateBasic() error {
+	if len(msg.AbiJSON) < 1 || len(msg.BytecodeHex) < 1 {
+		return ErrInvalid.Wrap("abi json or bytecode hex is empty")
+	}
+
+	if msg.Authority != msg.Metadata.Creator {
+		return ErrUnauthorized.Wrapf("authority mismatch: %s", msg.Authority)
+	}
+
+	if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil {
+		return ErrInvalid.Wrap("authority address is invalid")
+	}
+
+	return libmeta.ValidateBasic(msg)
+}
+
+func (msg *MsgDeployNewSmartContractProposalV2) GetSigners() []sdk.AccAddress {
+	return libmeta.GetSigners(msg)
+}
+
+func (msg *MsgDeployNewSmartContractProposalV2) Route() string { return RouterKey }
+
+func (msg *MsgDeployNewSmartContractProposalV2) Type() string {
+	return "propose_new_smart_contract_deployment"
+}
+
+func (msg *MsgDeployNewSmartContractProposalV2) GetSignBytes() []byte {
+	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg))
+}
+
+func (a *MsgDeployNewSmartContractProposalV2) Bytecode() []byte {
+	return common.FromHex(a.GetBytecodeHex())
+}