mleku/wasmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Registered new proposal types

Browse Source
This commit is contained in:
Ethan Frey
2022-01-21 14:29:30 +01:00
parent 6bd6ffe90b
commit d227112cc3
2 changed files with 173 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
x/wasm/keeper/proposal_handler.go
View File

@@ -2,6 +2,7 @@ package keeper
import (
"encoding/hex"
"fmt"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -35,6 +36,10 @@ func NewWasmProposalHandlerX(k types.ContractOpsKeeper, enabledProposalTypes []t
return handleInstantiateProposal(ctx, k, *c)
case *types.MigrateContractProposal:
return handleMigrateProposal(ctx, k, *c)
case *types.SudoContractProposal:
return handleSudoProposal(ctx, k, *c)
case *types.ExecuteContractProposal:
return handleExecuteProposal(ctx, k, *c)
case *types.UpdateAdminProposal:
return handleUpdateAdminProposal(ctx, k, *c)
case *types.ClearAdminProposal:
@@ -115,6 +120,58 @@ func handleMigrateProposal(ctx sdk.Context, k types.ContractOpsKeeper, p types.M
return nil
}
func handleSudoProposal(ctx sdk.Context, k types.ContractOpsKeeper, p types.SudoContractProposal) error {
return fmt.Errorf("Not implemented")
//if err := p.ValidateBasic(); err != nil {
// return err
//}
//
//contractAddr, err := sdk.AccAddressFromBech32(p.Contract)
//if err != nil {
// return sdkerrors.Wrap(err, "contract")
//}
//runAsAddr, err := sdk.AccAddressFromBech32(p.RunAs)
//if err != nil {
// return sdkerrors.Wrap(err, "run as address")
//}
//data, err := k.Migrate(ctx, contractAddr, runAsAddr, p.CodeID, p.Msg)
//if err != nil {
// return err
//}
//
//ctx.EventManager().EmitEvent(sdk.NewEvent(
// types.EventTypeGovContractResult,
// sdk.NewAttribute(types.AttributeKeyResultDataHex, hex.EncodeToString(data)),
//))
//return nil
}
func handleExecuteProposal(ctx sdk.Context, k types.ContractOpsKeeper, p types.ExecuteContractProposal) error {
return fmt.Errorf("Not implemented")
//if err := p.ValidateBasic(); err != nil {
// return err
//}
//
//contractAddr, err := sdk.AccAddressFromBech32(p.Contract)
//if err != nil {
// return sdkerrors.Wrap(err, "contract")
//}
//runAsAddr, err := sdk.AccAddressFromBech32(p.RunAs)
//if err != nil {
// return sdkerrors.Wrap(err, "run as address")
//}
//data, err := k.Migrate(ctx, contractAddr, runAsAddr, p.CodeID, p.Msg)
//if err != nil {
// return err
//}
//
//ctx.EventManager().EmitEvent(sdk.NewEvent(
// types.EventTypeGovContractResult,
// sdk.NewAttribute(types.AttributeKeyResultDataHex, hex.EncodeToString(data)),
//))
//return nil
}
func handleUpdateAdminProposal(ctx sdk.Context, k types.ContractOpsKeeper, p types.UpdateAdminProposal) error {
if err := p.ValidateBasic(); err != nil {
return err

116
x/wasm/types/proposal.go
View File

@@ -16,6 +16,8 @@ const (
ProposalTypeStoreCode ProposalType = "StoreCode"
ProposalTypeInstantiateContract ProposalType = "InstantiateContract"
ProposalTypeMigrateContract ProposalType = "MigrateContract"
ProposalTypeSudoContract ProposalType = "SudoContract"
ProposalTypeExecuteContract ProposalType = "ExecuteContract"
ProposalTypeUpdateAdmin ProposalType = "UpdateAdmin"
ProposalTypeClearAdmin ProposalType = "ClearAdmin"
ProposalTypePinCodes ProposalType = "PinCodes"
@@ -30,6 +32,8 @@ var EnableAllProposals = []ProposalType{
ProposalTypeStoreCode,
ProposalTypeInstantiateContract,
ProposalTypeMigrateContract,
ProposalTypeSudoContract,
ProposalTypeExecuteContract,
ProposalTypeUpdateAdmin,
ProposalTypeClearAdmin,
ProposalTypePinCodes,
@@ -58,6 +62,8 @@ func init() { // register new content types with the sdk
govtypes.RegisterProposalType(string(ProposalTypeStoreCode))
govtypes.RegisterProposalType(string(ProposalTypeInstantiateContract))
govtypes.RegisterProposalType(string(ProposalTypeMigrateContract))
govtypes.RegisterProposalType(string(ProposalTypeSudoContract))
govtypes.RegisterProposalType(string(ProposalTypeExecuteContract))
govtypes.RegisterProposalType(string(ProposalTypeUpdateAdmin))
govtypes.RegisterProposalType(string(ProposalTypeClearAdmin))
govtypes.RegisterProposalType(string(ProposalTypePinCodes))
@@ -65,6 +71,8 @@ func init() { // register new content types with the sdk
govtypes.RegisterProposalTypeCodec(&StoreCodeProposal{}, "wasm/StoreCodeProposal")
govtypes.RegisterProposalTypeCodec(&InstantiateContractProposal{}, "wasm/InstantiateContractProposal")
govtypes.RegisterProposalTypeCodec(&MigrateContractProposal{}, "wasm/MigrateContractProposal")
govtypes.RegisterProposalTypeCodec(&SudoContractProposal{}, "wasm/SudoContractProposal")
govtypes.RegisterProposalTypeCodec(&ExecuteContractProposal{}, "wasm/ExecuteContractProposal")
govtypes.RegisterProposalTypeCodec(&UpdateAdminProposal{}, "wasm/UpdateAdminProposal")
govtypes.RegisterProposalTypeCodec(&ClearAdminProposal{}, "wasm/ClearAdminProposal")
govtypes.RegisterProposalTypeCodec(&PinCodesProposal{}, "wasm/PinCodesProposal")
@@ -277,6 +285,114 @@ func (p MigrateContractProposal) MarshalYAML() (interface{}, error) {
}, nil
}
// ProposalRoute returns the routing key of a parameter change proposal.
func (p SudoContractProposal) ProposalRoute() string { return RouterKey }
// GetTitle returns the title of the proposal
func (p *SudoContractProposal) GetTitle() string { return p.Title }
// GetDescription returns the human readable description of the proposal
func (p SudoContractProposal) GetDescription() string { return p.Description }
// ProposalType returns the type
func (p SudoContractProposal) ProposalType() string { return string(ProposalTypeSudoContract) }
// ValidateBasic validates the proposal
func (p SudoContractProposal) ValidateBasic() error {
if err := validateProposalCommons(p.Title, p.Description); err != nil {
return err
}
if _, err := sdk.AccAddressFromBech32(p.Contract); err != nil {
return sdkerrors.Wrap(err, "contract")
}
if err := p.Msg.ValidateBasic(); err != nil {
return sdkerrors.Wrap(err, "payload msg")
}
return nil
}
// String implements the Stringer interface.
func (p SudoContractProposal) String() string {
return fmt.Sprintf(`Migrate Contract Proposal:
Title: %s
Description: %s
Contract: %s
Msg %q
`, p.Title, p.Description, p.Contract, p.Msg)
}
// MarshalYAML pretty prints the migrate message
func (p SudoContractProposal) MarshalYAML() (interface{}, error) {
return struct {
Title string `yaml:"title"`
Description string `yaml:"description"`
Contract string `yaml:"contract"`
Msg string `yaml:"msg"`
}{
Title: p.Title,
Description: p.Description,
Contract: p.Contract,
Msg: string(p.Msg),
}, nil
}
// ProposalRoute returns the routing key of a parameter change proposal.
func (p ExecuteContractProposal) ProposalRoute() string { return RouterKey }
// GetTitle returns the title of the proposal
func (p *ExecuteContractProposal) GetTitle() string { return p.Title }
// GetDescription returns the human readable description of the proposal
func (p ExecuteContractProposal) GetDescription() string { return p.Description }
// ProposalType returns the type
func (p ExecuteContractProposal) ProposalType() string { return string(ProposalTypeExecuteContract) }
// ValidateBasic validates the proposal
func (p ExecuteContractProposal) ValidateBasic() error {
if err := validateProposalCommons(p.Title, p.Description); err != nil {
return err
}
if _, err := sdk.AccAddressFromBech32(p.Contract); err != nil {
return sdkerrors.Wrap(err, "contract")
}
if _, err := sdk.AccAddressFromBech32(p.RunAs); err != nil {
return sdkerrors.Wrap(err, "run as")
}
if err := p.Msg.ValidateBasic(); err != nil {
return sdkerrors.Wrap(err, "payload msg")
}
return nil
}
// String implements the Stringer interface.
func (p ExecuteContractProposal) String() string {
return fmt.Sprintf(`Migrate Contract Proposal:
Title: %s
Description: %s
Contract: %s
Run as: %s
Msg %q
`, p.Title, p.Description, p.Contract, p.RunAs, p.Msg)
}
// MarshalYAML pretty prints the migrate message
func (p ExecuteContractProposal) MarshalYAML() (interface{}, error) {
return struct {
Title string `yaml:"title"`
Description string `yaml:"description"`
Contract string `yaml:"contract"`
Msg string `yaml:"msg"`
RunAs string `yaml:"run_as"`
}{
Title: p.Title,
Description: p.Description,
Contract: p.Contract,
Msg: string(p.Msg),
RunAs: p.RunAs,
}, nil
}
// ProposalRoute returns the routing key of a parameter change proposal.
func (p UpdateAdminProposal) ProposalRoute() string { return RouterKey }