update proto.version

plugin/dapp/accountmanager/executor/account_test.go

@@ -185,10 +185,10 @@ func TestAccountManager(t *testing.T) {
 	assert.Equal(t, balance.Balance, 199*types.Coin)
 
 	//过期账户查询
-	time.Sleep(10 * time.Second)
+	time.Sleep(11 * time.Second)
 	accounts, err = Exec_QueryExpiredAccounts(time.Now().Unix(), stateDB, kvdb)
 	assert.Equal(t, err, nil)
-	assert.Equal(t, accounts.Accounts[0].AccountID, "harrylee2015")
+	assert.Equal(t, 2, len(accounts.Accounts))
 	//账户延期
 	tx10, _ := CreateSupervise(&et.Supervise{
 		AccountIDs: []string{"harrylee2015"},
@@ -198,7 +198,7 @@ func TestAccountManager(t *testing.T) {
 	assert.Equal(t, err, nil)
 	accounts, err = Exec_QueryExpiredAccounts(time.Now().Unix(), stateDB, kvdb)
 	assert.Equal(t, err, nil)
-	assert.Equal(t, len(accounts.Accounts), 0)
+	assert.Equal(t, 1, len(accounts.Accounts))
 	//账户授权
 	tx11, _ := CreateSupervise(&et.Supervise{
 		AccountIDs: []string{"harrylee2015"},

plugin/dapp/accountmanager/executor/accountdb.go

@@ -427,7 +427,7 @@ func findAccountByAddr(localdb dbm.KV, addr string) (*et.Account, error) {
 	//第一次查询,默认展示最新得成交记录
 	rows, err := table.ListIndex("addr", prefix, nil, 1, et.ListDESC)
 	if err != nil {
-		elog.Error("findAccountByAddr.", "prefix", prefix, "err", err.Error())
+		elog.Error("findAccountByAddr.", "addr", addr, "err", err.Error())
 		return nil, err
 	}
 	for _, row := range rows {

plugin/dapp/accountmanager/executor/accountmanager.go

@@ -60,7 +60,10 @@ func (a *Accountmanager) ExecutorOrder() int64 {
 func (a *Accountmanager) CheckTx(tx *types.Transaction, index int) error {
 	//发送交易的时候就检查payload,做严格的参数检查
 	var ama et.AccountmanagerAction
-	types.Decode(tx.GetPayload(), &ama)
+	err := types.Decode(tx.GetPayload(), &ama)
+	if err != nil {
+		return err
+	}
 	switch ama.Ty {
 	case et.TyRegisterAction:
 		register := ama.GetRegister()

plugin/dapp/accountmanager/executor/tables_test.go

@@ -13,8 +13,8 @@ func TestAccountTable(t *testing.T) {
 	_, _, kvdb := util.CreateTestDB()
 	table := NewAccountTable(kvdb)
 	now := time.Now().Unix()
-	row1 := &et.Account{Index: now * int64(types.MaxTxsPerBlock), AccountID: "harry2015", Status: 1, ExpireTime: now + 10, Addr: "xxxx"}
-	row2 := &et.Account{Index: now*int64(types.MaxTxsPerBlock) + 1, AccountID: "harry2020", Status: 1, ExpireTime: now, Addr: "xxxx"}
+	row1 := &et.Account{Index: now * int64(types.MaxTxsPerBlock), AccountID: "harry2015", Status: 0, ExpireTime: now + 10, Addr: "xxxx"}
+	row2 := &et.Account{Index: now*int64(types.MaxTxsPerBlock) + 1, AccountID: "harry2020", Status: 0, ExpireTime: now, Addr: "xxxx"}
 	table.Add(row1)
 	table.Add(row2)
 	kvs, err := table.Save()

plugin/dapp/accountmanager/types/accountmanager.pb.go

 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: accountmanager.proto
 
-/*
-Package types is a generated protocol buffer package.
-
-It is generated from these files:
-	accountmanager.proto
-
-It has these top-level messages:
-	Accountmanager
-	AccountmanagerAction
-	Register
-	ResetKey
-	Apply
-	Asset
-	Transfer
-	Supervise
-	Account
-	AccountReceipt
-	ReplyAccountList
-	TransferReceipt
-	SuperviseReceipt
-	QueryExpiredAccounts
-	QueryAccountsByStatus
-	QueryAccountByID
-	QueryAccountByAddr
-	QueryBalanceByID
-	Balance
-*/
 package types
 
 import (
+	context "context"
 	fmt "fmt"
-
-	proto "github.com/golang/protobuf/proto"
-
 	math "math"
 
-	context "golang.org/x/net/context"
-
+	proto "github.com/golang/protobuf/proto"
 	grpc "google.golang.org/grpc"
 )
 
@@ -51,15 +21,38 @@ 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.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Accountmanager struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Accountmanager) Reset()         { *m = Accountmanager{} }
 func (m *Accountmanager) String() string { return proto.CompactTextString(m) }
 func (*Accountmanager) ProtoMessage()    {}
-func (*Accountmanager) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (*Accountmanager) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{0}
+}
+
+func (m *Accountmanager) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Accountmanager.Unmarshal(m, b)
+}
+func (m *Accountmanager) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Accountmanager.Marshal(b, m, deterministic)
+}
+func (m *Accountmanager) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Accountmanager.Merge(m, src)
+}
+func (m *Accountmanager) XXX_Size() int {
+	return xxx_messageInfo_Accountmanager.Size(m)
+}
+func (m *Accountmanager) XXX_DiscardUnknown() {
+	xxx_messageInfo_Accountmanager.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Accountmanager proto.InternalMessageInfo
 
 type AccountmanagerAction struct {
 	// Types that are valid to be assigned to Value:
@@ -69,38 +62,69 @@ type AccountmanagerAction struct {
 	//	*AccountmanagerAction_Supervise
 	//	*AccountmanagerAction_Apply
 	Value                isAccountmanagerAction_Value `protobuf_oneof:"value"`
-	Ty    int32                        `protobuf:"varint,6,opt,name=ty" json:"ty,omitempty"`
+	Ty                   int32                        `protobuf:"varint,6,opt,name=ty,proto3" json:"ty,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
 }
 
 func (m *AccountmanagerAction) Reset()         { *m = AccountmanagerAction{} }
 func (m *AccountmanagerAction) String() string { return proto.CompactTextString(m) }
 func (*AccountmanagerAction) ProtoMessage()    {}
-func (*AccountmanagerAction) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (*AccountmanagerAction) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{1}
+}
+
+func (m *AccountmanagerAction) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AccountmanagerAction.Unmarshal(m, b)
+}
+func (m *AccountmanagerAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AccountmanagerAction.Marshal(b, m, deterministic)
+}
+func (m *AccountmanagerAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AccountmanagerAction.Merge(m, src)
+}
+func (m *AccountmanagerAction) XXX_Size() int {
+	return xxx_messageInfo_AccountmanagerAction.Size(m)
+}
+func (m *AccountmanagerAction) XXX_DiscardUnknown() {
+	xxx_messageInfo_AccountmanagerAction.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AccountmanagerAction proto.InternalMessageInfo
 
 type isAccountmanagerAction_Value interface {
 	isAccountmanagerAction_Value()
 }
 
 type AccountmanagerAction_Register struct {
-	Register *Register `protobuf:"bytes,1,opt,name=register,oneof"`
+	Register *Register `protobuf:"bytes,1,opt,name=register,proto3,oneof"`
 }
+
 type AccountmanagerAction_ResetKey struct {
-	ResetKey *ResetKey `protobuf:"bytes,2,opt,name=resetKey,oneof"`
+	ResetKey *ResetKey `protobuf:"bytes,2,opt,name=resetKey,proto3,oneof"`
 }
+
 type AccountmanagerAction_Transfer struct {
-	Transfer *Transfer `protobuf:"bytes,3,opt,name=transfer,oneof"`
+	Transfer *Transfer `protobuf:"bytes,3,opt,name=transfer,proto3,oneof"`
 }
+
 type AccountmanagerAction_Supervise struct {
-	Supervise *Supervise `protobuf:"bytes,4,opt,name=supervise,oneof"`
+	Supervise *Supervise `protobuf:"bytes,4,opt,name=supervise,proto3,oneof"`
 }
+
 type AccountmanagerAction_Apply struct {
-	Apply *Apply `protobuf:"bytes,5,opt,name=apply,oneof"`
+	Apply *Apply `protobuf:"bytes,5,opt,name=apply,proto3,oneof"`
 }
 
 func (*AccountmanagerAction_Register) isAccountmanagerAction_Value() {}
+
 func (*AccountmanagerAction_ResetKey) isAccountmanagerAction_Value() {}
+
 func (*AccountmanagerAction_Transfer) isAccountmanagerAction_Value() {}
+
 func (*AccountmanagerAction_Supervise) isAccountmanagerAction_Value() {}
+
 func (*AccountmanagerAction_Apply) isAccountmanagerAction_Value() {}
 
 func (m *AccountmanagerAction) GetValue() isAccountmanagerAction_Value {
@@ -152,9 +176,9 @@ func (m *AccountmanagerAction) GetTy() int32 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AccountmanagerAction) 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 _AccountmanagerAction_OneofMarshaler, _AccountmanagerAction_OneofUnmarshaler, _AccountmanagerAction_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*AccountmanagerAction) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*AccountmanagerAction_Register)(nil),
 		(*AccountmanagerAction_ResetKey)(nil),
 		(*AccountmanagerAction_Transfer)(nil),
@@ -163,135 +187,38 @@ func (*AccountmanagerAction) XXX_OneofFuncs() (func(msg proto.Message, b *proto.
 	}
 }
 
-func _AccountmanagerAction_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AccountmanagerAction)
-	// value
-	switch x := m.Value.(type) {
-	case *AccountmanagerAction_Register:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Register); err != nil {
-			return err
-		}
-	case *AccountmanagerAction_ResetKey:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ResetKey); err != nil {
-			return err
-		}
-	case *AccountmanagerAction_Transfer:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Transfer); err != nil {
-			return err
-		}
-	case *AccountmanagerAction_Supervise:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Supervise); err != nil {
-			return err
-		}
-	case *AccountmanagerAction_Apply:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Apply); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AccountmanagerAction.Value has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AccountmanagerAction_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AccountmanagerAction)
-	switch tag {
-	case 1: // value.register
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Register)
-		err := b.DecodeMessage(msg)
-		m.Value = &AccountmanagerAction_Register{msg}
-		return true, err
-	case 2: // value.resetKey
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ResetKey)
-		err := b.DecodeMessage(msg)
-		m.Value = &AccountmanagerAction_ResetKey{msg}
-		return true, err
-	case 3: // value.transfer
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Transfer)
-		err := b.DecodeMessage(msg)
-		m.Value = &AccountmanagerAction_Transfer{msg}
-		return true, err
-	case 4: // value.supervise
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Supervise)
-		err := b.DecodeMessage(msg)
-		m.Value = &AccountmanagerAction_Supervise{msg}
-		return true, err
-	case 5: // value.apply
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Apply)
-		err := b.DecodeMessage(msg)
-		m.Value = &AccountmanagerAction_Apply{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AccountmanagerAction_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AccountmanagerAction)
-	// value
-	switch x := m.Value.(type) {
-	case *AccountmanagerAction_Register:
-		s := proto.Size(x.Register)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountmanagerAction_ResetKey:
-		s := proto.Size(x.ResetKey)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountmanagerAction_Transfer:
-		s := proto.Size(x.Transfer)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountmanagerAction_Supervise:
-		s := proto.Size(x.Supervise)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AccountmanagerAction_Apply:
-		s := proto.Size(x.Apply)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// 注册
+//注册
 type Register struct {
-	AccountID string `protobuf:"bytes,1,opt,name=accountID" json:"accountID,omitempty"`
+	AccountID            string   `protobuf:"bytes,1,opt,name=accountID,proto3" json:"accountID,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Register) Reset()         { *m = Register{} }
 func (m *Register) String() string { return proto.CompactTextString(m) }
 func (*Register) ProtoMessage()    {}
-func (*Register) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (*Register) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{2}
+}
+
+func (m *Register) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Register.Unmarshal(m, b)
+}
+func (m *Register) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Register.Marshal(b, m, deterministic)
+}
+func (m *Register) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Register.Merge(m, src)
+}
+func (m *Register) XXX_Size() int {
+	return xxx_messageInfo_Register.Size(m)
+}
+func (m *Register) XXX_DiscardUnknown() {
+	xxx_messageInfo_Register.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Register proto.InternalMessageInfo
 
 func (m *Register) GetAccountID() string {
 	if m != nil {
@@ -300,16 +227,39 @@ func (m *Register) GetAccountID() string {
 	return ""
 }
 
-// 重置公钥
+//重置公钥
 type ResetKey struct {
-	AccountID string `protobuf:"bytes,1,opt,name=accountID" json:"accountID,omitempty"`
-	Addr      string `protobuf:"bytes,2,opt,name=addr" json:"addr,omitempty"`
+	AccountID            string   `protobuf:"bytes,1,opt,name=accountID,proto3" json:"accountID,omitempty"`
+	Addr                 string   `protobuf:"bytes,2,opt,name=addr,proto3" json:"addr,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *ResetKey) Reset()         { *m = ResetKey{} }
 func (m *ResetKey) String() string { return proto.CompactTextString(m) }
 func (*ResetKey) ProtoMessage()    {}
-func (*ResetKey) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (*ResetKey) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{3}
+}
+
+func (m *ResetKey) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ResetKey.Unmarshal(m, b)
+}
+func (m *ResetKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ResetKey.Marshal(b, m, deterministic)
+}
+func (m *ResetKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResetKey.Merge(m, src)
+}
+func (m *ResetKey) XXX_Size() int {
+	return xxx_messageInfo_ResetKey.Size(m)
+}
+func (m *ResetKey) XXX_DiscardUnknown() {
+	xxx_messageInfo_ResetKey.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ResetKey proto.InternalMessageInfo
 
 func (m *ResetKey) GetAccountID() string {
 	if m != nil {
@@ -325,17 +275,40 @@ func (m *ResetKey) GetAddr() string {
 	return ""
 }
 
-// 用户申请服务
+//用户申请服务
 type Apply struct {
-	AccountID string `protobuf:"bytes,1,opt,name=accountID" json:"accountID,omitempty"`
-	// 操作， 1 撤销账户公钥重置, 2 锁定期结束后，执行重置公钥操作
-	Op int32 `protobuf:"varint,2,opt,name=op" json:"op,omitempty"`
+	AccountID string `protobuf:"bytes,1,opt,name=accountID,proto3" json:"accountID,omitempty"`
+	//操作， 1 撤销账户公钥重置, 2 锁定期结束后，执行重置公钥操作
+	Op                   int32    `protobuf:"varint,2,opt,name=op,proto3" json:"op,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Apply) Reset()         { *m = Apply{} }
 func (m *Apply) String() string { return proto.CompactTextString(m) }
 func (*Apply) ProtoMessage()    {}
-func (*Apply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (*Apply) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{4}
+}
+
+func (m *Apply) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Apply.Unmarshal(m, b)
+}
+func (m *Apply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Apply.Marshal(b, m, deterministic)
+}
+func (m *Apply) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Apply.Merge(m, src)
+}
+func (m *Apply) XXX_Size() int {
+	return xxx_messageInfo_Apply.Size(m)
+}
+func (m *Apply) XXX_DiscardUnknown() {
+	xxx_messageInfo_Apply.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Apply proto.InternalMessageInfo
 
 func (m *Apply) GetAccountID() string {
 	if m != nil {
@@ -351,16 +324,39 @@ func (m *Apply) GetOp() int32 {
 	return 0
 }
 
-// 资产类型
+//资产类型
 type Asset struct {
-	Execer string `protobuf:"bytes,1,opt,name=execer" json:"execer,omitempty"`
-	Symbol string `protobuf:"bytes,2,opt,name=symbol" json:"symbol,omitempty"`
+	Execer               string   `protobuf:"bytes,1,opt,name=execer,proto3" json:"execer,omitempty"`
+	Symbol               string   `protobuf:"bytes,2,opt,name=symbol,proto3" json:"symbol,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Asset) Reset()         { *m = Asset{} }
 func (m *Asset) String() string { return proto.CompactTextString(m) }
 func (*Asset) ProtoMessage()    {}
-func (*Asset) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (*Asset) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{5}
+}
+
+func (m *Asset) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Asset.Unmarshal(m, b)
+}
+func (m *Asset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Asset.Marshal(b, m, deterministic)
+}
+func (m *Asset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Asset.Merge(m, src)
+}
+func (m *Asset) XXX_Size() int {
+	return xxx_messageInfo_Asset.Size(m)
+}
+func (m *Asset) XXX_DiscardUnknown() {
+	xxx_messageInfo_Asset.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Asset proto.InternalMessageInfo
 
 func (m *Asset) GetExecer() string {
 	if m != nil {
@@ -376,22 +372,45 @@ func (m *Asset) GetSymbol() string {
 	return ""
 }
 
-// 合约内部账户之间转账
+//合约内部账户之间转账
 type Transfer struct {
-	// 资产类型
-	Asset *Asset `protobuf:"bytes,1,opt,name=Asset" json:"Asset,omitempty"`
+	//资产类型
+	Asset *Asset `protobuf:"bytes,1,opt,name=Asset,proto3" json:"Asset,omitempty"`
 	// from账户
-	FromAccountID string `protobuf:"bytes,2,opt,name=fromAccountID" json:"fromAccountID,omitempty"`
+	FromAccountID string `protobuf:"bytes,2,opt,name=fromAccountID,proto3" json:"fromAccountID,omitempty"`
 	// to账户
-	ToAccountID string `protobuf:"bytes,3,opt,name=toAccountID" json:"toAccountID,omitempty"`
-	// 转账金额
-	Amount int64 `protobuf:"varint,4,opt,name=amount" json:"amount,omitempty"`
+	ToAccountID string `protobuf:"bytes,3,opt,name=toAccountID,proto3" json:"toAccountID,omitempty"`
+	//转账金额
+	Amount               int64    `protobuf:"varint,4,opt,name=amount,proto3" json:"amount,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Transfer) Reset()         { *m = Transfer{} }
 func (m *Transfer) String() string { return proto.CompactTextString(m) }
 func (*Transfer) ProtoMessage()    {}
-func (*Transfer) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (*Transfer) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{6}
+}
+
+func (m *Transfer) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Transfer.Unmarshal(m, b)
+}
+func (m *Transfer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Transfer.Marshal(b, m, deterministic)
+}
+func (m *Transfer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Transfer.Merge(m, src)
+}
+func (m *Transfer) XXX_Size() int {
+	return xxx_messageInfo_Transfer.Size(m)
+}
+func (m *Transfer) XXX_DiscardUnknown() {
+	xxx_messageInfo_Transfer.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Transfer proto.InternalMessageInfo
 
 func (m *Transfer) GetAsset() *Asset {
 	if m != nil {
@@ -421,20 +440,43 @@ func (m *Transfer) GetAmount() int64 {
 	return 0
 }
 
-// 管理员监管操作
+//管理员监管操作
 type Supervise struct {
-	// 账户名单
-	AccountIDs []string `protobuf:"bytes,1,rep,name=accountIDs" json:"accountIDs,omitempty"`
-	// 操作， 1为冻结，2为解冻，3增加有效期,4为授权
-	Op int32 `protobuf:"varint,2,opt,name=op" json:"op,omitempty"`
-	// 0普通,后面根据业务需要可以自定义，有管理员授予不同的权限
-	Level int32 `protobuf:"varint,3,opt,name=level" json:"level,omitempty"`
+	//账户名单
+	AccountIDs []string `protobuf:"bytes,1,rep,name=accountIDs,proto3" json:"accountIDs,omitempty"`
+	//操作， 1为冻结，2为解冻，3增加有效期,4为授权
+	Op int32 `protobuf:"varint,2,opt,name=op,proto3" json:"op,omitempty"`
+	//0普通,后面根据业务需要可以自定义，有管理员授予不同的权限
+	Level                int32    `protobuf:"varint,3,opt,name=level,proto3" json:"level,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Supervise) Reset()         { *m = Supervise{} }
 func (m *Supervise) String() string { return proto.CompactTextString(m) }
 func (*Supervise) ProtoMessage()    {}
-func (*Supervise) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (*Supervise) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{7}
+}
+
+func (m *Supervise) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Supervise.Unmarshal(m, b)
+}
+func (m *Supervise) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Supervise.Marshal(b, m, deterministic)
+}
+func (m *Supervise) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Supervise.Merge(m, src)
+}
+func (m *Supervise) XXX_Size() int {
+	return xxx_messageInfo_Supervise.Size(m)
+}
+func (m *Supervise) XXX_DiscardUnknown() {
+	xxx_messageInfo_Supervise.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Supervise proto.InternalMessageInfo
 
 func (m *Supervise) GetAccountIDs() []string {
 	if m != nil {
@@ -458,30 +500,53 @@ func (m *Supervise) GetLevel() int32 {
 }
 
 type Account struct {
-	// 账户名称
-	AccountID string `protobuf:"bytes,1,opt,name=accountID" json:"accountID,omitempty"`
-	// 地址
-	Addr string `protobuf:"bytes,2,opt,name=addr" json:"addr,omitempty"`
-	// 上一次公钥地址
-	PrevAddr string `protobuf:"bytes,3,opt,name=prevAddr" json:"prevAddr,omitempty"`
-	// 账户状态 0 正常， 1表示冻结, 2表示锁定 3,过期注销
-	Status int32 `protobuf:"varint,4,opt,name=status" json:"status,omitempty"`
-	// 等级权限 0普通,后面根据业务需要可以自定义，有管理员授予不同的权限
-	Level int32 `protobuf:"varint,5,opt,name=level" json:"level,omitempty"`
-	// 注册时间
-	CreateTime int64 `protobuf:"varint,6,opt,name=createTime" json:"createTime,omitempty"`
-	// 失效时间
-	ExpireTime int64 `protobuf:"varint,7,opt,name=expireTime" json:"expireTime,omitempty"`
-	// 锁定时间
-	LockTime int64 `protobuf:"varint,8,opt,name=lockTime" json:"lockTime,omitempty"`
-	// 主键索引
-	Index int64 `protobuf:"varint,9,opt,name=index" json:"index,omitempty"`
+	//账户名称
+	AccountID string `protobuf:"bytes,1,opt,name=accountID,proto3" json:"accountID,omitempty"`
+	//地址
+	Addr string `protobuf:"bytes,2,opt,name=addr,proto3" json:"addr,omitempty"`
+	//上一次公钥地址
+	PrevAddr string `protobuf:"bytes,3,opt,name=prevAddr,proto3" json:"prevAddr,omitempty"`
+	//账户状态 0 正常， 1表示冻结, 2表示锁定 3,过期注销
+	Status int32 `protobuf:"varint,4,opt,name=status,proto3" json:"status,omitempty"`
+	//等级权限 0普通,后面根据业务需要可以自定义，有管理员授予不同的权限
+	Level int32 `protobuf:"varint,5,opt,name=level,proto3" json:"level,omitempty"`
+	//注册时间
+	CreateTime int64 `protobuf:"varint,6,opt,name=createTime,proto3" json:"createTime,omitempty"`
+	//失效时间
+	ExpireTime int64 `protobuf:"varint,7,opt,name=expireTime,proto3" json:"expireTime,omitempty"`
+	//锁定时间
+	LockTime int64 `protobuf:"varint,8,opt,name=lockTime,proto3" json:"lockTime,omitempty"`
+	//主键索引
+	Index                int64    `protobuf:"varint,9,opt,name=index,proto3" json:"index,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Account) Reset()         { *m = Account{} }
 func (m *Account) String() string { return proto.CompactTextString(m) }
 func (*Account) ProtoMessage()    {}
-func (*Account) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (*Account) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{8}
+}
+
+func (m *Account) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Account.Unmarshal(m, b)
+}
+func (m *Account) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Account.Marshal(b, m, deterministic)
+}
+func (m *Account) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Account.Merge(m, src)
+}
+func (m *Account) XXX_Size() int {
+	return xxx_messageInfo_Account.Size(m)
+}
+func (m *Account) XXX_DiscardUnknown() {
+	xxx_messageInfo_Account.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Account proto.InternalMessageInfo
 
 func (m *Account) GetAccountID() string {
 	if m != nil {
@@ -547,13 +612,36 @@ func (m *Account) GetIndex() int64 {
 }
 
 type AccountReceipt struct {
-	Account *Account `protobuf:"bytes,1,opt,name=account" json:"account,omitempty"`
+	Account              *Account `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *AccountReceipt) Reset()         { *m = AccountReceipt{} }
 func (m *AccountReceipt) String() string { return proto.CompactTextString(m) }
 func (*AccountReceipt) ProtoMessage()    {}
-func (*AccountReceipt) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (*AccountReceipt) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{9}
+}
+
+func (m *AccountReceipt) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AccountReceipt.Unmarshal(m, b)
+}
+func (m *AccountReceipt) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AccountReceipt.Marshal(b, m, deterministic)
+}
+func (m *AccountReceipt) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AccountReceipt.Merge(m, src)
+}
+func (m *AccountReceipt) XXX_Size() int {
+	return xxx_messageInfo_AccountReceipt.Size(m)
+}
+func (m *AccountReceipt) XXX_DiscardUnknown() {
+	xxx_messageInfo_AccountReceipt.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AccountReceipt proto.InternalMessageInfo
 
 func (m *AccountReceipt) GetAccount() *Account {
 	if m != nil {
@@ -563,14 +651,37 @@ func (m *AccountReceipt) GetAccount() *Account {
 }
 
 type ReplyAccountList struct {
-	Accounts   []*Account `protobuf:"bytes,1,rep,name=accounts" json:"accounts,omitempty"`
-	PrimaryKey string     `protobuf:"bytes,2,opt,name=primaryKey" json:"primaryKey,omitempty"`
+	Accounts             []*Account `protobuf:"bytes,1,rep,name=accounts,proto3" json:"accounts,omitempty"`
+	PrimaryKey           string     `protobuf:"bytes,2,opt,name=primaryKey,proto3" json:"primaryKey,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
 func (m *ReplyAccountList) Reset()         { *m = ReplyAccountList{} }
 func (m *ReplyAccountList) String() string { return proto.CompactTextString(m) }
 func (*ReplyAccountList) ProtoMessage()    {}
-func (*ReplyAccountList) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (*ReplyAccountList) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{10}
+}
+
+func (m *ReplyAccountList) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReplyAccountList.Unmarshal(m, b)
+}
+func (m *ReplyAccountList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReplyAccountList.Marshal(b, m, deterministic)
+}
+func (m *ReplyAccountList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReplyAccountList.Merge(m, src)
+}
+func (m *ReplyAccountList) XXX_Size() int {
+	return xxx_messageInfo_ReplyAccountList.Size(m)
+}
+func (m *ReplyAccountList) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReplyAccountList.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReplyAccountList proto.InternalMessageInfo
 
 func (m *ReplyAccountList) GetAccounts() []*Account {
 	if m != nil {
@@ -587,15 +698,38 @@ func (m *ReplyAccountList) GetPrimaryKey() string {
 }
 
 type TransferReceipt struct {
-	FromAccount *Account `protobuf:"bytes,1,opt,name=FromAccount" json:"FromAccount,omitempty"`
-	ToAccount   *Account `protobuf:"bytes,2,opt,name=ToAccount" json:"ToAccount,omitempty"`
-	Index       int64    `protobuf:"varint,3,opt,name=index" json:"index,omitempty"`
+	FromAccount          *Account `protobuf:"bytes,1,opt,name=FromAccount,proto3" json:"FromAccount,omitempty"`
+	ToAccount            *Account `protobuf:"bytes,2,opt,name=ToAccount,proto3" json:"ToAccount,omitempty"`
+	Index                int64    `protobuf:"varint,3,opt,name=index,proto3" json:"index,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *TransferReceipt) Reset()         { *m = TransferReceipt{} }
 func (m *TransferReceipt) String() string { return proto.CompactTextString(m) }
 func (*TransferReceipt) ProtoMessage()    {}
-func (*TransferReceipt) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (*TransferReceipt) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{11}
+}
+
+func (m *TransferReceipt) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransferReceipt.Unmarshal(m, b)
+}
+func (m *TransferReceipt) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransferReceipt.Marshal(b, m, deterministic)
+}
+func (m *TransferReceipt) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferReceipt.Merge(m, src)
+}
+func (m *TransferReceipt) XXX_Size() int {
+	return xxx_messageInfo_TransferReceipt.Size(m)
+}
+func (m *TransferReceipt) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransferReceipt.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TransferReceipt proto.InternalMessageInfo
 
 func (m *TransferReceipt) GetFromAccount() *Account {
 	if m != nil {
@@ -618,17 +752,40 @@ func (m *TransferReceipt) GetIndex() int64 {
 	return 0
 }
 
-// 回执日志
+//回执日志
 type SuperviseReceipt struct {
-	Accounts []*Account `protobuf:"bytes,1,rep,name=accounts" json:"accounts,omitempty"`
-	Op       int32      `protobuf:"varint,2,opt,name=op" json:"op,omitempty"`
-	Index    int64      `protobuf:"varint,3,opt,name=index" json:"index,omitempty"`
+	Accounts             []*Account `protobuf:"bytes,1,rep,name=accounts,proto3" json:"accounts,omitempty"`
+	Op                   int32      `protobuf:"varint,2,opt,name=op,proto3" json:"op,omitempty"`
+	Index                int64      `protobuf:"varint,3,opt,name=index,proto3" json:"index,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
 func (m *SuperviseReceipt) Reset()         { *m = SuperviseReceipt{} }
 func (m *SuperviseReceipt) String() string { return proto.CompactTextString(m) }
 func (*SuperviseReceipt) ProtoMessage()    {}
-func (*SuperviseReceipt) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (*SuperviseReceipt) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{12}
+}
+
+func (m *SuperviseReceipt) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SuperviseReceipt.Unmarshal(m, b)
+}
+func (m *SuperviseReceipt) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SuperviseReceipt.Marshal(b, m, deterministic)
+}
+func (m *SuperviseReceipt) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SuperviseReceipt.Merge(m, src)
+}
+func (m *SuperviseReceipt) XXX_Size() int {
+	return xxx_messageInfo_SuperviseReceipt.Size(m)
+}
+func (m *SuperviseReceipt) XXX_DiscardUnknown() {
+	xxx_messageInfo_SuperviseReceipt.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SuperviseReceipt proto.InternalMessageInfo
 
 func (m *SuperviseReceipt) GetAccounts() []*Account {
 	if m != nil {
@@ -652,18 +809,41 @@ func (m *SuperviseReceipt) GetIndex() int64 {
 }
 
 type QueryExpiredAccounts struct {
-	PrimaryKey string `protobuf:"bytes,1,opt,name=primaryKey" json:"primaryKey,omitempty"`
-	// 第一次需要传入逾期时间，时间戳
-	ExpiredTime int64 `protobuf:"varint,2,opt,name=expiredTime" json:"expiredTime,omitempty"`
-	// 单页返回多少条记录，默认返回10条
+	PrimaryKey string `protobuf:"bytes,1,opt,name=primaryKey,proto3" json:"primaryKey,omitempty"`
+	//第一次需要传入逾期时间，时间戳
+	ExpiredTime int64 `protobuf:"varint,2,opt,name=expiredTime,proto3" json:"expiredTime,omitempty"`
+	//单页返回多少条记录，默认返回10条
 	// 0降序，1升序，默认降序
-	Direction int32 `protobuf:"varint,3,opt,name=direction" json:"direction,omitempty"`
+	Direction            int32    `protobuf:"varint,3,opt,name=direction,proto3" json:"direction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *QueryExpiredAccounts) Reset()         { *m = QueryExpiredAccounts{} }
 func (m *QueryExpiredAccounts) String() string { return proto.CompactTextString(m) }
 func (*QueryExpiredAccounts) ProtoMessage()    {}
-func (*QueryExpiredAccounts) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (*QueryExpiredAccounts) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{13}
+}
+
+func (m *QueryExpiredAccounts) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryExpiredAccounts.Unmarshal(m, b)
+}
+func (m *QueryExpiredAccounts) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryExpiredAccounts.Marshal(b, m, deterministic)
+}
+func (m *QueryExpiredAccounts) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryExpiredAccounts.Merge(m, src)
+}
+func (m *QueryExpiredAccounts) XXX_Size() int {
+	return xxx_messageInfo_QueryExpiredAccounts.Size(m)
+}
+func (m *QueryExpiredAccounts) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryExpiredAccounts.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryExpiredAccounts proto.InternalMessageInfo
 
 func (m *QueryExpiredAccounts) GetPrimaryKey() string {
 	if m != nil {
@@ -687,18 +867,41 @@ func (m *QueryExpiredAccounts) GetDirection() int32 {
 }
 
 type QueryAccountsByStatus struct {
-	// 账户状态 1 正常， 2表示冻结, 3表示锁定
-	Status int32 `protobuf:"varint,1,opt,name=status" json:"status,omitempty"`
+	//账户状态 1 正常， 2表示冻结, 3表示锁定
+	Status int32 `protobuf:"varint,1,opt,name=status,proto3" json:"status,omitempty"`
 	// 主键索引
-	PrimaryKey string `protobuf:"bytes,3,opt,name=primaryKey" json:"primaryKey,omitempty"`
+	PrimaryKey string `protobuf:"bytes,3,opt,name=primaryKey,proto3" json:"primaryKey,omitempty"`
 	// 0降序，1升序，默认降序
-	Direction int32 `protobuf:"varint,5,opt,name=direction" json:"direction,omitempty"`
+	Direction            int32    `protobuf:"varint,5,opt,name=direction,proto3" json:"direction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *QueryAccountsByStatus) Reset()         { *m = QueryAccountsByStatus{} }
 func (m *QueryAccountsByStatus) String() string { return proto.CompactTextString(m) }
 func (*QueryAccountsByStatus) ProtoMessage()    {}
-func (*QueryAccountsByStatus) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (*QueryAccountsByStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{14}
+}
+
+func (m *QueryAccountsByStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryAccountsByStatus.Unmarshal(m, b)
+}
+func (m *QueryAccountsByStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryAccountsByStatus.Marshal(b, m, deterministic)
+}
+func (m *QueryAccountsByStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryAccountsByStatus.Merge(m, src)
+}
+func (m *QueryAccountsByStatus) XXX_Size() int {
+	return xxx_messageInfo_QueryAccountsByStatus.Size(m)
+}
+func (m *QueryAccountsByStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryAccountsByStatus.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryAccountsByStatus proto.InternalMessageInfo
 
 func (m *QueryAccountsByStatus) GetStatus() int32 {
 	if m != nil {
@@ -722,13 +925,36 @@ func (m *QueryAccountsByStatus) GetDirection() int32 {
 }
 
 type QueryAccountByID struct {
-	AccountID string `protobuf:"bytes,1,opt,name=accountID" json:"accountID,omitempty"`
+	AccountID            string   `protobuf:"bytes,1,opt,name=accountID,proto3" json:"accountID,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *QueryAccountByID) Reset()         { *m = QueryAccountByID{} }
 func (m *QueryAccountByID) String() string { return proto.CompactTextString(m) }
 func (*QueryAccountByID) ProtoMessage()    {}
-func (*QueryAccountByID) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+func (*QueryAccountByID) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{15}
+}
+
+func (m *QueryAccountByID) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryAccountByID.Unmarshal(m, b)
+}
+func (m *QueryAccountByID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryAccountByID.Marshal(b, m, deterministic)
+}
+func (m *QueryAccountByID) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryAccountByID.Merge(m, src)
+}
+func (m *QueryAccountByID) XXX_Size() int {
+	return xxx_messageInfo_QueryAccountByID.Size(m)
+}
+func (m *QueryAccountByID) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryAccountByID.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryAccountByID proto.InternalMessageInfo
 
 func (m *QueryAccountByID) GetAccountID() string {
 	if m != nil {
@@ -738,13 +964,36 @@ func (m *QueryAccountByID) GetAccountID() string {
 }
 
 type QueryAccountByAddr struct {
-	Addr string `protobuf:"bytes,1,opt,name=addr" json:"addr,omitempty"`
+	Addr                 string   `protobuf:"bytes,1,opt,name=addr,proto3" json:"addr,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *QueryAccountByAddr) Reset()         { *m = QueryAccountByAddr{} }
 func (m *QueryAccountByAddr) String() string { return proto.CompactTextString(m) }
 func (*QueryAccountByAddr) ProtoMessage()    {}
-func (*QueryAccountByAddr) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (*QueryAccountByAddr) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{16}
+}
+
+func (m *QueryAccountByAddr) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryAccountByAddr.Unmarshal(m, b)
+}
+func (m *QueryAccountByAddr) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryAccountByAddr.Marshal(b, m, deterministic)
+}
+func (m *QueryAccountByAddr) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryAccountByAddr.Merge(m, src)
+}
+func (m *QueryAccountByAddr) XXX_Size() int {
+	return xxx_messageInfo_QueryAccountByAddr.Size(m)
+}
+func (m *QueryAccountByAddr) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryAccountByAddr.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryAccountByAddr proto.InternalMessageInfo
 
 func (m *QueryAccountByAddr) GetAddr() string {
 	if m != nil {
@@ -754,14 +1003,37 @@ func (m *QueryAccountByAddr) GetAddr() string {
 }
 
 type QueryBalanceByID struct {
-	AccountID string `protobuf:"bytes,1,opt,name=accountID" json:"accountID,omitempty"`
-	Asset     *Asset `protobuf:"bytes,2,opt,name=asset" json:"asset,omitempty"`
+	AccountID            string   `protobuf:"bytes,1,opt,name=accountID,proto3" json:"accountID,omitempty"`
+	Asset                *Asset   `protobuf:"bytes,2,opt,name=asset,proto3" json:"asset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *QueryBalanceByID) Reset()         { *m = QueryBalanceByID{} }
 func (m *QueryBalanceByID) String() string { return proto.CompactTextString(m) }
 func (*QueryBalanceByID) ProtoMessage()    {}
-func (*QueryBalanceByID) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (*QueryBalanceByID) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{17}
+}
+
+func (m *QueryBalanceByID) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryBalanceByID.Unmarshal(m, b)
+}
+func (m *QueryBalanceByID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryBalanceByID.Marshal(b, m, deterministic)
+}
+func (m *QueryBalanceByID) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryBalanceByID.Merge(m, src)
+}
+func (m *QueryBalanceByID) XXX_Size() int {
+	return xxx_messageInfo_QueryBalanceByID.Size(m)
+}
+func (m *QueryBalanceByID) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryBalanceByID.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryBalanceByID proto.InternalMessageInfo
 
 func (m *QueryBalanceByID) GetAccountID() string {
 	if m != nil {
@@ -778,14 +1050,37 @@ func (m *QueryBalanceByID) GetAsset() *Asset {
 }
 
 type Balance struct {
-	Balance int64 `protobuf:"varint,1,opt,name=balance" json:"balance,omitempty"`
-	Frozen  int64 `protobuf:"varint,2,opt,name=frozen" json:"frozen,omitempty"`
+	Balance              int64    `protobuf:"varint,1,opt,name=balance,proto3" json:"balance,omitempty"`
+	Frozen               int64    `protobuf:"varint,2,opt,name=frozen,proto3" json:"frozen,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Balance) Reset()         { *m = Balance{} }
 func (m *Balance) String() string { return proto.CompactTextString(m) }
 func (*Balance) ProtoMessage()    {}
-func (*Balance) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+func (*Balance) Descriptor() ([]byte, []int) {
+	return fileDescriptor_aba6db06a1aaf83a, []int{18}
+}
+
+func (m *Balance) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Balance.Unmarshal(m, b)
+}
+func (m *Balance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Balance.Marshal(b, m, deterministic)
+}
+func (m *Balance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Balance.Merge(m, src)
+}
+func (m *Balance) XXX_Size() int {
+	return xxx_messageInfo_Balance.Size(m)
+}
+func (m *Balance) XXX_DiscardUnknown() {
+	xxx_messageInfo_Balance.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Balance proto.InternalMessageInfo
 
 func (m *Balance) GetBalance() int64 {
 	if m != nil {
@@ -823,47 +1118,11 @@ func init() {
 	proto.RegisterType((*Balance)(nil), "types.balance")
 }
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// Client API for Accountmanager service
-
-type AccountmanagerClient interface {
-}
-
-type accountmanagerClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewAccountmanagerClient(cc *grpc.ClientConn) AccountmanagerClient {
-	return &accountmanagerClient{cc}
-}
-
-// Server API for Accountmanager service
-
-type AccountmanagerServer interface {
-}
-
-func RegisterAccountmanagerServer(s *grpc.Server, srv AccountmanagerServer) {
-	s.RegisterService(&_Accountmanager_serviceDesc, srv)
-}
-
-var _Accountmanager_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "types.accountmanager",
-	HandlerType: (*AccountmanagerServer)(nil),
-	Methods:     []grpc.MethodDesc{},
-	Streams:     []grpc.StreamDesc{},
-	Metadata:    "accountmanager.proto",
+func init() {
+	proto.RegisterFile("accountmanager.proto", fileDescriptor_aba6db06a1aaf83a)
 }
 
-func init() { proto.RegisterFile("accountmanager.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
+var fileDescriptor_aba6db06a1aaf83a = []byte{
 	// 731 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x4d, 0x6b, 0xdb, 0x4c,
 	0x10, 0x8e, 0xac, 0xc8, 0xb6, 0x26, 0xef, 0xeb, 0x98, 0xc5, 0x0d, 0xa2, 0x94, 0x62, 0x96, 0x1c,
@@ -912,3 +1171,45 @@ var fileDescriptor0 = []byte{
 	0xb0, 0xd2, 0xc9, 0x10, 0x06, 0xed, 0xff, 0xeb, 0x55, 0x97, 0x7e, 0xb0, 0xaf, 0xff, 0x04, 0x00,
 	0x00, 0xff, 0xff, 0x84, 0x94, 0xab, 0xf2, 0x78, 0x07, 0x00, 0x00,
 }
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConnInterface
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion6
+
+// AccountmanagerClient is the client API for Accountmanager service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type AccountmanagerClient interface {
+}
+
+type accountmanagerClient struct {
+	cc grpc.ClientConnInterface
+}
+
+func NewAccountmanagerClient(cc grpc.ClientConnInterface) AccountmanagerClient {
+	return &accountmanagerClient{cc}
+}
+
+// AccountmanagerServer is the server API for Accountmanager service.
+type AccountmanagerServer interface {
+}
+
+// UnimplementedAccountmanagerServer can be embedded to have forward compatible implementations.
+type UnimplementedAccountmanagerServer struct {
+}
+
+func RegisterAccountmanagerServer(s *grpc.Server, srv AccountmanagerServer) {
+	s.RegisterService(&_Accountmanager_serviceDesc, srv)
+}
+
+var _Accountmanager_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "types.accountmanager",
+	HandlerType: (*AccountmanagerServer)(nil),
+	Methods:     []grpc.MethodDesc{},
+	Streams:     []grpc.StreamDesc{},
+	Metadata:    "accountmanager.proto",
+}