Add support for the Hermes relayer

.gitignore

@@ -1,5 +1,6 @@
 # Don't commit the interchaintest.test file,
 # regardless of where it was built.
 interchaintest.test
-
-/bin
+.idea
+/bin
+vendor

cmd/interchaintest/example_matrix.json

@@ -1,5 +1,5 @@
 {
-  "Relayers": ["rly"],
+  "Relayers": ["rly", "hermes"],
 
   "ChainSets": [
     [

cmd/interchaintest/interchaintest_test.go

@@ -103,7 +103,7 @@ func setUpTestMatrix() error {
 	if extraFlags.MatrixFile == "" {
 		fmt.Fprintln(os.Stderr, "No matrix file provided, falling back to rly with gaia and osmosis")
 
-		testMatrix.Relayers = []string{"rly"}
+		testMatrix.Relayers = []string{"rly", "hermes"}
 		testMatrix.ChainSets = [][]*interchaintest.ChainSpec{
 			{
 				{Name: "gaia", Version: "v7.0.1"},

conformance/flush.go

@@ -9,6 +9,7 @@ import (
 	interchaintest "github.com/strangelove-ventures/interchaintest/v6"
 	"github.com/strangelove-ventures/interchaintest/v6/ibc"
 	"github.com/strangelove-ventures/interchaintest/v6/relayer"
+	"github.com/strangelove-ventures/interchaintest/v6/relayer/hermes"
 	"github.com/strangelove-ventures/interchaintest/v6/testreporter"
 	"github.com/strangelove-ventures/interchaintest/v6/testutil"
 	"github.com/stretchr/testify/require"
@@ -100,9 +101,14 @@ func TestRelayerFlushing(t *testing.T, ctx context.Context, cf interchaintest.Ch
 		afterFlushHeight, err := c0.Height(ctx)
 		req.NoError(err)
 
+		//flush packets and flush acks are the same command in hermes and are not separated as in the go relayer
 		// Ack shouldn't happen yet.
 		_, err = testutil.PollForAck(ctx, c0, beforeTransferHeight, afterFlushHeight+2, tx.Packet)
-		req.ErrorIs(err, testutil.ErrNotFound)
+		if _, isHermes := r.(*hermes.Relayer); isHermes {
+			req.NoError(err)
+		} else {
+			req.ErrorIs(err, testutil.ErrNotFound)
+		}
 	})
 
 	t.Run("flush acks", func(t *testing.T) {

conformance/relayersetup.go

@@ -5,13 +5,14 @@ import (
 	"fmt"
 	"testing"
 
-	conntypes "github.com/cosmos/ibc-go/v6/modules/core/03-connection/types"
 	interchaintest "github.com/strangelove-ventures/interchaintest/v6"
 	"github.com/strangelove-ventures/interchaintest/v6/ibc"
 	"github.com/strangelove-ventures/interchaintest/v6/testreporter"
 	"github.com/strangelove-ventures/interchaintest/v6/testutil"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/errgroup"
+
+	conntypes "github.com/cosmos/ibc-go/v6/modules/core/03-connection/types"
 )
 
 // TestRelayerSetup contains a series of subtests that configure a relayer step-by-step.
@@ -102,7 +103,7 @@ func TestRelayerSetup(t *testing.T, ctx context.Context, cf interchaintest.Chain
 		conn0 := conns0[0]
 		req.NotEmpty(conn0.ID)
 		req.NotEmpty(conn0.ClientID)
-		req.Equal(conn0.State, conntypes.OPEN.String())
+		req.Subset([]string{conntypes.OPEN.String(), "Open"}, []string{conn0.State})
 
 		conns1, err := r.GetConnections(ctx, eRep, c1.Config().ChainID)
 		req.NoError(err)
@@ -111,7 +112,7 @@ func TestRelayerSetup(t *testing.T, ctx context.Context, cf interchaintest.Chain
 		conn1 := conns1[0]
 		req.NotEmpty(conn1.ID)
 		req.NotEmpty(conn1.ClientID)
-		req.Equal(conn1.State, conntypes.OPEN.String())
+		req.Subset([]string{conntypes.OPEN.String(), "Open"}, []string{conn1.State})
 
 		// Now validate counterparties.
 		req.Equal(conn0.Counterparty.ClientId, conn1.ClientID)
@@ -160,14 +161,14 @@ func TestRelayerSetup(t *testing.T, ctx context.Context, cf interchaintest.Chain
 
 		// Piecemeal assertions against each channel.
 		// Not asserting against ConnectionHops or ChannelID.
-		req.Equal(ch0.State, "STATE_OPEN")
-		req.Equal(ch0.Ordering, "ORDER_UNORDERED")
+		req.Subset([]string{"STATE_OPEN", "Open"}, []string{ch0.State})
+		req.Subset([]string{"ORDER_UNORDERED", "Unordered"}, []string{ch0.Ordering})
 		req.Equal(ch0.Counterparty, ibc.ChannelCounterparty{PortID: "transfer", ChannelID: ch1.ChannelID})
 		req.Equal(ch0.Version, "ics20-1")
 		req.Equal(ch0.PortID, "transfer")
 
-		req.Equal(ch1.State, "STATE_OPEN")
-		req.Equal(ch1.Ordering, "ORDER_UNORDERED")
+		req.Subset([]string{"STATE_OPEN", "Open"}, []string{ch1.State})
+		req.Subset([]string{"ORDER_UNORDERED", "Unordered"}, []string{ch1.Ordering})
 		req.Equal(ch1.Counterparty, ibc.ChannelCounterparty{PortID: "transfer", ChannelID: ch0.ChannelID})
 		req.Equal(ch1.Version, "ics20-1")
 		req.Equal(ch1.PortID, "transfer")

conformance/test.go

@@ -35,7 +35,6 @@ import (
 	"testing"
 	"time"
 
-	transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types"
 	"github.com/docker/docker/client"
 	interchaintest "github.com/strangelove-ventures/interchaintest/v6"
 	"github.com/strangelove-ventures/interchaintest/v6/chain/cosmos"
@@ -47,6 +46,8 @@ import (
 	"github.com/strangelove-ventures/interchaintest/v6/testutil"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/errgroup"
+
+	transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types"
 )
 
 const (
@@ -328,6 +329,7 @@ func TestChainPair(
 	}
 
 	if relayerImpl == nil {
+		t.Logf("creating relayer: %s", rf.Name())
 		// startup both chains.
 		// creates wallets in the relayer for src and dst chain.
 		// funds relayer src and dst wallets on respective chain in genesis.

examples/ibc/interchain_accounts_test.go

@@ -268,12 +268,12 @@ func TestInterchainAccounts(t *testing.T) {
 	chain1Chans, err := r.GetChannels(ctx, eRep, chain1.Config().ChainID)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(chain1Chans))
-	require.Equal(t, "STATE_CLOSED", chain1Chans[0].State)
+	require.Subset(t, []string{"STATE_CLOSED", "Closed"}, []string{chain1Chans[0].State})
 
 	chain2Chans, err := r.GetChannels(ctx, eRep, chain2.Config().ChainID)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(chain2Chans))
-	require.Equal(t, "STATE_CLOSED", chain2Chans[0].State)
+	require.Subset(t, []string{"STATE_CLOSED", "Closed"}, []string{chain2Chans[0].State})
 
 	// Attempt to open another channel for the same ICA
 	_, _, err = chain1.Exec(ctx, registerICA, nil)
@@ -294,12 +294,12 @@ func TestInterchainAccounts(t *testing.T) {
 	chain1Chans, err = r.GetChannels(ctx, eRep, chain1.Config().ChainID)
 	require.NoError(t, err)
 	require.Equal(t, 2, len(chain1Chans))
-	require.Equal(t, "STATE_OPEN", chain1Chans[1].State)
+	require.Subset(t, []string{"STATE_OPEN", "Open"}, []string{chain1Chans[1].State})
 
 	chain2Chans, err = r.GetChannels(ctx, eRep, chain2.Config().ChainID)
 	require.NoError(t, err)
 	require.Equal(t, 2, len(chain2Chans))
-	require.Equal(t, "STATE_OPEN", chain2Chans[1].State)
+	require.Subset(t, []string{"STATE_OPEN", "Open"}, []string{chain2Chans[1].State})
 }
 
 // parseInterchainAccountField takes a slice of bytes which should be returned when querying for an ICA via

interchain_test.go

@@ -26,7 +26,15 @@ import (
 	clienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types"
 )
 
-func TestInterchain_DuplicateChain(t *testing.T) {
+func TestInterchain_DuplicateChain_CosmosRly(t *testing.T) {
+	duplicateChainTest(t, ibc.CosmosRly)
+}
+
+func TestInterchain_DuplicateChain_HermesRelayer(t *testing.T) {
+	duplicateChainTest(t, ibc.Hermes)
+}
+
+func duplicateChainTest(t *testing.T, relayerImpl ibc.RelayerImplementation) {
 	if testing.Short() {
 		t.Skip("skipping in short mode")
 	}
@@ -46,7 +54,7 @@ func TestInterchain_DuplicateChain(t *testing.T) {
 
 	gaia0, gaia1 := chains[0], chains[1]
 
-	r := interchaintest.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t)).Build(
+	r := interchaintest.NewBuiltinRelayerFactory(relayerImpl, zaptest.NewLogger(t)).Build(
 		t, client, network,
 	)
 
@@ -74,7 +82,15 @@ func TestInterchain_DuplicateChain(t *testing.T) {
 	_ = ic.Close()
 }
 
-func TestInterchain_GetRelayerWallets(t *testing.T) {
+func TestInterchain_GetRelayerWallets_CosmosRly(t *testing.T) {
+	getRelayerWalletsTest(t, ibc.CosmosRly)
+}
+
+func TestInterchain_GetRelayerWallets_HermesRelayer(t *testing.T) {
+	getRelayerWalletsTest(t, ibc.Hermes)
+}
+
+func getRelayerWalletsTest(t *testing.T, relayerImpl ibc.RelayerImplementation) {
 	if testing.Short() {
 		t.Skip("skipping in short mode")
 	}
@@ -94,7 +110,7 @@ func TestInterchain_GetRelayerWallets(t *testing.T) {
 
 	gaia0, gaia1 := chains[0], chains[1]
 
-	r := interchaintest.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t)).Build(
+	r := interchaintest.NewBuiltinRelayerFactory(relayerImpl, zaptest.NewLogger(t)).Build(
 		t, client, network,
 	)
 
@@ -230,7 +246,15 @@ func TestInterchain_CreateUser(t *testing.T) {
 	})
 }
 
-func TestCosmosChain_BroadcastTx(t *testing.T) {
+func TestCosmosChain_BroadcastTx_CosmosRly(t *testing.T) {
+	broadcastTxCosmosChainTest(t, ibc.CosmosRly)
+}
+
+func TestCosmosChain_BroadcastTx_HermesRelayer(t *testing.T) {
+	broadcastTxCosmosChainTest(t, ibc.Hermes)
+}
+
+func broadcastTxCosmosChainTest(t *testing.T, relayerImpl ibc.RelayerImplementation) {
 	if testing.Short() {
 		t.Skip("skipping in short mode")
 	}
@@ -250,7 +274,7 @@ func TestCosmosChain_BroadcastTx(t *testing.T) {
 
 	gaia0, gaia1 := chains[0], chains[1]
 
-	r := interchaintest.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t)).Build(
+	r := interchaintest.NewBuiltinRelayerFactory(relayerImpl, zaptest.NewLogger(t)).Build(
 		t, client, network,
 	)
 

internal/dockerutil/filewriter.go

@@ -5,7 +5,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"path"
 	"time"
 
 	"github.com/docker/docker/api/types"
@@ -48,10 +47,10 @@ func (w *FileWriter) WriteFile(ctx context.Context, volumeName, relPath string,
 			Cmd: []string{
 				// Take the uid and gid of the mount path,
 				// and set that as the owner of the new relative path.
-				`chown "$(stat -c '%u:%g' "$1")" "$2"`,
+				`chown -R "$(stat -c '%u:%g' "$1")" "$2"`,
 				"_", // Meaningless arg0 for sh -c with positional args.
 				mountPath,
-				path.Join(mountPath, relPath),
+				mountPath,
 			},
 
 			// Use root user to avoid permission issues when reading files from the volume.

relayer/docker.go

@@ -20,6 +20,10 @@ import (
 	"go.uber.org/zap"
 )
 
+const (
+	defaultRlyHomeDirectory = "/home/relayer"
+)
+
 // DockerRelayer provides a common base for relayer implementations
 // that run on Docker.
 type DockerRelayer struct {
@@ -42,6 +46,8 @@ type DockerRelayer struct {
 
 	// wallets contains a mapping of chainID to relayer wallet
 	wallets map[string]ibc.Wallet
+
+	homeDir string
 }
 
 var _ ibc.Relayer = (*DockerRelayer)(nil)
@@ -64,12 +70,16 @@ func NewDockerRelayer(ctx context.Context, log *zap.Logger, testName string, cli
 		wallets: map[string]ibc.Wallet{},
 	}
 
+	r.homeDir = defaultRlyHomeDirectory
+
 	for _, opt := range options {
 		switch o := opt.(type) {
 		case RelayerOptionDockerImage:
 			r.customImage = &o.DockerImage
 		case RelayerOptionImagePull:
 			r.pullImage = o.Pull
+		case RelayerOptionHomeDir:
+			r.homeDir = o.HomeDir
 		}
 	}
 
@@ -122,6 +132,21 @@ func NewDockerRelayer(ctx context.Context, log *zap.Logger, testName string, cli
 	return &r, nil
 }
 
+// WriteFileToHomeDir writes the given contents to a file at the relative path specified. The file is relative
+// to the home directory in the relayer container.
+func (r *DockerRelayer) WriteFileToHomeDir(ctx context.Context, relativePath string, contents []byte) error {
+	fw := dockerutil.NewFileWriter(r.log, r.client, r.testName)
+	if err := fw.WriteFile(ctx, r.volumeName, relativePath, contents); err != nil {
+		return fmt.Errorf("failed to write file: %w", err)
+	}
+	return nil
+}
+
+// AddWallet adds a stores a wallet for the given chain ID.
+func (r *DockerRelayer) AddWallet(chainID string, wallet ibc.Wallet) {
+	r.wallets[chainID] = wallet
+}
+
 func (r *DockerRelayer) AddChainConfiguration(ctx context.Context, rep ibc.RelayerExecReporter, chainConfig ibc.ChainConfig, keyName, rpcAddr, grpcAddr string) error {
 	// For rly this file is json, but the file extension should not matter.
 	// Using .config to avoid implying any particular format.
@@ -469,7 +494,7 @@ func (r *DockerRelayer) Bind() []string {
 
 // HomeDir returns the home directory of the relayer on the underlying Docker container's filesystem.
 func (r *DockerRelayer) HomeDir() string {
-	return "/home/relayer"
+	return r.homeDir
 }
 
 func (r *DockerRelayer) HostName(pathName string) string {