Merge branch 'main' into pebbledb-default

.github/dependabot.yml

@@ -26,7 +26,3 @@ updates:
     directory: "/tests/connect"
     schedule:
       interval: daily
-  - package-ecosystem: gomod
-    directory: "/tests/feemarket"
-    schedule:
-      interval: daily

.github/labeler.yml

@@ -3,63 +3,20 @@
   - changed-files:
       - any-glob-to-any-file:
           - app/*.go
-          - app/apptesting/**
-          - app/keepers/**
           - app/params/**
-          - app/upgrades/**
-          - x/**/module.go
-"C:wasm":
+          - app/queries/**
+"C:x/tax":
   - changed-files:
       - any-glob-to-any-file:
-          - wasmbinding/**
-"C:x/guard":
+          - x/tax/**
+"C:x/tokenfactory":
   - changed-files:
       - any-glob-to-any-file:
-          - x/guard/**
-"C:x/txfees":
+          - x/tokenfactory/**
+"C:x/xfeemarket":
   - changed-files:
       - any-glob-to-any-file:
-          - x/txfees/**
-"C:x/airdrop":
-  - changed-files:
-      - any-glob-to-any-file:
-          - x/airdrop/**
-"C:x/bridge":
-  - changed-files:
-      - any-glob-to-any-file:
-          - x/bridge/**
-"C:x/coinfactory":
-  - changed-files:
-      - any-glob-to-any-file:
-          - x/coinfactory/**
-"C:x/did":
-  - changed-files:
-      - any-glob-to-any-file:
-          - x/did/**
-"C:x/farming":
-  - changed-files:
-      - any-glob-to-any-file:
-          - x/farming/**
-"C:x/liquidity":
-  - changed-files:
-      - any-glob-to-any-file:
-          - x/liquidity/**
-"C:x/lpfarm":
-  - changed-files:
-      - any-glob-to-any-file:
-          - x/lpfarm/**
-"C:x/marketmaker":
-  - changed-files:
-      - any-glob-to-any-file:
-          - x/marketmaker/**
-"C:x/rewards":
-  - changed-files:
-      - any-glob-to-any-file:
-          - x/rewards/**
-"C:x/token":
-  - changed-files:
-      - any-glob-to-any-file:
-          - x/token/**
+          - x/xfeemarket/**
 
 "T:build":
   - changed-files:
@@ -78,6 +35,7 @@
       - any-glob-to-any-file:
           - client/**
           - x/*/client/**
+          - x/**/autocli.go
 "C:docs":
   - changed-files:
       - any-glob-to-any-file:
@@ -88,3 +46,4 @@
           - x/**/*.md
           - x/**/*/*.md
           - tests/**/*.md
+          - adr/*.md

.github/workflows/build.yml

@@ -7,15 +7,11 @@ on:
 name: Build and validate genesis
 jobs:
   build:
-    strategy:
-      matrix:
-        go-version: [1.23.x]
-        os: [ubuntu-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: ${{ matrix.go-version }}
+          go-version: 1.23
       - uses: actions/checkout@v4
       - name: install
         run: make install

.github/workflows/codeql.yml

@@ -17,7 +17,7 @@ on:
   pull_request:
     branches: [ "main" ]
   schedule:
-    - cron: '0 * * * *'
+    - cron: '0 0 * * *'
 
 jobs:
   analyze:

.github/workflows/gosec.yml

@@ -1,10 +1,11 @@
 name: Run Gosec
 on:
   pull_request:
+    branches:
+      [main,release/**]
   push:
     branches:
-      - main
-      - release/**
+      [main,release/**]
 
 jobs:
   Gosec:

.github/workflows/lint.yml

@@ -13,17 +13,13 @@ permissions:
 
 jobs:
   golangci:
-    strategy:
-      matrix:
-        go: [stable]
-        os: [ubuntu-latest, macos-latest]
+    runs-on: ubuntu-latest
     name: lint
-    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ${{ matrix.go }}
+          go-version: 1.23
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:

.github/workflows/tests-unit.yml

@@ -6,14 +6,10 @@ on:
 name: Unit Tests
 jobs:
   test:
-    strategy:
-      matrix:
-        go-version: [1.23.x]
-        os: [ubuntu-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: ${{ matrix.go-version }}
+          go-version: 1.23
       - uses: actions/checkout@v4
       - run: go test ./...

adr/README.md

@@ -48,9 +48,7 @@ When writing ADRs, follow the same best practices for writing RFCs. When writing
 
 ### Draft
 
-* [ADR 002: Moving of guard permission checks to Message level](./adr-002-guard-checks-at-msg-level.md)
-* [ADR 003: Using of official Cosmos-SDK and IBC-Go](./adr-003-use-official-cosmos-modules.md)
-* [ADR 004: Allow users to create permissionless coins](./adr-004-create-permissionless-coins.md)
-* [ADR 005: Default coinfactory coins to be permissionless](./adr-005-default-permissionless-coins.md)
-* [ADR 006: Standardise coinfactory protobuf](./adr-006-standardise-coinfactory.md)
-* [ADR 007: KVStore key prefix](./adr-007-kvstore-key-prefix.md)
+* [ADR 002: Using of official Cosmos modules](./adr-002-use-official-cosmos-modules.md)
+* [ADR 003: Adopt Neutron TokenFactory](./adr-003-use-neutron-tokenfactory.md)
+* [ADR 004: Usage of Depinject](./adr-004-use-depinject-when-possible.md)
+* [ADR 005: Maintain a cosmos-sdk fork for the bank module](./adr-005-maintain-sdk-fork.md)

adr/adr-003-use-official-cosmos-modules.md → adr/adr-002-use-official-cosmos-modules.md

@@ -1,4 +1,4 @@
-# ADR 003: Using of official Cosmos-SDK and IBC-Go
+# ADR 002: Using of official Cosmos-SDK and IBC-Go
 
 ## Context
 

adr/adr-008-use-neutron-tokenfactory.md → adr/adr-003-use-neutron-tokenfactory.md

@@ -1,4 +1,4 @@
-# ADR 008: Use Neutron Token Factory by copying code into Mantrachain
+# ADR 003: Use Neutron Token Factory by copying code into Mantrachain
 
 ## Context
 

adr/adr-009-use-depinject-when-possible.md → adr/adr-004-use-depinject-when-possible.md

@@ -8,9 +8,9 @@ We observed that it causes an enormous reduction in the complexity of our code,
 
 ## Decision
 
-When possible, we'll use depinject to integrate mantra's external dependencies.
-
+We decided not to use depinject at this time because it is not yet fully supported up and down the cosmos stack.  We will revisit this decision when it is more widely supported.
+For now, we will continue to manually register all of our dependencies in the app.go file.
 
 ## Status
 
-Accepted
+Rejected