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

chore: prepare v11.13.0-rc0 for testnet #336

Merged
merged 5 commits into from
May 30, 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
4 changes: 2 additions & 2 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ import (

"github.com/persistenceOne/persistenceCore/v11/app/keepers"
"github.com/persistenceOne/persistenceCore/v11/app/upgrades"
v11_12_0 "github.com/persistenceOne/persistenceCore/v11/app/upgrades/v11.12.0"
v11_13_0_rc0 "github.com/persistenceOne/persistenceCore/v11/app/upgrades/testnet/v11.13.0-rc0"
"github.com/persistenceOne/persistenceCore/v11/client/docs"
)

var (
DefaultNodeHome string
Upgrades = []upgrades.Upgrade{v11_12_0.Upgrade}
Upgrades = []upgrades.Upgrade{v11_13_0_rc0.Upgrade}
ModuleBasics = module.NewBasicManager(keepers.AppModuleBasics...)
)

Expand Down
18 changes: 18 additions & 0 deletions app/upgrades/testnet/v11.13.0-rc0/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package v11_13_0_rc0

import (
store "github.com/cosmos/cosmos-sdk/store/types"

"github.com/persistenceOne/persistenceCore/v11/app/upgrades"
)

const (
// UpgradeName defines the on-chain upgrade name.
UpgradeName = "v11.13.0-rc0"
)

var Upgrade = upgrades.Upgrade{
UpgradeName: UpgradeName,
CreateUpgradeHandler: CreateUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}
15 changes: 15 additions & 0 deletions app/upgrades/testnet/v11.13.0-rc0/upgrades.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package v11_13_0_rc0

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/persistenceOne/persistenceCore/v11/app/upgrades"
)

func CreateUpgradeHandler(args upgrades.UpgradeHandlerArgs) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
ctx.Logger().Info("running module migrations...")
return args.ModuleManager.RunMigrations(ctx, args.Configurator, vm)
}
}
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/cosmos/ibc-go/v7 v7.4.0
github.com/gorilla/mux v1.8.1
github.com/persistenceOne/persistence-sdk/v2 v2.2.0
github.com/persistenceOne/pstake-native/v2 v2.14.0
github.com/persistenceOne/pstake-native/v2 v2.15.0-rc1
github.com/prometheus/client_golang v1.16.0
github.com/skip-mev/pob v1.0.5
github.com/spf13/cast v1.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1034,8 +1034,8 @@ github.com/persistenceOne/cosmos-sdk v0.47.10-lsm-rc0 h1:lbSQZUdaaKIpoSAznVESl0v
github.com/persistenceOne/cosmos-sdk v0.47.10-lsm-rc0/go.mod h1:Q/eHvXB0Awenk3NCh77NvjpeKGPigawFHIXlz2ayfos=
github.com/persistenceOne/persistence-sdk/v2 v2.2.0 h1:ZsBsy/HElkwjPXoASI7CptMFY9C3C/d27G+8bxFDzQw=
github.com/persistenceOne/persistence-sdk/v2 v2.2.0/go.mod h1:8VgozZWTPLMdlzsyiuGI0+vLo2fvGYSj/YKM9kiJwrI=
github.com/persistenceOne/pstake-native/v2 v2.14.0 h1:3FghzZZFA1UX/UrZNiVh5kPX2CSQUxZihZ5l80VWhms=
github.com/persistenceOne/pstake-native/v2 v2.14.0/go.mod h1:FcLbnTasZfKKKQJ6nzgzdkDqb3dUlIyraqcsj7DMTfE=
github.com/persistenceOne/pstake-native/v2 v2.15.0-rc1 h1:kOJ8E/N9QPFbH2JaoDrhlnwP88o9NZ7Mp44KAiBdNN8=
github.com/persistenceOne/pstake-native/v2 v2.15.0-rc1/go.mod h1:FcLbnTasZfKKKQJ6nzgzdkDqb3dUlIyraqcsj7DMTfE=
github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
Expand Down
4 changes: 2 additions & 2 deletions interchaintest/chain_upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ const (
func TestPersistenceUpgradeBasic(t *testing.T) {
var (
chainName = "persistence"
initialVersion = "v11.11.0"
upgradeName = "v11.12.0"
initialVersion = "v11.12.0"
upgradeName = "v11.13.0-rc0"
upgradeRepo = PersistenceCoreImage.Repository
upgradeBranchVersion = PersistenceCoreImage.Version
)
Expand Down
5 changes: 2 additions & 3 deletions interchaintest/liquidstake_stkxprt_globalcap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ package interchaintest

import (
"context"
"encoding/json"
"testing"

"cosmossdk.io/math"
"encoding/json"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
Expand All @@ -15,6 +13,7 @@ import (
"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v7/testutil"
"github.com/stretchr/testify/require"
"testing"

"github.com/persistenceOne/persistenceCore/v11/interchaintest/helpers"
)
Expand Down
9 changes: 3 additions & 6 deletions interchaintest/liquidstake_stkxprt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,20 @@ package interchaintest

import (
"context"
"encoding/json"
"testing"

"cosmossdk.io/math"
"encoding/json"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
"github.com/persistenceOne/persistenceCore/v11/interchaintest/helpers"
liquidstaketypes "github.com/persistenceOne/pstake-native/v2/x/liquidstake/types"
"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"

"github.com/persistenceOne/persistenceCore/v11/interchaintest/helpers"
"testing"
)

// TestLiquidStakeStkXPRT runs the flow of liquid XPRT staking using
Expand Down Expand Up @@ -155,7 +153,6 @@ func TestLiquidStakeStkXPRT(t *testing.T) {
)
require.NoError(t, err, "error submitting liquidstake validators whitelist update tx")
require.Equal(t, uint32(0), txResp.Code, txResp.RawLog)

// Liquid stake XPRT from the first user (5 XPRT)

firstUserLiquidStakeAmount := sdk.NewInt(5_000_000)
Expand Down
Loading