Skip to content

P
plugin
Commit 020ed969 authored by pengjun's avatar pengjun
Browse files
Options

#627 update collateralize query

parent 8bf3334d
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 86 deletions
plugin/dapp/collateralize/executor/collateralizedb.go
View file @ 020ed969
......@@ -274,7 +274,6 @@ func (action *Action) CollateralizeManage(manage *pty.CollateralizeManage) (*typ
StabilityFeeRatio: DefaultStabilityFeeRation,
Period: DefaultPeriod,
CollTotalBalance: DefaultCollTotalBalance,
CurrentTime: action.blocktime,
}
}
......@@ -308,12 +307,7 @@ func (action *Action) CollateralizeManage(manage *pty.CollateralizeManage) (*typ
} else {
collConfig.CollTotalBalance = manConfig.CollTotalBalance
}
if manage.CurrentTime != 0 {
collConfig.CollTotalBalance = manage.CollTotalBalance
} else {
collConfig.CollTotalBalance = manConfig.CollTotalBalance
}
collConfig.CurrentTime = action.blocktime
value := types.Encode(collConfig)
action.db.Set(ConfigKey(), value)
......@@ -425,6 +419,7 @@ func (action *Action) CollateralizeCreate(create *pty.CollateralizeCreate) (*typ
coll.CreateAddr = action.fromaddr
coll.Status = pty.CollateralizeActionCreate
coll.Index = action.GetIndex()
coll.CollBalance = 0
clog.Debug("CollateralizeCreate created", "CollateralizeID", collateralizeID, "TotalBalance", coll.TotalBalance)
......@@ -611,6 +606,7 @@ func (action *Action) CollateralizeBorrow(borrow *pty.CollateralizeBorrow) (*typ
coll.BorrowRecords = append(coll.BorrowRecords, borrowRecord)
coll.Status = pty.CollateralizeStatusCreated
coll.Balance -= borrow.Value
coll.CollBalance += btyFrozen
coll.Save(action.db)
kv = append(kv, coll.GetKVSet()...)
......@@ -693,6 +689,7 @@ func (action *Action) CollateralizeRepay(repay *pty.CollateralizeRepay) (*types.
// 保存
coll.Balance += borrowRecord.DebtValue
coll.CollBalance -= borrowRecord.CollateralValue
coll.BorrowRecords = append(coll.BorrowRecords[:index], coll.BorrowRecords[index+1:]...)
coll.InvalidRecords = append(coll.InvalidRecords, borrowRecord)
coll.LatestLiquidationPrice = getLatestLiquidationPrice(&coll.Collateralize)
......@@ -788,6 +785,7 @@ func (action *Action) CollateralizeAppend(cAppend *pty.CollateralizeAppend) (*ty
}
// 记录当前借贷的最高自动清算价格
coll.CollBalance += cAppend.CollateralValue
coll.LatestLiquidationPrice = getLatestLiquidationPrice(&coll.Collateralize)
coll.LatestExpireTime = getLatestExpireTime(&coll.Collateralize)
// append操作不更新Index
......@@ -900,6 +898,7 @@ func (action *Action) systemLiquidation(coll *pty.Collateralize, price float32)
borrowRecord.Index = action.GetIndex()
coll.InvalidRecords = append(coll.InvalidRecords, borrowRecord)
coll.BorrowRecords = append(coll.BorrowRecords[:index], coll.BorrowRecords[index+1:]...)
coll.CollBalance -= borrowRecord.CollateralValue
} else {
borrowRecord.PreStatus = borrowRecord.Status
borrowRecord.Status = pty.CollateralizeUserStatusWarning
......@@ -958,6 +957,7 @@ func (action *Action) expireLiquidation(coll *pty.Collateralize) (*types.Receipt
borrowRecord.Index = action.GetIndex()
coll.InvalidRecords = append(coll.InvalidRecords, borrowRecord)
coll.BorrowRecords = append(coll.BorrowRecords[:index], coll.BorrowRecords[index+1:]...)
coll.CollBalance -= borrowRecord.CollateralValue
} else {
borrowRecord.PreIndex = borrowRecord.Index
borrowRecord.Index = action.GetIndex()
......@@ -987,6 +987,11 @@ func pricePolicy(feed *pty.CollateralizeFeed) float32 {
totalVolume += volume
}
if totalVolume == 0 {
clog.Error("collateralize price feed volume empty")
return 0
}
for i, price := range feed.Price {
totalPrice += price * float32(float64(feed.Volume[i])/float64(totalVolume))
}
......@@ -1011,7 +1016,7 @@ func (action *Action) CollateralizeFeed(feed *pty.CollateralizeFeed) (*types.Rec
}
price := pricePolicy(feed)
if price == 0 || price == -1 {
if price <= 0 {
clog.Error("CollateralizePriceFeed", "price", price, "err", pty.ErrPriceInvalid)
return nil, pty.ErrPriceInvalid
}
......
plugin/dapp/collateralize/executor/query.go
View file @ 020ed969
......@@ -26,6 +26,7 @@ func (c *Collateralize) Query_CollateralizeInfoByID(req *pty.ReqCollateralizeInf
Balance: coll.Balance,
Period: coll.Period,
CollateralizeId: coll.CollateralizeId,
CollBalance: coll.CollBalance,
}, nil
}
......@@ -48,6 +49,7 @@ func (c *Collateralize) Query_CollateralizeInfoByIDs(req *pty.ReqCollateralizeIn
Balance: coll.Balance,
Period: coll.Period,
CollateralizeId: coll.CollateralizeId,
CollBalance: coll.CollBalance,
})
}
......
plugin/dapp/collateralize/proto/collateralize.proto
View file @ 020ed969
......@@ -19,6 +19,7 @@ message Collateralize {
int64 latestExpireTime = 13;//最近超期时间
int64 index = 14;//当前索引
int64 preIndex = 15;//上一个索引
int64 collBalance = 16;//抵押bty
}
// 借出记录
......@@ -150,6 +151,7 @@ message RepCollateralizeCurrentInfo {
int64 balance = 7; //剩余可借贷金额(ccny)
int64 period = 8; //合约期限
string collateralizeId = 9; //放贷ID
int64 collBalance = 10;//抵押bty
}
// 根据ID列表查询多期放贷信息
......
plugin/dapp/collateralize/types/collateralize.pb.go
View file @ 020ed969
......@@ -37,6 +37,7 @@ type Collateralize struct {
LatestExpireTime int64 `protobuf:"varint,13,opt,name=latestExpireTime,proto3" json:"latestExpireTime,omitempty"`
Index int64 `protobuf:"varint,14,opt,name=index,proto3" json:"index,omitempty"`
PreIndex int64 `protobuf:"varint,15,opt,name=preIndex,proto3" json:"preIndex,omitempty"`
CollBalance int64 `protobuf:"varint,16,opt,name=collBalance,proto3" json:"collBalance,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
......@@ -172,6 +173,13 @@ func (m *Collateralize) GetPreIndex() int64 {
return 0
}
func (m *Collateralize) GetCollBalance() int64 {
if m != nil {
return m.CollBalance
}
return 0
}
// 借出记录
type BorrowRecord struct {
AccountAddr string `protobuf:"bytes,1,opt,name=accountAddr,proto3" json:"accountAddr,omitempty"`
......@@ -1201,6 +1209,7 @@ type RepCollateralizeCurrentInfo struct {
Balance int64 `protobuf:"varint,7,opt,name=balance,proto3" json:"balance,omitempty"`
Period int64 `protobuf:"varint,8,opt,name=period,proto3" json:"period,omitempty"`
CollateralizeId string `protobuf:"bytes,9,opt,name=collateralizeId,proto3" json:"collateralizeId,omitempty"`
CollBalance int64 `protobuf:"varint,10,opt,name=collBalance,proto3" json:"collBalance,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
......@@ -1294,6 +1303,13 @@ func (m *RepCollateralizeCurrentInfo) GetCollateralizeId() string {
return ""
}
func (m *RepCollateralizeCurrentInfo) GetCollBalance() int64 {
if m != nil {
return m.CollBalance
}
return 0
}
// 根据ID列表查询多期放贷信息
type ReqCollateralizeInfos struct {
CollateralizeIds []string `protobuf:"bytes,1,rep,name=collateralizeIds,proto3" json:"collateralizeIds,omitempty"`
......@@ -1872,81 +1888,82 @@ func init() {
func init() { proto.RegisterFile("collateralize.proto", fileDescriptor_a988fb4a61381972) }
var fileDescriptor_a988fb4a61381972 = []byte{
// 1206 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x6d, 0x6b, 0xdc, 0x46,
0x10, 0x8e, 0xa4, 0x7b, 0xf1, 0xcd, 0xd9, 0x4e, 0xb2, 0x76, 0x5d, 0xd5, 0x35, 0xe6, 0x10, 0x85,
0x1e, 0x7d, 0x31, 0xd4, 0x09, 0xa5, 0xa1, 0x50, 0x6a, 0x5f, 0x12, 0x7c, 0x90, 0x42, 0x50, 0xd3,
0x52, 0x0a, 0x2d, 0xe8, 0xa4, 0xb5, 0x2b, 0x90, 0x25, 0x79, 0xb5, 0xe7, 0xfa, 0xfa, 0xbd, 0xf9,
0x15, 0xf9, 0x53, 0xf9, 0x07, 0xfd, 0x17, 0xfd, 0x5a, 0x76, 0x76, 0xf5, 0xb6, 0x92, 0x8c, 0xaf,
0xed, 0xa7, 0x7c, 0x31, 0xda, 0xd9, 0x67, 0x77, 0x67, 0x9f, 0x79, 0x66, 0x66, 0x7d, 0xb0, 0xe3,
0x27, 0x51, 0xe4, 0x71, 0xca, 0xbc, 0x28, 0xfc, 0x83, 0x1e, 0xa5, 0x2c, 0xe1, 0x09, 0xe9, 0xf3,
0x55, 0x4a, 0x33, 0xe7, 0x6d, 0x0f, 0xb6, 0x66, 0xd5, 0x69, 0x32, 0x85, 0xfb, 0x35, 0xfc, 0x3c,
0xb0, 0x8d, 0x89, 0x31, 0x1d, 0xb9, 0xba, 0x99, 0x38, 0xb0, 0xc9, 0x13, 0xee, 0x45, 0xa7, 0x5e,
0xe4, 0xc5, 0x3e, 0xb5, 0xcd, 0x89, 0x31, 0xb5, 0xdc, 0x9a, 0x8d, 0x4c, 0x60, 0x1c, 0xd0, 0x05,
0x9f, 0xd1, 0x30, 0x0a, 0xe3, 0x0b, 0xdb, 0x42, 0x48, 0xd5, 0x44, 0x3e, 0x81, 0x07, 0x51, 0x78,
0xb5, 0x0c, 0x03, 0x8f, 0x87, 0x49, 0xec, 0x8a, 0xbf, 0x76, 0x6f, 0x62, 0x4c, 0x4d, 0xb7, 0x61,
0x27, 0x9f, 0xc1, 0xc3, 0x8c, 0x7b, 0x8b, 0x30, 0x0a, 0xf9, 0xea, 0x39, 0xa5, 0x12, 0xdc, 0x47,
0x70, 0x73, 0x82, 0x1c, 0x02, 0xf8, 0x8c, 0x7a, 0x9c, 0x9e, 0x04, 0x01, 0xb3, 0x07, 0x78, 0x89,
0x8a, 0x85, 0xd8, 0x30, 0x5c, 0x28, 0xd7, 0x87, 0xe8, 0x57, 0x3e, 0x24, 0x4f, 0x60, 0x6b, 0x91,
0x30, 0x96, 0xfc, 0xee, 0x52, 0x3f, 0x61, 0x41, 0x66, 0x6f, 0x4c, 0xac, 0xe9, 0xf8, 0x78, 0xe7,
0x08, 0x49, 0x3b, 0x3a, 0xad, 0xcc, 0xb9, 0x75, 0x24, 0xf9, 0x1a, 0xb6, 0xe7, 0xf1, 0xb5, 0x17,
0x85, 0x41, 0xbe, 0x76, 0xd4, 0xbd, 0x56, 0x83, 0x92, 0x3d, 0x18, 0x64, 0xdc, 0xe3, 0xcb, 0xcc,
0x86, 0x89, 0x31, 0xed, 0xbb, 0x6a, 0x44, 0xbe, 0x84, 0x3d, 0xc1, 0x7c, 0xc6, 0x5f, 0x94, 0x8c,
0xbc, 0x64, 0xa1, 0x4f, 0xed, 0x31, 0x5e, 0xbe, 0x63, 0x56, 0xec, 0x97, 0x52, 0x16, 0x26, 0x81,
0xbd, 0x89, 0x17, 0x54, 0x23, 0xe4, 0x1c, 0x57, 0x3c, 0xbb, 0x49, 0x43, 0x46, 0x5f, 0x85, 0x97,
0xd4, 0xde, 0x42, 0x44, 0xc3, 0x4e, 0x76, 0xa1, 0x1f, 0xc6, 0x01, 0xbd, 0xb1, 0xb7, 0x11, 0x20,
0x07, 0x64, 0x1f, 0x36, 0x52, 0x46, 0xe7, 0x38, 0x71, 0x1f, 0x27, 0x8a, 0xb1, 0xf3, 0x97, 0x05,
0x9b, 0xd5, 0x6b, 0x0a, 0x11, 0x78, 0xbe, 0x9f, 0x2c, 0x63, 0x8e, 0x91, 0x90, 0x72, 0xaa, 0x9a,
0xc8, 0x01, 0x8c, 0x32, 0xee, 0x31, 0x8e, 0x9e, 0x48, 0x1d, 0x95, 0x86, 0xba, 0x24, 0x7f, 0xf4,
0xa2, 0x25, 0x55, 0x42, 0xd2, 0xcd, 0x75, 0xa4, 0x64, 0x48, 0x6a, 0x49, 0x37, 0x8b, 0x13, 0x85,
0x0a, 0xe5, 0x6e, 0x7d, 0x79, 0x62, 0x61, 0xd0, 0x44, 0x29, 0x37, 0x1a, 0x34, 0x44, 0x59, 0x90,
0xac, 0x82, 0x36, 0xac, 0x05, 0xed, 0x23, 0xd8, 0xca, 0xb1, 0x92, 0xe1, 0x0d, 0x3c, 0xa5, 0x6e,
0x14, 0x22, 0xa5, 0x65, 0x10, 0x46, 0x08, 0xa9, 0x58, 0x84, 0x9f, 0x29, 0xa3, 0xdf, 0x57, 0x55,
0x51, 0x1a, 0x44, 0x18, 0x18, 0x72, 0x3c, 0x0f, 0x50, 0x0a, 0x23, 0xb7, 0x18, 0xb7, 0x25, 0xf2,
0x66, 0x7b, 0x22, 0x17, 0x21, 0xde, 0xea, 0x0a, 0xf1, 0xb6, 0x16, 0xe2, 0xd7, 0x06, 0x3c, 0x38,
0xc9, 0x32, 0xca, 0x91, 0x02, 0x15, 0xe6, 0x43, 0x00, 0x79, 0x38, 0x5e, 0xc5, 0x90, 0x57, 0x29,
0x2d, 0x62, 0xc3, 0x05, 0x5f, 0x49, 0x32, 0x4d, 0x24, 0xb3, 0x18, 0xcb, 0x39, 0x5f, 0xce, 0x59,
0xf9, 0x9c, 0x5f, 0xcc, 0x51, 0xfe, 0x5b, 0x35, 0x9a, 0xc5, 0xd8, 0x79, 0x63, 0xc1, 0x4e, 0xad,
0x7e, 0x9d, 0xf8, 0x22, 0x32, 0xe4, 0x31, 0x0c, 0x64, 0xa6, 0xa3, 0x1f, 0xe3, 0xe3, 0x7d, 0x95,
0x7e, 0x35, 0xec, 0x0c, 0x11, 0x67, 0xf7, 0x5c, 0x85, 0x15, 0xab, 0x64, 0x36, 0xa3, 0x7f, 0x1d,
0xab, 0xa4, 0xb4, 0xc5, 0x2a, 0x89, 0x25, 0x5f, 0x40, 0x9f, 0xd1, 0xd4, 0x5b, 0xa1, 0xe3, 0xe3,
0xe3, 0x0f, 0xda, 0x16, 0xb9, 0x02, 0x70, 0x76, 0xcf, 0x95, 0x48, 0x71, 0x90, 0x97, 0xa6, 0x34,
0x0e, 0xf0, 0x42, 0x1d, 0x07, 0x9d, 0x20, 0x42, 0x1c, 0x24, 0xb1, 0xe4, 0x08, 0x7a, 0xe7, 0x94,
0x06, 0x28, 0xd7, 0xf1, 0xb1, 0xdd, 0xb6, 0xe6, 0x39, 0xa5, 0x62, 0x05, 0xe2, 0x84, 0x63, 0x7e,
0x94, 0x64, 0x52, 0xba, 0x1d, 0x8e, 0xcd, 0x04, 0x40, 0x38, 0x86, 0x48, 0xe1, 0xd8, 0xa5, 0x17,
0x7b, 0x17, 0xb2, 0x24, 0x76, 0x38, 0xf6, 0x1d, 0x22, 0x84, 0x63, 0x12, 0x4b, 0xb6, 0xc1, 0xe4,
0x2b, 0xa5, 0x4e, 0x93, 0xaf, 0x4e, 0x87, 0xd0, 0xbf, 0x16, 0x79, 0xe4, 0xfc, 0x6d, 0x68, 0xe1,
0x91, 0x4b, 0xf5, 0xb6, 0x60, 0xdc, 0xad, 0x2d, 0x98, 0xeb, 0xb4, 0x05, 0xab, 0xab, 0x2d, 0x94,
0x45, 0xb1, 0xa7, 0x17, 0x45, 0x91, 0x18, 0xaf, 0xaa, 0x2d, 0x4d, 0x16, 0x86, 0x86, 0x5d, 0xf8,
0xef, 0x2f, 0x19, 0xa3, 0xb1, 0xac, 0x58, 0x03, 0xe9, 0x7f, 0xc5, 0xe4, 0x3c, 0x82, 0x87, 0xf5,
0x60, 0x8a, 0x32, 0x77, 0x08, 0x90, 0x2d, 0x53, 0xca, 0xc4, 0x20, 0xb3, 0x8d, 0x89, 0x25, 0x3a,
0x52, 0x69, 0x71, 0x9e, 0x68, 0x6c, 0x49, 0x81, 0x36, 0x1a, 0xad, 0xd1, 0x6c, 0xb4, 0xce, 0x0f,
0xda, 0x52, 0xa9, 0xd2, 0x35, 0xba, 0xf9, 0xae, 0x8a, 0x99, 0x2a, 0xbf, 0x2a, 0x80, 0x3f, 0x03,
0x69, 0xea, 0x78, 0x8d, 0x5d, 0xab, 0x05, 0xca, 0xac, 0x17, 0x28, 0xe7, 0x4f, 0x5d, 0x1c, 0x52,
0xf0, 0xff, 0xcf, 0xee, 0x77, 0x6f, 0x1a, 0xce, 0x2f, 0x5a, 0xa8, 0x44, 0x0e, 0x89, 0xad, 0x31,
0xea, 0xab, 0x54, 0xf2, 0xdd, 0x77, 0x8b, 0xb1, 0xa0, 0x2a, 0x55, 0x55, 0xcc, 0x9a, 0x9a, 0xae,
0x1c, 0x08, 0x5d, 0x5d, 0x27, 0xd1, 0xf2, 0x52, 0x9c, 0x63, 0x09, 0x5d, 0xc9, 0x91, 0xf3, 0x8d,
0x46, 0x21, 0x66, 0xdc, 0xdd, 0x2f, 0xe9, 0xbc, 0x36, 0x61, 0xd7, 0xa5, 0x3e, 0x0d, 0x53, 0xfe,
0x6f, 0x5f, 0x6a, 0xf5, 0x97, 0x90, 0xd9, 0x78, 0x09, 0x69, 0x0d, 0xda, 0x6a, 0x36, 0xe8, 0x2a,
0xd3, 0x3d, 0x8d, 0xe9, 0xb2, 0x01, 0xf6, 0x6b, 0x0d, 0xf0, 0x00, 0x46, 0x2f, 0x8b, 0xd6, 0x35,
0x90, 0xad, 0xab, 0x30, 0x94, 0x4d, 0x67, 0xd8, 0xd5, 0x74, 0x36, 0xb4, 0xa6, 0xd3, 0xd0, 0x8b,
0xea, 0x3b, 0x77, 0xe7, 0x81, 0x40, 0xcf, 0x2b, 0x19, 0xc0, 0xef, 0xda, 0xcd, 0x2c, 0xed, 0x66,
0x85, 0x8f, 0xbd, 0x8a, 0x8f, 0xce, 0x0b, 0xd8, 0x6d, 0x71, 0x23, 0x23, 0x8f, 0x61, 0xc8, 0xd4,
0x9b, 0xcf, 0xc0, 0x37, 0xdf, 0x7e, 0x7b, 0x27, 0xc0, 0xa7, 0x5f, 0x0e, 0x75, 0xbe, 0x15, 0xd1,
0xbd, 0xaa, 0x41, 0xe6, 0xf1, 0x79, 0xb2, 0x86, 0x40, 0xde, 0x9a, 0xf0, 0xa1, 0x4b, 0xd3, 0xba,
0xc8, 0x64, 0x29, 0xc2, 0x9d, 0xca, 0xf8, 0x18, 0xb5, 0xf8, 0xbc, 0xbb, 0xef, 0xf7, 0xb2, 0xc4,
0x6f, 0xd4, 0x4a, 0x7c, 0x0b, 0xa7, 0xa3, 0x76, 0x4e, 0x67, 0xf0, 0x5e, 0x5b, 0x54, 0xb2, 0xbc,
0x4b, 0x54, 0xb0, 0x79, 0x21, 0x6f, 0xd8, 0x9d, 0x9f, 0xe0, 0xe0, 0x96, 0xb8, 0x64, 0xe4, 0x2b,
0x21, 0xaf, 0xf3, 0x24, 0x97, 0x8b, 0xa3, 0xe4, 0x72, 0xcb, 0x1a, 0x57, 0x2e, 0x70, 0xce, 0xc0,
0xd6, 0xdd, 0x3b, 0x5d, 0xa9, 0xc4, 0xea, 0x0a, 0x77, 0x21, 0x66, 0xb3, 0x2a, 0xe6, 0x53, 0xd8,
0x6b, 0xee, 0x84, 0xf4, 0xe6, 0xc9, 0x62, 0x54, 0x92, 0xa5, 0x7d, 0x8f, 0x8f, 0x61, 0x47, 0xf7,
0x79, 0xfe, 0x34, 0x23, 0x0f, 0xc0, 0x9a, 0x3f, 0xcd, 0xd9, 0x11, 0x9f, 0x0e, 0x13, 0x84, 0x5c,
0xb5, 0xa4, 0x83, 0x3a, 0xf2, 0xbf, 0x65, 0x72, 0xe1, 0x9c, 0x55, 0x75, 0xee, 0x06, 0x0e, 0xbb,
0xce, 0x54, 0x84, 0xdd, 0xfd, 0xd4, 0x92, 0x5a, 0xb3, 0x9d, 0xda, 0xda, 0xc9, 0x67, 0xf0, 0xbe,
0x4e, 0x4b, 0x5e, 0x2a, 0x3e, 0xd7, 0x4b, 0x45, 0xeb, 0xbf, 0x87, 0x45, 0x8d, 0xf8, 0xb5, 0x19,
0xa4, 0xb5, 0x6b, 0xdf, 0x6d, 0x9d, 0xf8, 0x99, 0xd8, 0xbf, 0xcd, 0x53, 0xf2, 0x29, 0x0c, 0x24,
0x4a, 0xbd, 0xa3, 0x5b, 0xfd, 0x54, 0x10, 0xe7, 0x8d, 0xd9, 0xdc, 0x67, 0x96, 0xc4, 0xe7, 0xe1,
0xc5, 0x3b, 0xf1, 0xe0, 0x4b, 0xa2, 0x02, 0x96, 0x3f, 0xf8, 0x4a, 0x93, 0xfe, 0x24, 0x1c, 0x36,
0x9e, 0x84, 0x8b, 0x01, 0xfe, 0xf2, 0xf2, 0xe8, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9e, 0x75,
0xc0, 0x02, 0x90, 0x11, 0x00, 0x00,
// 1221 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x5b, 0x6b, 0xdc, 0x46,
0x14, 0x8e, 0xa4, 0xbd, 0x78, 0xcf, 0xda, 0x8e, 0x33, 0x76, 0x53, 0xd5, 0x35, 0x66, 0x11, 0x85,
0x2e, 0xbd, 0x18, 0xea, 0x84, 0xd2, 0x50, 0x28, 0xb5, 0x37, 0x09, 0x5e, 0x48, 0x21, 0xa8, 0x69,
0x29, 0x85, 0x16, 0xb4, 0xd2, 0xd8, 0x15, 0xc8, 0x92, 0x2c, 0xcd, 0xba, 0xde, 0xbe, 0x37, 0xbf,
0x22, 0x3f, 0xae, 0xff, 0x21, 0x0f, 0x7d, 0x2d, 0x73, 0x66, 0x74, 0x99, 0x91, 0x64, 0xbc, 0x6d,
0x9f, 0xf2, 0x62, 0x34, 0x67, 0xbe, 0x33, 0x73, 0xe6, 0x9c, 0xef, 0x5c, 0xbc, 0xb0, 0xeb, 0x27,
0x51, 0xe4, 0x31, 0x9a, 0x79, 0x51, 0xf8, 0x07, 0x3d, 0x4a, 0xb3, 0x84, 0x25, 0xa4, 0xcf, 0x56,
0x29, 0xcd, 0x9d, 0xb7, 0x3d, 0xd8, 0x9a, 0xd5, 0xb7, 0xc9, 0x14, 0xee, 0x2b, 0xf8, 0x79, 0x60,
0x1b, 0x13, 0x63, 0x3a, 0x72, 0x75, 0x31, 0x71, 0x60, 0x93, 0x25, 0xcc, 0x8b, 0x4e, 0xbd, 0xc8,
0x8b, 0x7d, 0x6a, 0x9b, 0x13, 0x63, 0x6a, 0xb9, 0x8a, 0x8c, 0x4c, 0x60, 0x1c, 0xd0, 0x05, 0x9b,
0xd1, 0x30, 0x0a, 0xe3, 0x0b, 0xdb, 0x42, 0x48, 0x5d, 0x44, 0x3e, 0x81, 0x9d, 0x28, 0xbc, 0x5a,
0x86, 0x81, 0xc7, 0xc2, 0x24, 0x76, 0xf9, 0x5f, 0xbb, 0x37, 0x31, 0xa6, 0xa6, 0xdb, 0x90, 0x93,
0xcf, 0xe0, 0x41, 0xce, 0xbc, 0x45, 0x18, 0x85, 0x6c, 0xf5, 0x9c, 0x52, 0x01, 0xee, 0x23, 0xb8,
0xb9, 0x41, 0x0e, 0x01, 0xfc, 0x8c, 0x7a, 0x8c, 0x9e, 0x04, 0x41, 0x66, 0x0f, 0xf0, 0x11, 0x35,
0x09, 0xb1, 0x61, 0xb8, 0x90, 0xa6, 0x0f, 0xd1, 0xae, 0x62, 0x49, 0x9e, 0xc0, 0xd6, 0x22, 0xc9,
0xb2, 0xe4, 0x77, 0x97, 0xfa, 0x49, 0x16, 0xe4, 0xf6, 0xc6, 0xc4, 0x9a, 0x8e, 0x8f, 0x77, 0x8f,
0xd0, 0x69, 0x47, 0xa7, 0xb5, 0x3d, 0x57, 0x45, 0x92, 0xaf, 0x61, 0x7b, 0x1e, 0x5f, 0x7b, 0x51,
0x18, 0x14, 0xba, 0xa3, 0x6e, 0x5d, 0x0d, 0x4a, 0x1e, 0xc2, 0x20, 0x67, 0x1e, 0x5b, 0xe6, 0x36,
0x4c, 0x8c, 0x69, 0xdf, 0x95, 0x2b, 0xf2, 0x25, 0x3c, 0xe4, 0x9e, 0xcf, 0xd9, 0x8b, 0xca, 0x23,
0x2f, 0xb3, 0xd0, 0xa7, 0xf6, 0x18, 0x1f, 0xdf, 0xb1, 0xcb, 0xcf, 0x4b, 0x69, 0x16, 0x26, 0x81,
0xbd, 0x89, 0x0f, 0x94, 0x2b, 0xf4, 0x39, 0x6a, 0x3c, 0xbb, 0x49, 0xc3, 0x8c, 0xbe, 0x0a, 0x2f,
0xa9, 0xbd, 0x85, 0x88, 0x86, 0x9c, 0xec, 0x41, 0x3f, 0x8c, 0x03, 0x7a, 0x63, 0x6f, 0x23, 0x40,
0x2c, 0xc8, 0x3e, 0x6c, 0xa4, 0x19, 0x9d, 0xe3, 0xc6, 0x7d, 0xdc, 0x28, 0xd7, 0x3c, 0xe6, 0x9c,
0x2a, 0x05, 0x2d, 0x76, 0x44, 0xcc, 0x6b, 0x22, 0xe7, 0x2f, 0x0b, 0x36, 0xeb, 0x8e, 0xe0, 0x2a,
0x9e, 0xef, 0x27, 0xcb, 0x98, 0x61, 0xac, 0x04, 0xe1, 0xea, 0x22, 0x72, 0x00, 0xa3, 0x9c, 0x79,
0x19, 0x43, 0x5b, 0x05, 0xd3, 0x2a, 0x81, 0x4a, 0xda, 0x1f, 0xbd, 0x68, 0x49, 0x25, 0xd5, 0x74,
0xb1, 0x8a, 0x14, 0x3e, 0x14, 0x6c, 0xd3, 0xc5, 0xfc, 0x46, 0xce, 0x53, 0x71, 0x5a, 0x5f, 0xdc,
0x58, 0x0a, 0x34, 0xda, 0x8a, 0x83, 0x06, 0x0d, 0xda, 0x96, 0x61, 0x90, 0x61, 0x1d, 0x2a, 0x61,
0xfd, 0x08, 0xb6, 0x0a, 0xac, 0x88, 0xc1, 0x06, 0xde, 0xa2, 0x0a, 0x39, 0x8d, 0x69, 0x15, 0xa6,
0x11, 0x42, 0x6a, 0x12, 0x6e, 0x67, 0x9a, 0xd1, 0xef, 0xeb, 0xbc, 0xa9, 0x04, 0x3c, 0x50, 0x19,
0xfa, 0x78, 0x1e, 0x20, 0x59, 0x46, 0x6e, 0xb9, 0x6e, 0x4b, 0xf5, 0xcd, 0xf6, 0x54, 0x2f, 0x49,
0xb0, 0xd5, 0x45, 0x82, 0x6d, 0x95, 0x04, 0xce, 0x6b, 0x03, 0x76, 0x4e, 0xf2, 0x9c, 0x32, 0x74,
0x81, 0x0c, 0xf3, 0x21, 0x80, 0xb8, 0x1c, 0x9f, 0x62, 0x88, 0xa7, 0x54, 0x12, 0x7e, 0xe0, 0x82,
0xad, 0x84, 0x33, 0x4d, 0x74, 0x66, 0xb9, 0x16, 0x7b, 0xbe, 0xd8, 0xb3, 0x8a, 0x3d, 0xbf, 0xdc,
0xa3, 0xec, 0xb7, 0x7a, 0x34, 0xcb, 0xb5, 0xf3, 0xc6, 0x82, 0x5d, 0xa5, 0xc2, 0x9d, 0xf8, 0x3c,
0x32, 0xe4, 0x31, 0x0c, 0x44, 0x2d, 0x40, 0x3b, 0xc6, 0xc7, 0xfb, 0x32, 0x41, 0x15, 0xec, 0x0c,
0x11, 0x67, 0xf7, 0x5c, 0x89, 0xe5, 0x5a, 0x22, 0xdf, 0xd1, 0xbe, 0x0e, 0x2d, 0x41, 0x6d, 0xae,
0x25, 0xb0, 0xe4, 0x0b, 0xe8, 0x67, 0x34, 0xf5, 0x56, 0x68, 0xf8, 0xf8, 0xf8, 0x83, 0x36, 0x25,
0x97, 0x03, 0xce, 0xee, 0xb9, 0x02, 0xc9, 0x2f, 0xf2, 0xd2, 0x94, 0xc6, 0x01, 0x3e, 0xa8, 0xe3,
0xa2, 0x13, 0x44, 0xf0, 0x8b, 0x04, 0x96, 0x1c, 0x41, 0xef, 0x9c, 0xd2, 0x00, 0xe9, 0x3a, 0x3e,
0xb6, 0xdb, 0x74, 0x9e, 0x53, 0xca, 0x35, 0x10, 0xc7, 0x0d, 0xf3, 0xa3, 0x24, 0x17, 0xd4, 0xed,
0x30, 0x6c, 0xc6, 0x01, 0xdc, 0x30, 0x44, 0x72, 0xc3, 0x2e, 0xbd, 0xd8, 0xbb, 0x10, 0x45, 0xb3,
0xc3, 0xb0, 0xef, 0x10, 0xc1, 0x0d, 0x13, 0x58, 0xb2, 0x0d, 0x26, 0x5b, 0x49, 0x76, 0x9a, 0x6c,
0x75, 0x3a, 0x84, 0xfe, 0x35, 0xcf, 0x23, 0xe7, 0x6f, 0x43, 0x0b, 0x8f, 0x50, 0xd5, 0x1b, 0x87,
0x71, 0xb7, 0xc6, 0x61, 0xae, 0xd3, 0x38, 0xac, 0xae, 0xc6, 0x51, 0x95, 0xcd, 0x9e, 0x5e, 0x36,
0x79, 0x62, 0xbc, 0xaa, 0x37, 0x3d, 0x51, 0x18, 0x1a, 0x72, 0x2c, 0x82, 0xcb, 0x2c, 0xa3, 0xb1,
0xa8, 0x58, 0x03, 0x59, 0x04, 0x2b, 0x91, 0xf3, 0x08, 0x1e, 0xa8, 0xc1, 0xe4, 0x65, 0xee, 0x10,
0x20, 0x5f, 0xa6, 0x34, 0xe3, 0x8b, 0xdc, 0x36, 0x26, 0x16, 0xef, 0x59, 0x95, 0xc4, 0x79, 0xa2,
0x79, 0x4b, 0x10, 0xb4, 0xd1, 0x8a, 0x8d, 0x66, 0x2b, 0x76, 0x7e, 0xd0, 0x54, 0x05, 0x4b, 0xd7,
0xe8, 0xf7, 0x7b, 0x32, 0x66, 0xb2, 0xfc, 0xca, 0x00, 0xfe, 0x0c, 0xa4, 0xc9, 0xe3, 0x35, 0x4e,
0xad, 0x17, 0x28, 0x53, 0x2d, 0x50, 0xce, 0x9f, 0x3a, 0x39, 0x04, 0xe1, 0xff, 0x9f, 0xd3, 0xef,
0xde, 0x34, 0x9c, 0x5f, 0xb4, 0x50, 0xf1, 0x1c, 0xe2, 0x47, 0x63, 0xd4, 0x57, 0xa9, 0xf0, 0x77,
0xdf, 0x2d, 0xd7, 0xdc, 0x55, 0xa9, 0xac, 0x62, 0xd6, 0xd4, 0x74, 0xc5, 0x82, 0xf3, 0xea, 0x3a,
0x89, 0x96, 0x97, 0xfc, 0x1e, 0x8b, 0xf3, 0x4a, 0xac, 0x9c, 0x6f, 0x34, 0x17, 0x62, 0xc6, 0xdd,
0xfd, 0x91, 0xce, 0x6b, 0x13, 0xf6, 0x5c, 0xea, 0xd3, 0x30, 0x65, 0xff, 0x76, 0x96, 0x53, 0x67,
0x25, 0xb3, 0x31, 0x2b, 0x69, 0x0d, 0xda, 0x6a, 0x36, 0xe8, 0xba, 0xa7, 0x7b, 0x9a, 0xa7, 0xab,
0x06, 0xd8, 0x57, 0x1a, 0xe0, 0x01, 0x8c, 0x5e, 0x96, 0xad, 0x6b, 0x20, 0x5a, 0x57, 0x29, 0xa8,
0x9a, 0xce, 0xb0, 0xab, 0xe9, 0x6c, 0x68, 0x4d, 0xa7, 0xc1, 0x17, 0xd9, 0x77, 0xee, 0xee, 0x07,
0x02, 0x3d, 0xaf, 0xf2, 0x00, 0x7e, 0x2b, 0x2f, 0xb3, 0xb4, 0x97, 0x95, 0x36, 0xf6, 0x6a, 0x36,
0x3a, 0x2f, 0x60, 0xaf, 0xc5, 0x8c, 0x9c, 0x3c, 0x86, 0x61, 0x26, 0xa7, 0x42, 0x03, 0xa7, 0xc2,
0xfd, 0xf6, 0x4e, 0x80, 0xc3, 0x61, 0x01, 0x75, 0xbe, 0xe5, 0xd1, 0xbd, 0x52, 0x20, 0xf3, 0xf8,
0x3c, 0x59, 0x83, 0x20, 0x6f, 0x4d, 0xf8, 0xd0, 0xa5, 0xa9, 0x4a, 0x32, 0x51, 0x8a, 0xf0, 0xa4,
0x2a, 0x3e, 0x86, 0x12, 0x9f, 0x77, 0x77, 0xc2, 0xaf, 0x4a, 0xfc, 0x86, 0x52, 0xe2, 0x5b, 0x7c,
0x3a, 0x6a, 0x67, 0x8a, 0x36, 0xe5, 0x42, 0x73, 0xca, 0x9d, 0xc1, 0x7b, 0x6d, 0x71, 0xcb, 0x8b,
0x3e, 0x52, 0x3b, 0xad, 0x28, 0xf5, 0x0d, 0xb9, 0xf3, 0x13, 0x1c, 0xdc, 0x12, 0xb9, 0x9c, 0x7c,
0xc5, 0x09, 0x78, 0x9e, 0x14, 0x84, 0x72, 0x24, 0xa1, 0x6e, 0xd1, 0x71, 0x85, 0x82, 0x73, 0x06,
0xb6, 0x6e, 0xde, 0xe9, 0x4a, 0xa6, 0x5e, 0x17, 0x21, 0x4a, 0xba, 0x9b, 0x75, 0xba, 0x9f, 0xc2,
0xc3, 0xe6, 0x49, 0x18, 0x80, 0x22, 0x9d, 0x8c, 0x5a, 0x3a, 0xb5, 0x9f, 0xf1, 0x31, 0xec, 0xea,
0x36, 0xcf, 0x9f, 0xe6, 0x64, 0x07, 0xac, 0xf9, 0xd3, 0xc2, 0x3b, 0xfc, 0xd3, 0xc9, 0xb8, 0x43,
0xae, 0x5a, 0x12, 0x46, 0x5e, 0xf9, 0xdf, 0x72, 0xbd, 0x34, 0xce, 0xaa, 0x1b, 0x77, 0x03, 0x87,
0x5d, 0x77, 0x4a, 0x87, 0xdd, 0xfd, 0xd6, 0xca, 0xb5, 0x66, 0xbb, 0x6b, 0x95, 0x9b, 0xcf, 0xe0,
0x7d, 0xdd, 0x2d, 0x45, 0x31, 0xf9, 0x5c, 0x2f, 0x26, 0xad, 0xff, 0x62, 0x96, 0x55, 0xe4, 0xd7,
0x66, 0x90, 0xd6, 0xae, 0x8e, 0xb7, 0xf5, 0xea, 0x67, 0xfc, 0xfc, 0x36, 0x4b, 0xc9, 0xa7, 0x30,
0x10, 0x28, 0x39, 0x69, 0xb7, 0xda, 0x29, 0x21, 0xce, 0x1b, 0xb3, 0x79, 0xce, 0x2c, 0x89, 0xcf,
0xc3, 0x8b, 0x77, 0x62, 0x24, 0xac, 0x55, 0x8c, 0x41, 0xa3, 0x62, 0xe8, 0x43, 0xe3, 0xb0, 0x31,
0x34, 0x2e, 0x06, 0xf8, 0xeb, 0xcd, 0xa3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x50, 0x87,
0x0f, 0xd4, 0x11, 0x00, 0x00,
}
plugin/dapp/issuance/executor/issuancedb.go
View file @ 020ed969
......@@ -837,6 +837,10 @@ func pricePolicy(feed *pty.IssuanceFeed) float32 {
totalVolume += volume
}
if totalVolume == 0 {
clog.Error("issuance price feed volume empty")
return 0
}
for i, price := range feed.Price {
totalPrice += price * float32(float64(feed.Volume[i])/float64(totalVolume))
}
......@@ -861,7 +865,7 @@ func (action *Action) IssuanceFeed(feed *pty.IssuanceFeed) (*types.Receipt, erro
}
price := pricePolicy(feed)
if price == 0 || price == -1 {
if price <= 0 {
clog.Error("IssuancePriceFeed", "price", price, "err", pty.ErrPriceInvalid)
return nil, pty.ErrPriceInvalid
}
......
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