Merge branch 'main' into sainoe/main-upgrade-v50-2

cosmos · Jul 8, 2024 · 5482de3 · 5482de3
2 parents 0e3e05e + 22cf740
commit 5482de3
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 9 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -9,10 +9,11 @@ on:
   merge_group:
 permissions:
   contents: read
+
 jobs:
   golangci:
     name: golangci-lint
-    runs-on: ubuntu-latest
+    runs-on: Gaia-Runner-medium
     steps:
       - uses: actions/setup-go@v5
         with:

diff --git a/.github/workflows/nightly-e2e.yml b/.github/workflows/nightly-e2e.yml
@@ -36,7 +36,7 @@ jobs:
         # Run compatibility tests for different consumer (-cv) and provider (-pv) versions.
         # Combination of all provider versions with consumer versions are tested.
         # For new versions to be tested add/modify -pc/-cv parameters.
-        run: go run ./tests/e2e/... --tc compatibility -pv latest -pv v5.0.0-rc0 -pv v4.1.1-lsm -pv v3.3.3-lsm -cv latest -cv v5.0.0-rc0 -cv v4.1.1 -cv v3.3.0 -cv v3.2.0
+        run: go run ./tests/e2e/... --tc compatibility -pv latest -pv v4.3.0-lsm -pv v3.3.3-lsm -cv latest -cv v4.3.0 -cv v3.3.0
   happy-path-test:
     runs-on: ubuntu-latest
     timeout-minutes: 20

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ concurrency:
 
 jobs:
   tests:
-    runs-on: ubuntu-latest
+    runs-on: Gaia-Runner-medium
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -60,7 +60,7 @@ jobs:
           path: ./profile.out
 
   test-integration:
-    runs-on: ubuntu-latest
+    runs-on: Gaia-Runner-medium
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -91,7 +91,7 @@ jobs:
           path: ./integration-profile.out
 
   test-mbt:
-    runs-on: ubuntu-latest
+    runs-on: Gaia-Runner-medium
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -168,7 +168,7 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
   test-e2e:
-    runs-on: ubuntu-latest
+    runs-on: Gaia-Runner-medium
     steps:
       - uses: actions/checkout@v4
         with:
@@ -229,6 +229,37 @@ jobs:
         run: |
           make test-e2e-compatibility-tests-latest
 
+  test-cometmock:
+    runs-on: Gaia-Runner-medium
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          lfs: true
+      - name: checkout LFS objects
+        run: git lfs checkout
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.21"
+          check-latest: true
+          cache: true
+          cache-dependency-path: go.sum
+      - uses: technote-space/[email protected]
+        id: git_diff
+        with:
+          PATTERNS: |
+            **/*.go
+            go.mod
+            go.sum
+            **/go.mod
+            **/go.sum
+            **/Makefile
+            Makefile
+            Dockerfile*
+      - name: cometmock tests
+        if: env.GIT_DIFF
+        run: |
+          make test-e2e-short-cometmock
+
   test-trace:
     runs-on: ubuntu-latest
     steps:

diff --git a/tests/e2e/config.go b/tests/e2e/config.go
@@ -5,6 +5,7 @@ import (
 	"log"
 	"os/exec"
 	"strconv"
+	"strings"
 	"time"
 
 	e2e "github.com/cosmos/interchain-security/v5/tests/e2e/testlib"
@@ -417,15 +418,17 @@ func CompatibilityTestConfig(providerVersion, consumerVersion string) TestConfig
 				".app_state.provider.params.slash_meter_replenish_fraction = \"1.0\" | " + // This disables slash packet throttling
 				".app_state.provider.params.slash_meter_replenish_period = \"3s\"",
 		}
-	} else if semver.Compare(providerVersion, "v5.0.0-alpha1") < 0 { //TODO: MOV THIS BACK TO "v5.0.0"
-		fmt.Println("Using provider chain config for v4.1.x")
+	} else if semver.Compare(semver.MajorMinor(providerVersion), "v4.3.0") >= 0 && strings.HasSuffix(providerVersion, "-lsm") {
+		// v4.3.0-lsm introduced 'expedited governance proposal' which needs `expedited_voting_period` parameter to be set in genesis
+		fmt.Println("Using provider chain config for versions >= v4.3.0-lsm")
 		providerConfig = ChainConfig{
 			ChainId:        ChainID("provi"),
-			AccountPrefix:  ProviderAccountPrefix,
+			AccountPrefix:  "cosmos",
 			BinaryName:     "interchain-security-pd",
 			IpPrefix:       "7.7.7",
 			VotingWaitTime: 20,
 			GenesisChanges: ".app_state.gov.params.voting_period = \"20s\" | " +
+				".app_state.gov.params.expedited_voting_period = \"10s\" | " +
 				// Custom slashing parameters for testing validator downtime functionality
 				// See https://docs.cosmos.network/main/modules/slashing/04_begin_block.html#uptime-tracking
 				".app_state.slashing.params.signed_blocks_window = \"10\" | " +