Skip to content

Commit 6a6fb66

Browse files
puneet2019puneet2019
authored
Merge branch 'main' into dependabot/github_actions/docker/login-action-3
2 parents df9823e + a7e05a2 commit 6a6fb66

File tree

89 files changed

+456
-635
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+456
-635
lines changed

‎app/app.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ import (
6161
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
6262
"github.com/spf13/cast"
6363

64-
"github.com/persistenceOne/persistenceCore/v16/app/constants"
65-
"github.com/persistenceOne/persistenceCore/v16/app/keepers"
66-
"github.com/persistenceOne/persistenceCore/v16/app/upgrades"
67-
v1600 "github.com/persistenceOne/persistenceCore/v16/app/upgrades/v16.0.0"
64+
"github.com/persistenceOne/persistenceCore/v17/app/constants"
65+
"github.com/persistenceOne/persistenceCore/v17/app/keepers"
66+
"github.com/persistenceOne/persistenceCore/v17/app/upgrades"
67+
v1700rc0 "github.com/persistenceOne/persistenceCore/v17/app/upgrades/testnet/v17.0.0-rc0"
6868
)
6969

7070
var (
7171
DefaultNodeHome string
72-
Upgrades = []upgrades.Upgrade{v1600.Upgrade}
72+
Upgrades = []upgrades.Upgrade{v1700rc0.Upgrade}
7373
)
7474

7575
var (

‎app/encoding.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
pobtypes "github.com/persistenceOne/persistence-sdk/v7/x/pob/types"
2121
ratesynctypes "github.com/persistenceOne/persistence-sdk/v7/x/ratesync/types"
2222

23-
"github.com/persistenceOne/persistenceCore/v16/app/params"
23+
"github.com/persistenceOne/persistenceCore/v17/app/params"
2424
)
2525

2626
// MakeEncodingConfig creates an EncodingConfig for testing

‎app/keepers/keepers.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ import (
7474
ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
7575
ibckeeper "github.com/cosmos/ibc-go/v10/modules/core/keeper"
7676
ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
77-
"github.com/persistenceOne/persistenceCore/v16/x/halving"
78-
halvingtypes "github.com/persistenceOne/persistenceCore/v16/x/halving/types"
79-
liquidstakekeeper "github.com/persistenceOne/persistenceCore/v16/x/liquidstake/keeper"
80-
liquidstaketypes "github.com/persistenceOne/persistenceCore/v16/x/liquidstake/types"
77+
"github.com/persistenceOne/persistenceCore/v17/x/halving"
78+
halvingtypes "github.com/persistenceOne/persistenceCore/v17/x/halving/types"
79+
liquidstakekeeper "github.com/persistenceOne/persistenceCore/v17/x/liquidstake/keeper"
80+
liquidstaketypes "github.com/persistenceOne/persistenceCore/v17/x/liquidstake/types"
8181
"github.com/spf13/cast"
8282

83-
"github.com/persistenceOne/persistenceCore/v16/app/constants"
84-
"github.com/persistenceOne/persistenceCore/v16/wasmbindings"
83+
"github.com/persistenceOne/persistenceCore/v17/app/constants"
84+
"github.com/persistenceOne/persistenceCore/v17/wasmbindings"
8585
)
8686

