Skip to content

P
plugin
Commit 2e4b635d authored by pengjun's avatar pengjun
Browse files
Options

#627 remove collateralize close; add collateralize retrieve

parent 5523229c
Hide whitespace changes
Inline Side-by-side
Showing with 257 additions and 218 deletions
plugin/dapp/collateralize/commands/cmd.go
View file @ 2e4b635d
......@@ -24,7 +24,7 @@ func CollateralizeCmd() *cobra.Command {
CollateralizeAppendRawTxCmd(),
CollateralizeRepayRawTxCmd(),
CollateralizePriceFeedRawTxCmd(),
CollateralizeCloseRawTxCmd(),
CollateralizeRetrieveRawTxCmd(),
CollateralizeManageRawTxCmd(),
CollateralizeQueryCmd(),
)
......@@ -233,22 +233,24 @@ func CollateralizePriceFeed(cmd *cobra.Command, args []string) {
}
// CollateralizeCloseRawTxCmd 生成开始交易命令行
func CollateralizeCloseRawTxCmd() *cobra.Command {
func CollateralizeRetrieveRawTxCmd() *cobra.Command {
cmd := &cobra.Command{
Use: "close",
Short: "close a collateralize",
Run: CollateralizeClose,
Use: "retrieve",
Short: "retrieve balance",
Run: CollateralizeRetrieve,
}
addCollateralizeCloseFlags(cmd)
addCollateralizeRetrieveFlags(cmd)
return cmd
}
func addCollateralizeCloseFlags(cmd *cobra.Command) {
func addCollateralizeRetrieveFlags(cmd *cobra.Command) {
cmd.Flags().StringP("collateralizeID", "g", "", "collateralize ID")
cmd.MarkFlagRequired("collateralizeID")
cmd.Flags().StringP("balance", "b", "", "retrieve balance")
cmd.MarkFlagRequired("balance")
}
func CollateralizeClose(cmd *cobra.Command, args []string) {
func CollateralizeRetrieve(cmd *cobra.Command, args []string) {
title, _ := cmd.Flags().GetString("title")
cfg := types.GetCliSysParam(title)
if cfg == nil {
......@@ -257,11 +259,12 @@ func CollateralizeClose(cmd *cobra.Command, args []string) {
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
collateralizeID, _ := cmd.Flags().GetString("collateralizeID")
balance, _ := cmd.Flags().GetInt64("balance")
params := &rpctypes.CreateTxIn{
Execer: cfg.ExecName(pkt.CollateralizeX),
ActionName: "CollateralizeClose",
Payload: []byte(fmt.Sprintf("{\"collateralizeID\":\"%s\"}", collateralizeID)),
ActionName: "CollateralizeRetrieve",
Payload: []byte(fmt.Sprintf("{\"collateralizeID\":\"%s\", \"balance\": %d}", collateralizeID, balance)),
}
var res string
......
plugin/dapp/collateralize/executor/collateralize_test.go
View file @ 2e4b635d
......@@ -528,11 +528,12 @@ func TestCollateralize(t *testing.T) {
assert.NotNil(t, res)
// collateralize close
p11 := &pkt.CollateralizeCloseTx{
// collateralize retrieve
p11 := &pkt.CollateralizeRetrieveTx{
CollateralizeID: common.ToHex(collateralizeID),
Balance:100,
}
createTx, err = pkt.CreateRawCollateralizeCloseTx(env.cfg, p11)
createTx, err = pkt.CreateRawCollateralizeRetrieveTx(env.cfg, p11)
if err != nil {
t.Error("RPC_Default_Process", "err", err)
}
......@@ -558,7 +559,7 @@ func TestCollateralize(t *testing.T) {
env.kvdb.Set(kv.Key, kv.Value)
}
// query collateralize by status
res, err = exec.Query("CollateralizeByStatus", types.Encode(&pkt.ReqCollateralizeByStatus{Status:2}))
res, err = exec.Query("CollateralizeByStatus", types.Encode(&pkt.ReqCollateralizeByStatus{Status:1}))
assert.Nil(t, err)
assert.NotNil(t, res)
}
......
plugin/dapp/collateralize/executor/collateralizedb.go
View file @ 2e4b635d
......@@ -206,7 +206,7 @@ func (action *Action) GetFeedReceiptLog(collateralize *pty.Collateralize, record
// GetCloseReceiptLog generate logs for Collateralize close action
func (action *Action) GetCloseReceiptLog(collateralize *pty.Collateralize) *types.ReceiptLog {
log := &types.ReceiptLog{}
log.Ty = pty.TyLogCollateralizeClose
log.Ty = pty.TyLogCollateralizeRetrieve
c := &pty.ReceiptCollateralize{}
c.CollateralizeId = collateralize.CollateralizeId
......@@ -368,18 +368,16 @@ func (action *Action) CollateralizeCreate(create *pty.CollateralizeCreate) (*typ
return nil, pty.ErrPermissionDeny
}
collateralizeID := common.ToHex(action.txhash)
// 检查ccny余额
if !action.CheckExecTokenAccount(action.fromaddr, create.TotalBalance, false) {
clog.Error("CollateralizeCreate", "fromaddr", action.fromaddr, "balance", create.TotalBalance, "error", types.ErrInsufficientBalance)
return nil, types.ErrInsufficientBalance
}
// 查找ID是否重复
_, err := queryCollateralizeByID(action.db, collateralizeID)
// 根据地址查找ID
collateralizeIDs, err := queryCollateralizeByAddr(action.localDB, action.fromaddr, pty.CollateralizeStatusCreated, 0)
if err != types.ErrNotFound {
clog.Error("CollateralizeCreate", "CollateralizeCreate repeated", collateralizeID)
clog.Error("CollateralizeCreate.queryCollateralizeByAddr", "addr", action.fromaddr)
return nil, pty.ErrCollateralizeRepeatHash
}
......@@ -392,35 +390,46 @@ func (action *Action) CollateralizeCreate(create *pty.CollateralizeCreate) (*typ
logs = append(logs, receipt.Logs...)
kv = append(kv, receipt.KV...)
// 获取借贷配置
var collcfg *pty.CollateralizeManage
cfg, err := getCollateralizeConfig(action.db)
if cfg == nil {
collcfg = &pty.CollateralizeManage{
DebtCeiling:DefaultDebtCeiling,
LiquidationRatio:DefaultLiquidationRatio,
StabilityFeeRatio:DefaultStabilityFeeRation,
Period:DefaultPeriod,
CollTotalBalance:DefaultCollTotalBalance,
var collateralizeID string
coll := &CollateralizeDB{}
if collateralizeIDs == nil {
collateralizeID = common.ToHex(action.txhash)
// 获取借贷配置
var collcfg *pty.CollateralizeManage
cfg, _ := getCollateralizeConfig(action.db)
if cfg == nil {
collcfg = &pty.CollateralizeManage{
DebtCeiling:DefaultDebtCeiling,
LiquidationRatio:DefaultLiquidationRatio,
StabilityFeeRatio:DefaultStabilityFeeRation,
Period:DefaultPeriod,
CollTotalBalance:DefaultCollTotalBalance,
}
} else {
collcfg = cfg
}
// 构造coll结构
coll.CollateralizeId = collateralizeID
coll.LiquidationRatio = collcfg.LiquidationRatio
coll.TotalBalance = create.TotalBalance
coll.DebtCeiling = collcfg.DebtCeiling
coll.StabilityFeeRatio = collcfg.StabilityFeeRatio
coll.Period = collcfg.Period
coll.Balance = create.TotalBalance
coll.CreateAddr = action.fromaddr
coll.Status = pty.CollateralizeActionCreate
coll.Index = action.GetIndex()
coll.CollBalance = 0
} else {
collcfg = cfg
collateralize, err := queryCollateralizeByID(action.db, collateralizeIDs[0])
if err != nil {
clog.Error("CollateralizeCreate.queryCollateralizeByID", "addr", action.fromaddr, "execaddr", action.execaddr, "collId", collateralizeIDs[0])
return nil, err
}
coll.Collateralize = *collateralize
coll.TotalBalance += create.TotalBalance
}
// 构造coll结构
coll := &CollateralizeDB{}
coll.CollateralizeId = collateralizeID
coll.LiquidationRatio = collcfg.LiquidationRatio
coll.TotalBalance = create.TotalBalance
coll.DebtCeiling = collcfg.DebtCeiling
coll.StabilityFeeRatio = collcfg.StabilityFeeRatio
coll.Period = collcfg.Period
coll.Balance = create.TotalBalance
coll.CreateAddr = action.fromaddr
coll.Status = pty.CollateralizeActionCreate
coll.Index = action.GetIndex()
coll.CollBalance = 0
clog.Debug("CollateralizeCreate created", "CollateralizeID", collateralizeID, "TotalBalance", coll.TotalBalance)
// 保存
......@@ -1077,45 +1086,55 @@ func (action *Action) CollateralizeFeed(feed *pty.CollateralizeFeed) (*types.Rec
return receipt, nil
}
// CollateralizeClose 终止借贷
func (action *Action) CollateralizeClose(close *pty.CollateralizeClose) (*types.Receipt, error) {
// CollateralizeRetrieve 收回未放贷
func (action *Action) CollateralizeRetrieve(retrieve *pty.CollateralizeRetrieve) (*types.Receipt, error) {
var logs []*types.ReceiptLog
var kv []*types.KeyValue
var receipt *types.Receipt
collateralize, err := queryCollateralizeByID(action.db, close.CollateralizeId)
collateralize, err := queryCollateralizeByID(action.db, retrieve.CollateralizeId)
if err != nil {
clog.Error("CollateralizeClose", "CollateralizeId", close.CollateralizeId, "err", err)
clog.Error("CollateralizeRetrieve", "CollateralizeId", retrieve.CollateralizeId, "err", err)
return nil, err
}
if action.fromaddr != collateralize.CreateAddr {
clog.Error("CollateralizeClose", "CollateralizeId", close.CollateralizeId, "err", "account error", "create", collateralize.CreateAddr, "from", action.fromaddr)
clog.Error("CollateralizeRetrieve", "CollateralizeId", retrieve.CollateralizeId, "err", "account error", "create", collateralize.CreateAddr, "from", action.fromaddr)
return nil, pty.ErrPermissionDeny
}
for _, borrowRecord := range collateralize.BorrowRecords {
if borrowRecord.Status != pty.CollateralizeUserStatusClose {
clog.Error("CollateralizeClose", "CollateralizeId", close.CollateralizeId, "addr", action.fromaddr, "execaddr", action.execaddr, "err", pty.ErrCollateralizeRecordNotEmpty)
return nil, pty.ErrCollateralizeRecordNotEmpty
}
}
//for _, borrowRecord := range collateralize.BorrowRecords {
// if borrowRecord.Status != pty.CollateralizeUserStatusClose {
// clog.Error("CollateralizeRetrieve", "CollateralizeId", retrieve.CollateralizeId, "addr", action.fromaddr, "execaddr", action.execaddr, "err", pty.ErrCollateralizeRecordNotEmpty)
// return nil, pty.ErrCollateralizeRecordNotEmpty
// }
//}
// 收回金额不能大于待放出金额
if retrieve.Balance > collateralize.Balance {
clog.Error("CollateralizeRetrieve", "CollateralizeId", retrieve.CollateralizeId, "err", "balance error", "retrieve balance", retrieve.Balance, "available balance", collateralize.Balance)
return nil, pty.ErrPermissionDeny
}
// 解冻ccny
receipt, err = action.tokenAccount.ExecActive(action.fromaddr, action.execaddr, collateralize.Balance*Coin)
receipt, err = action.tokenAccount.ExecActive(action.fromaddr, action.execaddr, retrieve.Balance*Coin)
if err != nil {
clog.Error("IssuanceClose.ExecActive", "addr", action.fromaddr, "execaddr", action.execaddr, "amount", collateralize.TotalBalance)
clog.Error("IssuanceClose.ExecActive", "addr", action.fromaddr, "execaddr", action.execaddr, "balance", retrieve.Balance)
return nil, err
}
logs = append(logs, receipt.Logs...)
kv = append(kv, receipt.KV...)
clog.Debug("CollateralizeClose", "ID", close.CollateralizeId)
clog.Debug("CollateralizeRetrieve", "ID", retrieve.CollateralizeId, "balance", retrieve.Balance)
coll := &CollateralizeDB{*collateralize}
coll.Status = pty.CollateralizeStatusClose
coll.PreIndex = coll.Index
coll.Index = action.GetIndex()
coll.TotalBalance -= retrieve.Balance
coll.Balance -= retrieve.Balance
if coll.TotalBalance == 0 {
coll.PreIndex = coll.Index
coll.Index = action.GetIndex()
coll.Status = pty.CollateralizeStatusClose
}
coll.Save(action.db)
kv = append(kv, coll.GetKVSet()...)
......
plugin/dapp/collateralize/executor/exec.go
View file @ 2e4b635d
......@@ -39,10 +39,10 @@ func (c *Collateralize) Exec_Feed(payload *pty.CollateralizeFeed, tx *types.Tran
return actiondb.CollateralizeFeed(payload)
}
// Exec_Close Action
func (c *Collateralize) Exec_Close(payload *pty.CollateralizeClose, tx *types.Transaction, index int) (*types.Receipt, error) {
// Exec_Retrieve Action
func (c *Collateralize) Exec_Retrieve(payload *pty.CollateralizeRetrieve, tx *types.Transaction, index int) (*types.Receipt, error) {
actiondb := NewCollateralizeAction(c, tx, index)
return actiondb.CollateralizeClose(payload)
return actiondb.CollateralizeRetrieve(payload)
}
// Exec_Close Action
......
plugin/dapp/collateralize/executor/exec_del_local.go
View file @ 2e4b635d
......@@ -13,7 +13,7 @@ func (c *Collateralize) execDelLocal(tx *types.Transaction, receiptData *types.R
set := &types.LocalDBSet{}
for _, item := range receiptData.Logs {
if item.Ty == pty.TyLogCollateralizeCreate || item.Ty == pty.TyLogCollateralizeBorrow || item.Ty == pty.TyLogCollateralizeAppend ||
item.Ty == pty.TyLogCollateralizeRepay || item.Ty == pty.TyLogCollateralizeFeed || item.Ty == pty.TyLogCollateralizeClose {
item.Ty == pty.TyLogCollateralizeRepay || item.Ty == pty.TyLogCollateralizeFeed || item.Ty == pty.TyLogCollateralizeRetrieve {
var collateralizeLog pty.ReceiptCollateralize
err := types.Decode(item.Log, &collateralizeLog)
if err != nil {
......@@ -57,12 +57,14 @@ func (c *Collateralize) execDelLocal(tx *types.Transaction, receiptData *types.R
// set.KV = append(set.KV, c.deleteCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.Index)...)
//}
break
case pty.TyLogCollateralizeClose:
set.KV = append(set.KV, c.deleteCollateralizeStatus(collateralizeLog.Status, collateralizeLog.Index)...)
set.KV = append(set.KV, c.addCollateralizeStatus(pty.CollateralizeStatusCreated, collateralizeLog.CollateralizeId,
collateralizeLog.PreIndex)...)
//set.KV = append(set.KV, c.addCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.CollateralizeId,
// collateralizeLog.PreStatus, collateralizeLog.PreIndex)...)
case pty.TyLogCollateralizeRetrieve:
if collateralizeLog.Status == pty.CollateralizeStatusClose {
set.KV = append(set.KV, c.deleteCollateralizeStatus(collateralizeLog.Status, collateralizeLog.Index)...)
set.KV = append(set.KV, c.addCollateralizeStatus(pty.CollateralizeStatusCreated, collateralizeLog.CollateralizeId,
collateralizeLog.PreIndex)...)
//set.KV = append(set.KV, c.addCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.CollateralizeId,
// collateralizeLog.PreStatus, collateralizeLog.PreIndex)...)
}
break
}
}
......@@ -96,8 +98,8 @@ func (c *Collateralize) ExecDelLocal_Feed(payload *pty.CollateralizeFeed, tx *ty
return c.execDelLocal(tx, receiptData)
}
// ExecDelLocal_Close Action
func (c *Collateralize) ExecDelLocal_Close(payload *pty.CollateralizeClose, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
// ExecDelLocal_Retrieve Action
func (c *Collateralize) ExecDelLocal_Retrieve(payload *pty.CollateralizeRetrieve, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
return c.execDelLocal(tx, receiptData)
}
......
plugin/dapp/collateralize/executor/exec_local.go
View file @ 2e4b635d
......@@ -14,7 +14,7 @@ func (c *Collateralize) execLocal(tx *types.Transaction, receipt *types.ReceiptD
set := &types.LocalDBSet{}
for _, item := range receipt.Logs {
if item.Ty == pty.TyLogCollateralizeCreate || item.Ty == pty.TyLogCollateralizeBorrow || item.Ty == pty.TyLogCollateralizeAppend ||
item.Ty == pty.TyLogCollateralizeRepay || item.Ty == pty.TyLogCollateralizeFeed || item.Ty == pty.TyLogCollateralizeClose {
item.Ty == pty.TyLogCollateralizeRepay || item.Ty == pty.TyLogCollateralizeFeed || item.Ty == pty.TyLogCollateralizeRetrieve {
var collateralizeLog pty.ReceiptCollateralize
err := types.Decode(item.Log, &collateralizeLog)
if err != nil {
......@@ -59,10 +59,12 @@ func (c *Collateralize) execLocal(tx *types.Transaction, receipt *types.ReceiptD
// 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(collateralizeLog.PreStatus, collateralizeLog.PreIndex)...)
//set.KV = append(set.KV, c.deleteCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.PreIndex)...)
case pty.TyLogCollateralizeRetrieve:
if collateralizeLog.Status == pty.CollateralizeStatusClose {
set.KV = append(set.KV, c.addCollateralizeStatus(collateralizeLog.Status, collateralizeLog.CollateralizeId, collateralizeLog.Index)...)
set.KV = append(set.KV, c.deleteCollateralizeStatus(collateralizeLog.PreStatus, collateralizeLog.PreIndex)...)
//set.KV = append(set.KV, c.deleteCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.PreIndex)...)
}
break
}
}
......@@ -95,8 +97,8 @@ func (c *Collateralize) ExecLocal_Feed(payload *pty.CollateralizeFeed, tx *types
return c.execLocal(tx, receiptData)
}
// ExecLocal_Close Action
func (c *Collateralize) ExecLocal_Close(payload *pty.CollateralizeClose, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
// ExecLocal_Retrieve Action
func (c *Collateralize) ExecLocal_Retrieve(payload *pty.CollateralizeRetrieve, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
return c.execLocal(tx, receiptData)
}
......
plugin/dapp/collateralize/proto/collateralize.proto
View file @ 2e4b635d
......@@ -51,13 +51,13 @@ message AssetPriceRecord {
// action
message CollateralizeAction {
oneof value {
CollateralizeCreate create = 1; //创建一期借贷
CollateralizeBorrow borrow = 2; //借贷
CollateralizeRepay repay = 3; //清算
CollateralizeAppend append = 4; //追加
CollateralizeFeed feed = 5; //喂价
CollateralizeClose close = 6; //关闭
CollateralizeManage manage = 7; //全局配置
CollateralizeCreate create = 1; //创建一期借贷
CollateralizeBorrow borrow = 2; //借贷
CollateralizeRepay repay = 3; //清算
CollateralizeAppend append = 4; //追加
CollateralizeFeed feed = 5; //喂价
CollateralizeRetrieve retrieve = 6; //收回
CollateralizeManage manage = 7; //全局配置
}
int32 ty = 10;
}
......@@ -105,9 +105,10 @@ message CollateralizeFeed {
repeated int64 volume = 3; //成交量
}
// 放贷关闭
message CollateralizeClose {
// 收回
message CollateralizeRetrieve {
string collateralizeId = 1; //借贷期数ID
int64 balance = 2; //收回金额
}
// exec_local 放贷信息
......
plugin/dapp/collateralize/types/collateralize.go
View file @ 2e4b635d
......@@ -57,7 +57,7 @@ func (collateralize *CollateralizeType) GetLogMap() map[int64]*types.LogInfo {
TyLogCollateralizeRepay: {Ty: reflect.TypeOf(ReceiptCollateralize{}), Name: "LogCollateralizeRepay"},
TyLogCollateralizeAppend: {Ty: reflect.TypeOf(ReceiptCollateralize{}), Name: "LogCollateralizeAppend"},
TyLogCollateralizeFeed: {Ty: reflect.TypeOf(ReceiptCollateralize{}), Name: "LogCollateralizeFeed"},
TyLogCollateralizeClose: {Ty: reflect.TypeOf(ReceiptCollateralize{}), Name: "LogCollateralizeClose"},
TyLogCollateralizeRetrieve: {Ty: reflect.TypeOf(ReceiptCollateralize{}), Name: "LogCollateralizeRetrieve"},
}
}
......@@ -111,14 +111,14 @@ func (collateralize CollateralizeType) CreateTx(action string, message json.RawM
return nil, types.ErrInvalidParam
}
return CreateRawCollateralizeFeedTx(cfg, &param)
} else if action == "CollateralizeClose" {
var param CollateralizeCloseTx
} else if action == "CollateralizeRetrive" {
var param CollateralizeRetrieveTx
err := json.Unmarshal(message, &param)
if err != nil {
llog.Error("CreateTx", "Error", err)
return nil, types.ErrInvalidParam
}
return CreateRawCollateralizeCloseTx(cfg, &param)
return CreateRawCollateralizeRetrieveTx(cfg, &param)
} else if action == "CollateralizeManage" {
var param CollateralizeManageTx
err := json.Unmarshal(message, &param)
......@@ -135,13 +135,13 @@ func (collateralize CollateralizeType) CreateTx(action string, message json.RawM
// GetTypeMap method
func (collateralize CollateralizeType) GetTypeMap() map[string]int32 {
return map[string]int32{
"Create": CollateralizeActionCreate,
"Borrow": CollateralizeActionBorrow,
"Repay": CollateralizeActionRepay,
"Append": CollateralizeActionAppend,
"Feed": CollateralizeActionFeed,
"Close": CollateralizeActionClose,
"Manage": CollateralizeActionManage,
"Create": CollateralizeActionCreate,
"Borrow": CollateralizeActionBorrow,
"Repay": CollateralizeActionRepay,
"Append": CollateralizeActionAppend,
"Feed": CollateralizeActionFeed,
"Retrieve": CollateralizeActionRetrieve,
"Manage": CollateralizeActionManage,
}
}
......@@ -290,19 +290,20 @@ func CreateRawCollateralizeFeedTx(cfg *types.Chain33Config, parm *CollateralizeF
return tx, nil
}
// CreateRawCollateralizeCloseTx method
func CreateRawCollateralizeCloseTx(cfg *types.Chain33Config, parm *CollateralizeCloseTx) (*types.Transaction, error) {
// CreateRawCollateralizeRetrieveTx method
func CreateRawCollateralizeRetrieveTx(cfg *types.Chain33Config, parm *CollateralizeRetrieveTx) (*types.Transaction, error) {
if parm == nil {
llog.Error("CreateRawCollateralizeCloseTx", "parm", parm)
return nil, types.ErrInvalidParam
}
v := &CollateralizeClose{
v := &CollateralizeRetrieve{
CollateralizeId: parm.CollateralizeID,
Balance: parm.Balance,
}
close := &CollateralizeAction{
Ty: CollateralizeActionClose,
Value: &CollateralizeAction_Close{v},
Ty: CollateralizeActionRetrieve,
Value: &CollateralizeAction_Retrieve{v},
}
tx := &types.Transaction{
Execer: []byte(cfg.ExecName(CollateralizeX)),
......
plugin/dapp/collateralize/types/collateralize.pb.go
View file @ 2e4b635d
......@@ -396,7 +396,7 @@ type CollateralizeAction struct {
// *CollateralizeAction_Repay
// *CollateralizeAction_Append
// *CollateralizeAction_Feed
// *CollateralizeAction_Close
// *CollateralizeAction_Retrieve
// *CollateralizeAction_Manage
Value isCollateralizeAction_Value `protobuf_oneof:"value"`
Ty int32 `protobuf:"varint,10,opt,name=ty,proto3" json:"ty,omitempty"`
......@@ -454,8 +454,8 @@ type CollateralizeAction_Feed struct {
Feed *CollateralizeFeed `protobuf:"bytes,5,opt,name=feed,proto3,oneof"`
}
type CollateralizeAction_Close struct {
Close *CollateralizeClose `protobuf:"bytes,6,opt,name=close,proto3,oneof"`
type CollateralizeAction_Retrieve struct {
Retrieve *CollateralizeRetrieve `protobuf:"bytes,6,opt,name=retrieve,proto3,oneof"`
}
type CollateralizeAction_Manage struct {
......@@ -472,7 +472,7 @@ func (*CollateralizeAction_Append) isCollateralizeAction_Value() {}
func (*CollateralizeAction_Feed) isCollateralizeAction_Value() {}
func (*CollateralizeAction_Close) isCollateralizeAction_Value() {}
func (*CollateralizeAction_Retrieve) isCollateralizeAction_Value() {}
func (*CollateralizeAction_Manage) isCollateralizeAction_Value() {}
......@@ -518,9 +518,9 @@ func (m *CollateralizeAction) GetFeed() *CollateralizeFeed {
return nil
}
func (m *CollateralizeAction) GetClose() *CollateralizeClose {
if x, ok := m.GetValue().(*CollateralizeAction_Close); ok {
return x.Close
func (m *CollateralizeAction) GetRetrieve() *CollateralizeRetrieve {
if x, ok := m.GetValue().(*CollateralizeAction_Retrieve); ok {
return x.Retrieve
}
return nil
}
......@@ -547,7 +547,7 @@ func (*CollateralizeAction) XXX_OneofWrappers() []interface{} {
(*CollateralizeAction_Repay)(nil),
(*CollateralizeAction_Append)(nil),
(*CollateralizeAction_Feed)(nil),
(*CollateralizeAction_Close)(nil),
(*CollateralizeAction_Retrieve)(nil),
(*CollateralizeAction_Manage)(nil),
}
}
......@@ -918,46 +918,54 @@ func (m *CollateralizeFeed) GetVolume() []int64 {
return nil
}
// 放贷关闭
type CollateralizeClose struct {
// 收回
type CollateralizeRetrieve struct {
CollateralizeId string `protobuf:"bytes,1,opt,name=collateralizeId,proto3" json:"collateralizeId,omitempty"`
Balance int64 `protobuf:"varint,2,opt,name=balance,proto3" json:"balance,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *CollateralizeClose) Reset() { *m = CollateralizeClose{} }
func (m *CollateralizeClose) String() string { return proto.CompactTextString(m) }
func (*CollateralizeClose) ProtoMessage() {}
func (*CollateralizeClose) Descriptor() ([]byte, []int) {
func (m *CollateralizeRetrieve) Reset() { *m = CollateralizeRetrieve{} }
func (m *CollateralizeRetrieve) String() string { return proto.CompactTextString(m) }
func (*CollateralizeRetrieve) ProtoMessage() {}
func (*CollateralizeRetrieve) Descriptor() ([]byte, []int) {
return fileDescriptor_a988fb4a61381972, []int{11}
}
func (m *CollateralizeClose) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_CollateralizeClose.Unmarshal(m, b)
func (m *CollateralizeRetrieve) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_CollateralizeRetrieve.Unmarshal(m, b)
}
func (m *CollateralizeClose) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_CollateralizeClose.Marshal(b, m, deterministic)
func (m *CollateralizeRetrieve) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_CollateralizeRetrieve.Marshal(b, m, deterministic)
}
func (m *CollateralizeClose) XXX_Merge(src proto.Message) {
xxx_messageInfo_CollateralizeClose.Merge(m, src)
func (m *CollateralizeRetrieve) XXX_Merge(src proto.Message) {
xxx_messageInfo_CollateralizeRetrieve.Merge(m, src)
}
func (m *CollateralizeClose) XXX_Size() int {
return xxx_messageInfo_CollateralizeClose.Size(m)
func (m *CollateralizeRetrieve) XXX_Size() int {
return xxx_messageInfo_CollateralizeRetrieve.Size(m)
}
func (m *CollateralizeClose) XXX_DiscardUnknown() {
xxx_messageInfo_CollateralizeClose.DiscardUnknown(m)
func (m *CollateralizeRetrieve) XXX_DiscardUnknown() {
xxx_messageInfo_CollateralizeRetrieve.DiscardUnknown(m)
}
var xxx_messageInfo_CollateralizeClose proto.InternalMessageInfo
var xxx_messageInfo_CollateralizeRetrieve proto.InternalMessageInfo
func (m *CollateralizeClose) GetCollateralizeId() string {
func (m *CollateralizeRetrieve) GetCollateralizeId() string {
if m != nil {
return m.CollateralizeId
}
return ""
}
func (m *CollateralizeRetrieve) GetBalance() int64 {
if m != nil {
return m.Balance
}
return 0
}
// exec_local 放贷信息
type ReceiptCollateralize struct {
CollateralizeId string `protobuf:"bytes,1,opt,name=collateralizeId,proto3" json:"collateralizeId,omitempty"`
......@@ -1938,7 +1946,7 @@ func init() {
proto.RegisterType((*CollateralizeRepay)(nil), "types.CollateralizeRepay")
proto.RegisterType((*CollateralizeAppend)(nil), "types.CollateralizeAppend")
proto.RegisterType((*CollateralizeFeed)(nil), "types.CollateralizeFeed")
proto.RegisterType((*CollateralizeClose)(nil), "types.CollateralizeClose")
proto.RegisterType((*CollateralizeRetrieve)(nil), "types.CollateralizeRetrieve")
proto.RegisterType((*ReceiptCollateralize)(nil), "types.ReceiptCollateralize")
proto.RegisterType((*CollateralizeRecord)(nil), "types.CollateralizeRecord")
proto.RegisterType((*CollateralizeRecords)(nil), "types.CollateralizeRecords")
......@@ -1961,84 +1969,85 @@ func init() {
func init() { proto.RegisterFile("collateralize.proto", fileDescriptor_a988fb4a61381972) }
var fileDescriptor_a988fb4a61381972 = []byte{
// 1257 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xdd, 0x6e, 0xdc, 0x44,
0x14, 0xae, 0xed, 0xfd, 0xc9, 0x9e, 0x4d, 0xd2, 0x74, 0x12, 0x8a, 0x09, 0x51, 0xb4, 0xb2, 0x90,
0x58, 0x01, 0x8d, 0x44, 0x5a, 0x21, 0x2a, 0x24, 0x44, 0xb2, 0x6d, 0x95, 0x95, 0x8a, 0x54, 0x99,
0x82, 0x50, 0x25, 0x90, 0xbc, 0xf6, 0x24, 0x58, 0x72, 0xd6, 0x8e, 0x3d, 0x1b, 0xb2, 0xdc, 0xd3,
0x0b, 0x9e, 0xa1, 0xbc, 0x02, 0xcf, 0xc4, 0x3b, 0x70, 0xc1, 0x2d, 0x9a, 0x33, 0xe3, 0x9f, 0x19,
0xdb, 0xd1, 0x2e, 0x70, 0xd5, 0x9b, 0x68, 0xe7, 0xcc, 0x37, 0x33, 0xe7, 0xe7, 0x3b, 0x3f, 0x0e,
0xec, 0xfa, 0x71, 0x14, 0x79, 0x8c, 0xa6, 0x5e, 0x14, 0xfe, 0x42, 0x8f, 0x92, 0x34, 0x66, 0x31,
0xe9, 0xb2, 0x65, 0x42, 0x33, 0xe7, 0xaf, 0x0e, 0x6c, 0x4d, 0xaa, 0xdb, 0x64, 0x0c, 0x77, 0x15,
0xfc, 0x34, 0xb0, 0x8d, 0x91, 0x31, 0x1e, 0xb8, 0xba, 0x98, 0x38, 0xb0, 0xc9, 0x62, 0xe6, 0x45,
0xa7, 0x5e, 0xe4, 0xcd, 0x7d, 0x6a, 0x9b, 0x23, 0x63, 0x6c, 0xb9, 0x8a, 0x8c, 0x8c, 0x60, 0x18,
0xd0, 0x19, 0x9b, 0xd0, 0x30, 0x0a, 0xe7, 0x17, 0xb6, 0x85, 0x90, 0xaa, 0x88, 0x7c, 0x04, 0x3b,
0x51, 0x78, 0xb5, 0x08, 0x03, 0x8f, 0x85, 0xf1, 0xdc, 0xe5, 0x7f, 0xed, 0xce, 0xc8, 0x18, 0x9b,
0x6e, 0x4d, 0x4e, 0x3e, 0x81, 0x7b, 0x19, 0xf3, 0x66, 0x61, 0x14, 0xb2, 0xe5, 0x33, 0x4a, 0x05,
0xb8, 0x8b, 0xe0, 0xfa, 0x06, 0x39, 0x04, 0xf0, 0x53, 0xea, 0x31, 0x7a, 0x12, 0x04, 0xa9, 0xdd,
0x43, 0x23, 0x2a, 0x12, 0x62, 0x43, 0x7f, 0x26, 0x55, 0xef, 0xa3, 0x5e, 0xf9, 0x92, 0x3c, 0x86,
0xad, 0x59, 0x9c, 0xa6, 0xf1, 0xcf, 0x2e, 0xf5, 0xe3, 0x34, 0xc8, 0xec, 0x8d, 0x91, 0x35, 0x1e,
0x1e, 0xef, 0x1e, 0xa1, 0xd3, 0x8e, 0x4e, 0x2b, 0x7b, 0xae, 0x8a, 0x24, 0x5f, 0xc0, 0xf6, 0x74,
0x7e, 0xed, 0x45, 0x61, 0x90, 0x9f, 0x1d, 0xb4, 0x9f, 0xd5, 0xa0, 0xe4, 0x3e, 0xf4, 0x32, 0xe6,
0xb1, 0x45, 0x66, 0xc3, 0xc8, 0x18, 0x77, 0x5d, 0xb9, 0x22, 0x9f, 0xc1, 0x7d, 0xee, 0xf9, 0x8c,
0x3d, 0x2f, 0x3d, 0xf2, 0x22, 0x0d, 0x7d, 0x6a, 0x0f, 0xd1, 0xf8, 0x96, 0x5d, 0x7e, 0x5f, 0x42,
0xd3, 0x30, 0x0e, 0xec, 0x4d, 0x34, 0x50, 0xae, 0xd0, 0xe7, 0x78, 0xe2, 0xe9, 0x4d, 0x12, 0xa6,
0xf4, 0x65, 0x78, 0x49, 0xed, 0x2d, 0x44, 0xd4, 0xe4, 0x64, 0x0f, 0xba, 0xe1, 0x3c, 0xa0, 0x37,
0xf6, 0x36, 0x02, 0xc4, 0x82, 0xec, 0xc3, 0x46, 0x92, 0xd2, 0x29, 0x6e, 0xdc, 0xc5, 0x8d, 0x62,
0xcd, 0x63, 0xce, 0xa9, 0x92, 0xd3, 0x62, 0x47, 0xc4, 0xbc, 0x22, 0x72, 0xfe, 0xb4, 0x60, 0xb3,
0xea, 0x08, 0x7e, 0xc4, 0xf3, 0xfd, 0x78, 0x31, 0x67, 0x18, 0x2b, 0x41, 0xb8, 0xaa, 0x88, 0x1c,
0xc0, 0x20, 0x63, 0x5e, 0xca, 0x50, 0x57, 0xc1, 0xb4, 0x52, 0xa0, 0x92, 0xf6, 0x3b, 0x2f, 0x5a,
0x50, 0x49, 0x35, 0x5d, 0xac, 0x22, 0x85, 0x0f, 0x05, 0xdb, 0x74, 0x31, 0x7f, 0x91, 0xf3, 0x54,
0xdc, 0xd6, 0x15, 0x2f, 0x16, 0x02, 0x8d, 0xb6, 0xe2, 0xa2, 0x5e, 0x8d, 0xb6, 0x45, 0x18, 0x64,
0x58, 0xfb, 0x4a, 0x58, 0x3f, 0x80, 0xad, 0x1c, 0x2b, 0x62, 0xb0, 0x81, 0xaf, 0xa8, 0x42, 0x4e,
0x63, 0x5a, 0x86, 0x69, 0x80, 0x90, 0x8a, 0x84, 0xeb, 0x99, 0xa4, 0xf4, 0x9b, 0x2a, 0x6f, 0x4a,
0x01, 0x0f, 0x54, 0x8a, 0x3e, 0x9e, 0x06, 0x48, 0x96, 0x81, 0x5b, 0xac, 0x9b, 0x52, 0x7d, 0xb3,
0x39, 0xd5, 0x0b, 0x12, 0x6c, 0xb5, 0x91, 0x60, 0x5b, 0x25, 0x81, 0xf3, 0xda, 0x80, 0x9d, 0x93,
0x2c, 0xa3, 0x0c, 0x5d, 0x20, 0xc3, 0x7c, 0x08, 0x20, 0x1e, 0x47, 0x53, 0x0c, 0x61, 0x4a, 0x29,
0xe1, 0x17, 0xce, 0xd8, 0x52, 0x38, 0xd3, 0x44, 0x67, 0x16, 0x6b, 0xb1, 0xe7, 0x8b, 0x3d, 0x2b,
0xdf, 0xf3, 0x8b, 0x3d, 0xca, 0x7e, 0xaa, 0x46, 0xb3, 0x58, 0x3b, 0x6f, 0x2c, 0xd8, 0x55, 0x2a,
0xdc, 0x89, 0xcf, 0x23, 0x43, 0x1e, 0x41, 0x4f, 0xd4, 0x02, 0xd4, 0x63, 0x78, 0xbc, 0x2f, 0x13,
0x54, 0xc1, 0x4e, 0x10, 0x71, 0x76, 0xc7, 0x95, 0x58, 0x7e, 0x4a, 0xe4, 0x3b, 0xea, 0xd7, 0x72,
0x4a, 0x50, 0x9b, 0x9f, 0x12, 0x58, 0xf2, 0x29, 0x74, 0x53, 0x9a, 0x78, 0x4b, 0x54, 0x7c, 0x78,
0xfc, 0x5e, 0xd3, 0x21, 0x97, 0x03, 0xce, 0xee, 0xb8, 0x02, 0xc9, 0x1f, 0xf2, 0x92, 0x84, 0xce,
0x03, 0x34, 0xa8, 0xe5, 0xa1, 0x13, 0x44, 0xf0, 0x87, 0x04, 0x96, 0x1c, 0x41, 0xe7, 0x9c, 0xd2,
0x00, 0xe9, 0x3a, 0x3c, 0xb6, 0x9b, 0xce, 0x3c, 0xa3, 0x94, 0x9f, 0x40, 0x1c, 0x57, 0xcc, 0x8f,
0xe2, 0x4c, 0x50, 0xb7, 0x45, 0xb1, 0x09, 0x07, 0x70, 0xc5, 0x10, 0xc9, 0x15, 0xbb, 0xf4, 0xe6,
0xde, 0x85, 0x28, 0x9a, 0x2d, 0x8a, 0x7d, 0x8d, 0x08, 0xae, 0x98, 0xc0, 0x92, 0x6d, 0x30, 0xd9,
0x52, 0xb2, 0xd3, 0x64, 0xcb, 0xd3, 0x3e, 0x74, 0xaf, 0x79, 0x1e, 0x39, 0x7f, 0x1b, 0x5a, 0x78,
0xc4, 0x51, 0xbd, 0x71, 0x18, 0xab, 0x35, 0x0e, 0x73, 0x9d, 0xc6, 0x61, 0xb5, 0x35, 0x8e, 0xb2,
0x6c, 0x76, 0xf4, 0xb2, 0xc9, 0x13, 0xe3, 0x65, 0xb5, 0xe9, 0x89, 0xc2, 0x50, 0x93, 0x63, 0x11,
0x5c, 0xa4, 0x29, 0x9d, 0x8b, 0x8a, 0xd5, 0x93, 0x45, 0xb0, 0x14, 0x39, 0x0f, 0xe1, 0x9e, 0x1a,
0x4c, 0x5e, 0xe6, 0x0e, 0x01, 0xb2, 0x45, 0x42, 0x53, 0xbe, 0xc8, 0x6c, 0x63, 0x64, 0xf1, 0x9e,
0x55, 0x4a, 0x9c, 0xc7, 0x9a, 0xb7, 0x04, 0x41, 0x6b, 0xad, 0xd8, 0xa8, 0xb7, 0x62, 0xe7, 0x5b,
0xed, 0xa8, 0x60, 0xe9, 0x1a, 0xfd, 0x7e, 0x4f, 0xc6, 0x4c, 0x96, 0x5f, 0x19, 0xc0, 0x57, 0x40,
0xea, 0x3c, 0x5e, 0xe3, 0xd6, 0x6a, 0x81, 0x32, 0xd5, 0x02, 0xe5, 0xfc, 0xaa, 0x93, 0x43, 0x10,
0xfe, 0xff, 0xb9, 0x7d, 0xf5, 0xa6, 0xe1, 0xfc, 0xa0, 0x85, 0x8a, 0xe7, 0x10, 0xbf, 0x1a, 0xa3,
0xbe, 0x4c, 0x84, 0xbf, 0xbb, 0x6e, 0xb1, 0xe6, 0xae, 0x4a, 0x64, 0x15, 0xb3, 0xc6, 0xa6, 0x2b,
0x16, 0x9c, 0x57, 0xd7, 0x71, 0xb4, 0xb8, 0xe4, 0xef, 0x58, 0x9c, 0x57, 0x62, 0xe5, 0x7c, 0xa9,
0xb9, 0x10, 0x33, 0x6e, 0x75, 0x23, 0x9d, 0xd7, 0x26, 0xec, 0xb9, 0xd4, 0xa7, 0x61, 0xc2, 0xfe,
0xed, 0x2c, 0xa7, 0xce, 0x4a, 0x66, 0x6d, 0x56, 0xd2, 0x1a, 0xb4, 0x55, 0x6f, 0xd0, 0x55, 0x4f,
0x77, 0x34, 0x4f, 0x97, 0x0d, 0xb0, 0xab, 0x34, 0xc0, 0x03, 0x18, 0xbc, 0x28, 0x5a, 0x57, 0x4f,
0xb4, 0xae, 0x42, 0x50, 0x36, 0x9d, 0x7e, 0x5b, 0xd3, 0xd9, 0xd0, 0x9a, 0xce, 0xef, 0x3a, 0x5f,
0x64, 0xdf, 0x59, 0xdd, 0x0f, 0x04, 0x3a, 0x5e, 0xe9, 0x01, 0xfc, 0xad, 0x58, 0x66, 0xb5, 0x5a,
0xd6, 0x51, 0x2c, 0x2b, 0x74, 0xef, 0x56, 0x74, 0x77, 0x9e, 0xc3, 0x5e, 0x83, 0x7a, 0x19, 0x79,
0x04, 0xfd, 0x54, 0x4e, 0x8b, 0x06, 0x4e, 0x8b, 0xfb, 0xcd, 0x1d, 0x02, 0x87, 0xc6, 0x1c, 0xea,
0x7c, 0xc5, 0xa3, 0x7e, 0xa5, 0x40, 0xa6, 0xf3, 0xf3, 0x78, 0x0d, 0xe2, 0xfc, 0x61, 0xc1, 0xfb,
0x2e, 0x4d, 0x54, 0xf2, 0x89, 0x12, 0x85, 0x37, 0x95, 0xd6, 0x19, 0x8a, 0x75, 0x6f, 0xef, 0xe4,
0x5f, 0x96, 0xfe, 0x0d, 0xa5, 0xf4, 0x37, 0xf8, 0x74, 0xd0, 0xcc, 0x20, 0x6d, 0xfa, 0x85, 0xda,
0xf4, 0x5b, 0xff, 0xba, 0x18, 0xae, 0xfa, 0x75, 0xe1, 0x4c, 0xe0, 0x9d, 0xa6, 0x90, 0x67, 0x79,
0x6b, 0xaa, 0x28, 0x92, 0x77, 0x8f, 0x9a, 0xdc, 0xf9, 0x1e, 0x0e, 0x6e, 0x09, 0x7a, 0x46, 0x3e,
0xe7, 0xdc, 0x3d, 0x8f, 0x73, 0x2e, 0x3a, 0x52, 0xaf, 0x5b, 0xce, 0xb8, 0xe2, 0x80, 0x73, 0x06,
0xb6, 0xae, 0xde, 0xe9, 0x52, 0x66, 0x73, 0x1b, 0x97, 0x8a, 0x4c, 0x31, 0xab, 0x99, 0xf2, 0x0a,
0xee, 0xd7, 0x6f, 0xc2, 0xd8, 0xe5, 0x19, 0x6a, 0x54, 0x32, 0xb4, 0xbc, 0xdb, 0x6c, 0xbe, 0xdb,
0xaa, 0xde, 0xfd, 0x21, 0xec, 0xea, 0xb6, 0x4c, 0x9f, 0x64, 0x64, 0x07, 0xac, 0xe9, 0x93, 0xdc,
0x6b, 0xfc, 0xa7, 0xf3, 0x9b, 0xc1, 0x3d, 0x75, 0xd5, 0x90, 0x84, 0x52, 0x97, 0xff, 0x56, 0x57,
0x4a, 0xad, 0xad, 0x66, 0xad, 0x3b, 0x55, 0xad, 0x6f, 0xe0, 0xb0, 0x4d, 0x17, 0xe9, 0xe1, 0xd5,
0xb5, 0x59, 0xcf, 0x5f, 0x67, 0xf0, 0xae, 0xee, 0xaf, 0xbc, 0x70, 0x3d, 0xd0, 0x0b, 0x57, 0x23,
0x89, 0x8b, 0x8a, 0xf5, 0x63, 0x3d, 0xaa, 0x6b, 0x57, 0xe8, 0xdb, 0xe6, 0x85, 0xa7, 0xfc, 0xfe,
0x26, 0x4d, 0xc9, 0xc7, 0xd0, 0x13, 0x28, 0x39, 0xed, 0x37, 0xea, 0x29, 0x21, 0xce, 0x1b, 0xb3,
0x7e, 0xcf, 0x24, 0x9e, 0x9f, 0x87, 0x17, 0x6f, 0xc5, 0x58, 0x5a, 0xa9, 0x4e, 0xbd, 0x7a, 0x75,
0xd2, 0x06, 0xd7, 0x7e, 0x7d, 0x70, 0x7d, 0xc0, 0x8b, 0x90, 0xea, 0x1d, 0xf1, 0x19, 0x56, 0x4c,
0x3d, 0x06, 0x9a, 0x20, 0x16, 0xb3, 0x1e, 0xfe, 0xc3, 0xe9, 0xe1, 0x3f, 0x01, 0x00, 0x00, 0xff,
0xff, 0x18, 0xd7, 0xbc, 0xeb, 0x87, 0x12, 0x00, 0x00,
// 1270 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x4d, 0x6f, 0xdc, 0x44,
0x18, 0xae, 0xed, 0xfd, 0xc8, 0xbe, 0x9b, 0xa4, 0xe9, 0x24, 0x0d, 0x26, 0x44, 0xd1, 0x6a, 0x84,
0xc4, 0x0a, 0x68, 0x24, 0xd2, 0x0a, 0x51, 0xb8, 0x90, 0xa4, 0xad, 0xb2, 0x52, 0x91, 0x2a, 0x53,
0x10, 0x2a, 0x02, 0xc9, 0xbb, 0x9e, 0x04, 0x4b, 0x8e, 0xed, 0xd8, 0xb3, 0x21, 0xcb, 0x9d, 0x1e,
0xf8, 0x0d, 0x70, 0xe4, 0xca, 0x6f, 0xe2, 0x3f, 0x70, 0xe0, 0x8a, 0xe6, 0xc3, 0xf6, 0xcc, 0xd8,
0x8e, 0x76, 0x81, 0x53, 0x2f, 0xd1, 0xce, 0x3b, 0xcf, 0xcc, 0xbc, 0x1f, 0xcf, 0xfb, 0xe1, 0xc0,
0xf6, 0x2c, 0x89, 0x22, 0x9f, 0x92, 0xcc, 0x8f, 0xc2, 0x9f, 0xc8, 0x61, 0x9a, 0x25, 0x34, 0x41,
0x5d, 0xba, 0x48, 0x49, 0x8e, 0xff, 0xea, 0xc0, 0xc6, 0xa9, 0xba, 0x8d, 0xc6, 0x70, 0x57, 0xc3,
0x4f, 0x02, 0xd7, 0x1a, 0x59, 0xe3, 0x81, 0x67, 0x8a, 0x11, 0x86, 0x75, 0x9a, 0x50, 0x3f, 0x3a,
0xf1, 0x23, 0x3f, 0x9e, 0x11, 0xd7, 0x1e, 0x59, 0x63, 0xc7, 0xd3, 0x64, 0x68, 0x04, 0xc3, 0x80,
0x4c, 0xe9, 0x29, 0x09, 0xa3, 0x30, 0xbe, 0x70, 0x1d, 0x0e, 0x51, 0x45, 0xe8, 0x7d, 0xd8, 0x8a,
0xc2, 0xab, 0x79, 0x18, 0xf8, 0x34, 0x4c, 0x62, 0x8f, 0xfd, 0x75, 0x3b, 0x23, 0x6b, 0x6c, 0x7b,
0x35, 0x39, 0xfa, 0x10, 0xee, 0xe5, 0xd4, 0x9f, 0x86, 0x51, 0x48, 0x17, 0xcf, 0x08, 0x11, 0xe0,
0x2e, 0x07, 0xd7, 0x37, 0xd0, 0x01, 0xc0, 0x2c, 0x23, 0x3e, 0x25, 0xc7, 0x41, 0x90, 0xb9, 0x3d,
0x6e, 0x84, 0x22, 0x41, 0x2e, 0xf4, 0xa7, 0x52, 0xf5, 0x3e, 0xd7, 0xab, 0x58, 0xa2, 0xc7, 0xb0,
0x31, 0x4d, 0xb2, 0x2c, 0xf9, 0xd1, 0x23, 0xb3, 0x24, 0x0b, 0x72, 0x77, 0x6d, 0xe4, 0x8c, 0x87,
0x47, 0xdb, 0x87, 0xdc, 0x69, 0x87, 0x27, 0xca, 0x9e, 0xa7, 0x23, 0xd1, 0x67, 0xb0, 0x39, 0x89,
0xaf, 0xfd, 0x28, 0x0c, 0x8a, 0xb3, 0x83, 0xf6, 0xb3, 0x06, 0x14, 0xed, 0x42, 0x2f, 0xa7, 0x3e,
0x9d, 0xe7, 0x2e, 0x8c, 0xac, 0x71, 0xd7, 0x93, 0x2b, 0xf4, 0x31, 0xec, 0x32, 0xcf, 0xe7, 0xf4,
0x79, 0xe5, 0x91, 0x17, 0x59, 0x38, 0x23, 0xee, 0x90, 0x1b, 0xdf, 0xb2, 0xcb, 0xee, 0x4b, 0x49,
0x16, 0x26, 0x81, 0xbb, 0xce, 0x0d, 0x94, 0x2b, 0xee, 0x73, 0x7e, 0xe2, 0xe9, 0x4d, 0x1a, 0x66,
0xe4, 0x65, 0x78, 0x49, 0xdc, 0x0d, 0x8e, 0xa8, 0xc9, 0xd1, 0x0e, 0x74, 0xc3, 0x38, 0x20, 0x37,
0xee, 0x26, 0x07, 0x88, 0x05, 0xda, 0x83, 0xb5, 0x34, 0x23, 0x13, 0xbe, 0x71, 0x97, 0x6f, 0x94,
0x6b, 0x16, 0x73, 0x46, 0x95, 0x82, 0x16, 0x5b, 0x22, 0xe6, 0x8a, 0x08, 0xff, 0xe9, 0xc0, 0xba,
0xea, 0x08, 0x76, 0xc4, 0x9f, 0xcd, 0x92, 0x79, 0x4c, 0x79, 0xac, 0x04, 0xe1, 0x54, 0x11, 0xda,
0x87, 0x41, 0x4e, 0xfd, 0x8c, 0x72, 0x5d, 0x05, 0xd3, 0x2a, 0x81, 0x4e, 0xda, 0xaf, 0xfd, 0x68,
0x4e, 0x24, 0xd5, 0x4c, 0xb1, 0x8e, 0x14, 0x3e, 0x14, 0x6c, 0x33, 0xc5, 0xec, 0x45, 0xc6, 0x53,
0x71, 0x5b, 0x57, 0xbc, 0x58, 0x0a, 0x0c, 0xda, 0x8a, 0x8b, 0x7a, 0x35, 0xda, 0x96, 0x61, 0x90,
0x61, 0xed, 0x6b, 0x61, 0x7d, 0x17, 0x36, 0x0a, 0xac, 0x88, 0xc1, 0x1a, 0x7f, 0x45, 0x17, 0x32,
0x1a, 0x93, 0x2a, 0x4c, 0x03, 0x0e, 0x51, 0x24, 0x4c, 0xcf, 0x34, 0x23, 0x5f, 0xaa, 0xbc, 0xa9,
0x04, 0x2c, 0x50, 0x19, 0xf7, 0xf1, 0x24, 0xe0, 0x64, 0x19, 0x78, 0xe5, 0xba, 0x29, 0xd5, 0xd7,
0x9b, 0x53, 0xbd, 0x24, 0xc1, 0x46, 0x1b, 0x09, 0x36, 0x75, 0x12, 0xe0, 0xd7, 0x16, 0x6c, 0x1d,
0xe7, 0x39, 0xa1, 0xdc, 0x05, 0x32, 0xcc, 0x07, 0x00, 0xe2, 0x71, 0x6e, 0x8a, 0x25, 0x4c, 0xa9,
0x24, 0xec, 0xc2, 0x29, 0x5d, 0x08, 0x67, 0xda, 0xdc, 0x99, 0xe5, 0x5a, 0xec, 0xcd, 0xc4, 0x9e,
0x53, 0xec, 0xcd, 0xca, 0x3d, 0x42, 0x7f, 0x50, 0xa3, 0x59, 0xae, 0xf1, 0xef, 0x0e, 0x6c, 0x6b,
0x15, 0xee, 0x78, 0xc6, 0x22, 0x83, 0x1e, 0x41, 0x4f, 0xd4, 0x02, 0xae, 0xc7, 0xf0, 0x68, 0x4f,
0x26, 0xa8, 0x86, 0x3d, 0xe5, 0x88, 0xb3, 0x3b, 0x9e, 0xc4, 0xb2, 0x53, 0x22, 0xdf, 0xb9, 0x7e,
0x2d, 0xa7, 0x04, 0xb5, 0xd9, 0x29, 0x81, 0x45, 0x1f, 0x41, 0x37, 0x23, 0xa9, 0xbf, 0xe0, 0x8a,
0x0f, 0x8f, 0xde, 0x6e, 0x3a, 0xe4, 0x31, 0xc0, 0xd9, 0x1d, 0x4f, 0x20, 0xd9, 0x43, 0x7e, 0x9a,
0x92, 0x38, 0xe0, 0x06, 0xb5, 0x3c, 0x74, 0xcc, 0x11, 0xec, 0x21, 0x81, 0x45, 0x87, 0xd0, 0x39,
0x27, 0x24, 0xe0, 0x74, 0x1d, 0x1e, 0xb9, 0x4d, 0x67, 0x9e, 0x11, 0xc2, 0x4e, 0x70, 0x1c, 0xfa,
0x94, 0xb1, 0x83, 0x66, 0x21, 0xb9, 0x16, 0xec, 0x1d, 0x1e, 0xed, 0x37, 0xeb, 0x26, 0x30, 0x67,
0x77, 0xbc, 0x12, 0xcf, 0x34, 0xbc, 0xf4, 0x63, 0xff, 0x42, 0x54, 0xcf, 0x16, 0x0d, 0xbf, 0xe0,
0x08, 0xa6, 0xa1, 0xc0, 0xa2, 0x4d, 0xb0, 0xe9, 0x42, 0xd2, 0xd4, 0xa6, 0x8b, 0x93, 0x3e, 0x74,
0xaf, 0x59, 0x42, 0xe1, 0xbf, 0x2d, 0x23, 0x4e, 0xe2, 0xa8, 0xd9, 0x41, 0xac, 0xe5, 0x3a, 0x88,
0xbd, 0x4a, 0x07, 0x71, 0xda, 0x3a, 0x48, 0x55, 0x3f, 0x3b, 0x66, 0xfd, 0x64, 0x19, 0xf2, 0x52,
0xed, 0x7e, 0xa2, 0x42, 0xd4, 0xe4, 0xbc, 0x1a, 0xce, 0xb3, 0x8c, 0xc4, 0xa2, 0x74, 0xf5, 0x64,
0x35, 0xac, 0x44, 0xf8, 0x21, 0xdc, 0xd3, 0xa3, 0xca, 0xea, 0xdd, 0x01, 0x40, 0x3e, 0x4f, 0x49,
0xc6, 0x16, 0xb9, 0x6b, 0x8d, 0x1c, 0xd6, 0xbc, 0x2a, 0x09, 0x7e, 0x6c, 0x78, 0x4b, 0x30, 0xb5,
0xd6, 0x93, 0xad, 0x7a, 0x4f, 0xc6, 0x5f, 0x19, 0x47, 0x05, 0x5d, 0x57, 0x68, 0xfc, 0x3b, 0x32,
0x66, 0xb2, 0x0e, 0xcb, 0x00, 0xbe, 0x02, 0x54, 0x27, 0xf4, 0x0a, 0xb7, 0xaa, 0x95, 0xca, 0xd6,
0x2b, 0x15, 0xfe, 0xd9, 0x24, 0x87, 0x60, 0xfe, 0xff, 0x73, 0xfb, 0xf2, 0xdd, 0x03, 0x7f, 0x67,
0x84, 0x8a, 0x25, 0x13, 0xbb, 0x9a, 0x47, 0x7d, 0x91, 0x0a, 0x7f, 0x77, 0xbd, 0x72, 0xcd, 0x5c,
0x95, 0xca, 0x72, 0xe6, 0x8c, 0x6d, 0x4f, 0x2c, 0x18, 0xaf, 0xae, 0x93, 0x68, 0x7e, 0xc9, 0xde,
0x71, 0x18, 0xaf, 0xc4, 0x0a, 0x7f, 0x0b, 0xf7, 0x1b, 0xf3, 0x6e, 0x05, 0x3b, 0x95, 0xa1, 0xc6,
0xd6, 0x86, 0x1a, 0xfc, 0xda, 0x86, 0x1d, 0x8f, 0xcc, 0x48, 0x98, 0xd2, 0x7f, 0x3b, 0xf1, 0xe9,
0x13, 0x95, 0x5d, 0x9b, 0xa8, 0x8c, 0x36, 0xee, 0xd4, 0xdb, 0xb8, 0x1a, 0x86, 0x8e, 0x11, 0x86,
0xaa, 0x4d, 0x76, 0xb5, 0x36, 0xb9, 0x0f, 0x83, 0x17, 0x65, 0x83, 0xeb, 0x89, 0x06, 0x57, 0x0a,
0xaa, 0xd6, 0xd4, 0x6f, 0x6b, 0x4d, 0x6b, 0x46, 0x6b, 0xfa, 0xcd, 0x24, 0x93, 0xec, 0x4e, 0xcb,
0xfb, 0x01, 0x41, 0xc7, 0xaf, 0x3c, 0xc0, 0x7f, 0x6b, 0x96, 0x39, 0xad, 0x96, 0x75, 0x34, 0xcb,
0x4a, 0xdd, 0xbb, 0x8a, 0xee, 0xf8, 0x39, 0xec, 0x34, 0xa8, 0x97, 0xa3, 0x47, 0xd0, 0xcf, 0xe4,
0x4c, 0x69, 0xf1, 0x99, 0x72, 0xaf, 0xb9, 0x56, 0xf3, 0xd1, 0xb2, 0x80, 0xe2, 0xcf, 0x59, 0xd4,
0xaf, 0x34, 0xc8, 0x24, 0x3e, 0x4f, 0x96, 0xb7, 0x16, 0xff, 0xe1, 0xc0, 0x3b, 0x1e, 0x49, 0xf5,
0x72, 0x23, 0xea, 0x17, 0xbf, 0xa9, 0xb2, 0xce, 0xd2, 0xac, 0x7b, 0x73, 0xbf, 0x0f, 0xaa, 0xbe,
0xb0, 0xa6, 0xf5, 0x85, 0x06, 0x9f, 0x0e, 0x9a, 0x19, 0x64, 0xcc, 0xc8, 0x50, 0x9b, 0x91, 0xeb,
0xdf, 0x20, 0xc3, 0x65, 0xbf, 0x41, 0xf0, 0x29, 0xdc, 0x6f, 0x0a, 0x79, 0x5e, 0xf4, 0x2d, 0x45,
0x91, 0xa2, 0xb5, 0xd4, 0xe4, 0xf8, 0x1b, 0xd8, 0xbf, 0x25, 0xe8, 0x39, 0xfa, 0x84, 0x71, 0xf7,
0x3c, 0x29, 0xb8, 0x88, 0xa5, 0x5e, 0xb7, 0x9c, 0xf1, 0xc4, 0x01, 0x7c, 0x06, 0xae, 0xa9, 0xde,
0xc9, 0x42, 0x66, 0x73, 0x1b, 0x97, 0xca, 0x4c, 0xb1, 0xd5, 0x4c, 0x79, 0x05, 0xbb, 0xf5, 0x9b,
0x78, 0xec, 0x8a, 0x0c, 0xb5, 0x94, 0x0c, 0xad, 0xee, 0xb6, 0x9b, 0xef, 0x76, 0xd4, 0xbb, 0xdf,
0x83, 0x6d, 0xd3, 0x96, 0xc9, 0x93, 0x1c, 0x6d, 0x81, 0x33, 0x79, 0x52, 0x78, 0x8d, 0xfd, 0xc4,
0xbf, 0x58, 0xcc, 0x53, 0x57, 0x0d, 0x49, 0x28, 0x75, 0xf9, 0x6f, 0x75, 0xa5, 0xd2, 0xda, 0x69,
0xd6, 0xba, 0xa3, 0x6a, 0x7d, 0x03, 0x07, 0x6d, 0xba, 0x48, 0x0f, 0x2f, 0xaf, 0xcd, 0x6a, 0xfe,
0x3a, 0x83, 0xb7, 0x4c, 0x7f, 0x15, 0x85, 0xeb, 0x81, 0x59, 0xb8, 0x1a, 0x49, 0x5c, 0x56, 0xac,
0xef, 0xeb, 0x51, 0x5d, 0xb9, 0x42, 0xdf, 0x36, 0x4c, 0x3c, 0x65, 0xf7, 0x37, 0x69, 0x8a, 0x3e,
0x80, 0x9e, 0x40, 0xc9, 0x6f, 0x82, 0x46, 0x3d, 0x25, 0x04, 0xff, 0x6a, 0xd7, 0xef, 0x39, 0x4d,
0xe2, 0xf3, 0xf0, 0xe2, 0x8d, 0x98, 0x59, 0x95, 0xea, 0xd4, 0xab, 0x57, 0x27, 0x63, 0xaa, 0xed,
0xd7, 0xa7, 0xda, 0x07, 0xac, 0x08, 0xe9, 0xde, 0x11, 0x1f, 0x6b, 0xe5, 0x48, 0x64, 0x71, 0x13,
0xc4, 0x62, 0xda, 0xe3, 0xff, 0x96, 0x7a, 0xf8, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x82, 0xe9,
0x7d, 0xb9, 0xad, 0x12, 0x00, 0x00,
}
plugin/dapp/collateralize/types/tx.go
View file @ 2e4b635d
......@@ -39,9 +39,10 @@ type CollateralizeFeedTx struct {
Fee int64 `json:"fee"`
}
// CollateralizeCloseTx for construction
type CollateralizeCloseTx struct {
// CollateralizeRetrieveTx for construction
type CollateralizeRetrieveTx struct {
CollateralizeID string `json:"collateralizeId"`
Balance int64 `json:"Balance"`
Fee int64 `json:"fee"`
}
......
plugin/dapp/collateralize/types/types.go
View file @ 2e4b635d
......@@ -11,7 +11,7 @@ const (
CollateralizeActionRepay
CollateralizeActionAppend
CollateralizeActionFeed
CollateralizeActionClose
CollateralizeActionRetrieve
CollateralizeActionManage
//log for Collateralize
......@@ -20,7 +20,7 @@ const (
TyLogCollateralizeRepay = 733
TyLogCollateralizeAppend = 734
TyLogCollateralizeFeed = 735
TyLogCollateralizeClose = 736
TyLogCollateralizeRetrieve = 736
)
// Collateralize name
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment