Merge remote-tracking branch 'origin/main' into faddat/remove-depguar…

…d-bump-golangci
cosmos · Aug 13, 2023 · 2f9b6d6 · 2f9b6d6
2 parents 4793c68 + 64d860d
commit 2f9b6d6
Show file tree

Hide file tree

Showing 182 changed files with 5,663 additions and 1,851 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -37,3 +37,13 @@ updates:
     open-pull-requests-limit: 0
     labels:
       - dependencies
+
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: daily
+    target-branch: "release/v3.1.x"
+    # Only allow automated security-related dependency updates on release branches.
+    open-pull-requests-limit: 0
+    labels:
+      - dependencies
diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml
@@ -28,5 +28,31 @@ jobs:
         run: make proto-check
       - name: Unit, integration and difference tests
         run: go test ./...
+  E2E_Tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          lfs: true
+      - name: Checkout LFS objects
+        run: git lfs checkout
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
       - name: E2E tests
         run: make test-e2e-short
+  Cometmock_Tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          lfs: true
+      - name: Checkout LFS objects
+        run: git lfs checkout
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
+      - name: E2E tests
+        run: make test-e2e-short-cometmock
diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -40,7 +40,7 @@ jobs:
           make build-docs
 
       - name: Deploy 🚀
-        uses: JamesIves/[email protected].2
+        uses: JamesIves/[email protected].3
         with:
           branch: gh-pages
           folder: ~/output

diff --git a/.github/workflows/manual-e2e.yml b/.github/workflows/manual-e2e.yml
@@ -5,22 +5,99 @@ on:
   workflow_dispatch:
 
 jobs:
-  manual-integration-main:
+  happy-path-test:
     runs-on: ubuntu-latest
-    timeout-minutes: 60
+    timeout-minutes: 20
     steps:
       - uses: actions/setup-go@v4
         with:
           go-version: "1.20"
       - uses: actions/checkout@v3
-
       - name: Checkout LFS objects
         run: git lfs checkout
-
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
           go-version: "1.20" # The Go version to download (if necessary) and use.
-
-      - name: E2E tests
-        run: make test-e2e
+      - name: E2E happy-path test
+        run: go run ./tests/e2e/... --tc happy-path
+  changeover-test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
+      - uses: actions/checkout@v3
+      - name: Checkout LFS objects
+        run: git lfs checkout
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20" # The Go version to download (if necessary) and use.
+      - name: E2E changeover test
+        run: go run ./tests/e2e/... --tc changeover
+  democracy-reward-test:
+      runs-on: ubuntu-latest
+      timeout-minutes: 20
+      steps:
+        - uses: actions/setup-go@v4
+          with:
+            go-version: "1.20"
+        - uses: actions/checkout@v3
+        - name: Checkout LFS objects
+          run: git lfs checkout
+        - name: Setup Go
+          uses: actions/setup-go@v4
+          with:
+            go-version: "1.20" # The Go version to download (if necessary) and use.
+        - name: E2E democracy-reward tests
+          run: go run ./tests/e2e/... --tc democracy-reward
+  democracy-test:
+      runs-on: ubuntu-latest
+      timeout-minutes: 20
+      steps:
+        - uses: actions/setup-go@v4
+          with:
+            go-version: "1.20"
+        - uses: actions/checkout@v3
+        - name: Checkout LFS objects
+          run: git lfs checkout
+        - name: Setup Go
+          uses: actions/setup-go@v4
+          with:
+            go-version: "1.20" # The Go version to download (if necessary) and use.
+        - name: E2E democracy tests
+          run: go run ./tests/e2e/... --tc democracy
+  slash-throttle-test:
+      runs-on: ubuntu-latest
+      timeout-minutes: 20
+      steps:
+        - uses: actions/setup-go@v4
+          with:
+            go-version: "1.20"
+        - uses: actions/checkout@v3
+        - name: Checkout LFS objects
+          run: git lfs checkout
+        - name: Setup Go
+          uses: actions/setup-go@v4
+          with:
+            go-version: "1.20" # The Go version to download (if necessary) and use.
+        - name: E2E slash-throttle tests
+          run: go run ./tests/e2e/... --tc slash-throttle
+  multiconsumer-test:
+      runs-on: ubuntu-latest
+      timeout-minutes: 20
+      steps:
+        - uses: actions/setup-go@v4
+          with:
+            go-version: "1.20"
+        - uses: actions/checkout@v3
+        - name: Checkout LFS objects
+          run: git lfs checkout
+        - name: Setup Go
+          uses: actions/setup-go@v4
+          with:
+            go-version: "1.20" # The Go version to download (if necessary) and use.
+        - name: E2E multi-consumer tests
+          run: go run ./tests/e2e/... --tc multiconsumer
diff --git a/.github/workflows/nightly-e2e.yml b/.github/workflows/nightly-e2e.yml
@@ -18,21 +18,111 @@ on:
     - cron: "0 3 * * *"
 
 jobs:
-  nightly-test:
+  happy-path-test:
     runs-on: ubuntu-latest
-    timeout-minutes: 60
+    timeout-minutes: 20
     steps:
       - uses: actions/setup-go@v4
         with:
           go-version: "1.20"
-
       - uses: actions/checkout@v3
