Merge branch 'master' of https://github.com/jpeng-go/plugin

plugin/dapp/collateralize/executor/collateralizedb.go

@@ -29,7 +29,7 @@ const (
 	Coin                      = types.Coin      // 1e8
 	DefaultDebtCeiling        = 10000 * Coin    // 默认借贷限额
 	DefaultLiquidationRatio   = 0.4 * 1e4       // 默认质押比
-	DefaultStabilityFeeRation = 0.08 * 1e4       // 默认稳定费
+	DefaultStabilityFeeRation = 0.08 * 1e4      // 默认稳定费
 	DefaultPeriod             = 3600 * 24 * 365 // 默认合约限期
 	DefaultTotalBalance       = 0               // 默认放贷总额
 	PriceWarningRate          = 1.3 * 1e4       // 价格提前预警率
@@ -475,7 +475,7 @@ func getBtyNumToFrozen(value int64, price int64, ratio int64) (int64, error) {
 // 计算清算价格
 // value:借出ccny数量， colValue:抵押物数量， price:抵押物价格
 func calcLiquidationPrice(value int64, colValue int64) int64 {
-	return (value *pty.CollateralizePreLiquidationRatio) / colValue
+	return (value * pty.CollateralizePreLiquidationRatio) / colValue
 }
 
 // 获取最近抵押物价格
@@ -615,7 +615,7 @@ func (action *Action) CollateralizeBorrow(borrow *pty.CollateralizeBorrow) (*typ
 	borrowRecord.StartTime = action.blocktime
 	borrowRecord.CollateralPrice = lastPrice
 	borrowRecord.DebtValue = borrow.GetValue()
-	borrowRecord.LiquidationPrice = (coll.LiquidationRatio*lastPrice*pty.CollateralizePreLiquidationRatio)/1e8
+	borrowRecord.LiquidationPrice = (coll.LiquidationRatio * lastPrice * pty.CollateralizePreLiquidationRatio) / 1e8
 	borrowRecord.Status = pty.CollateralizeUserStatusCreate
 	borrowRecord.ExpireTime = action.blocktime + coll.Period
 
@@ -678,7 +678,7 @@ func (action *Action) CollateralizeRepay(repay *pty.CollateralizeRepay) (*types.
 	}
 
 	// 借贷金额+利息
-	fee := (borrowRecord.DebtValue * coll.StabilityFeeRatio)/1e4
+	fee := (borrowRecord.DebtValue * coll.StabilityFeeRatio) / 1e4
 	realRepay := borrowRecord.DebtValue + fee
 
 	// 检查

plugin/dapp/collateralize/types/collateralize.go

@@ -334,8 +334,8 @@ func CreateRawCollateralizeManageTx(cfg *types.Chain33Config, parm *Collateraliz
 
 	v := &CollateralizeManage{
 		DebtCeiling:       int64(math.Trunc((parm.DebtCeiling+0.0000001)*1e4)) * 1e4,
-		LiquidationRatio:  int64(math.Trunc((parm.LiquidationRatio+0.0000001)*1e4)),
-		StabilityFeeRatio: int64(math.Trunc((parm.StabilityFeeRatio+0.0000001)*1e4)),
+		LiquidationRatio:  int64(math.Trunc((parm.LiquidationRatio + 0.0000001) * 1e4)),
+		StabilityFeeRatio: int64(math.Trunc((parm.StabilityFeeRatio + 0.0000001) * 1e4)),
 		Period:            parm.Period,
 		TotalBalance:      int64(math.Trunc((parm.TotalBalance+0.0000001)*1e4)) * 1e4,
 	}

plugin/dapp/collateralize/types/collateralize.pb.go

@@ -5,7 +5,9 @@ package types
 
 import (
 	fmt "fmt"
+
 	proto "github.com/golang/protobuf/proto"
+
 	math "math"
 )
 
@@ -18,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 // 放贷信息
 type Collateralize struct {
@@ -46,17 +48,16 @@ func (m *Collateralize) Reset()         { *m = Collateralize{} }
 func (m *Collateralize) String() string { return proto.CompactTextString(m) }
 func (*Collateralize) ProtoMessage()    {}
 func (*Collateralize) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{0}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{0}
 }
-
 func (m *Collateralize) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Collateralize.Unmarshal(m, b)
 }
 func (m *Collateralize) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Collateralize.Marshal(b, m, deterministic)
 }
-func (m *Collateralize) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Collateralize.Merge(m, src)
+func (dst *Collateralize) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Collateralize.Merge(dst, src)
 }
 func (m *Collateralize) XXX_Size() int {
 	return xxx_messageInfo_Collateralize.Size(m)
@@ -195,17 +196,16 @@ func (m *BorrowRecord) Reset()         { *m = BorrowRecord{} }
 func (m *BorrowRecord) String() string { return proto.CompactTextString(m) }
 func (*BorrowRecord) ProtoMessage()    {}
 func (*BorrowRecord) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{1}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{1}
 }
-
 func (m *BorrowRecord) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BorrowRecord.Unmarshal(m, b)
 }
 func (m *BorrowRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BorrowRecord.Marshal(b, m, deterministic)
 }
-func (m *BorrowRecord) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BorrowRecord.Merge(m, src)
+func (dst *BorrowRecord) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BorrowRecord.Merge(dst, src)
 }
 func (m *BorrowRecord) XXX_Size() int {
 	return xxx_messageInfo_BorrowRecord.Size(m)
@@ -315,17 +315,16 @@ func (m *AssetPriceRecord) Reset()         { *m = AssetPriceRecord{} }
 func (m *AssetPriceRecord) String() string { return proto.CompactTextString(m) }
 func (*AssetPriceRecord) ProtoMessage()    {}
 func (*AssetPriceRecord) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{2}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{2}
 }
-
 func (m *AssetPriceRecord) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AssetPriceRecord.Unmarshal(m, b)
 }
 func (m *AssetPriceRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AssetPriceRecord.Marshal(b, m, deterministic)
 }
