Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ioctl): project state and operator subcommands #4024

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
coverage:
range: 50...90
range: 50...100
status:
project:
default:
Expand All @@ -9,6 +9,7 @@ coverage:
default:
enabled: yes
target: auto
#threshold: 0%
ignore:
- "action/protocol/rewarding/rewardingpb"
- "action/protocol/account/accountpb"
Expand Down
54 changes: 51 additions & 3 deletions ioctl/cmd/ws/ws.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,79 @@ var (
config.English: "W3bstream node operations",
config.Chinese: "W3bstream节点操作",
}
)

// multi-language flags descriptions
var (
_flagChainEndpointUsages = map[config.Language]string{
config.English: "set endpoint for once",
config.Chinese: "一次设置端点",
}

_flagWsEndpointUsages = map[config.Language]string{
config.English: "set w3bsteram endpoint for once",
config.Chinese: "一次设置w3bstream端点",
}
_flagProjectIDUsages = map[config.Language]string{
config.English: "project id",
config.Chinese: "项目ID",
}
_flagProjectVersionUsages = map[config.Language]string{
config.English: "project version",
config.Chinese: "项目版本",
}
_flagSendDataUsages = map[config.Language]string{
config.English: "send data",
config.Chinese: "要发送的数据",
}
_flagVMTypeUsages = map[config.Language]string{
config.English: "vm type, support risc0, halo2",
config.Chinese: "虚拟机类型,目前支持risc0和halo2",
}
_flagCodeFileUsages = map[config.Language]string{
config.English: "code file",
config.Chinese: "代码文件",
}
_flagConfFileUsages = map[config.Language]string{
config.English: "conf file",
config.Chinese: "配置文件",
}
_flagExpandParamUsages = map[config.Language]string{
config.English: "expand param, if you use risc0 vm, need it.",
config.Chinese: "扩展参数,risc0虚拟机需要此参数",
}
_flagMessageIDUsages = map[config.Language]string{
config.English: "message id",
config.Chinese: "消息ID",
}
_flagProjectOperatorUsages = map[config.Language]string{
config.English: "project operator",
config.Chinese: "项目操作者账户地址",
}

_flagIPFSEndpointUsages = map[config.Language]string{
config.English: "set ipfs endpoint for resource uploading for once",
config.Chinese: "一次设置ipfs端点",
}

_flagIPFSGatewayUsages = map[config.Language]string{
config.English: "set ipfs gateway for resource fetching for once",
config.Chinese: "一次设置ipfs网关",
}

_flagContractAddressUsages = map[config.Language]string{
config.English: "set w3bsteram project register contract address for once",
config.Chinese: "一次设置w3bstream项目注册合约地址",
}
_flagProjectConfigFileUsages = map[config.Language]string{
config.English: "project config file path",
config.Chinese: "项目配置文件路径",
}
_flagProjectConfigHashUsages = map[config.Language]string{
config.English: "project config file hash(sha256) for validating",
config.Chinese: "项目配置文件sha256哈希",
}
_flagVersionUsages = map[config.Language]string{
config.English: "version for the project config",
config.Chinese: "该project config的版本号",
}
)

func init() {
Expand Down
21 changes: 0 additions & 21 deletions ioctl/cmd/ws/wscodeconvert.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,27 +57,6 @@ var (
config.English: "convert zkp code to hex string compressed with zlib",
config.Chinese: "将zkp代码通过zlib进行压缩之后转成hex字符串",
}

_flagVersionUsages = map[config.Language]string{
config.English: "version for the project config",
config.Chinese: "该project config的版本号",
}
_flagVMTypeUsages = map[config.Language]string{
config.English: "vm type, support risc0, halo2",
config.Chinese: "虚拟机类型,目前支持risc0和halo2",
}
_flagCodeFileUsages = map[config.Language]string{
config.English: "code file",
config.Chinese: "代码文件",
}
_flagConfFileUsages = map[config.Language]string{
config.English: "conf file",
config.Chinese: "配置文件",
}
_flagExpandParamUsages = map[config.Language]string{
config.English: "expand param, if you use risc0 vm, need it.",
config.Chinese: "扩展参数,risc0虚拟机需要此参数",
}
)

func init() {
Expand Down
5 changes: 0 additions & 5 deletions ioctl/cmd/ws/wsmessagequery.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ var (
config.English: "query message status from w3bstream",
config.Chinese: "向w3bstream查询消息状态",
}

_flagMessageIDUsages = map[config.Language]string{
config.English: "message id",
config.Chinese: "消息ID",
}
)

func init() {
Expand Down
13 changes: 0 additions & 13 deletions ioctl/cmd/ws/wsmessagesend.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,6 @@ var (
config.English: "send message to w3bstream for zk proofing",
config.Chinese: "向w3bstream发送消息请求zk证明",
}

_flagProjectIDUsages = map[config.Language]string{
config.English: "project id",
config.Chinese: "项目ID",
}
_flagProjectVersionUsages = map[config.Language]string{
config.English: "project version",
config.Chinese: "项目版本",
}
_flagSendDataUsages = map[config.Language]string{
config.English: "send data",
config.Chinese: "要发送的数据",
}
)

func init() {
Expand Down
12 changes: 12 additions & 0 deletions ioctl/cmd/ws/wsproject.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,15 @@ const (
createWsProjectFuncName = "createProject"
updateWsProjectFuncName = "updateProject"
queryWsProjectFuncName = "projects"
addProjectOperatorFuncName = "addOperator"
delProjectOperatorFuncName = "removeOperator"
startWsProjectFuncName = "unpauseProject"
stopWsProjectFuncName = "pauseProject"
wsProjectUpsertedEventName = "ProjectUpserted"
wsProjectPausedEventName = "ProjectPaused"
wsProjectUnpausedEventName = "ProjectUnpaused"
wsOperatorRemovedEventName = "OperatorRemoved"
wsOperatorAddedEventName = "OperatorAdded"
)

type projectMeta struct {
Expand All @@ -84,6 +92,10 @@ func init() {
wsProject.AddCommand(wsProjectCreate)
wsProject.AddCommand(wsProjectUpdate)
wsProject.AddCommand(wsProjectQuery)
wsProject.AddCommand(wsProjectStart)
wsProject.AddCommand(wsProjectStop)
wsProject.AddCommand(wsProjectAddOperator)
wsProject.AddCommand(wsProjectDelOperator)

wsProjectRegisterContractAddress = config.ReadConfig.WsRegisterContract
wsProjectIPFSEndpoint = config.ReadConfig.IPFSEndpoint
Expand Down
108 changes: 108 additions & 0 deletions ioctl/cmd/ws/wsprojectcontrol.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
package ws

import (
"fmt"
"math/big"

"github.com/pkg/errors"
"github.com/spf13/cobra"

"github.com/iotexproject/iotex-core/ioctl/cmd/action"
"github.com/iotexproject/iotex-core/ioctl/config"
"github.com/iotexproject/iotex-core/ioctl/output"
"github.com/iotexproject/iotex-core/ioctl/util"
)

var (
wsProjectStart = &cobra.Command{
Use: "start",
Short: config.TranslateInLang(wsProjectStartShorts, config.UILanguage),
RunE: func(cmd *cobra.Command, args []string) error {
id, err := cmd.Flags().GetUint64("project-id")
if err != nil {
return output.PrintError(err)
}
out, err := controlProjectState(id, startProject)
if err != nil {
return output.PrintError(err)
}
output.PrintResult(out)
return nil
},
}

wsProjectStop = &cobra.Command{
Use: "stop",
Short: config.TranslateInLang(wsProjectStopShorts, config.UILanguage),
RunE: func(cmd *cobra.Command, args []string) error {
id, err := cmd.Flags().GetUint64("project-id")
if err != nil {
return output.PrintError(err)
}
out, err := controlProjectState(id, stopProject)
if err != nil {
return output.PrintError(err)
}
output.PrintResult(out)
return nil
},
}

wsProjectStartShorts = map[config.Language]string{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move this to ws.go

config.English: "start w3bstream project",
config.Chinese: "开启项目",
}

wsProjectStopShorts = map[config.Language]string{
config.English: "stop w3bstream project",
config.Chinese: "停止项目",
}
)

const (
startProject = 0
stopProject = 1
)

func init() {
wsProjectStop.Flags().Uint64P("project-id", "i", 0, config.TranslateInLang(_flagProjectIDUsages, config.UILanguage))
wsProjectStart.Flags().Uint64P("project-id", "i", 0, config.TranslateInLang(_flagProjectIDUsages, config.UILanguage))

_ = wsProjectStop.MarkFlagRequired("project-id")
_ = wsProjectStart.MarkFlagRequired("project-id")
}

func controlProjectState(projectID uint64, command int) (string, error) {
var funcName string
switch command {
case startProject:
funcName = startWsProjectFuncName
case stopProject:
funcName = stopWsProjectFuncName
default:
return "", errors.New("invalid control command")
}

contract, err := util.Address(wsProjectRegisterContractAddress)
if err != nil {
return "", output.NewError(output.AddressError, "failed to get project register contract address", err)
}

bytecode, err := wsProjectRegisterContractABI.Pack(funcName, projectID)
if err != nil {
return "", output.NewError(output.ConvertError, fmt.Sprintf("failed to pack abi"), err)
}

rsp, err := action.ExecuteAndResponse(contract, big.NewInt(0), bytecode)
if err != nil {
return "", errors.Wrap(err, "failed to execute contract")
}
_, err = waitReceiptByActionHash(rsp.ActionHash)
if err != nil {
return "", errors.Wrap(err, "failed to wait event")
}
if command == startProject {
return fmt.Sprintf("project %d started", projectID), nil
}
return fmt.Sprintf("project %d stopped", projectID), nil
}
9 changes: 0 additions & 9 deletions ioctl/cmd/ws/wsprojectcreate.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,6 @@ var (
config.English: "create w3bstream project",
config.Chinese: "创建项目",
}

_flagProjectConfigFileUsages = map[config.Language]string{
config.English: "project config file path",
config.Chinese: "项目配置文件路径",
}
_flagProjectConfigHashUsages = map[config.Language]string{
config.English: "project config file hash(sha256) for validating",
config.Chinese: "项目配置文件sha256哈希",
}
)

func init() {
Expand Down
Loading
Loading