feat: integrate wasm 08

.gitmodules

@@ -8,7 +8,7 @@
 
 [submodule ".github/scripts/IBC-Integration"]
 	path = .github/scripts/IBC-Integration
-	url = https://github.com/icon-project/IBC-Integration.git
+	url = https://github.com/icon-project/ibc-integration.git
 [submodule ".github/scripts/archway"]
 	path = .github/scripts/archway
 	url = https://github.com/archway-network/archway.git

cmd/flags.go

@@ -55,6 +55,8 @@ const (
 	flagSrcConnID               = "src-connection-id"
 	flagDstConnID               = "dst-connection-id"
 	flagBtpBlockHeight          = "btp-block-height"
+	flagSrcWasmCodeID           = "src-wasm-code-id"
+	flagDstWasmCodeID           = "dst-wasm-code-id"
 )
 
 const (
@@ -286,6 +288,8 @@ func clientParameterFlags(v *viper.Viper, cmd *cobra.Command) *cobra.Command {
 	cmd.Flags().BoolP(flagUpdateAfterMisbehaviour, "m", true,
 		"allow governance to update the client if misbehaviour freezing occurs")
 	cmd.Flags().Duration(flagClientTrustingPeriod, 0, "custom light client trusting period ex. 24h (default: 85% of chains reported unbonding time)")
+	cmd.Flags().String(flagSrcWasmCodeID, "", "src chain's wasm code id for clients (default: empty / not used)")
+	cmd.Flags().String(flagDstWasmCodeID, "", "dst chain's wasm code id for clients (default: empty / not used)")
 	if err := v.BindPFlag(flagUpdateAfterExpiry, cmd.Flags().Lookup(flagUpdateAfterExpiry)); err != nil {
 		panic(err)
 	}

cmd/paths.go

@@ -408,7 +408,6 @@ $ %s pth fch`, appName, defaultHome, appName)),
 					client, _, err := client.Repositories.DownloadContents(cmd.Context(), "cosmos", "chain-registry", regPath, nil)
 					if err != nil {
 						if errors.As(err, new(*github.RateLimitError)) {
-							fmt.Println("some paths failed: ", err)
 							break
 						}
 						fmt.Fprintf(cmd.ErrOrStderr(), "failure retrieving: %s: consider adding to cosmos/chain-registry: ERR: %v\n", pthName, err)

cmd/start.go

@@ -45,42 +45,52 @@ $ %s start demo-path --max-msgs 3
 $ %s start demo-path2 --max-tx-size 10`, appName, appName, appName, appName)),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			chains := make(map[string]*relayer.Chain)
