Merged with origin/main.

dymensionxyz · Mar 18, 2024 · 49e3bdc · 49e3bdc
2 parents 7e45b1c + c74746c
commit 49e3bdc
Show file tree

Hide file tree

Showing 38 changed files with 148 additions and 1,026 deletions.
diff --git a/.github/workflows/golangci_lint.yml b/.github/workflows/golangci_lint.yml
@@ -15,10 +15,10 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.22
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3.7.0
+        uses: golangci/golangci-lint-action@v4.0.0
         with:
-          config-path: .golangci.yml
-          version: v1.49.0
-          skip-cache: true
+          version: v1.56.2
+          skip-cache: true
+          args: --out-format colored-line-number
diff --git a/.golangci.yml b/.golangci.yml
@@ -2,8 +2,32 @@ run:
   timeout: 5m
   tests: true
   modules-download-mode: readonly
-  skip-files:
-    - ./*_test.go    
+
+output:
+  # Format: colored-line-number|line-number|json|colored-tab|tab|checkstyle|code-climate|junit-xml|github-actions|teamcity
+  #
+  # Multiple can be specified by separating them by comma, output can be provided
+  # for each of them by separating format name and path by colon symbol.
+  # Output path can be either `stdout`, `stderr` or path to the file to write to.
+  # Example: "checkstyle:report.xml,json:stdout,colored-line-number"
+  #
+  # Default: colored-line-number
+  format: colored-line-number
+  # Print lines of code with issue.
+  # Default: true
+  print-issued-lines: true
+  # Print linter name in the end of issue text.
+  # Default: true
+  print-linter-name: true
+  # Make issues output unique by line.
+  # Default: true
+  uniq-by-line: true
+  # Add a prefix to the output file references.
+  # Default: ""
+  path-prefix: ""
+  # Sort results by: filepath, line and column.
+  # Default: false
+  sort-results: true
 
 linters:
   disable-all: true
@@ -22,7 +46,7 @@ linters:
 issues:
   exclude-use-default: false
   exclude:
-    - "^.*SA1019.*$"  # Excluding SA1019 errors
+    - "^.*SA1019.*$" # Excluding SA1019 errors
 
 linters-settings:
   revive:
@@ -32,4 +56,3 @@ linters-settings:
         disabled: true
   errcheck:
     check-type-assertions: true
-
diff --git a/app/app.go b/app/app.go
@@ -267,20 +267,18 @@ var (
 
 	// module account permissions
 	maccPerms = map[string][]string{
-		authtypes.FeeCollectorName:      nil,
-		distrtypes.ModuleName:           nil,
-		minttypes.ModuleName:            {authtypes.Minter},
-		stakingtypes.BondedPoolName:     {authtypes.Burner, authtypes.Staking},
-		stakingtypes.NotBondedPoolName:  {authtypes.Burner, authtypes.Staking},
-		govtypes.ModuleName:             {authtypes.Burner},
-		ibctransfertypes.ModuleName:     {authtypes.Minter, authtypes.Burner},
-		sequencermoduletypes.ModuleName: {authtypes.Minter, authtypes.Burner, authtypes.Staking},
-		rollappmoduletypes.ModuleName:   {authtypes.Minter},
-		streamermoduletypes.ModuleName:  nil,
-		// this line is used by starport scaffolding # stargate/app/maccPerms
-
-		evmtypes.ModuleName: {authtypes.Minter, authtypes.Burner}, // used for secure addition and subtraction of balance using module account
-		evmtypes.ModuleVirtualFrontierContractDeployerName: nil, // used for deploying virtual frontier bank contract
+		authtypes.FeeCollectorName:                         nil,
+		distrtypes.ModuleName:                              nil,
+		minttypes.ModuleName:                               {authtypes.Minter},
+		stakingtypes.BondedPoolName:                        {authtypes.Burner, authtypes.Staking},
+		stakingtypes.NotBondedPoolName:                     {authtypes.Burner, authtypes.Staking},
+		govtypes.ModuleName:                                {authtypes.Burner},
+		ibctransfertypes.ModuleName:                        {authtypes.Minter, authtypes.Burner},
+		sequencermoduletypes.ModuleName:                    {authtypes.Minter, authtypes.Burner, authtypes.Staking},
+		rollappmoduletypes.ModuleName:                      {authtypes.Minter},
+		streamermoduletypes.ModuleName:                     nil,
+		evmtypes.ModuleName:                                {authtypes.Minter, authtypes.Burner}, // used for secure addition and subtraction of balance using module account.
+		evmtypes.ModuleVirtualFrontierContractDeployerName: nil,                                  // used for deploying virtual frontier bank contract.
 		gammtypes.ModuleName:                               {authtypes.Minter, authtypes.Burner},
 		lockuptypes.ModuleName:                             {authtypes.Minter, authtypes.Burner},
 		incentivestypes.ModuleName:                         {authtypes.Minter, authtypes.Burner},

diff --git a/go.sum b/go.sum
@@ -458,7 +458,7 @@ github.com/dymensionxyz/ethermint v0.22.0-dymension-v0.4.1 h1:J31ASxmDVm7ytjmk9T
 github.com/dymensionxyz/ethermint v0.22.0-dymension-v0.4.1/go.mod h1:O2J61ZwM0Vdms6pRa1fb43pwmCuNRctro3AB90WlOc0=
 github.com/dymensionxyz/osmosis/osmomath v0.0.6-dym-v0.0.1 h1:59ZE3Ocrn04MUpb5VJgfi24eDcnQ9VBfCSw0Mx1n7OI=
 github.com/dymensionxyz/osmosis/osmomath v0.0.6-dym-v0.0.1/go.mod h1:2idySYJxP5YfMAEeSeqD8e7fSchfsI4jn7XFHJgNUsM=
-github.com/dymensionxyz/osmosis/v15 v15.2.1-0.20240310110736-a0811b5943a5 h1:fdu2lHVWNsACjqA5A63Y8sSVV8UiIoDKjOScUDTivOc=
+github.com/dymensionxyz/osmosis/v15 v15.2.1-0.20240310110736-a0811b5943a5 h1:1SSfSpblYEtcWOKttIDDpuaUOtThFHdWzU/9a42rITc=
 github.com/dymensionxyz/osmosis/v15 v15.2.1-0.20240310110736-a0811b5943a5/go.mod h1:BHHGzl86byC0sov3EUfTzyDuIsGY//rcrek6gCOa+fw=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=