-func (m *AssetPriceRecord) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AssetPriceRecord.Merge(m, src)
+func (dst *AssetPriceRecord) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AssetPriceRecord.Merge(dst, src)
 }
 func (m *AssetPriceRecord) XXX_Size() int {
 	return xxx_messageInfo_AssetPriceRecord.Size(m)
@@ -385,17 +384,16 @@ func (m *CollateralizeAction) Reset()         { *m = CollateralizeAction{} }
 func (m *CollateralizeAction) String() string { return proto.CompactTextString(m) }
 func (*CollateralizeAction) ProtoMessage()    {}
 func (*CollateralizeAction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{3}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{3}
 }
-
 func (m *CollateralizeAction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CollateralizeAction.Unmarshal(m, b)
 }
 func (m *CollateralizeAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CollateralizeAction.Marshal(b, m, deterministic)
 }
-func (m *CollateralizeAction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CollateralizeAction.Merge(m, src)
+func (dst *CollateralizeAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CollateralizeAction.Merge(dst, src)
 }
 func (m *CollateralizeAction) XXX_Size() int {
 	return xxx_messageInfo_CollateralizeAction.Size(m)
@@ -515,9 +513,9 @@ func (m *CollateralizeAction) GetTy() int32 {
 	return 0
 }
 
-// XXX_OneofWrappers is for the internal use of the proto package.
-func (*CollateralizeAction) XXX_OneofWrappers() []interface{} {
-	return []interface{}{
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*CollateralizeAction) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _CollateralizeAction_OneofMarshaler, _CollateralizeAction_OneofUnmarshaler, _CollateralizeAction_OneofSizer, []interface{}{
 		(*CollateralizeAction_Create)(nil),
 		(*CollateralizeAction_Borrow)(nil),
 		(*CollateralizeAction_Repay)(nil),
@@ -528,6 +526,162 @@ func (*CollateralizeAction) XXX_OneofWrappers() []interface{} {
 	}
 }
 
+func _CollateralizeAction_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*CollateralizeAction)
+	// value
+	switch x := m.Value.(type) {
+	case *CollateralizeAction_Create:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Create); err != nil {
+			return err
+		}
+	case *CollateralizeAction_Borrow:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Borrow); err != nil {
+			return err
+		}
+	case *CollateralizeAction_Repay:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Repay); err != nil {
+			return err
+		}
+	case *CollateralizeAction_Append:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Append); err != nil {
+			return err
+		}
+	case *CollateralizeAction_Feed:
+		b.EncodeVarint(5<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Feed); err != nil {
+			return err
+		}
+	case *CollateralizeAction_Retrieve:
+		b.EncodeVarint(6<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Retrieve); err != nil {
+			return err
+		}
+	case *CollateralizeAction_Manage:
+		b.EncodeVarint(7<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Manage); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("CollateralizeAction.Value has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _CollateralizeAction_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*CollateralizeAction)
+	switch tag {
+	case 1: // value.create
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CollateralizeCreate)
+		err := b.DecodeMessage(msg)
+		m.Value = &CollateralizeAction_Create{msg}
+		return true, err
+	case 2: // value.borrow
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CollateralizeBorrow)
+		err := b.DecodeMessage(msg)
+		m.Value = &CollateralizeAction_Borrow{msg}
+		return true, err
+	case 3: // value.repay
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CollateralizeRepay)
+		err := b.DecodeMessage(msg)
+		m.Value = &CollateralizeAction_Repay{msg}
+		return true, err
+	case 4: // value.append
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CollateralizeAppend)
+		err := b.DecodeMessage(msg)
+		m.Value = &CollateralizeAction_Append{msg}
+		return true, err
+	case 5: // value.feed
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CollateralizeFeed)
+		err := b.DecodeMessage(msg)
+		m.Value = &CollateralizeAction_Feed{msg}
+		return true, err
+	case 6: // value.retrieve
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CollateralizeRetrieve)
+		err := b.DecodeMessage(msg)
+		m.Value = &CollateralizeAction_Retrieve{msg}
+		return true, err
+	case 7: // value.manage
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CollateralizeManage)
+		err := b.DecodeMessage(msg)
+		m.Value = &CollateralizeAction_Manage{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _CollateralizeAction_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*CollateralizeAction)
+	// value
+	switch x := m.Value.(type) {
+	case *CollateralizeAction_Create:
+		s := proto.Size(x.Create)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *CollateralizeAction_Borrow:
+		s := proto.Size(x.Borrow)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *CollateralizeAction_Repay:
+		s := proto.Size(x.Repay)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *CollateralizeAction_Append:
+		s := proto.Size(x.Append)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *CollateralizeAction_Feed:
+		s := proto.Size(x.Feed)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *CollateralizeAction_Retrieve:
+		s := proto.Size(x.Retrieve)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *CollateralizeAction_Manage:
+		s := proto.Size(x.Manage)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
 type CollateralizeManage struct {
 	DebtCeiling          int64    `protobuf:"varint,1,opt,name=debtCeiling,proto3" json:"debtCeiling,omitempty"`
 	LiquidationRatio     int64    `protobuf:"varint,2,opt,name=liquidationRatio,proto3" json:"liquidationRatio,omitempty"`
@@ -544,17 +698,16 @@ func (m *CollateralizeManage) Reset()         { *m = CollateralizeManage{} }
 func (m *CollateralizeManage) String() string { return proto.CompactTextString(m) }
 func (*CollateralizeManage) ProtoMessage()    {}
 func (*CollateralizeManage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{4}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{4}
 }
-
 func (m *CollateralizeManage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CollateralizeManage.Unmarshal(m, b)
 }
 func (m *CollateralizeManage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CollateralizeManage.Marshal(b, m, deterministic)
 }
-func (m *CollateralizeManage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CollateralizeManage.Merge(m, src)
+func (dst *CollateralizeManage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CollateralizeManage.Merge(dst, src)
 }
 func (m *CollateralizeManage) XXX_Size() int {
 	return xxx_messageInfo_CollateralizeManage.Size(m)
@@ -618,17 +771,16 @@ func (m *CollateralizeAddr) Reset()         { *m = CollateralizeAddr{} }
 func (m *CollateralizeAddr) String() string { return proto.CompactTextString(m) }
 func (*CollateralizeAddr) ProtoMessage()    {}
 func (*CollateralizeAddr) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{5}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{5}
 }
-
 func (m *CollateralizeAddr) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CollateralizeAddr.Unmarshal(m, b)
 }
 func (m *CollateralizeAddr) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CollateralizeAddr.Marshal(b, m, deterministic)
 }
-func (m *CollateralizeAddr) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CollateralizeAddr.Merge(m, src)
+func (dst *CollateralizeAddr) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CollateralizeAddr.Merge(dst, src)
 }
 func (m *CollateralizeAddr) XXX_Size() int {
 	return xxx_messageInfo_CollateralizeAddr.Size(m)
@@ -658,17 +810,16 @@ func (m *CollateralizeCreate) Reset()         { *m = CollateralizeCreate{} }
 func (m *CollateralizeCreate) String() string { return proto.CompactTextString(m) }
 func (*CollateralizeCreate) ProtoMessage()    {}
 func (*CollateralizeCreate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{6}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{6}
 }
-
 func (m *CollateralizeCreate) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CollateralizeCreate.Unmarshal(m, b)
 }
 func (m *CollateralizeCreate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CollateralizeCreate.Marshal(b, m, deterministic)
 }
-func (m *CollateralizeCreate) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CollateralizeCreate.Merge(m, src)
+func (dst *CollateralizeCreate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CollateralizeCreate.Merge(dst, src)
 }
 func (m *CollateralizeCreate) XXX_Size() int {
 	return xxx_messageInfo_CollateralizeCreate.Size(m)
@@ -699,17 +850,16 @@ func (m *CollateralizeBorrow) Reset()         { *m = CollateralizeBorrow{} }
 func (m *CollateralizeBorrow) String() string { return proto.CompactTextString(m) }
 func (*CollateralizeBorrow) ProtoMessage()    {}
 func (*CollateralizeBorrow) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{7}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{7}
 }
-
 func (m *CollateralizeBorrow) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CollateralizeBorrow.Unmarshal(m, b)
 }
 func (m *CollateralizeBorrow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CollateralizeBorrow.Marshal(b, m, deterministic)
 }
-func (m *CollateralizeBorrow) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CollateralizeBorrow.Merge(m, src)
+func (dst *CollateralizeBorrow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CollateralizeBorrow.Merge(dst, src)
 }
 func (m *CollateralizeBorrow) XXX_Size() int {
 	return xxx_messageInfo_CollateralizeBorrow.Size(m)
@@ -747,17 +897,16 @@ func (m *CollateralizeRepay) Reset()         { *m = CollateralizeRepay{} }
 func (m *CollateralizeRepay) String() string { return proto.CompactTextString(m) }
 func (*CollateralizeRepay) ProtoMessage()    {}
 func (*CollateralizeRepay) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{8}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{8}
 }
-
 func (m *CollateralizeRepay) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CollateralizeRepay.Unmarshal(m, b)
 }
 func (m *CollateralizeRepay) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CollateralizeRepay.Marshal(b, m, deterministic)
 }
