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

Jump to bottom

Copy of CNS-single-provider #1706

Closed
wants to merge 25 commits into from
Closed

Copy of CNS-single-provider #1706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
484251e
wip
Sep 11, 2024
a8c1e68
handle rewards
Sep 11, 2024
737e0e4
fix the genesis
Sep 11, 2024
0491c43
Merge branch 'main' into CNS-single-provider
Yaroms Sep 11, 2024
5db8143
add metadata and aftermodify
Sep 11, 2024
67636a4
Merge branch 'CNS-single-provider' of https://github.com/lavanet/lava…
Sep 11, 2024
6e4bba8
done
Sep 11, 2024
0dc711a
works sanity
Sep 11, 2024
373d527
some fixes
Sep 12, 2024
d97f273
remove delegation when zero
Sep 12, 2024
9baca37
added design issues
Sep 16, 2024
f475c1c
fix
Sep 16, 2024
367b3b3
now all entries are self
Sep 16, 2024
a471a57
remove proto break check
Sep 16, 2024
09efb19
added dualstaking migrator
Sep 19, 2024
8fef340
temp comment
Sep 19, 2024
c049481
added migration for metadata
Sep 19, 2024
41d0891
fix migration
Sep 19, 2024
0573afa
added metadata query
Sep 19, 2024
dbf4f36
fix health
Sep 19, 2024
5f9413e
small fixes
Sep 19, 2024
a22a80c
lint
Sep 19, 2024
67baa9d
lint
Sep 19, 2024
07745e6
Merge branch 'main' into CNS-single-provider
Yaroms Sep 19, 2024
391608a
Trigger workflow
Sep 19, 2024
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
18 changes: 9 additions & 9 deletions .github/workflows/proto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ jobs:
# with:
# input: "proto"

break-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: bufbuild/buf-setup-action@v1.38.0
- uses: bufbuild/buf-breaking-action@v1
with:
input: "proto"
against: "https://github.com/${{ github.repository }}.git#branch=${{ github.event.pull_request.base.ref }},ref=HEAD~1,subdir=proto"
# break-check:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# - uses: bufbuild/buf-setup-action@v1.38.0
# - uses: bufbuild/buf-breaking-action@v1
# with:
# input: "proto"
# against: "https://github.com/${{ github.repository }}.git#branch=${{ github.event.pull_request.base.ref }},ref=HEAD~1,subdir=proto"

validate-check:
runs-on: ubuntu-latest
Expand Down
36 changes: 0 additions & 36 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,42 +166,6 @@

// Upgrades add here future upgrades (upgrades.Upgrade)
var Upgrades = []upgrades.Upgrade{
upgrades.Upgrade_0_22_0,
upgrades.Upgrade_0_23_0,
upgrades.Upgrade_0_23_2,
upgrades.Upgrade_0_23_4,
upgrades.Upgrade_0_23_5,
upgrades.Upgrade_0_24_0,
upgrades.Upgrade_0_25_0,
upgrades.Upgrade_0_25_1,
upgrades.Upgrade_0_25_2,
upgrades.Upgrade_0_26_0,
upgrades.Upgrade_0_26_1,
upgrades.Upgrade_0_26_2,
upgrades.Upgrade_0_27_0,
upgrades.Upgrade_0_30_0,
upgrades.Upgrade_0_30_1,
upgrades.Upgrade_0_30_2,
upgrades.Upgrade_0_31_0,
upgrades.Upgrade_0_31_1,
upgrades.Upgrade_0_32_0,
upgrades.Upgrade_0_32_3,
upgrades.Upgrade_0_33_0,
upgrades.Upgrade_0_34_0,
upgrades.Upgrade_0_35_0,
upgrades.Upgrade_1_0_0,
upgrades.Upgrade_1_0_1,
upgrades.Upgrade_1_1_0,
upgrades.Upgrade_1_2_0,
upgrades.Upgrade_2_0_0,
upgrades.Upgrade_2_1_0,
upgrades.Upgrade_2_1_1,
upgrades.Upgrade_2_1_3,
upgrades.Upgrade_2_2_0,
upgrades.Upgrade_2_4_0,
upgrades.Upgrade_2_5_0,
upgrades.Upgrade_3_0_0,
upgrades.Upgrade_3_0_1,
upgrades.Upgrade_3_1_0,
}

Expand Down Expand Up @@ -402,20 +366,20 @@
memKeys: memKeys,
}

app.ParamsKeeper = initParamsKeeper(appCodec, cdc, keys[paramstypes.StoreKey], tkeys[paramstypes.TStoreKey])

Check failure on line 369 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.ParamsKeeper undefined (type *LavaApp has no field or method ParamsKeeper) (typecheck)

