pulling in ChainProcessor and PathProcessor

Makefile

@@ -1,8 +1,8 @@
 VERSION := $(shell echo $(shell git describe --tags) | sed 's/^v//')
 COMMIT  := $(shell git log -1 --format='%H')
-GAIA_VERSION := v6.0.0
-AKASH_VERSION := v0.12.1
-OSMOSIS_VERSION := v6.4.0
+GAIA_VERSION := v7.0.1
+AKASH_VERSION := v0.16.3
+OSMOSIS_VERSION := v8.0.0
 WASMD_VERSION := v0.25.0
 
 GOPATH := $(shell go env GOPATH)

_test/setup/gaia-setup.sh

@@ -38,5 +38,5 @@ sed -i 's/timeout_propose = "3s"/timeout_propose = "1s"/g' ~/.gaia/config/config
 sed -i 's/index_all_keys = false/index_all_keys = true/g' ~/.gaia/config/config.toml
 
 # Start the gaia
-gaiad start --pruning=nothing
+gaiad start --pruning=nothing --minimum-gas-prices 0.0uatom;0.0stake
 

_test/test_chains.go

@@ -43,7 +43,7 @@ var (
 		dockerfile: "docker/gaiad/Dockerfile",
 		rpcPort:    "26657",
 		buildArgs: []dc.BuildArg{
-			{Name: "DefaultVersion", Value: "v5.0.8"},
+			{Name: "VERSION", Value: "v7.0.1"},
 		},
 	}
 
@@ -64,7 +64,7 @@ var (
 		dockerfile: "docker/akash/Dockerfile",
 		rpcPort:    "26657",
 		buildArgs: []dc.BuildArg{
-			{Name: "DefaultVersion", Value: "v0.12.1"},
+			{Name: "VERSION", Value: "v0.16.3"},
 		},
 	}
 
@@ -85,7 +85,7 @@ var (
 		dockerfile: "docker/osmosis/Dockerfile",
 		rpcPort:    "26657",
 		buildArgs: []dc.BuildArg{
-			{Name: "DefaultVersion", Value: "v6.4.0"},
+			{Name: "VERSION", Value: "v8.0.0"},
 		},
 	}
 

cmd/query.go

@@ -886,16 +886,13 @@ $ %s query unrelayed-pkts demo-path channel-0`,
 				return err
 			}
 
-			eventBus := relayer.NewChainEventBus([]*relayer.Chain{c[src], c[dst]}, a.Log)
-			eventBus.Start(cmd.Context())
-
 			channelID := args[1]
 			channel, err := relayer.QueryChannel(cmd.Context(), c[src], channelID)
 			if err != nil {
 				return err
 			}
 
-			sp, err := relayer.UnrelayedSequences(cmd.Context(), c[src], c[dst], channel, &eventBus)
+			sp, err := relayer.UnrelayedSequences(cmd.Context(), c[src], c[dst], channel)
 			if err != nil {
 				return err
 			}
@@ -944,16 +941,13 @@ $ %s query unrelayed-acks demo-path channel-0`,
 				return err
 			}
 
-			eventBus := relayer.NewChainEventBus([]*relayer.Chain{c[src], c[dst]}, a.Log)
-			eventBus.Start(cmd.Context())
-
 			channelID := args[1]
 			channel, err := relayer.QueryChannel(cmd.Context(), c[src], channelID)
 			if err != nil {
 				return err
 			}
 
-			sp, err := relayer.UnrelayedAcknowledgements(cmd.Context(), c[src], c[dst], channel, &eventBus)
+			sp, err := relayer.UnrelayedAcknowledgements(cmd.Context(), c[src], c[dst], channel)
 			if err != nil {
 				return err
 			}

cmd/tx.go

