Merge pull request #250 from persistenceOne/chore/prepare-v10

chore: v10 dependencies
persistenceOne · Oct 23, 2023 · 78140b1 · 78140b1
2 parents 98958ac + a7ee724
commit 78140b1
Show file tree

Hide file tree

Showing 36 changed files with 60 additions and 52 deletions.
diff --git a/app/app.go b/app/app.go
@@ -55,18 +55,16 @@ import (
 	pobabci "github.com/skip-mev/pob/abci"
 	"github.com/skip-mev/pob/mempool"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/keepers"
-	"github.com/persistenceOne/persistenceCore/v9/app/upgrades"
-	v9 "github.com/persistenceOne/persistenceCore/v9/app/upgrades/v9"
-	v9_1_0 "github.com/persistenceOne/persistenceCore/v9/app/upgrades/v9.1.0"
-	v9_2_0 "github.com/persistenceOne/persistenceCore/v9/app/upgrades/v9.2.0"
+	"github.com/persistenceOne/persistenceCore/v10/app/keepers"
+	"github.com/persistenceOne/persistenceCore/v10/app/upgrades"
+	v10 "github.com/persistenceOne/persistenceCore/v10/app/upgrades/v10"
+	v9_2_0 "github.com/persistenceOne/persistenceCore/v10/app/upgrades/v9.2.0"
 )
 
 var (
 	DefaultNodeHome string
-	//Upgrades        = []upgrades.Upgrade{v9.Upgrade, v9_1_0.Upgrade}
-	UpgradesMainnet = []upgrades.Upgrade{v9.Upgrade, v9_1_0.Upgrade}
-	UpgradesTestnet = []upgrades.Upgrade{v9_2_0.Upgrade}
+	UpgradesMainnet = []upgrades.Upgrade{v10.Upgrade}
+	UpgradesTestnet = []upgrades.Upgrade{v10.Upgrade}
 	ModuleBasics    = module.NewBasicManager(keepers.AppModuleBasics...)
 )
 

diff --git a/app/encoding.go b/app/encoding.go
@@ -11,7 +11,7 @@ import (
 	sdkslashing "github.com/cosmos/cosmos-sdk/x/slashing"
 	sdkstaking "github.com/cosmos/cosmos-sdk/x/staking"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/params"
+	"github.com/persistenceOne/persistenceCore/v10/app/params"
 )
 
 // MakeEncodingConfig creates an EncodingConfig for testing

diff --git a/app/genesis.go b/app/genesis.go
@@ -8,7 +8,7 @@ package app
 import (
 	"encoding/json"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/params"
+	"github.com/persistenceOne/persistenceCore/v10/app/params"
 )
 
 // GenesisState of the blockchain is represented here as a map of raw json

diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -82,13 +82,14 @@ import (
 	interchainquerytypes "github.com/persistenceOne/persistence-sdk/v2/x/interchainquery/types"
 	oraclekeeper "github.com/persistenceOne/persistence-sdk/v2/x/oracle/keeper"
 	oracletypes "github.com/persistenceOne/persistence-sdk/v2/x/oracle/types"
-	"github.com/persistenceOne/persistenceCore/v9/wasmbindings"
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc"
 	liquidstakeibckeeper "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/keeper"
 	liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types"
 	builderkeeper "github.com/skip-mev/pob/x/builder/keeper"
 	buildertypes "github.com/skip-mev/pob/x/builder/types"
 
+	"github.com/persistenceOne/persistenceCore/v10/wasmbindings"
+
 	// unnamed import of statik for swagger UI support
 	_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
 	"github.com/cosmos/cosmos-sdk/client/flags"

diff --git a/app/modules.go b/app/modules.go
@@ -62,7 +62,7 @@ import (
 	"github.com/skip-mev/pob/x/builder"
 	buildertypes "github.com/skip-mev/pob/x/builder/types"
 
-	appparams "github.com/persistenceOne/persistenceCore/v9/app/params"
+	appparams "github.com/persistenceOne/persistenceCore/v10/app/params"
 )
 
 var ModuleAccountPermissions = map[string][]string{

diff --git a/app/upgrades/types.go b/app/upgrades/types.go
@@ -6,7 +6,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/keepers"
+	"github.com/persistenceOne/persistenceCore/v10/app/keepers"
 )
 
 type UpgradeHandlerArgs struct {

diff --git a/app/upgrades/v10/constants.go b/app/upgrades/v10/constants.go
@@ -3,7 +3,7 @@ package v10
 import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/upgrades"
+	"github.com/persistenceOne/persistenceCore/v10/app/upgrades"
 )
 
 const (

diff --git a/app/upgrades/v10/upgrades.go b/app/upgrades/v10/upgrades.go
@@ -5,7 +5,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/upgrades"
+	"github.com/persistenceOne/persistenceCore/v10/app/upgrades"
 )
 
 func CreateUpgradeHandler(args upgrades.UpgradeHandlerArgs) upgradetypes.UpgradeHandler {

diff --git a/app/upgrades/v7/constants.go b/app/upgrades/v7/constants.go
@@ -3,7 +3,7 @@ package v7
 import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/upgrades"
+	"github.com/persistenceOne/persistenceCore/v10/app/upgrades"
 )
 
 const (

diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go
@@ -5,7 +5,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/upgrades"
+	"github.com/persistenceOne/persistenceCore/v10/app/upgrades"
 )
 
 func CreateUpgradeHandler(args upgrades.UpgradeHandlerArgs) upgradetypes.UpgradeHandler {

diff --git a/app/upgrades/v8.1.0/constants.go b/app/upgrades/v8.1.0/constants.go
@@ -3,7 +3,7 @@ package v8_1_0
 import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/upgrades"
+	"github.com/persistenceOne/persistenceCore/v10/app/upgrades"
 )
 
 const (

diff --git a/app/upgrades/v8.1.0/upgrades.go b/app/upgrades/v8.1.0/upgrades.go
@@ -5,7 +5,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/upgrades"
+	"github.com/persistenceOne/persistenceCore/v10/app/upgrades"
 )
 
 func CreateUpgradeHandler(args upgrades.UpgradeHandlerArgs) upgradetypes.UpgradeHandler {

diff --git a/app/upgrades/v8/constants.go b/app/upgrades/v8/constants.go
@@ -12,7 +12,7 @@ import (
 	liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types"
 	buildertypes "github.com/skip-mev/pob/x/builder/types"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/upgrades"
+	"github.com/persistenceOne/persistenceCore/v10/app/upgrades"
 )
 
 const (

diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go
@@ -17,8 +17,8 @@ import (
 	lscosmostypes "github.com/persistenceOne/pstake-native/v2/x/lscosmos/types"
 	buildertypes "github.com/skip-mev/pob/x/builder/types"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/keepers"
-	"github.com/persistenceOne/persistenceCore/v9/app/upgrades"
+	"github.com/persistenceOne/persistenceCore/v10/app/keepers"
+	"github.com/persistenceOne/persistenceCore/v10/app/upgrades"
 )
 
 func setInitialMinCommissionRate(ctx sdk.Context, keepers *keepers.AppKeepers) error {

diff --git a/app/upgrades/v9.1.0/constants.go b/app/upgrades/v9.1.0/constants.go
@@ -3,7 +3,7 @@ package v9_1_0
 import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/upgrades"
+	"github.com/persistenceOne/persistenceCore/v10/app/upgrades"
 )
 
 const (

diff --git a/app/upgrades/v9.1.0/upgrades.go b/app/upgrades/v9.1.0/upgrades.go
@@ -5,7 +5,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/upgrades"
+	"github.com/persistenceOne/persistenceCore/v10/app/upgrades"
 )
 
 func CreateUpgradeHandler(args upgrades.UpgradeHandlerArgs) upgradetypes.UpgradeHandler {

diff --git a/app/upgrades/v9.2.0/constants.go b/app/upgrades/v9.2.0/constants.go
@@ -3,7 +3,7 @@ package v9_2_0
 import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/upgrades"
+	"github.com/persistenceOne/persistenceCore/v10/app/upgrades"
 )
 
 const (

diff --git a/app/upgrades/v9.2.0/upgrades.go b/app/upgrades/v9.2.0/upgrades.go
@@ -10,7 +10,7 @@ import (
 	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/upgrades"
+	"github.com/persistenceOne/persistenceCore/v10/app/upgrades"
 )
 
 func CreateUpgradeHandler(args upgrades.UpgradeHandlerArgs) upgradetypes.UpgradeHandler {

diff --git a/app/upgrades/v9.2.0/upgrades_test.go b/app/upgrades/v9.2.0/upgrades_test.go
@@ -5,10 +5,11 @@ package v9_2_0_test
 
 import (
 	"fmt"
-	v9_2_0 "github.com/persistenceOne/persistenceCore/v9/app/upgrades/v9.2.0"
 	"os"
 	"testing"
 
+	v9_2_0 "github.com/persistenceOne/persistenceCore/v10/app/upgrades/v9.2.0"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/CosmWasm/wasmd/x/wasm"
@@ -24,8 +25,9 @@ import (
 	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	"github.com/cosmos/cosmos-sdk/x/crisis"
 	oracletypes "github.com/persistenceOne/persistence-sdk/v2/x/oracle/types"
-	"github.com/persistenceOne/persistenceCore/v9/app"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/persistenceOne/persistenceCore/v10/app"
 )
 
 type KeeperTestHelper struct {

diff --git a/app/upgrades/v9/constants.go b/app/upgrades/v9/constants.go
@@ -4,7 +4,7 @@ import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
 	lscosmostypes "github.com/persistenceOne/pstake-native/v2/x/lscosmos/types"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/upgrades"
+	"github.com/persistenceOne/persistenceCore/v10/app/upgrades"
 )
 
 const (

diff --git a/app/upgrades/v9/upgrades.go b/app/upgrades/v9/upgrades.go
@@ -5,7 +5,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/persistenceOne/persistenceCore/v9/app/upgrades"
+	"github.com/persistenceOne/persistenceCore/v10/app/upgrades"
 )
 
 func CreateUpgradeHandler(args upgrades.UpgradeHandlerArgs) upgradetypes.UpgradeHandler {

diff --git a/cmd/persistenceCore/cmd/root.go b/cmd/persistenceCore/cmd/root.go
@@ -33,8 +33,8 @@ import (
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 
-	"github.com/persistenceOne/persistenceCore/v9/app"
-	"github.com/persistenceOne/persistenceCore/v9/app/params"
+	"github.com/persistenceOne/persistenceCore/v10/app"
+	"github.com/persistenceOne/persistenceCore/v10/app/params"
 )
 
 const flagInvalidCheckPeriod = "invalid-check-period"

diff --git a/cmd/persistenceCore/cmd/testnet.go b/cmd/persistenceCore/cmd/testnet.go
@@ -40,7 +40,7 @@ import (
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"github.com/persistenceOne/persistenceCore/v9/app"
+	"github.com/persistenceOne/persistenceCore/v10/app"
 )
 
 var (

diff --git a/cmd/persistenceCore/cmd/testnet_test.go b/cmd/persistenceCore/cmd/testnet_test.go
@@ -19,7 +19,7 @@ import (
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 
-	"github.com/persistenceOne/persistenceCore/v9/app"
+	"github.com/persistenceOne/persistenceCore/v10/app"
 )
 
 func TestTestnetCmd(t *testing.T) {

diff --git a/cmd/persistenceCore/main.go b/cmd/persistenceCore/main.go
@@ -11,8 +11,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/server"
 	servercmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
-	"github.com/persistenceOne/persistenceCore/v9/app"
-	"github.com/persistenceOne/persistenceCore/v9/cmd/persistenceCore/cmd"
+	"github.com/persistenceOne/persistenceCore/v10/app"
+	"github.com/persistenceOne/persistenceCore/v10/cmd/persistenceCore/cmd"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/persistenceOne/persistenceCore/v9
+module github.com/persistenceOne/persistenceCore/v10
 
 go 1.21
 

diff --git a/interchaintest/chain_upgrade_test.go b/interchaintest/chain_upgrade_test.go
@@ -11,13 +11,14 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-	"github.com/persistenceOne/persistenceCore/v9/interchaintest/helpers"
 	"github.com/strangelove-ventures/interchaintest/v7"
 	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v7/ibc"
 	"github.com/strangelove-ventures/interchaintest/v7/testutil"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
+
+	"github.com/persistenceOne/persistenceCore/v10/interchaintest/helpers"
 )
 
 const (
@@ -29,9 +30,9 @@ func TestPersistenceUpgradeBasic(t *testing.T) {
 	var (
 		chainName            = "persistence"
 		upgradeRepo          = PersistenceCoreImage.Repository
-		initialVersion       = "v9.1.0"
+		initialVersion       = "v9.2.0"
 		upgradeBranchVersion = PersistenceCoreImage.Version
-		upgradeName          = "v9.2.0"
+		upgradeName          = "v10"
 	)
 
 	CosmosChainUpgradeTest(

diff --git a/interchaintest/go.mod b/interchaintest/go.mod
@@ -1,4 +1,4 @@
-module github.com/persistenceOne/persistenceCore/v9/interchaintest
+module github.com/persistenceOne/persistenceCore/v10/interchaintest
 
 go 1.21
 

diff --git a/interchaintest/lsm_bond_tokenize_test.go b/interchaintest/lsm_bond_tokenize_test.go
@@ -4,12 +4,13 @@ import (
 	"context"
 	"testing"
 
+	"github.com/strangelove-ventures/interchaintest/v7"
 	"github.com/stretchr/testify/require"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/persistenceOne/persistenceCore/v9/interchaintest/helpers"
-	"github.com/strangelove-ventures/interchaintest/v7"
 	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
+
+	"github.com/persistenceOne/persistenceCore/v10/interchaintest/helpers"
 )
 
 // TestBondTokenize executes scenario of bonding and tokenizing.

diff --git a/interchaintest/lsm_halt_fork_test.go b/interchaintest/lsm_halt_fork_test.go
@@ -8,13 +8,14 @@ import (
 
 	"cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/persistenceOne/persistenceCore/v9/interchaintest/helpers"
 	"github.com/strangelove-ventures/interchaintest/v7"
 	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v7/ibc"
 	"github.com/strangelove-ventures/interchaintest/v7/testutil"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
+
+	"github.com/persistenceOne/persistenceCore/v10/interchaintest/helpers"
 )
 
 func TestPersistenceLSMHaltFork(t *testing.T) {

diff --git a/interchaintest/lsm_multi_tokenize_vote_test.go b/interchaintest/lsm_multi_tokenize_vote_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
 	"github.com/stretchr/testify/require"
 
-	"github.com/persistenceOne/persistenceCore/v9/interchaintest/helpers"
+	"github.com/persistenceOne/persistenceCore/v10/interchaintest/helpers"
 )
 
 // TestMultiTokenizeVote case checks what happens with a voting tally when two

diff --git a/interchaintest/lsm_tokenize_send_vote_test.go b/interchaintest/lsm_tokenize_send_vote_test.go
@@ -5,13 +5,14 @@ import (
 	"testing"
 
 	"cosmossdk.io/math"
+	"github.com/strangelove-ventures/interchaintest/v7"
 	"github.com/stretchr/testify/require"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/persistenceOne/persistenceCore/v9/interchaintest/helpers"
-	"github.com/strangelove-ventures/interchaintest/v7"
 	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v7/ibc"
+
+	"github.com/persistenceOne/persistenceCore/v10/interchaintest/helpers"
 )
 
 // TestTokenizeSendVote checks that once shares are tokenized, the tokens can be

diff --git a/interchaintest/module_ibchooks_test.go b/interchaintest/module_ibchooks_test.go
@@ -7,7 +7,6 @@ import (
 	"testing"
 
 	"cosmossdk.io/math"
-	"github.com/persistenceOne/persistenceCore/v9/interchaintest/helpers"
 	"github.com/strangelove-ventures/interchaintest/v7"
 	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v7/ibc"
@@ -16,6 +15,8 @@ import (
 	"github.com/strangelove-ventures/interchaintest/v7/testutil"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
+
+	"github.com/persistenceOne/persistenceCore/v10/interchaintest/helpers"
 )
 
 // TestPersistenceIBCHooks ensures the ibc-hooks middleware from osmosis works.