Check failure on line 369 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.ParamsKeeper undefined (type *LavaApp has no field or method ParamsKeeper) (typecheck)

// set the BaseApp's parameter store
app.ConsensusParamsKeeper = consensusparamkeeper.NewKeeper(appCodec, keys[consensusparamtypes.StoreKey], authtypes.NewModuleAddress(govtypes.ModuleName).String())

Check failure on line 372 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.ConsensusParamsKeeper undefined (type *LavaApp has no field or method ConsensusParamsKeeper) (typecheck)

Check failure on line 372 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.ConsensusParamsKeeper undefined (type *LavaApp has no field or method ConsensusParamsKeeper) (typecheck)
bApp.SetParamStore(&app.ConsensusParamsKeeper)

Check failure on line 373 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.ConsensusParamsKeeper undefined (type *LavaApp has no field or method ConsensusParamsKeeper) (typecheck)

Check failure on line 373 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.ConsensusParamsKeeper undefined (type *LavaApp has no field or method ConsensusParamsKeeper) (typecheck)

// add capability keeper and ScopeToModule for ibc module
app.CapabilityKeeper = capabilitykeeper.NewKeeper(appCodec, keys[capabilitytypes.StoreKey], memKeys[capabilitytypes.MemStoreKey])

Check failure on line 376 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.CapabilityKeeper undefined (type *LavaApp has no field or method CapabilityKeeper) (typecheck)

Check failure on line 376 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.CapabilityKeeper undefined (type *LavaApp has no field or method CapabilityKeeper) (typecheck)

// grant capabilities for the ibc and ibc-transfer modules
scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibcexported.ModuleName)

Check failure on line 379 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.CapabilityKeeper undefined (type *LavaApp has no field or method CapabilityKeeper) (typecheck)

Check failure on line 379 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.CapabilityKeeper undefined (type *LavaApp has no field or method CapabilityKeeper) (typecheck)
scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)

Check failure on line 380 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.CapabilityKeeper undefined (type *LavaApp has no field or method CapabilityKeeper) (typecheck)

Check failure on line 380 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.CapabilityKeeper undefined (type *LavaApp has no field or method CapabilityKeeper) (typecheck)
scopedICAControllerKeeper := app.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName)

Check failure on line 381 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.CapabilityKeeper undefined (type *LavaApp has no field or method CapabilityKeeper) (typecheck)

Check failure on line 381 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.CapabilityKeeper undefined (type *LavaApp has no field or method CapabilityKeeper) (typecheck)
scopedICAHostKeeper := app.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName)

Check failure on line 382 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.CapabilityKeeper undefined (type *LavaApp has no field or method CapabilityKeeper) (typecheck)

Check failure on line 382 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.CapabilityKeeper undefined (type *LavaApp has no field or method CapabilityKeeper) (typecheck)
// this line is used by starport scaffolding # stargate/app/scopedKeeper

// add keepers
Expand Down Expand Up @@ -1022,7 +986,7 @@
if err := tmjson.Unmarshal(req.AppStateBytes, &genesisState); err != nil {
panic(err)
}
app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap())

Check failure on line 989 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.UpgradeKeeper undefined (type *LavaApp has no field or method UpgradeKeeper) (typecheck)

Check failure on line 989 in app/app.go

View workflow job for this annotation

GitHub Actions / lint 

app.UpgradeKeeper undefined (type *LavaApp has no field or method UpgradeKeeper) (typecheck)
return app.mm.InitGenesis(ctx, app.appCodec, genesisState)
}

Expand Down
261 changes: 0 additions & 261 deletions app/upgrades/empty_upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,8 @@ import (
store "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"
"github.com/cosmos/cosmos-sdk/x/group"
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"
icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
"github.com/lavanet/lava/v3/app/keepers"
v1 "github.com/lavanet/lava/v3/x/downtime/v1"
dualstakingtypes "github.com/lavanet/lava/v3/x/dualstaking/types"
fixationtypes "github.com/lavanet/lava/v3/x/fixationstore/types"
protocoltypes "github.com/lavanet/lava/v3/x/protocol/types"
rewardstypes "github.com/lavanet/lava/v3/x/rewards/types"
)

