Lend test net upgrade

app/app.go

@@ -1144,8 +1144,8 @@ func (a *App) ModuleAccountsPermissions() map[string][]string {
 
 func (a *App) registerUpgradeHandlers() {
 	a.UpgradeKeeper.SetUpgradeHandler(
-		tv4_0_0.UpgradeNameV4_1_0,
-		tv4_0_0.CreateUpgradeHandlerV410(a.mm, a.configurator, a.Rewardskeeper, a.LiquidityKeeper),
+		tv4_0_0.UpgradeNameV4_2_0,
+		tv4_0_0.CreateUpgradeHandlerV420(a.mm, a.configurator),
 	)
 
 	// When a planned update height is reached, the old binary will panic
@@ -1215,6 +1215,8 @@ func upgradeHandlers(upgradeInfo storetypes.UpgradeInfo, a *App, storeUpgrades *
 		}
 	case upgradeInfo.Name == tv4_0_0.UpgradeNameV4_1_0 && !a.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height):
 		storeUpgrades = &storetypes.StoreUpgrades{}
+	case upgradeInfo.Name == tv4_0_0.UpgradeNameV4_2_0 && !a.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height):
+		storeUpgrades = &storetypes.StoreUpgrades{}
 	}
 	return storeUpgrades
 }

app/upgrades/testnet/v4_0_0/constants.go

@@ -27,3 +27,17 @@ const (
 		}
 	}'`
 )
+
+const (
+	UpgradeNameV4_2_0   = "v4.2.0"
+	UpgradeHeightV4_2_0 = "" // replace this height
+	UpgradeInfoV4_2_0   = `'{
+		"binaries": {
+			"darwin/arm64":"",
+			"darwin/x86_64":"",
+			"linux/arm64":"",
+			"linux/x86_64":"",
+			"windows/x86_64":""
+		}
+	}'`
+)

app/upgrades/testnet/v4_0_0/upgrades.go

@@ -55,7 +55,7 @@ func CreateSwapFeeGauge(
 	_ = rewardsKeeper.CreateNewGauge(ctx, newGauge, true)
 }
 
-// CreateUpgradeHandler creates an SDK upgrade handler for v4_0_1
+// CreateUpgradeHandler creates an SDK upgrade handler for v4_1_0
 func CreateUpgradeHandlerV410(
 	mm *module.Manager,
 	configurator module.Configurator,
@@ -74,3 +74,20 @@ func CreateUpgradeHandlerV410(
 		return newVM, err
 	}
 }
+
+// CreateUpgradeHandler creates an SDK upgrade handler for v4_2_0
+func CreateUpgradeHandlerV420(
+	mm *module.Manager,
+	configurator module.Configurator,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		// This change is only for testnet upgrade
+
+		newVM, err := mm.RunMigrations(ctx, configurator, fromVM)
+
+		if err != nil {
+			return newVM, err
+		}
+		return newVM, err
+	}
+}

x/lend/genesis.go

@@ -84,7 +84,7 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 	lends, _ := k.GetLends(ctx)
 	userDeposit, _ := k.GetUserDepositStats(ctx)
 	reserveDeposit, _ := k.GetReserveDepositStats(ctx)