-
-      - name: E2E tests
-        run: make test-e2e
+      - name: Checkout LFS objects
+        run: git lfs checkout
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20" # The Go version to download (if necessary) and use.
+      - name: E2E happy-path test
+        run: go run ./tests/e2e/... --tc happy-path
+  changeover-test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
+      - uses: actions/checkout@v3
+      - name: Checkout LFS objects
+        run: git lfs checkout
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20" # The Go version to download (if necessary) and use.
+      - name: E2E changeover test
+        run: go run ./tests/e2e/... --tc changeover
+  democracy-reward-test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
+      - uses: actions/checkout@v3
+      - name: Checkout LFS objects
+        run: git lfs checkout
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20" # The Go version to download (if necessary) and use.
+      - name: E2E democracy-reward tests
+        run: go run ./tests/e2e/... --tc democracy-reward
+  democracy-test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
+      - uses: actions/checkout@v3
+      - name: Checkout LFS objects
+        run: git lfs checkout
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20" # The Go version to download (if necessary) and use.
+      - name: E2E democracy tests
+        run: go run ./tests/e2e/... --tc democracy
+  slash-throttle-test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
+      - uses: actions/checkout@v3
+      - name: Checkout LFS objects
+        run: git lfs checkout
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20" # The Go version to download (if necessary) and use.
+      - name: E2E slash-throttle tests
+        run: go run ./tests/e2e/... --tc slash-throttle
+  multiconsumer-test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
+      - uses: actions/checkout@v3
+      - name: Checkout LFS objects
+        run: git lfs checkout
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20" # The Go version to download (if necessary) and use.
+      - name: E2E multi-consumer tests
+        run: go run ./tests/e2e/... --tc multiconsumer
 
   nightly-test-fail:
-    needs: nightly-test
+    needs:
+      - happy-path-test
+      - changeover-test
+      - democracy-reward-test
+      - democracy-test
+      - slash-throttle-test
+      - multiconsumer-test
     if: ${{ failure() }}
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/proto-registry.yml b/.github/workflows/proto-registry.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: bufbuild/buf-setup-action@v1.22.0
+      - uses: bufbuild/buf-setup-action@v1.25.1
       - uses: bufbuild/buf-push-action@v1
         with:
           input: "proto"

diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: bufbuild/buf-setup-action@v1.22.0
+      - uses: bufbuild/buf-setup-action@v1.25.1
       - uses: bufbuild/buf-breaking-action@v1
         with:
           input: "proto"

diff --git a/.golangci.yml b/.golangci.yml
@@ -12,6 +12,7 @@ linters:
   enable:
     - dogsled
     - exportloopref
+    - gci
     - goconst
     - gocritic
     - gofumpt
@@ -55,6 +56,17 @@ issues:
   max-same-issues: 10000
 
 linters-settings:
+  gci:
+    sections:
+      - standard # Standard section: captures all standard packages.
+      - default # Default section: contains all imports that could not be matched to another section type.
+      - blank # blank imports
+      - dot # dot imports
+      - prefix(cosmossdk.io)
+      - prefix(github.com/cosmos/cosmos-sdk)
+      - prefix(github.com/cometbft/cometbft)
+      - prefix(github.com/cosmos/interchain-security)
+    custom-order: true
   gofumpt:
     # Choose whether to use the extra rules.
     # Default: false

diff --git a/.mergify.yml b/.mergify.yml
@@ -26,3 +26,11 @@ pull_request_rules:
       backport:
         branches:
           - release/v3.0.x
+  - name: Backport patches to the release/v3.1.x branch
+    conditions:
+      - base=main
+      - label=A:backport/v3.1.x
+    actions:
+      backport:
+        branches:
+          - release/v3.1.x
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,23 @@
 ## [Unreleased]
 
 Add an entry to the unreleased section whenever merging a PR to main that is not targeted at a specific release. These entries will eventually be included in a release.
+* `[x/ccv/provider]` (fix) [#1076](https://github.com/cosmos/interchain-security/pull/1076) Add `InitTimeoutTimestamps` and `ExportedVscSendTimestamps` to exported genesis.
+
+* (feat!) [#1024](https://github.com/cosmos/interchain-security/pull/1024) throttle with retries, consumer changes  
+* (fix!) revert consumer packet data changes from #1037 [#1150](https://github.com/cosmos/interchain-security/pull/1150)
+* (fix!) proper deletion of pending packets [#1146](https://github.com/cosmos/interchain-security/pull/1146)
+* (feat!) optimize pending packets storage on consumer, with migration! [#1037](https://github.com/cosmos/interchain-security/pull/1037)
+* (feat) introduce the gRPC query `/interchain_security/ccv/consumer/provider-info` and CLI command `interchain-security-cd q ccvconsumer provider-info`to retrieve provider info from the consumer chain.
+
+## v3.1.0
+
+Date July 11th, 2023
+
+A minor upgrade to v3.0.0, which removes the panic in the consumer ccv module which would occur in an emergency scenario where the ccv channel is closed. This release also fixes how a distribution related event is emitted, and bumps cometbft.
+
+* (feat) [#1127](https://github.com/cosmos/interchain-security/pull/1127) Remove consumer panic when ccv channel is closed
+* (fix) [#720](https://github.com/cosmos/interchain-security/issues/720) Fix the attribute `AttributeDistributionTotal` value in `FeeDistribution` event emit.
+* (deps) [#1119](https://github.com/cosmos/interchain-security/pull/1119) bump cometbft from `v0.37.1` to `0.37.2`.
 
 ## v3.0.0
 

diff --git a/Dockerfile b/Dockerfile
@@ -32,10 +32,10 @@ RUN make install
 FROM ghcr.io/informalsystems/hermes:1.4.1 AS hermes-builder
 
 # Get CometMock
-FROM informalofftermatt/cometmock:latest as cometmock-builder
+FROM ghcr.io/informalsystems/cometmock:v0.37.x as cometmock-builder
 
 # Get GoRelayer
-FROM informalofftermatt/gorelayer:nogas AS gorelayer-builder
+FROM ghcr.io/informalsystems/relayer-no-gas-sim:v2.3.0-rc4-no-gas-sim AS gorelayer-builder
 
 FROM --platform=linux/amd64 fedora:36
 RUN dnf update -y