#627 update collateralize

plugin/dapp/collateralize/commands/cmd.go

@@ -55,7 +55,7 @@ func CollateralizeCreate(cmd *cobra.Command, args []string) {
 	params := &rpctypes.CreateTxIn{
 		Execer:     types.ExecName(pkt.CollateralizeX),
 		ActionName: "CollateralizeCreate",
-		Payload:    []byte(fmt.Sprintf("{\"balance\":%d}", balance)),
+		Payload:    []byte(fmt.Sprintf("{\"totalBalance\":%d}", balance)),
 	}
 
 	var res string
@@ -89,7 +89,7 @@ func CollateralizeBorrow(cmd *cobra.Command, args []string) {
 	params := &rpctypes.CreateTxIn{
 		Execer:     types.ExecName(pkt.CollateralizeX),
 		ActionName: "CollateralizeBorrow",
-		Payload:    []byte(fmt.Sprintf("{\"collateralizeID\":%s,\"value\":%d}", collateralizeID, value)),
+		Payload:    []byte(fmt.Sprintf("{\"collateralizeID\":\"%s\",\"value\":%d}", collateralizeID, value)),
 	}
 
 	var res string
@@ -111,6 +111,8 @@ func CollateralizeAppendRawTxCmd() *cobra.Command {
 func addCollateralizeAppendFlags(cmd *cobra.Command) {
 	cmd.Flags().StringP("collateralizeID", "g", "", "collateralize ID")
 	cmd.MarkFlagRequired("collateralizeID")
+	cmd.Flags().StringP("recordID", "r", "", "recordID")
+	cmd.MarkFlagRequired("recordID")
 	cmd.Flags().Uint64P("value", "v", 0, "value")
 	cmd.MarkFlagRequired("value")
 }
@@ -118,12 +120,13 @@ func addCollateralizeAppendFlags(cmd *cobra.Command) {
 func CollateralizeAppend(cmd *cobra.Command, args []string) {
 	rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
 	collateralizeID, _ := cmd.Flags().GetString("collateralizeID")
+	recordID, _ := cmd.Flags().GetString("recordID")
 	value, _ := cmd.Flags().GetUint64("value")
 
 	params := &rpctypes.CreateTxIn{
 		Execer:     types.ExecName(pkt.CollateralizeX),
 		ActionName: "CollateralizeAppend",
-		Payload:    []byte(fmt.Sprintf("{\"collateralizeID\":%s,\"value\":%d}", collateralizeID, value)),
+		Payload:    []byte(fmt.Sprintf("{\"collateralizeID\":\"%s\", \"recordID\":\"%s\", \"value\":%d}", collateralizeID, recordID, value)),
 	}
 
 	var res string
@@ -145,19 +148,19 @@ func CollateralizeRepayRawTxCmd() *cobra.Command {
 func addCollateralizeRepayFlags(cmd *cobra.Command) {
 	cmd.Flags().StringP("collateralizeID", "g", "", "collateralize ID")
 	cmd.MarkFlagRequired("collateralizeID")
-	cmd.Flags().Uint64P("value", "v", 0, "value")
-	cmd.MarkFlagRequired("value")
+	cmd.Flags().StringP("recordID", "r", "", "recordID")
+	cmd.MarkFlagRequired("recordID")
 }
 
 func CollateralizeRepay(cmd *cobra.Command, args []string) {
 	rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
 	collateralizeID, _ := cmd.Flags().GetString("collateralizeID")
-	value, _ := cmd.Flags().GetUint64("value")
+	recordID, _ := cmd.Flags().GetString("recordID")
 
 	params := &rpctypes.CreateTxIn{
 		Execer:     types.ExecName(pkt.CollateralizeX),
 		ActionName: "CollateralizeRepay",
-		Payload:    []byte(fmt.Sprintf("{\"collateralizeID\":%s,\"value\":%d}", collateralizeID, value)),
+		Payload:    []byte(fmt.Sprintf("{\"collateralizeID\":\"%s\",\"recordID\":\"%s\"}", collateralizeID, recordID)),
 	}
 
 	var res string
@@ -191,7 +194,7 @@ func CollateralizePriceFeed(cmd *cobra.Command, args []string) {
 	params := &rpctypes.CreateTxIn{
 		Execer:     types.ExecName(pkt.CollateralizeX),
 		ActionName: "CollateralizePriceFeed",
-		Payload:    []byte(fmt.Sprintf("{[\"price\":%s],[\"volume\":%d]}", price, volume)),
+		Payload:    []byte(fmt.Sprintf("{\"price\":[ %f ], \"volume\":[ %d ]}", price, volume)),
 	}
 
 	var res string
@@ -222,7 +225,7 @@ func CollateralizeClose(cmd *cobra.Command, args []string) {
 	params := &rpctypes.CreateTxIn{
 		Execer:     types.ExecName(pkt.CollateralizeX),
 		ActionName: "CollateralizeClose",
-		Payload:    []byte(fmt.Sprintf("{\"collateralizeID\":%s}", collateralizeID)),
+		Payload:    []byte(fmt.Sprintf("{\"collateralizeID\":\"%s\"}", collateralizeID)),
 	}
 
 	var res string
@@ -258,7 +261,7 @@ func CollateralizeManage(cmd *cobra.Command, args []string) {
 	params := &rpctypes.CreateTxIn{
 		Execer:     types.ExecName(pkt.CollateralizeX),
 		ActionName: "CollateralizeManage",
-		Payload:    []byte(fmt.Sprintf("{\"debtCeiling\":%d, \"liquidationRatio\":%f, \"stabilityFeeRatio\":%f, \"period\":%s}",
+		Payload:    []byte(fmt.Sprintf("{\"debtCeiling\":%d, \"liquidationRatio\":%f, \"stabilityFeeRatio\":%f, \"period\":%d}",
 			debtCeiling, liquidationRatio, stabilityFeeRatio, period)),
 	}
 
@@ -308,11 +311,15 @@ func CollateralizeQuery(cmd *cobra.Command, args []string) {
 	//	req.Index = index
 	//}
 
-	status, err := strconv.ParseInt(statusStr, 10, 32)
-	if err != nil {
-		fmt.Println(err)
-		cmd.Help()
-		return
+	var status int64
+	var err error
+	if statusStr != "" {
+		status, err = strconv.ParseInt(statusStr, 10, 32)
+		if err != nil {
+			fmt.Println(err)
+			cmd.Help()
+			return
+		}
 	}
 
 	if collateralizeID != "" {

plugin/dapp/collateralize/executor/exec_del_local.go

@@ -26,26 +26,34 @@ func (c *Collateralize) execDelLocal(tx *types.Transaction, receiptData *types.R
 				set.KV = append(set.KV, c.deleteCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.Index)...)
 				break
 			case pty.TyLogCollateralizeBorrow:
-				set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.RecordStatus, collateralizeLog.Index)...)
+				set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.Index)...)
 				set.KV = append(set.KV, c.deleteCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.Index)...)
 				break
-			case pty.TyLogCollateralizeAppend: // append没有状态变化
+			case pty.TyLogCollateralizeAppend:
+				if collateralizeLog.Status == pty.CollateralizeUserStatusWarning {
+					set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.PreStatus, collateralizeLog.CollateralizeId,
+						collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
+					set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.Index)...)
+					set.KV = append(set.KV, c.addCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.CollateralizeId,
+						collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
+					set.KV = append(set.KV, c.deleteCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.Index)...)
+				}
 				break
 			case pty.TyLogCollateralizeRepay:
-				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.RecordPreStatus, collateralizeLog.CollateralizeId,
+				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.PreStatus, collateralizeLog.CollateralizeId,
 					collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
-				set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.RecordStatus, collateralizeLog.Index)...)
+				set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.Index)...)
 				set.KV = append(set.KV, c.addCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.CollateralizeId,
 					collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
 				break
 			case pty.TyLogCollateralizeFeed:
-				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.RecordStatus, collateralizeLog.CollateralizeId,
+				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.CollateralizeId,
 					collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
-				set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.RecordStatus, collateralizeLog.Index)...)
+				set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.Index)...)
 				set.KV = append(set.KV, c.addCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.CollateralizeId,
 					collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
 				// 如果没有被清算，需要把地址索引更新
-				if collateralizeLog.RecordStatus == pty.CollateralizeUserStatusWarning || collateralizeLog.RecordStatus == pty.CollateralizeUserStatusExpire {
+				if collateralizeLog.Status == pty.CollateralizeUserStatusWarning || collateralizeLog.Status == pty.CollateralizeUserStatusExpire {
 					set.KV = append(set.KV, c.deleteCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.Index)...)
 				}
 				break

plugin/dapp/collateralize/executor/exec_local.go

@@ -27,33 +27,41 @@ func (c *Collateralize) execLocal(tx *types.Transaction, receipt *types.ReceiptD
 				set.KV = append(set.KV, c.addCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.CollateralizeId, collateralizeLog.Index)...)
 				break
 			case pty.TyLogCollateralizeBorrow:
-				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.RecordStatus, collateralizeLog.CollateralizeId,
+				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.CollateralizeId,
 					collateralizeLog.RecordId, collateralizeLog.Index)...)
 				set.KV = append(set.KV, c.addCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.CollateralizeId,
 					collateralizeLog.RecordId, collateralizeLog.Index)...)
 				break
-			case pty.TyLogCollateralizeAppend: //append没有状态变化
+			case pty.TyLogCollateralizeAppend:
+				if collateralizeLog.Status == pty.CollateralizeUserStatusWarning {
+					set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.PreStatus, collateralizeLog.PreIndex)...)
+					set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.CollateralizeId,
+						collateralizeLog.RecordId, collateralizeLog.Index)...)
+					set.KV = append(set.KV, c.deleteCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.PreIndex)...)
+					set.KV = append(set.KV, c.addCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.CollateralizeId,
+						collateralizeLog.RecordId, collateralizeLog.Index)...)
+				}
 				break
 			case pty.TyLogCollateralizeRepay:
-				set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.RecordPreStatus, collateralizeLog.PreIndex)...)
-				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.RecordStatus, collateralizeLog.CollateralizeId,
+				set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.PreStatus, collateralizeLog.PreIndex)...)
+				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.CollateralizeId,
 					collateralizeLog.RecordId, collateralizeLog.Index)...)
 				set.KV = append(set.KV, c.deleteCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.PreIndex)...)
 				break
 			case pty.TyLogCollateralizeFeed:
-				set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.RecordPreStatus, collateralizeLog.PreIndex)...)
-				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.RecordStatus, collateralizeLog.CollateralizeId,
+				set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.PreStatus, collateralizeLog.PreIndex)...)
+				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.CollateralizeId,
 					collateralizeLog.RecordId, collateralizeLog.Index)...)
 				set.KV = append(set.KV, c.deleteCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.PreIndex)...)
 				// 如果没有被清算，需要把地址索引更新
-				if collateralizeLog.RecordStatus == pty.CollateralizeUserStatusWarning || collateralizeLog.RecordStatus == pty.CollateralizeUserStatusExpire {
+				if collateralizeLog.Status == pty.CollateralizeUserStatusWarning || collateralizeLog.Status == pty.CollateralizeUserStatusExpire {
 					set.KV = append(set.KV, c.addCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.CollateralizeId,
 						collateralizeLog.RecordId, collateralizeLog.Index)...)
 				}
 				break
 			case pty.TyLogCollateralizeClose:
 				set.KV = append(set.KV, c.addCollateralizeStatus(collateralizeLog.Status, collateralizeLog.CollateralizeId, collateralizeLog.Index)...)
-				set.KV = append(set.KV, c.deleteCollateralizeStatus(pty.CollateralizeStatusCreated, collateralizeLog.PreIndex)...)
+				set.KV = append(set.KV, c.deleteCollateralizeStatus(collateralizeLog.PreStatus, collateralizeLog.PreIndex)...)
 				set.KV = append(set.KV, c.deleteCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.PreIndex)...)
 				break
 			}

plugin/dapp/collateralize/executor/keys.go

@@ -36,11 +36,6 @@ func calcCollateralizePriceKey(time string) []byte {
 	return []byte(key)
 }
 
-func calcCollateralizeLatestPriceKey() []byte {
-	key := fmt.Sprintf("LODB-collateralize-latest-price")
-	return []byte(key)
-}
-
 func calcCollateralizeRecordAddrPrefix(addr string) []byte {
 	key := fmt.Sprintf("LODB-collateralize-record-addr:%d", addr)
 	return []byte(key)

plugin/dapp/collateralize/proto/collateralize.proto

@@ -14,13 +14,11 @@ message Collateralize {
     repeated BorrowRecord borrowRecords  = 8; //借贷记录
     repeated BorrowRecord InvalidRecords = 9; //失效的借贷记录
     int32       status                   = 10;//当期借贷的状态，是否关闭
-    int32       collType                 = 11;//质押资产类型(1，bty，2，btc，3，eth...)
-    float       latestLiquidationPrice   = 12;//最高清算价格
-    int64       period                   = 13;//借贷最大期限
-    int64       latestExpireTime         = 14;//最近超期时间
-    int64       index                    = 15;//当前索引
-    int64       preIndex                 = 16;//上一个索引
-    int64       createIndex              = 17;//创建时的索引，用于close删除记录
+    float       latestLiquidationPrice   = 11;//最高清算价格
+    int64       period                   = 12;//借贷最大期限
+    int64       latestExpireTime         = 13;//最近超期时间
+    int64       index                    = 14;//当前索引
+    int64       preIndex                 = 15;//上一个索引
 }
 
 // 借出记录
@@ -36,6 +34,8 @@ message BorrowRecord {
     int64       expireTime           = 9; //超时清算时间
     int32       preStatus            = 10;//上一次抵押状态，用于告警恢复
     string      recordId             = 11;//借出id，标识一次借出记录
+    int64       index                = 12;//当前索引
+    int64       preIndex             = 13;//上级索引
 }
 
 // 资产价格记录
@@ -111,13 +111,12 @@ message ReceiptCollateralize {
     string      collateralizeId    = 1;
     string      createAddr         = 2;
     string      accountAddr        = 3;
-    int32       status             = 4;
-    int64       index              = 5;
-    int32       recordStatus       = 6;
-    int32       recordPreStatus    = 7;
-    string      recordId           = 8;
-    int64       preIndex           = 9;
-}
+    string      recordId           = 4;
+    int32       status             = 5;
+    int32       PreStatus          = 6;
+    int64       index              = 7;
+    int64       preIndex           = 8;
+ }
 
 // exec_local 借贷记录信息
 message CollateralizeRecord {

plugin/dapp/collateralize/types/collateralize.go

@@ -93,7 +93,7 @@ func (Collateralize CollateralizeType) CreateTx(action string, message json.RawM
 			return nil, types.ErrInvalidParam
 		}
 		return CreateRawCollateralizeAppendTx(&param)
-	} else if action == "CollateralizeFeed" {
+	} else if action == "CollateralizePriceFeed" {
 		var param CollateralizeFeedTx
 		err := json.Unmarshal(message, &param)
 		if err != nil {

plugin/dapp/collateralize/types/types.go

@@ -26,7 +26,7 @@ const (
 // Collateralize name
 const (
 	CollateralizeX = "collateralize"
-	CCNYTokenName = "ccny"
+	CCNYTokenName = "CCNY"
 	CollateralizePreLiquidationRatio = 1.1 //TODO 预清算比例，抵押物价值跌到借出ccny价值110%的时候开始清算
 )
 
@@ -36,11 +36,12 @@ const (
 	CollateralizeStatusClose
 )
 
-const (
-	CollateralizeAssetTypeBty = 1 + iota
-	CollateralizeAssetTypeBtc
-	CollateralizeAssetTypeEth
-)
+//暂时只支持bty
+//const (
+//	CollateralizeAssetTypeBty = 1 + iota
+//	CollateralizeAssetTypeBtc
+//	CollateralizeAssetTypeEth
+//)
 
 const (
 	CollateralizeUserStatusCreate = 1 + iota

plugin/dapp/issuance/executor/issuancedb.go

@@ -32,12 +32,6 @@ const (
 	ExpireWarningTime         = 3600 * 24 * 10  // 提前10天超时预警
 )
 
-const (
-	priceFeedKey = "issuance-price-feed"
-	guarantorKey = "issuance-guarantor"
-	manageKey    = "issuance-manage"
-)
-
 func getManageKey(key string, db dbm.KV) ([]byte, error) {
 	manageKey := types.ManageKey(key)
 	value, err := db.Get([]byte(manageKey))
@@ -48,7 +42,7 @@ func getManageKey(key string, db dbm.KV) ([]byte, error) {
 }
 
 func getGuarantorAddr(db dbm.KV) (string, error) {
-	value, err := getManageKey(guarantorKey, db)
+	value, err := getManageKey(pty.GuarantorKey, db)
 	if err != nil {
 		clog.Error("IssuancePriceFeed", "getGuarantorAddr", err)
 		return "", err
@@ -323,7 +317,7 @@ func (action *Action) IssuanceManage(manage *pty.IssuanceManage) (*types.Receipt
 	var receipt *types.Receipt
 
 	// 是否配置管理用户
-	if !isRightAddr(manageKey, action.fromaddr, action.db) {
+	if !isRightAddr(pty.ManageKey, action.fromaddr, action.db) {
 		clog.Error("IssuanceManage", "addr", action.fromaddr, "error", "Address has no permission to config")
 		return nil, pty.ErrPermissionDeny
 	}
@@ -384,7 +378,7 @@ func (action *Action) IssuanceCreate(create *pty.IssuanceCreate) (*types.Receipt
 	var receipt *types.Receipt
 
 	// 是否配置管理用户
-	if !isRightAddr(manageKey, action.fromaddr, action.db) {
+	if !isRightAddr(pty.ManageKey, action.fromaddr, action.db) {
 		clog.Error("IssuanceCreate", "addr", action.fromaddr, "error", "Address has no permission to create")
 		return nil, pty.ErrPermissionDeny
 	}
@@ -859,7 +853,7 @@ func (action *Action) IssuanceFeed(feed *pty.IssuanceFeed) (*types.Receipt, erro
 	}
 
 	// 是否后台管理用户
-	if !isRightAddr(priceFeedKey, action.fromaddr, action.db) {
+	if !isRightAddr(pty.PriceFeedKey, action.fromaddr, action.db) {
 		clog.Error("IssuancePriceFeed", "addr", action.fromaddr, "error", "Address has no permission to feed price")
 		return nil, pty.ErrPermissionDeny
 	}
@@ -933,7 +927,7 @@ func (action *Action) IssuanceClose(close *pty.IssuanceClose) (*types.Receipt, e
 		return nil, err
 	}
 
-	if !isRightAddr(manageKey, action.fromaddr, action.db) {
+	if !isRightAddr(pty.ManageKey, action.fromaddr, action.db) {
 		clog.Error("IssuanceClose", "addr", action.fromaddr, "error", "Address has no permission to close")
 		return nil, pty.ErrPermissionDeny
 	}

plugin/dapp/issuance/types/types.go

@@ -41,4 +41,10 @@ const (
 	IssuanceUserStatusExpire
 	IssuanceUserStatusExpireLiquidate
 	IssuanceUserStatusClose
+)
+
+const (
+	PriceFeedKey = "issuance-price-feed"
+	GuarantorKey = "issuance-guarantor"
+	ManageKey    = "issuance-manage"
 )
\ No newline at end of file