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

osmosis-labs · Mar 8, 2024 · 910b67d · 910b67d
2 parents 5e23284 + 24e7758
commit 910b67d
Show file tree

Hide file tree

Showing 97 changed files with 2,119 additions and 761 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -0,0 +1,41 @@
+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
+          - osmo-v23/v0.47.5-iavl-v1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - main
+      - osmo**
       - release/**
 permissions:
   contents: read
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - uses: technote-space/[email protected]
         id: git_diff

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -6,7 +6,7 @@ on:
       - "**.go"
   push:
     branches:
-      - main
+      - osmo**
       - release/**
     paths:
       - "**.go"
@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git a/.github/workflows/dependabot-update-all.yml b/.github/workflows/dependabot-update-all.yml
@@ -17,7 +17,7 @@ jobs:
           token: ${{ secrets.PRBOT_PAT }}
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - name: Extract updated dependency
         id: deps

diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml
@@ -7,7 +7,7 @@ on:
       - "go.sum"
   push:
     branches:
-      - main
+      - osmo**
     paths:
       - "**/*.go"
       - "go.mod"

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -2,7 +2,7 @@ name: Lint
 on:
   push:
     branches:
-      - main
+      - osmo**
       - release/**
   pull_request:
 permissions:
@@ -16,11 +16,11 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.50.1
+          version: v1.51.2
diff --git a/.github/workflows/proto-docker.yml b/.github/workflows/proto-docker.yml
diff --git a/.github/workflows/release-cosmovisor.yml b/.github/workflows/release-cosmovisor.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       # get 'v*.*.*' part from 'cosmovisor/v*.*.*' and save to $GITHUB_ENV
       - name: Set env

diff --git a/.github/workflows/release-rosetta.yml b/.github/workflows/release-rosetta.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       # get 'v*.*.*' part from 'rosetta/v*.*.*' and save to $GITHUB_ENV
       - name: Set env

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - name: Unshallow
         run: git fetch --prune --unshallow

diff --git a/.github/workflows/sims-045.yml b/.github/workflows/sims-045.yml
@@ -21,7 +21,7 @@ jobs:
           ref: "release/v0.45.x"
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - run: make build
 
@@ -33,7 +33,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - name: Install runsim
         run: go install github.com/cosmos/tools/cmd/[email protected]
@@ -51,7 +51,7 @@ jobs:
           ref: "release/v0.45.x"
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - uses: actions/cache@v3
         with:
@@ -70,7 +70,7 @@ jobs:
           ref: "release/v0.45.x"
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - uses: actions/cache@v3
         with:
@@ -90,7 +90,7 @@ jobs:
           ref: "release/v0.45.x"
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - uses: actions/cache@v3
         with:

diff --git a/.github/workflows/sims-046.yml b/.github/workflows/sims-046.yml
@@ -21,7 +21,7 @@ jobs:
           ref: "release/v0.46.x"
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - run: make build
 
@@ -33,7 +33,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - name: Install runsim
         run: go install github.com/cosmos/tools/cmd/[email protected]
@@ -52,7 +52,7 @@ jobs:
           ref: "release/v0.46.x"
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - uses: actions/cache@v3
         with:
@@ -71,7 +71,7 @@ jobs:
           ref: "release/v0.46.x"
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - uses: actions/cache@v3
         with:
@@ -90,7 +90,7 @@ jobs:
           ref: "release/v0.46.x"
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - uses: actions/cache@v3
         with:

diff --git a/.github/workflows/sims-047.yml b/.github/workflows/sims-047.yml
@@ -21,7 +21,7 @@ jobs:
           ref: "release/v0.47.x"
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - run: make build
 
@@ -33,7 +33,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - name: Install runsim
         run: go install github.com/cosmos/tools/cmd/[email protected]
@@ -52,7 +52,7 @@ jobs:
           ref: "release/v0.47.x"
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - uses: actions/cache@v3
         with:
@@ -71,7 +71,7 @@ jobs:
           ref: "release/v0.47.x"
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - uses: actions/cache@v3
         with:
@@ -90,7 +90,7 @@ jobs:
           ref: "release/v0.47.x"
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - uses: actions/cache@v3
         with:

diff --git a/.github/workflows/sims-nightly.yml b/.github/workflows/sims-nightly.yml
@@ -22,7 +22,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - name: Install runsim
         run: go install github.com/cosmos/tools/cmd/[email protected]
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           check-latest: true
       - uses: actions/cache@v3
         with: