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: upgrade to v4 (backport #357) #358

Merged
merged 2 commits into from
May 8, 2024
Merged
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: 2 additions & 0 deletions .github/workflows/check-generated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ jobs:

- name: Install protoc
uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Node.js
uses: actions/setup-node@v4
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
### Features
* (fswap, fbridge) [\#354](https://github.com/Finschia/finschia/pull/354) Bump finschia-sdk v0.48.1 to v0.49.0-rc1
* (fbridge) [\#355](https://github.com/Finschia/finschia/pull/355) Bump finschia-sdk v0.49.0-rc1 to v0.49.0-rc2
* (build) [\#357](https://github.com/Finschia/finschia/pull/357) Upgrade to v4

### Improvements

Expand Down
4 changes: 2 additions & 2 deletions ante/ante_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
xauthsigning "github.com/Finschia/finschia-sdk/x/auth/signing"
ocrand "github.com/Finschia/ostracon/libs/rand"

linkapp "github.com/Finschia/finschia/v3/app"
linkhelpers "github.com/Finschia/finschia/v3/app/helpers"
linkapp "github.com/Finschia/finschia/v4/app"
linkhelpers "github.com/Finschia/finschia/v4/app/helpers"
)

type IntegrationTestSuite struct {
Expand Down
8 changes: 4 additions & 4 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,13 @@ import (
wasmpluskeeper "github.com/Finschia/wasmd/x/wasmplus/keeper"
wasmplustypes "github.com/Finschia/wasmd/x/wasmplus/types"

appante "github.com/Finschia/finschia/v3/ante"
appparams "github.com/Finschia/finschia/v3/app/params"
_ "github.com/Finschia/finschia/v3/client/docs/statik" // unnamed import of statik for swagger UI support
appante "github.com/Finschia/finschia/v4/ante"
appparams "github.com/Finschia/finschia/v4/app/params"
_ "github.com/Finschia/finschia/v4/client/docs/statik" // unnamed import of statik for swagger UI support
)

const appName = "Finschia"
const upgradeName = "v3-Rose"
const upgradeName = "v4-Marigold"

var (
// DefaultNodeHome default home directories for the application daemon
Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package app
import (
"github.com/Finschia/finschia-sdk/std"

"github.com/Finschia/finschia/v3/app/params"
"github.com/Finschia/finschia/v4/app/params"
)

// MakeEncodingConfig creates an EncodingConfig for testing
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/Finschia/ostracon/libs/log"
octypes "github.com/Finschia/ostracon/types"

linkapp "github.com/Finschia/finschia/v3/app"
linkapp "github.com/Finschia/finschia/v4/app"
)

// SimAppChainID hardcoded chainID for simulation
Expand Down
2 changes: 1 addition & 1 deletion cli_test/cli_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
minttypes "github.com/Finschia/finschia-sdk/x/mint/types"
osttypes "github.com/Finschia/ostracon/types"

"github.com/Finschia/finschia/v3/app"
"github.com/Finschia/finschia/v4/app"
)

func TestFnsadKeysAddMultisig(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cli_test/multi_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/Finschia/finschia-sdk/crypto/keys/ed25519"
sdk "github.com/Finschia/finschia-sdk/types"

"github.com/Finschia/finschia/v3/app"
"github.com/Finschia/finschia/v4/app"
)

func TestMultiValidatorAndSendTokens(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions cli_test/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ import (
wasmcli "github.com/Finschia/wasmd/x/wasm/client/cli"
wasmtypes "github.com/Finschia/wasmd/x/wasm/types"

"github.com/Finschia/finschia/v3/app"
fnsacmd "github.com/Finschia/finschia/v3/cmd/fnsad/cmd"
fnsatypes "github.com/Finschia/finschia/v3/types"
"github.com/Finschia/finschia/v4/app"
fnsacmd "github.com/Finschia/finschia/v4/cmd/fnsad/cmd"
fnsatypes "github.com/Finschia/finschia/v4/types"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions cmd/fnsad/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ import (
"github.com/Finschia/wasmd/x/wasm"
wasmkeeper "github.com/Finschia/wasmd/x/wasm/keeper"

"github.com/Finschia/finschia/v3/app"
"github.com/Finschia/finschia/v3/app/params"
fnsatypes "github.com/Finschia/finschia/v3/types"
"github.com/Finschia/finschia/v4/app"
"github.com/Finschia/finschia/v4/app/params"
fnsatypes "github.com/Finschia/finschia/v4/types"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/fnsad/cmd/testnet_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
genutiltypes "github.com/Finschia/finschia-sdk/x/genutil/types"
"github.com/Finschia/ostracon/libs/log"

"github.com/Finschia/finschia/v3/app"
"github.com/Finschia/finschia/v4/app"
)

func Test_TestnetCmd(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/fnsad/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/Finschia/finschia-sdk/server"
svrcmd "github.com/Finschia/finschia-sdk/server/cmd"

"github.com/Finschia/finschia/v3/app"
"github.com/Finschia/finschia/v3/cmd/fnsad/cmd"
"github.com/Finschia/finschia/v4/app"
"github.com/Finschia/finschia/v4/cmd/fnsad/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/Finschia/finschia/v3
module github.com/Finschia/finschia/v4

go 1.20

Expand Down
2 changes: 1 addition & 1 deletion interchaintest/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/Finschia/finschia/v3/interchaintest
module github.com/Finschia/finschia/v4/interchaintest

go 1.20

Expand Down
Loading