-	buyBackDeposir, _ := k.GetBuyBackDepositStats(ctx)
+	buyBackDeposit, _ := k.GetBuyBackDepositStats(ctx)
 	borrowDeposit, _ := k.GetBorrowStats(ctx)
 	return types.NewGenesisState(
 		k.GetAllBorrow(ctx),
@@ -101,7 +101,7 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 		lends,
 		userDeposit,
 		reserveDeposit,
-		buyBackDeposir,
+		buyBackDeposit,
 		borrowDeposit,
 		k.GetLendPairs(ctx),
 		k.GetAllAssetRatesStats(ctx),

x/lend/keeper/iter.go

@@ -65,15 +65,22 @@ func (k Keeper) IterateBorrow(ctx sdk.Context, ID uint64) (sdk.Dec, sdk.Dec, err
 	if err != nil {
 		return sdk.ZeroDec(), sdk.ZeroDec(), err
 	}
-
 	borrowInterestTracker, found := k.GetBorrowInterestTracker(ctx, borrow.ID)
 	if !found {
 		borrowInterestTracker = types.BorrowInterestTracker{
 			BorrowingId:         borrow.ID,
 			InterestAccumulated: sdk.ZeroDec(),
 		}
 	}
-	borrowInterestTracker.InterestAccumulated = borrowInterestTracker.InterestAccumulated.Add(interestPerBlock)
+	if !borrow.IsStableBorrow {
+		borrowInterestTracker.InterestAccumulated = borrowInterestTracker.InterestAccumulated.Add(interestPerBlock)
+	} else {
+		stableInterestPerBlock, err := k.CalculateStableInterest(ctx, borrow.AmountOut.Amount.String(), borrow)
+		if err != nil {
+			return sdk.ZeroDec(), sdk.ZeroDec(), err
+		}
+		borrowInterestTracker.InterestAccumulated = borrowInterestTracker.InterestAccumulated.Add(stableInterestPerBlock)
+	}
 	newInterestPerBlock := sdk.ZeroInt()
 	if borrowInterestTracker.InterestAccumulated.GTE(sdk.OneDec()) {
 		newInterestPerBlock = borrowInterestTracker.InterestAccumulated.TruncateInt()
@@ -101,24 +108,24 @@ func (k Keeper) IterateBorrow(ctx sdk.Context, ID uint64) (sdk.Dec, sdk.Dec, err
 	return indexGlobalCurrent, reserveGlobalIndex, nil
 }
 
-//func (k Keeper) CalculateRewards(ctx sdk.Context, amount string, rate sdk.Dec) (sdk.Dec, error) {
-//
-//	currentTime := ctx.BlockTime().Unix()
-//
-//	prevInterestTime := k.GetLastInterestTime(ctx)
-//	if prevInterestTime == int64(types.Uint64Zero) {
-//		prevInterestTime = currentTime
-//	}
-//	secondsElapsed := currentTime - prevInterestTime
-//	if secondsElapsed < int64(types.Uint64Zero) {
-//		return sdk.ZeroDec(), sdkerrors.Wrap(types.ErrNegativeTimeElapsed, fmt.Sprintf("%d seconds", secondsElapsed))
-//	}
-//	yearsElapsed := sdk.NewDec(secondsElapsed).QuoInt64(types.SecondsPerYear)
-//	amt, _ := sdk.NewDecFromStr(amount)
-//	perc := rate
-//	newAmount := amt.Mul(perc).Mul(yearsElapsed)
-//	return newAmount, nil
-//}
+func (k Keeper) CalculateStableInterest(ctx sdk.Context, amount string, borrow types.BorrowAsset) (sdk.Dec, error) {
+
+	currentTime := ctx.BlockTime().Unix()
+
+	prevInterestTime := borrow.LastInteractionTime.Unix()
+	if prevInterestTime == int64(types.Uint64Zero) {
+		prevInterestTime = currentTime
+	}
+	secondsElapsed := currentTime - prevInterestTime
+	if secondsElapsed < int64(types.Uint64Zero) {
+		return sdk.ZeroDec(), sdkerrors.Wrap(types.ErrNegativeTimeElapsed, fmt.Sprintf("%d seconds", secondsElapsed))
+	}
+	yearsElapsed := sdk.NewDec(secondsElapsed).QuoInt64(types.SecondsPerYear)
+	amt, _ := sdk.NewDecFromStr(amount)
+	perc := borrow.StableBorrowRate
+	newAmount := amt.Mul(perc).Mul(yearsElapsed)
+	return newAmount, nil
+}
 
 func (k Keeper) CalculateLendReward(ctx sdk.Context, amount string, rate sdk.Dec, lend types.LendAsset) (sdk.Dec, sdk.Dec, error) {
 	currentTime := ctx.BlockTime().Unix()