Skip to content

Commit

Permalink
feat: added support for passing multiple parachains in -p flag
Browse files Browse the repository at this point in the history
  • Loading branch information
riyasng12 committed Jan 5, 2024
1 parent d0155e7 commit a633da6
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 51 deletions.
4 changes: 2 additions & 2 deletions cli/cmd/chains/kusama/cmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

var (
configFilePath string
paraChain string
paraChain []string
network string
noRelay bool
explorer bool
Expand All @@ -34,7 +34,7 @@ var KusamaCmd = common.NewDiveCommandBuilder().
SetShort("Build, initialize and start a Kusama node").
SetLong("The command starts the kusama relay chain and kusama parachain if -p flag is given").
SetRun(kusama).
AddStringFlagWithShortHand(&paraChain, "parachain", "p", "", "specify the parachain to spawn parachain node").
AddStringSliceFlagWithShortHand(&paraChain, "parachain", "p", []string{}, "specify the parachain to spawn parachain node").
AddStringFlagWithShortHand(&network, "network", "n", "", "specify the network to run (local/testnet/mainnet). Default will be local.").
AddBoolFlag(&noRelay, "no-relay", false, "specify the bool flag to run parachain only (only for testnet and mainnet)").
AddStringFlagWithShortHand(&configFilePath, "config", "c", "", "path to custom config json file to start kusama relaychain and parachain nodes.").
Expand Down
56 changes: 34 additions & 22 deletions cli/cmd/chains/kusama/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,17 @@ func RunKusama(cli *common.Cli) (*common.DiveMultipleServiceResponse, error) {
return nil, common.WrapMessageToError(err, "Failed to upload the configuration files.")
}

result, err := startRelayAndParaChain(cli, enclaveContext, serviceConfig, encodedServiceConfigDataString)
if err != nil {
return nil, err
result := &common.DiveMultipleServiceResponse{}
if noRelay {
result, err = startParaChains(cli, enclaveContext, serviceConfig, encodedServiceConfigDataString, "")
if err != nil {
return nil, err
}
} else {
result, err = startRelayAndParaChain(cli, enclaveContext, serviceConfig, encodedServiceConfigDataString)
if err != nil {
return nil, err
}
}

return result, nil
Expand Down Expand Up @@ -149,6 +157,8 @@ func startRelayAndParaChain(cli *common.Cli, enclaveContext *enclaves.EnclaveCon

func startParaChains(cli *common.Cli, enclaveContext *enclaves.EnclaveContext, serviceConfig *utils.PolkadotServiceConfig, para string, ipAddress string) (*common.DiveMultipleServiceResponse, error) {
paraResult := &common.DiveMultipleServiceResponse{}
allParaResult := &common.DiveMultipleServiceResponse{}

var err error

if serviceConfig.ChainType == localChain {
Expand All @@ -157,6 +167,7 @@ func startParaChains(cli *common.Cli, enclaveContext *enclaves.EnclaveContext, s
if err != nil {
return nil, err
}
allParaResult = concatenateDiveResults(allParaResult, paraResult)
} else {
for _, paraNode := range serviceConfig.Para {
paraChainConfig, err := paraNode.EncodeToString()
Expand All @@ -168,11 +179,11 @@ func startParaChains(cli *common.Cli, enclaveContext *enclaves.EnclaveContext, s
if err != nil {
return nil, err
}
allParaResult = concatenateDiveResults(allParaResult, paraResult)
}

}

return paraResult, nil
return allParaResult, nil
}

func runParaChain(cli *common.Cli, enclaveContext *enclaves.EnclaveContext, serviceConfig *utils.PolkadotServiceConfig, para string) (*common.DiveMultipleServiceResponse, error) {
Expand Down Expand Up @@ -206,20 +217,23 @@ func runParaChain(cli *common.Cli, enclaveContext *enclaves.EnclaveContext, serv
return nil, common.WrapMessageToErrorf(common.ErrDataUnMarshall, "%s.%s", err, "Failed to decode reponse data.")

}

return resultPara, nil
}

func configureService(serviceConfig *utils.PolkadotServiceConfig) error {

if paraChain != "" {
if len(paraChain) != 0 {
serviceConfig.Para = []utils.ParaNodeConfig{}
serviceConfig.Para = append(serviceConfig.Para, utils.ParaNodeConfig{
Name: paraChain,
Nodes: []utils.NodeConfig{
{Name: "alice", NodeType: "full", Prometheus: false},
},
})
for _, value := range paraChain {
if value != "" {
serviceConfig.Para = append(serviceConfig.Para, utils.ParaNodeConfig{
Name: value,
Nodes: []utils.NodeConfig{
{Name: "alice", NodeType: "full", Prometheus: false},
},
})
}
}
}

if network != "" {
Expand All @@ -238,11 +252,9 @@ func configureService(serviceConfig *utils.PolkadotServiceConfig) error {
}

if noRelay && serviceConfig.ChainType == "local" {
if serviceConfig.ChainType == "local" {
return common.WrapMessageToError(common.ErrInvalidFlag, "The '--no-relay' flag cannot be used with a 'local' network. This flag is only applicable for 'testnet' and 'mainnet' networks.")
} else {
serviceConfig.RelayChain = utils.RelayChainConfig{}
}
return common.WrapMessageToError(common.ErrInvalidFlag, "The '--no-relay' flag cannot be used with a 'local' network. This flag is only applicable for 'testnet' and 'mainnet' networks.")
} else if noRelay && serviceConfig.ChainType != "local" {
serviceConfig.RelayChain = utils.RelayChainConfig{}
}

return nil
Expand Down Expand Up @@ -279,13 +291,13 @@ func configureMetrics(serviceConfig *utils.PolkadotServiceConfig) {
func flagCheck() error {

if configFilePath != "" {
if paraChain != "" || network != "" || explorer || metrics {
if len(paraChain) != 0 || network != "" || explorer || metrics {
return common.WrapMessageToError(common.ErrInvalidFlag, "The '-c' flag does not allow additional flags.")
}
}

if noRelay && (network == "testnet" || network == "mainnet") {
if paraChain == "" {
if len(paraChain) == 0 {
return common.WrapMessageToError(common.ErrMissingFlags, "The '-p' flag is required when using '--no-relay' flag. Please provide the '-p' flag with the parachain name.")
}
}
Expand Down Expand Up @@ -322,7 +334,7 @@ func getIPAddress(cli *common.Cli, serviceConfig *utils.PolkadotServiceConfig, r

shortUuid, err := cli.Context().GetShortUuid(common.EnclaveName)
if err != nil {
return "", fmt.Errorf("Failed to retrieve the UUID of the enclave.")
return "", fmt.Errorf("failed to retrieve the UUID of the enclave")
}
serviceFileName := fmt.Sprintf(common.ServiceFilePath, common.EnclaveName, shortUuid)

Expand All @@ -334,7 +346,7 @@ func getIPAddress(cli *common.Cli, serviceConfig *utils.PolkadotServiceConfig, r
chainServiceName := fmt.Sprintf("rococo-local-%s", nodename)
chainServiceResponse, OK := services[chainServiceName]
if !OK {
return "", fmt.Errorf("Service name '%s' not found", chainServiceName)
return "", fmt.Errorf("service name '%s' not found", chainServiceName)
}

ipAddress := chainServiceResponse.IpAddress
Expand Down
11 changes: 5 additions & 6 deletions cli/cmd/chains/polkadot/cmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

var (
configFilePath string
paraChain string
paraChain []string
network string
noRelay bool
explorer bool
Expand All @@ -21,7 +21,7 @@ const (
runPolkadotFunctionName = "run_polkadot_setup"
runPolkadotRelayLocal = "start_relay_chains_local"
runPolkadotRelayTestnetMainet = "start_test_main_net_relay_nodes"
runUploadFiles = "upload_files"
runUploadFiles = "upload_files"
runPolkadotParaLocalFunctionName = "start_nodes"
runPolkadotParaTestMainFunctionName = "run_testnet_mainnet"
runPolkadotExplorer = "run_pokadot_js_app"
Expand All @@ -34,7 +34,7 @@ var PolkadotCmd = common.NewDiveCommandBuilder().
SetShort("Build, initialize and start a Polkadot node").
SetLong("The command starts the polkadot relay chain and polkadot parachain if -p flag is given").
SetRun(polkadot).
AddStringFlagWithShortHand(&paraChain, "parachain", "p", "", "specify the parachain to spawn parachain node").
AddStringSliceFlagWithShortHand(&paraChain, "parachain", "p", []string{}, "specify the parachain to spawn parachain node").
AddStringFlagWithShortHand(&network, "network", "n", "", "specify the network to run (local/testnet/mainnet). Default will be local.").
AddBoolFlag(&noRelay, "no-relay", false, "specify the bool flag to run parachain only (only for testnet and mainnet)").
AddStringFlagWithShortHand(&configFilePath, "config", "c", "", "path to custom config json file to start polkadot relaychain and parachain nodes.").
Expand All @@ -49,8 +49,7 @@ func polkadot(cmd *cobra.Command, args []string) {
if err != nil {
cliContext.Fatalf("Error %s. %s", err, cmd.UsageString())
}

cliContext.Spinner().StartWithMessage("Starting Polkadot Node", "green")
cliContext.StartSpinnerIfNotVerbose("Starting Polkadot Node", common.DiveLogs)

response, err := RunPolkadot(cliContext)
if err != nil {
Expand All @@ -76,5 +75,5 @@ func polkadot(cmd *cobra.Command, args []string) {
}
}
stopMessage := fmt.Sprintf("Polkadot Node Started. Please find service details in current working directory(%s)\n", serviceFileName)
cliContext.Spinner().StopWithMessage(stopMessage)
cliContext.StopSpinnerIfNotVerbose(stopMessage, common.DiveLogs)
}
56 changes: 35 additions & 21 deletions cli/cmd/chains/polkadot/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,17 @@ func RunPolkadot(cli *common.Cli) (*common.DiveMultipleServiceResponse, error) {
return nil, common.WrapMessageToError(err, "Failed to upload the configuration files.")
}

result, err := startRelayAndParaChain(cli, enclaveContext, serviceConfig, encodedServiceConfigDataString)
if err != nil {
return nil, err
result := &common.DiveMultipleServiceResponse{}
if noRelay {
result, err = startParaChains(cli, enclaveContext, serviceConfig, encodedServiceConfigDataString, "")
if err != nil {
return nil, err
}
} else {
result, err = startRelayAndParaChain(cli, enclaveContext, serviceConfig, encodedServiceConfigDataString)
if err != nil {
return nil, err
}
}

return result, nil
Expand Down Expand Up @@ -149,6 +157,8 @@ func startRelayAndParaChain(cli *common.Cli, enclaveContext *enclaves.EnclaveCon

func startParaChains(cli *common.Cli, enclaveContext *enclaves.EnclaveContext, serviceConfig *utils.PolkadotServiceConfig, para string, ipAddress string) (*common.DiveMultipleServiceResponse, error) {
paraResult := &common.DiveMultipleServiceResponse{}
allParaResult := &common.DiveMultipleServiceResponse{}

var err error

if serviceConfig.ChainType == localChain {
Expand All @@ -157,6 +167,8 @@ func startParaChains(cli *common.Cli, enclaveContext *enclaves.EnclaveContext, s
if err != nil {
return nil, err
}
allParaResult = concatenateDiveResults(allParaResult, paraResult)

} else {
for _, paraNode := range serviceConfig.Para {
paraChainConfig, err := paraNode.EncodeToString()
Expand All @@ -168,11 +180,11 @@ func startParaChains(cli *common.Cli, enclaveContext *enclaves.EnclaveContext, s
if err != nil {
return nil, err
}
allParaResult = concatenateDiveResults(allParaResult, paraResult)
}

}

return paraResult, nil
return allParaResult, nil
}

func runParaChain(cli *common.Cli, enclaveContext *enclaves.EnclaveContext, serviceConfig *utils.PolkadotServiceConfig, para string) (*common.DiveMultipleServiceResponse, error) {
Expand Down Expand Up @@ -212,14 +224,18 @@ func runParaChain(cli *common.Cli, enclaveContext *enclaves.EnclaveContext, serv

func configureService(serviceConfig *utils.PolkadotServiceConfig) error {

if paraChain != "" {
if len(paraChain) != 0 {
serviceConfig.Para = []utils.ParaNodeConfig{}
serviceConfig.Para = append(serviceConfig.Para, utils.ParaNodeConfig{
Name: paraChain,
Nodes: []utils.NodeConfig{
{Name: "alice", NodeType: "full", Prometheus: false},
},
})
for _, value := range paraChain {
if value != "" {
serviceConfig.Para = append(serviceConfig.Para, utils.ParaNodeConfig{
Name: value,
Nodes: []utils.NodeConfig{
{Name: "alice", NodeType: "full", Prometheus: false},
},
})
}
}
}

if network != "" {
Expand All @@ -238,11 +254,9 @@ func configureService(serviceConfig *utils.PolkadotServiceConfig) error {
}

if noRelay && serviceConfig.ChainType == "local" {
if serviceConfig.ChainType == "local" {
return common.WrapMessageToError(common.ErrInvalidFlag, "The '--no-relay' flag cannot be used with a 'local' network. This flag is only applicable for 'testnet' and 'mainnet' networks.")
} else {
serviceConfig.RelayChain = utils.RelayChainConfig{}
}
return common.WrapMessageToError(common.ErrInvalidFlag, "The '--no-relay' flag cannot be used with a 'local' network. This flag is only applicable for 'testnet' and 'mainnet' networks.")
} else if noRelay && serviceConfig.ChainType != "local" {
serviceConfig.RelayChain = utils.RelayChainConfig{}
}

return nil
Expand Down Expand Up @@ -279,13 +293,13 @@ func configureMetrics(serviceConfig *utils.PolkadotServiceConfig) {
func flagCheck() error {

if configFilePath != "" {
if paraChain != "" || network != "" || explorer || metrics {
if len(paraChain) != 0 || network != "" || explorer || metrics {
return common.WrapMessageToError(common.ErrInvalidFlag, "The '-c' flag does not allow additional flags.")
}
}

if noRelay && (network == "testnet" || network == "mainnet") {
if paraChain == "" {
if len(paraChain) == 0 {
return common.WrapMessageToError(common.ErrMissingFlags, "The '-p' flag is required when using '--no-relay' flag. Please provide the '-p' flag with the parachain name.")
}
}
Expand Down Expand Up @@ -322,7 +336,7 @@ func getIPAddress(cli *common.Cli, serviceConfig *utils.PolkadotServiceConfig, r

shortUuid, err := cli.Context().GetShortUuid(common.EnclaveName)
if err != nil {
return "", fmt.Errorf("Failed to retrieve the UUID of the enclave.")
return "", fmt.Errorf("failed to retrieve the UUID of the enclave")
}
serviceFileName := fmt.Sprintf(common.ServiceFilePath, common.EnclaveName, shortUuid)

Expand All @@ -334,7 +348,7 @@ func getIPAddress(cli *common.Cli, serviceConfig *utils.PolkadotServiceConfig, r
chainServiceName := fmt.Sprintf("rococo-local-%s", nodename)
chainServiceResponse, OK := services[chainServiceName]
if !OK {
return "", fmt.Errorf("Service name '%s' not found", chainServiceName)
return "", fmt.Errorf("service name '%s' not found", chainServiceName)
}

ipAddress := chainServiceResponse.IpAddress
Expand Down
6 changes: 6 additions & 0 deletions cli/common/command_builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ func (dc *diveCommandBuilder) AddStringFlagWithShortHand(stringV *string, name s
return dc
}

// Add StringSliceFlag adds a slice of string flag to the command that persists with short hand
func (dc *diveCommandBuilder) AddStringSliceFlagWithShortHand(stringV *[]string, name string, shorthand string, value []string, usage string) CommandBuilder {
dc.cmd.Flags().StringSliceVarP(stringV, name, shorthand, value, usage)
return dc
}

// Add BooFlag adds a boolean flag to the command that persists
func (dc *diveCommandBuilder) AddBoolFlag(boolV *bool, name string, value bool, usage string) CommandBuilder {
dc.cmd.Flags().BoolVar(boolV, name, value, usage)
Expand Down
3 changes: 3 additions & 0 deletions cli/common/interfaces.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,9 @@ type CommandBuilder interface {
// Add StringFlag adds a string flag to the command that persists with short hand
AddStringFlagWithShortHand(stringV *string, name string, shorthand string, value string, usage string) CommandBuilder

// Add StringSliceFlag adds a slice of string flag to the command that persists with short hand
AddStringSliceFlagWithShortHand(stringV *[]string, name string, shorthand string, value []string, usage string) CommandBuilder

// Add BooFlag adds a boolean flag to the command that persists
AddBoolFlag(boolV *bool, name string, value bool, usage string) CommandBuilder

Expand Down

0 comments on commit a633da6

Please sign in to comment.