-func (m *CollateralizeRepay) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CollateralizeRepay.Merge(m, src)
+func (dst *CollateralizeRepay) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CollateralizeRepay.Merge(dst, src)
 }
 func (m *CollateralizeRepay) XXX_Size() int {
 	return xxx_messageInfo_CollateralizeRepay.Size(m)
@@ -796,17 +945,16 @@ func (m *CollateralizeAppend) Reset()         { *m = CollateralizeAppend{} }
 func (m *CollateralizeAppend) String() string { return proto.CompactTextString(m) }
 func (*CollateralizeAppend) ProtoMessage()    {}
 func (*CollateralizeAppend) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{9}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{9}
 }
-
 func (m *CollateralizeAppend) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CollateralizeAppend.Unmarshal(m, b)
 }
 func (m *CollateralizeAppend) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CollateralizeAppend.Marshal(b, m, deterministic)
 }
-func (m *CollateralizeAppend) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CollateralizeAppend.Merge(m, src)
+func (dst *CollateralizeAppend) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CollateralizeAppend.Merge(dst, src)
 }
 func (m *CollateralizeAppend) XXX_Size() int {
 	return xxx_messageInfo_CollateralizeAppend.Size(m)
@@ -852,17 +1000,16 @@ func (m *CollateralizeFeed) Reset()         { *m = CollateralizeFeed{} }
 func (m *CollateralizeFeed) String() string { return proto.CompactTextString(m) }
 func (*CollateralizeFeed) ProtoMessage()    {}
 func (*CollateralizeFeed) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{10}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{10}
 }
-
 func (m *CollateralizeFeed) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CollateralizeFeed.Unmarshal(m, b)
 }
 func (m *CollateralizeFeed) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CollateralizeFeed.Marshal(b, m, deterministic)
 }
-func (m *CollateralizeFeed) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CollateralizeFeed.Merge(m, src)
+func (dst *CollateralizeFeed) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CollateralizeFeed.Merge(dst, src)
 }
 func (m *CollateralizeFeed) XXX_Size() int {
 	return xxx_messageInfo_CollateralizeFeed.Size(m)
@@ -907,17 +1054,16 @@ 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}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{11}
 }
-
 func (m *CollateralizeRetrieve) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CollateralizeRetrieve.Unmarshal(m, b)
 }
 func (m *CollateralizeRetrieve) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CollateralizeRetrieve.Marshal(b, m, deterministic)
 }
-func (m *CollateralizeRetrieve) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CollateralizeRetrieve.Merge(m, src)
+func (dst *CollateralizeRetrieve) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CollateralizeRetrieve.Merge(dst, src)
 }
 func (m *CollateralizeRetrieve) XXX_Size() int {
 	return xxx_messageInfo_CollateralizeRetrieve.Size(m)
@@ -957,17 +1103,16 @@ func (m *ReceiptCollateralize) Reset()         { *m = ReceiptCollateralize{} }
 func (m *ReceiptCollateralize) String() string { return proto.CompactTextString(m) }
 func (*ReceiptCollateralize) ProtoMessage()    {}
 func (*ReceiptCollateralize) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{12}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{12}
 }
-
 func (m *ReceiptCollateralize) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReceiptCollateralize.Unmarshal(m, b)
 }
 func (m *ReceiptCollateralize) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReceiptCollateralize.Marshal(b, m, deterministic)
 }
-func (m *ReceiptCollateralize) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReceiptCollateralize.Merge(m, src)
+func (dst *ReceiptCollateralize) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReceiptCollateralize.Merge(dst, src)
 }
 func (m *ReceiptCollateralize) XXX_Size() int {
 	return xxx_messageInfo_ReceiptCollateralize.Size(m)
@@ -1018,17 +1163,16 @@ func (m *CollateralizeRecords) Reset()         { *m = CollateralizeRecords{} }
 func (m *CollateralizeRecords) String() string { return proto.CompactTextString(m) }
 func (*CollateralizeRecords) ProtoMessage()    {}
 func (*CollateralizeRecords) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{13}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{13}
 }
-
 func (m *CollateralizeRecords) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CollateralizeRecords.Unmarshal(m, b)
 }
 func (m *CollateralizeRecords) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CollateralizeRecords.Marshal(b, m, deterministic)
 }