func defaultUpgradeHandler(
Expand Down Expand Up @@ -45,256 +34,6 @@ func defaultUpgradeHandler(
// },
// }

var Upgrade_0_22_0 = Upgrade{
UpgradeName: "v0.22.0",
CreateUpgradeHandler: v0_22_0_UpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

func v0_22_0_UpgradeHandler(
m *module.Manager,
c module.Configurator,
bapm BaseAppParamManager,
lk *keepers.LavaKeepers,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
lk.DowntimeKeeper.SetParams(ctx, v1.DefaultParams())
lk.ProtocolKeeper.SetParams(ctx, protocoltypes.DefaultParams())
return m.RunMigrations(ctx, c, vm)
}
}

var Upgrade_0_23_0 = Upgrade{
UpgradeName: "v0.23.0",
CreateUpgradeHandler: v0_23_0_UpgradeHandler,
StoreUpgrades: store.StoreUpgrades{Added: []string{dualstakingtypes.StoreKey}},
}

func v0_23_0_UpgradeHandler(
m *module.Manager,
c module.Configurator,
bapm BaseAppParamManager,
lk *keepers.LavaKeepers,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
lk.PairingKeeper.InitProviderQoS(ctx, *fixationtypes.DefaultGenesis())
return m.RunMigrations(ctx, c, vm)
}
}

var Upgrade_0_23_2 = Upgrade{
UpgradeName: "v0.23.2", // upgrade name
CreateUpgradeHandler: defaultUpgradeHandler, // upgrade handler (default)
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_23_4 = Upgrade{
UpgradeName: "v0.23.4",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_23_5 = Upgrade{
UpgradeName: "v0.23.5",
CreateUpgradeHandler: v0_23_0_UpgradeHandler,
StoreUpgrades: store.StoreUpgrades{Added: []string{dualstakingtypes.StoreKey}},
}

var Upgrade_0_24_0 = Upgrade{
UpgradeName: "v0.24.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_25_0 = Upgrade{
UpgradeName: "v0.25.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_25_1 = Upgrade{
UpgradeName: "v0.25.1",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_25_2 = Upgrade{
UpgradeName: "v0.25.2",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_26_0 = Upgrade{
UpgradeName: "v0.26.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_26_1 = Upgrade{
UpgradeName: "v0.26.1",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_26_2 = Upgrade{
UpgradeName: "v0.26.2",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_27_0 = Upgrade{
UpgradeName: "v0.27.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_30_0 = Upgrade{
UpgradeName: "v0.30.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_30_1 = Upgrade{
UpgradeName: "v0.30.1",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_30_2 = Upgrade{
UpgradeName: "v0.30.2",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_31_0 = Upgrade{
UpgradeName: "v0.31.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_31_1 = Upgrade{
UpgradeName: "v0.31.1",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_32_0 = Upgrade{
UpgradeName: "v0.32.0",
CreateUpgradeHandler: v0_32_0_UpgradeHandler,
StoreUpgrades: store.StoreUpgrades{
Added: []string{rewardstypes.StoreKey},
Deleted: []string{minttypes.StoreKey},
},
}

var Upgrade_0_32_3 = Upgrade{
UpgradeName: "v0.32.3",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_33_0 = Upgrade{
UpgradeName: "v0.33.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_34_0 = Upgrade{
UpgradeName: "v0.34.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{
Added: []string{icahosttypes.StoreKey, icacontrollertypes.StoreKey},
},
}

var Upgrade_0_35_0 = Upgrade{
UpgradeName: "v0.35.0",
CreateUpgradeHandler: v_35_0,
StoreUpgrades: store.StoreUpgrades{Added: []string{authzkeeper.StoreKey, group.StoreKey}},
}

var Upgrade_1_0_0 = Upgrade{
UpgradeName: "v1.0.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_1_0_1 = Upgrade{
UpgradeName: "v1.0.1",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_1_1_0 = Upgrade{
UpgradeName: "v1.1.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_1_2_0 = Upgrade{
UpgradeName: "v1.2.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_2_0_0 = Upgrade{
UpgradeName: "v2.0.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{
Added: []string{packetforwardtypes.StoreKey},
},
}

var Upgrade_2_1_0 = Upgrade{
UpgradeName: "v2.1.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_2_1_1 = Upgrade{
UpgradeName: "v2.1.1",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_2_1_3 = Upgrade{
UpgradeName: "v2.1.3",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_2_2_0 = Upgrade{
UpgradeName: "v2.2.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{
Added: []string{packetforwardtypes.StoreKey},
},
}

var Upgrade_2_4_0 = Upgrade{
UpgradeName: "v2.4.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_2_5_0 = Upgrade{
UpgradeName: "v2.5.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_3_0_0 = Upgrade{
UpgradeName: "v3.0.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_3_0_1 = Upgrade{
UpgradeName: "v3.0.1",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_3_1_0 = Upgrade{
UpgradeName: "v3.1.0",
CreateUpgradeHandler: defaultUpgradeHandler,
Expand Down
Loading
Loading