Merge branch 'main' into prettymuchbryce/api-server-locking

.github/ISSUE_TEMPLATE/module-readiness-checklist.md

@@ -10,13 +10,13 @@ This checklist is to be used for tracking the final internal audit of new Cosmos
 
 ### Release Candidate Checklist
 
-The following checklist should be gone through once the module has been fully implemented. This audit should be performed directly on `master`, or preferably on a `alpha` or `beta` release tag that includes the module.
+The following checklist should be gone through once the module has been fully implemented. This audit should be performed directly on `main`, or preferably on a `alpha` or `beta` release tag that includes the module.
 
 The module **should not** be included in any Release Candidate tag until it has passed this checklist.
 
 - [ ] API audit (at least 1 person) (@assignee)
   - [ ] Are Msg and Query methods and types well-named and organized?
-  - [ ] Is everything well documented (inline godoc as well as [`/spec/` folder](https://github.com/cosmos/cosmos-sdk/blob/master/docs/spec/SPEC-SPEC.md) in module directory)
+  - [ ] Is everything well documented (inline godoc as well as [`/spec/` folder](https://github.com/cosmos/cosmos-sdk/blob/main/docs/spec/SPEC-SPEC.md) in module directory)
 - [ ] State machine audit (at least 2 people) (@assignee1, @assignee2)
   - [ ] Read through MsgServer code and verify correctness upon visual inspection
   - [ ] Ensure all state machine code which could be confusing is properly commented

.github/PULL_REQUEST_TEMPLATE.md

@@ -23,10 +23,10 @@ I have...
 
 - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
 - [ ] added `!` to the type prefix if API or client breaking change
-- [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting))
+- [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting))
 - [ ] provided a link to the relevant issue or specification
-- [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules)
-- [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing)
+- [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/building-modules)
+- [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing)
 - [ ] added a changelog entry to `CHANGELOG.md`
 - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc)
 - [ ] updated the relevant documentation or specification
@@ -47,4 +47,4 @@ I have...
 - [ ] reviewed API design and naming
 - [ ] reviewed documentation is accurate
 - [ ] reviewed tests and test coverage
-- [ ] manually tested (if applicable)
+- [ ] manually tested (if applicable)

.github/PULL_REQUEST_TEMPLATE/docs.md

@@ -15,9 +15,9 @@ please add links to any relevant follow up issues.*
 I have...
 
 - [ ] included the correct `docs:` prefix in the PR title
-- [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting))
+- [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting))
 - [ ] provided a link to the relevant issue or specification
-- [ ] followed the [documentation writing guidelines](https://github.com/cosmos/cosmos-sdk/blob/master/docs/DOC_WRITING_GUIDELINES.md)
+- [ ] followed the [documentation writing guidelines](https://github.com/cosmos/cosmos-sdk/blob/main/docs/DOC_WRITING_GUIDELINES.md)
 - [ ] reviewed "Files changed" and left comments if necessary
 - [ ] confirmed all CI checks have passed
 

.github/PULL_REQUEST_TEMPLATE/other.md

@@ -15,7 +15,7 @@ please add links to any relevant follow up issues.*
 I have...
 
 - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
-- [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting))
+- [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting))
 - [ ] provided a link to the relevant issue or specification
 - [ ] reviewed "Files changed" and left comments if necessary
 - [ ] confirmed all CI checks have passed
@@ -29,4 +29,4 @@ I have...
 
 - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
 - [ ] confirmed all author checklist items have been addressed
-- [ ] confirmed that this PR does not change production code
+- [ ] confirmed that this PR does not change production code

.github/workflows/atlas.yml

@@ -3,7 +3,7 @@ name: Atlas
 on:
   push:
     branches:
-      - master
+      - main
     paths:
       - "x/**/atlas/*"
   pull_request:

.github/workflows/deploy-docs.yml

@@ -1,10 +1,10 @@
 name: Deploy docs
 # This job builds and deploys documenation to github pages.
-# It runs on every push to master with a change in the docs folder.
+# It runs on every push to main with a change in the docs folder.
 on:
   push:
     branches:
-      - master
+      - main
     paths:
       - "docs/**"
 

.github/workflows/docker.yml

@@ -1,10 +1,10 @@
 name: Build & Push
-# Build & Push builds the simapp docker image on every push to master and
+# Build & Push builds the simapp docker image on every push to main and
 # and pushes the image to https://hub.docker.com/r/interchainio/simapp/tags
 on:
   push:
     branches:
-      - master
+      - main
     tags:
       - "v[0-9]+.[0-9]+.[0-9]+" # Push events to matching v*, i.e. v1.0, v20.15.10
       - "v[0-9]+.[0-9]+.[0-9]+-rc*" # Push events to matching v*, i.e. v1.0-rc1, v20.15.10-rc5

.github/workflows/lint.yml

@@ -1,12 +1,12 @@
 name: Lint
 # Lint runs golangci-lint over the entire cosmos-sdk repository
-# This workflow is run on every pull request and push to master
+# This workflow is run on every pull request and push to main
 # The `golangci` will pass without running if no *.{go, mod, sum} files have been changed.
 on:
   pull_request:
   push:
     branches:
-      - master
+      - main
 jobs:
   golangci:
     name: golangci-lint

.github/workflows/proto-docker.yml

@@ -2,18 +2,18 @@ name: Build & Push SDK Proto Builder
 on:
   push:
     branches:
