Merge branch 'osmo/v0.47.5' into mattverse/bpt-5

.github/mergify.yml

@@ -0,0 +1,40 @@
+defaults:
+  actions:
+    backport:
+      assignees:
+        - "{{ author }}"
+
+queue_rules:
+  - name: default
+    conditions:
+      - "#approved-reviews-by>=1"
+
+pull_request_rules:
+  - name: automerge to the base branch with label automerge and branch protection passing
+    conditions:
+      - "#approved-reviews-by>=1"
+      - base=osmo/v0.47.5
+      - label=A:automerge
+    actions:
+      queue:
+        name: default
+        method: squash
+        commit_message_template: |
+          {{ title }} (#{{ number }})
+          {{ body }}
+  - name: backport patches to v22 branch
+    conditions:
+      - base=osmo/v0.47.5
+      - label=A:backport/v22
+    actions:
+      backport:
+        branches:
+          - osmo-v22/v0.47.5
+  - name: backport patches to v23 branch
+    conditions:
+      - base=osmo/v0.47.5
+      - label=A:backport/v23
+    actions:
+      backport:
+        branches:
+          - osmo-v23/v0.47.5

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - main
+      - osmo**
       - release/**
 permissions:
   contents: read

.github/workflows/codeql-analysis.yml

@@ -6,7 +6,7 @@ on:
       - "**.go"
   push:
     branches:
-      - main
+      - osmo**
       - release/**
     paths:
       - "**.go"

.github/workflows/gosec.yml

@@ -7,7 +7,7 @@ on:
       - "go.sum"
   push:
     branches:
-      - main
+      - osmo**
     paths:
       - "**/*.go"
       - "go.mod"

.github/workflows/lint.yml

@@ -2,7 +2,7 @@ name: Lint
 on:
   push:
     branches:
-      - main
+      - osmo**
       - release/**
   pull_request:
 permissions:

.github/workflows/staticmajor.yml

@@ -3,7 +3,7 @@ name: Detect leaking resources and bad code patterns
 on:
   push:
     branches:
-      - main
+      - osmo**
   pull_request:
   workflow_dispatch:
 

.github/workflows/test.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
   push:
     branches:
+      - osmo**
       - release/v0.47.x
 
 permissions:
@@ -264,4 +265,4 @@ jobs:
         if: env.GIT_DIFF
         run: |
           cd simapp
-          go test -mod=readonly -timeout 30m -tags='app_v1 norace ledger test_ledger_mock rocksdb_build' ./...
+          go test -mod=readonly -timeout 30m -tags='app_v1 norace ledger test_ledger_mock rocksdb_build' ./...

baseapp/options.go

@@ -96,6 +96,11 @@ func SetChainID(chainID string) func(*BaseApp) {
 	return func(app *BaseApp) { app.chainID = chainID }
 }
 
+// SetStoreLoader allows us to customize the rootMultiStore initialization.
+func SetStoreLoader(loader StoreLoader) func(*BaseApp) {
+	return func(app *BaseApp) { app.SetStoreLoader(loader) }
+}
+
 func (app *BaseApp) SetName(name string) {
 	if app.sealed {
 		panic("SetName() on sealed BaseApp")