add --src-height and --dst-height options to tx clients subcommand

Signed-off-by: Masanori Yoshida <masanori.yoshida@datachain.jp>

Author: siburu

cmd/tx.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"context"
+	"math"
 	"strings"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
@@ -38,6 +39,10 @@ func transactionCmd(ctx *config.Context) *cobra.Command {
 }
 
 func createClientsCmd(ctx *config.Context) *cobra.Command {
+	const (
+		flagSrcHeight = "src-height"
+		flagDstHeight = "dst-height"
+	)
 	cmd := &cobra.Command{
 		Use:   "clients [path-name]",
 		Short: "create a clients between two configured chains with a configured path",
@@ -58,9 +63,29 @@ func createClientsCmd(ctx *config.Context) *cobra.Command {
 				return err
 			}
 
-			return core.CreateClients(c[src], c[dst])
+			var srcHeight *uint64
+			if h, err := cmd.Flags().GetUint64(flagSrcHeight); err != nil {
+				return err
+			} else if h == math.MaxUint64 {
+				srcHeight = nil
+			} else {
+				srcHeight = &h
+			}
+
+			var dstHeight *uint64
+			if h, err := cmd.Flags().GetUint64(flagDstHeight); err != nil {
+				return err
+			} else if h == math.MaxUint64 {
+				dstHeight = nil
+			} else {
+				dstHeight = &h
+			}
+
+			return core.CreateClients(c[src], c[dst], srcHeight, dstHeight)
 		},
 	}
+	cmd.Flags().Uint64(flagSrcHeight, math.MaxUint64, "src header at this height is submitted to dst chain")
+	cmd.Flags().Uint64(flagDstHeight, math.MaxUint64, "dst header at this height is submitted to src chain")
 	return cmd
 }
 

core/client.go

@@ -8,14 +8,14 @@ import (
 	"golang.org/x/sync/errgroup"
 )
 
-func CreateClients(src, dst *ProvableChain) error {
+func CreateClients(src, dst *ProvableChain, srcHeight, dstHeight *uint64) error {
 	logger := GetChainPairLogger(src, dst)
 	defer logger.TimeTrack(time.Now(), "CreateClients")
 	var (
 		clients = &RelayMsgs{Src: []sdk.Msg{}, Dst: []sdk.Msg{}}
 	)
 
-	srcH, dstH, err := getHeadersForCreateClient(src, dst)
+	srcH, dstH, err := getHeadersForCreateClient(src, dst, srcHeight, dstHeight)
 	if err != nil {
 		logger.Error(
 			"failed to get headers for create client",
@@ -118,14 +118,14 @@ func UpdateClients(src, dst *ProvableChain) error {
 }
 
 // getHeadersForCreateClient calls UpdateLightWithHeader on the passed chains concurrently
-func getHeadersForCreateClient(src, dst LightClient) (srch, dsth Header, err error) {
+func getHeadersForCreateClient(src, dst LightClient, srcHeight, dstHeight *uint64) (srch, dsth Header, err error) {
 	var eg = new(errgroup.Group)
 	eg.Go(func() error {
-		srch, err = src.GetFinalizedHeader(nil)
+		srch, err = src.GetFinalizedHeader(srcHeight)
 		return err
 	})
 	eg.Go(func() error {
-		dsth, err = dst.GetFinalizedHeader(nil)
+		dsth, err = dst.GetFinalizedHeader(dstHeight)
 		return err
 	})
 	if err := eg.Wait(); err != nil {

tests/cases/tm2tm/scripts/handshake

@@ -27,6 +27,6 @@ retry 5 $RLY tendermint light init $CHAINID_TWO -f
 # add a path between chain0 and chain1
 $RLY paths add $CHAINID_ONE $CHAINID_TWO $PATH_NAME --file=./configs/path.json
 
-retry 5 $RLY tx clients $PATH_NAME
+retry 5 $RLY tx clients --src-height 2 $PATH_NAME
 retry 5 $RLY tx connection $PATH_NAME
 retry 5 $RLY tx channel $PATH_NAME

tests/cases/tmmock2tmmock/scripts/handshake

@@ -19,6 +19,6 @@ $RLY tendermint keys show $CHAINID_TWO $RLYKEY
 # add a path between chain0 and chain1
 $RLY paths add $CHAINID_ONE $CHAINID_TWO $PATH_NAME --file=./configs/path.json
 
-retry 5 $RLY tx clients $PATH_NAME
+retry 5 $RLY tx clients --dst-height 2 $PATH_NAME
 retry 5 $RLY tx connection $PATH_NAME
 retry 5 $RLY tx channel $PATH_NAME