-      - master
+      - main
     paths:
       - "contrib/devtools/dockerfile"
 
 permissions:
   contents: read
-  
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    # set VERSION to new version when making changes, when merged to master the image will automatically be pushed
+      # set VERSION to new version when making changes, when merged to main the image will automatically be pushed
       - uses: actions/checkout@v3
       - name: Prepare
         id: prep

.github/workflows/proto-registry.yml

@@ -4,9 +4,9 @@ name: Buf-Push
 on:
   push:
     branches:
-      - master
+      - main
     paths:
-      - 'proto/**'
+      - "proto/**"
 
 jobs:
   push:
@@ -16,6 +16,5 @@ jobs:
       - uses: bufbuild/[email protected]
       - uses: bufbuild/buf-push-action@v1
         with:
-          input: 'proto'
+          input: "proto"
           buf_token: ${{ secrets.BUF_TOKEN }}
-

.github/workflows/proto.yml

@@ -4,12 +4,12 @@ name: Protobuf
 on:
   pull_request:
     paths:
-      - 'proto/**'
+      - "proto/**"
   push:
     branches:
-      - master
+      - main
     paths:
-      - 'proto/**'
+      - "proto/**"
 
 jobs:
   lint:
@@ -29,5 +29,5 @@ jobs:
       - uses: bufbuild/[email protected]
       - uses: bufbuild/buf-breaking-action@v1
         with:
-          input: 'proto'
-          against: 'https://github.com/${{ github.repository }}.git#branch=${{ github.event.pull_request.base.ref }},ref=HEAD~1,subdir=proto'
+          input: "proto"
+          against: "https://github.com/${{ github.repository }}.git#branch=${{ github.event.pull_request.base.ref }},ref=HEAD~1,subdir=proto"

.github/workflows/sims.yml

@@ -11,10 +11,10 @@ jobs:
   cleanup-runs:
     runs-on: ubuntu-latest
     steps:
-    - uses: rokroskar/workflow-run-cleanup-action@master
-      env:
-        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
+      - uses: rokroskar/workflow-run-cleanup-action@master
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
   build:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'skip-sims')"

.github/workflows/test-race.yml

@@ -1,11 +1,11 @@
 name: Tests Race
 #  Tests Race workflow runs unit tests with the race detector
-#  This workflow is run on pushes to master & every Pull Requests where a .go, .mod, .sum have been changed
+#  This workflow is run on pushes to main & every Pull Requests where a .go, .mod, .sum have been changed
 on:
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 permissions:
   contents: read
@@ -17,7 +17,7 @@ jobs:
       - uses: rokroskar/workflow-run-cleanup-action@master
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
+    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
 
   install-tparse:
     runs-on: ubuntu-latest

.github/workflows/test.yml

@@ -1,23 +1,23 @@
 name: Tests / Code Coverage
 #  Tests / Code Coverage workflow runs unit tests and uploads a code coverage report
-#  This workflow is run on pushes to master & every Pull Requests where a .go, .mod, .sum have been changed
+#  This workflow is run on pushes to main & every Pull Requests where a .go, .mod, .sum have been changed
 on:
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 permissions:
   contents: read
-  
+
 jobs:
   cleanup-runs:
     runs-on: ubuntu-latest
     steps:
-    - uses: rokroskar/workflow-run-cleanup-action@master
-      env:
-        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
+      - uses: rokroskar/workflow-run-cleanup-action@master
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
   build:
     runs-on: ubuntu-latest
     strategy:
@@ -73,7 +73,7 @@ jobs:
         with:
           go-version: 1.18
       - name: Create a file with all core Cosmos SDK pkgs
-        run:  go list ./... > pkgs.txt
+        run: go list ./... > pkgs.txt
       - name: Split pkgs into 4 files
         run: split -d -n l/4 pkgs.txt pkgs.txt.part.
       # cache multiple
@@ -217,7 +217,7 @@ jobs:
         run: |
           ./contrib/localnet_liveness.sh 100 5 50 localhost
         if: env.GIT_DIFF
-        
+
   install-runsim:
     runs-on: ubuntu-latest
     needs: build

.mergify.yml

@@ -4,11 +4,11 @@ queue_rules:
       - "#approved-reviews-by>1"
 
 pull_request_rules:
-  - name: automerge to master with label automerge and branch protection passing
+  - name: automerge to main with label automerge and branch protection passing
     conditions:
       - "#approved-reviews-by>1"
-      - base=master
-      - label=automerge
+      - base=main
+      - label=A:automerge
     actions:
       queue:
         name: default
@@ -18,31 +18,31 @@ pull_request_rules:
           {{ body }}
   - name: backport patches to v0.46.x branch
     conditions:
-      - base=master
+      - base=main
       - label=backport/0.46.x
     actions:
       backport:
         branches:
           - release/v0.46.x
   - name: backport patches to v0.45.x branch
     conditions:
-      - base=master
+      - base=main
       - label=backport/0.45.x
     actions:
       backport:
         branches:
           - release/v0.45.x
   - name: backport patches to v0.44.x branch
     conditions:
-      - base=master
+      - base=main
       - label=backport/0.44.x
     actions:
       backport:
         branches:
           - release/v0.44.x
   - name: backport patches to v0.42.x branch
     conditions:
-      - base=master
+      - base=main
       - label=backport/0.42.x (Stargate)
     actions:
       backport: