Merge branch 'main' into CNS-516-add-unit-test-to-check-the-distribut…

…ion-of-picked-providers-when-pairing

.gitignore

@@ -44,6 +44,7 @@ ecosystem/lava-sdk/package-lock.json
 ecosystem/lava-sdk/examples/jsonRPC_test.ts
 ecosystem/lava-sdk/examples/restAPI_test.ts
 ecosystem/lava-sdk/examples/tendermintRPC_test.ts
+ecosystem/lava-sdk/examples/tendermintRPC_test2.ts
 ecosystem/lava-sdk/examples/jsonRPC_badge_test.ts
 ecosystem/lava-sdk/pairingList.json
 

app/app.go

@@ -90,6 +90,9 @@ import (
 	conflictmodule "github.com/lavanet/lava/x/conflict"
 	conflictmodulekeeper "github.com/lavanet/lava/x/conflict/keeper"
 	conflictmoduletypes "github.com/lavanet/lava/x/conflict/types"
+	downtimemodule "github.com/lavanet/lava/x/downtime"
+	downtimekeeper "github.com/lavanet/lava/x/downtime/keeper"
+	downtimemoduletypes "github.com/lavanet/lava/x/downtime/types"
 	epochstoragemodule "github.com/lavanet/lava/x/epochstorage"
 	epochstoragemodulekeeper "github.com/lavanet/lava/x/epochstorage/keeper"
 	epochstoragemoduletypes "github.com/lavanet/lava/x/epochstorage/types"
@@ -188,6 +191,7 @@ var (
 		projectsmodule.AppModuleBasic{},
 		protocolmodule.AppModuleBasic{},
 		plansmodule.AppModuleBasic{},
+		downtimemodule.AppModuleBasic{},
 		// this line is used by starport scaffolding # stargate/app/moduleBasic
 	)
 
@@ -287,6 +291,7 @@ func New(
 		conflictmoduletypes.StoreKey,
 		projectsmoduletypes.StoreKey,
 		plansmoduletypes.StoreKey,
+		downtimemoduletypes.StoreKey,
 		// this line is used by starport scaffolding # stargate/app/storeKey
 	)
 	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
@@ -492,6 +497,10 @@ func New(
 	)
 	protocolModule := protocolmodule.NewAppModule(appCodec, app.ProtocolKeeper)
 
+	// downtime module
+	app.DowntimeKeeper = downtimekeeper.NewKeeper(appCodec, keys[downtimemoduletypes.StoreKey], app.GetSubspace(downtimemoduletypes.ModuleName), app.EpochstorageKeeper)
+	downtimeModule := downtimemodule.NewAppModule(app.DowntimeKeeper)
+
 	// this line is used by starport scaffolding # stargate/app/keeperDefinition
 
 	// Create static IBC router, add transfer route, then set and seal it
@@ -539,6 +548,7 @@ func New(
 		projectsModule,
 		plansModule,
 		protocolModule,
+		downtimeModule,
 		// this line is used by starport scaffolding # stargate/app/appModule
 	)
 
@@ -564,6 +574,7 @@ func New(
 		epochstoragemoduletypes.ModuleName,
 		subscriptionmoduletypes.ModuleName,
 		conflictmoduletypes.ModuleName, // conflict needs to change state before pairing changes stakes
+		downtimemoduletypes.ModuleName, // downtime needs to run before pairing
 		pairingmoduletypes.ModuleName,
 		projectsmoduletypes.ModuleName,
 		plansmoduletypes.ModuleName,
@@ -598,7 +609,8 @@ func New(
 		vestingtypes.ModuleName,
 		upgradetypes.ModuleName,
 		feegrant.ModuleName,
-		paramstypes.ModuleName)
+		paramstypes.ModuleName,
+		downtimemoduletypes.ModuleName) // downtime has no end block but module manager requires it.
 
 	// NOTE: The genutils module must occur after staking so that pools are
 	// properly initialized with tokens from genesis accounts.
@@ -622,6 +634,7 @@ func New(
 		specmoduletypes.ModuleName,
 		epochstoragemoduletypes.ModuleName, // epochStyorage end block must come before pairing for proper epoch handling
 		subscriptionmoduletypes.ModuleName,
+		downtimemoduletypes.ModuleName,
 		pairingmoduletypes.ModuleName,
 		projectsmoduletypes.ModuleName,
 		plansmoduletypes.ModuleName,
@@ -884,6 +897,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(projectsmoduletypes.ModuleName)
 	paramsKeeper.Subspace(protocolmoduletypes.ModuleName)
 	paramsKeeper.Subspace(plansmoduletypes.ModuleName)
+	paramsKeeper.Subspace(downtimemoduletypes.ModuleName)
 	// this line is used by starport scaffolding # stargate/app/paramSubspace
 
 	return paramsKeeper

app/keepers/lavaKeepers.go

@@ -17,6 +17,7 @@ import (
 	ibctransferkeeper "github.com/cosmos/ibc-go/v3/modules/apps/transfer/keeper"
 	ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
 	conflictmodulekeeper "github.com/lavanet/lava/x/conflict/keeper"
+	downtimekeeper "github.com/lavanet/lava/x/downtime/keeper"
 	epochstoragemodulekeeper "github.com/lavanet/lava/x/epochstorage/keeper"
 	pairingmodulekeeper "github.com/lavanet/lava/x/pairing/keeper"
 	plansmodulekeeper "github.com/lavanet/lava/x/plans/keeper"
@@ -58,4 +59,5 @@ type LavaKeepers struct {
 	ProjectsKeeper     projectsmodulekeeper.Keeper
 	PlansKeeper        plansmodulekeeper.Keeper
 	ProtocolKeeper     protocolmodulekeeper.Keeper
+	DowntimeKeeper     downtimekeeper.Keeper
 }

app/test_helper.go

@@ -1,23 +1,17 @@
-//go:build ignore
-
 package app
 
 import (
 	"github.com/cosmos/cosmos-sdk/simapp"
-	"github.com/cosmos/cosmos-sdk/store"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/lavanet/lava/app"
 	"github.com/tendermint/tendermint/libs/log"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	tmdb "github.com/tendermint/tm-db"
 )
 
 // Setup a new App for testing purposes
-func TestSetup() (app.LavaApp, sdk.Context) {
+func TestSetup() (*LavaApp, sdk.Context) {
 	db := tmdb.NewMemDB()
-	stateStore := store.NewCommitMultiStore(db)
-	ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger())
-	encoding := app.MakeEncodingConfig(ModuleBasics)
+	encoding := MakeEncodingConfig()
 	app := New(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, encoding, simapp.EmptyAppOptions{})
-	return app, ctx
+	return app, app.NewContext(true, tmproto.Header{})
 }

common/types/utils.go

@@ -5,28 +5,53 @@ import (
 	"golang.org/x/exp/constraints"
 )
 
-func FindMin[T constraints.Ordered](s []T) (m T) {
-	if len(s) > 0 {
-		m = s[0]
-		for _, v := range s[1:] {
-			if m > v {
-				m = v
-			}
+func FindMin[T constraints.Ordered](s []T) T {
+	ind := FindIndexOfMin(s)
+	if ind == -1 {
+		var zero T
+		return zero
+	}
+
+	return s[ind]
+}
+
+func FindIndexOfMin[T constraints.Ordered](s []T) int {
+	if len(s) == 0 {
+		return -1
+	}
+	m := s[0]
+	mInd := 0
+	for i := range s {
+		if m > s[i] {
+			mInd = i
 		}
 	}
-	return m
+	return mInd
 }
 
-func FindMax[T constraints.Ordered](s []T) (m T) {
-	if len(s) > 0 {
-		m = s[0]
-		for _, v := range s[1:] {
-			if m < v {
-				m = v
-			}
+func FindMax[T constraints.Ordered](s []T) T {
+	ind := FindIndexOfMax(s)
+	if ind == -1 {
+		var zero T
+		return zero
+	}
+
+	return s[ind]
+}
+
+func FindIndexOfMax[T constraints.Ordered](s []T) int {
+	if len(s) == 0 {
+		return -1
+	}
+	m := s[0]
+	mInd := 0
+	for i := range s {
+		if m < s[i] {
+			m = s[i]
+			mInd = i
 		}
 	}
-	return m
+	return mInd
 }
 
 func Intersection[T comparable](arrays ...[]T) []T {

cookbook/plans/adventurer.json → cookbook/plans/basic.json

@@ -1,11 +1,11 @@
 {
     "proposal": {
-        "title": "Add plan proposal: advneturer",
-        "description": "A proposal for a new plan for a mid-range user",
+        "title": "Add plan proposal: Basic",
+        "description": "A proposal for a new plan for a basic user",
         "plans": [
             {
-                "index": "adventurer",
-                "description": "Plan for the Lava adventurer",
+                "index": "basic",
+                "description": "Plan for the basic Lava user",
                 "type": "rpc",
                 "price": {
                     "denom": "ulava",
@@ -15,10 +15,10 @@
                 "allow_overuse": false,
                 "overuse_rate": "0",
                 "plan_policy": {
-                    "geolocation_profile": "18446744073709551615",
+                    "geolocation_profile": "0",
                     "total_cu_limit": "1000000000",
                     "epoch_cu_limit": "5000000",
-                    "max_providers_to_pair": "5"
+                    "max_providers_to_pair": "14"
                 }
             }
         ]

cookbook/plans/enterprise.json

@@ -0,0 +1,27 @@
+{
+    "proposal": {
+        "title": "Add plan proposal: Enterprise",
+        "description": "A proposal for a new plan for a enterprise user",
+        "plans": [
+            {
+                "index": "enterprise",
+                "description": "Plan for the enterprise Lava user",
+                "type": "rpc",
+                "price": {
+                    "denom": "ulava",
+                    "amount": "600000000000"
+                },
+                "annual_discount_percentage": "0",
+                "allow_overuse": false,
+                "overuse_rate": "0",
+                "plan_policy": {
+                    "geolocation_profile": "65535",
+                    "total_cu_limit": "9223372036854775807",
+                    "epoch_cu_limit": "9223372036854775807",
+                    "max_providers_to_pair": "28"
+                }
+            }
+        ]
+    },
+    "deposit": "10000000ulava"
+}

cookbook/plans/explorer.json → cookbook/plans/free.json

@@ -1,11 +1,11 @@
 {
     "proposal": {
-        "title": "Add plan proposal: explorer",
-        "description": "A proposal for a new plan for a beginner user",
+        "title": "Add plan proposal: free",
+        "description": "A proposal for a new plan for a free user",
         "plans": [
             {
-                "index": "explorer",
-                "description": "Plan for the Lava explorer",
+                "index": "free",
+                "description": "Plan for the free Lava user",
                 "type": "rpc",
                 "price": {
                     "denom": "ulava",
@@ -15,7 +15,7 @@
                 "allow_overuse": false,
                 "overuse_rate": "0",
                 "plan_policy": {
-                    "geolocation_profile": "18446744073709551615",
+                    "geolocation_profile": "4",
                     "total_cu_limit": "10000000",
                     "epoch_cu_limit": "100000",
                     "max_providers_to_pair": "5"

cookbook/plans/whale.json → cookbook/plans/premium.json

@@ -1,24 +1,24 @@
 {
     "proposal": {
-        "title": "Add plan proposal: whale",
-        "description": "A proposal for a new plan for an advanced user",
+        "title": "Add plan proposal: Premium",
+        "description": "A proposal for a new plan for a premium user",
         "plans": [
             {
-                "index": "whale",
-                "description": "Plan for the Lava whale",
+                "index": "premium",
+                "description": "Plan for the premium Lava user",
                 "type": "rpc",
                 "price": {
                     "denom": "ulava",
-                    "amount": "100000000000000"
+                    "amount": "600000000000"
                 },
                 "annual_discount_percentage": "0",
                 "allow_overuse": false,
                 "overuse_rate": "0",
                 "plan_policy": {
-                    "geolocation_profile": "18446744073709551615",
+                    "geolocation_profile": "65535",
                     "total_cu_limit": "9223372036854775807",
                     "epoch_cu_limit": "9223372036854775807",
-                    "max_providers_to_pair": "5"
+                    "max_providers_to_pair": "14"
                 }
             }
         ]