feat: loan pool

CHANGELOG.md

@@ -1,9 +1,19 @@
 <a name="unreleased"></a>
 ## [Unreleased]
 
+
+<a name="v0.1.6"></a>
+## [v0.1.6](https://github.com/SAONetwork/sao-consensus/compare/v0.1.5...v0.1.6) (2023-06-15)
+
 ### Features
-- add total storage and used storage in pledge ([#58](https://github.com/SAONetwork/sao-consensus/issues/58))
-- allow sp to declare delegation with validator for higher order priority ([#54](https://github.com/SAONetwork/sao-consensus/issues/54))
+
+* proof of existence ([#57](https://github.com/SAONetwork/sao-consensus/issues/57))  *#57* 
+* add total storage and used storage in pledge ([#58](https://github.com/SAONetwork/sao-consensus/issues/58))  *#58* 
+* allow sp to declare delegation with validator for higher order priority ([#54](https://github.com/SAONetwork/sao-consensus/issues/54))  *#54* 
+
+### Bug Fixes
+
+* add shard pledge field to record order pledge ([#60](https://github.com/SAONetwork/sao-consensus/issues/60))  *#60* 
 
 
 <a name="v0.1.5"></a>

app/app.go

@@ -2,6 +2,7 @@ package app
 
 import (
 	"fmt"
+	v017 "github.com/SaoNetwork/sao/app/upgrades/v0_1_7"
 	"io"
 	"net/http"
 	"os"
@@ -113,6 +114,9 @@ import (
 	didmodule "github.com/SaoNetwork/sao/x/did"
 	didmodulekeeper "github.com/SaoNetwork/sao/x/did/keeper"
 	didmoduletypes "github.com/SaoNetwork/sao/x/did/types"
+	loanmodule "github.com/SaoNetwork/sao/x/loan"
+	loanmodulekeeper "github.com/SaoNetwork/sao/x/loan/keeper"
+	loanmoduletypes "github.com/SaoNetwork/sao/x/loan/types"
 	marketmodule "github.com/SaoNetwork/sao/x/market"
 	marketmodulekeeper "github.com/SaoNetwork/sao/x/market/keeper"
 	marketmoduletypes "github.com/SaoNetwork/sao/x/market/types"
@@ -189,6 +193,7 @@ var (
 		modelmodule.AppModuleBasic{},
 		didmodule.AppModuleBasic{},
 		marketmodule.AppModuleBasic{},
+		loanmodule.AppModuleBasic{},
 		// this line is used by starport scaffolding # stargate/app/moduleBasic
 	)
 
@@ -205,6 +210,7 @@ var (
 		nodemoduletypes.ModuleName:     {authtypes.Minter, authtypes.Burner},
 		ordermoduletypes.ModuleName:    {authtypes.Staking},
 		marketmoduletypes.ModuleName:   {authtypes.Staking},
+		loanmoduletypes.ModuleName:     {authtypes.Minter, authtypes.Burner},
 		// this line is used by starport scaffolding # stargate/app/maccPerms
 	}
 )
@@ -276,6 +282,8 @@ type App struct {
 	DidKeeper didmodulekeeper.Keeper
 
 	MarketKeeper marketmodulekeeper.Keeper
+
+	LoanKeeper loanmodulekeeper.Keeper
 	// this line is used by starport scaffolding # stargate/app/keeperDeclaration
 
 	// mm is the module manager
@@ -319,6 +327,7 @@ func New(
 		modelmoduletypes.StoreKey,
 		didmoduletypes.StoreKey,
 		marketmoduletypes.StoreKey,
+		loanmoduletypes.StoreKey,
 		// this line is used by starport scaffolding # stargate/app/storeKey
 	)
 	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
@@ -459,6 +468,7 @@ func New(
 		app.OrderKeeper,
 		&stakingKeeper,
 		app.MarketKeeper,
+		app.LoanKeeper,
 		appCodec,
 		keys[nodemoduletypes.StoreKey],
 		keys[nodemoduletypes.MemStoreKey],
@@ -572,12 +582,22 @@ func New(
 	)
 	marketModule := marketmodule.NewAppModule(appCodec, app.MarketKeeper, app.AccountKeeper, app.BankKeeper)
 
+	app.LoanKeeper = *loanmodulekeeper.NewKeeper(
+		app.BankKeeper,
+		appCodec,
+		keys[loanmoduletypes.StoreKey],
+		keys[loanmoduletypes.MemStoreKey],
+		app.GetSubspace(loanmoduletypes.ModuleName),
+	)
+	loanModule := loanmodule.NewAppModule(appCodec, app.LoanKeeper, app.AccountKeeper, app.BankKeeper)
+
 	app.NodeKeeper = *nodemodulekeeper.NewKeeper(
 		app.AccountKeeper,
 		app.BankKeeper,
 		app.OrderKeeper,
 		app.StakingKeeper,
 		app.MarketKeeper,
+		app.LoanKeeper,
 		appCodec,
 		keys[nodemoduletypes.StoreKey],
 		keys[nodemoduletypes.MemStoreKey],
@@ -666,6 +686,7 @@ func New(
 		modelModule,
 		didModule,
 		marketModule,
+		loanModule,
 		// this line is used by starport scaffolding # stargate/app/appModule
 	)
 
@@ -701,6 +722,7 @@ func New(
 		modelmoduletypes.ModuleName,
 		didmoduletypes.ModuleName,
 		marketmoduletypes.ModuleName,
+		loanmoduletypes.ModuleName,
 		// this line is used by starport scaffolding # stargate/app/beginBlockers
 	)
 
@@ -731,6 +753,7 @@ func New(
 		modelmoduletypes.ModuleName,
 		didmoduletypes.ModuleName,
 		marketmoduletypes.ModuleName,
+		loanmoduletypes.ModuleName,
 		// this line is used by starport scaffolding # stargate/app/endBlockers
 	)
 
@@ -766,6 +789,7 @@ func New(
 		modelmoduletypes.ModuleName,
 		didmoduletypes.ModuleName,
 		marketmoduletypes.ModuleName,
+		loanmoduletypes.ModuleName,
 		// this line is used by starport scaffolding # stargate/app/initGenesis
 	)
 
@@ -801,6 +825,7 @@ func New(
 		modelModule,
 		didModule,
 		marketModule,
+		loanModule,
 		// this line is used by starport scaffolding # stargate/app/appModule
 	)
 	app.sm.RegisterStoreDecoders()
@@ -863,6 +888,11 @@ func (app *App) setupUpgradeHandlers() {
 		v016.CreateUpgradeHandler(app.mm, app.configurator, app.NodeKeeper),
 	)
 
+	app.UpgradeKeeper.SetUpgradeHandler(
+		v017.UpgradeName,
+		v017.CreateUpgradeHandler(app.mm, app.configurator, app.NodeKeeper),
+	)
+
 	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
 	if err != nil {
 		panic(fmt.Errorf("failed to read upgrade info from disk: %w", err))
@@ -871,6 +901,19 @@ func (app *App) setupUpgradeHandlers() {
 	if app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
 		return
 	}
+
+	var storeUpgrades *storetypes.StoreUpgrades
+
+	switch upgradeInfo.Name {
+	case v017.UpgradeName:
+		storeUpgrades = &storetypes.StoreUpgrades{
+			Added: []string{loanmoduletypes.StoreKey},
+		}
+	}
+
+	if storeUpgrades != nil {
+		app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, storeUpgrades))
+	}
 }
 
 // Name returns the name of the App
@@ -1035,6 +1078,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(modelmoduletypes.ModuleName)
 	paramsKeeper.Subspace(didmoduletypes.ModuleName)
 	paramsKeeper.Subspace(marketmoduletypes.ModuleName)
+	paramsKeeper.Subspace(loanmoduletypes.ModuleName)
 	// this line is used by starport scaffolding # stargate/app/paramSubspace
 
 	return paramsKeeper

app/upgrades/v0_1_7/constants.go

@@ -0,0 +1,6 @@
+package v017
+
+const (
+	UpgradeName = "v0.1.7"
+	UpgradeInfo = `'upgrade to v0.1.7'`
+)

app/upgrades/v0_1_7/upgrades.go

@@ -0,0 +1,21 @@
+package v017
+
+import (
+	nodekeeper "github.com/SaoNetwork/sao/x/node/keeper"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+	node nodekeeper.Keeper,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		logger := ctx.Logger().With("upgrade", UpgradeName)
+
+		logger.Debug("running module migrations ...")
+		return mm.RunMigrations(ctx, configurator, vm)
+	}
+}

config.yml

@@ -35,6 +35,10 @@ genesis:
             amount: "100000000000"
             denom: "sao"
         annual_percentage_yield : "1"
+    loan:
+      params:
+        InterestRatePerBlock: "0.0000000625"
+        minLiquidityRatio: "0.3"
     staking:
       params:
         bond_denom: "sao"