feat: set cointype

.github/workflows/check-generated.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
 
       - uses: actions/checkout@v4
         with:

.github/workflows/ci-smart-contract.yml

@@ -9,7 +9,7 @@ on:
 
 env:
   TEST_DOCKER_IMAGE: finschianode:smartcontractci
-  GO_VERSION: "1.20"
+  GO_VERSION: "1.21"
 
 jobs:
   cleanup-runs:

.github/workflows/e2e-ibc.yml

@@ -13,7 +13,7 @@ permissions:
   packages: write
 
 env:
-  GO_VERSION: '1.20'
+  GO_VERSION: '1.21'
   TAR_PATH: /tmp/fnsad-docker-image.tar
   IMAGE_NAME: finschia
 

.github/workflows/format.yml

@@ -13,22 +13,18 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: Display go version
         run: go version
       - uses: actions/cache@v3
         id: cache
         with:
           path: ~/go/bin
-          key: ${{ runner.os }}-go-v1.20-misspell-v0.3.4-goimports-reviser-v3.4.5
+          key: ${{ runner.os }}-go-v1.21-misspell-v0.3.4
       - name: install misspell
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
           go install github.com/client9/misspell/cmd/[email protected]
-      - name: install goimports-reviser
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          go install github.com/incu6us/goimports-reviser/[email protected]
       - name: Make Format
         run: make format
       - name: Check Diff

.github/workflows/lint.yml

@@ -11,7 +11,6 @@ jobs:
   golangci:
     name: golangci-lint
     runs-on: ubuntu-latest
-    timeout-minutes: 6
     steps:
       - uses: actions/checkout@v4
       - uses: technote-space/[email protected]
@@ -22,11 +21,11 @@ jobs:
             go.sum
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - uses: golangci/golangci-lint-action@v4
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.51
+          version: v1.55
           args: --timeout 10m
           github-token: ${{ secrets.GITHUB_TOKEN }}
         if: env.GIT_DIFF

.github/workflows/sims.yml

@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: Display go version
         run: go version
       - run: make build
@@ -35,7 +35,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: Display go version
         run: go version
       - name: Install runsim
@@ -52,7 +52,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: Display go version
         run: go version
       - uses: technote-space/[email protected]
@@ -78,7 +78,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: Display go version
         run: go version
       - uses: technote-space/[email protected]
@@ -106,7 +106,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: Display go version
         run: go version
       - uses: technote-space/[email protected]
@@ -134,7 +134,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: Display go version
         run: go version
       - uses: technote-space/[email protected]

.github/workflows/tests.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: Display go version
         run: go version
       - name: install tparse
@@ -41,7 +41,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - uses: technote-space/[email protected]
         with:
           PATTERNS: |
@@ -59,7 +59,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: Create a file with all the pkgs
         run: go list ./... > pkgs.txt
       - name: Split pkgs into 4 files
@@ -93,7 +93,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - uses: technote-space/[email protected]
         with:
           PATTERNS: |
@@ -177,7 +177,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - uses: technote-space/[email protected]
         with:
           PATTERNS: |
@@ -250,7 +250,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - uses: technote-space/[email protected]
         with:
           PATTERNS: |
@@ -319,7 +319,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: Install docker-compose
         run: sudo apt-get update && sudo apt-get install -y docker-compose
       - name: Start localnet
@@ -336,10 +336,10 @@ jobs:
             exit 1
           fi
 
-  test-upgrade-name:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Test upgrade name
-        run: |
-          make test-upgrade-name
+  # test-upgrade-name:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - name: Test upgrade name
+  #       run: |
+  #         make test-upgrade-name

.golangci.yml

@@ -2,9 +2,9 @@ linters:
   enable:
     - bodyclose
     - deadcode
-    - depguard
     - dogsled
     - errcheck
+    - gci
     - goconst
     - gocritic
     - gofmt