@@ -728,16 +728,13 @@ $ %s tx relay-pkt demo-path channel-1 1`,
 				return err
 			}
 
-			eventBus := relayer.NewChainEventBus([]*relayer.Chain{c[src], c[dst]}, a.Log)
-			eventBus.Start(cmd.Context())
-
 			channelID := args[1]
 			channel, err := relayer.QueryChannel(cmd.Context(), c[src], channelID)
 			if err != nil {
 				return err
 			}
 
-			sp, err := relayer.UnrelayedSequences(cmd.Context(), c[src], c[dst], channel, &eventBus)
+			sp, err := relayer.UnrelayedSequences(cmd.Context(), c[src], c[dst], channel)
 			if err != nil {
 				return err
 			}
@@ -781,15 +778,12 @@ $ %s tx relay-pkts demo-path channel-0`,
 				return err
 			}
 
-			eventBus := relayer.NewChainEventBus([]*relayer.Chain{c[src], c[dst]}, a.Log)
-			eventBus.Start(cmd.Context())
-
-			sp, err := relayer.UnrelayedSequences(cmd.Context(), c[src], c[dst], channel, &eventBus)
+			sp, err := relayer.UnrelayedSequences(cmd.Context(), c[src], c[dst], channel)
 			if err != nil {
 				return err
 			}
 
-			if err = relayer.RelayPackets(cmd.Context(), a.Log, c[src], c[dst], sp, maxTxSize, maxMsgLength, channel, &eventBus); err != nil {
+			if err = relayer.RelayPackets(cmd.Context(), a.Log, c[src], c[dst], sp, maxTxSize, maxMsgLength, channel); err != nil {
 				return err
 			}
 
@@ -832,17 +826,14 @@ $ %s tx relay-acks demo-path channel-0 -l 3 -s 6`,
 				return err
 			}
 
-			eventBus := relayer.NewChainEventBus([]*relayer.Chain{c[src], c[dst]}, a.Log)
-			eventBus.Start(cmd.Context())
-
 			// sp.Src contains all sequences acked on SRC but acknowledgement not processed on DST
 			// sp.Dst contains all sequences acked on DST but acknowledgement not processed on SRC
-			sp, err := relayer.UnrelayedAcknowledgements(cmd.Context(), c[src], c[dst], channel, &eventBus)
+			sp, err := relayer.UnrelayedAcknowledgements(cmd.Context(), c[src], c[dst], channel)
 			if err != nil {
 				return err
 			}
 
-			if err = relayer.RelayAcknowledgements(cmd.Context(), a.Log, c[src], c[dst], sp, maxTxSize, maxMsgLength, channel, &eventBus); err != nil {
+			if err = relayer.RelayAcknowledgements(cmd.Context(), a.Log, c[src], c[dst], sp, maxTxSize, maxMsgLength, channel); err != nil {
 				return err
 			}
 

docker/osmosis/Dockerfile

@@ -1,24 +1,27 @@
 FROM golang:alpine AS build-env
-ARG VERSION
 
 ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev
 
 RUN apk add --no-cache $PACKAGES
 
 WORKDIR /go/src/github.com/osmosis-labs
 
+RUN wget -O /lib/libwasmvm_muslc.a https://github.com/CosmWasm/wasmvm/releases/download/v1.0.0/libwasmvm_muslc.$(uname -m).a
+
+ARG VERSION
+
 RUN git clone https://github.com/osmosis-labs/osmosis.git
 
 WORKDIR /go/src/github.com/osmosis-labs/osmosis
 
-RUN git checkout ${VERSION} && make build-linux
+RUN git checkout ${VERSION} && BUILD_TAGS=muslc make install
 
 FROM alpine:edge
 
-RUN apk add --no-cache ca-certificates
+RUN apk add --no-cache ca-certificates gcc
 WORKDIR /root
 
-COPY --from=build-env /go/src/github.com/osmosis-labs/osmosis/build/osmosisd /usr/bin/osmosisd
+COPY --from=build-env /go/bin/osmosisd /usr/bin/osmosisd
 
 WORKDIR /osmosis
 

ibctest/ibc_test.go

@@ -67,7 +67,7 @@ func (relayerFactory) Capabilities() map[itfrelayer.Capability]bool {
 	// As of the current version of ibc-testing-framework's relayer tests,
 	// this version of the relayer can support everything but the timestamp timeout.
 	m := itfrelayer.FullCapabilities()
-	m[itfrelayer.TimestampTimeout] = false
+	// m[itfrelayer.TimestampTimeout] = false
 	return m
 }