From 1dd4f8400486c52ea66c1c30b10b703d072e15da Mon Sep 17 00:00:00 2001 From: zemyblue Date: Tue, 27 Feb 2024 18:41:59 +0900 Subject: [PATCH 1/5] chore: rename namespace to v3 Signed-off-by: zemyblue --- ante/ante_test.go | 4 ++-- app/app.go | 6 +++--- 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 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ante/ante_test.go b/ante/ante_test.go index 9e6a184c..05cc7494 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/v2/app" - linkhelpers "github.com/Finschia/finschia/v2/app/helpers" + linkapp "github.com/Finschia/finschia/v3/app" + linkhelpers "github.com/Finschia/finschia/v3/app/helpers" ) type IntegrationTestSuite struct { diff --git a/app/app.go b/app/app.go index 28a9962c..ae6e3ffd 100644 --- a/app/app.go +++ b/app/app.go @@ -123,9 +123,9 @@ import ( wasmpluskeeper "github.com/Finschia/wasmd/x/wasmplus/keeper" wasmplustypes "github.com/Finschia/wasmd/x/wasmplus/types" - appante "github.com/Finschia/finschia/v2/ante" - appparams "github.com/Finschia/finschia/v2/app/params" - _ "github.com/Finschia/finschia/v2/client/docs/statik" // unnamed import of statik for swagger UI support + 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 ) const appName = "Finschia" diff --git a/app/encoding.go b/app/encoding.go index 166dece4..e09ebc3d 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/v2/app/params" + "github.com/Finschia/finschia/v3/app/params" ) // MakeEncodingConfig creates an EncodingConfig for testing diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go index 46388149..fd475437 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/v2/app" + linkapp "github.com/Finschia/finschia/v3/app" ) // SimAppChainID hardcoded chainID for simulation diff --git a/cli_test/cli_test.go b/cli_test/cli_test.go index dacfb154..7956bdcf 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/v2/app" + "github.com/Finschia/finschia/v3/app" ) func TestFnsadKeysAddMultisig(t *testing.T) { diff --git a/cli_test/multi_test.go b/cli_test/multi_test.go index db29bdaf..996eaab6 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/v2/app" + "github.com/Finschia/finschia/v3/app" ) func TestMultiValidatorAndSendTokens(t *testing.T) { diff --git a/cli_test/test_helpers.go b/cli_test/test_helpers.go index 56c20fad..d67bce19 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/v2/app" - fnsacmd "github.com/Finschia/finschia/v2/cmd/fnsad/cmd" - fnsatypes "github.com/Finschia/finschia/v2/types" + "github.com/Finschia/finschia/v3/app" + fnsacmd "github.com/Finschia/finschia/v3/cmd/fnsad/cmd" + fnsatypes "github.com/Finschia/finschia/v3/types" ) const ( diff --git a/cmd/fnsad/cmd/root.go b/cmd/fnsad/cmd/root.go index 0abaa1f8..4537392a 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/v2/app" - "github.com/Finschia/finschia/v2/app/params" - fnsatypes "github.com/Finschia/finschia/v2/types" + "github.com/Finschia/finschia/v3/app" + "github.com/Finschia/finschia/v3/app/params" + fnsatypes "github.com/Finschia/finschia/v3/types" ) const ( diff --git a/cmd/fnsad/cmd/testnet_test.go b/cmd/fnsad/cmd/testnet_test.go index d0eae1a9..7d304378 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/v2/app" + "github.com/Finschia/finschia/v3/app" ) func Test_TestnetCmd(t *testing.T) { diff --git a/cmd/fnsad/main.go b/cmd/fnsad/main.go index 0aa274cd..e91e29bc 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/v2/app" - "github.com/Finschia/finschia/v2/cmd/fnsad/cmd" + "github.com/Finschia/finschia/v3/app" + "github.com/Finschia/finschia/v3/cmd/fnsad/cmd" ) func main() { diff --git a/go.mod b/go.mod index f4007e11..79489968 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Finschia/finschia/v2 +module github.com/Finschia/finschia/v3 go 1.20 From 3af6f4ac7ea25d447972f9b2b7164502bc6b9899 Mon Sep 17 00:00:00 2001 From: zemyblue Date: Tue, 27 Feb 2024 18:46:05 +0900 Subject: [PATCH 2/5] chore: change upgrade name to `v3-Rose` Signed-off-by: zemyblue --- app/app.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/app.go b/app/app.go index ae6e3ffd..fc3c5167 100644 --- a/app/app.go +++ b/app/app.go @@ -129,7 +129,7 @@ import ( ) const appName = "Finschia" -const upgradeName = "v2-Daisy" +const upgradeName = "v3-Rose" var ( // DefaultNodeHome default home directories for the application daemon From 712db51dfd56db8fd920a18b78e7d8bf4ba4281d Mon Sep 17 00:00:00 2001 From: zemyblue Date: Tue, 27 Feb 2024 18:59:26 +0900 Subject: [PATCH 3/5] chore: update changelog Signed-off-by: zemyblue --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 345b7e04..73e045fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## [Unreleased] ### Features +* (build) [\#329](https://github.com/Finschia/finschia/pull/329) rename namespace to v2 ### Improvements * (improvements) [\#230](https://github.com/Finschia/finschia/pull/230) fix Makefile for format and execute make format #230 From 9ac70f3a600dd0d9138e25dfe3eb070dc4b74291 Mon Sep 17 00:00:00 2001 From: zemyblue Date: Tue, 27 Feb 2024 22:33:22 +0900 Subject: [PATCH 4/5] Update CHANGELOG.md Co-authored-by: 170210 <85928898+170210@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73e045fb..df0b798d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,7 +37,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## [Unreleased] ### Features -* (build) [\#329](https://github.com/Finschia/finschia/pull/329) rename namespace to v2 +* (build) [\#329](https://github.com/Finschia/finschia/pull/329) rename namespace to v3 ### Improvements * (improvements) [\#230](https://github.com/Finschia/finschia/pull/230) fix Makefile for format and execute make format #230 From c4db428a4ab05eb795d1c5114ffa30172aa9ec09 Mon Sep 17 00:00:00 2001 From: zemyblue Date: Wed, 28 Feb 2024 17:58:47 +0900 Subject: [PATCH 5/5] chore: rename namespace to v3 in the interchaintest Signed-off-by: zemyblue --- interchaintest/go.mod | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interchaintest/go.mod b/interchaintest/go.mod index f1e88798..7958d33f 100644 --- a/interchaintest/go.mod +++ b/interchaintest/go.mod @@ -1,4 +1,4 @@ -module github.com/Finschia/finschia/v2/interchaintest +module github.com/Finschia/finschia/v3/interchaintest go 1.20 @@ -10,10 +10,7 @@ replace ( ) require ( - github.com/cosmos/cosmos-sdk v0.47.5 - github.com/cosmos/ibc-go/v7 v7.3.0 github.com/strangelove-ventures/interchaintest/v7 v7.0.0 - github.com/stretchr/testify v1.8.4 go.uber.org/zap v1.26.0 ) @@ -61,11 +58,13 @@ require ( github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.3 // indirect + github.com/cosmos/cosmos-sdk v0.47.5 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/gogoproto v1.4.10 // indirect github.com/cosmos/iavl v0.20.0 // indirect github.com/cosmos/ibc-go/modules/capability v1.0.0-rc1 // indirect + github.com/cosmos/ibc-go/v7 v7.3.0 // indirect github.com/cosmos/ics23/go v0.10.0 // indirect github.com/cosmos/interchain-security/v3 v3.1.1-0.20231102122221-81650a84f989 // indirect github.com/cosmos/ledger-cosmos-go v0.13.0 // indirect @@ -190,6 +189,7 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.16.0 // indirect + github.com/stretchr/testify v1.8.4 // indirect github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect