From 6daa0dcde62c5a21bf348e4ad133020dd88ce269 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 25 Jun 2023 12:10:29 +0800 Subject: [PATCH 01/14] hermes v1.5.1 --- Dockerfile | 2 +- Dockerfile.gaia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dee88dae7c..c522f49a72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN go mod tidy RUN make install # Get Hermes build -FROM ghcr.io/informalsystems/hermes:1.4.1 AS hermes-builder +FROM ghcr.io/informalsystems/hermes:1.5.1 AS hermes-builder # Get CometMock FROM informalofftermatt/cometmock:latest as cometmock-builder diff --git a/Dockerfile.gaia b/Dockerfile.gaia index b9f6ff007f..212fd6665e 100644 --- a/Dockerfile.gaia +++ b/Dockerfile.gaia @@ -61,7 +61,7 @@ WORKDIR /interchain-security RUN make install # Get Hermes build -FROM ghcr.io/informalsystems/hermes:1.4.1 AS hermes-builder +FROM ghcr.io/informalsystems/hermes:1.5.1 AS hermes-builder FROM --platform=linux/amd64 fedora:36 RUN dnf update -y From 2465d5d56f4101f48edea7291663528c58a0f47d Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 25 Jun 2023 14:41:06 +0800 Subject: [PATCH 02/14] use a full path for hermes and rly --- Dockerfile | 4 ++-- Dockerfile.gaia | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c522f49a72..4eac1122de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,9 +42,9 @@ RUN dnf update -y RUN dnf install -y which iproute iputils procps-ng vim-minimal tmux net-tools htop jq USER root -COPY --from=hermes-builder /usr/bin/hermes /usr/local/bin/ +COPY --from=hermes-builder /usr/bin/hermes /usr/local/bin/hermes COPY --from=cometmock-builder /usr/local/bin/cometmock /usr/local/bin/cometmock -COPY --from=gorelayer-builder /bin/rly /usr/local/bin/ +COPY --from=gorelayer-builder /bin/rly /usr/local/bin/rly COPY --from=is-builder /go/bin/interchain-security-pd /usr/local/bin/interchain-security-pd COPY --from=is-builder /go/bin/interchain-security-cd /usr/local/bin/interchain-security-cd diff --git a/Dockerfile.gaia b/Dockerfile.gaia index 212fd6665e..1103f41365 100644 --- a/Dockerfile.gaia +++ b/Dockerfile.gaia @@ -68,7 +68,7 @@ RUN dnf update -y RUN dnf install -y which iproute iputils procps-ng vim-minimal tmux net-tools htop jq USER root -COPY --from=hermes-builder /usr/bin/hermes /usr/local/bin/ +COPY --from=hermes-builder /usr/bin/hermes /usr/local/bin/hermes # swap interchain-security-pd binary with gaia binary but keep the name COPY --from=gaia-builder /go/gaia/build/gaiad /usr/local/bin/interchain-security-pd From 275f7232ebfb0d70a4c398edea68d8ed5ceb51a4 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Thu, 17 Aug 2023 10:11:07 +0800 Subject: [PATCH 03/14] update hermes to 1.6.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4eac1122de..a337122df7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN go mod tidy RUN make install # Get Hermes build -FROM ghcr.io/informalsystems/hermes:1.5.1 AS hermes-builder +FROM ghcr.io/informalsystems/hermes:1.6.0 AS hermes-builder # Get CometMock FROM informalofftermatt/cometmock:latest as cometmock-builder From cee14ca7ecaf98618c0ec77fbd7185ac4311ff7e Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sat, 16 Sep 2023 04:03:11 +0000 Subject: [PATCH 04/14] Update Dockerfile.gaia --- Dockerfile.gaia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.gaia b/Dockerfile.gaia index 1103f41365..ba5a077f18 100644 --- a/Dockerfile.gaia +++ b/Dockerfile.gaia @@ -61,7 +61,7 @@ WORKDIR /interchain-security RUN make install # Get Hermes build -FROM ghcr.io/informalsystems/hermes:1.5.1 AS hermes-builder +FROM ghcr.io/informalsystems/hermes:1.6.0 AS hermes-builder FROM --platform=linux/amd64 fedora:36 RUN dnf update -y From d6e7b688d057ea5bf6c79543591fdfcfa31b8656 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sat, 16 Sep 2023 12:17:41 +0800 Subject: [PATCH 05/14] remove references to the websocket address --- tests/e2e/actions.go | 3 --- x/ccv/provider/keeper/proposal_test.go | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go index 2256156958..4725d1a0c4 100644 --- a/tests/e2e/actions.go +++ b/tests/e2e/actions.go @@ -731,7 +731,6 @@ rpc_addr = "%s" rpc_timeout = "10s" store_prefix = "ibc" trusting_period = "14days" -websocket_addr = "%s" [chains.gas_price] denom = "stake" @@ -822,14 +821,12 @@ func (tr TestRun) addChainToHermes( keyName := "query" rpcAddr := "http://" + queryNodeIP + ":26658" grpcAddr := "tcp://" + queryNodeIP + ":9091" - wsAddr := "ws://" + queryNodeIP + ":26658/websocket" chainConfig := fmt.Sprintf(hermesChainConfigTemplate, grpcAddr, chainId, keyName, rpcAddr, - wsAddr, // action.consumer, ) diff --git a/x/ccv/provider/keeper/proposal_test.go b/x/ccv/provider/keeper/proposal_test.go index 135e16eaae..74ec7fbe6e 100644 --- a/x/ccv/provider/keeper/proposal_test.go +++ b/x/ccv/provider/keeper/proposal_test.go @@ -232,6 +232,7 @@ func TestPendingConsumerAdditionPropDeletion(t *testing.T) { defer ctrl.Finish() for _, tc := range testCases { + tc := tc providerKeeper.SetPendingConsumerAdditionProp(ctx, &tc.ConsumerAdditionProposal) } @@ -603,6 +604,7 @@ func TestPendingConsumerRemovalPropDeletion(t *testing.T) { defer ctrl.Finish() for _, tc := range testCases { + tc := tc providerKeeper.SetPendingConsumerRemovalProp(ctx, &tc.ConsumerRemovalProposal) } From 6b8ebf3bd7f7552cbc1a665cb91d20d77564b68a Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sat, 16 Sep 2023 12:24:00 +0800 Subject: [PATCH 06/14] Revert "remove references to the websocket address" This reverts commit d6e7b688d057ea5bf6c79543591fdfcfa31b8656. --- tests/e2e/actions.go | 3 +++ x/ccv/provider/keeper/proposal_test.go | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go index 4725d1a0c4..2256156958 100644 --- a/tests/e2e/actions.go +++ b/tests/e2e/actions.go @@ -731,6 +731,7 @@ rpc_addr = "%s" rpc_timeout = "10s" store_prefix = "ibc" trusting_period = "14days" +websocket_addr = "%s" [chains.gas_price] denom = "stake" @@ -821,12 +822,14 @@ func (tr TestRun) addChainToHermes( keyName := "query" rpcAddr := "http://" + queryNodeIP + ":26658" grpcAddr := "tcp://" + queryNodeIP + ":9091" + wsAddr := "ws://" + queryNodeIP + ":26658/websocket" chainConfig := fmt.Sprintf(hermesChainConfigTemplate, grpcAddr, chainId, keyName, rpcAddr, + wsAddr, // action.consumer, ) diff --git a/x/ccv/provider/keeper/proposal_test.go b/x/ccv/provider/keeper/proposal_test.go index 74ec7fbe6e..135e16eaae 100644 --- a/x/ccv/provider/keeper/proposal_test.go +++ b/x/ccv/provider/keeper/proposal_test.go @@ -232,7 +232,6 @@ func TestPendingConsumerAdditionPropDeletion(t *testing.T) { defer ctrl.Finish() for _, tc := range testCases { - tc := tc providerKeeper.SetPendingConsumerAdditionProp(ctx, &tc.ConsumerAdditionProposal) } @@ -604,7 +603,6 @@ func TestPendingConsumerRemovalPropDeletion(t *testing.T) { defer ctrl.Finish() for _, tc := range testCases { - tc := tc providerKeeper.SetPendingConsumerRemovalProp(ctx, &tc.ConsumerRemovalProposal) } From 2bfc77dd0e37934a16c50d03af5f2f00ec4be928 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sat, 16 Sep 2023 12:25:29 +0800 Subject: [PATCH 07/14] change websocket_address to event_source --- tests/e2e/actions.go | 6 +++++- x/ccv/provider/keeper/proposal_test.go | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go index 2256156958..a988d43a46 100644 --- a/tests/e2e/actions.go +++ b/tests/e2e/actions.go @@ -731,7 +731,11 @@ rpc_addr = "%s" rpc_timeout = "10s" store_prefix = "ibc" trusting_period = "14days" -websocket_addr = "%s" + +[chains.event_source] +mode = "push" +url = "%s" +batch_delay = "500ms" [chains.gas_price] denom = "stake" diff --git a/x/ccv/provider/keeper/proposal_test.go b/x/ccv/provider/keeper/proposal_test.go index 135e16eaae..74ec7fbe6e 100644 --- a/x/ccv/provider/keeper/proposal_test.go +++ b/x/ccv/provider/keeper/proposal_test.go @@ -232,6 +232,7 @@ func TestPendingConsumerAdditionPropDeletion(t *testing.T) { defer ctrl.Finish() for _, tc := range testCases { + tc := tc providerKeeper.SetPendingConsumerAdditionProp(ctx, &tc.ConsumerAdditionProposal) } @@ -603,6 +604,7 @@ func TestPendingConsumerRemovalPropDeletion(t *testing.T) { defer ctrl.Finish() for _, tc := range testCases { + tc := tc providerKeeper.SetPendingConsumerRemovalProp(ctx, &tc.ConsumerRemovalProposal) } From 340ce3a44465ecc18f6e1b7ac71b369c8cecc58e Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sat, 16 Sep 2023 12:44:41 +0800 Subject: [PATCH 08/14] trigger ci --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index a65db076ab..a2866cc6eb 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,7 @@ install: go.sum go install $(BUILD_FLAGS) ./cmd/interchain-security-cd go install $(BUILD_FLAGS) ./cmd/interchain-security-cdd go install $(BUILD_FLAGS) ./cmd/interchain-security-sd + # run all tests: unit, integration, diff, and E2E test: From 4ed830dc3ed78c5c7bfe7d5c27750202c4cf6b9e Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sat, 16 Sep 2023 13:09:04 +0800 Subject: [PATCH 09/14] Revert "trigger ci" This reverts commit 340ce3a44465ecc18f6e1b7ac71b369c8cecc58e. --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index a2866cc6eb..a65db076ab 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,6 @@ install: go.sum go install $(BUILD_FLAGS) ./cmd/interchain-security-cd go install $(BUILD_FLAGS) ./cmd/interchain-security-cdd go install $(BUILD_FLAGS) ./cmd/interchain-security-sd - # run all tests: unit, integration, diff, and E2E test: From 560fc1507b4ef6158a24867cd844aa20817d50e7 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sat, 30 Dec 2023 02:55:54 +0700 Subject: [PATCH 10/14] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dcd2c7e163..ba80887be7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN go mod tidy RUN make install # Get Hermes build -FROM ghcr.io/informalsystems/hermes:1.6.0 AS hermes-builder +FROM ghcr.io/informalsystems/hermes:1.7.4 AS hermes-builder # Get CometMock FROM ghcr.io/informalsystems/cometmock:v0.37.x as cometmock-builder From b991f5f94dcc6a8c66800e020bb0be60757c60ca Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Wed, 10 Jan 2024 05:30:42 +0700 Subject: [PATCH 11/14] Update Dockerfile.gaia Co-authored-by: Marius Poke --- Dockerfile.gaia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.gaia b/Dockerfile.gaia index 2526555f0a..2857d84d39 100644 --- a/Dockerfile.gaia +++ b/Dockerfile.gaia @@ -61,7 +61,7 @@ WORKDIR /interchain-security RUN make install # Get Hermes build -FROM ghcr.io/informalsystems/hermes:1.6.0 AS hermes-builder +FROM ghcr.io/informalsystems/hermes:v1.7.4 AS hermes-builder FROM --platform=linux/amd64 fedora:36 RUN dnf update -y From 793fca13b26c61d2e40d5a8693c3db3cd4f54b39 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Wed, 10 Jan 2024 05:30:49 +0700 Subject: [PATCH 12/14] Update Dockerfile Co-authored-by: Simon Noetzlin --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7ef77b4bee..26150d665e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN go mod tidy RUN make install # Get Hermes build -FROM ghcr.io/informalsystems/hermes:1.7.4 AS hermes-builder +FROM ghcr.io/informalsystems/hermes:v1.7.4 AS hermes-builder # Get CometMock FROM ghcr.io/informalsystems/cometmock:v0.37.x as cometmock-builder From efd9dcc3dca4217dfa2882d0e68f086fbc8c1d24 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sat, 10 Feb 2024 20:23:05 +0530 Subject: [PATCH 13/14] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2aa8de0c19..a98dbf1b2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN go mod tidy RUN make install # Get Hermes build -FROM ghcr.io/informalsystems/hermes:v1.7.4 AS hermes-builder +FROM ghcr.io/informalsystems/hermes:v1.8.0 AS hermes-builder # Get CometMock From 6cb61dd03b6bf8ed6fd180b4d813373f6623fb9c Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sat, 10 Feb 2024 20:23:35 +0530 Subject: [PATCH 14/14] Update Dockerfile.gaia --- Dockerfile.gaia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.gaia b/Dockerfile.gaia index cd5556bded..8fa2a129b0 100644 --- a/Dockerfile.gaia +++ b/Dockerfile.gaia @@ -61,7 +61,7 @@ WORKDIR /interchain-security RUN make install # Get Hermes build -FROM ghcr.io/informalsystems/hermes:v1.7.4 AS hermes-builder +FROM ghcr.io/informalsystems/hermes:v1.8.0 AS hermes-builder FROM --platform=linux/amd64 fedora:36