CNS-137: implement new jailing design

.github/workflows/e2e.yml

@@ -15,15 +15,14 @@ jobs:
 
     # Install Ignite
     - name: ignite install
-      uses: nick-fields/retry@v2
-      with:
-        max_attempts: 3
-        retry_on: error
-        timeout_minutes: 20
-        command: git clone --depth 1 --branch v0.22.2 https://github.com/ignite/cli && cd cli && make install 
-
+      run: git clone --depth 1 --branch v0.22.2 https://github.com/ignite/cli && cd cli && make install 
+      # run: curl https://get.ignite.com/cli! | bash
     - name: ignite version
       run:  ignite version
+    # - name: starport install
+    #   run: curl https://get.starport.network/starport@v0.19.2! | bash
+    # - name: starport version
+    #   run:  starport version
 
     # Setup Paths
     - name: home
@@ -188,4 +187,5 @@ jobs:
     - name: GRPC Gateway Error Only Logs
       if: always()
       continue-on-error: true
+
       run: cat testutil/e2e/logs/11_grpcGateway_errors.log

app/app.go

@@ -87,6 +87,7 @@ import (
 	"github.com/lavanet/lava/app/keepers"
 	"github.com/lavanet/lava/app/upgrades"
 	"github.com/lavanet/lava/app/upgrades/v0_5_0"
+	"github.com/lavanet/lava/app/upgrades/v0_5_1"
 	"github.com/lavanet/lava/docs"
 	conflictmodule "github.com/lavanet/lava/x/conflict"
 	conflictmodulekeeper "github.com/lavanet/lava/x/conflict/keeper"
@@ -116,7 +117,7 @@ const (
 )
 
 // Upgrades add here future upgrades (upgrades.Upgrade)
-var Upgrades = []upgrades.Upgrade{upgrades.Upgrade_0_4_0, upgrades.Upgrade_0_4_3, upgrades.Upgrade_0_4_4, upgrades.Upgrade_0_4_5, v0_5_0.Upgrade}
+var Upgrades = []upgrades.Upgrade{upgrades.Upgrade_0_4_0, upgrades.Upgrade_0_4_3, upgrades.Upgrade_0_4_4, upgrades.Upgrade_0_4_5, v0_5_0.Upgrade, v0_5_1.Upgrade}
 
 // this line is used by starport scaffolding # stargate/wasm/app/enabledProposals
 

app/upgrades/v0_5_1/upgrade.go

@@ -0,0 +1,39 @@
+package v0_5_1
+
+import (
+	"log"
+
+	store "github.com/cosmos/cosmos-sdk/store/types"
+	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/lavanet/lava/app/keepers"
+	"github.com/lavanet/lava/app/upgrades"
+	pairingtypes "github.com/lavanet/lava/x/pairing/types"
+)
+
+const UpgradeName = "v0.5.1"
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,           // upgrade name defined few lines above
+	CreateUpgradeHandler: CreateUpgradeHandler,  // create CreateUpgradeHandler in upgrades.go below
+	StoreUpgrades:        store.StoreUpgrades{}, // StoreUpgrades has 3 fields: Added/Renamed/Deleted any module that fits these description should be added in the way below
+}
+
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+	bpm upgrades.BaseAppParamManager,
+	keepers *keepers.LavaKeepers,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		log.Println("########################")
+		log.Println("#   STARTING UPGRADE   #")
+		log.Println("########################")
+
+		// we use a dedicated SET since the upgrade package doesn't have access to the paramstore, thus can't set a parameter directly
+		keepers.PairingKeeper.SetRecommendedEpochNumToCollectPayment(ctx, pairingtypes.DefaultRecommendedEpochNumToCollectPayment)
+
+		return mm.RunMigrations(ctx, configurator, vm)
+	}
+}

proto/pairing/params.proto

@@ -54,4 +54,5 @@ message Params {
       (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
       (gogoproto.nullable)   = false
       ];
+    uint64 recommendedEpochNumToCollectPayment = 14 [(gogoproto.moretags) = "yaml:\"recommended_epoch_num_to_collect_payment\""];
 }

proto/pairing/provider_payment_storage.proto

@@ -5,11 +5,13 @@ option go_package = "github.com/lavanet/lava/x/pairing/types";
 import "pairing/unique_payment_storage_client_provider.proto"; 
 
 message ProviderPaymentStorage {
+
   string index = 1; 
   reserved 2;
   uint64 epoch = 3;
-  repeated string unresponsiveness_complaints = 4;
+  reserved 4;
   repeated string uniquePaymentStorageClientProviderKeys = 5; 
+  uint64 complainersTotalCu = 6; // total CU that were supposed to be served by the provider but didn't because he was unavailable (so consumers complained about him)
 }
 // change Client -> consumer
 

testutil/keeper/keepers_init.go