@@ -17,7 +17,6 @@ linters:
     - misspell
     - maligned
     - nakedret
-    - prealloc
     - scopelint
     - staticcheck
     - structcheck
@@ -68,6 +67,18 @@ linters-settings:
     # Default is to use a neutral variety of English.
     # Setting locale to US will correct the British spelling of 'colour' to 'color'.
     locale: US
+  gci:
+    custom-order: true
+    sections:
+      - standard # Standard section: captures all standard packages.
+      - default # Default section: contains all imports that could not be matched to another section type.
+      - prefix(cosmossdk.io)
+      - prefix(github.com/cosmos/cosmos-sdk)
+      - prefix(github.com/cosmos/ibc-go)
+      - prefix(github.com/CosmWasm/wasmd)
+      - prefix(github.com/Finschia/finschia-sdk)
+      - prefix(github.com/Finschia/finschia)
+
 run:
   # default concurrency is a available CPU number
   concurrency: 4

CHANGELOG.md

@@ -37,6 +37,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ## [Unreleased]
 
 ### Features
+* (config) [\#345](https://github.com/Finschia/finschia/pull/345) set cointype
 
 ### Improvements
 

CONTRIBUTING.md

@@ -74,7 +74,7 @@ Please don't make Pull Requests from `main`.
 
 ## Dependencies
 
-We use [Go 1.20 Modules](https://github.com/golang/go/wiki/Modules) to manage
+We use [Go 1.21 Modules](https://github.com/golang/go/wiki/Modules) to manage
 dependency versions.
 
 The `main` branch of every finschia repository should just build with `go get`,

Dockerfile

@@ -5,7 +5,7 @@
 # > docker run -it -p 26656:26656 -p 26657:26657 -v ~/.finschia:/root/.finschia -v finschia/finschianode fnsad init
 # > docker run -it -p 26656:26656 -p 26657:26657 -v ~/.finschia:/root/.finschia -v finschia/finschianode fnsad start --rpc.laddr=tcp://0.0.0.0:26657 --p2p.laddr=tcp://0.0.0.0:26656
 
-ARG GO_VERSION="1.20"
+ARG GO_VERSION="1.21"
 ARG RUNNER_IMAGE="alpine:3.17"
 
 FROM golang:${GO_VERSION}-alpine3.17 AS build-env

Makefile

@@ -252,7 +252,6 @@ lint:
 format:
 	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" | xargs gofmt -w -s
 	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" | xargs misspell -w
-	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" | xargs -n1 goimports-reviser -rm-unused -set-alias -project-name "github.com/Finschia/finschia/" -company-prefixes "github.com/Finschia/"
 
 .PHONY: lint format
 

README.md

@@ -9,7 +9,7 @@
 
 This repository hosts `Finschia`. This repository is forked from [gaia](https://github.com/cosmos/gaia) at 2021-03-15. Finschia is a mainnet app implementation using [finschia-sdk](https://github.com/Finschia/finschia-sdk), [ostracon](https://github.com/Finschia/ostracon), [wasmd](https://github.com/Finschia/wasmd) and [ibc-go](https://github.com/Finschia/ibc-go).
 
-**Node**: Requires [Go 1.20+](https://golang.org/dl/)
+**Node**: Requires [Go 1.21+](https://golang.org/dl/)
 
 **Warnings**: Initial development is in progress, but there has not yet been a stable.
 

app/ante.go

@@ -3,16 +3,16 @@ package app
 import (
 	"errors"
 
-	circuitante "cosmossdk.io/x/circuit/ante"
-	ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
-	"github.com/cosmos/ibc-go/v8/modules/core/keeper"
-
 	corestoretypes "cosmossdk.io/core/store"
+	circuitante "cosmossdk.io/x/circuit/ante"
 	circuitkeeper "cosmossdk.io/x/circuit/keeper"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
 
+	ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
+	"github.com/cosmos/ibc-go/v8/modules/core/keeper"
+
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types"
 )