fix(tests): update dependencies

.github/workflows/interchaintest.yaml

@@ -90,20 +90,6 @@ jobs:
             - name: Load current image
               run: docker load --input archway_local
 
-            - name: Get last release tag
-              id: lastrelease
-              uses: WyriHaximus/github-action-get-previous-tag@v1
-              with:
-                prefix: 'v'
-
-            - name: Download ${{ steps.lastrelease.outputs.tag }} image
-              uses: actions/download-artifact@v3
-              with:
-                name: action_image_artifact_archway_${{ steps.lastrelease.outputs.tag }}
-
-            - name: Load ${{ steps.lastrelease.outputs.tag }} image
-              run: docker load --input archway_${{ steps.lastrelease.outputs.tag }}
-
             - name: Run chain upgrade test
               run: |
                 cd interchaintest
@@ -140,7 +126,7 @@ jobs:
           - name: Run chain conformance test
             run: |
               cd interchaintest
-              go test -v -race -run  TestGaiaConformance
+              go test -v -race -run TestGaiaConformance
 
     cwica_tests:
       name: Interchain transactions test
@@ -173,4 +159,4 @@ jobs:
         - name: Run interchain transactions test
           run: |
             cd interchaintest
-            go test -v -race -run  TestCWICA
+            go test -v -race -run TestCWICA

interchaintest/cwica_test.go

@@ -34,7 +34,7 @@ func TestCWICA(t *testing.T) {
 	junoChainSpec := &interchaintest.ChainSpec{
 		Name:          "juno",
 		ChainName:     "juno",
-		Version:       "v20.0.0",
+		Version:       "v25.0.0",
 		NumValidators: &numOfVals,
 		ChainConfig: ibc.ChainConfig{
 			GasAdjustment: 2,
@@ -62,20 +62,28 @@ func TestCWICA(t *testing.T) {
 		ibc.CosmosRly,
 		zaptest.NewLogger(t),
 		relayer.StartupFlags("-b", "100", "-p", "events"),
+		// relayer.ImagePull(false),
+		// relayer.DockerImage(&ibc.DockerImage{
+		// 	Repository: "ghcr.io/cosmos/relayer",
+		// 	Version:    "justin-CoC", // sha256:a7f03cc955c1bd8d1436bee29eaf5c1e44298e17d1dfb3fecb1be912f206819b
+		// }),
 	)
 	client, network := interchaintest.DockerSetup(t)
 	relayer := relayerFactory.Build(t, client, network)
 
 	// Create the IBC network with the chains and relayer
+	ibcChannelOpts := ibc.DefaultChannelOpts()
+	ibcChannelOpts.Order = ibc.Ordered
 	ic := interchaintest.NewInterchain().
 		AddChain(archwayChain).
 		AddChain(counterpartyChain).
 		AddRelayer(relayer, relayerName).
 		AddLink(interchaintest.InterchainLink{
-			Chain1:  archwayChain,
-			Chain2:  counterpartyChain,
-			Relayer: relayer,
-			Path:    path,
+			Chain1:            archwayChain,
+			Chain2:            counterpartyChain,
+			Relayer:           relayer,
+			Path:              path,
+			CreateChannelOpts: ibcChannelOpts,
 		})
 	ir := cosmos.DefaultEncoding().InterfaceRegistry
 	rep := testreporter.NewNopReporter()
@@ -257,6 +265,7 @@ func TestCWICA(t *testing.T) {
 	require.NoError(t, err)
 	for _, channel := range channels {
 		if channel.Counterparty.PortID == "icahost" {
+			// TODO: ORDER_UNORDERED channels are not closed on msg timeout
 			require.Equal(t, "STATE_CLOSED", channel.State)
 		}
 	}

proto/archway/oracle/v1/genesis.proto

@@ -24,7 +24,7 @@ message GenesisState {
       aggregate_exchange_rate_votes = 6 [ (gogoproto.nullable) = false ];
   repeated string pairs = 7 [
     (gogoproto.customtype) =
-        "github.com/archway-network/archway/x/common/asset.Pair",
+        "github.com/archway-network/archway/x/oracle/asset.Pair",
     (gogoproto.nullable) = false
   ];
   repeated archway.oracle.v1.Rewards rewards = 8

proto/archway/oracle/v1/oracle.proto

@@ -38,7 +38,7 @@ message Params {
   // Ex. '["unibi:uusd","ubtc:uusd"]'
   repeated string whitelist = 4 [
     (gogoproto.moretags) = "yaml:\"whitelist\"",
-    (gogoproto.customtype) = "github.com/archway-network/archway/x/common/asset.Pair"
+    (gogoproto.customtype) = "github.com/archway-network/archway/x/oracle/asset.Pair"
   ];
   // SlashFraction returns the proportion of an oracle's stake that gets
   // slashed in the event of slashing. `SlashFraction` specifies the exact
@@ -119,7 +119,7 @@ message ExchangeRateTuple {
   string pair = 1 [
     (gogoproto.moretags) = "yaml:\"pair\"",
     (gogoproto.customtype) =
-        "github.com/archway-network/archway/x/common/asset.Pair",
+        "github.com/archway-network/archway/x/oracle/asset.Pair",
     (gogoproto.nullable) = false
   ];
 

proto/archway/oracle/v1/query.proto

@@ -95,7 +95,7 @@ message QueryExchangeRateRequest {
   // pair defines the pair to query for.
   string pair = 1 [
     (gogoproto.customtype) =
-        "github.com/archway-network/archway/x/common/asset.Pair",
+        "github.com/archway-network/archway/x/oracle/asset.Pair",
     (gogoproto.nullable) = false
   ];
 }
@@ -134,7 +134,7 @@ message QueryActivesResponse {
   // actives defines a list of the pair which oracle prices agreed upon.
   repeated string actives = 1 [
     (gogoproto.customtype) =
-        "github.com/archway-network/archway/x/common/asset.Pair",
+        "github.com/archway-network/archway/x/oracle/asset.Pair",
     (gogoproto.nullable) = false
   ];
 }
@@ -150,7 +150,7 @@ message QueryVoteTargetsResponse {
   // should vote in the current vote period.
   repeated string vote_targets = 1 [
     (gogoproto.customtype) =
-        "github.com/archway-network/archway/x/common/asset.Pair",
+        "github.com/archway-network/archway/x/oracle/asset.Pair",
     (gogoproto.nullable) = false
   ];
 }

proto/archway/oracle/v1/state.proto

@@ -13,7 +13,7 @@ message PriceSnapshot {
   string pair = 1 [
     (gogoproto.moretags) = "yaml:\"pair\"",
     (gogoproto.customtype) =
-        "github.com/archway-network/archway/x/common/asset.Pair",
+        "github.com/archway-network/archway/x/oracle/asset.Pair",
     (gogoproto.nullable) = false
   ];