From 04fb7bef3807fdc6df513e27e3a0870d3c07190c Mon Sep 17 00:00:00 2001 From: Youngtaek Yoon Date: Wed, 8 May 2024 19:09:40 +0900 Subject: [PATCH] feat: upgrade to v4 (#357) * Increase go module version * Update the upgrade name * Provide github token to get a higher rate limit * Update CHANGELOG.md (cherry picked from commit d239ccf20ea4a72c443cedd5ecd592c1143dc947) # Conflicts: # CHANGELOG.md --- .github/workflows/check-generated.yml | 2 ++ CHANGELOG.md | 5 +++++ ante/ante_test.go | 4 ++-- app/app.go | 8 ++++---- app/encoding.go | 2 +- app/helpers/test_helpers.go | 2 +- cli_test/cli_test.go | 2 +- cli_test/multi_test.go | 2 +- cli_test/test_helpers.go | 6 +++--- cmd/fnsad/cmd/root.go | 6 +++--- cmd/fnsad/cmd/testnet_test.go | 2 +- cmd/fnsad/main.go | 4 ++-- go.mod | 2 +- interchaintest/go.mod | 2 +- 14 files changed, 28 insertions(+), 21 deletions(-) diff --git a/.github/workflows/check-generated.yml b/.github/workflows/check-generated.yml index e515d8c7..9e2da2bb 100644 --- a/.github/workflows/check-generated.yml +++ b/.github/workflows/check-generated.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index b635f62c..beec7677 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,11 @@ 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 +<<<<<<< HEAD +======= +* (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 +>>>>>>> d239ccf (feat: upgrade to v4 (#357)) ### Improvements diff --git a/ante/ante_test.go b/ante/ante_test.go index 05cc7494..e9443297 100644 --- a/ante/ante_test.go +++ b/ante/ante_test.go @@ -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 { diff --git a/app/app.go b/app/app.go index fa134fbf..a3e5fbf5 100644 --- a/app/app.go +++ b/app/app.go @@ -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 diff --git a/app/encoding.go b/app/encoding.go index e09ebc3d..6b34ec90 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -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 diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go index fd475437..7447ded9 100644 --- a/app/helpers/test_helpers.go +++ b/app/helpers/test_helpers.go @@ -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 diff --git a/cli_test/cli_test.go b/cli_test/cli_test.go index 7956bdcf..7b5d433d 100644 --- a/cli_test/cli_test.go +++ b/cli_test/cli_test.go @@ -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) { diff --git a/cli_test/multi_test.go b/cli_test/multi_test.go index 996eaab6..71f1cdca 100644 --- a/cli_test/multi_test.go +++ b/cli_test/multi_test.go @@ -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) { diff --git a/cli_test/test_helpers.go b/cli_test/test_helpers.go index d67bce19..6e2553fc 100644 --- a/cli_test/test_helpers.go +++ b/cli_test/test_helpers.go @@ -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 ( diff --git a/cmd/fnsad/cmd/root.go b/cmd/fnsad/cmd/root.go index 4537392a..f864b93a 100644 --- a/cmd/fnsad/cmd/root.go +++ b/cmd/fnsad/cmd/root.go @@ -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 ( diff --git a/cmd/fnsad/cmd/testnet_test.go b/cmd/fnsad/cmd/testnet_test.go index 7d304378..286248f7 100644 --- a/cmd/fnsad/cmd/testnet_test.go +++ b/cmd/fnsad/cmd/testnet_test.go @@ -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) { diff --git a/cmd/fnsad/main.go b/cmd/fnsad/main.go index e91e29bc..b6c0593c 100644 --- a/cmd/fnsad/main.go +++ b/cmd/fnsad/main.go @@ -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() { diff --git a/go.mod b/go.mod index cf817a1c..bfb59f52 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Finschia/finschia/v3 +module github.com/Finschia/finschia/v4 go 1.20 diff --git a/interchaintest/go.mod b/interchaintest/go.mod index 7958d33f..c3402031 100644 --- a/interchaintest/go.mod +++ b/interchaintest/go.mod @@ -1,4 +1,4 @@ -module github.com/Finschia/finschia/v3/interchaintest +module github.com/Finschia/finschia/v4/interchaintest go 1.20