-			paths := make([]relayer.NamedPath, len(args))
+
+			var paths []relayer.NamedPath
 
 			if len(args) > 0 {
-				for i, pathName := range args {
+				for _, pathName := range args {
 					path := a.config.Paths.MustGet(pathName)
-					paths[i] = relayer.NamedPath{
-						Name: pathName,
-						Path: path,
+					if err := path.IsInvalid(); err != nil {
+						a.log.Warn(fmt.Sprintf("Skipping invalid path: [%s] : %s", pathName, err.Error()))
+					} else {
+						paths = append(paths, relayer.NamedPath{
+							Name: pathName,
+							Path: path,
+						})
 					}
-
-					// collect unique chain IDs
-					chains[path.Src.ChainID] = nil
-					chains[path.Dst.ChainID] = nil
 				}
 			} else {
 				for n, path := range a.config.Paths {
-					paths = append(paths, relayer.NamedPath{
-						Name: n,
-						Path: path,
-					})
-
-					// collect unique chain IDs
-					chains[path.Src.ChainID] = nil
-					chains[path.Dst.ChainID] = nil
+					if err := path.IsInvalid(); err != nil {
+						a.log.Warn(fmt.Sprintf("Skipping invalid path: [%s] : %s", n, err.Error()))
+					} else {
+						paths = append(paths, relayer.NamedPath{
+							Name: n,
+							Path: path,
+						})
+					}
 				}
 			}
 
-			chainIDs := make([]string, 0, len(chains))
-			for chainID := range chains {
-				chainIDs = append(chainIDs, chainID)
-			}
+			for _, p := range paths {
+				srcChainID := p.Path.Src.ChainID
+				if _, ok := chains[srcChainID]; !ok {
+					chain, err := a.config.Chains.Get(srcChainID)
+					if err != nil {
+						return err
+					}
+					chains[srcChainID] = chain
+				}
 
-			// get chain configurations
-			chains, err := a.config.Chains.Gets(chainIDs...)
-			if err != nil {
-				return err
+				dstChainID := p.Path.Dst.ChainID
+				if _, ok := chains[dstChainID]; !ok {
+					chain, err := a.config.Chains.Get(dstChainID)
+					if err != nil {
+						return err
+					}
+					chains[dstChainID] = chain
+				}
 			}
 
 			if err := ensureKeysExist(chains); err != nil {

cmd/tx.go

@@ -94,6 +94,16 @@ func createClientsCmd(a *appState) *cobra.Command {
 				return err
 			}
 
+			srcWasmCodeID, err := cmd.Flags().GetString(flagSrcWasmCodeID)
+			if err != nil {
+				return err
+			}
+
+			dstWasmCodeID, err := cmd.Flags().GetString(flagDstWasmCodeID)
+			if err != nil {
+				return err
+			}
+
 			path := args[0]
 
 			c, src, dst, err := a.config.ChainsFromPath(path)
@@ -111,7 +121,7 @@ func createClientsCmd(a *appState) *cobra.Command {
 
 			// TODO: make iconStartHeight compulsory
 			// if iconStartHeight is not given it can create confusion as starting relay at any time could miss number of btp block update_client
-			clientSrc, clientDst, err := c[src].CreateClients(cmd.Context(), c[dst], allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, a.config.memo(cmd), iconStartHeight)
+			clientSrc, clientDst, err := c[src].CreateClients(cmd.Context(), c[dst], allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, a.config.memo(cmd), iconStartHeight, srcWasmCodeID, dstWasmCodeID)
 			if err != nil {
 				return err
 			}
@@ -166,6 +176,11 @@ func createClientCmd(a *appState) *cobra.Command {
 				return err
 			}
 
+			srcWasmCodeID, err := cmd.Flags().GetString(flagSrcWasmCodeID)
+			if err != nil {
+				return err
+			}
+
 			src, ok := a.config.Chains[args[0]]
 			if !ok {
 				return errChainNotFound(args[0])
@@ -242,7 +257,7 @@ func createClientCmd(a *appState) *cobra.Command {
 				return err
 			}
 
-			clientID, err := relayer.CreateClient(cmd.Context(), src, dst, srcUpdateHeader, dstUpdateHeader, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, a.config.memo(cmd), iconStartHeight)
+			clientID, err := relayer.CreateClient(cmd.Context(), src, dst, srcUpdateHeader, dstUpdateHeader, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, a.config.memo(cmd), iconStartHeight, srcWasmCodeID)
 			if err != nil {
 				return err
 			}
@@ -441,6 +456,16 @@ $ %s tx conn demo-path --timeout 5s`,
 				return err
 			}
 
+			srcWasmCodeID, err := cmd.Flags().GetString(flagSrcWasmCodeID)
+			if err != nil {
+				return err
+			}
+
+			dstWasmCodeID, err := cmd.Flags().GetString(flagDstWasmCodeID)
+			if err != nil {
+				return err
+			}
+
 			// ensure that keys exist
 			if exists := c[src].ChainProvider.KeyExists(c[src].ChainProvider.Key()); !exists {
 				return fmt.Errorf("key %s not found on src chain %s", c[src].ChainProvider.Key(), c[src].ChainID())
@@ -462,7 +487,7 @@ $ %s tx conn demo-path --timeout 5s`,
 			}
 
 			// ensure that the clients exist
-			clientSrc, clientDst, err := c[src].CreateClients(cmd.Context(), c[dst], allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, memo, iconStartHeight)
+			clientSrc, clientDst, err := c[src].CreateClients(cmd.Context(), c[dst], allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, memo, iconStartHeight, srcWasmCodeID, dstWasmCodeID)
 			if err != nil {
 				return err
 			}
@@ -726,6 +751,16 @@ $ %s tx connect demo-path --src-port mock --dst-port mock --order unordered --ve
 				return err
 			}
 
+			srcWasmCodeID, err := cmd.Flags().GetString(flagSrcWasmCodeID)
+			if err != nil {
+				return err
+			}
+
+			dstWasmCodeID, err := cmd.Flags().GetString(flagDstWasmCodeID)
+			if err != nil {
+				return err
+			}
+
 			// ensure that keys exist
 			if exists := c[src].ChainProvider.KeyExists(c[src].ChainProvider.Key()); !exists {
 				return fmt.Errorf("key %s not found on src chain %s", c[src].ChainProvider.Key(), c[src].ChainID())
@@ -747,7 +782,7 @@ $ %s tx connect demo-path --src-port mock --dst-port mock --order unordered --ve
 			}
 
 			// create clients if they aren't already created
-			clientSrc, clientDst, err := c[src].CreateClients(cmd.Context(), c[dst], allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, memo, iconStartHeight)
+			clientSrc, clientDst, err := c[src].CreateClients(cmd.Context(), c[dst], allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, memo, iconStartHeight, srcWasmCodeID, dstWasmCodeID)
 			if err != nil {
 				return fmt.Errorf("error creating clients: %w", err)
 			}