@@ -18,6 +18,7 @@ import (
 	conflicttypes "github.com/lavanet/lava/x/conflict/types"
 	epochstoragekeeper "github.com/lavanet/lava/x/epochstorage/keeper"
 	epochstoragetypes "github.com/lavanet/lava/x/epochstorage/types"
+	"github.com/lavanet/lava/x/pairing"
 	pairingkeeper "github.com/lavanet/lava/x/pairing/keeper"
 	pairingtypes "github.com/lavanet/lava/x/pairing/types"
 	"github.com/lavanet/lava/x/spec"
@@ -31,7 +32,9 @@ import (
 	tmdb "github.com/tendermint/tm-db"
 )
 
-const BLOCK_TIME = 30 * time.Second
+const (
+	BLOCK_TIME = 30 * time.Second
+)
 
 const BLOCK_HEADER_LEN = 32
 
@@ -214,20 +217,9 @@ func AdvanceEpoch(ctx context.Context, ks *Keepers, customBlockTime ...time.Dura
 // Make sure you save the new context
 func NewBlock(ctx context.Context, ks *Keepers, customTime ...time.Duration) {
 	unwrapedCtx := sdk.UnwrapSDKContext(ctx)
-	block := uint64(unwrapedCtx.BlockHeight())
 	if ks.Epochstorage.IsEpochStart(sdk.UnwrapSDKContext(ctx)) {
-		ks.Epochstorage.FixateParams(unwrapedCtx, block)
-		// begin block
-		ks.Epochstorage.SetEpochDetailsStart(unwrapedCtx, block)
-		ks.Epochstorage.StoreCurrentEpochStakeStorage(unwrapedCtx, block, epochstoragetypes.ProviderKey)
-		ks.Epochstorage.StoreCurrentEpochStakeStorage(unwrapedCtx, block, epochstoragetypes.ClientKey)
-
-		ks.Epochstorage.UpdateEarliestEpochstart(unwrapedCtx)
-		ks.Epochstorage.RemoveOldEpochData(unwrapedCtx, epochstoragetypes.ProviderKey)
-		ks.Epochstorage.RemoveOldEpochData(unwrapedCtx, epochstoragetypes.ClientKey)
-
-		ks.Pairing.RemoveOldEpochPayment(unwrapedCtx)
-		ks.Pairing.CheckUnstakingForCommit(unwrapedCtx)
+		ks.Epochstorage.EpochStart(unwrapedCtx)
+		ks.Pairing.EpochStart(unwrapedCtx, pairing.EPOCHS_NUM_TO_CHECK_CU_FOR_UNRESPONSIVE_PROVIDER, pairing.EPOCHS_NUM_TO_CHECK_FOR_COMPLAINERS)
 	}
 
 	ks.Conflict.CheckAndHandleAllVotes(unwrapedCtx)

x/epochstorage/keeper/epoch_start.go

@@ -0,0 +1,32 @@
+package keeper
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/lavanet/lava/x/epochstorage/types"
+)
+
+// Function that calls all the functions that are supposed to run in epoch start
+func (k Keeper) EpochStart(ctx sdk.Context) {
+	block := uint64(ctx.BlockHeight())
+
+	// save params for this epoch
+	k.FixateParams(ctx, block)
+
+	// on Epoch start we need to do:
+	// 1. update Epoch start
+	// 2. update the StakeStorage
+	// on epoch start block end: (because other modules need this info) to clear their storages
+	// 3. remove old StakeStorage
+	// 4. update earliest epoch start
+
+	k.SetEpochDetailsStart(ctx, block)
+
+	k.StoreCurrentEpochStakeStorage(ctx, block, types.ProviderKey)
+
+	k.StoreCurrentEpochStakeStorage(ctx, block, types.ClientKey)
+
+	k.UpdateEarliestEpochstart(ctx)
+
+	k.RemoveOldEpochData(ctx, types.ProviderKey)
+	k.RemoveOldEpochData(ctx, types.ClientKey)
+}

x/epochstorage/module.go

@@ -169,28 +169,8 @@ func (AppModule) ConsensusVersion() uint64 { return 2 }
 // BeginBlock executes all ABCI BeginBlock logic respective to the capability module.
 func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {
 	if am.keeper.IsEpochStart(ctx) {
-		block := uint64(ctx.BlockHeight())
-
-		// save params for this epoch
-		am.keeper.FixateParams(ctx, block)
-
-		// on Epoch start we need to do:
-		// 1. update Epoch start
-		// 2. update the StakeStorage
-		// on epoch start block end: (because other modules need this info) to clear their storages
-		// 3. remove old StakeStorage
-		// 4. update earliest epoch start
-
-		am.keeper.SetEpochDetailsStart(ctx, block)
-
-		am.keeper.StoreCurrentEpochStakeStorage(ctx, block, types.ProviderKey)
-
-		am.keeper.StoreCurrentEpochStakeStorage(ctx, block, types.ClientKey)
-
-		am.keeper.UpdateEarliestEpochstart(ctx)
-
-		am.keeper.RemoveOldEpochData(ctx, types.ProviderKey)
-		am.keeper.RemoveOldEpochData(ctx, types.ClientKey)
+		// run functions that are supposed to run in epoch start
+		am.keeper.EpochStart(ctx)
 
 		// Notify world we have a new session
 

x/pairing/keeper/epoch_start.go

@@ -0,0 +1,34 @@
+package keeper
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/lavanet/lava/utils"
+)
+
+// Function that calls all the functions that are supposed to run in epoch start
+func (k Keeper) EpochStart(ctx sdk.Context, epochsNumToCheckCuForUnresponsiveProvider uint64, epochsNumToCheckForComplainers uint64) {
+	logger := k.Logger(ctx)
+	logOnErr := func(err error, failingFunc string) {
+		if err != nil {
+			attrs := map[string]string{"error": err.Error()}
+			utils.LavaError(ctx, logger, "new_epoch", attrs, failingFunc)
+		}
+	}
+	// on session start we need to do:
+	// 1. remove old session payments
+	// 2. unstake any unstaking providers
+	// 3. unstake any unstaking users
+	// 4. unstake/jail unresponsive providers
+
+	// 1.
+	err := k.RemoveOldEpochPayment(ctx)
+	logOnErr(err, "RemoveOldEpochPayment")
+
+	// 2+3.
+	err = k.CheckUnstakingForCommit(ctx)
+	logOnErr(err, "CheckUnstakingForCommit")
+
+	// 4. unstake unresponsive providers
+	err = k.UnstakeUnresponsiveProviders(ctx, epochsNumToCheckCuForUnresponsiveProvider, epochsNumToCheckForComplainers)
+	logOnErr(err, "UnstakeUnresponsiveProviders")
+}