-func (m *CollateralizeRecords) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CollateralizeRecords.Merge(m, src)
+func (dst *CollateralizeRecords) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CollateralizeRecords.Merge(dst, src)
 }
 func (m *CollateralizeRecords) XXX_Size() int {
 	return xxx_messageInfo_CollateralizeRecords.Size(m)
@@ -1058,17 +1202,16 @@ func (m *ReqCollateralizeInfo) Reset()         { *m = ReqCollateralizeInfo{} }
 func (m *ReqCollateralizeInfo) String() string { return proto.CompactTextString(m) }
 func (*ReqCollateralizeInfo) ProtoMessage()    {}
 func (*ReqCollateralizeInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{14}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{14}
 }
-
 func (m *ReqCollateralizeInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReqCollateralizeInfo.Unmarshal(m, b)
 }
 func (m *ReqCollateralizeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReqCollateralizeInfo.Marshal(b, m, deterministic)
 }
-func (m *ReqCollateralizeInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReqCollateralizeInfo.Merge(m, src)
+func (dst *ReqCollateralizeInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReqCollateralizeInfo.Merge(dst, src)
 }
 func (m *ReqCollateralizeInfo) XXX_Size() int {
 	return xxx_messageInfo_ReqCollateralizeInfo.Size(m)
@@ -1108,17 +1251,16 @@ func (m *RepCollateralizeCurrentInfo) Reset()         { *m = RepCollateralizeCur
 func (m *RepCollateralizeCurrentInfo) String() string { return proto.CompactTextString(m) }
 func (*RepCollateralizeCurrentInfo) ProtoMessage()    {}
 func (*RepCollateralizeCurrentInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{15}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{15}
 }
-
 func (m *RepCollateralizeCurrentInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepCollateralizeCurrentInfo.Unmarshal(m, b)
 }
 func (m *RepCollateralizeCurrentInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepCollateralizeCurrentInfo.Marshal(b, m, deterministic)
 }
-func (m *RepCollateralizeCurrentInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepCollateralizeCurrentInfo.Merge(m, src)
+func (dst *RepCollateralizeCurrentInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepCollateralizeCurrentInfo.Merge(dst, src)
 }
 func (m *RepCollateralizeCurrentInfo) XXX_Size() int {
 	return xxx_messageInfo_RepCollateralizeCurrentInfo.Size(m)
@@ -1218,17 +1360,16 @@ func (m *ReqCollateralizeInfos) Reset()         { *m = ReqCollateralizeInfos{} }
 func (m *ReqCollateralizeInfos) String() string { return proto.CompactTextString(m) }
 func (*ReqCollateralizeInfos) ProtoMessage()    {}
 func (*ReqCollateralizeInfos) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{16}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{16}
 }
-
 func (m *ReqCollateralizeInfos) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReqCollateralizeInfos.Unmarshal(m, b)
 }
 func (m *ReqCollateralizeInfos) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReqCollateralizeInfos.Marshal(b, m, deterministic)
 }
-func (m *ReqCollateralizeInfos) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReqCollateralizeInfos.Merge(m, src)
+func (dst *ReqCollateralizeInfos) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReqCollateralizeInfos.Merge(dst, src)
 }
 func (m *ReqCollateralizeInfos) XXX_Size() int {
 	return xxx_messageInfo_ReqCollateralizeInfos.Size(m)
@@ -1258,17 +1399,16 @@ func (m *RepCollateralizeCurrentInfos) Reset()         { *m = RepCollateralizeCu
 func (m *RepCollateralizeCurrentInfos) String() string { return proto.CompactTextString(m) }
 func (*RepCollateralizeCurrentInfos) ProtoMessage()    {}
 func (*RepCollateralizeCurrentInfos) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{17}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{17}
 }
-
 func (m *RepCollateralizeCurrentInfos) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepCollateralizeCurrentInfos.Unmarshal(m, b)
 }
 func (m *RepCollateralizeCurrentInfos) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepCollateralizeCurrentInfos.Marshal(b, m, deterministic)
 }
-func (m *RepCollateralizeCurrentInfos) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepCollateralizeCurrentInfos.Merge(m, src)
+func (dst *RepCollateralizeCurrentInfos) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepCollateralizeCurrentInfos.Merge(dst, src)
 }
 func (m *RepCollateralizeCurrentInfos) XXX_Size() int {
 	return xxx_messageInfo_RepCollateralizeCurrentInfos.Size(m)
@@ -1299,17 +1439,16 @@ func (m *ReqCollateralizeByStatus) Reset()         { *m = ReqCollateralizeByStat
 func (m *ReqCollateralizeByStatus) String() string { return proto.CompactTextString(m) }
 func (*ReqCollateralizeByStatus) ProtoMessage()    {}
 func (*ReqCollateralizeByStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{18}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{18}
 }
-
 func (m *ReqCollateralizeByStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReqCollateralizeByStatus.Unmarshal(m, b)
 }
 func (m *ReqCollateralizeByStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReqCollateralizeByStatus.Marshal(b, m, deterministic)
 }
-func (m *ReqCollateralizeByStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReqCollateralizeByStatus.Merge(m, src)
+func (dst *ReqCollateralizeByStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReqCollateralizeByStatus.Merge(dst, src)
 }
 func (m *ReqCollateralizeByStatus) XXX_Size() int {
 	return xxx_messageInfo_ReqCollateralizeByStatus.Size(m)
@@ -1348,17 +1487,16 @@ func (m *ReqCollateralizeByAddr) Reset()         { *m = ReqCollateralizeByAddr{}
 func (m *ReqCollateralizeByAddr) String() string { return proto.CompactTextString(m) }
 func (*ReqCollateralizeByAddr) ProtoMessage()    {}
 func (*ReqCollateralizeByAddr) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{19}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{19}
 }
-
 func (m *ReqCollateralizeByAddr) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReqCollateralizeByAddr.Unmarshal(m, b)
 }
 func (m *ReqCollateralizeByAddr) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReqCollateralizeByAddr.Marshal(b, m, deterministic)
 }
-func (m *ReqCollateralizeByAddr) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReqCollateralizeByAddr.Merge(m, src)
+func (dst *ReqCollateralizeByAddr) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReqCollateralizeByAddr.Merge(dst, src)
 }
 func (m *ReqCollateralizeByAddr) XXX_Size() int {
 	return xxx_messageInfo_ReqCollateralizeByAddr.Size(m)
@@ -1402,17 +1540,16 @@ func (m *RepCollateralizeIDs) Reset()         { *m = RepCollateralizeIDs{} }
 func (m *RepCollateralizeIDs) String() string { return proto.CompactTextString(m) }
 func (*RepCollateralizeIDs) ProtoMessage()    {}
 func (*RepCollateralizeIDs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{20}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{20}
 }
-
 func (m *RepCollateralizeIDs) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepCollateralizeIDs.Unmarshal(m, b)
 }
 func (m *RepCollateralizeIDs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepCollateralizeIDs.Marshal(b, m, deterministic)
 }
-func (m *RepCollateralizeIDs) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepCollateralizeIDs.Merge(m, src)
+func (dst *RepCollateralizeIDs) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepCollateralizeIDs.Merge(dst, src)
 }
 func (m *RepCollateralizeIDs) XXX_Size() int {
 	return xxx_messageInfo_RepCollateralizeIDs.Size(m)
@@ -1445,17 +1582,16 @@ func (m *ReqCollateralizeRecordByAddr) Reset()         { *m = ReqCollateralizeRe
 func (m *ReqCollateralizeRecordByAddr) String() string { return proto.CompactTextString(m) }
 func (*ReqCollateralizeRecordByAddr) ProtoMessage()    {}
 func (*ReqCollateralizeRecordByAddr) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{21}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{21}
 }
-
 func (m *ReqCollateralizeRecordByAddr) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReqCollateralizeRecordByAddr.Unmarshal(m, b)
 }
 func (m *ReqCollateralizeRecordByAddr) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReqCollateralizeRecordByAddr.Marshal(b, m, deterministic)
 }
-func (m *ReqCollateralizeRecordByAddr) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReqCollateralizeRecordByAddr.Merge(m, src)
+func (dst *ReqCollateralizeRecordByAddr) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReqCollateralizeRecordByAddr.Merge(dst, src)
 }
 func (m *ReqCollateralizeRecordByAddr) XXX_Size() int {
 	return xxx_messageInfo_ReqCollateralizeRecordByAddr.Size(m)
@@ -1508,17 +1644,16 @@ func (m *ReqCollateralizeRecordByStatus) Reset()         { *m = ReqCollateralize
 func (m *ReqCollateralizeRecordByStatus) String() string { return proto.CompactTextString(m) }
 func (*ReqCollateralizeRecordByStatus) ProtoMessage()    {}
 func (*ReqCollateralizeRecordByStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{22}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{22}
 }
-
 func (m *ReqCollateralizeRecordByStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReqCollateralizeRecordByStatus.Unmarshal(m, b)
 }
 func (m *ReqCollateralizeRecordByStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReqCollateralizeRecordByStatus.Marshal(b, m, deterministic)
 }
-func (m *ReqCollateralizeRecordByStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReqCollateralizeRecordByStatus.Merge(m, src)
+func (dst *ReqCollateralizeRecordByStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReqCollateralizeRecordByStatus.Merge(dst, src)
 }
 func (m *ReqCollateralizeRecordByStatus) XXX_Size() int {
 	return xxx_messageInfo_ReqCollateralizeRecordByStatus.Size(m)
@@ -1562,17 +1697,16 @@ func (m *RepCollateralizeRecords) Reset()         { *m = RepCollateralizeRecords
 func (m *RepCollateralizeRecords) String() string { return proto.CompactTextString(m) }
 func (*RepCollateralizeRecords) ProtoMessage()    {}
 func (*RepCollateralizeRecords) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{23}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{23}
 }
-
 func (m *RepCollateralizeRecords) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepCollateralizeRecords.Unmarshal(m, b)
 }
 func (m *RepCollateralizeRecords) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepCollateralizeRecords.Marshal(b, m, deterministic)
 }
-func (m *RepCollateralizeRecords) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepCollateralizeRecords.Merge(m, src)
+func (dst *RepCollateralizeRecords) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepCollateralizeRecords.Merge(dst, src)
 }
 func (m *RepCollateralizeRecords) XXX_Size() int {
 	return xxx_messageInfo_RepCollateralizeRecords.Size(m)
@@ -1603,17 +1737,16 @@ func (m *ReqCollateralizeRecord) Reset()         { *m = ReqCollateralizeRecord{}
 func (m *ReqCollateralizeRecord) String() string { return proto.CompactTextString(m) }
 func (*ReqCollateralizeRecord) ProtoMessage()    {}
 func (*ReqCollateralizeRecord) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{24}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{24}
 }
-
 func (m *ReqCollateralizeRecord) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReqCollateralizeRecord.Unmarshal(m, b)
 }
 func (m *ReqCollateralizeRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReqCollateralizeRecord.Marshal(b, m, deterministic)
 }
-func (m *ReqCollateralizeRecord) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReqCollateralizeRecord.Merge(m, src)
+func (dst *ReqCollateralizeRecord) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReqCollateralizeRecord.Merge(dst, src)
 }
 func (m *ReqCollateralizeRecord) XXX_Size() int {
 	return xxx_messageInfo_ReqCollateralizeRecord.Size(m)
@@ -1650,17 +1783,16 @@ func (m *RepCollateralizeRecord) Reset()         { *m = RepCollateralizeRecord{}
 func (m *RepCollateralizeRecord) String() string { return proto.CompactTextString(m) }
 func (*RepCollateralizeRecord) ProtoMessage()    {}
 func (*RepCollateralizeRecord) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{25}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{25}
 }
-
 func (m *RepCollateralizeRecord) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepCollateralizeRecord.Unmarshal(m, b)
 }
 func (m *RepCollateralizeRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepCollateralizeRecord.Marshal(b, m, deterministic)
 }
