Merge branch 'main' into marius/rewards-memo

cosmos · Sep 25, 2024 · 7595e28 · 7595e28
2 parents 3a6a619 + 27eaaff
commit 7595e28
Show file tree

Hide file tree

Showing 40 changed files with 1,037 additions and 188 deletions.
diff --git a/.changelog/unreleased/api-breaking/provider/2171-permissionless-ICS.md b/.changelog/unreleased/api-breaking/provider/2171-permissionless-ICS.md
diff --git a/.changelog/unreleased/bug-fixes/2282-duplicate-events.md b/.changelog/unreleased/bug-fixes/2282-duplicate-events.md
@@ -0,0 +1,2 @@
+- Remove duplicate event emission on cached context.
+  ([\#2282](https://github.com/cosmos/interchain-security/pull/2282))
diff --git a/.changelog/unreleased/bug-fixes/2288-rewards-stride.md b/.changelog/unreleased/bug-fixes/2288-rewards-stride.md
@@ -0,0 +1,2 @@
+- `[x/provider]` Add patch to enable ICS rewards from Stride to be distributed.
+  ([\#2288](https://github.com/cosmos/interchain-security/pull/2288))
diff --git a/.changelog/unreleased/dependencies/2200-bump-sdk.md b/.changelog/unreleased/dependencies/2200-bump-sdk.md
diff --git a/.changelog/unreleased/features/provider/2171-permissionless-ICS.md b/.changelog/unreleased/features/provider/2171-permissionless-ICS.md
diff --git a/.changelog/unreleased/state-breaking/2288-rewards-stride.md b/.changelog/unreleased/state-breaking/2288-rewards-stride.md
@@ -0,0 +1,2 @@
+- `[x/provider]` Add patch to enable ICS rewards from Stride to be distributed.
+  ([\#2288](https://github.com/cosmos/interchain-security/pull/2288))
diff --git a/.../api-breaking/2079-inactive-validators.md → .../api-breaking/2079-inactive-validators.md b/.../api-breaking/2079-inactive-validators.md → .../api-breaking/2079-inactive-validators.md
diff --git a/...d/api-breaking/2098-vscmatured-removal.md → ...0/api-breaking/2098-vscmatured-removal.md b/...d/api-breaking/2098-vscmatured-removal.md → ...0/api-breaking/2098-vscmatured-removal.md
diff --git a/...d/api-breaking/2171-permissionless-ics.md → ...0/api-breaking/2171-permissionless-ics.md b/...d/api-breaking/2171-permissionless-ics.md → ...0/api-breaking/2171-permissionless-ics.md
diff --git a/...nreleased/dependencies/2200-bump-comet.md → ...og/v6.0.0/dependencies/2200-bump-comet.md b/...nreleased/dependencies/2200-bump-comet.md → ...og/v6.0.0/dependencies/2200-bump-comet.md
diff --git a/.../unreleased/dependencies/2200-bump-ibc.md → ...elog/v6.0.0/dependencies/2200-bump-ibc.md b/.../unreleased/dependencies/2200-bump-ibc.md → ...elog/v6.0.0/dependencies/2200-bump-ibc.md
diff --git a/.changelog/v6.0.0/dependencies/2200-bump-sdk.md b/.changelog/v6.0.0/dependencies/2200-bump-sdk.md
@@ -0,0 +1,3 @@
+- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
+  [v0.50.9](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.9)
+  ([\#2200](https://github.com/cosmos/interchain-security/pull/2200))
diff --git a/...eased/features/2035-min-stake-max-rank.md → ...6.0.0/features/2035-min-stake-max-rank.md b/...eased/features/2035-min-stake-max-rank.md → ...6.0.0/features/2035-min-stake-max-rank.md
diff --git a/...ased/features/2066-allow-inactive-vals.md → ....0.0/features/2066-allow-inactive-vals.md b/...ased/features/2066-allow-inactive-vals.md → ....0.0/features/2066-allow-inactive-vals.md
diff --git a/...ased/features/2079-inactive-validators.md → ....0.0/features/2079-inactive-validators.md b/...ased/features/2079-inactive-validators.md → ....0.0/features/2079-inactive-validators.md
diff --git a/...eased/features/2098-vscmatured-removal.md → ...6.0.0/features/2098-vscmatured-removal.md b/...eased/features/2098-vscmatured-removal.md → ...6.0.0/features/2098-vscmatured-removal.md
diff --git a/...res/2106-query-blocks-until-next-epoch.md → ...res/2106-query-blocks-until-next-epoch.md b/...res/2106-query-blocks-until-next-epoch.md → ...res/2106-query-blocks-until-next-epoch.md
diff --git a/...eased/features/2171-permissionless-ics.md → ...6.0.0/features/2171-permissionless-ics.md b/...eased/features/2171-permissionless-ics.md → ...6.0.0/features/2171-permissionless-ics.md
diff --git a/...ased/features/2211-deprecate-migration.md → ....0.0/features/2211-deprecate-migration.md b/...ased/features/2211-deprecate-migration.md → ....0.0/features/2211-deprecate-migration.md
diff --git a/...state-breaking/2035-min-stake-max-rank.md → ...state-breaking/2035-min-stake-max-rank.md b/...state-breaking/2035-min-stake-max-rank.md → ...state-breaking/2035-min-stake-max-rank.md
diff --git a/...tate-breaking/2066-allow-inactive-vals.md → ...tate-breaking/2066-allow-inactive-vals.md b/...tate-breaking/2066-allow-inactive-vals.md → ...tate-breaking/2066-allow-inactive-vals.md
diff --git a/...tate-breaking/2079-inactive-validators.md → ...tate-breaking/2079-inactive-validators.md b/...tate-breaking/2079-inactive-validators.md → ...tate-breaking/2079-inactive-validators.md
diff --git a/...state-breaking/2098-vscmatured-removal.md → ...state-breaking/2098-vscmatured-removal.md b/...state-breaking/2098-vscmatured-removal.md → ...state-breaking/2098-vscmatured-removal.md
diff --git a/...state-breaking/2171-permissionless-ics.md → ...state-breaking/2171-permissionless-ics.md b/...state-breaking/2171-permissionless-ics.md → ...state-breaking/2171-permissionless-ics.md
diff --git a/.changelog/v6.0.0/summary.md b/.changelog/v6.0.0/summary.md
@@ -0,0 +1 @@
+*September 12, 2024*
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -22,7 +22,7 @@ updates:
     directory: "/"
     schedule:
       interval: daily
-    target-branch: "release/v4.3.x"
+    target-branch: "release/v4.0.x"
     # Only allow automated security-related dependency updates on release branches.
     open-pull-requests-limit: 0
     labels:
@@ -32,17 +32,7 @@ updates:
     directory: "/"
     schedule:
       interval: daily
-    target-branch: "release/v4.3.x-lsm"
-    # Only allow automated security-related dependency updates on release branches.
-    open-pull-requests-limit: 0
-    labels:
-      - dependencies
-
-    - package-ecosystem: gomod
-    directory: "/"
-    schedule:
-      interval: daily
-    target-branch: "release/v4.4.x"
+    target-branch: "release/v4.5.x"
     # Only allow automated security-related dependency updates on release branches.
     open-pull-requests-limit: 0
     labels:
@@ -72,7 +62,7 @@ updates:
     directory: "/"
     schedule:
       interval: daily
-    target-branch: "release/v6.0.x"
+    target-branch: "release/v6.1.x"
     # Only allow automated security-related dependency updates on release branches.
     open-pull-requests-limit: 0
     labels:

diff --git a/.mergify.yml b/.mergify.yml
@@ -10,30 +10,22 @@ queue_rules:
       - "#approved-reviews-by>1"
 
 pull_request_rules:
-  - name: Backport patches to the release/v4.3.x branch
+  - name: Backport patches to the release/v4.0.x branch
     conditions:
       - base=main
-      - label=A:backport/v4.3.x
+      - label=A:backport/v4.0.x
     actions:
       backport:
         branches:
-          - release/v4.3.x
-  - name: Backport patches to the release/v4.3.x-lsm branch
+          - release/v4.0.x
+  - name: Backport patches to the release/v4.5.x branch
     conditions:
       - base=main
-      - label=A:backport/v4.3.x-lsm
+      - label=A:backport/v4.5.x
     actions:
       backport:
         branches:
-          - release/v4.3.x-lsm
-  - name: Backport patches to the release/v4.4.x branch
-    conditions:
-      - base=main
-      - label=A:backport/v4.4.x
-    actions:
-      backport:
-        branches:
-          - release/v4.4.x
+          - release/v4.5.x
   - name: Backport patches to the release/v5.x branch
     conditions:
       - base=main
@@ -50,11 +42,11 @@ pull_request_rules:
       backport:
         branches:
           - release/v5.2.x
-  - name: Backport patches to the release/v6.0.x branch
+  - name: Backport patches to the release/v6.1.x branch
     conditions:
       - base=main
-      - label=A:backport/v6.0.x
+      - label=A:backport/v6.1.x
     actions:
       backport:
         branches:
-          - release/v6.0.x
+          - release/v6.1.x