Skip to content

P
plugin
Commit 8bf3334d authored by pengjun's avatar pengjun
Browse files
Options

#627 fix query error

parent 248ebbe9
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 82 deletions
plugin/dapp/collateralize/commands/cmd.go
View file @ 8bf3334d
...@@ -305,7 +305,7 @@ func CollateralizeManage(cmd *cobra.Command, args []string) { ...@@ -305,7 +305,7 @@ func CollateralizeManage(cmd *cobra.Command, args []string) {
params := &rpctypes.CreateTxIn{ params := &rpctypes.CreateTxIn{
Execer: cfg.ExecName(pkt.CollateralizeX), Execer: cfg.ExecName(pkt.CollateralizeX),
ActionName: "CollateralizeManage", ActionName: "CollateralizeManage",
Payload: []byte(fmt.Sprintf("{\"debtCeiling\":%d, \"liquidationRatio\":%f, \"stabilityFeeRatio\":%f, \"period\":%d, \"totalBalance\":%d,}", Payload: []byte(fmt.Sprintf("{\"debtCeiling\":%d, \"liquidationRatio\":%f, \"stabilityFeeRatio\":%f, \"period\":%d, \"totalBalance\":%d}",
debtCeiling, liquidationRatio, stabilityFeeRatio, period, totalBalance)), debtCeiling, liquidationRatio, stabilityFeeRatio, period, totalBalance)),
} }
......
plugin/dapp/collateralize/executor/collateralizedb.go
View file @ 8bf3334d
...@@ -266,7 +266,6 @@ func (action *Action) CollateralizeManage(manage *pty.CollateralizeManage) (*typ ...@@ -266,7 +266,6 @@ func (action *Action) CollateralizeManage(manage *pty.CollateralizeManage) (*typ
return nil, pty.ErrRiskParam return nil, pty.ErrRiskParam
} }
var collConfig *pty.CollateralizeManage
manConfig, _ := getCollateralizeConfig(action.db) manConfig, _ := getCollateralizeConfig(action.db)
if manConfig == nil { if manConfig == nil {
manConfig = &pty.CollateralizeManage{ manConfig = &pty.CollateralizeManage{
...@@ -275,9 +274,11 @@ func (action *Action) CollateralizeManage(manage *pty.CollateralizeManage) (*typ ...@@ -275,9 +274,11 @@ func (action *Action) CollateralizeManage(manage *pty.CollateralizeManage) (*typ
StabilityFeeRatio: DefaultStabilityFeeRation, StabilityFeeRatio: DefaultStabilityFeeRation,
Period: DefaultPeriod, Period: DefaultPeriod,
CollTotalBalance: DefaultCollTotalBalance, CollTotalBalance: DefaultCollTotalBalance,
CurrentTime: action.blocktime,
} }
} }
collConfig := &pty.CollateralizeManage{}
if manage.StabilityFeeRatio != 0 { if manage.StabilityFeeRatio != 0 {
collConfig.StabilityFeeRatio = manage.StabilityFeeRatio collConfig.StabilityFeeRatio = manage.StabilityFeeRatio
} else { } else {
...@@ -308,6 +309,12 @@ func (action *Action) CollateralizeManage(manage *pty.CollateralizeManage) (*typ ...@@ -308,6 +309,12 @@ func (action *Action) CollateralizeManage(manage *pty.CollateralizeManage) (*typ
collConfig.CollTotalBalance = manConfig.CollTotalBalance collConfig.CollTotalBalance = manConfig.CollTotalBalance
} }
if manage.CurrentTime != 0 {
collConfig.CollTotalBalance = manage.CollTotalBalance
} else {
collConfig.CollTotalBalance = manConfig.CollTotalBalance
}
value := types.Encode(collConfig) value := types.Encode(collConfig)
action.db.Set(ConfigKey(), value) action.db.Set(ConfigKey(), value)
kv = append(kv, &types.KeyValue{Key: ConfigKey(), Value: value}) kv = append(kv, &types.KeyValue{Key: ConfigKey(), Value: value})
......
plugin/dapp/collateralize/executor/query.go
View file @ 8bf3334d
...@@ -123,8 +123,7 @@ func (c *Collateralize) Query_CollateralizeConfig(req *pty.ReqCollateralizeRecor ...@@ -123,8 +123,7 @@ func (c *Collateralize) Query_CollateralizeConfig(req *pty.ReqCollateralizeRecor
collIDRecords, err := queryCollateralizeByStatus(c.GetLocalDB(), pty.CollateralizeStatusCreated, 0) collIDRecords, err := queryCollateralizeByStatus(c.GetLocalDB(), pty.CollateralizeStatusCreated, 0)
if err != nil { if err != nil {
clog.Error("Query_CollateralizeByStatus", "get collateralize record error", err) clog.Debug("Query_CollateralizeByStatus", "get collateralize record error", err)
return nil, err
} }
collBalance := config.CollTotalBalance collBalance := config.CollTotalBalance
...@@ -144,6 +143,7 @@ func (c *Collateralize) Query_CollateralizeConfig(req *pty.ReqCollateralizeRecor ...@@ -144,6 +143,7 @@ func (c *Collateralize) Query_CollateralizeConfig(req *pty.ReqCollateralizeRecor
StabilityFeeRatio: config.StabilityFeeRatio, StabilityFeeRatio: config.StabilityFeeRatio,
Period: config.Period, Period: config.Period,
CollBalance: collBalance, CollBalance: collBalance,
CurrentTime: config.CurrentTime,
} }
return ret, nil return ret, nil
......
plugin/dapp/collateralize/proto/collateralize.proto
View file @ 8bf3334d
...@@ -67,6 +67,7 @@ message CollateralizeManage { ...@@ -67,6 +67,7 @@ message CollateralizeManage {
float stabilityFeeRatio = 3; //稳定费 float stabilityFeeRatio = 3; //稳定费
int64 period = 4; //合约期限 int64 period = 4; //合约期限
int64 collTotalBalance = 5; //放贷总量 int64 collTotalBalance = 5; //放贷总量
int64 currentTime = 6; //设置时间
} }
message CollateralizeAddr { message CollateralizeAddr {
...@@ -216,4 +217,5 @@ message RepCollateralizeConfig { ...@@ -216,4 +217,5 @@ message RepCollateralizeConfig {
int64 period = 4; //合约期限 int64 period = 4; //合约期限
int64 collTotalBalance = 5; //放贷总量 int64 collTotalBalance = 5; //放贷总量
int64 collBalance = 6; //剩余放贷额度 int64 collBalance = 6; //剩余放贷额度
int64 currentTime = 7; //设置时间
} }
\ No newline at end of file
plugin/dapp/collateralize/types/collateralize.go
View file @ 8bf3334d
...@@ -331,7 +331,7 @@ func CreateRawCollateralizeManageTx(cfg *types.Chain33Config, parm *Collateraliz ...@@ -331,7 +331,7 @@ func CreateRawCollateralizeManageTx(cfg *types.Chain33Config, parm *Collateraliz
LiquidationRatio: parm.LiquidationRatio, LiquidationRatio: parm.LiquidationRatio,
StabilityFeeRatio: parm.StabilityFeeRatio, StabilityFeeRatio: parm.StabilityFeeRatio,
Period: parm.Period, Period: parm.Period,
CollTotalBalance: parm.TotalBalance, CollTotalBalance: parm.CollTotalBalance,
} }
manage := &CollateralizeAction{ manage := &CollateralizeAction{
......
plugin/dapp/collateralize/types/collateralize.pb.go
View file @ 8bf3334d
...@@ -550,6 +550,7 @@ type CollateralizeManage struct { ...@@ -550,6 +550,7 @@ type CollateralizeManage struct {
StabilityFeeRatio float32 `protobuf:"fixed32,3,opt,name=stabilityFeeRatio,proto3" json:"stabilityFeeRatio,omitempty"` StabilityFeeRatio float32 `protobuf:"fixed32,3,opt,name=stabilityFeeRatio,proto3" json:"stabilityFeeRatio,omitempty"`
Period int64 `protobuf:"varint,4,opt,name=period,proto3" json:"period,omitempty"` Period int64 `protobuf:"varint,4,opt,name=period,proto3" json:"period,omitempty"`
CollTotalBalance int64 `protobuf:"varint,5,opt,name=collTotalBalance,proto3" json:"collTotalBalance,omitempty"` CollTotalBalance int64 `protobuf:"varint,5,opt,name=collTotalBalance,proto3" json:"collTotalBalance,omitempty"`
CurrentTime int64 `protobuf:"varint,6,opt,name=currentTime,proto3" json:"currentTime,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -615,6 +616,13 @@ func (m *CollateralizeManage) GetCollTotalBalance() int64 { ...@@ -615,6 +616,13 @@ func (m *CollateralizeManage) GetCollTotalBalance() int64 {
return 0 return 0
} }
func (m *CollateralizeManage) GetCurrentTime() int64 {
if m != nil {
return m.CurrentTime
}
return 0
}
type CollateralizeAddr struct { type CollateralizeAddr struct {
SuperAddrs []string `protobuf:"bytes,1,rep,name=superAddrs,proto3" json:"superAddrs,omitempty"` SuperAddrs []string `protobuf:"bytes,1,rep,name=superAddrs,proto3" json:"superAddrs,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
...@@ -1750,6 +1758,7 @@ type RepCollateralizeConfig struct { ...@@ -1750,6 +1758,7 @@ type RepCollateralizeConfig struct {
Period int64 `protobuf:"varint,4,opt,name=period,proto3" json:"period,omitempty"` Period int64 `protobuf:"varint,4,opt,name=period,proto3" json:"period,omitempty"`
CollTotalBalance int64 `protobuf:"varint,5,opt,name=collTotalBalance,proto3" json:"collTotalBalance,omitempty"` CollTotalBalance int64 `protobuf:"varint,5,opt,name=collTotalBalance,proto3" json:"collTotalBalance,omitempty"`
CollBalance int64 `protobuf:"varint,6,opt,name=collBalance,proto3" json:"collBalance,omitempty"` CollBalance int64 `protobuf:"varint,6,opt,name=collBalance,proto3" json:"collBalance,omitempty"`
CurrentTime int64 `protobuf:"varint,7,opt,name=currentTime,proto3" json:"currentTime,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1822,6 +1831,13 @@ func (m *RepCollateralizeConfig) GetCollBalance() int64 { ...@@ -1822,6 +1831,13 @@ func (m *RepCollateralizeConfig) GetCollBalance() int64 {
return 0 return 0
} }
func (m *RepCollateralizeConfig) GetCurrentTime() int64 {
if m != nil {
return m.CurrentTime
}
return 0
}
func init() { func init() {
proto.RegisterType((*Collateralize)(nil), "types.Collateralize") proto.RegisterType((*Collateralize)(nil), "types.Collateralize")
proto.RegisterType((*BorrowRecord)(nil), "types.BorrowRecord") proto.RegisterType((*BorrowRecord)(nil), "types.BorrowRecord")
...@@ -1856,80 +1872,81 @@ func init() { ...@@ -1856,80 +1872,81 @@ func init() {
func init() { proto.RegisterFile("collateralize.proto", fileDescriptor_a988fb4a61381972) } func init() { proto.RegisterFile("collateralize.proto", fileDescriptor_a988fb4a61381972) }
var fileDescriptor_a988fb4a61381972 = []byte{ var fileDescriptor_a988fb4a61381972 = []byte{
// 1192 bytes of a gzipped FileDescriptorProto // 1206 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xdd, 0x6e, 0xdc, 0x44, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x6d, 0x6b, 0xdc, 0x46,
0x14, 0xae, 0xed, 0xfd, 0xc9, 0x9e, 0x4d, 0xd2, 0x76, 0x12, 0x82, 0x09, 0x51, 0xb4, 0xb2, 0x90, 0x10, 0x8e, 0xa4, 0x7b, 0xf1, 0xcd, 0xd9, 0x4e, 0xb2, 0x76, 0x5d, 0xd5, 0x35, 0xe6, 0x10, 0x85,
0x58, 0xf1, 0x13, 0x89, 0xb4, 0x42, 0x54, 0x48, 0x88, 0x64, 0xdb, 0x2a, 0x2b, 0x15, 0xa9, 0x32, 0x1e, 0x7d, 0x31, 0xd4, 0x09, 0xa5, 0xa1, 0x50, 0x6a, 0x5f, 0x12, 0x7c, 0x90, 0x42, 0x50, 0xd3,
0x05, 0x21, 0x24, 0x90, 0xbc, 0xf6, 0x24, 0x58, 0x72, 0x6c, 0x67, 0x3c, 0x1b, 0xb2, 0xdc, 0xd3, 0x52, 0x0a, 0x2d, 0xe8, 0xa4, 0xb5, 0x2b, 0x90, 0x25, 0x79, 0xb5, 0xe7, 0xfa, 0xfa, 0xbd, 0xf9,
0xa7, 0xe0, 0xa5, 0x7a, 0xc1, 0x3d, 0xcf, 0xc1, 0x15, 0x9a, 0x33, 0xe3, 0xbf, 0xb1, 0x1d, 0x65, 0x15, 0xf9, 0x53, 0xf9, 0x07, 0xfd, 0x17, 0xfd, 0x5a, 0x76, 0x76, 0xf5, 0xb6, 0x92, 0x8c, 0xaf,
0x81, 0x1b, 0xb8, 0x89, 0x3c, 0x67, 0xbe, 0x99, 0x39, 0xf3, 0x9d, 0xef, 0x9c, 0x33, 0x59, 0xd8, 0xed, 0xa7, 0x7c, 0x31, 0xda, 0xd9, 0x67, 0x77, 0x67, 0x9f, 0x79, 0x66, 0x66, 0x7d, 0xb0, 0xe3,
0xf1, 0x93, 0x28, 0xf2, 0x38, 0x65, 0x5e, 0x14, 0xfe, 0x42, 0x8f, 0x52, 0x96, 0xf0, 0x84, 0xf4, 0x27, 0x51, 0xe4, 0x71, 0xca, 0xbc, 0x28, 0xfc, 0x83, 0x1e, 0xa5, 0x2c, 0xe1, 0x09, 0xe9, 0xf3,
0xf9, 0x2a, 0xa5, 0x99, 0xf3, 0xa6, 0x07, 0x5b, 0xb3, 0xea, 0x34, 0x99, 0xc2, 0xfd, 0x1a, 0x7e, 0x55, 0x4a, 0x33, 0xe7, 0x6d, 0x0f, 0xb6, 0x66, 0xd5, 0x69, 0x32, 0x85, 0xfb, 0x35, 0xfc, 0x3c,
0x1e, 0xd8, 0xc6, 0xc4, 0x98, 0x8e, 0x5c, 0xdd, 0x4c, 0x1c, 0xd8, 0xe4, 0x09, 0xf7, 0xa2, 0x53, 0xb0, 0x8d, 0x89, 0x31, 0x1d, 0xb9, 0xba, 0x99, 0x38, 0xb0, 0xc9, 0x13, 0xee, 0x45, 0xa7, 0x5e,
0x2f, 0xf2, 0x62, 0x9f, 0xda, 0xe6, 0xc4, 0x98, 0x5a, 0x6e, 0xcd, 0x46, 0x26, 0x30, 0x0e, 0xe8, 0xe4, 0xc5, 0x3e, 0xb5, 0xcd, 0x89, 0x31, 0xb5, 0xdc, 0x9a, 0x8d, 0x4c, 0x60, 0x1c, 0xd0, 0x05,
0x82, 0xcf, 0x68, 0x18, 0x85, 0xf1, 0x85, 0x6d, 0x21, 0xa4, 0x6a, 0x22, 0x1f, 0xc0, 0x83, 0x28, 0x9f, 0xd1, 0x30, 0x0a, 0xe3, 0x0b, 0xdb, 0x42, 0x48, 0xd5, 0x44, 0x3e, 0x81, 0x07, 0x51, 0x78,
0xbc, 0x5a, 0x86, 0x81, 0xc7, 0xc3, 0x24, 0x76, 0xc5, 0x5f, 0xbb, 0x37, 0x31, 0xa6, 0xa6, 0xdb, 0xb5, 0x0c, 0x03, 0x8f, 0x87, 0x49, 0xec, 0x8a, 0xbf, 0x76, 0x6f, 0x62, 0x4c, 0x4d, 0xb7, 0x61,
0xb0, 0x93, 0x8f, 0xe0, 0x61, 0xc6, 0xbd, 0x45, 0x18, 0x85, 0x7c, 0xf5, 0x9c, 0x52, 0x09, 0xee, 0x27, 0x9f, 0xc1, 0xc3, 0x8c, 0x7b, 0x8b, 0x30, 0x0a, 0xf9, 0xea, 0x39, 0xa5, 0x12, 0xdc, 0x47,
0x23, 0xb8, 0x39, 0x41, 0x0e, 0x01, 0x7c, 0x46, 0x3d, 0x4e, 0x4f, 0x82, 0x80, 0xd9, 0x03, 0xbc, 0x70, 0x73, 0x82, 0x1c, 0x02, 0xf8, 0x8c, 0x7a, 0x9c, 0x9e, 0x04, 0x01, 0xb3, 0x07, 0x78, 0x89,
0x44, 0xc5, 0x42, 0x6c, 0x18, 0x2e, 0x94, 0xeb, 0x43, 0xf4, 0x2b, 0x1f, 0x92, 0x27, 0xb0, 0xb5, 0x8a, 0x85, 0xd8, 0x30, 0x5c, 0x28, 0xd7, 0x87, 0xe8, 0x57, 0x3e, 0x24, 0x4f, 0x60, 0x6b, 0x91,
0x48, 0x18, 0x4b, 0x7e, 0x76, 0xa9, 0x9f, 0xb0, 0x20, 0xb3, 0x37, 0x26, 0xd6, 0x74, 0x7c, 0xbc, 0x30, 0x96, 0xfc, 0xee, 0x52, 0x3f, 0x61, 0x41, 0x66, 0x6f, 0x4c, 0xac, 0xe9, 0xf8, 0x78, 0xe7,
0x73, 0x84, 0xa4, 0x1d, 0x9d, 0x56, 0xe6, 0xdc, 0x3a, 0x92, 0x7c, 0x0e, 0xdb, 0xf3, 0xf8, 0xda, 0x08, 0x49, 0x3b, 0x3a, 0xad, 0xcc, 0xb9, 0x75, 0x24, 0xf9, 0x1a, 0xb6, 0xe7, 0xf1, 0xb5, 0x17,
0x8b, 0xc2, 0x20, 0x5f, 0x3b, 0xea, 0x5e, 0xab, 0x41, 0xc9, 0x1e, 0x0c, 0x32, 0xee, 0xf1, 0x65, 0x85, 0x41, 0xbe, 0x76, 0xd4, 0xbd, 0x56, 0x83, 0x92, 0x3d, 0x18, 0x64, 0xdc, 0xe3, 0xcb, 0xcc,
0x66, 0xc3, 0xc4, 0x98, 0xf6, 0x5d, 0x35, 0x22, 0x9f, 0xc2, 0x9e, 0x60, 0x3e, 0xe3, 0x2f, 0x4a, 0x86, 0x89, 0x31, 0xed, 0xbb, 0x6a, 0x44, 0xbe, 0x84, 0x3d, 0xc1, 0x7c, 0xc6, 0x5f, 0x94, 0x8c,
0x46, 0x5e, 0xb2, 0xd0, 0xa7, 0xf6, 0x18, 0x2f, 0xdf, 0x31, 0x2b, 0xf6, 0x4b, 0x29, 0x0b, 0x93, 0xbc, 0x64, 0xa1, 0x4f, 0xed, 0x31, 0x5e, 0xbe, 0x63, 0x56, 0xec, 0x97, 0x52, 0x16, 0x26, 0x81,
0xc0, 0xde, 0xc4, 0x0b, 0xaa, 0x11, 0x72, 0x8e, 0x2b, 0x9e, 0xdd, 0xa4, 0x21, 0xa3, 0xaf, 0xc2, 0xbd, 0x89, 0x17, 0x54, 0x23, 0xe4, 0x1c, 0x57, 0x3c, 0xbb, 0x49, 0x43, 0x46, 0x5f, 0x85, 0x97,
0x4b, 0x6a, 0x6f, 0x21, 0xa2, 0x61, 0x27, 0xbb, 0xd0, 0x0f, 0xe3, 0x80, 0xde, 0xd8, 0xdb, 0x08, 0xd4, 0xde, 0x42, 0x44, 0xc3, 0x4e, 0x76, 0xa1, 0x1f, 0xc6, 0x01, 0xbd, 0xb1, 0xb7, 0x11, 0x20,
0x90, 0x03, 0xb2, 0x0f, 0x1b, 0x29, 0xa3, 0x73, 0x9c, 0xb8, 0x8f, 0x13, 0xc5, 0xd8, 0xf9, 0xc3, 0x07, 0x64, 0x1f, 0x36, 0x52, 0x46, 0xe7, 0x38, 0x71, 0x1f, 0x27, 0x8a, 0xb1, 0xf3, 0x97, 0x05,
0x82, 0xcd, 0xea, 0x35, 0x85, 0x08, 0x3c, 0xdf, 0x4f, 0x96, 0x31, 0xc7, 0x48, 0x48, 0x39, 0x55, 0x9b, 0xd5, 0x6b, 0x0a, 0x11, 0x78, 0xbe, 0x9f, 0x2c, 0x63, 0x8e, 0x91, 0x90, 0x72, 0xaa, 0x9a,
0x4d, 0xe4, 0x00, 0x46, 0x19, 0xf7, 0x18, 0x47, 0x4f, 0xa4, 0x8e, 0x4a, 0x43, 0x5d, 0x92, 0xdf, 0xc8, 0x01, 0x8c, 0x32, 0xee, 0x31, 0x8e, 0x9e, 0x48, 0x1d, 0x95, 0x86, 0xba, 0x24, 0x7f, 0xf4,
0x7a, 0xd1, 0x92, 0x2a, 0x21, 0xe9, 0xe6, 0x3a, 0x52, 0x32, 0x24, 0xb5, 0xa4, 0x9b, 0xc5, 0x89, 0xa2, 0x25, 0x55, 0x42, 0xd2, 0xcd, 0x75, 0xa4, 0x64, 0x48, 0x6a, 0x49, 0x37, 0x8b, 0x13, 0x85,
0x42, 0x85, 0x72, 0xb7, 0xbe, 0x3c, 0xb1, 0x30, 0x68, 0xa2, 0x94, 0x1b, 0x0d, 0x1a, 0xa2, 0x2c, 0x0a, 0xe5, 0x6e, 0x7d, 0x79, 0x62, 0x61, 0xd0, 0x44, 0x29, 0x37, 0x1a, 0x34, 0x44, 0x59, 0x90,
0x48, 0x56, 0x41, 0x1b, 0xd6, 0x82, 0xf6, 0x1e, 0x6c, 0xe5, 0x58, 0xc9, 0xf0, 0x06, 0x9e, 0x52, 0xac, 0x82, 0x36, 0xac, 0x05, 0xed, 0x23, 0xd8, 0xca, 0xb1, 0x92, 0xe1, 0x0d, 0x3c, 0xa5, 0x6e,
0x37, 0x0a, 0x91, 0xd2, 0x32, 0x08, 0x23, 0x84, 0x54, 0x2c, 0xc2, 0xcf, 0x94, 0xd1, 0xaf, 0xab, 0x14, 0x22, 0xa5, 0x65, 0x10, 0x46, 0x08, 0xa9, 0x58, 0x84, 0x9f, 0x29, 0xa3, 0xdf, 0x57, 0x55,
0xaa, 0x28, 0x0d, 0x22, 0x0c, 0x0c, 0x39, 0x9e, 0x07, 0x28, 0x85, 0x91, 0x5b, 0x8c, 0xdb, 0x12, 0x51, 0x1a, 0x44, 0x18, 0x18, 0x72, 0x3c, 0x0f, 0x50, 0x0a, 0x23, 0xb7, 0x18, 0xb7, 0x25, 0xf2,
0x79, 0xb3, 0x3d, 0x91, 0x8b, 0x10, 0x6f, 0x75, 0x85, 0x78, 0x5b, 0x0b, 0xf1, 0x6b, 0x03, 0x1e, 0x66, 0x7b, 0x22, 0x17, 0x21, 0xde, 0xea, 0x0a, 0xf1, 0xb6, 0x16, 0xe2, 0xd7, 0x06, 0x3c, 0x38,
0x9c, 0x64, 0x19, 0xe5, 0x48, 0x81, 0x0a, 0xf3, 0x21, 0x80, 0x3c, 0x1c, 0xaf, 0x62, 0xc8, 0xab, 0xc9, 0x32, 0xca, 0x91, 0x02, 0x15, 0xe6, 0x43, 0x00, 0x79, 0x38, 0x5e, 0xc5, 0x90, 0x57, 0x29,
0x94, 0x16, 0xb1, 0xe1, 0x82, 0xaf, 0x24, 0x99, 0x26, 0x92, 0x59, 0x8c, 0xe5, 0x9c, 0x2f, 0xe7, 0x2d, 0x62, 0xc3, 0x05, 0x5f, 0x49, 0x32, 0x4d, 0x24, 0xb3, 0x18, 0xcb, 0x39, 0x5f, 0xce, 0x59,
0xac, 0x7c, 0xce, 0x2f, 0xe6, 0x28, 0xff, 0xa9, 0x1a, 0xcd, 0x62, 0xec, 0xfc, 0x66, 0xc1, 0x4e, 0xf9, 0x9c, 0x5f, 0xcc, 0x51, 0xfe, 0x5b, 0x35, 0x9a, 0xc5, 0xd8, 0x79, 0x63, 0xc1, 0x4e, 0xad,
0xad, 0x7e, 0x9d, 0xf8, 0x22, 0x32, 0xe4, 0x31, 0x0c, 0x64, 0xa6, 0xa3, 0x1f, 0xe3, 0xe3, 0x7d, 0x7e, 0x9d, 0xf8, 0x22, 0x32, 0xe4, 0x31, 0x0c, 0x64, 0xa6, 0xa3, 0x1f, 0xe3, 0xe3, 0x7d, 0x95,
0x95, 0x7e, 0x35, 0xec, 0x0c, 0x11, 0x67, 0xf7, 0x5c, 0x85, 0x15, 0xab, 0x64, 0x36, 0xa3, 0x7f, 0x7e, 0x35, 0xec, 0x0c, 0x11, 0x67, 0xf7, 0x5c, 0x85, 0x15, 0xab, 0x64, 0x36, 0xa3, 0x7f, 0x1d,
0x1d, 0xab, 0xa4, 0xb4, 0xc5, 0x2a, 0x89, 0x25, 0x9f, 0x40, 0x9f, 0xd1, 0xd4, 0x5b, 0xa1, 0xe3, 0xab, 0xa4, 0xb4, 0xc5, 0x2a, 0x89, 0x25, 0x5f, 0x40, 0x9f, 0xd1, 0xd4, 0x5b, 0xa1, 0xe3, 0xe3,
0xe3, 0xe3, 0x77, 0xda, 0x16, 0xb9, 0x02, 0x70, 0x76, 0xcf, 0x95, 0x48, 0x71, 0x90, 0x97, 0xa6, 0xe3, 0x0f, 0xda, 0x16, 0xb9, 0x02, 0x70, 0x76, 0xcf, 0x95, 0x48, 0x71, 0x90, 0x97, 0xa6, 0x34,
0x34, 0x0e, 0xf0, 0x42, 0x1d, 0x07, 0x9d, 0x20, 0x42, 0x1c, 0x24, 0xb1, 0xe4, 0x08, 0x7a, 0xe7, 0x0e, 0xf0, 0x42, 0x1d, 0x07, 0x9d, 0x20, 0x42, 0x1c, 0x24, 0xb1, 0xe4, 0x08, 0x7a, 0xe7, 0x94,
0x94, 0x06, 0x28, 0xd7, 0xf1, 0xb1, 0xdd, 0xb6, 0xe6, 0x39, 0xa5, 0x62, 0x05, 0xe2, 0x84, 0x63, 0x06, 0x28, 0xd7, 0xf1, 0xb1, 0xdd, 0xb6, 0xe6, 0x39, 0xa5, 0x62, 0x05, 0xe2, 0x84, 0x63, 0x7e,
0x7e, 0x94, 0x64, 0x52, 0xba, 0x1d, 0x8e, 0xcd, 0x04, 0x40, 0x38, 0x86, 0x48, 0xe1, 0xd8, 0xa5, 0x94, 0x64, 0x52, 0xba, 0x1d, 0x8e, 0xcd, 0x04, 0x40, 0x38, 0x86, 0x48, 0xe1, 0xd8, 0xa5, 0x17,
0x17, 0x7b, 0x17, 0xb2, 0x24, 0x76, 0x38, 0xf6, 0x15, 0x22, 0x84, 0x63, 0x12, 0x4b, 0xb6, 0xc1, 0x7b, 0x17, 0xb2, 0x24, 0x76, 0x38, 0xf6, 0x1d, 0x22, 0x84, 0x63, 0x12, 0x4b, 0xb6, 0xc1, 0xe4,
0xe4, 0x2b, 0xa5, 0x4e, 0x93, 0xaf, 0x4e, 0x87, 0xd0, 0xbf, 0x16, 0x79, 0xe4, 0xfc, 0x6e, 0x68, 0x2b, 0xa5, 0x4e, 0x93, 0xaf, 0x4e, 0x87, 0xd0, 0xbf, 0x16, 0x79, 0xe4, 0xfc, 0x6d, 0x68, 0xe1,
0xe1, 0x91, 0x4b, 0xf5, 0xb6, 0x60, 0xdc, 0xad, 0x2d, 0x98, 0xeb, 0xb4, 0x05, 0xab, 0xab, 0x2d, 0x91, 0x4b, 0xf5, 0xb6, 0x60, 0xdc, 0xad, 0x2d, 0x98, 0xeb, 0xb4, 0x05, 0xab, 0xab, 0x2d, 0x94,
0x94, 0x45, 0xb1, 0xa7, 0x17, 0x45, 0x91, 0x18, 0xaf, 0xaa, 0x2d, 0x4d, 0x16, 0x86, 0x86, 0xdd, 0x45, 0xb1, 0xa7, 0x17, 0x45, 0x91, 0x18, 0xaf, 0xaa, 0x2d, 0x4d, 0x16, 0x86, 0x86, 0x5d, 0xf8,
0x79, 0x04, 0x0f, 0xeb, 0xa1, 0x12, 0x45, 0xec, 0x10, 0x20, 0x5b, 0xa6, 0x94, 0x89, 0x41, 0x66, 0xef, 0x2f, 0x19, 0xa3, 0xb1, 0xac, 0x58, 0x03, 0xe9, 0x7f, 0xc5, 0xe4, 0x3c, 0x82, 0x87, 0xf5,
0x1b, 0x13, 0x4b, 0xf4, 0x9b, 0xd2, 0xe2, 0x3c, 0xd1, 0xb8, 0x90, 0xf2, 0x6b, 0xb4, 0x51, 0xa3, 0x60, 0x8a, 0x32, 0x77, 0x08, 0x90, 0x2d, 0x53, 0xca, 0xc4, 0x20, 0xb3, 0x8d, 0x89, 0x25, 0x3a,
0xd9, 0x46, 0x9d, 0x6f, 0xb4, 0xa5, 0x52, 0x83, 0x6b, 0xf4, 0xea, 0x5d, 0x15, 0x11, 0x55, 0x5c, 0x52, 0x69, 0x71, 0x9e, 0x68, 0x6c, 0x49, 0x81, 0x36, 0x1a, 0xad, 0xd1, 0x6c, 0xb4, 0xce, 0x0f,
0x55, 0x78, 0xbe, 0x07, 0xd2, 0x54, 0xe9, 0x1a, 0xbb, 0x56, 0xcb, 0x8f, 0x59, 0x2f, 0x3f, 0xce, 0xda, 0x52, 0xa9, 0xd2, 0x35, 0xba, 0xf9, 0xae, 0x8a, 0x99, 0x2a, 0xbf, 0x2a, 0x80, 0x3f, 0x03,
0xaf, 0x7a, 0xe8, 0xa5, 0x9c, 0xff, 0x9d, 0xdd, 0xef, 0xde, 0x12, 0x9c, 0x1f, 0xb4, 0x50, 0x89, 0x69, 0xea, 0x78, 0x8d, 0x5d, 0xab, 0x05, 0xca, 0xac, 0x17, 0x28, 0xe7, 0x4f, 0x5d, 0x1c, 0x52,
0x0c, 0x11, 0x5b, 0x63, 0x4c, 0x57, 0xa9, 0xe4, 0xbb, 0xef, 0x16, 0x63, 0x41, 0x55, 0xaa, 0x6a, 0xf0, 0xff, 0xcf, 0xee, 0x77, 0x6f, 0x1a, 0xce, 0x2f, 0x5a, 0xa8, 0x44, 0x0e, 0x89, 0xad, 0x31,
0x94, 0x35, 0x35, 0x5d, 0x39, 0x10, 0xaa, 0xb9, 0x4e, 0xa2, 0xe5, 0xa5, 0x38, 0xc7, 0x12, 0xaa, 0xea, 0xab, 0x54, 0xf2, 0xdd, 0x77, 0x8b, 0xb1, 0xa0, 0x2a, 0x55, 0x55, 0xcc, 0x9a, 0x9a, 0xae,
0x91, 0x23, 0xe7, 0x0b, 0x8d, 0x42, 0xcc, 0xa7, 0xbb, 0x5f, 0xd2, 0x79, 0x6d, 0xc2, 0xae, 0x4b, 0x1c, 0x08, 0x5d, 0x5d, 0x27, 0xd1, 0xf2, 0x52, 0x9c, 0x63, 0x09, 0x5d, 0xc9, 0x91, 0xf3, 0x8d,
0x7d, 0x1a, 0xa6, 0xfc, 0xef, 0xbe, 0xc3, 0xea, 0xef, 0x1c, 0xb3, 0xf1, 0xce, 0xd1, 0xda, 0xaf, 0x46, 0x21, 0x66, 0xdc, 0xdd, 0x2f, 0xe9, 0xbc, 0x36, 0x61, 0xd7, 0xa5, 0x3e, 0x0d, 0x53, 0xfe,
0xd5, 0x6c, 0xbf, 0x55, 0xa6, 0x7b, 0x1a, 0xd3, 0x65, 0x7b, 0xeb, 0xd7, 0xda, 0xdb, 0x01, 0x8c, 0x6f, 0x5f, 0x6a, 0xf5, 0x97, 0x90, 0xd9, 0x78, 0x09, 0x69, 0x0d, 0xda, 0x6a, 0x36, 0xe8, 0x2a,
0x5e, 0x16, 0x8d, 0x69, 0x20, 0x1b, 0x53, 0x61, 0x28, 0x5b, 0xca, 0xb0, 0xab, 0xa5, 0x6c, 0x68, 0xd3, 0x3d, 0x8d, 0xe9, 0xb2, 0x01, 0xf6, 0x6b, 0x0d, 0xf0, 0x00, 0x46, 0x2f, 0x8b, 0xd6, 0x35,
0x2d, 0xa5, 0xa1, 0x17, 0xd5, 0x55, 0xee, 0xce, 0x03, 0x81, 0x9e, 0x57, 0x32, 0x80, 0xdf, 0xb5, 0x90, 0xad, 0xab, 0x30, 0x94, 0x4d, 0x67, 0xd8, 0xd5, 0x74, 0x36, 0xb4, 0xa6, 0xd3, 0xd0, 0x8b,
0x9b, 0x59, 0xda, 0xcd, 0x0a, 0x1f, 0x7b, 0x15, 0x1f, 0x9d, 0x17, 0xb0, 0xdb, 0xe2, 0x46, 0x46, 0xea, 0x3b, 0x77, 0xe7, 0x81, 0x40, 0xcf, 0x2b, 0x19, 0xc0, 0xef, 0xda, 0xcd, 0x2c, 0xed, 0x66,
0x1e, 0xc3, 0x90, 0xa9, 0x17, 0x9d, 0x81, 0x2f, 0xba, 0xfd, 0xf6, 0x3a, 0x8f, 0x0f, 0xbb, 0x1c, 0x85, 0x8f, 0xbd, 0x8a, 0x8f, 0xce, 0x0b, 0xd8, 0x6d, 0x71, 0x23, 0x23, 0x8f, 0x61, 0xc8, 0xd4,
0xea, 0x7c, 0x29, 0xa2, 0x7b, 0x55, 0x83, 0xcc, 0xe3, 0xf3, 0x64, 0x0d, 0x81, 0xbc, 0x31, 0xe1, 0x9b, 0xcf, 0xc0, 0x37, 0xdf, 0x7e, 0x7b, 0x27, 0xc0, 0xa7, 0x5f, 0x0e, 0x75, 0xbe, 0x15, 0xd1,
0x5d, 0x97, 0xa6, 0x75, 0x91, 0x2d, 0x19, 0xa3, 0x31, 0xc7, 0x9d, 0xca, 0xf8, 0x18, 0xb5, 0xf8, 0xbd, 0xaa, 0x41, 0xe6, 0xf1, 0x79, 0xb2, 0x86, 0x40, 0xde, 0x9a, 0xf0, 0xa1, 0x4b, 0xd3, 0xba,
0xfc, 0x7f, 0x5f, 0xe7, 0x65, 0x01, 0xdf, 0xa8, 0x15, 0xf0, 0x16, 0x4e, 0x47, 0xed, 0x9c, 0xce, 0xc8, 0x64, 0x29, 0xc2, 0x9d, 0xca, 0xf8, 0x18, 0xb5, 0xf8, 0xbc, 0xbb, 0xef, 0xf7, 0xb2, 0xc4,
0xe0, 0xad, 0xb6, 0xa8, 0x64, 0x79, 0x0f, 0xa8, 0x60, 0xf3, 0x42, 0xde, 0xb0, 0x3b, 0xdf, 0xc1, 0x6f, 0xd4, 0x4a, 0x7c, 0x0b, 0xa7, 0xa3, 0x76, 0x4e, 0x67, 0xf0, 0x5e, 0x5b, 0x54, 0xb2, 0xbc,
0xc1, 0x2d, 0x71, 0xc9, 0xc8, 0x67, 0x42, 0x5e, 0xe7, 0x49, 0x2e, 0x17, 0x47, 0xc9, 0xe5, 0x96, 0x4b, 0x54, 0xb0, 0x79, 0x21, 0x6f, 0xd8, 0x9d, 0x9f, 0xe0, 0xe0, 0x96, 0xb8, 0x64, 0xe4, 0x2b,
0x35, 0xae, 0x5c, 0xe0, 0x9c, 0x81, 0xad, 0xbb, 0x77, 0xba, 0x52, 0x89, 0xd5, 0x15, 0xee, 0x42, 0x21, 0xaf, 0xf3, 0x24, 0x97, 0x8b, 0xa3, 0xe4, 0x72, 0xcb, 0x1a, 0x57, 0x2e, 0x70, 0xce, 0xc0,
0xcc, 0x66, 0x55, 0xcc, 0xa7, 0xb0, 0xd7, 0xdc, 0x09, 0xe9, 0xcd, 0x93, 0xc5, 0xa8, 0x24, 0x4b, 0xd6, 0xdd, 0x3b, 0x5d, 0xa9, 0xc4, 0xea, 0x0a, 0x77, 0x21, 0x66, 0xb3, 0x2a, 0xe6, 0x53, 0xd8,
0xfb, 0x1e, 0xef, 0xc3, 0x8e, 0xee, 0xf3, 0xfc, 0x69, 0x46, 0x1e, 0x80, 0x35, 0x7f, 0x9a, 0xb3, 0x6b, 0xee, 0x84, 0xf4, 0xe6, 0xc9, 0x62, 0x54, 0x92, 0xa5, 0x7d, 0x8f, 0x8f, 0x61, 0x47, 0xf7,
0x23, 0x3e, 0x1d, 0x26, 0x08, 0xb9, 0x6a, 0x49, 0x07, 0x75, 0xe4, 0x3f, 0xcb, 0xe4, 0xc2, 0x39, 0x79, 0xfe, 0x34, 0x23, 0x0f, 0xc0, 0x9a, 0x3f, 0xcd, 0xd9, 0x11, 0x9f, 0x0e, 0x13, 0x84, 0x5c,
0xab, 0xea, 0xdc, 0x0d, 0x1c, 0x76, 0x9d, 0xa9, 0x08, 0xbb, 0xfb, 0xa9, 0x25, 0xb5, 0x66, 0x3b, 0xb5, 0xa4, 0x83, 0x3a, 0xf2, 0xbf, 0x65, 0x72, 0xe1, 0x9c, 0x55, 0x75, 0xee, 0x06, 0x0e, 0xbb,
0xb5, 0xb5, 0x93, 0xcf, 0xe0, 0x6d, 0x9d, 0x96, 0xbc, 0x54, 0x7c, 0xac, 0x97, 0x8a, 0xd6, 0x7f, 0xce, 0x54, 0x84, 0xdd, 0xfd, 0xd4, 0x92, 0x5a, 0xb3, 0x9d, 0xda, 0xda, 0xc9, 0x67, 0xf0, 0xbe,
0xfe, 0x8a, 0x1a, 0xf1, 0x63, 0x33, 0x48, 0x6b, 0xd7, 0xbe, 0xdb, 0x3a, 0xf1, 0x33, 0xb1, 0x7f, 0x4e, 0x4b, 0x5e, 0x2a, 0x3e, 0xd7, 0x4b, 0x45, 0xeb, 0xbf, 0x87, 0x45, 0x8d, 0xf8, 0xb5, 0x19,
0x9b, 0xa7, 0xe4, 0x43, 0x18, 0x48, 0x94, 0x7a, 0x25, 0xb7, 0xfa, 0xa9, 0x20, 0xce, 0x9f, 0x46, 0xa4, 0xb5, 0x6b, 0xdf, 0x6d, 0x9d, 0xf8, 0x99, 0xd8, 0xbf, 0xcd, 0x53, 0xf2, 0x29, 0x0c, 0x24,
0x73, 0x9f, 0x59, 0x12, 0x9f, 0x87, 0x17, 0xff, 0xf5, 0xe7, 0x9c, 0xf0, 0x5f, 0xd8, 0x72, 0xd8, 0x4a, 0xbd, 0xa3, 0x5b, 0xfd, 0x54, 0x10, 0xe7, 0x8d, 0xd9, 0xdc, 0x67, 0x96, 0xc4, 0xe7, 0xe1,
0x40, 0xfa, 0x5f, 0x31, 0x2d, 0x06, 0xf8, 0xab, 0xc9, 0xa3, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xc5, 0x3b, 0xf1, 0xe0, 0x4b, 0xa2, 0x02, 0x96, 0x3f, 0xf8, 0x4a, 0x93, 0xfe, 0x24, 0x1c, 0x36,
0xab, 0xcf, 0xc4, 0xe0, 0x4c, 0x11, 0x00, 0x00, 0x9e, 0x84, 0x8b, 0x01, 0xfe, 0xf2, 0xf2, 0xe8, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9e, 0x75,
0xc0, 0x02, 0x90, 0x11, 0x00, 0x00,
} }
plugin/dapp/collateralize/types/tx.go
View file @ 8bf3334d
...@@ -51,6 +51,6 @@ type CollateralizeManageTx struct { ...@@ -51,6 +51,6 @@ type CollateralizeManageTx struct {
LiquidationRatio float32 `json:"liquidationRatio"` LiquidationRatio float32 `json:"liquidationRatio"`
StabilityFeeRatio float32 `json:"stabilityFeeRatio"` StabilityFeeRatio float32 `json:"stabilityFeeRatio"`
Period int64 `json:"period"` Period int64 `json:"period"`
TotalBalance int64 `json:"totalBalance"` CollTotalBalance int64 `json:"collTotalBalance"`
Fee int64 `json:"fee"` Fee int64 `json:"fee"`
} }
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