Merge branch 'main' into kocu/rm-stf-run-with-ctx

Author: kocubinski

.github/dependabot.yml

@@ -187,6 +187,15 @@ updates:
     labels:
       - "A:automerge"
       - dependencies
+  - package-ecosystem: gomod
+    directory: "x/accounts/defaults/base"
+    schedule:
+      interval: weekly
+      day: wednesday
+      time: "02:45"
+    labels:
+      - "A:automerge"
+      - dependencies
   - package-ecosystem: gomod
     directory: "x/accounts/defaults/multisig"
     schedule:

.github/pr_labeler.yml

@@ -28,6 +28,8 @@
   - indexer/postgres/**/*
 "C:x/accounts":
   - x/accounts/**/*
+"C:x/accounts/base":
+  - x/accounts/defaults/base/**/*
 "C:x/accounts/multisig":
   - x/accounts/defaults/multisig/**/*
 "C:x/accounts/lockup":

.github/workflows/test.yml

@@ -937,6 +937,29 @@ jobs:
         with:
           projectBaseDir: x/accounts/
 
+  test-x-accounts-base:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.23"
+          check-latest: true
+          cache: true
+          cache-dependency-path: x/accounts/defaults/base/go.sum
+      - uses: technote-space/get-diff-action@v6.1.2
+        id: git_diff
+        with:
+          PATTERNS: |
+            x/accounts/defaults/base/**/*.go
+            x/accounts/defaults/base/go.mod
+            x/accounts/defaults/base/go.sum
+      - name: tests
+        if: env.GIT_DIFF
+        run: |
+          cd x/accounts/defaults/base
+          go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock' ./...
+
   test-x-accounts-lockup:
     runs-on: ubuntu-latest
     steps:

CHANGELOG.md

@@ -54,8 +54,10 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 ### Bug Fixes
 
 * (baseapp) [#21256](https://github.com/cosmos/cosmos-sdk/pull/21256) Halt height will not commit the block indicated, meaning that if halt-height is set to 10, only blocks until 9 (included) will be committed. This is to go back to the original behavior before a change was introduced in v0.50.0.
+* (runtime) [#21769](https://github.com/cosmos/cosmos-sdk/pull/21769) Fix baseapp options ordering to avoid overwriting options set by modules.
 
 ### API Breaking Changes
+
 * (sims)[#21613](https://github.com/cosmos/cosmos-sdk/pull/21613) Add sims2 framework and factory methods for simpler message factories in modules
 
 ### Deprecated