-func (m *RepCollateralizeRecord) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepCollateralizeRecord.Merge(m, src)
+func (dst *RepCollateralizeRecord) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepCollateralizeRecord.Merge(dst, src)
 }
 func (m *RepCollateralizeRecord) XXX_Size() int {
 	return xxx_messageInfo_RepCollateralizeRecord.Size(m)
@@ -1696,17 +1828,16 @@ func (m *RepCollateralizeConfig) Reset()         { *m = RepCollateralizeConfig{}
 func (m *RepCollateralizeConfig) String() string { return proto.CompactTextString(m) }
 func (*RepCollateralizeConfig) ProtoMessage()    {}
 func (*RepCollateralizeConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{26}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{26}
 }
-
 func (m *RepCollateralizeConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepCollateralizeConfig.Unmarshal(m, b)
 }
 func (m *RepCollateralizeConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepCollateralizeConfig.Marshal(b, m, deterministic)
 }
-func (m *RepCollateralizeConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepCollateralizeConfig.Merge(m, src)
+func (dst *RepCollateralizeConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepCollateralizeConfig.Merge(dst, src)
 }
 func (m *RepCollateralizeConfig) XXX_Size() int {
 	return xxx_messageInfo_RepCollateralizeConfig.Size(m)
@@ -1778,17 +1909,16 @@ func (m *RepCollateralizePrice) Reset()         { *m = RepCollateralizePrice{} }
 func (m *RepCollateralizePrice) String() string { return proto.CompactTextString(m) }
 func (*RepCollateralizePrice) ProtoMessage()    {}
 func (*RepCollateralizePrice) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a988fb4a61381972, []int{27}
+	return fileDescriptor_collateralize_20087f687fb00ba3, []int{27}
 }
-
 func (m *RepCollateralizePrice) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepCollateralizePrice.Unmarshal(m, b)
 }
 func (m *RepCollateralizePrice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepCollateralizePrice.Marshal(b, m, deterministic)
 }
-func (m *RepCollateralizePrice) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepCollateralizePrice.Merge(m, src)
+func (dst *RepCollateralizePrice) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepCollateralizePrice.Merge(dst, src)
 }
 func (m *RepCollateralizePrice) XXX_Size() int {
 	return xxx_messageInfo_RepCollateralizePrice.Size(m)
@@ -1837,9 +1967,9 @@ func init() {
 	proto.RegisterType((*RepCollateralizePrice)(nil), "types.RepCollateralizePrice")
 }
 
-func init() { proto.RegisterFile("collateralize.proto", fileDescriptor_a988fb4a61381972) }
+func init() { proto.RegisterFile("collateralize.proto", fileDescriptor_collateralize_20087f687fb00ba3) }
 
-var fileDescriptor_a988fb4a61381972 = []byte{
+var fileDescriptor_collateralize_20087f687fb00ba3 = []byte{
 	// 1197 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x4d, 0x6f, 0xe4, 0x44,
 	0x13, 0x8e, 0xc7, 0xf3, 0x91, 0xa9, 0x49, 0xb2, 0xd9, 0x4e, 0x36, 0xaf, 0xdf, 0xdd, 0x28, 0x1a,

plugin/dapp/issuance/executor/issuancedb.go

@@ -582,7 +582,7 @@ func (action *Action) IssuanceDebt(debt *pty.IssuanceDebt) (*types.Receipt, erro
 	debtRecord.StartTime = action.blocktime
 	debtRecord.CollateralPrice = lastPrice
 	debtRecord.DebtValue = debt.Value
-	debtRecord.LiquidationPrice = (issu.LiquidationRatio*lastPrice*pty.IssuancePreLiquidationRatio) / 1e8
+	debtRecord.LiquidationPrice = (issu.LiquidationRatio * lastPrice * pty.IssuancePreLiquidationRatio) / 1e8
 	debtRecord.Status = pty.IssuanceUserStatusCreate
 	debtRecord.ExpireTime = action.blocktime + issu.Period
 

plugin/dapp/issuance/types/issuance.go

@@ -146,7 +146,7 @@ func CreateRawIssuanceCreateTx(cfg *types.Chain33Config, parm *IssuanceCreateTx)
 	v := &IssuanceCreate{
 		TotalBalance:     int64(math.Trunc((parm.TotalBalance+0.0000001)*1e4)) * 1e4,
 		DebtCeiling:      int64(math.Trunc((parm.DebtCeiling+0.0000001)*1e4)) * 1e4,
-		LiquidationRatio: int64(math.Trunc((parm.LiquidationRatio+0.0000001)*1e4)),
+		LiquidationRatio: int64(math.Trunc((parm.LiquidationRatio + 0.0000001) * 1e4)),
 		Period:           parm.Period,
 	}
 	create := &IssuanceAction{

plugin/dapp/issuance/types/issuance.pb.go

@@ -5,7 +5,9 @@ package types
 
 import (
 	fmt "fmt"
+
 	proto "github.com/golang/protobuf/proto"
+
 	math "math"
 )
 
@@ -18,7 +20,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 // 发行信息
 type Issuance struct {
@@ -46,17 +48,16 @@ func (m *Issuance) Reset()         { *m = Issuance{} }
 func (m *Issuance) String() string { return proto.CompactTextString(m) }
 func (*Issuance) ProtoMessage()    {}
 func (*Issuance) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{0}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{0}
 }
-
 func (m *Issuance) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Issuance.Unmarshal(m, b)
 }
 func (m *Issuance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Issuance.Marshal(b, m, deterministic)
 }
-func (m *Issuance) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Issuance.Merge(m, src)
+func (dst *Issuance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Issuance.Merge(dst, src)
 }
 func (m *Issuance) XXX_Size() int {
 	return xxx_messageInfo_Issuance.Size(m)
@@ -195,17 +196,16 @@ func (m *DebtRecord) Reset()         { *m = DebtRecord{} }
 func (m *DebtRecord) String() string { return proto.CompactTextString(m) }
 func (*DebtRecord) ProtoMessage()    {}
 func (*DebtRecord) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{1}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{1}
 }
-
 func (m *DebtRecord) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DebtRecord.Unmarshal(m, b)
 }
 func (m *DebtRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DebtRecord.Marshal(b, m, deterministic)
 }
-func (m *DebtRecord) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DebtRecord.Merge(m, src)
+func (dst *DebtRecord) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DebtRecord.Merge(dst, src)
 }
 func (m *DebtRecord) XXX_Size() int {
 	return xxx_messageInfo_DebtRecord.Size(m)
@@ -313,17 +313,16 @@ func (m *IssuanceAssetPriceRecord) Reset()         { *m = IssuanceAssetPriceReco
 func (m *IssuanceAssetPriceRecord) String() string { return proto.CompactTextString(m) }
 func (*IssuanceAssetPriceRecord) ProtoMessage()    {}
 func (*IssuanceAssetPriceRecord) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{2}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{2}
 }
-
 func (m *IssuanceAssetPriceRecord) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IssuanceAssetPriceRecord.Unmarshal(m, b)
 }
 func (m *IssuanceAssetPriceRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IssuanceAssetPriceRecord.Marshal(b, m, deterministic)
 }
-func (m *IssuanceAssetPriceRecord) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IssuanceAssetPriceRecord.Merge(m, src)
+func (dst *IssuanceAssetPriceRecord) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IssuanceAssetPriceRecord.Merge(dst, src)
 }
 func (m *IssuanceAssetPriceRecord) XXX_Size() int {
 	return xxx_messageInfo_IssuanceAssetPriceRecord.Size(m)
@@ -368,17 +367,16 @@ func (m *IssuanceAction) Reset()         { *m = IssuanceAction{} }
 func (m *IssuanceAction) String() string { return proto.CompactTextString(m) }
 func (*IssuanceAction) ProtoMessage()    {}
 func (*IssuanceAction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{3}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{3}
 }
-
 func (m *IssuanceAction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IssuanceAction.Unmarshal(m, b)
 }
 func (m *IssuanceAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IssuanceAction.Marshal(b, m, deterministic)
 }
-func (m *IssuanceAction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IssuanceAction.Merge(m, src)
+func (dst *IssuanceAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IssuanceAction.Merge(dst, src)
 }
 func (m *IssuanceAction) XXX_Size() int {
 	return xxx_messageInfo_IssuanceAction.Size(m)
@@ -485,9 +483,9 @@ func (m *IssuanceAction) GetTy() int32 {
 	return 0
 }
 
-// XXX_OneofWrappers is for the internal use of the proto package.
-func (*IssuanceAction) XXX_OneofWrappers() []interface{} {
-	return []interface{}{
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*IssuanceAction) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _IssuanceAction_OneofMarshaler, _IssuanceAction_OneofUnmarshaler, _IssuanceAction_OneofSizer, []interface{}{
 		(*IssuanceAction_Create)(nil),
 		(*IssuanceAction_Debt)(nil),
 		(*IssuanceAction_Repay)(nil),
@@ -497,6 +495,144 @@ func (*IssuanceAction) XXX_OneofWrappers() []interface{} {
 	}
 }
 
+func _IssuanceAction_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*IssuanceAction)
+	// value
+	switch x := m.Value.(type) {
+	case *IssuanceAction_Create:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Create); err != nil {
+			return err
+		}
+	case *IssuanceAction_Debt:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Debt); err != nil {
+			return err
+		}
+	case *IssuanceAction_Repay:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Repay); err != nil {
+			return err
+		}
+	case *IssuanceAction_Feed:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Feed); err != nil {
+			return err
+		}
+	case *IssuanceAction_Close:
+		b.EncodeVarint(5<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Close); err != nil {
+			return err
+		}
+	case *IssuanceAction_Manage:
+		b.EncodeVarint(6<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Manage); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("IssuanceAction.Value has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _IssuanceAction_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*IssuanceAction)
+	switch tag {
+	case 1: // value.create
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(IssuanceCreate)
+		err := b.DecodeMessage(msg)
+		m.Value = &IssuanceAction_Create{msg}
+		return true, err
+	case 2: // value.debt
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(IssuanceDebt)
+		err := b.DecodeMessage(msg)
+		m.Value = &IssuanceAction_Debt{msg}
+		return true, err
+	case 3: // value.repay
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(IssuanceRepay)
+		err := b.DecodeMessage(msg)
+		m.Value = &IssuanceAction_Repay{msg}
+		return true, err
+	case 4: // value.feed
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(IssuanceFeed)
+		err := b.DecodeMessage(msg)
+		m.Value = &IssuanceAction_Feed{msg}
+		return true, err
+	case 5: // value.close
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(IssuanceClose)
+		err := b.DecodeMessage(msg)
+		m.Value = &IssuanceAction_Close{msg}
+		return true, err
+	case 6: // value.manage
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(IssuanceManage)
+		err := b.DecodeMessage(msg)
+		m.Value = &IssuanceAction_Manage{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _IssuanceAction_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*IssuanceAction)
+	// value
+	switch x := m.Value.(type) {
+	case *IssuanceAction_Create:
+		s := proto.Size(x.Create)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *IssuanceAction_Debt:
+		s := proto.Size(x.Debt)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *IssuanceAction_Repay:
+		s := proto.Size(x.Repay)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *IssuanceAction_Feed:
+		s := proto.Size(x.Feed)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *IssuanceAction_Close:
+		s := proto.Size(x.Close)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *IssuanceAction_Manage:
+		s := proto.Size(x.Manage)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
 type IssuanceManage struct {
 	SuperAddrs           []string `protobuf:"bytes,1,rep,name=superAddrs,proto3" json:"superAddrs,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -508,17 +644,16 @@ func (m *IssuanceManage) Reset()         { *m = IssuanceManage{} }
 func (m *IssuanceManage) String() string { return proto.CompactTextString(m) }
 func (*IssuanceManage) ProtoMessage()    {}
 func (*IssuanceManage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{4}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{4}
 }
-
 func (m *IssuanceManage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IssuanceManage.Unmarshal(m, b)
 }
 func (m *IssuanceManage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IssuanceManage.Marshal(b, m, deterministic)
 }
-func (m *IssuanceManage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IssuanceManage.Merge(m, src)
+func (dst *IssuanceManage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IssuanceManage.Merge(dst, src)
 }
 func (m *IssuanceManage) XXX_Size() int {
 	return xxx_messageInfo_IssuanceManage.Size(m)
@@ -551,17 +686,16 @@ func (m *IssuanceCreate) Reset()         { *m = IssuanceCreate{} }
 func (m *IssuanceCreate) String() string { return proto.CompactTextString(m) }
 func (*IssuanceCreate) ProtoMessage()    {}
 func (*IssuanceCreate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{5}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{5}
 }
-
 func (m *IssuanceCreate) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IssuanceCreate.Unmarshal(m, b)
 }
 func (m *IssuanceCreate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IssuanceCreate.Marshal(b, m, deterministic)
 }
-func (m *IssuanceCreate) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IssuanceCreate.Merge(m, src)
+func (dst *IssuanceCreate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IssuanceCreate.Merge(dst, src)
 }
 func (m *IssuanceCreate) XXX_Size() int {
 	return xxx_messageInfo_IssuanceCreate.Size(m)
@@ -613,17 +747,16 @@ func (m *IssuanceDebt) Reset()         { *m = IssuanceDebt{} }
 func (m *IssuanceDebt) String() string { return proto.CompactTextString(m) }
 func (*IssuanceDebt) ProtoMessage()    {}
 func (*IssuanceDebt) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{6}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{6}
 }
-
 func (m *IssuanceDebt) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IssuanceDebt.Unmarshal(m, b)
 }
 func (m *IssuanceDebt) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IssuanceDebt.Marshal(b, m, deterministic)
 }
-func (m *IssuanceDebt) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IssuanceDebt.Merge(m, src)
+func (dst *IssuanceDebt) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IssuanceDebt.Merge(dst, src)
 }
 func (m *IssuanceDebt) XXX_Size() int {
 	return xxx_messageInfo_IssuanceDebt.Size(m)
@@ -661,17 +794,16 @@ func (m *IssuanceRepay) Reset()         { *m = IssuanceRepay{} }
 func (m *IssuanceRepay) String() string { return proto.CompactTextString(m) }
 func (*IssuanceRepay) ProtoMessage()    {}
 func (*IssuanceRepay) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{7}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{7}
 }
-
 func (m *IssuanceRepay) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IssuanceRepay.Unmarshal(m, b)
 }
 func (m *IssuanceRepay) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IssuanceRepay.Marshal(b, m, deterministic)
 }
-func (m *IssuanceRepay) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IssuanceRepay.Merge(m, src)
+func (dst *IssuanceRepay) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IssuanceRepay.Merge(dst, src)
 }
 func (m *IssuanceRepay) XXX_Size() int {
 	return xxx_messageInfo_IssuanceRepay.Size(m)
@@ -710,17 +842,16 @@ func (m *IssuanceFeed) Reset()         { *m = IssuanceFeed{} }
 func (m *IssuanceFeed) String() string { return proto.CompactTextString(m) }
 func (*IssuanceFeed) ProtoMessage()    {}
 func (*IssuanceFeed) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{8}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{8}
 }
-
 func (m *IssuanceFeed) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IssuanceFeed.Unmarshal(m, b)
 }
 func (m *IssuanceFeed) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IssuanceFeed.Marshal(b, m, deterministic)
 }
-func (m *IssuanceFeed) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IssuanceFeed.Merge(m, src)
+func (dst *IssuanceFeed) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IssuanceFeed.Merge(dst, src)
 }
 func (m *IssuanceFeed) XXX_Size() int {
 	return xxx_messageInfo_IssuanceFeed.Size(m)
@@ -764,17 +895,16 @@ func (m *IssuanceClose) Reset()         { *m = IssuanceClose{} }
 func (m *IssuanceClose) String() string { return proto.CompactTextString(m) }
 func (*IssuanceClose) ProtoMessage()    {}
 func (*IssuanceClose) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{9}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{9}
 }
-
 func (m *IssuanceClose) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IssuanceClose.Unmarshal(m, b)
 }
 func (m *IssuanceClose) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IssuanceClose.Marshal(b, m, deterministic)
 }
-func (m *IssuanceClose) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IssuanceClose.Merge(m, src)
+func (dst *IssuanceClose) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IssuanceClose.Merge(dst, src)
 }
 func (m *IssuanceClose) XXX_Size() int {
 	return xxx_messageInfo_IssuanceClose.Size(m)
@@ -807,17 +937,16 @@ func (m *ReceiptIssuance) Reset()         { *m = ReceiptIssuance{} }
 func (m *ReceiptIssuance) String() string { return proto.CompactTextString(m) }
 func (*ReceiptIssuance) ProtoMessage()    {}
 func (*ReceiptIssuance) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{10}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{10}
 }
-
 func (m *ReceiptIssuance) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReceiptIssuance.Unmarshal(m, b)
 }
 func (m *ReceiptIssuance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReceiptIssuance.Marshal(b, m, deterministic)
 }
-func (m *ReceiptIssuance) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReceiptIssuance.Merge(m, src)
+func (dst *ReceiptIssuance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReceiptIssuance.Merge(dst, src)
 }
 func (m *ReceiptIssuance) XXX_Size() int {
 	return xxx_messageInfo_ReceiptIssuance.Size(m)
@@ -869,17 +998,16 @@ func (m *ReceiptIssuanceID) Reset()         { *m = ReceiptIssuanceID{} }
 func (m *ReceiptIssuanceID) String() string { return proto.CompactTextString(m) }
 func (*ReceiptIssuanceID) ProtoMessage()    {}
 func (*ReceiptIssuanceID) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{11}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{11}
 }
-
 func (m *ReceiptIssuanceID) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReceiptIssuanceID.Unmarshal(m, b)
 }
 func (m *ReceiptIssuanceID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReceiptIssuanceID.Marshal(b, m, deterministic)
 }
-func (m *ReceiptIssuanceID) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReceiptIssuanceID.Merge(m, src)
+func (dst *ReceiptIssuanceID) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReceiptIssuanceID.Merge(dst, src)
 }
 func (m *ReceiptIssuanceID) XXX_Size() int {
 	return xxx_messageInfo_ReceiptIssuanceID.Size(m)
@@ -916,17 +1044,16 @@ func (m *IssuanceRecords) Reset()         { *m = IssuanceRecords{} }
 func (m *IssuanceRecords) String() string { return proto.CompactTextString(m) }
 func (*IssuanceRecords) ProtoMessage()    {}
 func (*IssuanceRecords) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{12}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{12}
 }
-
 func (m *IssuanceRecords) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IssuanceRecords.Unmarshal(m, b)
 }
 func (m *IssuanceRecords) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IssuanceRecords.Marshal(b, m, deterministic)
 }
-func (m *IssuanceRecords) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IssuanceRecords.Merge(m, src)
+func (dst *IssuanceRecords) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IssuanceRecords.Merge(dst, src)
 }
 func (m *IssuanceRecords) XXX_Size() int {
 	return xxx_messageInfo_IssuanceRecords.Size(m)
@@ -956,17 +1083,16 @@ func (m *ReqIssuanceInfo) Reset()         { *m = ReqIssuanceInfo{} }
 func (m *ReqIssuanceInfo) String() string { return proto.CompactTextString(m) }
 func (*ReqIssuanceInfo) ProtoMessage()    {}
 func (*ReqIssuanceInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{13}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{13}
 }
-
 func (m *ReqIssuanceInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReqIssuanceInfo.Unmarshal(m, b)
 }
 func (m *ReqIssuanceInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReqIssuanceInfo.Marshal(b, m, deterministic)
 }
-func (m *ReqIssuanceInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReqIssuanceInfo.Merge(m, src)
+func (dst *ReqIssuanceInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReqIssuanceInfo.Merge(dst, src)
 }
 func (m *ReqIssuanceInfo) XXX_Size() int {
 	return xxx_messageInfo_ReqIssuanceInfo.Size(m)
@@ -1005,17 +1131,16 @@ func (m *RepIssuanceCurrentInfo) Reset()         { *m = RepIssuanceCurrentInfo{}
 func (m *RepIssuanceCurrentInfo) String() string { return proto.CompactTextString(m) }
 func (*RepIssuanceCurrentInfo) ProtoMessage()    {}
 func (*RepIssuanceCurrentInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{14}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{14}
 }
-
 func (m *RepIssuanceCurrentInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepIssuanceCurrentInfo.Unmarshal(m, b)
 }
 func (m *RepIssuanceCurrentInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepIssuanceCurrentInfo.Marshal(b, m, deterministic)
 }
-func (m *RepIssuanceCurrentInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepIssuanceCurrentInfo.Merge(m, src)
+func (dst *RepIssuanceCurrentInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepIssuanceCurrentInfo.Merge(dst, src)
 }
 func (m *RepIssuanceCurrentInfo) XXX_Size() int {
 	return xxx_messageInfo_RepIssuanceCurrentInfo.Size(m)
@@ -1108,17 +1233,16 @@ func (m *ReqIssuanceInfos) Reset()         { *m = ReqIssuanceInfos{} }
 func (m *ReqIssuanceInfos) String() string { return proto.CompactTextString(m) }
 func (*ReqIssuanceInfos) ProtoMessage()    {}
 func (*ReqIssuanceInfos) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{15}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{15}
 }
-
 func (m *ReqIssuanceInfos) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReqIssuanceInfos.Unmarshal(m, b)
 }
 func (m *ReqIssuanceInfos) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReqIssuanceInfos.Marshal(b, m, deterministic)
 }
-func (m *ReqIssuanceInfos) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReqIssuanceInfos.Merge(m, src)
+func (dst *ReqIssuanceInfos) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReqIssuanceInfos.Merge(dst, src)
 }
 func (m *ReqIssuanceInfos) XXX_Size() int {
 	return xxx_messageInfo_ReqIssuanceInfos.Size(m)
@@ -1148,17 +1272,16 @@ func (m *RepIssuanceCurrentInfos) Reset()         { *m = RepIssuanceCurrentInfos
 func (m *RepIssuanceCurrentInfos) String() string { return proto.CompactTextString(m) }
 func (*RepIssuanceCurrentInfos) ProtoMessage()    {}
 func (*RepIssuanceCurrentInfos) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{16}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{16}
 }
-
 func (m *RepIssuanceCurrentInfos) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepIssuanceCurrentInfos.Unmarshal(m, b)
 }
 func (m *RepIssuanceCurrentInfos) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepIssuanceCurrentInfos.Marshal(b, m, deterministic)
 }
-func (m *RepIssuanceCurrentInfos) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepIssuanceCurrentInfos.Merge(m, src)
+func (dst *RepIssuanceCurrentInfos) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepIssuanceCurrentInfos.Merge(dst, src)
 }
 func (m *RepIssuanceCurrentInfos) XXX_Size() int {
 	return xxx_messageInfo_RepIssuanceCurrentInfos.Size(m)
@@ -1189,17 +1312,16 @@ func (m *ReqIssuanceByStatus) Reset()         { *m = ReqIssuanceByStatus{} }
 func (m *ReqIssuanceByStatus) String() string { return proto.CompactTextString(m) }
 func (*ReqIssuanceByStatus) ProtoMessage()    {}
 func (*ReqIssuanceByStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{17}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{17}
 }
-
 func (m *ReqIssuanceByStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReqIssuanceByStatus.Unmarshal(m, b)
 }
 func (m *ReqIssuanceByStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReqIssuanceByStatus.Marshal(b, m, deterministic)
 }
-func (m *ReqIssuanceByStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReqIssuanceByStatus.Merge(m, src)
+func (dst *ReqIssuanceByStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReqIssuanceByStatus.Merge(dst, src)
 }
 func (m *ReqIssuanceByStatus) XXX_Size() int {
 	return xxx_messageInfo_ReqIssuanceByStatus.Size(m)
@@ -1236,17 +1358,16 @@ func (m *RepIssuanceIDs) Reset()         { *m = RepIssuanceIDs{} }
 func (m *RepIssuanceIDs) String() string { return proto.CompactTextString(m) }
 func (*RepIssuanceIDs) ProtoMessage()    {}
 func (*RepIssuanceIDs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{18}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{18}
 }
-
 func (m *RepIssuanceIDs) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepIssuanceIDs.Unmarshal(m, b)
 }
 func (m *RepIssuanceIDs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepIssuanceIDs.Marshal(b, m, deterministic)
 }
-func (m *RepIssuanceIDs) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepIssuanceIDs.Merge(m, src)
+func (dst *RepIssuanceIDs) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepIssuanceIDs.Merge(dst, src)
 }
 func (m *RepIssuanceIDs) XXX_Size() int {
 	return xxx_messageInfo_RepIssuanceIDs.Size(m)
@@ -1279,17 +1400,16 @@ func (m *ReqIssuanceRecords) Reset()         { *m = ReqIssuanceRecords{} }
 func (m *ReqIssuanceRecords) String() string { return proto.CompactTextString(m) }
 func (*ReqIssuanceRecords) ProtoMessage()    {}
 func (*ReqIssuanceRecords) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{19}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{19}
 }
-
 func (m *ReqIssuanceRecords) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReqIssuanceRecords.Unmarshal(m, b)
 }
 func (m *ReqIssuanceRecords) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReqIssuanceRecords.Marshal(b, m, deterministic)
 }
-func (m *ReqIssuanceRecords) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReqIssuanceRecords.Merge(m, src)
+func (dst *ReqIssuanceRecords) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReqIssuanceRecords.Merge(dst, src)
 }
 func (m *ReqIssuanceRecords) XXX_Size() int {
 	return xxx_messageInfo_ReqIssuanceRecords.Size(m)
@@ -1340,17 +1460,16 @@ func (m *RepIssuanceRecords) Reset()         { *m = RepIssuanceRecords{} }
 func (m *RepIssuanceRecords) String() string { return proto.CompactTextString(m) }
 func (*RepIssuanceRecords) ProtoMessage()    {}
 func (*RepIssuanceRecords) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{20}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{20}
 }
-
 func (m *RepIssuanceRecords) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepIssuanceRecords.Unmarshal(m, b)
 }
 func (m *RepIssuanceRecords) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepIssuanceRecords.Marshal(b, m, deterministic)
 }
-func (m *RepIssuanceRecords) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepIssuanceRecords.Merge(m, src)
+func (dst *RepIssuanceRecords) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepIssuanceRecords.Merge(dst, src)
 }
 func (m *RepIssuanceRecords) XXX_Size() int {
 	return xxx_messageInfo_RepIssuanceRecords.Size(m)
@@ -1380,17 +1499,16 @@ func (m *RepIssuanceDebtInfo) Reset()         { *m = RepIssuanceDebtInfo{} }
 func (m *RepIssuanceDebtInfo) String() string { return proto.CompactTextString(m) }
 func (*RepIssuanceDebtInfo) ProtoMessage()    {}
 func (*RepIssuanceDebtInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{21}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{21}
 }
-
 func (m *RepIssuanceDebtInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepIssuanceDebtInfo.Unmarshal(m, b)
 }
 func (m *RepIssuanceDebtInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepIssuanceDebtInfo.Marshal(b, m, deterministic)
 }
-func (m *RepIssuanceDebtInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepIssuanceDebtInfo.Merge(m, src)
+func (dst *RepIssuanceDebtInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepIssuanceDebtInfo.Merge(dst, src)
 }
 func (m *RepIssuanceDebtInfo) XXX_Size() int {
 	return xxx_messageInfo_RepIssuanceDebtInfo.Size(m)
@@ -1420,17 +1538,16 @@ func (m *RepIssuancePrice) Reset()         { *m = RepIssuancePrice{} }
 func (m *RepIssuancePrice) String() string { return proto.CompactTextString(m) }
 func (*RepIssuancePrice) ProtoMessage()    {}
 func (*RepIssuancePrice) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7110f4228953d675, []int{22}
+	return fileDescriptor_issuance_e0dc6f257f1d6c63, []int{22}
 }
-
 func (m *RepIssuancePrice) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepIssuancePrice.Unmarshal(m, b)
 }
 func (m *RepIssuancePrice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepIssuancePrice.Marshal(b, m, deterministic)
 }
-func (m *RepIssuancePrice) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepIssuancePrice.Merge(m, src)
+func (dst *RepIssuancePrice) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepIssuancePrice.Merge(dst, src)
 }
 func (m *RepIssuancePrice) XXX_Size() int {
 	return xxx_messageInfo_RepIssuancePrice.Size(m)
@@ -1474,9 +1591,9 @@ func init() {
 	proto.RegisterType((*RepIssuancePrice)(nil), "types.RepIssuancePrice")
 }
 
-func init() { proto.RegisterFile("issuance.proto", fileDescriptor_7110f4228953d675) }
+func init() { proto.RegisterFile("issuance.proto", fileDescriptor_issuance_e0dc6f257f1d6c63) }
 
-var fileDescriptor_7110f4228953d675 = []byte{
+var fileDescriptor_issuance_e0dc6f257f1d6c63 = []byte{
 	// 1026 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcd, 0x6e, 0xe3, 0x36,
 	0x10, 0x8e, 0x24, 0xcb, 0x3f, 0xe3, 0xc4, 0xc9, 0x72, 0xb7, 0xa9, 0x50, 0xb4, 0x0b, 0x83, 0xe8,