8787
type AppKeepers struct {
@@ -519,7 +519,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
519519
paramsKeeper.Subspace(authtypes.ModuleName).WithKeyTable(authtypes.ParamKeyTable())
520520
paramsKeeper.Subspace(banktypes.ModuleName).WithKeyTable(banktypes.ParamKeyTable())
521521
paramsKeeper.Subspace(stakingtypes.ModuleName).WithKeyTable(stakingtypes.ParamKeyTable())
522-
paramsKeeper.Subspace(minttypes.ModuleName).WithKeyTable(minttypes.ParamKeyTable())
522+
paramsKeeper.Subspace(minttypes.ModuleName)
523523
paramsKeeper.Subspace(distributiontypes.ModuleName).WithKeyTable(distributiontypes.ParamKeyTable())
524524
paramsKeeper.Subspace(slashingtypes.ModuleName).WithKeyTable(slashingtypes.ParamKeyTable())
525525
paramsKeeper.Subspace(crisistypes.ModuleName).WithKeyTable(crisistypes.ParamKeyTable())

‎app/keepers/keys.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
icahosttypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/host/types"
2727
ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
2828
ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
29-
"github.com/persistenceOne/persistenceCore/v16/x/halving"
30-
liquidstaketypes "github.com/persistenceOne/persistenceCore/v16/x/liquidstake/types"
29+
"github.com/persistenceOne/persistenceCore/v17/x/halving"
30+
liquidstaketypes "github.com/persistenceOne/persistenceCore/v17/x/liquidstake/types"
3131
)
3232

3333
func (appKeepers *AppKeepers) GenerateKeys() {

‎app/modules.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ import (
5555
ibc "github.com/cosmos/ibc-go/v10/modules/core"
5656
ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
5757
ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
58-
"github.com/persistenceOne/persistenceCore/v16/x/halving"
59-
"github.com/persistenceOne/persistenceCore/v16/x/liquidstake"
60-
liquidstaketypes "github.com/persistenceOne/persistenceCore/v16/x/liquidstake/types"
58+
"github.com/persistenceOne/persistenceCore/v17/x/halving"
59+
"github.com/persistenceOne/persistenceCore/v17/x/liquidstake"
60+
liquidstaketypes "github.com/persistenceOne/persistenceCore/v17/x/liquidstake/types"
6161
)
6262

6363
var ModuleAccountPermissions = map[string][]string{

‎app/params/proto.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/cosmos/cosmos-sdk/codec/types"
1313
"github.com/cosmos/cosmos-sdk/x/auth/tx"
1414
"github.com/cosmos/gogoproto/proto"
15-
"github.com/persistenceOne/persistenceCore/v16/app/constants"
15+
"github.com/persistenceOne/persistenceCore/v17/app/constants"
1616
)
1717

1818
// MakeEncodingConfig creates an EncodingConfiguration for an amino based test configuration.

‎app/test_helpers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/cosmos/cosmos-sdk/types/module/testutil"
2525
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
2626
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
27-
"github.com/persistenceOne/persistenceCore/v16/app/constants"
27+
"github.com/persistenceOne/persistenceCore/v17/app/constants"
2828
"github.com/stretchr/testify/require"
2929
)
3030

‎app/upgrades/testnet/v16.0.0-rc0/upgrades.go‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎app/upgrades/testnet/v16.0.0-rc0/upgrades_test.go‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

app/upgrades/v16.0.0/constants.go renamed to app/upgrades/testnet/v17.0.0-rc0/constants.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
package v16_0_0
1+
package v17_0_0_rc0
22

33
import (
44
store "cosmossdk.io/store/types"
5-
protocolpooltypes "github.com/cosmos/cosmos-sdk/x/protocolpool/types"
6-
7-
"github.com/persistenceOne/persistenceCore/v16/app/upgrades"
5+
"github.com/persistenceOne/persistenceCore/v17/app/upgrades"
86
)
97

108
const (
119
// UpgradeName defines the on-chain upgrade name.
12-
UpgradeName = "v16.0.0"
10+
UpgradeName = "v17.0.0-rc0"
1311
)
1412

1513
var Upgrade = upgrades.Upgrade{
1614
UpgradeName: UpgradeName,
1715
CreateUpgradeHandler: CreateUpgradeHandler,
1816
StoreUpgrades: store.StoreUpgrades{
19-
Added: []string{protocolpooltypes.StoreKey},
17+
Added: []string{},
2018
Deleted: []string{},
2119
},
2220
}

0 commit comments

Comments
 (0)