Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: set cointype #345

Open
wants to merge 10 commits into
base: fnsad-v050-legacy
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-generated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-smart-contract.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

env:
TEST_DOCKER_IMAGE: finschianode:smartcontractci
GO_VERSION: "1.20"
GO_VERSION: "1.21"

jobs:
cleanup-runs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-ibc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
12 changes: 6 additions & 6 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand All @@ -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
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand All @@ -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
15 changes: 13 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ linters:
enable:
- bodyclose
- deadcode
- depguard
- dogsled
- errcheck
- gci
- goconst
- gocritic
- gofmt
Expand All @@ -17,7 +17,6 @@ linters:
- misspell
- maligned
- nakedret
- prealloc
- scopelint
- staticcheck
- structcheck
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`,
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
8 changes: 4 additions & 4 deletions app/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
Loading
Loading