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.

Sign up for GitHub

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

chore: v10 dependencies #249

Closed
wants to merge 2 commits into from
Closed

chore: v10 dependencies #249

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c81abe2
v10 dependencies
kruspy Oct 23, 2023
b268ecd
upgrade test
kruspy Oct 23, 2023
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
14 changes: 6 additions & 8 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...)
)

Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion app/keepers/keepers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/modules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v10/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v10/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v7/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v7/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v8.1.0/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v8.1.0/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v8/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v8/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v9.1.0/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v9.1.0/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v9.2.0/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v9.2.0/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 4 additions & 2 deletions app/upgrades/v9.2.0/upgrades_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v9/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v9/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions cmd/persistenceCore/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/persistenceCore/cmd/testnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion cmd/persistenceCore/cmd/testnet_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/persistenceCore/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/persistenceOne/persistenceCore/v9
module github.com/persistenceOne/persistenceCore/v10

go 1.21

Expand Down
3 changes: 2 additions & 1 deletion interchaintest/chain_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion interchaintest/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/persistenceOne/persistenceCore/v9/interchaintest
module github.com/persistenceOne/persistenceCore/v10/interchaintest

go 1.21

Expand Down
5 changes: 3 additions & 2 deletions interchaintest/lsm_bond_tokenize_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion interchaintest/lsm_halt_fork_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion interchaintest/lsm_multi_tokenize_vote_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions interchaintest/lsm_tokenize_send_vote_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion interchaintest/module_ibchooks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion interchaintest/module_pfm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/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"
Expand All @@ -19,6 +18,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"
)

type PacketMetadata struct {
Expand Down
Loading
Loading