chore: merge upstream/bumpup50

.github/pr_labeler.yml

@@ -11,8 +11,8 @@
 # "C:CLI":
 #   - client/**/*
 #   - x/*/client/**/*
-# "Type: ADR":
-#   - docs/architecture/**/*
+"C:x/collection":
+  - x/collection/**/*
 "C:x/foundation":
   - x/foundation/**/*
 "C:x/stakingplus":

.golangci.yml

@@ -1,22 +1,23 @@
 run:
   tests: true
   timeout: 15m
-  sort-results: true
   allow-parallel-runners: true
   skip-files:
     - ".*\\.pb\\.go$"
     - ".*\\.pb\\.gw\\.go$"
     - ".*\\.pulsar\\.go$"
 
+output:
+  sort-results: true
+
 linters:
   disable-all: true
   enable:
-    - depguard
     - dogsled
     - exportloopref
+    - gci
     - goconst
     - gocritic
-    - gci
     - gofumpt
     - gosec
     - gosimple
@@ -25,8 +26,8 @@ linters:
     - misspell
     - nakedret
     - nolintlint
-    - staticcheck
     - revive
+    - staticcheck
     - stylecheck
     - typecheck
     - unconvert
@@ -58,6 +59,9 @@ issues:
     - text: "leading space"
       linters:
         - nolintlint
+    - text: "SA1019: collection." # TODO: remove deprecated collection features later
+      linters:
+        - staticcheck
   max-issues-per-linter: 10000
   max-same-issues: 10000
 

CHANGELOG.md

@@ -41,6 +41,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Features
 * (x/staking) [\#1214](https://github.com/Finschia/finschia-sdk/pull/1214) update x/stakingplus to use Finschia/cosmos-sdk
+* (x/collection,token) [\#1208](https://github.com/Finschia/finschia-sdk/pull/1208) update x/collection to use Finschia/cosmos-sdk
 * (x/foundation) [\#1198](https://github.com/Finschia/finschia-sdk/pull/1198) update x/foundation to use Finschia/cosmos-sdk
 * (x/bankplus) [\#1223](https://github.com/Finschia/finschia-sdk/pull/1223) deprecate x/bankplus
 * (all) [\#1205](https://github.com/Finschia/finschia-sdk/pull/1205) delegate native logics to Finschia/cosmos-sdk