Skip to content

Commit 8d68ae2

Browse files
authored
chore: prepare v11.13.0-rc0 for testnet (#336)
* prepare v11.13.0-rc0 for testnet * update tests, by reducing rebalancing epoch * add sleep before staking * update go.mod * refix interchain test.
1 parent de4841e commit 8d68ae2

File tree

8 files changed

+45
-16
lines changed

8 files changed

+45
-16
lines changed

app/app.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ import (
5656

5757
"github.com/persistenceOne/persistenceCore/v11/app/keepers"
5858
"github.com/persistenceOne/persistenceCore/v11/app/upgrades"
59-
v11_12_0 "github.com/persistenceOne/persistenceCore/v11/app/upgrades/v11.12.0"
59+
v11_13_0_rc0 "github.com/persistenceOne/persistenceCore/v11/app/upgrades/testnet/v11.13.0-rc0"
6060
"github.com/persistenceOne/persistenceCore/v11/client/docs"
6161
)
6262

6363
var (
6464
DefaultNodeHome string
65-
Upgrades = []upgrades.Upgrade{v11_12_0.Upgrade}
65+
Upgrades = []upgrades.Upgrade{v11_13_0_rc0.Upgrade}
6666
ModuleBasics = module.NewBasicManager(keepers.AppModuleBasics...)
6767
)
6868

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package v11_13_0_rc0
2+
3+
import (
4+
store "github.com/cosmos/cosmos-sdk/store/types"
5+
6+
"github.com/persistenceOne/persistenceCore/v11/app/upgrades"
7+
)
8+
9+
const (
10+
// UpgradeName defines the on-chain upgrade name.
11+
UpgradeName = "v11.13.0-rc0"
12+
)
13+
14+
var Upgrade = upgrades.Upgrade{
15+
UpgradeName: UpgradeName,
16+
CreateUpgradeHandler: CreateUpgradeHandler,
17+
StoreUpgrades: store.StoreUpgrades{},
18+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package v11_13_0_rc0
2+
3+
import (
4+
sdk "github.com/cosmos/cosmos-sdk/types"
5+
"github.com/cosmos/cosmos-sdk/types/module"
6+
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
7+
"github.com/persistenceOne/persistenceCore/v11/app/upgrades"
8+
)
9+
10+
func CreateUpgradeHandler(args upgrades.UpgradeHandlerArgs) upgradetypes.UpgradeHandler {
11+
return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
12+
ctx.Logger().Info("running module migrations...")
13+
return args.ModuleManager.RunMigrations(ctx, args.Configurator, vm)
14+
}
15+
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/cosmos/ibc-go/v7 v7.4.0
1717
github.com/gorilla/mux v1.8.1
1818
github.com/persistenceOne/persistence-sdk/v2 v2.2.0
19-
github.com/persistenceOne/pstake-native/v2 v2.14.0
19+
github.com/persistenceOne/pstake-native/v2 v2.15.0-rc1
2020
github.com/prometheus/client_golang v1.16.0
2121
github.com/skip-mev/pob v1.0.5
2222
github.com/spf13/cast v1.6.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,8 +1034,8 @@ github.com/persistenceOne/cosmos-sdk v0.47.10-lsm-rc0 h1:lbSQZUdaaKIpoSAznVESl0v
10341034
github.com/persistenceOne/cosmos-sdk v0.47.10-lsm-rc0/go.mod h1:Q/eHvXB0Awenk3NCh77NvjpeKGPigawFHIXlz2ayfos=
10351035
github.com/persistenceOne/persistence-sdk/v2 v2.2.0 h1:ZsBsy/HElkwjPXoASI7CptMFY9C3C/d27G+8bxFDzQw=
10361036
github.com/persistenceOne/persistence-sdk/v2 v2.2.0/go.mod h1:8VgozZWTPLMdlzsyiuGI0+vLo2fvGYSj/YKM9kiJwrI=
1037-
github.com/persistenceOne/pstake-native/v2 v2.14.0 h1:3FghzZZFA1UX/UrZNiVh5kPX2CSQUxZihZ5l80VWhms=
1038-
github.com/persistenceOne/pstake-native/v2 v2.14.0/go.mod h1:FcLbnTasZfKKKQJ6nzgzdkDqb3dUlIyraqcsj7DMTfE=
1037+
github.com/persistenceOne/pstake-native/v2 v2.15.0-rc1 h1:kOJ8E/N9QPFbH2JaoDrhlnwP88o9NZ7Mp44KAiBdNN8=
1038+
github.com/persistenceOne/pstake-native/v2 v2.15.0-rc1/go.mod h1:FcLbnTasZfKKKQJ6nzgzdkDqb3dUlIyraqcsj7DMTfE=
10391039
github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
10401040
github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
10411041
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=

interchaintest/chain_upgrade_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ const (
2929
func TestPersistenceUpgradeBasic(t *testing.T) {
3030
var (
3131
chainName = "persistence"
32-
initialVersion = "v11.11.0"
33-
upgradeName = "v11.12.0"
32+
initialVersion = "v11.12.0"
33+
upgradeName = "v11.13.0-rc0"
3434
upgradeRepo = PersistenceCoreImage.Repository
3535
upgradeBranchVersion = PersistenceCoreImage.Version
3636
)

interchaintest/liquidstake_stkxprt_globalcap_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ package interchaintest
22

33
import (
44
"context"
5-
"encoding/json"
6-
"testing"
7-
85
"cosmossdk.io/math"
6+
"encoding/json"
97
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
108
sdk "github.com/cosmos/cosmos-sdk/types"
119
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -15,6 +13,7 @@ import (
1513
"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
1614
"github.com/strangelove-ventures/interchaintest/v7/testutil"
1715
"github.com/stretchr/testify/require"
16+
"testing"
1817

1918
"github.com/persistenceOne/persistenceCore/v11/interchaintest/helpers"
2019
)

interchaintest/liquidstake_stkxprt_test.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,20 @@ package interchaintest
22

33
import (
44
"context"
5-
"encoding/json"
6-
"testing"
7-
85
"cosmossdk.io/math"
6+
"encoding/json"
97
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
108
sdk "github.com/cosmos/cosmos-sdk/types"
119
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
1210
govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
11+
"github.com/persistenceOne/persistenceCore/v11/interchaintest/helpers"
1312
liquidstaketypes "github.com/persistenceOne/pstake-native/v2/x/liquidstake/types"
1413
"github.com/strangelove-ventures/interchaintest/v7"
1514
"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
1615
"github.com/strangelove-ventures/interchaintest/v7/ibc"
1716
"github.com/strangelove-ventures/interchaintest/v7/testutil"
1817
"github.com/stretchr/testify/require"
19-
20-
"github.com/persistenceOne/persistenceCore/v11/interchaintest/helpers"
18+
"testing"
2119
)
2220

2321
// TestLiquidStakeStkXPRT runs the flow of liquid XPRT staking using
@@ -155,7 +153,6 @@ func TestLiquidStakeStkXPRT(t *testing.T) {
155153
)
156154
require.NoError(t, err, "error submitting liquidstake validators whitelist update tx")
157155
require.Equal(t, uint32(0), txResp.Code, txResp.RawLog)
158-
159156
// Liquid stake XPRT from the first user (5 XPRT)
160157

161158
firstUserLiquidStakeAmount := sdk.NewInt(5_000_000)

0 commit comments

Comments
 (0)