diff --git a/chain/chainservice.go b/chain/chainservice.go
index 82a427cb8..7fbdc6138 100644
--- a/chain/chainservice.go
+++ b/chain/chainservice.go
@@ -23,7 +23,6 @@ import (
 	"github.com/aergoio/aergo/contract/name"
 	"github.com/aergoio/aergo/contract/system"
 	"github.com/aergoio/aergo/fee"
-	"github.com/aergoio/aergo/internal/common"
 	"github.com/aergoio/aergo/internal/enc"
 	"github.com/aergoio/aergo/message"
 	"github.com/aergoio/aergo/pkg/component"
@@ -781,8 +780,7 @@ func (cw *ChainWorker) Receive(context actor.Context) {
 		} else if contractProof.Inclusion {
 			contractTrieRoot := contractProof.State.StorageRoot
 			for _, storageKey := range msg.StorageKeys {
-				trieKey := common.Hasher([]byte(storageKey))
-				varProof, err := cw.sdb.GetStateDB().GetVarAndProof(trieKey, contractTrieRoot, msg.Compressed)
+				varProof, err := cw.sdb.GetStateDB().GetVarAndProof(storageKey, contractTrieRoot, msg.Compressed)
 				varProof.Key = storageKey
 				varProofs = append(varProofs, varProof)
 				if err != nil {
diff --git a/cmd/aergocli/cmd/contract.go b/cmd/aergocli/cmd/contract.go
index 7ea7b17df..afb44ce3a 100644
--- a/cmd/aergocli/cmd/contract.go
+++ b/cmd/aergocli/cmd/contract.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/aergoio/aergo/cmd/aergocli/util"
 	luacEncoding "github.com/aergoio/aergo/cmd/aergoluac/encoding"
+	"github.com/aergoio/aergo/internal/common"
 	"github.com/aergoio/aergo/types"
 	"github.com/mr-tron/base58/base58"
 	"github.com/spf13/cobra"
@@ -33,10 +34,10 @@ func init() {
 	}
 
 	deployCmd := &cobra.Command{
-		Use:   "deploy [flags] --payload 'payload string' creator\n  aergocli contract deploy [flags] creator bcfile abifile",
-		Short: "Deploy a compiled contract to the server",
-		Args:  cobra.MinimumNArgs(1),
-		Run:   runDeployCmd,
+		Use:                   "deploy [flags] --payload 'payload string' creator\n  aergocli contract deploy [flags] creator bcfile abifile",
+		Short:                 "Deploy a compiled contract to the server",
+		Args:                  cobra.MinimumNArgs(1),
+		Run:                   runDeployCmd,
 		DisableFlagsInUseLine: true,
 	}
 	deployCmd.PersistentFlags().StringVar(&data, "payload", "", "result of compiling a contract")
@@ -328,15 +329,16 @@ func runQueryStateCmd(cmd *cobra.Command, args []string) {
 			return
 		}
 	}
-	storageKey := bytes.NewBufferString("_sv_")
-	storageKey.WriteString(args[1])
+	storageKeyPlain := bytes.NewBufferString("_sv_")
+	storageKeyPlain.WriteString(args[1])
 	if len(args) > 2 {
-		storageKey.WriteString("-")
-		storageKey.WriteString(args[2])
+		storageKeyPlain.WriteString("-")
+		storageKeyPlain.WriteString(args[2])
 	}
+	storageKey := common.Hasher([]byte(storageKeyPlain.Bytes()))
 	stateQuery := &types.StateQuery{
 		ContractAddress: contract,
-		StorageKeys:     []string{storageKey.String()},
+		StorageKeys:     [][]byte{storageKey},
 		Root:            root,
 		Compressed:      compressed,
 	}
diff --git a/message/blockchainmsg.go b/message/blockchainmsg.go
index 5b8dbc971..da9077dc8 100644
--- a/message/blockchainmsg.go
+++ b/message/blockchainmsg.go
@@ -96,7 +96,7 @@ type GetQueryRsp struct {
 }
 type GetStateQuery struct {
 	ContractAddress []byte
-	StorageKeys     []string
+	StorageKeys     [][]byte
 	Root            []byte
 	Compressed      bool
 }
diff --git a/types/account.pb.go b/types/account.pb.go
index ba328915a..aba8c2850 100644
--- a/types/account.pb.go
+++ b/types/account.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: account.proto
 
-package types
+package types // import "github.com/aergoio/aergo/types"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -29,7 +29,7 @@ func (m *Account) Reset()         { *m = Account{} }
 func (m *Account) String() string { return proto.CompactTextString(m) }
 func (*Account) ProtoMessage()    {}
 func (*Account) Descriptor() ([]byte, []int) {
-	return fileDescriptor_8e28828dcb8d24f0, []int{0}
+	return fileDescriptor_account_e24eda885a5c6a02, []int{0}
 }
 func (m *Account) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Account.Unmarshal(m, b)
@@ -37,8 +37,8 @@ func (m *Account) XXX_Unmarshal(b []byte) error {
 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 (dst *Account) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Account.Merge(dst, src)
 }
 func (m *Account) XXX_Size() int {
 	return xxx_messageInfo_Account.Size(m)
@@ -57,7 +57,7 @@ func (m *Account) GetAddress() []byte {
 }
 
 type AccountList struct {
-	Accounts             []*Account `protobuf:"bytes,1,rep,name=accounts,proto3" json:"accounts,omitempty"`
+	Accounts             []*Account `protobuf:"bytes,1,rep,name=accounts" json:"accounts,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
 	XXX_unrecognized     []byte     `json:"-"`
 	XXX_sizecache        int32      `json:"-"`
@@ -67,7 +67,7 @@ func (m *AccountList) Reset()         { *m = AccountList{} }
 func (m *AccountList) String() string { return proto.CompactTextString(m) }
 func (*AccountList) ProtoMessage()    {}
 func (*AccountList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_8e28828dcb8d24f0, []int{1}
+	return fileDescriptor_account_e24eda885a5c6a02, []int{1}
 }
 func (m *AccountList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountList.Unmarshal(m, b)
@@ -75,8 +75,8 @@ func (m *AccountList) XXX_Unmarshal(b []byte) error {
 func (m *AccountList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AccountList.Marshal(b, m, deterministic)
 }
-func (m *AccountList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AccountList.Merge(m, src)
+func (dst *AccountList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AccountList.Merge(dst, src)
 }
 func (m *AccountList) XXX_Size() int {
 	return xxx_messageInfo_AccountList.Size(m)
@@ -99,9 +99,9 @@ func init() {
 	proto.RegisterType((*AccountList)(nil), "types.AccountList")
 }
 
-func init() { proto.RegisterFile("account.proto", fileDescriptor_8e28828dcb8d24f0) }
+func init() { proto.RegisterFile("account.proto", fileDescriptor_account_e24eda885a5c6a02) }
 
-var fileDescriptor_8e28828dcb8d24f0 = []byte{
+var fileDescriptor_account_e24eda885a5c6a02 = []byte{
 	// 137 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4d, 0x4c, 0x4e, 0xce,
 	0x2f, 0xcd, 0x2b, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2d, 0xa9, 0x2c, 0x48, 0x2d,
diff --git a/types/blockchain.pb.go b/types/blockchain.pb.go
index 539ef39e1..e27dd1711 100644
--- a/types/blockchain.pb.go
+++ b/types/blockchain.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: blockchain.proto
 
-package types
+package types // import "github.com/aergoio/aergo/types"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -23,30 +23,31 @@ type TxType int32
 const (
 	TxType_NORMAL     TxType = 0
 	TxType_GOVERNANCE TxType = 1
+	TxType_REDEPLOY   TxType = 2
 )
 
 var TxType_name = map[int32]string{
 	0: "NORMAL",
 	1: "GOVERNANCE",
+	2: "REDEPLOY",
 }
-
 var TxType_value = map[string]int32{
 	"NORMAL":     0,
 	"GOVERNANCE": 1,
+	"REDEPLOY":   2,
 }
 
 func (x TxType) String() string {
 	return proto.EnumName(TxType_name, int32(x))
 }
-
 func (TxType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{0}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{0}
 }
 
 type Block struct {
 	Hash                 []byte       `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"`
-	Header               *BlockHeader `protobuf:"bytes,2,opt,name=header,proto3" json:"header,omitempty"`
-	Body                 *BlockBody   `protobuf:"bytes,3,opt,name=body,proto3" json:"body,omitempty"`
+	Header               *BlockHeader `protobuf:"bytes,2,opt,name=header" json:"header,omitempty"`
+	Body                 *BlockBody   `protobuf:"bytes,3,opt,name=body" json:"body,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -56,7 +57,7 @@ func (m *Block) Reset()         { *m = Block{} }
 func (m *Block) String() string { return proto.CompactTextString(m) }
 func (*Block) ProtoMessage()    {}
 func (*Block) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{0}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{0}
 }
 func (m *Block) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Block.Unmarshal(m, b)
@@ -64,8 +65,8 @@ func (m *Block) XXX_Unmarshal(b []byte) error {
 func (m *Block) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Block.Marshal(b, m, deterministic)
 }
-func (m *Block) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Block.Merge(m, src)
+func (dst *Block) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Block.Merge(dst, src)
 }
 func (m *Block) XXX_Size() int {
 	return xxx_messageInfo_Block.Size(m)
@@ -100,12 +101,12 @@ func (m *Block) GetBody() *BlockBody {
 type BlockHeader struct {
 	ChainID              []byte   `protobuf:"bytes,1,opt,name=chainID,proto3" json:"chainID,omitempty"`
 	PrevBlockHash        []byte   `protobuf:"bytes,2,opt,name=prevBlockHash,proto3" json:"prevBlockHash,omitempty"`
-	BlockNo              uint64   `protobuf:"varint,3,opt,name=blockNo,proto3" json:"blockNo,omitempty"`
-	Timestamp            int64    `protobuf:"varint,4,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+	BlockNo              uint64   `protobuf:"varint,3,opt,name=blockNo" json:"blockNo,omitempty"`
+	Timestamp            int64    `protobuf:"varint,4,opt,name=timestamp" json:"timestamp,omitempty"`
 	BlocksRootHash       []byte   `protobuf:"bytes,5,opt,name=blocksRootHash,proto3" json:"blocksRootHash,omitempty"`
 	TxsRootHash          []byte   `protobuf:"bytes,6,opt,name=txsRootHash,proto3" json:"txsRootHash,omitempty"`
 	ReceiptsRootHash     []byte   `protobuf:"bytes,7,opt,name=receiptsRootHash,proto3" json:"receiptsRootHash,omitempty"`
-	Confirms             uint64   `protobuf:"varint,8,opt,name=confirms,proto3" json:"confirms,omitempty"`
+	Confirms             uint64   `protobuf:"varint,8,opt,name=confirms" json:"confirms,omitempty"`
 	PubKey               []byte   `protobuf:"bytes,9,opt,name=pubKey,proto3" json:"pubKey,omitempty"`
 	CoinbaseAccount      []byte   `protobuf:"bytes,10,opt,name=coinbaseAccount,proto3" json:"coinbaseAccount,omitempty"`
 	Sign                 []byte   `protobuf:"bytes,11,opt,name=sign,proto3" json:"sign,omitempty"`
@@ -118,7 +119,7 @@ func (m *BlockHeader) Reset()         { *m = BlockHeader{} }
 func (m *BlockHeader) String() string { return proto.CompactTextString(m) }
 func (*BlockHeader) ProtoMessage()    {}
 func (*BlockHeader) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{1}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{1}
 }
 func (m *BlockHeader) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BlockHeader.Unmarshal(m, b)
@@ -126,8 +127,8 @@ func (m *BlockHeader) XXX_Unmarshal(b []byte) error {
 func (m *BlockHeader) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BlockHeader.Marshal(b, m, deterministic)
 }
-func (m *BlockHeader) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BlockHeader.Merge(m, src)
+func (dst *BlockHeader) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BlockHeader.Merge(dst, src)
 }
 func (m *BlockHeader) XXX_Size() int {
 	return xxx_messageInfo_BlockHeader.Size(m)
@@ -216,7 +217,7 @@ func (m *BlockHeader) GetSign() []byte {
 }
 
 type BlockBody struct {
-	Txs                  []*Tx    `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"`
+	Txs                  []*Tx    `protobuf:"bytes,1,rep,name=txs" json:"txs,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -226,7 +227,7 @@ func (m *BlockBody) Reset()         { *m = BlockBody{} }
 func (m *BlockBody) String() string { return proto.CompactTextString(m) }
 func (*BlockBody) ProtoMessage()    {}
 func (*BlockBody) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{2}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{2}
 }
 func (m *BlockBody) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BlockBody.Unmarshal(m, b)
@@ -234,8 +235,8 @@ func (m *BlockBody) XXX_Unmarshal(b []byte) error {
 func (m *BlockBody) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BlockBody.Marshal(b, m, deterministic)
 }
-func (m *BlockBody) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BlockBody.Merge(m, src)
+func (dst *BlockBody) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BlockBody.Merge(dst, src)
 }
 func (m *BlockBody) XXX_Size() int {
 	return xxx_messageInfo_BlockBody.Size(m)
@@ -254,7 +255,7 @@ func (m *BlockBody) GetTxs() []*Tx {
 }
 
 type TxList struct {
-	Txs                  []*Tx    `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"`
+	Txs                  []*Tx    `protobuf:"bytes,1,rep,name=txs" json:"txs,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -264,7 +265,7 @@ func (m *TxList) Reset()         { *m = TxList{} }
 func (m *TxList) String() string { return proto.CompactTextString(m) }
 func (*TxList) ProtoMessage()    {}
 func (*TxList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{3}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{3}
 }
 func (m *TxList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TxList.Unmarshal(m, b)
@@ -272,8 +273,8 @@ func (m *TxList) XXX_Unmarshal(b []byte) error {
 func (m *TxList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TxList.Marshal(b, m, deterministic)
 }
-func (m *TxList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TxList.Merge(m, src)
+func (dst *TxList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TxList.Merge(dst, src)
 }
 func (m *TxList) XXX_Size() int {
 	return xxx_messageInfo_TxList.Size(m)
@@ -293,7 +294,7 @@ func (m *TxList) GetTxs() []*Tx {
 
 type Tx struct {
 	Hash                 []byte   `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"`
-	Body                 *TxBody  `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"`
+	Body                 *TxBody  `protobuf:"bytes,2,opt,name=body" json:"body,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -303,7 +304,7 @@ func (m *Tx) Reset()         { *m = Tx{} }
 func (m *Tx) String() string { return proto.CompactTextString(m) }
 func (*Tx) ProtoMessage()    {}
 func (*Tx) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{4}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{4}
 }
 func (m *Tx) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Tx.Unmarshal(m, b)
@@ -311,8 +312,8 @@ func (m *Tx) XXX_Unmarshal(b []byte) error {
 func (m *Tx) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Tx.Marshal(b, m, deterministic)
 }
-func (m *Tx) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Tx.Merge(m, src)
+func (dst *Tx) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Tx.Merge(dst, src)
 }
 func (m *Tx) XXX_Size() int {
 	return xxx_messageInfo_Tx.Size(m)
@@ -338,14 +339,14 @@ func (m *Tx) GetBody() *TxBody {
 }
 
 type TxBody struct {
-	Nonce                uint64   `protobuf:"varint,1,opt,name=nonce,proto3" json:"nonce,omitempty"`
+	Nonce                uint64   `protobuf:"varint,1,opt,name=nonce" json:"nonce,omitempty"`
 	Account              []byte   `protobuf:"bytes,2,opt,name=account,proto3" json:"account,omitempty"`
 	Recipient            []byte   `protobuf:"bytes,3,opt,name=recipient,proto3" json:"recipient,omitempty"`
 	Amount               []byte   `protobuf:"bytes,4,opt,name=amount,proto3" json:"amount,omitempty"`
 	Payload              []byte   `protobuf:"bytes,5,opt,name=payload,proto3" json:"payload,omitempty"`
-	GasLimit             uint64   `protobuf:"varint,6,opt,name=gasLimit,proto3" json:"gasLimit,omitempty"`
+	GasLimit             uint64   `protobuf:"varint,6,opt,name=gasLimit" json:"gasLimit,omitempty"`
 	GasPrice             []byte   `protobuf:"bytes,7,opt,name=gasPrice,proto3" json:"gasPrice,omitempty"`
-	Type                 TxType   `protobuf:"varint,8,opt,name=type,proto3,enum=types.TxType" json:"type,omitempty"`
+	Type                 TxType   `protobuf:"varint,8,opt,name=type,enum=types.TxType" json:"type,omitempty"`
 	ChainIdHash          []byte   `protobuf:"bytes,9,opt,name=chainIdHash,proto3" json:"chainIdHash,omitempty"`
 	Sign                 []byte   `protobuf:"bytes,10,opt,name=sign,proto3" json:"sign,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -357,7 +358,7 @@ func (m *TxBody) Reset()         { *m = TxBody{} }
 func (m *TxBody) String() string { return proto.CompactTextString(m) }
 func (*TxBody) ProtoMessage()    {}
 func (*TxBody) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{5}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{5}
 }
 func (m *TxBody) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TxBody.Unmarshal(m, b)
@@ -365,8 +366,8 @@ func (m *TxBody) XXX_Unmarshal(b []byte) error {
 func (m *TxBody) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TxBody.Marshal(b, m, deterministic)
 }
-func (m *TxBody) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TxBody.Merge(m, src)
+func (dst *TxBody) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TxBody.Merge(dst, src)
 }
 func (m *TxBody) XXX_Size() int {
 	return xxx_messageInfo_TxBody.Size(m)
@@ -450,7 +451,7 @@ func (m *TxBody) GetSign() []byte {
 // TxIdx specifies a transaction's block hash and index within the block body
 type TxIdx struct {
 	BlockHash            []byte   `protobuf:"bytes,1,opt,name=blockHash,proto3" json:"blockHash,omitempty"`
-	Idx                  int32    `protobuf:"varint,2,opt,name=idx,proto3" json:"idx,omitempty"`
+	Idx                  int32    `protobuf:"varint,2,opt,name=idx" json:"idx,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -460,7 +461,7 @@ func (m *TxIdx) Reset()         { *m = TxIdx{} }
 func (m *TxIdx) String() string { return proto.CompactTextString(m) }
 func (*TxIdx) ProtoMessage()    {}
 func (*TxIdx) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{6}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{6}
 }
 func (m *TxIdx) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TxIdx.Unmarshal(m, b)
@@ -468,8 +469,8 @@ func (m *TxIdx) XXX_Unmarshal(b []byte) error {
 func (m *TxIdx) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TxIdx.Marshal(b, m, deterministic)
 }
-func (m *TxIdx) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TxIdx.Merge(m, src)
+func (dst *TxIdx) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TxIdx.Merge(dst, src)
 }
 func (m *TxIdx) XXX_Size() int {
 	return xxx_messageInfo_TxIdx.Size(m)
@@ -495,8 +496,8 @@ func (m *TxIdx) GetIdx() int32 {
 }
 
 type TxInBlock struct {
-	TxIdx                *TxIdx   `protobuf:"bytes,1,opt,name=txIdx,proto3" json:"txIdx,omitempty"`
-	Tx                   *Tx      `protobuf:"bytes,2,opt,name=tx,proto3" json:"tx,omitempty"`
+	TxIdx                *TxIdx   `protobuf:"bytes,1,opt,name=txIdx" json:"txIdx,omitempty"`
+	Tx                   *Tx      `protobuf:"bytes,2,opt,name=tx" json:"tx,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -506,7 +507,7 @@ func (m *TxInBlock) Reset()         { *m = TxInBlock{} }
 func (m *TxInBlock) String() string { return proto.CompactTextString(m) }
 func (*TxInBlock) ProtoMessage()    {}
 func (*TxInBlock) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{7}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{7}
 }
 func (m *TxInBlock) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TxInBlock.Unmarshal(m, b)
@@ -514,8 +515,8 @@ func (m *TxInBlock) XXX_Unmarshal(b []byte) error {
 func (m *TxInBlock) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TxInBlock.Marshal(b, m, deterministic)
 }
-func (m *TxInBlock) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TxInBlock.Merge(m, src)
+func (dst *TxInBlock) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TxInBlock.Merge(dst, src)
 }
 func (m *TxInBlock) XXX_Size() int {
 	return xxx_messageInfo_TxInBlock.Size(m)
@@ -541,11 +542,11 @@ func (m *TxInBlock) GetTx() *Tx {
 }
 
 type State struct {
-	Nonce                uint64   `protobuf:"varint,1,opt,name=nonce,proto3" json:"nonce,omitempty"`
+	Nonce                uint64   `protobuf:"varint,1,opt,name=nonce" json:"nonce,omitempty"`
 	Balance              []byte   `protobuf:"bytes,2,opt,name=balance,proto3" json:"balance,omitempty"`
 	CodeHash             []byte   `protobuf:"bytes,3,opt,name=codeHash,proto3" json:"codeHash,omitempty"`
 	StorageRoot          []byte   `protobuf:"bytes,4,opt,name=storageRoot,proto3" json:"storageRoot,omitempty"`
-	SqlRecoveryPoint     uint64   `protobuf:"varint,5,opt,name=sqlRecoveryPoint,proto3" json:"sqlRecoveryPoint,omitempty"`
+	SqlRecoveryPoint     uint64   `protobuf:"varint,5,opt,name=sqlRecoveryPoint" json:"sqlRecoveryPoint,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -555,7 +556,7 @@ func (m *State) Reset()         { *m = State{} }
 func (m *State) String() string { return proto.CompactTextString(m) }
 func (*State) ProtoMessage()    {}
 func (*State) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{8}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{8}
 }
 func (m *State) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_State.Unmarshal(m, b)
@@ -563,8 +564,8 @@ func (m *State) XXX_Unmarshal(b []byte) error {
 func (m *State) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_State.Marshal(b, m, deterministic)
 }
-func (m *State) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_State.Merge(m, src)
+func (dst *State) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_State.Merge(dst, src)
 }
 func (m *State) XXX_Size() int {
 	return xxx_messageInfo_State.Size(m)
@@ -611,13 +612,13 @@ func (m *State) GetSqlRecoveryPoint() uint64 {
 }
 
 type AccountProof struct {
-	State                *State   `protobuf:"bytes,1,opt,name=state,proto3" json:"state,omitempty"`
-	Inclusion            bool     `protobuf:"varint,2,opt,name=inclusion,proto3" json:"inclusion,omitempty"`
+	State                *State   `protobuf:"bytes,1,opt,name=state" json:"state,omitempty"`
+	Inclusion            bool     `protobuf:"varint,2,opt,name=inclusion" json:"inclusion,omitempty"`
 	Key                  []byte   `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`
 	ProofKey             []byte   `protobuf:"bytes,4,opt,name=proofKey,proto3" json:"proofKey,omitempty"`
 	ProofVal             []byte   `protobuf:"bytes,5,opt,name=proofVal,proto3" json:"proofVal,omitempty"`
 	Bitmap               []byte   `protobuf:"bytes,6,opt,name=bitmap,proto3" json:"bitmap,omitempty"`
-	Height               uint32   `protobuf:"varint,7,opt,name=height,proto3" json:"height,omitempty"`
+	Height               uint32   `protobuf:"varint,7,opt,name=height" json:"height,omitempty"`
 	AuditPath            [][]byte `protobuf:"bytes,8,rep,name=auditPath,proto3" json:"auditPath,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -628,7 +629,7 @@ func (m *AccountProof) Reset()         { *m = AccountProof{} }
 func (m *AccountProof) String() string { return proto.CompactTextString(m) }
 func (*AccountProof) ProtoMessage()    {}
 func (*AccountProof) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{9}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{9}
 }
 func (m *AccountProof) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountProof.Unmarshal(m, b)
@@ -636,8 +637,8 @@ func (m *AccountProof) XXX_Unmarshal(b []byte) error {
 func (m *AccountProof) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AccountProof.Marshal(b, m, deterministic)
 }
-func (m *AccountProof) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AccountProof.Merge(m, src)
+func (dst *AccountProof) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AccountProof.Merge(dst, src)
 }
 func (m *AccountProof) XXX_Size() int {
 	return xxx_messageInfo_AccountProof.Size(m)
@@ -706,13 +707,13 @@ func (m *AccountProof) GetAuditPath() [][]byte {
 
 type ContractVarProof struct {
 	Value                []byte   `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
-	Inclusion            bool     `protobuf:"varint,2,opt,name=inclusion,proto3" json:"inclusion,omitempty"`
-	Key                  string   `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`
+	Inclusion            bool     `protobuf:"varint,2,opt,name=inclusion" json:"inclusion,omitempty"`
 	ProofKey             []byte   `protobuf:"bytes,4,opt,name=proofKey,proto3" json:"proofKey,omitempty"`
 	ProofVal             []byte   `protobuf:"bytes,5,opt,name=proofVal,proto3" json:"proofVal,omitempty"`
 	Bitmap               []byte   `protobuf:"bytes,6,opt,name=bitmap,proto3" json:"bitmap,omitempty"`
-	Height               uint32   `protobuf:"varint,7,opt,name=height,proto3" json:"height,omitempty"`
+	Height               uint32   `protobuf:"varint,7,opt,name=height" json:"height,omitempty"`
 	AuditPath            [][]byte `protobuf:"bytes,8,rep,name=auditPath,proto3" json:"auditPath,omitempty"`
+	Key                  []byte   `protobuf:"bytes,9,opt,name=key,proto3" json:"key,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -722,7 +723,7 @@ func (m *ContractVarProof) Reset()         { *m = ContractVarProof{} }
 func (m *ContractVarProof) String() string { return proto.CompactTextString(m) }
 func (*ContractVarProof) ProtoMessage()    {}
 func (*ContractVarProof) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{10}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{10}
 }
 func (m *ContractVarProof) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ContractVarProof.Unmarshal(m, b)
@@ -730,8 +731,8 @@ func (m *ContractVarProof) XXX_Unmarshal(b []byte) error {
 func (m *ContractVarProof) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ContractVarProof.Marshal(b, m, deterministic)
 }
-func (m *ContractVarProof) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ContractVarProof.Merge(m, src)
+func (dst *ContractVarProof) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContractVarProof.Merge(dst, src)
 }
 func (m *ContractVarProof) XXX_Size() int {
 	return xxx_messageInfo_ContractVarProof.Size(m)
@@ -756,13 +757,6 @@ func (m *ContractVarProof) GetInclusion() bool {
 	return false
 }
 
-func (m *ContractVarProof) GetKey() string {
-	if m != nil {
-		return m.Key
-	}
-	return ""
-}
-
 func (m *ContractVarProof) GetProofKey() []byte {
 	if m != nil {
 		return m.ProofKey
@@ -798,9 +792,16 @@ func (m *ContractVarProof) GetAuditPath() [][]byte {
 	return nil
 }
 
+func (m *ContractVarProof) GetKey() []byte {
+	if m != nil {
+		return m.Key
+	}
+	return nil
+}
+
 type StateQueryProof struct {
-	ContractProof        *AccountProof       `protobuf:"bytes,1,opt,name=contractProof,proto3" json:"contractProof,omitempty"`
-	VarProofs            []*ContractVarProof `protobuf:"bytes,2,rep,name=varProofs,proto3" json:"varProofs,omitempty"`
+	ContractProof        *AccountProof       `protobuf:"bytes,1,opt,name=contractProof" json:"contractProof,omitempty"`
+	VarProofs            []*ContractVarProof `protobuf:"bytes,2,rep,name=varProofs" json:"varProofs,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
 	XXX_unrecognized     []byte              `json:"-"`
 	XXX_sizecache        int32               `json:"-"`
@@ -810,7 +811,7 @@ func (m *StateQueryProof) Reset()         { *m = StateQueryProof{} }
 func (m *StateQueryProof) String() string { return proto.CompactTextString(m) }
 func (*StateQueryProof) ProtoMessage()    {}
 func (*StateQueryProof) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{11}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{11}
 }
 func (m *StateQueryProof) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StateQueryProof.Unmarshal(m, b)
@@ -818,8 +819,8 @@ func (m *StateQueryProof) XXX_Unmarshal(b []byte) error {
 func (m *StateQueryProof) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StateQueryProof.Marshal(b, m, deterministic)
 }
-func (m *StateQueryProof) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StateQueryProof.Merge(m, src)
+func (dst *StateQueryProof) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StateQueryProof.Merge(dst, src)
 }
 func (m *StateQueryProof) XXX_Size() int {
 	return xxx_messageInfo_StateQueryProof.Size(m)
@@ -846,16 +847,16 @@ func (m *StateQueryProof) GetVarProofs() []*ContractVarProof {
 
 type Receipt struct {
 	ContractAddress      []byte   `protobuf:"bytes,1,opt,name=contractAddress,proto3" json:"contractAddress,omitempty"`
-	Status               string   `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"`
-	Ret                  string   `protobuf:"bytes,3,opt,name=ret,proto3" json:"ret,omitempty"`
+	Status               string   `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"`
+	Ret                  string   `protobuf:"bytes,3,opt,name=ret" json:"ret,omitempty"`
 	TxHash               []byte   `protobuf:"bytes,4,opt,name=txHash,proto3" json:"txHash,omitempty"`
 	FeeUsed              []byte   `protobuf:"bytes,5,opt,name=feeUsed,proto3" json:"feeUsed,omitempty"`
 	CumulativeFeeUsed    []byte   `protobuf:"bytes,6,opt,name=cumulativeFeeUsed,proto3" json:"cumulativeFeeUsed,omitempty"`
 	Bloom                []byte   `protobuf:"bytes,7,opt,name=bloom,proto3" json:"bloom,omitempty"`
-	Events               []*Event `protobuf:"bytes,8,rep,name=events,proto3" json:"events,omitempty"`
-	BlockNo              uint64   `protobuf:"varint,9,opt,name=blockNo,proto3" json:"blockNo,omitempty"`
+	Events               []*Event `protobuf:"bytes,8,rep,name=events" json:"events,omitempty"`
+	BlockNo              uint64   `protobuf:"varint,9,opt,name=blockNo" json:"blockNo,omitempty"`
 	BlockHash            []byte   `protobuf:"bytes,10,opt,name=blockHash,proto3" json:"blockHash,omitempty"`
-	TxIndex              int32    `protobuf:"varint,11,opt,name=txIndex,proto3" json:"txIndex,omitempty"`
+	TxIndex              int32    `protobuf:"varint,11,opt,name=txIndex" json:"txIndex,omitempty"`
 	From                 []byte   `protobuf:"bytes,12,opt,name=from,proto3" json:"from,omitempty"`
 	To                   []byte   `protobuf:"bytes,13,opt,name=to,proto3" json:"to,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -867,7 +868,7 @@ func (m *Receipt) Reset()         { *m = Receipt{} }
 func (m *Receipt) String() string { return proto.CompactTextString(m) }
 func (*Receipt) ProtoMessage()    {}
 func (*Receipt) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{12}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{12}
 }
 func (m *Receipt) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Receipt.Unmarshal(m, b)
@@ -875,8 +876,8 @@ func (m *Receipt) XXX_Unmarshal(b []byte) error {
 func (m *Receipt) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Receipt.Marshal(b, m, deterministic)
 }
-func (m *Receipt) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Receipt.Merge(m, src)
+func (dst *Receipt) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Receipt.Merge(dst, src)
 }
 func (m *Receipt) XXX_Size() int {
 	return xxx_messageInfo_Receipt.Size(m)
@@ -980,13 +981,13 @@ func (m *Receipt) GetTo() []byte {
 
 type Event struct {
 	ContractAddress      []byte   `protobuf:"bytes,1,opt,name=contractAddress,proto3" json:"contractAddress,omitempty"`
-	EventName            string   `protobuf:"bytes,2,opt,name=eventName,proto3" json:"eventName,omitempty"`
-	JsonArgs             string   `protobuf:"bytes,3,opt,name=jsonArgs,proto3" json:"jsonArgs,omitempty"`
-	EventIdx             int32    `protobuf:"varint,4,opt,name=eventIdx,proto3" json:"eventIdx,omitempty"`
+	EventName            string   `protobuf:"bytes,2,opt,name=eventName" json:"eventName,omitempty"`
+	JsonArgs             string   `protobuf:"bytes,3,opt,name=jsonArgs" json:"jsonArgs,omitempty"`
+	EventIdx             int32    `protobuf:"varint,4,opt,name=eventIdx" json:"eventIdx,omitempty"`
 	TxHash               []byte   `protobuf:"bytes,5,opt,name=txHash,proto3" json:"txHash,omitempty"`
 	BlockHash            []byte   `protobuf:"bytes,6,opt,name=blockHash,proto3" json:"blockHash,omitempty"`
-	BlockNo              uint64   `protobuf:"varint,7,opt,name=blockNo,proto3" json:"blockNo,omitempty"`
-	TxIndex              int32    `protobuf:"varint,8,opt,name=txIndex,proto3" json:"txIndex,omitempty"`
+	BlockNo              uint64   `protobuf:"varint,7,opt,name=blockNo" json:"blockNo,omitempty"`
+	TxIndex              int32    `protobuf:"varint,8,opt,name=txIndex" json:"txIndex,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -996,7 +997,7 @@ func (m *Event) Reset()         { *m = Event{} }
 func (m *Event) String() string { return proto.CompactTextString(m) }
 func (*Event) ProtoMessage()    {}
 func (*Event) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{13}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{13}
 }
 func (m *Event) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Event.Unmarshal(m, b)
@@ -1004,8 +1005,8 @@ func (m *Event) XXX_Unmarshal(b []byte) error {
 func (m *Event) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Event.Marshal(b, m, deterministic)
 }
-func (m *Event) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Event.Merge(m, src)
+func (dst *Event) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Event.Merge(dst, src)
 }
 func (m *Event) XXX_Size() int {
 	return xxx_messageInfo_Event.Size(m)
@@ -1073,7 +1074,7 @@ func (m *Event) GetTxIndex() int32 {
 }
 
 type FnArgument struct {
-	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1083,7 +1084,7 @@ func (m *FnArgument) Reset()         { *m = FnArgument{} }
 func (m *FnArgument) String() string { return proto.CompactTextString(m) }
 func (*FnArgument) ProtoMessage()    {}
 func (*FnArgument) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{14}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{14}
 }
 func (m *FnArgument) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FnArgument.Unmarshal(m, b)
@@ -1091,8 +1092,8 @@ func (m *FnArgument) XXX_Unmarshal(b []byte) error {
 func (m *FnArgument) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FnArgument.Marshal(b, m, deterministic)
 }
-func (m *FnArgument) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FnArgument.Merge(m, src)
+func (dst *FnArgument) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FnArgument.Merge(dst, src)
 }
 func (m *FnArgument) XXX_Size() int {
 	return xxx_messageInfo_FnArgument.Size(m)
@@ -1111,10 +1112,10 @@ func (m *FnArgument) GetName() string {
 }
 
 type Function struct {
-	Name                 string        `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Arguments            []*FnArgument `protobuf:"bytes,2,rep,name=arguments,proto3" json:"arguments,omitempty"`
-	Payable              bool          `protobuf:"varint,3,opt,name=payable,proto3" json:"payable,omitempty"`
-	View                 bool          `protobuf:"varint,4,opt,name=view,proto3" json:"view,omitempty"`
+	Name                 string        `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Arguments            []*FnArgument `protobuf:"bytes,2,rep,name=arguments" json:"arguments,omitempty"`
+	Payable              bool          `protobuf:"varint,3,opt,name=payable" json:"payable,omitempty"`
+	View                 bool          `protobuf:"varint,4,opt,name=view" json:"view,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
 	XXX_unrecognized     []byte        `json:"-"`
 	XXX_sizecache        int32         `json:"-"`
@@ -1124,7 +1125,7 @@ func (m *Function) Reset()         { *m = Function{} }
 func (m *Function) String() string { return proto.CompactTextString(m) }
 func (*Function) ProtoMessage()    {}
 func (*Function) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{15}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{15}
 }
 func (m *Function) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Function.Unmarshal(m, b)
@@ -1132,8 +1133,8 @@ func (m *Function) XXX_Unmarshal(b []byte) error {
 func (m *Function) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Function.Marshal(b, m, deterministic)
 }
-func (m *Function) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Function.Merge(m, src)
+func (dst *Function) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Function.Merge(dst, src)
 }
 func (m *Function) XXX_Size() int {
 	return xxx_messageInfo_Function.Size(m)
@@ -1173,9 +1174,9 @@ func (m *Function) GetView() bool {
 }
 
 type StateVar struct {
-	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Type                 string   `protobuf:"bytes,2,opt,name=type,proto3" json:"type,omitempty"`
-	Len                  int32    `protobuf:"varint,3,opt,name=len,proto3" json:"len,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Type                 string   `protobuf:"bytes,2,opt,name=type" json:"type,omitempty"`
+	Len                  int32    `protobuf:"varint,3,opt,name=len" json:"len,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1185,7 +1186,7 @@ func (m *StateVar) Reset()         { *m = StateVar{} }
 func (m *StateVar) String() string { return proto.CompactTextString(m) }
 func (*StateVar) ProtoMessage()    {}
 func (*StateVar) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{16}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{16}
 }
 func (m *StateVar) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StateVar.Unmarshal(m, b)
@@ -1193,8 +1194,8 @@ func (m *StateVar) XXX_Unmarshal(b []byte) error {
 func (m *StateVar) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StateVar.Marshal(b, m, deterministic)
 }
-func (m *StateVar) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StateVar.Merge(m, src)
+func (dst *StateVar) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StateVar.Merge(dst, src)
 }
 func (m *StateVar) XXX_Size() int {
 	return xxx_messageInfo_StateVar.Size(m)
@@ -1227,10 +1228,10 @@ func (m *StateVar) GetLen() int32 {
 }
 
 type ABI struct {
-	Version              string      `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"`
-	Language             string      `protobuf:"bytes,2,opt,name=language,proto3" json:"language,omitempty"`
-	Functions            []*Function `protobuf:"bytes,3,rep,name=functions,proto3" json:"functions,omitempty"`
-	StateVariables       []*StateVar `protobuf:"bytes,4,rep,name=state_variables,json=stateVariables,proto3" json:"state_variables,omitempty"`
+	Version              string      `protobuf:"bytes,1,opt,name=version" json:"version,omitempty"`
+	Language             string      `protobuf:"bytes,2,opt,name=language" json:"language,omitempty"`
+	Functions            []*Function `protobuf:"bytes,3,rep,name=functions" json:"functions,omitempty"`
+	StateVariables       []*StateVar `protobuf:"bytes,4,rep,name=state_variables,json=stateVariables" json:"state_variables,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
 	XXX_unrecognized     []byte      `json:"-"`
 	XXX_sizecache        int32       `json:"-"`
@@ -1240,7 +1241,7 @@ func (m *ABI) Reset()         { *m = ABI{} }
 func (m *ABI) String() string { return proto.CompactTextString(m) }
 func (*ABI) ProtoMessage()    {}
 func (*ABI) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{17}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{17}
 }
 func (m *ABI) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ABI.Unmarshal(m, b)
@@ -1248,8 +1249,8 @@ func (m *ABI) XXX_Unmarshal(b []byte) error {
 func (m *ABI) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ABI.Marshal(b, m, deterministic)
 }
-func (m *ABI) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ABI.Merge(m, src)
+func (dst *ABI) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ABI.Merge(dst, src)
 }
 func (m *ABI) XXX_Size() int {
 	return xxx_messageInfo_ABI.Size(m)
@@ -1300,7 +1301,7 @@ func (m *Query) Reset()         { *m = Query{} }
 func (m *Query) String() string { return proto.CompactTextString(m) }
 func (*Query) ProtoMessage()    {}
 func (*Query) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{18}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{18}
 }
 func (m *Query) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Query.Unmarshal(m, b)
@@ -1308,8 +1309,8 @@ func (m *Query) XXX_Unmarshal(b []byte) error {
 func (m *Query) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Query.Marshal(b, m, deterministic)
 }
-func (m *Query) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Query.Merge(m, src)
+func (dst *Query) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Query.Merge(dst, src)
 }
 func (m *Query) XXX_Size() int {
 	return xxx_messageInfo_Query.Size(m)
@@ -1336,9 +1337,9 @@ func (m *Query) GetQueryinfo() []byte {
 
 type StateQuery struct {
 	ContractAddress      []byte   `protobuf:"bytes,1,opt,name=contractAddress,proto3" json:"contractAddress,omitempty"`
-	StorageKeys          []string `protobuf:"bytes,2,rep,name=storageKeys,proto3" json:"storageKeys,omitempty"`
 	Root                 []byte   `protobuf:"bytes,3,opt,name=root,proto3" json:"root,omitempty"`
-	Compressed           bool     `protobuf:"varint,4,opt,name=compressed,proto3" json:"compressed,omitempty"`
+	Compressed           bool     `protobuf:"varint,4,opt,name=compressed" json:"compressed,omitempty"`
+	StorageKeys          [][]byte `protobuf:"bytes,5,rep,name=storageKeys,proto3" json:"storageKeys,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1348,7 +1349,7 @@ func (m *StateQuery) Reset()         { *m = StateQuery{} }
 func (m *StateQuery) String() string { return proto.CompactTextString(m) }
 func (*StateQuery) ProtoMessage()    {}
 func (*StateQuery) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{19}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{19}
 }
 func (m *StateQuery) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StateQuery.Unmarshal(m, b)
@@ -1356,8 +1357,8 @@ func (m *StateQuery) XXX_Unmarshal(b []byte) error {
 func (m *StateQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_StateQuery.Marshal(b, m, deterministic)
 }
-func (m *StateQuery) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StateQuery.Merge(m, src)
+func (dst *StateQuery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StateQuery.Merge(dst, src)
 }
 func (m *StateQuery) XXX_Size() int {
 	return xxx_messageInfo_StateQuery.Size(m)
@@ -1375,13 +1376,6 @@ func (m *StateQuery) GetContractAddress() []byte {
 	return nil
 }
 
-func (m *StateQuery) GetStorageKeys() []string {
-	if m != nil {
-		return m.StorageKeys
-	}
-	return nil
-}
-
 func (m *StateQuery) GetRoot() []byte {
 	if m != nil {
 		return m.Root
@@ -1396,14 +1390,21 @@ func (m *StateQuery) GetCompressed() bool {
 	return false
 }
 
+func (m *StateQuery) GetStorageKeys() [][]byte {
+	if m != nil {
+		return m.StorageKeys
+	}
+	return nil
+}
+
 type FilterInfo struct {
 	ContractAddress      []byte   `protobuf:"bytes,1,opt,name=contractAddress,proto3" json:"contractAddress,omitempty"`
-	EventName            string   `protobuf:"bytes,2,opt,name=eventName,proto3" json:"eventName,omitempty"`
-	Blockfrom            uint64   `protobuf:"varint,3,opt,name=blockfrom,proto3" json:"blockfrom,omitempty"`
-	Blockto              uint64   `protobuf:"varint,4,opt,name=blockto,proto3" json:"blockto,omitempty"`
-	Desc                 bool     `protobuf:"varint,5,opt,name=desc,proto3" json:"desc,omitempty"`
+	EventName            string   `protobuf:"bytes,2,opt,name=eventName" json:"eventName,omitempty"`
+	Blockfrom            uint64   `protobuf:"varint,3,opt,name=blockfrom" json:"blockfrom,omitempty"`
+	Blockto              uint64   `protobuf:"varint,4,opt,name=blockto" json:"blockto,omitempty"`
+	Desc                 bool     `protobuf:"varint,5,opt,name=desc" json:"desc,omitempty"`
 	ArgFilter            []byte   `protobuf:"bytes,6,opt,name=argFilter,proto3" json:"argFilter,omitempty"`
-	RecentBlockCnt       int32    `protobuf:"varint,7,opt,name=recentBlockCnt,proto3" json:"recentBlockCnt,omitempty"`
+	RecentBlockCnt       int32    `protobuf:"varint,7,opt,name=recentBlockCnt" json:"recentBlockCnt,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1413,7 +1414,7 @@ func (m *FilterInfo) Reset()         { *m = FilterInfo{} }
 func (m *FilterInfo) String() string { return proto.CompactTextString(m) }
 func (*FilterInfo) ProtoMessage()    {}
 func (*FilterInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9ac6287ce250c9a, []int{20}
+	return fileDescriptor_blockchain_cf213077748568a3, []int{20}
 }
 func (m *FilterInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FilterInfo.Unmarshal(m, b)
@@ -1421,8 +1422,8 @@ func (m *FilterInfo) XXX_Unmarshal(b []byte) error {
 func (m *FilterInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FilterInfo.Marshal(b, m, deterministic)
 }
-func (m *FilterInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FilterInfo.Merge(m, src)
+func (dst *FilterInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FilterInfo.Merge(dst, src)
 }
 func (m *FilterInfo) XXX_Size() int {
 	return xxx_messageInfo_FilterInfo.Size(m)
@@ -1507,92 +1508,94 @@ func init() {
 	proto.RegisterEnum("types.TxType", TxType_name, TxType_value)
 }
 
-func init() { proto.RegisterFile("blockchain.proto", fileDescriptor_e9ac6287ce250c9a) }
-
-var fileDescriptor_e9ac6287ce250c9a = []byte{
-	// 1338 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0x4d, 0x6f, 0x23, 0x45,
-	0x13, 0x7e, 0xc7, 0xf6, 0x38, 0x76, 0xe5, 0xcb, 0xdb, 0xef, 0x0a, 0x06, 0x58, 0xad, 0xcc, 0x28,
-	0xa0, 0x68, 0x05, 0x59, 0x69, 0x11, 0x02, 0xc4, 0x29, 0xd9, 0xdd, 0x80, 0xd9, 0x25, 0x1b, 0x9a,
-	0x90, 0x03, 0x17, 0xd4, 0x9e, 0x69, 0xdb, 0xc3, 0x7a, 0xa6, 0xbd, 0x33, 0x3d, 0x66, 0x7c, 0xe0,
-	0xc4, 0x95, 0x3f, 0xc0, 0x11, 0x89, 0xdf, 0xc5, 0x11, 0x71, 0x41, 0x88, 0x7f, 0x80, 0xaa, 0xba,
-	0xe7, 0xc3, 0x4e, 0x40, 0x44, 0xe2, 0xc0, 0x29, 0x5d, 0x4f, 0x57, 0xb7, 0xab, 0x9e, 0xa7, 0xaa,
-	0x7a, 0x02, 0x83, 0xf1, 0x5c, 0x05, 0xcf, 0x83, 0x99, 0x88, 0x92, 0xa3, 0x45, 0xaa, 0xb4, 0x62,
-	0xae, 0x5e, 0x2d, 0x64, 0xe6, 0xc7, 0xe0, 0x9e, 0xe0, 0x16, 0x63, 0xd0, 0x99, 0x89, 0x6c, 0xe6,
-	0x39, 0x43, 0xe7, 0x70, 0x87, 0xd3, 0x9a, 0xdd, 0x83, 0xee, 0x4c, 0x8a, 0x50, 0xa6, 0x5e, 0x6b,
-	0xe8, 0x1c, 0x6e, 0x3f, 0x60, 0x47, 0x74, 0xe8, 0x88, 0x4e, 0x7c, 0x4c, 0x3b, 0xdc, 0x7a, 0xb0,
-	0x03, 0xe8, 0x8c, 0x55, 0xb8, 0xf2, 0xda, 0xe4, 0x39, 0x68, 0x7a, 0x9e, 0xa8, 0x70, 0xc5, 0x69,
-	0xd7, 0xff, 0xad, 0x05, 0xdb, 0x8d, 0xd3, 0xcc, 0x83, 0x2d, 0x0a, 0x6a, 0xf4, 0xc8, 0xfe, 0x70,
-	0x69, 0xb2, 0x03, 0xd8, 0x5d, 0xa4, 0x72, 0x69, 0x9c, 0x31, 0xb0, 0x16, 0xed, 0xaf, 0x83, 0x78,
-	0x9e, 0x32, 0x3b, 0x53, 0xf4, 0xc3, 0x1d, 0x5e, 0x9a, 0xec, 0x0e, 0xf4, 0x75, 0x14, 0xcb, 0x4c,
-	0x8b, 0x78, 0xe1, 0x75, 0x86, 0xce, 0x61, 0x9b, 0xd7, 0x00, 0x7b, 0x13, 0xf6, 0xc8, 0x31, 0xe3,
-	0x4a, 0x69, 0xba, 0xde, 0xa5, 0xeb, 0x37, 0x50, 0x36, 0x84, 0x6d, 0x5d, 0xd4, 0x4e, 0x5d, 0x72,
-	0x6a, 0x42, 0xec, 0x1e, 0x0c, 0x52, 0x19, 0xc8, 0x68, 0xa1, 0x6b, 0xb7, 0x2d, 0x72, 0xbb, 0x82,
-	0xb3, 0x57, 0xa1, 0x17, 0xa8, 0x64, 0x12, 0xa5, 0x71, 0xe6, 0xf5, 0x28, 0xdc, 0xca, 0x66, 0x2f,
-	0x41, 0x77, 0x91, 0x8f, 0x9f, 0xc8, 0x95, 0xd7, 0xa7, 0xd3, 0xd6, 0x62, 0x87, 0xb0, 0x1f, 0xa8,
-	0x28, 0x19, 0x8b, 0x4c, 0x1e, 0x07, 0x81, 0xca, 0x13, 0xed, 0x01, 0x39, 0x6c, 0xc2, 0xa8, 0x60,
-	0x16, 0x4d, 0x13, 0x6f, 0xdb, 0x28, 0x88, 0x6b, 0xff, 0x10, 0xfa, 0x95, 0x04, 0xec, 0x35, 0x68,
-	0xeb, 0x22, 0xf3, 0x9c, 0x61, 0xfb, 0x70, 0xfb, 0x41, 0xdf, 0x2a, 0x74, 0x51, 0x70, 0x44, 0xfd,
-	0x37, 0xa0, 0x7b, 0x51, 0x3c, 0x8d, 0x32, 0xfd, 0xf7, 0x6e, 0x1f, 0x42, 0xeb, 0xa2, 0xb8, 0xb6,
-	0x58, 0x5e, 0xb7, 0x05, 0x60, 0x4a, 0x65, 0xb7, 0x3a, 0xd7, 0x50, 0xff, 0x87, 0x16, 0xfe, 0x08,
-	0xc5, 0x72, 0x1b, 0xdc, 0x44, 0x25, 0x81, 0xa4, 0x2b, 0x3a, 0xdc, 0x18, 0x28, 0xa7, 0xb0, 0x49,
-	0x1a, 0xb9, 0x4b, 0x13, 0xe5, 0x4c, 0x65, 0x10, 0x2d, 0x22, 0x99, 0x68, 0x92, 0x7a, 0x87, 0xd7,
-	0x00, 0x92, 0x27, 0x62, 0x3a, 0xd6, 0x31, 0xe4, 0x19, 0x0b, 0xef, 0x5b, 0x88, 0xd5, 0x5c, 0x89,
-	0xd0, 0xea, 0x5b, 0x9a, 0x28, 0xc5, 0x54, 0x64, 0x4f, 0xa3, 0x38, 0xd2, 0xa4, 0x6a, 0x87, 0x57,
-	0xb6, 0xdd, 0x3b, 0x4f, 0xa3, 0x40, 0x5a, 0x29, 0x2b, 0x1b, 0xb3, 0xc4, 0xc4, 0x48, 0xbe, 0xbd,
-	0x46, 0x96, 0x17, 0xab, 0x85, 0xe4, 0xb4, 0x85, 0x35, 0x63, 0x8a, 0x38, 0xa4, 0x62, 0x30, 0x72,
-	0x36, 0xa1, 0x4a, 0x29, 0x68, 0x28, 0xf5, 0x1e, 0xb8, 0x17, 0xc5, 0x28, 0x2c, 0x30, 0xd3, 0x71,
-	0x55, 0xf4, 0x86, 0xe0, 0x1a, 0x60, 0x03, 0x68, 0x47, 0x61, 0x41, 0xec, 0xb8, 0x1c, 0x97, 0xfe,
-	0x27, 0xd0, 0xbf, 0x28, 0x46, 0x89, 0xe9, 0x62, 0x1f, 0x5c, 0x8d, 0xb7, 0xd0, 0xc1, 0xed, 0x07,
-	0x3b, 0x55, 0x7c, 0xa3, 0xb0, 0xe0, 0x66, 0x8b, 0xbd, 0x02, 0x2d, 0x5d, 0x58, 0x99, 0x1a, 0xf2,
-	0xb6, 0x74, 0xe1, 0xff, 0xe8, 0x80, 0xfb, 0xb9, 0x16, 0x5a, 0xfe, 0xb5, 0x3e, 0x63, 0x31, 0x17,
-	0x88, 0x5b, 0x7d, 0xac, 0x69, 0x4a, 0x3b, 0x94, 0x14, 0xb4, 0x91, 0xa7, 0xb2, 0x91, 0x90, 0x4c,
-	0xab, 0x54, 0x4c, 0x25, 0x76, 0x82, 0x95, 0xa8, 0x09, 0x61, 0x13, 0x65, 0x2f, 0xe6, 0x5c, 0x06,
-	0x6a, 0x29, 0xd3, 0xd5, 0xb9, 0x8a, 0x12, 0x4d, 0x82, 0x75, 0xf8, 0x15, 0xdc, 0xff, 0xd5, 0x81,
-	0x1d, 0x5b, 0xf2, 0xe7, 0xa9, 0x52, 0x13, 0xcc, 0x39, 0xc3, 0x98, 0x37, 0x72, 0xa6, 0x3c, 0xb8,
-	0xd9, 0x42, 0x52, 0xa3, 0x24, 0x98, 0xe7, 0x59, 0xa4, 0x12, 0x0a, 0xbd, 0xc7, 0x6b, 0x00, 0x49,
-	0x7d, 0x2e, 0x57, 0x36, 0x6e, 0x5c, 0x62, 0x3a, 0x0b, 0xbc, 0x1c, 0xfb, 0xd1, 0xc4, 0x5b, 0xd9,
-	0xd5, 0xde, 0xa5, 0x98, 0xdb, 0xaa, 0xaa, 0x6c, 0x2c, 0xc4, 0x71, 0xa4, 0x63, 0xb1, 0xb0, 0xa3,
-	0xc2, 0x5a, 0x88, 0xcf, 0x64, 0x34, 0x9d, 0x69, 0x2a, 0xa8, 0x5d, 0x6e, 0x2d, 0x8c, 0x4b, 0xe4,
-	0x61, 0xa4, 0xcf, 0x85, 0x9e, 0x79, 0xbd, 0x61, 0x1b, 0xc5, 0xae, 0x00, 0xff, 0x67, 0x07, 0x06,
-	0x0f, 0x55, 0xa2, 0x53, 0x11, 0xe8, 0x4b, 0x91, 0x9a, 0x74, 0x6f, 0x83, 0xbb, 0x14, 0xf3, 0x5c,
-	0xda, 0xda, 0x30, 0xc6, 0x3f, 0x4f, 0xb0, 0xff, 0x5f, 0x4a, 0xf0, 0x3b, 0x07, 0xf6, 0x49, 0xa7,
-	0xcf, 0x72, 0xd4, 0x97, 0xf2, 0xfb, 0x00, 0x76, 0x03, 0x9b, 0x33, 0x01, 0x56, 0xd6, 0xff, 0x5b,
-	0x59, 0x9b, 0xd2, 0xf3, 0x75, 0x4f, 0xf6, 0x2e, 0xf4, 0x97, 0x96, 0xa6, 0xcc, 0x6b, 0xd1, 0xfc,
-	0x7a, 0xd9, 0x1e, 0xdb, 0xa4, 0x91, 0xd7, 0x9e, 0xfe, 0xef, 0x2d, 0xd8, 0xe2, 0x66, 0x56, 0x9b,
-	0x71, 0x6b, 0x5c, 0x8f, 0xc3, 0x30, 0x95, 0x59, 0x66, 0x79, 0xde, 0x84, 0x31, 0x63, 0xac, 0xad,
-	0x3c, 0x23, 0xba, 0xfb, 0xdc, 0x5a, 0xc8, 0x75, 0x2a, 0x75, 0xc9, 0x75, 0x2a, 0x69, 0x3a, 0xe9,
-	0x82, 0x3a, 0xc3, 0x4e, 0x27, 0x63, 0x61, 0x37, 0x4d, 0xa4, 0xfc, 0x22, 0x93, 0xd5, 0x74, 0xb2,
-	0x26, 0x7b, 0x0b, 0x6e, 0x05, 0x79, 0x9c, 0xcf, 0x85, 0x8e, 0x96, 0xf2, 0xd4, 0xfa, 0x18, 0xc2,
-	0xaf, 0x6e, 0x60, 0x45, 0x8c, 0xe7, 0x4a, 0xc5, 0x76, 0x58, 0x19, 0x83, 0x1d, 0x40, 0x57, 0x2e,
-	0x65, 0xa2, 0x33, 0xa2, 0xbd, 0xee, 0x8b, 0xc7, 0x08, 0x72, 0xbb, 0xd7, 0x7c, 0x40, 0xfb, 0x57,
-	0x1e, 0xd0, 0x7a, 0x0e, 0xc1, 0xe6, 0x1c, 0xf2, 0x60, 0x4b, 0x17, 0xa3, 0x24, 0x94, 0x05, 0xbd,
-	0x37, 0x2e, 0x2f, 0x4d, 0x1c, 0x6e, 0x93, 0x54, 0xc5, 0xde, 0x8e, 0x19, 0x6e, 0xb8, 0x66, 0x7b,
-	0xd0, 0xd2, 0xca, 0xdb, 0x25, 0xa4, 0xa5, 0x95, 0xff, 0x87, 0x03, 0x2e, 0xc5, 0x71, 0x03, 0xbe,
-	0xef, 0x40, 0x9f, 0x62, 0x3e, 0x13, 0xb1, 0xb4, 0x94, 0xd7, 0x00, 0xd6, 0xec, 0xd7, 0x99, 0x4a,
-	0x8e, 0xd3, 0x69, 0x66, 0xa9, 0xaf, 0x6c, 0xdc, 0x23, 0x47, 0x9c, 0x8b, 0x1d, 0x0a, 0xb6, 0xb2,
-	0x1b, 0xda, 0xb8, 0x6b, 0xda, 0xac, 0x65, 0xdf, 0xbd, 0x26, 0xfb, 0x92, 0xb5, 0xad, 0x75, 0xd6,
-	0x1a, 0xbc, 0xf4, 0xd6, 0x78, 0xf1, 0x87, 0x00, 0xa7, 0x18, 0x4f, 0x1e, 0x4b, 0xf3, 0x58, 0x27,
-	0x98, 0x88, 0x43, 0xb1, 0xd2, 0xda, 0xff, 0x16, 0x7a, 0xa7, 0x79, 0x12, 0x68, 0xec, 0xd8, 0x6b,
-	0xf6, 0xd9, 0x7d, 0xe8, 0x0b, 0x7b, 0xbe, 0x2c, 0xef, 0x5b, 0x56, 0xd4, 0xfa, 0x66, 0x5e, 0xfb,
-	0xd8, 0xe7, 0x4f, 0x8c, 0xe7, 0x92, 0x38, 0xe9, 0xf1, 0xd2, 0xc4, 0xeb, 0x97, 0x91, 0xfc, 0x86,
-	0xe8, 0xe8, 0x71, 0x5a, 0xfb, 0x8f, 0xa0, 0x47, 0xbd, 0x78, 0x29, 0xd2, 0x6b, 0x7f, 0x9e, 0xd9,
-	0xa7, 0xcf, 0x70, 0x6f, 0xde, 0xba, 0x01, 0xb4, 0xe7, 0x32, 0xa1, 0xdb, 0x5d, 0x8e, 0x4b, 0xff,
-	0x27, 0x07, 0xda, 0xc7, 0x27, 0x23, 0xfc, 0xed, 0xa5, 0x4c, 0x69, 0x1c, 0x99, 0x4b, 0x4a, 0x13,
-	0xe5, 0x98, 0x8b, 0x64, 0x9a, 0x8b, 0x69, 0x79, 0x57, 0x65, 0xb3, 0xb7, 0xa1, 0x3f, 0xb1, 0x14,
-	0xa0, 0x8e, 0x98, 0xe2, 0x7e, 0x99, 0xa2, 0xc5, 0x79, 0xed, 0xc1, 0xde, 0x87, 0x7d, 0x9a, 0xef,
-	0x5f, 0x2d, 0x45, 0x1a, 0x61, 0x62, 0x99, 0xd7, 0x59, 0x3b, 0x54, 0x26, 0xc4, 0xf7, 0x32, 0xbb,
-	0x32, 0x6e, 0xfe, 0x33, 0x70, 0x69, 0xe6, 0xdc, 0xac, 0x00, 0x5f, 0xe0, 0x91, 0x28, 0x99, 0x28,
-	0xfb, 0xfc, 0xd5, 0x80, 0xff, 0xbd, 0x03, 0x50, 0x8f, 0xb2, 0x1b, 0x5c, 0x5b, 0xbf, 0x8e, 0x4f,
-	0xe4, 0xca, 0xe8, 0xda, 0xe7, 0x4d, 0x08, 0x89, 0x4f, 0xf1, 0xe1, 0x34, 0xef, 0x13, 0xad, 0xd9,
-	0x5d, 0x80, 0x40, 0xc5, 0x0b, 0xbc, 0x41, 0x86, 0x56, 0xc6, 0x06, 0xe2, 0xff, 0xe2, 0x00, 0x9c,
-	0x46, 0x73, 0x2d, 0xd3, 0x51, 0x32, 0x51, 0xff, 0x5a, 0x9b, 0x95, 0x6d, 0x41, 0x1d, 0x6e, 0xbe,
-	0xb8, 0x6b, 0xa0, 0x6a, 0x0b, 0xad, 0x28, 0xa2, 0xb2, 0x2d, 0xb4, 0xc2, 0x14, 0x42, 0x99, 0x05,
-	0xd4, 0x64, 0x3d, 0x4e, 0x6b, 0x7a, 0x1a, 0xd2, 0xa9, 0x09, 0xb2, 0x6c, 0xb1, 0x0a, 0xc0, 0x2f,
-	0x74, 0xfc, 0x7e, 0x4e, 0x34, 0x7d, 0xd8, 0x3c, 0x4c, 0xcc, 0xc3, 0xe2, 0xf2, 0x0d, 0xf4, 0xde,
-	0x01, 0x7e, 0x52, 0xe2, 0xd7, 0x17, 0x03, 0xe8, 0x9e, 0x3d, 0xe3, 0x9f, 0x1e, 0x3f, 0x1d, 0xfc,
-	0x8f, 0xed, 0x01, 0x7c, 0xf4, 0xec, 0xf2, 0x31, 0x3f, 0x3b, 0x3e, 0x7b, 0xf8, 0x78, 0xe0, 0x9c,
-	0x0c, 0xbf, 0xbc, 0x3b, 0x8d, 0xf4, 0x2c, 0x1f, 0x1f, 0x05, 0x2a, 0xbe, 0x2f, 0x64, 0x3a, 0x55,
-	0x91, 0x32, 0x7f, 0xef, 0x53, 0xa5, 0x8c, 0xbb, 0xf4, 0x6f, 0xd1, 0x3b, 0x7f, 0x06, 0x00, 0x00,
-	0xff, 0xff, 0xa0, 0x1c, 0x39, 0xe4, 0x2a, 0x0d, 0x00, 0x00,
+func init() { proto.RegisterFile("blockchain.proto", fileDescriptor_blockchain_cf213077748568a3) }
+
+var fileDescriptor_blockchain_cf213077748568a3 = []byte{
+	// 1370 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0x4f, 0x6f, 0x23, 0xc5,
+	0x12, 0x7f, 0x63, 0xcf, 0x38, 0x76, 0xe5, 0x9f, 0xb7, 0xdf, 0xea, 0xbd, 0x79, 0x8f, 0xd5, 0xca,
+	0x8c, 0x16, 0x14, 0xad, 0x20, 0x2b, 0x05, 0x21, 0x40, 0x9c, 0x92, 0xdd, 0x04, 0xb2, 0x1b, 0x92,
+	0xd0, 0x84, 0x48, 0x70, 0x41, 0xed, 0x99, 0xb6, 0x3d, 0xac, 0x67, 0xda, 0x3b, 0xd3, 0x36, 0xe3,
+	0x03, 0x27, 0xbe, 0x01, 0x37, 0x8e, 0x48, 0x7c, 0x34, 0x84, 0xb8, 0x20, 0xc4, 0x37, 0x40, 0x55,
+	0xdd, 0xf3, 0xc7, 0x4e, 0x00, 0xad, 0xc4, 0x81, 0x53, 0xfa, 0xf7, 0xeb, 0xea, 0x76, 0x55, 0xfd,
+	0xaa, 0xaa, 0x27, 0xd0, 0x1f, 0x4e, 0x55, 0xf8, 0x3c, 0x9c, 0x88, 0x38, 0xdd, 0x9f, 0x65, 0x4a,
+	0x2b, 0xe6, 0xe9, 0xe5, 0x4c, 0xe6, 0x41, 0x02, 0xde, 0x11, 0x6e, 0x31, 0x06, 0xee, 0x44, 0xe4,
+	0x13, 0xdf, 0x19, 0x38, 0x7b, 0x5b, 0x9c, 0xd6, 0xec, 0x21, 0x74, 0x26, 0x52, 0x44, 0x32, 0xf3,
+	0x5b, 0x03, 0x67, 0x6f, 0xf3, 0x80, 0xed, 0xd3, 0xa1, 0x7d, 0x3a, 0xf1, 0x21, 0xed, 0x70, 0x6b,
+	0xc1, 0x1e, 0x80, 0x3b, 0x54, 0xd1, 0xd2, 0x6f, 0x93, 0x65, 0xbf, 0x69, 0x79, 0xa4, 0xa2, 0x25,
+	0xa7, 0xdd, 0xe0, 0x97, 0x16, 0x6c, 0x36, 0x4e, 0x33, 0x1f, 0x36, 0xc8, 0xa9, 0xd3, 0x27, 0xf6,
+	0x87, 0x4b, 0xc8, 0x1e, 0xc0, 0xf6, 0x2c, 0x93, 0x0b, 0x63, 0x8c, 0x8e, 0xb5, 0x68, 0x7f, 0x95,
+	0xc4, 0xf3, 0x14, 0xd9, 0xb9, 0xa2, 0x1f, 0x76, 0x79, 0x09, 0xd9, 0x3d, 0xe8, 0xe9, 0x38, 0x91,
+	0xb9, 0x16, 0xc9, 0xcc, 0x77, 0x07, 0xce, 0x5e, 0x9b, 0xd7, 0x04, 0x7b, 0x1d, 0x76, 0xc8, 0x30,
+	0xe7, 0x4a, 0x69, 0xba, 0xde, 0xa3, 0xeb, 0xd7, 0x58, 0x36, 0x80, 0x4d, 0x5d, 0xd4, 0x46, 0x1d,
+	0x32, 0x6a, 0x52, 0xec, 0x21, 0xf4, 0x33, 0x19, 0xca, 0x78, 0xa6, 0x6b, 0xb3, 0x0d, 0x32, 0xbb,
+	0xc1, 0xb3, 0xff, 0x43, 0x37, 0x54, 0xe9, 0x28, 0xce, 0x92, 0xdc, 0xef, 0x92, 0xbb, 0x15, 0x66,
+	0xff, 0x81, 0xce, 0x6c, 0x3e, 0x7c, 0x26, 0x97, 0x7e, 0x8f, 0x4e, 0x5b, 0xc4, 0xf6, 0x60, 0x37,
+	0x54, 0x71, 0x3a, 0x14, 0xb9, 0x3c, 0x0c, 0x43, 0x35, 0x4f, 0xb5, 0x0f, 0x64, 0xb0, 0x4e, 0xa3,
+	0x82, 0x79, 0x3c, 0x4e, 0xfd, 0x4d, 0xa3, 0x20, 0xae, 0x83, 0x3d, 0xe8, 0x55, 0x12, 0xb0, 0x57,
+	0xa0, 0xad, 0x8b, 0xdc, 0x77, 0x06, 0xed, 0xbd, 0xcd, 0x83, 0x9e, 0x55, 0xe8, 0xaa, 0xe0, 0xc8,
+	0x06, 0xaf, 0x41, 0xe7, 0xaa, 0x38, 0x8b, 0x73, 0xfd, 0xe7, 0x66, 0xef, 0x43, 0xeb, 0xaa, 0xb8,
+	0xb5, 0x58, 0x5e, 0xb5, 0x05, 0x60, 0x4a, 0x65, 0xbb, 0x3a, 0xd7, 0x50, 0xff, 0xbb, 0x16, 0xfe,
+	0x08, 0xf9, 0x72, 0x17, 0xbc, 0x54, 0xa5, 0xa1, 0xa4, 0x2b, 0x5c, 0x6e, 0x00, 0xca, 0x29, 0x6c,
+	0x90, 0x46, 0xee, 0x12, 0xa2, 0x9c, 0x99, 0x0c, 0xe3, 0x59, 0x2c, 0x53, 0x4d, 0x52, 0x6f, 0xf1,
+	0x9a, 0xc0, 0xe4, 0x89, 0x84, 0x8e, 0xb9, 0x26, 0x79, 0x06, 0xe1, 0x7d, 0x33, 0xb1, 0x9c, 0x2a,
+	0x11, 0x59, 0x7d, 0x4b, 0x88, 0x52, 0x8c, 0x45, 0x7e, 0x16, 0x27, 0xb1, 0x26, 0x55, 0x5d, 0x5e,
+	0x61, 0xbb, 0x77, 0x99, 0xc5, 0xa1, 0xb4, 0x52, 0x56, 0x18, 0xa3, 0xc4, 0xc0, 0x48, 0xbe, 0x9d,
+	0x46, 0x94, 0x57, 0xcb, 0x99, 0xe4, 0xb4, 0x85, 0x35, 0x63, 0x8a, 0x38, 0xa2, 0x62, 0x30, 0x72,
+	0x36, 0xa9, 0x4a, 0x29, 0x68, 0x28, 0xf5, 0x0e, 0x78, 0x57, 0xc5, 0x69, 0x54, 0x60, 0xa4, 0xc3,
+	0xaa, 0xe8, 0x4d, 0x82, 0x6b, 0x82, 0xf5, 0xa1, 0x1d, 0x47, 0x05, 0x65, 0xc7, 0xe3, 0xb8, 0x0c,
+	0x9e, 0x42, 0xef, 0xaa, 0x38, 0x4d, 0x4d, 0x17, 0x07, 0xe0, 0x69, 0xbc, 0x85, 0x0e, 0x6e, 0x1e,
+	0x6c, 0x55, 0xfe, 0x9d, 0x46, 0x05, 0x37, 0x5b, 0xec, 0x7f, 0xd0, 0xd2, 0x85, 0x95, 0xa9, 0x21,
+	0x6f, 0x4b, 0x17, 0xc1, 0xf7, 0x0e, 0x78, 0x9f, 0x68, 0xa1, 0xe5, 0x1f, 0xeb, 0x33, 0x14, 0x53,
+	0x81, 0xbc, 0xd5, 0xc7, 0x42, 0x53, 0xda, 0x91, 0x24, 0xa7, 0x8d, 0x3c, 0x15, 0xc6, 0x84, 0xe4,
+	0x5a, 0x65, 0x62, 0x2c, 0xb1, 0x13, 0xac, 0x44, 0x4d, 0x0a, 0x9b, 0x28, 0x7f, 0x31, 0xe5, 0x32,
+	0x54, 0x0b, 0x99, 0x2d, 0x2f, 0x55, 0x9c, 0x6a, 0x12, 0xcc, 0xe5, 0x37, 0xf8, 0xe0, 0x67, 0x07,
+	0xb6, 0x6c, 0xc9, 0x5f, 0x66, 0x4a, 0x8d, 0x30, 0xe6, 0x1c, 0x7d, 0x5e, 0x8b, 0x99, 0xe2, 0xe0,
+	0x66, 0x0b, 0x93, 0x1a, 0xa7, 0xe1, 0x74, 0x9e, 0xc7, 0x2a, 0x25, 0xd7, 0xbb, 0xbc, 0x26, 0x30,
+	0xa9, 0xcf, 0xe5, 0xd2, 0xfa, 0x8d, 0x4b, 0x0c, 0x67, 0x86, 0x97, 0x63, 0x3f, 0x1a, 0x7f, 0x2b,
+	0x5c, 0xed, 0x5d, 0x8b, 0xa9, 0xad, 0xaa, 0x0a, 0x63, 0x21, 0x0e, 0x63, 0x9d, 0x88, 0x99, 0x1d,
+	0x15, 0x16, 0x21, 0x3f, 0x91, 0xf1, 0x78, 0xa2, 0xa9, 0xa0, 0xb6, 0xb9, 0x45, 0xe8, 0x97, 0x98,
+	0x47, 0xb1, 0xbe, 0x14, 0x7a, 0xe2, 0x77, 0x07, 0x6d, 0x14, 0xbb, 0x22, 0x82, 0x1f, 0x1d, 0xe8,
+	0x3f, 0x56, 0xa9, 0xce, 0x44, 0xa8, 0xaf, 0x45, 0x66, 0xc2, 0xbd, 0x0b, 0xde, 0x42, 0x4c, 0xe7,
+	0xd2, 0xd6, 0x86, 0x01, 0x7f, 0x11, 0xe0, 0x3f, 0x22, 0x9c, 0x32, 0xcd, 0xbd, 0x2a, 0xcd, 0x4f,
+	0xdd, 0x6e, 0xbb, 0xef, 0x06, 0xdf, 0x38, 0xb0, 0x4b, 0x6a, 0x7d, 0x3c, 0x47, 0x95, 0x29, 0xca,
+	0xf7, 0x60, 0x3b, 0xb4, 0x91, 0x13, 0x61, 0xc5, 0xfd, 0xb7, 0x15, 0xb7, 0x59, 0x00, 0x7c, 0xd5,
+	0x92, 0xbd, 0x0d, 0xbd, 0x85, 0x4d, 0x56, 0xee, 0xb7, 0x68, 0x8a, 0xfd, 0xd7, 0x1e, 0x5b, 0x4f,
+	0x26, 0xaf, 0x2d, 0x83, 0x5f, 0x5b, 0xb0, 0xc1, 0xcd, 0xc4, 0x36, 0x43, 0xd7, 0x98, 0x1e, 0x46,
+	0x51, 0x26, 0xf3, 0xdc, 0x66, 0x7b, 0x9d, 0xc6, 0x4c, 0x60, 0x85, 0xcd, 0x73, 0x4a, 0x7a, 0x8f,
+	0x5b, 0x84, 0xb1, 0x66, 0xd2, 0x4c, 0xaa, 0x1e, 0xc7, 0x25, 0x5a, 0xea, 0x82, 0xfa, 0xc3, 0xce,
+	0x28, 0x83, 0xb0, 0xa7, 0x46, 0x52, 0x7e, 0x9a, 0xcb, 0x6a, 0x46, 0x59, 0xc8, 0xde, 0x80, 0x3b,
+	0xe1, 0x3c, 0x99, 0x4f, 0x85, 0x8e, 0x17, 0xf2, 0xc4, 0xda, 0x18, 0x21, 0x6e, 0x6e, 0x60, 0x5d,
+	0x0c, 0xa7, 0x4a, 0x25, 0x76, 0x64, 0x19, 0xc0, 0x1e, 0x40, 0x47, 0x2e, 0x64, 0xaa, 0x73, 0x92,
+	0xa3, 0xee, 0x8e, 0x63, 0x24, 0xb9, 0xdd, 0x6b, 0x3e, 0xa3, 0xbd, 0x1b, 0xcf, 0x68, 0x3d, 0x8d,
+	0x60, 0x7d, 0x1a, 0xf9, 0xb0, 0xa1, 0x8b, 0xd3, 0x34, 0x92, 0x05, 0xbd, 0x3a, 0x1e, 0x2f, 0x21,
+	0x8e, 0xb8, 0x51, 0xa6, 0x12, 0x7f, 0xcb, 0x8c, 0x38, 0x5c, 0xb3, 0x1d, 0x68, 0x69, 0xe5, 0x6f,
+	0x13, 0xd3, 0xd2, 0x2a, 0xf8, 0xcd, 0x01, 0x8f, 0xfc, 0x78, 0x89, 0x7c, 0xdf, 0x83, 0x1e, 0xf9,
+	0x7c, 0x2e, 0x12, 0x69, 0x53, 0x5e, 0x13, 0x58, 0xcb, 0x5f, 0xe6, 0x2a, 0x3d, 0xcc, 0xc6, 0xb9,
+	0x4d, 0x7d, 0x85, 0x71, 0x8f, 0x0c, 0x71, 0x3a, 0xba, 0xe4, 0x6c, 0x85, 0x1b, 0xda, 0x78, 0x2b,
+	0xda, 0xac, 0x44, 0xdf, 0xb9, 0x25, 0xfa, 0x32, 0x6b, 0x1b, 0xab, 0x59, 0x6b, 0xe4, 0xa5, 0xbb,
+	0x92, 0x97, 0x60, 0x00, 0x70, 0x82, 0xfe, 0xcc, 0x13, 0x69, 0x9e, 0xec, 0x14, 0x03, 0x71, 0xc8,
+	0x57, 0x5a, 0x07, 0x5f, 0x43, 0xf7, 0x64, 0x9e, 0x86, 0x1a, 0xfb, 0xf6, 0x96, 0x7d, 0xf6, 0x08,
+	0x7a, 0xc2, 0x9e, 0x2f, 0xcb, 0xfb, 0x8e, 0x15, 0xb5, 0xbe, 0x99, 0xd7, 0x36, 0xf6, 0x11, 0x14,
+	0xc3, 0xa9, 0xa4, 0x9c, 0x74, 0x79, 0x09, 0xf1, 0xfa, 0x45, 0x2c, 0xbf, 0xa2, 0x74, 0x74, 0x39,
+	0xad, 0x83, 0x27, 0xd0, 0xa5, 0x5e, 0xbc, 0x16, 0xd9, 0xad, 0x3f, 0xcf, 0xec, 0x03, 0x68, 0x72,
+	0x6f, 0x5e, 0xbc, 0x3e, 0xb4, 0xa7, 0x32, 0xa5, 0xdb, 0x3d, 0x8e, 0xcb, 0xe0, 0x07, 0x07, 0xda,
+	0x87, 0x47, 0xa7, 0xf8, 0xdb, 0x0b, 0x99, 0xd1, 0x50, 0x32, 0x97, 0x94, 0x10, 0xe5, 0x98, 0x8a,
+	0x74, 0x3c, 0x17, 0xe3, 0xf2, 0xae, 0x0a, 0xb3, 0x37, 0xa1, 0x37, 0xb2, 0x29, 0x40, 0x1d, 0x31,
+	0xc4, 0xdd, 0x32, 0x44, 0xcb, 0xf3, 0xda, 0x82, 0xbd, 0x0b, 0xbb, 0x34, 0xe5, 0xbf, 0x58, 0x88,
+	0x2c, 0xc6, 0xc0, 0x72, 0xdf, 0x5d, 0x39, 0x54, 0x06, 0xc4, 0x77, 0x72, 0xbb, 0x32, 0x66, 0xc1,
+	0x05, 0x78, 0x34, 0x73, 0x5e, 0xae, 0x00, 0x5f, 0xe0, 0x91, 0x38, 0x1d, 0x29, 0xfb, 0x08, 0xd6,
+	0x44, 0xf0, 0xad, 0x03, 0x50, 0x8f, 0xb2, 0x97, 0xb8, 0x96, 0x81, 0x9b, 0xe1, 0xe3, 0x68, 0xde,
+	0x20, 0x5a, 0xb3, 0xfb, 0x00, 0xa1, 0x4a, 0x66, 0xb8, 0x2f, 0x23, 0x2b, 0x52, 0x83, 0x69, 0xbc,
+	0xab, 0xcf, 0xe4, 0x32, 0xf7, 0x3d, 0x9a, 0xb7, 0x4d, 0xea, 0xa9, 0xdb, 0x6d, 0xf5, 0xdb, 0xc1,
+	0x4f, 0x0e, 0xc0, 0x49, 0x3c, 0xd5, 0x32, 0x3b, 0x4d, 0x47, 0xea, 0x6f, 0x6b, 0xb6, 0xb2, 0x39,
+	0xa8, 0xcf, 0xcd, 0xd7, 0x77, 0x4d, 0x54, 0xcd, 0xa1, 0x15, 0x79, 0x5e, 0x36, 0x87, 0x56, 0x18,
+	0x6a, 0x24, 0xf3, 0x90, 0x5a, 0xad, 0xcb, 0x69, 0x4d, 0x0f, 0x47, 0x36, 0x36, 0x4e, 0x96, 0x8d,
+	0x56, 0x11, 0xf8, 0xb5, 0x8e, 0xdf, 0xd2, 0xa9, 0xa6, 0x8f, 0x9c, 0xc7, 0xa9, 0x79, 0x76, 0x3c,
+	0xbe, 0xc6, 0x3e, 0x3c, 0xc0, 0xcf, 0x4b, 0xfc, 0x12, 0x63, 0x00, 0x9d, 0xf3, 0x0b, 0xfe, 0xd1,
+	0xe1, 0x59, 0xff, 0x5f, 0x6c, 0x07, 0xe0, 0x83, 0x8b, 0xeb, 0x63, 0x7e, 0x7e, 0x78, 0xfe, 0xf8,
+	0xb8, 0xef, 0xb0, 0x2d, 0xe8, 0xf2, 0xe3, 0x27, 0xc7, 0x97, 0x67, 0x17, 0x9f, 0xf5, 0x5b, 0x47,
+	0x83, 0xcf, 0xef, 0x8f, 0x63, 0x3d, 0x99, 0x0f, 0xf7, 0x43, 0x95, 0x3c, 0x12, 0x32, 0x1b, 0xab,
+	0x58, 0x99, 0xbf, 0x8f, 0xa8, 0x7a, 0x86, 0x1d, 0xfa, 0x87, 0xe9, 0xad, 0xdf, 0x03, 0x00, 0x00,
+	0xff, 0xff, 0xfd, 0x9f, 0x7f, 0xb4, 0x44, 0x0d, 0x00, 0x00,
 }
diff --git a/types/metric.pb.go b/types/metric.pb.go
index 44ef1b7d7..485c1d51e 100644
--- a/types/metric.pb.go
+++ b/types/metric.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: metric.proto
 
-package types
+package types // import "github.com/aergoio/aergo/types"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -31,7 +31,6 @@ var MetricType_name = map[int32]string{
 	0: "NOTHING",
 	1: "P2P_NETWORK",
 }
-
 var MetricType_value = map[string]int32{
 	"NOTHING":     0,
 	"P2P_NETWORK": 1,
@@ -40,13 +39,12 @@ var MetricType_value = map[string]int32{
 func (x MetricType) String() string {
 	return proto.EnumName(MetricType_name, int32(x))
 }
-
 func (MetricType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_da41641f55bff5df, []int{0}
+	return fileDescriptor_metric_295631cc212b5411, []int{0}
 }
 
 type MetricsRequest struct {
-	Types                []MetricType `protobuf:"varint,1,rep,packed,name=types,proto3,enum=types.MetricType" json:"types,omitempty"`
+	Types                []MetricType `protobuf:"varint,1,rep,packed,name=types,enum=types.MetricType" json:"types,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -56,7 +54,7 @@ func (m *MetricsRequest) Reset()         { *m = MetricsRequest{} }
 func (m *MetricsRequest) String() string { return proto.CompactTextString(m) }
 func (*MetricsRequest) ProtoMessage()    {}
 func (*MetricsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_da41641f55bff5df, []int{0}
+	return fileDescriptor_metric_295631cc212b5411, []int{0}
 }
 func (m *MetricsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MetricsRequest.Unmarshal(m, b)
@@ -64,8 +62,8 @@ func (m *MetricsRequest) XXX_Unmarshal(b []byte) error {
 func (m *MetricsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MetricsRequest.Marshal(b, m, deterministic)
 }
-func (m *MetricsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MetricsRequest.Merge(m, src)
+func (dst *MetricsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MetricsRequest.Merge(dst, src)
 }
 func (m *MetricsRequest) XXX_Size() int {
 	return xxx_messageInfo_MetricsRequest.Size(m)
@@ -84,7 +82,7 @@ func (m *MetricsRequest) GetTypes() []MetricType {
 }
 
 type Metrics struct {
-	Peers                []*PeerMetric `protobuf:"bytes,1,rep,name=peers,proto3" json:"peers,omitempty"`
+	Peers                []*PeerMetric `protobuf:"bytes,1,rep,name=peers" json:"peers,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
 	XXX_unrecognized     []byte        `json:"-"`
 	XXX_sizecache        int32         `json:"-"`
@@ -94,7 +92,7 @@ func (m *Metrics) Reset()         { *m = Metrics{} }
 func (m *Metrics) String() string { return proto.CompactTextString(m) }
 func (*Metrics) ProtoMessage()    {}
 func (*Metrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_da41641f55bff5df, []int{1}
+	return fileDescriptor_metric_295631cc212b5411, []int{1}
 }
 func (m *Metrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Metrics.Unmarshal(m, b)
@@ -102,8 +100,8 @@ func (m *Metrics) XXX_Unmarshal(b []byte) error {
 func (m *Metrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Metrics.Marshal(b, m, deterministic)
 }
-func (m *Metrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Metrics.Merge(m, src)
+func (dst *Metrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Metrics.Merge(dst, src)
 }
 func (m *Metrics) XXX_Size() int {
 	return xxx_messageInfo_Metrics.Size(m)
@@ -123,10 +121,10 @@ func (m *Metrics) GetPeers() []*PeerMetric {
 
 type PeerMetric struct {
 	PeerID               []byte   `protobuf:"bytes,1,opt,name=peerID,proto3" json:"peerID,omitempty"`
-	SumIn                int64    `protobuf:"varint,2,opt,name=sumIn,proto3" json:"sumIn,omitempty"`
-	AvrIn                int64    `protobuf:"varint,3,opt,name=avrIn,proto3" json:"avrIn,omitempty"`
-	SumOut               int64    `protobuf:"varint,4,opt,name=sumOut,proto3" json:"sumOut,omitempty"`
-	AvrOut               int64    `protobuf:"varint,5,opt,name=avrOut,proto3" json:"avrOut,omitempty"`
+	SumIn                int64    `protobuf:"varint,2,opt,name=sumIn" json:"sumIn,omitempty"`
+	AvrIn                int64    `protobuf:"varint,3,opt,name=avrIn" json:"avrIn,omitempty"`
+	SumOut               int64    `protobuf:"varint,4,opt,name=sumOut" json:"sumOut,omitempty"`
+	AvrOut               int64    `protobuf:"varint,5,opt,name=avrOut" json:"avrOut,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -136,7 +134,7 @@ func (m *PeerMetric) Reset()         { *m = PeerMetric{} }
 func (m *PeerMetric) String() string { return proto.CompactTextString(m) }
 func (*PeerMetric) ProtoMessage()    {}
 func (*PeerMetric) Descriptor() ([]byte, []int) {
-	return fileDescriptor_da41641f55bff5df, []int{2}
+	return fileDescriptor_metric_295631cc212b5411, []int{2}
 }
 func (m *PeerMetric) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PeerMetric.Unmarshal(m, b)
@@ -144,8 +142,8 @@ func (m *PeerMetric) XXX_Unmarshal(b []byte) error {
 func (m *PeerMetric) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PeerMetric.Marshal(b, m, deterministic)
 }
-func (m *PeerMetric) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PeerMetric.Merge(m, src)
+func (dst *PeerMetric) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PeerMetric.Merge(dst, src)
 }
 func (m *PeerMetric) XXX_Size() int {
 	return xxx_messageInfo_PeerMetric.Size(m)
@@ -198,9 +196,9 @@ func init() {
 	proto.RegisterEnum("types.MetricType", MetricType_name, MetricType_value)
 }
 
-func init() { proto.RegisterFile("metric.proto", fileDescriptor_da41641f55bff5df) }
+func init() { proto.RegisterFile("metric.proto", fileDescriptor_metric_295631cc212b5411) }
 
-var fileDescriptor_da41641f55bff5df = []byte{
+var fileDescriptor_metric_295631cc212b5411 = []byte{
 	// 251 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x90, 0x4d, 0x4b, 0xc3, 0x40,
 	0x10, 0x40, 0x5d, 0x63, 0x5a, 0x98, 0x94, 0x5a, 0x17, 0x91, 0x9c, 0x24, 0xf4, 0x62, 0xe8, 0x21,
diff --git a/types/node.pb.go b/types/node.pb.go
index a69299095..498003119 100644
--- a/types/node.pb.go
+++ b/types/node.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: node.proto
 
-package types
+package types // import "github.com/aergoio/aergo/types"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -20,8 +20,8 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type PeerAddress struct {
 	// address is string representation of ip address or domain name.
-	Address              string   `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-	Port                 uint32   `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"`
+	Address              string   `protobuf:"bytes,1,opt,name=address" json:"address,omitempty"`
+	Port                 uint32   `protobuf:"varint,2,opt,name=port" json:"port,omitempty"`
 	PeerID               []byte   `protobuf:"bytes,3,opt,name=peerID,proto3" json:"peerID,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -32,7 +32,7 @@ func (m *PeerAddress) Reset()         { *m = PeerAddress{} }
 func (m *PeerAddress) String() string { return proto.CompactTextString(m) }
 func (*PeerAddress) ProtoMessage()    {}
 func (*PeerAddress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_0c843d59d2d938e7, []int{0}
+	return fileDescriptor_node_8e9c8d3902796194, []int{0}
 }
 func (m *PeerAddress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PeerAddress.Unmarshal(m, b)
@@ -40,8 +40,8 @@ func (m *PeerAddress) XXX_Unmarshal(b []byte) error {
 func (m *PeerAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PeerAddress.Marshal(b, m, deterministic)
 }
-func (m *PeerAddress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PeerAddress.Merge(m, src)
+func (dst *PeerAddress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PeerAddress.Merge(dst, src)
 }
 func (m *PeerAddress) XXX_Size() int {
 	return xxx_messageInfo_PeerAddress.Size(m)
@@ -77,9 +77,9 @@ func init() {
 	proto.RegisterType((*PeerAddress)(nil), "types.PeerAddress")
 }
 
-func init() { proto.RegisterFile("node.proto", fileDescriptor_0c843d59d2d938e7) }
+func init() { proto.RegisterFile("node.proto", fileDescriptor_node_8e9c8d3902796194) }
 
-var fileDescriptor_0c843d59d2d938e7 = []byte{
+var fileDescriptor_node_8e9c8d3902796194 = []byte{
 	// 141 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xca, 0xcb, 0x4f, 0x49,
 	0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2d, 0xa9, 0x2c, 0x48, 0x2d, 0x56, 0x0a, 0xe6,
diff --git a/types/p2p.pb.go b/types/p2p.pb.go
index de0bef814..303a79190 100644
--- a/types/p2p.pb.go
+++ b/types/p2p.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: p2p.proto
 
-package types
+package types // import "github.com/aergoio/aergo/types"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -86,7 +86,6 @@ var ResultStatus_name = map[int32]string{
 	15: "DATA_LOSS",
 	16: "UNAUTHENTICATED",
 }
-
 var ResultStatus_value = map[string]int32{
 	"OK":                  0,
 	"CANCELED":            1,
@@ -110,22 +109,21 @@ var ResultStatus_value = map[string]int32{
 func (x ResultStatus) String() string {
 	return proto.EnumName(ResultStatus_name, int32(x))
 }
-
 func (ResultStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{0}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{0}
 }
 
 // MsgHeader contains common properties of all p2p messages
 type MsgHeader struct {
 	// Deprecated client version.
-	ClientVersion string `protobuf:"bytes,1,opt,name=clientVersion,proto3" json:"clientVersion,omitempty"`
+	ClientVersion string `protobuf:"bytes,1,opt,name=clientVersion" json:"clientVersion,omitempty"`
 	// unix time
-	Timestamp int64 `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+	Timestamp int64 `protobuf:"varint,2,opt,name=timestamp" json:"timestamp,omitempty"`
 	// allows requesters to use request data when processing a response
-	Id string `protobuf:"bytes,3,opt,name=id,proto3" json:"id,omitempty"`
+	Id string `protobuf:"bytes,3,opt,name=id" json:"id,omitempty"`
 	// Gossip is flag to have receiver peer gossip the message to neighbors
 	// Deprecated whether to gossip other peers is determined by subprotocol since version 0.3.0 .
-	Gossip bool `protobuf:"varint,4,opt,name=gossip,proto3" json:"gossip,omitempty"`
+	Gossip bool `protobuf:"varint,4,opt,name=gossip" json:"gossip,omitempty"`
 	// PeerID is id of node that created the message (not the peer that may have sent it). =base58(mh(sha256(nodePubKey)))
 	PeerID []byte `protobuf:"bytes,5,opt,name=peerID,proto3" json:"peerID,omitempty"`
 	// nodePubKey Authoring node Secp256k1 public key (32bytes) - protobufs serielized
@@ -133,9 +131,9 @@ type MsgHeader struct {
 	// signature of message data + method specific data by message authoring node. format: string([]bytes)
 	Sign []byte `protobuf:"bytes,7,opt,name=sign,proto3" json:"sign,omitempty"`
 	// sub category of message. the receiving peer determines how to deserialize payload data and whether to spread messages to other peers
-	Subprotocol uint32 `protobuf:"varint,8,opt,name=subprotocol,proto3" json:"subprotocol,omitempty"`
+	Subprotocol uint32 `protobuf:"varint,8,opt,name=subprotocol" json:"subprotocol,omitempty"`
 	// size of bytes of the payload
-	Length               uint32   `protobuf:"varint,9,opt,name=length,proto3" json:"length,omitempty"`
+	Length               uint32   `protobuf:"varint,9,opt,name=length" json:"length,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -145,7 +143,7 @@ func (m *MsgHeader) Reset()         { *m = MsgHeader{} }
 func (m *MsgHeader) String() string { return proto.CompactTextString(m) }
 func (*MsgHeader) ProtoMessage()    {}
 func (*MsgHeader) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{0}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{0}
 }
 func (m *MsgHeader) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MsgHeader.Unmarshal(m, b)
@@ -153,8 +151,8 @@ func (m *MsgHeader) XXX_Unmarshal(b []byte) error {
 func (m *MsgHeader) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MsgHeader.Marshal(b, m, deterministic)
 }
-func (m *MsgHeader) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgHeader.Merge(m, src)
+func (dst *MsgHeader) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgHeader.Merge(dst, src)
 }
 func (m *MsgHeader) XXX_Size() int {
 	return xxx_messageInfo_MsgHeader.Size(m)
@@ -230,7 +228,7 @@ func (m *MsgHeader) GetLength() uint32 {
 
 // Deprecated P2PMessage is data structure for aergo v0.2 or earlier. This structure is not used anymore since v0.3.0.
 type P2PMessage struct {
-	Header               *MsgHeader `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"`
+	Header               *MsgHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"`
 	Data                 []byte     `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
 	XXX_unrecognized     []byte     `json:"-"`
@@ -241,7 +239,7 @@ func (m *P2PMessage) Reset()         { *m = P2PMessage{} }
 func (m *P2PMessage) String() string { return proto.CompactTextString(m) }
 func (*P2PMessage) ProtoMessage()    {}
 func (*P2PMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{1}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{1}
 }
 func (m *P2PMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_P2PMessage.Unmarshal(m, b)
@@ -249,8 +247,8 @@ func (m *P2PMessage) XXX_Unmarshal(b []byte) error {
 func (m *P2PMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_P2PMessage.Marshal(b, m, deterministic)
 }
-func (m *P2PMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_P2PMessage.Merge(m, src)
+func (dst *P2PMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_P2PMessage.Merge(dst, src)
 }
 func (m *P2PMessage) XXX_Size() int {
 	return xxx_messageInfo_P2PMessage.Size(m)
@@ -278,7 +276,7 @@ func (m *P2PMessage) GetData() []byte {
 // Ping request message
 type Ping struct {
 	BestBlockHash        []byte   `protobuf:"bytes,1,opt,name=best_block_hash,json=bestBlockHash,proto3" json:"best_block_hash,omitempty"`
-	BestHeight           uint64   `protobuf:"varint,2,opt,name=best_height,json=bestHeight,proto3" json:"best_height,omitempty"`
+	BestHeight           uint64   `protobuf:"varint,2,opt,name=best_height,json=bestHeight" json:"best_height,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -288,7 +286,7 @@ func (m *Ping) Reset()         { *m = Ping{} }
 func (m *Ping) String() string { return proto.CompactTextString(m) }
 func (*Ping) ProtoMessage()    {}
 func (*Ping) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{2}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{2}
 }
 func (m *Ping) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Ping.Unmarshal(m, b)
@@ -296,8 +294,8 @@ func (m *Ping) XXX_Unmarshal(b []byte) error {
 func (m *Ping) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Ping.Marshal(b, m, deterministic)
 }
-func (m *Ping) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Ping.Merge(m, src)
+func (dst *Ping) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Ping.Merge(dst, src)
 }
 func (m *Ping) XXX_Size() int {
 	return xxx_messageInfo_Ping.Size(m)
@@ -325,7 +323,7 @@ func (m *Ping) GetBestHeight() uint64 {
 // Ping response message
 type Pong struct {
 	BestBlockHash        []byte   `protobuf:"bytes,1,opt,name=bestBlockHash,proto3" json:"bestBlockHash,omitempty"`
-	BestHeight           uint64   `protobuf:"varint,2,opt,name=bestHeight,proto3" json:"bestHeight,omitempty"`
+	BestHeight           uint64   `protobuf:"varint,2,opt,name=bestHeight" json:"bestHeight,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -335,7 +333,7 @@ func (m *Pong) Reset()         { *m = Pong{} }
 func (m *Pong) String() string { return proto.CompactTextString(m) }
 func (*Pong) ProtoMessage()    {}
 func (*Pong) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{3}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{3}
 }
 func (m *Pong) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Pong.Unmarshal(m, b)
@@ -343,8 +341,8 @@ func (m *Pong) XXX_Unmarshal(b []byte) error {
 func (m *Pong) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Pong.Marshal(b, m, deterministic)
 }
-func (m *Pong) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Pong.Merge(m, src)
+func (dst *Pong) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Pong.Merge(dst, src)
 }
 func (m *Pong) XXX_Size() int {
 	return xxx_messageInfo_Pong.Size(m)
@@ -371,14 +369,14 @@ func (m *Pong) GetBestHeight() uint64 {
 
 // Status is peer status exchanged during handshaking.
 type Status struct {
-	Sender        *PeerAddress `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"`
+	Sender        *PeerAddress `protobuf:"bytes,1,opt,name=sender" json:"sender,omitempty"`
 	BestBlockHash []byte       `protobuf:"bytes,2,opt,name=bestBlockHash,proto3" json:"bestBlockHash,omitempty"`
-	BestHeight    uint64       `protobuf:"varint,3,opt,name=bestHeight,proto3" json:"bestHeight,omitempty"`
+	BestHeight    uint64       `protobuf:"varint,3,opt,name=bestHeight" json:"bestHeight,omitempty"`
 	ChainID       []byte       `protobuf:"bytes,4,opt,name=chainID,proto3" json:"chainID,omitempty"`
 	// noExpose means that peer doesn't want to be known to other peers.
-	NoExpose bool `protobuf:"varint,5,opt,name=noExpose,proto3" json:"noExpose,omitempty"`
+	NoExpose bool `protobuf:"varint,5,opt,name=noExpose" json:"noExpose,omitempty"`
 	// version of server binary
-	Version              string   `protobuf:"bytes,6,opt,name=version,proto3" json:"version,omitempty"`
+	Version              string   `protobuf:"bytes,6,opt,name=version" json:"version,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -388,7 +386,7 @@ func (m *Status) Reset()         { *m = Status{} }
 func (m *Status) String() string { return proto.CompactTextString(m) }
 func (*Status) ProtoMessage()    {}
 func (*Status) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{4}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{4}
 }
 func (m *Status) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Status.Unmarshal(m, b)
@@ -396,8 +394,8 @@ func (m *Status) XXX_Unmarshal(b []byte) error {
 func (m *Status) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Status.Marshal(b, m, deterministic)
 }
-func (m *Status) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Status.Merge(m, src)
+func (dst *Status) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Status.Merge(dst, src)
 }
 func (m *Status) XXX_Size() int {
 	return xxx_messageInfo_Status.Size(m)
@@ -452,7 +450,7 @@ func (m *Status) GetVersion() string {
 
 // GoAwayNotice is sent before host peer is closing connection to remote peer. it contains why the host closing connection.
 type GoAwayNotice struct {
-	Message              string   `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"`
+	Message              string   `protobuf:"bytes,1,opt,name=message" json:"message,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -462,7 +460,7 @@ func (m *GoAwayNotice) Reset()         { *m = GoAwayNotice{} }
 func (m *GoAwayNotice) String() string { return proto.CompactTextString(m) }
 func (*GoAwayNotice) ProtoMessage()    {}
 func (*GoAwayNotice) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{5}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{5}
 }
 func (m *GoAwayNotice) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoAwayNotice.Unmarshal(m, b)
@@ -470,8 +468,8 @@ func (m *GoAwayNotice) XXX_Unmarshal(b []byte) error {
 func (m *GoAwayNotice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GoAwayNotice.Marshal(b, m, deterministic)
 }
-func (m *GoAwayNotice) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GoAwayNotice.Merge(m, src)
+func (dst *GoAwayNotice) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoAwayNotice.Merge(dst, src)
 }
 func (m *GoAwayNotice) XXX_Size() int {
 	return xxx_messageInfo_GoAwayNotice.Size(m)
@@ -490,8 +488,8 @@ func (m *GoAwayNotice) GetMessage() string {
 }
 
 type AddressesRequest struct {
-	Sender               *PeerAddress `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"`
-	MaxSize              uint32       `protobuf:"varint,2,opt,name=maxSize,proto3" json:"maxSize,omitempty"`
+	Sender               *PeerAddress `protobuf:"bytes,1,opt,name=sender" json:"sender,omitempty"`
+	MaxSize              uint32       `protobuf:"varint,2,opt,name=maxSize" json:"maxSize,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -501,7 +499,7 @@ func (m *AddressesRequest) Reset()         { *m = AddressesRequest{} }
 func (m *AddressesRequest) String() string { return proto.CompactTextString(m) }
 func (*AddressesRequest) ProtoMessage()    {}
 func (*AddressesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{6}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{6}
 }
 func (m *AddressesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddressesRequest.Unmarshal(m, b)
@@ -509,8 +507,8 @@ func (m *AddressesRequest) XXX_Unmarshal(b []byte) error {
 func (m *AddressesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddressesRequest.Marshal(b, m, deterministic)
 }
-func (m *AddressesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddressesRequest.Merge(m, src)
+func (dst *AddressesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddressesRequest.Merge(dst, src)
 }
 func (m *AddressesRequest) XXX_Size() int {
 	return xxx_messageInfo_AddressesRequest.Size(m)
@@ -536,8 +534,8 @@ func (m *AddressesRequest) GetMaxSize() uint32 {
 }
 
 type AddressesResponse struct {
-	Status               ResultStatus   `protobuf:"varint,1,opt,name=status,proto3,enum=types.ResultStatus" json:"status,omitempty"`
-	Peers                []*PeerAddress `protobuf:"bytes,2,rep,name=peers,proto3" json:"peers,omitempty"`
+	Status               ResultStatus   `protobuf:"varint,1,opt,name=status,enum=types.ResultStatus" json:"status,omitempty"`
+	Peers                []*PeerAddress `protobuf:"bytes,2,rep,name=peers" json:"peers,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
 	XXX_unrecognized     []byte         `json:"-"`
 	XXX_sizecache        int32          `json:"-"`
@@ -547,7 +545,7 @@ func (m *AddressesResponse) Reset()         { *m = AddressesResponse{} }
 func (m *AddressesResponse) String() string { return proto.CompactTextString(m) }
 func (*AddressesResponse) ProtoMessage()    {}
 func (*AddressesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{7}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{7}
 }
 func (m *AddressesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddressesResponse.Unmarshal(m, b)
@@ -555,8 +553,8 @@ func (m *AddressesResponse) XXX_Unmarshal(b []byte) error {
 func (m *AddressesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AddressesResponse.Marshal(b, m, deterministic)
 }
-func (m *AddressesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AddressesResponse.Merge(m, src)
+func (dst *AddressesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddressesResponse.Merge(dst, src)
 }
 func (m *AddressesResponse) XXX_Size() int {
 	return xxx_messageInfo_AddressesResponse.Size(m)
@@ -586,7 +584,7 @@ func (m *AddressesResponse) GetPeers() []*PeerAddress {
 // knows that block already at best effort.
 type NewBlockNotice struct {
 	BlockHash            []byte   `protobuf:"bytes,1,opt,name=blockHash,proto3" json:"blockHash,omitempty"`
-	BlockNo              uint64   `protobuf:"varint,2,opt,name=blockNo,proto3" json:"blockNo,omitempty"`
+	BlockNo              uint64   `protobuf:"varint,2,opt,name=blockNo" json:"blockNo,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -596,7 +594,7 @@ func (m *NewBlockNotice) Reset()         { *m = NewBlockNotice{} }
 func (m *NewBlockNotice) String() string { return proto.CompactTextString(m) }
 func (*NewBlockNotice) ProtoMessage()    {}
 func (*NewBlockNotice) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{8}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{8}
 }
 func (m *NewBlockNotice) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NewBlockNotice.Unmarshal(m, b)
@@ -604,8 +602,8 @@ func (m *NewBlockNotice) XXX_Unmarshal(b []byte) error {
 func (m *NewBlockNotice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NewBlockNotice.Marshal(b, m, deterministic)
 }
-func (m *NewBlockNotice) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NewBlockNotice.Merge(m, src)
+func (dst *NewBlockNotice) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NewBlockNotice.Merge(dst, src)
 }
 func (m *NewBlockNotice) XXX_Size() int {
 	return xxx_messageInfo_NewBlockNotice.Size(m)
@@ -634,8 +632,8 @@ func (m *NewBlockNotice) GetBlockNo() uint64 {
 // It contains whole block information
 type BlockProducedNotice struct {
 	ProducerID           []byte   `protobuf:"bytes,1,opt,name=producerID,proto3" json:"producerID,omitempty"`
-	BlockNo              uint64   `protobuf:"varint,2,opt,name=blockNo,proto3" json:"blockNo,omitempty"`
-	Block                *Block   `protobuf:"bytes,3,opt,name=block,proto3" json:"block,omitempty"`
+	BlockNo              uint64   `protobuf:"varint,2,opt,name=blockNo" json:"blockNo,omitempty"`
+	Block                *Block   `protobuf:"bytes,3,opt,name=block" json:"block,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -645,7 +643,7 @@ func (m *BlockProducedNotice) Reset()         { *m = BlockProducedNotice{} }
 func (m *BlockProducedNotice) String() string { return proto.CompactTextString(m) }
 func (*BlockProducedNotice) ProtoMessage()    {}
 func (*BlockProducedNotice) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{9}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{9}
 }
 func (m *BlockProducedNotice) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BlockProducedNotice.Unmarshal(m, b)
@@ -653,8 +651,8 @@ func (m *BlockProducedNotice) XXX_Unmarshal(b []byte) error {
 func (m *BlockProducedNotice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BlockProducedNotice.Marshal(b, m, deterministic)
 }
-func (m *BlockProducedNotice) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BlockProducedNotice.Merge(m, src)
+func (dst *BlockProducedNotice) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BlockProducedNotice.Merge(dst, src)
 }
 func (m *BlockProducedNotice) XXX_Size() int {
 	return xxx_messageInfo_BlockProducedNotice.Size(m)
@@ -691,11 +689,11 @@ type GetBlockHeadersRequest struct {
 	// Hash indicated referenced block hash. server will return headers from this block.
 	Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"`
 	// Block height instead of hash will be used for the first returned block, if hash is nil or empty
-	Height uint64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"`
-	Offset uint64 `protobuf:"varint,3,opt,name=offset,proto3" json:"offset,omitempty"`
-	Size   uint32 `protobuf:"varint,4,opt,name=size,proto3" json:"size,omitempty"`
+	Height uint64 `protobuf:"varint,2,opt,name=height" json:"height,omitempty"`
+	Offset uint64 `protobuf:"varint,3,opt,name=offset" json:"offset,omitempty"`
+	Size   uint32 `protobuf:"varint,4,opt,name=size" json:"size,omitempty"`
 	// default is false.
-	Asc                  bool     `protobuf:"varint,5,opt,name=asc,proto3" json:"asc,omitempty"`
+	Asc                  bool     `protobuf:"varint,5,opt,name=asc" json:"asc,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -705,7 +703,7 @@ func (m *GetBlockHeadersRequest) Reset()         { *m = GetBlockHeadersRequest{}
 func (m *GetBlockHeadersRequest) String() string { return proto.CompactTextString(m) }
 func (*GetBlockHeadersRequest) ProtoMessage()    {}
 func (*GetBlockHeadersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{10}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{10}
 }
 func (m *GetBlockHeadersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBlockHeadersRequest.Unmarshal(m, b)
@@ -713,8 +711,8 @@ func (m *GetBlockHeadersRequest) XXX_Unmarshal(b []byte) error {
 func (m *GetBlockHeadersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetBlockHeadersRequest.Marshal(b, m, deterministic)
 }
-func (m *GetBlockHeadersRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetBlockHeadersRequest.Merge(m, src)
+func (dst *GetBlockHeadersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBlockHeadersRequest.Merge(dst, src)
 }
 func (m *GetBlockHeadersRequest) XXX_Size() int {
 	return xxx_messageInfo_GetBlockHeadersRequest.Size(m)
@@ -762,10 +760,10 @@ func (m *GetBlockHeadersRequest) GetAsc() bool {
 
 // GetBlockResponse contains response of GetBlockRequest.
 type GetBlockHeadersResponse struct {
-	Status               ResultStatus   `protobuf:"varint,1,opt,name=status,proto3,enum=types.ResultStatus" json:"status,omitempty"`
+	Status               ResultStatus   `protobuf:"varint,1,opt,name=status,enum=types.ResultStatus" json:"status,omitempty"`
 	Hashes               [][]byte       `protobuf:"bytes,2,rep,name=hashes,proto3" json:"hashes,omitempty"`
-	Headers              []*BlockHeader `protobuf:"bytes,3,rep,name=headers,proto3" json:"headers,omitempty"`
-	HasNext              bool           `protobuf:"varint,4,opt,name=hasNext,proto3" json:"hasNext,omitempty"`
+	Headers              []*BlockHeader `protobuf:"bytes,3,rep,name=headers" json:"headers,omitempty"`
+	HasNext              bool           `protobuf:"varint,4,opt,name=hasNext" json:"hasNext,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
 	XXX_unrecognized     []byte         `json:"-"`
 	XXX_sizecache        int32          `json:"-"`
@@ -775,7 +773,7 @@ func (m *GetBlockHeadersResponse) Reset()         { *m = GetBlockHeadersResponse
 func (m *GetBlockHeadersResponse) String() string { return proto.CompactTextString(m) }
 func (*GetBlockHeadersResponse) ProtoMessage()    {}
 func (*GetBlockHeadersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{11}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{11}
 }
 func (m *GetBlockHeadersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBlockHeadersResponse.Unmarshal(m, b)
@@ -783,8 +781,8 @@ func (m *GetBlockHeadersResponse) XXX_Unmarshal(b []byte) error {
 func (m *GetBlockHeadersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetBlockHeadersResponse.Marshal(b, m, deterministic)
 }
-func (m *GetBlockHeadersResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetBlockHeadersResponse.Merge(m, src)
+func (dst *GetBlockHeadersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBlockHeadersResponse.Merge(dst, src)
 }
 func (m *GetBlockHeadersResponse) XXX_Size() int {
 	return xxx_messageInfo_GetBlockHeadersResponse.Size(m)
@@ -835,7 +833,7 @@ func (m *GetBlockRequest) Reset()         { *m = GetBlockRequest{} }
 func (m *GetBlockRequest) String() string { return proto.CompactTextString(m) }
 func (*GetBlockRequest) ProtoMessage()    {}
 func (*GetBlockRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{12}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{12}
 }
 func (m *GetBlockRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBlockRequest.Unmarshal(m, b)
@@ -843,8 +841,8 @@ func (m *GetBlockRequest) XXX_Unmarshal(b []byte) error {
 func (m *GetBlockRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetBlockRequest.Marshal(b, m, deterministic)
 }
-func (m *GetBlockRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetBlockRequest.Merge(m, src)
+func (dst *GetBlockRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBlockRequest.Merge(dst, src)
 }
 func (m *GetBlockRequest) XXX_Size() int {
 	return xxx_messageInfo_GetBlockRequest.Size(m)
@@ -864,9 +862,9 @@ func (m *GetBlockRequest) GetHashes() [][]byte {
 
 // GetBlockResponse contains response of GetBlockRequest.
 type GetBlockResponse struct {
-	Status               ResultStatus `protobuf:"varint,1,opt,name=status,proto3,enum=types.ResultStatus" json:"status,omitempty"`
-	Blocks               []*Block     `protobuf:"bytes,2,rep,name=blocks,proto3" json:"blocks,omitempty"`
-	HasNext              bool         `protobuf:"varint,3,opt,name=hasNext,proto3" json:"hasNext,omitempty"`
+	Status               ResultStatus `protobuf:"varint,1,opt,name=status,enum=types.ResultStatus" json:"status,omitempty"`
+	Blocks               []*Block     `protobuf:"bytes,2,rep,name=blocks" json:"blocks,omitempty"`
+	HasNext              bool         `protobuf:"varint,3,opt,name=hasNext" json:"hasNext,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -876,7 +874,7 @@ func (m *GetBlockResponse) Reset()         { *m = GetBlockResponse{} }
 func (m *GetBlockResponse) String() string { return proto.CompactTextString(m) }
 func (*GetBlockResponse) ProtoMessage()    {}
 func (*GetBlockResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{13}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{13}
 }
 func (m *GetBlockResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBlockResponse.Unmarshal(m, b)
@@ -884,8 +882,8 @@ func (m *GetBlockResponse) XXX_Unmarshal(b []byte) error {
 func (m *GetBlockResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetBlockResponse.Marshal(b, m, deterministic)
 }
-func (m *GetBlockResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetBlockResponse.Merge(m, src)
+func (dst *GetBlockResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBlockResponse.Merge(dst, src)
 }
 func (m *GetBlockResponse) XXX_Size() int {
 	return xxx_messageInfo_GetBlockResponse.Size(m)
@@ -928,7 +926,7 @@ func (m *NewTransactionsNotice) Reset()         { *m = NewTransactionsNotice{} }
 func (m *NewTransactionsNotice) String() string { return proto.CompactTextString(m) }
 func (*NewTransactionsNotice) ProtoMessage()    {}
 func (*NewTransactionsNotice) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{14}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{14}
 }
 func (m *NewTransactionsNotice) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NewTransactionsNotice.Unmarshal(m, b)
@@ -936,8 +934,8 @@ func (m *NewTransactionsNotice) XXX_Unmarshal(b []byte) error {
 func (m *NewTransactionsNotice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NewTransactionsNotice.Marshal(b, m, deterministic)
 }
-func (m *NewTransactionsNotice) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NewTransactionsNotice.Merge(m, src)
+func (dst *NewTransactionsNotice) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NewTransactionsNotice.Merge(dst, src)
 }
 func (m *NewTransactionsNotice) XXX_Size() int {
 	return xxx_messageInfo_NewTransactionsNotice.Size(m)
@@ -966,7 +964,7 @@ func (m *GetTransactionsRequest) Reset()         { *m = GetTransactionsRequest{}
 func (m *GetTransactionsRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTransactionsRequest) ProtoMessage()    {}
 func (*GetTransactionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{15}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{15}
 }
 func (m *GetTransactionsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTransactionsRequest.Unmarshal(m, b)
@@ -974,8 +972,8 @@ func (m *GetTransactionsRequest) XXX_Unmarshal(b []byte) error {
 func (m *GetTransactionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTransactionsRequest.Marshal(b, m, deterministic)
 }
-func (m *GetTransactionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTransactionsRequest.Merge(m, src)
+func (dst *GetTransactionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTransactionsRequest.Merge(dst, src)
 }
 func (m *GetTransactionsRequest) XXX_Size() int {
 	return xxx_messageInfo_GetTransactionsRequest.Size(m)
@@ -994,10 +992,10 @@ func (m *GetTransactionsRequest) GetHashes() [][]byte {
 }
 
 type GetTransactionsResponse struct {
-	Status               ResultStatus `protobuf:"varint,1,opt,name=status,proto3,enum=types.ResultStatus" json:"status,omitempty"`
+	Status               ResultStatus `protobuf:"varint,1,opt,name=status,enum=types.ResultStatus" json:"status,omitempty"`
 	Hashes               [][]byte     `protobuf:"bytes,2,rep,name=hashes,proto3" json:"hashes,omitempty"`
-	Txs                  []*Tx        `protobuf:"bytes,3,rep,name=txs,proto3" json:"txs,omitempty"`
-	HasNext              bool         `protobuf:"varint,4,opt,name=hasNext,proto3" json:"hasNext,omitempty"`
+	Txs                  []*Tx        `protobuf:"bytes,3,rep,name=txs" json:"txs,omitempty"`
+	HasNext              bool         `protobuf:"varint,4,opt,name=hasNext" json:"hasNext,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -1007,7 +1005,7 @@ func (m *GetTransactionsResponse) Reset()         { *m = GetTransactionsResponse
 func (m *GetTransactionsResponse) String() string { return proto.CompactTextString(m) }
 func (*GetTransactionsResponse) ProtoMessage()    {}
 func (*GetTransactionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{16}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{16}
 }
 func (m *GetTransactionsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetTransactionsResponse.Unmarshal(m, b)
@@ -1015,8 +1013,8 @@ func (m *GetTransactionsResponse) XXX_Unmarshal(b []byte) error {
 func (m *GetTransactionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetTransactionsResponse.Marshal(b, m, deterministic)
 }
-func (m *GetTransactionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetTransactionsResponse.Merge(m, src)
+func (dst *GetTransactionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTransactionsResponse.Merge(dst, src)
 }
 func (m *GetTransactionsResponse) XXX_Size() int {
 	return xxx_messageInfo_GetTransactionsResponse.Size(m)
@@ -1070,7 +1068,7 @@ func (m *GetMissingRequest) Reset()         { *m = GetMissingRequest{} }
 func (m *GetMissingRequest) String() string { return proto.CompactTextString(m) }
 func (*GetMissingRequest) ProtoMessage()    {}
 func (*GetMissingRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{17}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{17}
 }
 func (m *GetMissingRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMissingRequest.Unmarshal(m, b)
@@ -1078,8 +1076,8 @@ func (m *GetMissingRequest) XXX_Unmarshal(b []byte) error {
 func (m *GetMissingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetMissingRequest.Marshal(b, m, deterministic)
 }
-func (m *GetMissingRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetMissingRequest.Merge(m, src)
+func (dst *GetMissingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetMissingRequest.Merge(dst, src)
 }
 func (m *GetMissingRequest) XXX_Size() int {
 	return xxx_messageInfo_GetMissingRequest.Size(m)
@@ -1116,7 +1114,7 @@ func (m *GetAncestorRequest) Reset()         { *m = GetAncestorRequest{} }
 func (m *GetAncestorRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAncestorRequest) ProtoMessage()    {}
 func (*GetAncestorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{18}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{18}
 }
 func (m *GetAncestorRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAncestorRequest.Unmarshal(m, b)
@@ -1124,8 +1122,8 @@ func (m *GetAncestorRequest) XXX_Unmarshal(b []byte) error {
 func (m *GetAncestorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAncestorRequest.Marshal(b, m, deterministic)
 }
-func (m *GetAncestorRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAncestorRequest.Merge(m, src)
+func (dst *GetAncestorRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAncestorRequest.Merge(dst, src)
 }
 func (m *GetAncestorRequest) XXX_Size() int {
 	return xxx_messageInfo_GetAncestorRequest.Size(m)
@@ -1144,9 +1142,9 @@ func (m *GetAncestorRequest) GetHashes() [][]byte {
 }
 
 type GetAncestorResponse struct {
-	Status               ResultStatus `protobuf:"varint,1,opt,name=status,proto3,enum=types.ResultStatus" json:"status,omitempty"`
+	Status               ResultStatus `protobuf:"varint,1,opt,name=status,enum=types.ResultStatus" json:"status,omitempty"`
 	AncestorHash         []byte       `protobuf:"bytes,2,opt,name=ancestorHash,proto3" json:"ancestorHash,omitempty"`
-	AncestorNo           uint64       `protobuf:"varint,3,opt,name=ancestorNo,proto3" json:"ancestorNo,omitempty"`
+	AncestorNo           uint64       `protobuf:"varint,3,opt,name=ancestorNo" json:"ancestorNo,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -1156,7 +1154,7 @@ func (m *GetAncestorResponse) Reset()         { *m = GetAncestorResponse{} }
 func (m *GetAncestorResponse) String() string { return proto.CompactTextString(m) }
 func (*GetAncestorResponse) ProtoMessage()    {}
 func (*GetAncestorResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{19}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{19}
 }
 func (m *GetAncestorResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAncestorResponse.Unmarshal(m, b)
@@ -1164,8 +1162,8 @@ func (m *GetAncestorResponse) XXX_Unmarshal(b []byte) error {
 func (m *GetAncestorResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetAncestorResponse.Marshal(b, m, deterministic)
 }
-func (m *GetAncestorResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetAncestorResponse.Merge(m, src)
+func (dst *GetAncestorResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAncestorResponse.Merge(dst, src)
 }
 func (m *GetAncestorResponse) XXX_Size() int {
 	return xxx_messageInfo_GetAncestorResponse.Size(m)
@@ -1198,7 +1196,7 @@ func (m *GetAncestorResponse) GetAncestorNo() uint64 {
 }
 
 type GetHashByNo struct {
-	BlockNo              uint64   `protobuf:"varint,1,opt,name=blockNo,proto3" json:"blockNo,omitempty"`
+	BlockNo              uint64   `protobuf:"varint,1,opt,name=blockNo" json:"blockNo,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1208,7 +1206,7 @@ func (m *GetHashByNo) Reset()         { *m = GetHashByNo{} }
 func (m *GetHashByNo) String() string { return proto.CompactTextString(m) }
 func (*GetHashByNo) ProtoMessage()    {}
 func (*GetHashByNo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{20}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{20}
 }
 func (m *GetHashByNo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetHashByNo.Unmarshal(m, b)
@@ -1216,8 +1214,8 @@ func (m *GetHashByNo) XXX_Unmarshal(b []byte) error {
 func (m *GetHashByNo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetHashByNo.Marshal(b, m, deterministic)
 }
-func (m *GetHashByNo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetHashByNo.Merge(m, src)
+func (dst *GetHashByNo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetHashByNo.Merge(dst, src)
 }
 func (m *GetHashByNo) XXX_Size() int {
 	return xxx_messageInfo_GetHashByNo.Size(m)
@@ -1236,7 +1234,7 @@ func (m *GetHashByNo) GetBlockNo() uint64 {
 }
 
 type GetHashByNoResponse struct {
-	Status               ResultStatus `protobuf:"varint,1,opt,name=status,proto3,enum=types.ResultStatus" json:"status,omitempty"`
+	Status               ResultStatus `protobuf:"varint,1,opt,name=status,enum=types.ResultStatus" json:"status,omitempty"`
 	BlockHash            []byte       `protobuf:"bytes,2,opt,name=blockHash,proto3" json:"blockHash,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
@@ -1247,7 +1245,7 @@ func (m *GetHashByNoResponse) Reset()         { *m = GetHashByNoResponse{} }
 func (m *GetHashByNoResponse) String() string { return proto.CompactTextString(m) }
 func (*GetHashByNoResponse) ProtoMessage()    {}
 func (*GetHashByNoResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{21}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{21}
 }
 func (m *GetHashByNoResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetHashByNoResponse.Unmarshal(m, b)
@@ -1255,8 +1253,8 @@ func (m *GetHashByNoResponse) XXX_Unmarshal(b []byte) error {
 func (m *GetHashByNoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetHashByNoResponse.Marshal(b, m, deterministic)
 }
-func (m *GetHashByNoResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetHashByNoResponse.Merge(m, src)
+func (dst *GetHashByNoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetHashByNoResponse.Merge(dst, src)
 }
 func (m *GetHashByNoResponse) XXX_Size() int {
 	return xxx_messageInfo_GetHashByNoResponse.Size(m)
@@ -1286,9 +1284,9 @@ type GetHashesRequest struct {
 	// prevHash indicated referenced block hash. server will return hashes after this block.
 	PrevHash []byte `protobuf:"bytes,1,opt,name=prevHash,proto3" json:"prevHash,omitempty"`
 	// prevNumber indicated referenced block
-	PrevNumber uint64 `protobuf:"varint,2,opt,name=prevNumber,proto3" json:"prevNumber,omitempty"`
+	PrevNumber uint64 `protobuf:"varint,2,opt,name=prevNumber" json:"prevNumber,omitempty"`
 	// maximum count of hashes that want to get
-	Size                 uint64   `protobuf:"varint,3,opt,name=size,proto3" json:"size,omitempty"`
+	Size                 uint64   `protobuf:"varint,3,opt,name=size" json:"size,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1298,7 +1296,7 @@ func (m *GetHashesRequest) Reset()         { *m = GetHashesRequest{} }
 func (m *GetHashesRequest) String() string { return proto.CompactTextString(m) }
 func (*GetHashesRequest) ProtoMessage()    {}
 func (*GetHashesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{22}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{22}
 }
 func (m *GetHashesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetHashesRequest.Unmarshal(m, b)
@@ -1306,8 +1304,8 @@ func (m *GetHashesRequest) XXX_Unmarshal(b []byte) error {
 func (m *GetHashesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetHashesRequest.Marshal(b, m, deterministic)
 }
-func (m *GetHashesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetHashesRequest.Merge(m, src)
+func (dst *GetHashesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetHashesRequest.Merge(dst, src)
 }
 func (m *GetHashesRequest) XXX_Size() int {
 	return xxx_messageInfo_GetHashesRequest.Size(m)
@@ -1341,9 +1339,9 @@ func (m *GetHashesRequest) GetSize() uint64 {
 
 // GetHashesResponse contains response of GetHashesRequest.
 type GetHashesResponse struct {
-	Status               ResultStatus `protobuf:"varint,1,opt,name=status,proto3,enum=types.ResultStatus" json:"status,omitempty"`
+	Status               ResultStatus `protobuf:"varint,1,opt,name=status,enum=types.ResultStatus" json:"status,omitempty"`
 	Hashes               [][]byte     `protobuf:"bytes,2,rep,name=hashes,proto3" json:"hashes,omitempty"`
-	HasNext              bool         `protobuf:"varint,3,opt,name=hasNext,proto3" json:"hasNext,omitempty"`
+	HasNext              bool         `protobuf:"varint,3,opt,name=hasNext" json:"hasNext,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -1353,7 +1351,7 @@ func (m *GetHashesResponse) Reset()         { *m = GetHashesResponse{} }
 func (m *GetHashesResponse) String() string { return proto.CompactTextString(m) }
 func (*GetHashesResponse) ProtoMessage()    {}
 func (*GetHashesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e7fdddb109e6467a, []int{23}
+	return fileDescriptor_p2p_7867c4c4ce55e2e0, []int{23}
 }
 func (m *GetHashesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetHashesResponse.Unmarshal(m, b)
@@ -1361,8 +1359,8 @@ func (m *GetHashesResponse) XXX_Unmarshal(b []byte) error {
 func (m *GetHashesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetHashesResponse.Marshal(b, m, deterministic)
 }
-func (m *GetHashesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetHashesResponse.Merge(m, src)
+func (dst *GetHashesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetHashesResponse.Merge(dst, src)
 }
 func (m *GetHashesResponse) XXX_Size() int {
 	return xxx_messageInfo_GetHashesResponse.Size(m)
@@ -1422,9 +1420,9 @@ func init() {
 	proto.RegisterEnum("types.ResultStatus", ResultStatus_name, ResultStatus_value)
 }
 
-func init() { proto.RegisterFile("p2p.proto", fileDescriptor_e7fdddb109e6467a) }
+func init() { proto.RegisterFile("p2p.proto", fileDescriptor_p2p_7867c4c4ce55e2e0) }
 
-var fileDescriptor_e7fdddb109e6467a = []byte{
+var fileDescriptor_p2p_7867c4c4ce55e2e0 = []byte{
 	// 1203 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdd, 0x72, 0xda, 0x46,
 	0x14, 0xae, 0x00, 0x63, 0x38, 0x80, 0x2d, 0xaf, 0x9b, 0x84, 0x71, 0x33, 0x2e, 0xa3, 0xc9, 0xb4,
diff --git a/types/pmap.pb.go b/types/pmap.pb.go
index 54287e215..11ff6e2ca 100644
--- a/types/pmap.pb.go
+++ b/types/pmap.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: pmap.proto
 
-package types
+package types // import "github.com/aergoio/aergo/types"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -20,9 +20,9 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 // query to polaris
 type MapQuery struct {
-	Status               *Status  `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
-	AddMe                bool     `protobuf:"varint,2,opt,name=addMe,proto3" json:"addMe,omitempty"`
-	Size                 int32    `protobuf:"varint,3,opt,name=size,proto3" json:"size,omitempty"`
+	Status               *Status  `protobuf:"bytes,1,opt,name=status" json:"status,omitempty"`
+	AddMe                bool     `protobuf:"varint,2,opt,name=addMe" json:"addMe,omitempty"`
+	Size                 int32    `protobuf:"varint,3,opt,name=size" json:"size,omitempty"`
 	Excludes             [][]byte `protobuf:"bytes,4,rep,name=excludes,proto3" json:"excludes,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -33,7 +33,7 @@ func (m *MapQuery) Reset()         { *m = MapQuery{} }
 func (m *MapQuery) String() string { return proto.CompactTextString(m) }
 func (*MapQuery) ProtoMessage()    {}
 func (*MapQuery) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c373235fa8835f5c, []int{0}
+	return fileDescriptor_pmap_0a38776fb17418f4, []int{0}
 }
 func (m *MapQuery) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MapQuery.Unmarshal(m, b)
@@ -41,8 +41,8 @@ func (m *MapQuery) XXX_Unmarshal(b []byte) error {
 func (m *MapQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MapQuery.Marshal(b, m, deterministic)
 }
-func (m *MapQuery) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MapQuery.Merge(m, src)
+func (dst *MapQuery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MapQuery.Merge(dst, src)
 }
 func (m *MapQuery) XXX_Size() int {
 	return xxx_messageInfo_MapQuery.Size(m)
@@ -82,9 +82,9 @@ func (m *MapQuery) GetExcludes() [][]byte {
 }
 
 type MapResponse struct {
-	Status               ResultStatus   `protobuf:"varint,1,opt,name=status,proto3,enum=types.ResultStatus" json:"status,omitempty"`
-	Addresses            []*PeerAddress `protobuf:"bytes,2,rep,name=addresses,proto3" json:"addresses,omitempty"`
-	Message              string         `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"`
+	Status               ResultStatus   `protobuf:"varint,1,opt,name=status,enum=types.ResultStatus" json:"status,omitempty"`
+	Addresses            []*PeerAddress `protobuf:"bytes,2,rep,name=addresses" json:"addresses,omitempty"`
+	Message              string         `protobuf:"bytes,3,opt,name=message" json:"message,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
 	XXX_unrecognized     []byte         `json:"-"`
 	XXX_sizecache        int32          `json:"-"`
@@ -94,7 +94,7 @@ func (m *MapResponse) Reset()         { *m = MapResponse{} }
 func (m *MapResponse) String() string { return proto.CompactTextString(m) }
 func (*MapResponse) ProtoMessage()    {}
 func (*MapResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c373235fa8835f5c, []int{1}
+	return fileDescriptor_pmap_0a38776fb17418f4, []int{1}
 }
 func (m *MapResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MapResponse.Unmarshal(m, b)
@@ -102,8 +102,8 @@ func (m *MapResponse) XXX_Unmarshal(b []byte) error {
 func (m *MapResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MapResponse.Marshal(b, m, deterministic)
 }
-func (m *MapResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MapResponse.Merge(m, src)
+func (dst *MapResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MapResponse.Merge(dst, src)
 }
 func (m *MapResponse) XXX_Size() int {
 	return xxx_messageInfo_MapResponse.Size(m)
@@ -140,9 +140,9 @@ func init() {
 	proto.RegisterType((*MapResponse)(nil), "types.MapResponse")
 }
 
-func init() { proto.RegisterFile("pmap.proto", fileDescriptor_c373235fa8835f5c) }
+func init() { proto.RegisterFile("pmap.proto", fileDescriptor_pmap_0a38776fb17418f4) }
 
-var fileDescriptor_c373235fa8835f5c = []byte{
+var fileDescriptor_pmap_0a38776fb17418f4 = []byte{
 	// 251 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x50, 0xcd, 0x4a, 0xc4, 0x30,
 	0x10, 0xa6, 0xdb, 0xed, 0xda, 0x4e, 0xd5, 0x43, 0xf4, 0x10, 0x7a, 0x90, 0xb0, 0x20, 0x14, 0x84,
diff --git a/types/polarrpc.pb.go b/types/polarrpc.pb.go
index 0d269b0cb..65f560c54 100644
--- a/types/polarrpc.pb.go
+++ b/types/polarrpc.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: polarrpc.proto
 
-package types
+package types // import "github.com/aergoio/aergo/types"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -25,7 +25,7 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type Paginations struct {
 	Ref                  []byte   `protobuf:"bytes,1,opt,name=ref,proto3" json:"ref,omitempty"`
-	Size                 uint32   `protobuf:"varint,3,opt,name=size,proto3" json:"size,omitempty"`
+	Size                 uint32   `protobuf:"varint,3,opt,name=size" json:"size,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -35,7 +35,7 @@ func (m *Paginations) Reset()         { *m = Paginations{} }
 func (m *Paginations) String() string { return proto.CompactTextString(m) }
 func (*Paginations) ProtoMessage()    {}
 func (*Paginations) Descriptor() ([]byte, []int) {
-	return fileDescriptor_9eae49c68867e2c2, []int{0}
+	return fileDescriptor_polarrpc_2b3b2813fa132042, []int{0}
 }
 func (m *Paginations) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Paginations.Unmarshal(m, b)
@@ -43,8 +43,8 @@ func (m *Paginations) XXX_Unmarshal(b []byte) error {
 func (m *Paginations) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Paginations.Marshal(b, m, deterministic)
 }
-func (m *Paginations) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Paginations.Merge(m, src)
+func (dst *Paginations) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Paginations.Merge(dst, src)
 }
 func (m *Paginations) XXX_Size() int {
 	return xxx_messageInfo_Paginations.Size(m)
@@ -70,9 +70,9 @@ func (m *Paginations) GetSize() uint32 {
 }
 
 type PolarisPeerList struct {
-	Total                uint32         `protobuf:"varint,1,opt,name=total,proto3" json:"total,omitempty"`
-	HasNext              bool           `protobuf:"varint,2,opt,name=hasNext,proto3" json:"hasNext,omitempty"`
-	Peers                []*PolarisPeer `protobuf:"bytes,3,rep,name=peers,proto3" json:"peers,omitempty"`
+	Total                uint32         `protobuf:"varint,1,opt,name=total" json:"total,omitempty"`
+	HasNext              bool           `protobuf:"varint,2,opt,name=hasNext" json:"hasNext,omitempty"`
+	Peers                []*PolarisPeer `protobuf:"bytes,3,rep,name=peers" json:"peers,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
 	XXX_unrecognized     []byte         `json:"-"`
 	XXX_sizecache        int32          `json:"-"`
@@ -82,7 +82,7 @@ func (m *PolarisPeerList) Reset()         { *m = PolarisPeerList{} }
 func (m *PolarisPeerList) String() string { return proto.CompactTextString(m) }
 func (*PolarisPeerList) ProtoMessage()    {}
 func (*PolarisPeerList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_9eae49c68867e2c2, []int{1}
+	return fileDescriptor_polarrpc_2b3b2813fa132042, []int{1}
 }
 func (m *PolarisPeerList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolarisPeerList.Unmarshal(m, b)
@@ -90,8 +90,8 @@ func (m *PolarisPeerList) XXX_Unmarshal(b []byte) error {
 func (m *PolarisPeerList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolarisPeerList.Marshal(b, m, deterministic)
 }
-func (m *PolarisPeerList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolarisPeerList.Merge(m, src)
+func (dst *PolarisPeerList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolarisPeerList.Merge(dst, src)
 }
 func (m *PolarisPeerList) XXX_Size() int {
 	return xxx_messageInfo_PolarisPeerList.Size(m)
@@ -124,11 +124,11 @@ func (m *PolarisPeerList) GetPeers() []*PolarisPeer {
 }
 
 type PolarisPeer struct {
-	Address   *PeerAddress `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-	Connected int64        `protobuf:"varint,2,opt,name=connected,proto3" json:"connected,omitempty"`
+	Address   *PeerAddress `protobuf:"bytes,1,opt,name=address" json:"address,omitempty"`
+	Connected int64        `protobuf:"varint,2,opt,name=connected" json:"connected,omitempty"`
 	// lastCheck contains unixtimestamp with nanoseconds precision
-	LastCheck            int64    `protobuf:"varint,3,opt,name=lastCheck,proto3" json:"lastCheck,omitempty"`
-	Verion               string   `protobuf:"bytes,4,opt,name=verion,proto3" json:"verion,omitempty"`
+	LastCheck            int64    `protobuf:"varint,3,opt,name=lastCheck" json:"lastCheck,omitempty"`
+	Verion               string   `protobuf:"bytes,4,opt,name=verion" json:"verion,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -138,7 +138,7 @@ func (m *PolarisPeer) Reset()         { *m = PolarisPeer{} }
 func (m *PolarisPeer) String() string { return proto.CompactTextString(m) }
 func (*PolarisPeer) ProtoMessage()    {}
 func (*PolarisPeer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_9eae49c68867e2c2, []int{2}
+	return fileDescriptor_polarrpc_2b3b2813fa132042, []int{2}
 }
 func (m *PolarisPeer) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PolarisPeer.Unmarshal(m, b)
@@ -146,8 +146,8 @@ func (m *PolarisPeer) XXX_Unmarshal(b []byte) error {
 func (m *PolarisPeer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PolarisPeer.Marshal(b, m, deterministic)
 }
-func (m *PolarisPeer) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PolarisPeer.Merge(m, src)
+func (dst *PolarisPeer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolarisPeer.Merge(dst, src)
 }
 func (m *PolarisPeer) XXX_Size() int {
 	return xxx_messageInfo_PolarisPeer.Size(m)
@@ -200,9 +200,8 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// PolarisRPCServiceClient is the client API for PolarisRPCService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+// Client API for PolarisRPCService service
+
 type PolarisRPCServiceClient interface {
 	// Returns the current state of this node
 	NodeState(ctx context.Context, in *NodeReq, opts ...grpc.CallOption) (*SingleBytes, error)
@@ -223,7 +222,7 @@ func NewPolarisRPCServiceClient(cc *grpc.ClientConn) PolarisRPCServiceClient {
 
 func (c *polarisRPCServiceClient) NodeState(ctx context.Context, in *NodeReq, opts ...grpc.CallOption) (*SingleBytes, error) {
 	out := new(SingleBytes)
-	err := c.cc.Invoke(ctx, "/types.PolarisRPCService/NodeState", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.PolarisRPCService/NodeState", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -232,7 +231,7 @@ func (c *polarisRPCServiceClient) NodeState(ctx context.Context, in *NodeReq, op
 
 func (c *polarisRPCServiceClient) Metric(ctx context.Context, in *MetricsRequest, opts ...grpc.CallOption) (*Metrics, error) {
 	out := new(Metrics)
-	err := c.cc.Invoke(ctx, "/types.PolarisRPCService/Metric", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.PolarisRPCService/Metric", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -241,7 +240,7 @@ func (c *polarisRPCServiceClient) Metric(ctx context.Context, in *MetricsRequest
 
 func (c *polarisRPCServiceClient) CurrentList(ctx context.Context, in *Paginations, opts ...grpc.CallOption) (*PolarisPeerList, error) {
 	out := new(PolarisPeerList)
-	err := c.cc.Invoke(ctx, "/types.PolarisRPCService/CurrentList", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.PolarisRPCService/CurrentList", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -250,7 +249,7 @@ func (c *polarisRPCServiceClient) CurrentList(ctx context.Context, in *Paginatio
 
 func (c *polarisRPCServiceClient) WhiteList(ctx context.Context, in *Paginations, opts ...grpc.CallOption) (*PolarisPeerList, error) {
 	out := new(PolarisPeerList)
-	err := c.cc.Invoke(ctx, "/types.PolarisRPCService/WhiteList", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.PolarisRPCService/WhiteList", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -259,14 +258,15 @@ func (c *polarisRPCServiceClient) WhiteList(ctx context.Context, in *Paginations
 
 func (c *polarisRPCServiceClient) BlackList(ctx context.Context, in *Paginations, opts ...grpc.CallOption) (*PolarisPeerList, error) {
 	out := new(PolarisPeerList)
-	err := c.cc.Invoke(ctx, "/types.PolarisRPCService/BlackList", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.PolarisRPCService/BlackList", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// PolarisRPCServiceServer is the server API for PolarisRPCService service.
+// Server API for PolarisRPCService service
+
 type PolarisRPCServiceServer interface {
 	// Returns the current state of this node
 	NodeState(context.Context, *NodeReq) (*SingleBytes, error)
@@ -400,9 +400,9 @@ var _PolarisRPCService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "polarrpc.proto",
 }
 
-func init() { proto.RegisterFile("polarrpc.proto", fileDescriptor_9eae49c68867e2c2) }
+func init() { proto.RegisterFile("polarrpc.proto", fileDescriptor_polarrpc_2b3b2813fa132042) }
 
-var fileDescriptor_9eae49c68867e2c2 = []byte{
+var fileDescriptor_polarrpc_2b3b2813fa132042 = []byte{
 	// 401 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0xc1, 0x6e, 0xd3, 0x40,
 	0x10, 0x8d, 0xeb, 0x26, 0xc5, 0x93, 0x36, 0xc0, 0x08, 0x2a, 0xcb, 0x42, 0xc8, 0xf2, 0xc9, 0x07,
diff --git a/types/raft.pb.go b/types/raft.pb.go
index b34826210..2e3baac57 100644
--- a/types/raft.pb.go
+++ b/types/raft.pb.go
@@ -39,13 +39,13 @@ func (x MembershipChangeType) String() string {
 	return proto.EnumName(MembershipChangeType_name, int32(x))
 }
 func (MembershipChangeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_raft_f2d3f4c16774f7d3, []int{0}
+	return fileDescriptor_raft_3623b658a658ac91, []int{0}
 }
 
 type MemberAttr struct {
-	ID                   uint64   `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"`
-	Name                 string   `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	Url                  string   `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"`
+	ID                   uint64   `protobuf:"varint,1,opt,name=ID" json:"ID,omitempty"`
+	Name                 string   `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Url                  string   `protobuf:"bytes,3,opt,name=url" json:"url,omitempty"`
 	PeerID               []byte   `protobuf:"bytes,4,opt,name=peerID,proto3" json:"peerID,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -56,7 +56,7 @@ func (m *MemberAttr) Reset()         { *m = MemberAttr{} }
 func (m *MemberAttr) String() string { return proto.CompactTextString(m) }
 func (*MemberAttr) ProtoMessage()    {}
 func (*MemberAttr) Descriptor() ([]byte, []int) {
-	return fileDescriptor_raft_f2d3f4c16774f7d3, []int{0}
+	return fileDescriptor_raft_3623b658a658ac91, []int{0}
 }
 func (m *MemberAttr) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MemberAttr.Unmarshal(m, b)
@@ -105,8 +105,8 @@ func (m *MemberAttr) GetPeerID() []byte {
 }
 
 type MembershipChange struct {
-	Type                 MembershipChangeType `protobuf:"varint,1,opt,name=type,proto3,enum=types.MembershipChangeType" json:"type,omitempty"`
-	Attr                 *MemberAttr          `protobuf:"bytes,2,opt,name=attr,proto3" json:"attr,omitempty"`
+	Type                 MembershipChangeType `protobuf:"varint,1,opt,name=type,enum=types.MembershipChangeType" json:"type,omitempty"`
+	Attr                 *MemberAttr          `protobuf:"bytes,2,opt,name=attr" json:"attr,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
 	XXX_unrecognized     []byte               `json:"-"`
 	XXX_sizecache        int32                `json:"-"`
@@ -116,7 +116,7 @@ func (m *MembershipChange) Reset()         { *m = MembershipChange{} }
 func (m *MembershipChange) String() string { return proto.CompactTextString(m) }
 func (*MembershipChange) ProtoMessage()    {}
 func (*MembershipChange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_raft_f2d3f4c16774f7d3, []int{1}
+	return fileDescriptor_raft_3623b658a658ac91, []int{1}
 }
 func (m *MembershipChange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MembershipChange.Unmarshal(m, b)
@@ -151,7 +151,7 @@ func (m *MembershipChange) GetAttr() *MemberAttr {
 }
 
 type MembershipChangeReply struct {
-	Attr                 *MemberAttr `protobuf:"bytes,1,opt,name=attr,proto3" json:"attr,omitempty"`
+	Attr                 *MemberAttr `protobuf:"bytes,1,opt,name=attr" json:"attr,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
 	XXX_unrecognized     []byte      `json:"-"`
 	XXX_sizecache        int32       `json:"-"`
@@ -161,7 +161,7 @@ func (m *MembershipChangeReply) Reset()         { *m = MembershipChangeReply{} }
 func (m *MembershipChangeReply) String() string { return proto.CompactTextString(m) }
 func (*MembershipChangeReply) ProtoMessage()    {}
 func (*MembershipChangeReply) Descriptor() ([]byte, []int) {
-	return fileDescriptor_raft_f2d3f4c16774f7d3, []int{2}
+	return fileDescriptor_raft_3623b658a658ac91, []int{2}
 }
 func (m *MembershipChangeReply) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MembershipChangeReply.Unmarshal(m, b)
@@ -189,8 +189,8 @@ func (m *MembershipChangeReply) GetAttr() *MemberAttr {
 }
 
 type HardStateInfo struct {
-	Term                 uint64   `protobuf:"varint,1,opt,name=term,proto3" json:"term,omitempty"`
-	Commit               uint64   `protobuf:"varint,2,opt,name=commit,proto3" json:"commit,omitempty"`
+	Term                 uint64   `protobuf:"varint,1,opt,name=term" json:"term,omitempty"`
+	Commit               uint64   `protobuf:"varint,2,opt,name=commit" json:"commit,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -200,7 +200,7 @@ func (m *HardStateInfo) Reset()         { *m = HardStateInfo{} }
 func (m *HardStateInfo) String() string { return proto.CompactTextString(m) }
 func (*HardStateInfo) ProtoMessage()    {}
 func (*HardStateInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_raft_f2d3f4c16774f7d3, []int{3}
+	return fileDescriptor_raft_3623b658a658ac91, []int{3}
 }
 func (m *HardStateInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HardStateInfo.Unmarshal(m, b)
@@ -247,7 +247,7 @@ func (m *GetClusterInfoRequest) Reset()         { *m = GetClusterInfoRequest{} }
 func (m *GetClusterInfoRequest) String() string { return proto.CompactTextString(m) }
 func (*GetClusterInfoRequest) ProtoMessage()    {}
 func (*GetClusterInfoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_raft_f2d3f4c16774f7d3, []int{4}
+	return fileDescriptor_raft_3623b658a658ac91, []int{4}
 }
 func (m *GetClusterInfoRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetClusterInfoRequest.Unmarshal(m, b)
@@ -276,10 +276,10 @@ func (m *GetClusterInfoRequest) GetBestBlockHash() []byte {
 
 type GetClusterInfoResponse struct {
 	ChainID              []byte         `protobuf:"bytes,1,opt,name=chainID,proto3" json:"chainID,omitempty"`
-	ClusterID            uint64         `protobuf:"varint,2,opt,name=clusterID,proto3" json:"clusterID,omitempty"`
-	Error                string         `protobuf:"bytes,3,opt,name=error,proto3" json:"error,omitempty"`
-	MbrAttrs             []*MemberAttr  `protobuf:"bytes,4,rep,name=mbrAttrs,proto3" json:"mbrAttrs,omitempty"`
-	HardStateInfo        *HardStateInfo `protobuf:"bytes,5,opt,name=hardStateInfo,proto3" json:"hardStateInfo,omitempty"`
+	ClusterID            uint64         `protobuf:"varint,2,opt,name=clusterID" json:"clusterID,omitempty"`
+	Error                string         `protobuf:"bytes,3,opt,name=error" json:"error,omitempty"`
+	MbrAttrs             []*MemberAttr  `protobuf:"bytes,4,rep,name=mbrAttrs" json:"mbrAttrs,omitempty"`
+	HardStateInfo        *HardStateInfo `protobuf:"bytes,5,opt,name=hardStateInfo" json:"hardStateInfo,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
 	XXX_unrecognized     []byte         `json:"-"`
 	XXX_sizecache        int32          `json:"-"`
@@ -289,7 +289,7 @@ func (m *GetClusterInfoResponse) Reset()         { *m = GetClusterInfoResponse{}
 func (m *GetClusterInfoResponse) String() string { return proto.CompactTextString(m) }
 func (*GetClusterInfoResponse) ProtoMessage()    {}
 func (*GetClusterInfoResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_raft_f2d3f4c16774f7d3, []int{5}
+	return fileDescriptor_raft_3623b658a658ac91, []int{5}
 }
 func (m *GetClusterInfoResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetClusterInfoResponse.Unmarshal(m, b)
@@ -354,9 +354,9 @@ func init() {
 	proto.RegisterEnum("types.MembershipChangeType", MembershipChangeType_name, MembershipChangeType_value)
 }
 
-func init() { proto.RegisterFile("raft.proto", fileDescriptor_raft_f2d3f4c16774f7d3) }
+func init() { proto.RegisterFile("raft.proto", fileDescriptor_raft_3623b658a658ac91) }
 
-var fileDescriptor_raft_f2d3f4c16774f7d3 = []byte{
+var fileDescriptor_raft_3623b658a658ac91 = []byte{
 	// 420 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0x51, 0x8b, 0xd3, 0x40,
 	0x10, 0x36, 0x6d, 0x7a, 0xda, 0xb1, 0x2d, 0xbd, 0xa1, 0x77, 0x04, 0x15, 0x09, 0x41, 0xa1, 0x08,
diff --git a/types/rpc.pb.go b/types/rpc.pb.go
index 14961161f..d2462f460 100644
--- a/types/rpc.pb.go
+++ b/types/rpc.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: rpc.proto
 
-package types
+package types // import "github.com/aergoio/aergo/types"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -48,7 +48,6 @@ var CommitStatus_name = map[int32]string{
 	7: "TX_HAS_SAME_NONCE",
 	9: "TX_INTERNAL_ERROR",
 }
-
 var CommitStatus_value = map[string]int32{
 	"TX_OK":                   0,
 	"TX_NONCE_TOO_LOW":        1,
@@ -64,9 +63,8 @@ var CommitStatus_value = map[string]int32{
 func (x CommitStatus) String() string {
 	return proto.EnumName(CommitStatus_name, int32(x))
 }
-
 func (CommitStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{0}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{0}
 }
 
 type VerifyStatus int32
@@ -82,7 +80,6 @@ var VerifyStatus_name = map[int32]string{
 	1: "VERIFY_STATUS_SIGN_NOT_MATCH",
 	2: "VERIFY_STATUS_INVALID_HASH",
 }
-
 var VerifyStatus_value = map[string]int32{
 	"VERIFY_STATUS_OK":             0,
 	"VERIFY_STATUS_SIGN_NOT_MATCH": 1,
@@ -92,16 +89,15 @@ var VerifyStatus_value = map[string]int32{
 func (x VerifyStatus) String() string {
 	return proto.EnumName(VerifyStatus_name, int32(x))
 }
-
 func (VerifyStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{1}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{1}
 }
 
 // BlockchainStatus is current status of blockchain
 type BlockchainStatus struct {
 	BestBlockHash        []byte   `protobuf:"bytes,1,opt,name=best_block_hash,json=bestBlockHash,proto3" json:"best_block_hash,omitempty"`
-	BestHeight           uint64   `protobuf:"varint,2,opt,name=best_height,json=bestHeight,proto3" json:"best_height,omitempty"`
-	ConsensusInfo        string   `protobuf:"bytes,3,opt,name=consensus_info,json=consensusInfo,proto3" json:"consensus_info,omitempty"`
+	BestHeight           uint64   `protobuf:"varint,2,opt,name=best_height,json=bestHeight" json:"best_height,omitempty"`
+	ConsensusInfo        string   `protobuf:"bytes,3,opt,name=consensus_info,json=consensusInfo" json:"consensus_info,omitempty"`
 	BestChainIdHash      []byte   `protobuf:"bytes,4,opt,name=best_chain_id_hash,json=bestChainIdHash,proto3" json:"best_chain_id_hash,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -112,7 +108,7 @@ func (m *BlockchainStatus) Reset()         { *m = BlockchainStatus{} }
 func (m *BlockchainStatus) String() string { return proto.CompactTextString(m) }
 func (*BlockchainStatus) ProtoMessage()    {}
 func (*BlockchainStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{0}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{0}
 }
 func (m *BlockchainStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BlockchainStatus.Unmarshal(m, b)
@@ -120,8 +116,8 @@ func (m *BlockchainStatus) XXX_Unmarshal(b []byte) error {
 func (m *BlockchainStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BlockchainStatus.Marshal(b, m, deterministic)
 }
-func (m *BlockchainStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BlockchainStatus.Merge(m, src)
+func (dst *BlockchainStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BlockchainStatus.Merge(dst, src)
 }
 func (m *BlockchainStatus) XXX_Size() int {
 	return xxx_messageInfo_BlockchainStatus.Size(m)
@@ -161,10 +157,10 @@ func (m *BlockchainStatus) GetBestChainIdHash() []byte {
 }
 
 type ChainId struct {
-	Magic                string   `protobuf:"bytes,1,opt,name=magic,proto3" json:"magic,omitempty"`
-	Public               bool     `protobuf:"varint,2,opt,name=public,proto3" json:"public,omitempty"`
-	Mainnet              bool     `protobuf:"varint,3,opt,name=mainnet,proto3" json:"mainnet,omitempty"`
-	Consensus            string   `protobuf:"bytes,4,opt,name=consensus,proto3" json:"consensus,omitempty"`
+	Magic                string   `protobuf:"bytes,1,opt,name=magic" json:"magic,omitempty"`
+	Public               bool     `protobuf:"varint,2,opt,name=public" json:"public,omitempty"`
+	Mainnet              bool     `protobuf:"varint,3,opt,name=mainnet" json:"mainnet,omitempty"`
+	Consensus            string   `protobuf:"bytes,4,opt,name=consensus" json:"consensus,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -174,7 +170,7 @@ func (m *ChainId) Reset()         { *m = ChainId{} }
 func (m *ChainId) String() string { return proto.CompactTextString(m) }
 func (*ChainId) ProtoMessage()    {}
 func (*ChainId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{1}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{1}
 }
 func (m *ChainId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ChainId.Unmarshal(m, b)
@@ -182,8 +178,8 @@ func (m *ChainId) XXX_Unmarshal(b []byte) error {
 func (m *ChainId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ChainId.Marshal(b, m, deterministic)
 }
-func (m *ChainId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ChainId.Merge(m, src)
+func (dst *ChainId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChainId.Merge(dst, src)
 }
 func (m *ChainId) XXX_Size() int {
 	return xxx_messageInfo_ChainId.Size(m)
@@ -224,9 +220,9 @@ func (m *ChainId) GetConsensus() string {
 
 // ChainInfo returns chain configuration
 type ChainInfo struct {
-	Id                   *ChainId `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	BpNumber             uint32   `protobuf:"varint,2,opt,name=bpNumber,proto3" json:"bpNumber,omitempty"`
-	Maxblocksize         uint64   `protobuf:"varint,3,opt,name=maxblocksize,proto3" json:"maxblocksize,omitempty"`
+	Id                   *ChainId `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	BpNumber             uint32   `protobuf:"varint,2,opt,name=bpNumber" json:"bpNumber,omitempty"`
+	Maxblocksize         uint64   `protobuf:"varint,3,opt,name=maxblocksize" json:"maxblocksize,omitempty"`
 	Maxtokens            []byte   `protobuf:"bytes,4,opt,name=maxtokens,proto3" json:"maxtokens,omitempty"`
 	Stakingminimum       []byte   `protobuf:"bytes,5,opt,name=stakingminimum,proto3" json:"stakingminimum,omitempty"`
 	Totalstaking         []byte   `protobuf:"bytes,6,opt,name=totalstaking,proto3" json:"totalstaking,omitempty"`
@@ -241,7 +237,7 @@ func (m *ChainInfo) Reset()         { *m = ChainInfo{} }
 func (m *ChainInfo) String() string { return proto.CompactTextString(m) }
 func (*ChainInfo) ProtoMessage()    {}
 func (*ChainInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{2}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{2}
 }
 func (m *ChainInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ChainInfo.Unmarshal(m, b)
@@ -249,8 +245,8 @@ func (m *ChainInfo) XXX_Unmarshal(b []byte) error {
 func (m *ChainInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ChainInfo.Marshal(b, m, deterministic)
 }
-func (m *ChainInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ChainInfo.Merge(m, src)
+func (dst *ChainInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChainInfo.Merge(dst, src)
 }
 func (m *ChainInfo) XXX_Size() int {
 	return xxx_messageInfo_ChainInfo.Size(m)
@@ -319,7 +315,7 @@ func (m *ChainInfo) GetNameprice() []byte {
 
 // ChainStats corresponds to a chain statistics report.
 type ChainStats struct {
-	Report               string   `protobuf:"bytes,1,opt,name=report,proto3" json:"report,omitempty"`
+	Report               string   `protobuf:"bytes,1,opt,name=report" json:"report,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -329,7 +325,7 @@ func (m *ChainStats) Reset()         { *m = ChainStats{} }
 func (m *ChainStats) String() string { return proto.CompactTextString(m) }
 func (*ChainStats) ProtoMessage()    {}
 func (*ChainStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{3}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{3}
 }
 func (m *ChainStats) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ChainStats.Unmarshal(m, b)
@@ -337,8 +333,8 @@ func (m *ChainStats) XXX_Unmarshal(b []byte) error {
 func (m *ChainStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ChainStats.Marshal(b, m, deterministic)
 }
-func (m *ChainStats) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ChainStats.Merge(m, src)
+func (dst *ChainStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChainStats.Merge(dst, src)
 }
 func (m *ChainStats) XXX_Size() int {
 	return xxx_messageInfo_ChainStats.Size(m)
@@ -370,7 +366,7 @@ func (m *Input) Reset()         { *m = Input{} }
 func (m *Input) String() string { return proto.CompactTextString(m) }
 func (*Input) ProtoMessage()    {}
 func (*Input) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{4}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{4}
 }
 func (m *Input) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Input.Unmarshal(m, b)
@@ -378,8 +374,8 @@ func (m *Input) XXX_Unmarshal(b []byte) error {
 func (m *Input) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Input.Marshal(b, m, deterministic)
 }
-func (m *Input) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Input.Merge(m, src)
+func (dst *Input) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Input.Merge(dst, src)
 }
 func (m *Input) XXX_Size() int {
 	return xxx_messageInfo_Input.Size(m)
@@ -419,7 +415,7 @@ func (m *Input) GetScript() []byte {
 }
 
 type Output struct {
-	Index                uint32   `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"`
+	Index                uint32   `protobuf:"varint,1,opt,name=index" json:"index,omitempty"`
 	Address              []byte   `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"`
 	Value                []byte   `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"`
 	Script               []byte   `protobuf:"bytes,4,opt,name=script,proto3" json:"script,omitempty"`
@@ -432,7 +428,7 @@ func (m *Output) Reset()         { *m = Output{} }
 func (m *Output) String() string { return proto.CompactTextString(m) }
 func (*Output) ProtoMessage()    {}
 func (*Output) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{5}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{5}
 }
 func (m *Output) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Output.Unmarshal(m, b)
@@ -440,8 +436,8 @@ func (m *Output) XXX_Unmarshal(b []byte) error {
 func (m *Output) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Output.Marshal(b, m, deterministic)
 }
-func (m *Output) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Output.Merge(m, src)
+func (dst *Output) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Output.Merge(dst, src)
 }
 func (m *Output) XXX_Size() int {
 	return xxx_messageInfo_Output.Size(m)
@@ -490,7 +486,7 @@ func (m *Empty) Reset()         { *m = Empty{} }
 func (m *Empty) String() string { return proto.CompactTextString(m) }
 func (*Empty) ProtoMessage()    {}
 func (*Empty) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{6}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{6}
 }
 func (m *Empty) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Empty.Unmarshal(m, b)
@@ -498,8 +494,8 @@ func (m *Empty) XXX_Unmarshal(b []byte) error {
 func (m *Empty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Empty.Marshal(b, m, deterministic)
 }
-func (m *Empty) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Empty.Merge(m, src)
+func (dst *Empty) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Empty.Merge(dst, src)
 }
 func (m *Empty) XXX_Size() int {
 	return xxx_messageInfo_Empty.Size(m)
@@ -521,7 +517,7 @@ func (m *SingleBytes) Reset()         { *m = SingleBytes{} }
 func (m *SingleBytes) String() string { return proto.CompactTextString(m) }
 func (*SingleBytes) ProtoMessage()    {}
 func (*SingleBytes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{7}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{7}
 }
 func (m *SingleBytes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SingleBytes.Unmarshal(m, b)
@@ -529,8 +525,8 @@ func (m *SingleBytes) XXX_Unmarshal(b []byte) error {
 func (m *SingleBytes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SingleBytes.Marshal(b, m, deterministic)
 }
-func (m *SingleBytes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SingleBytes.Merge(m, src)
+func (dst *SingleBytes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SingleBytes.Merge(dst, src)
 }
 func (m *SingleBytes) XXX_Size() int {
 	return xxx_messageInfo_SingleBytes.Size(m)
@@ -559,7 +555,7 @@ func (m *AccountAddress) Reset()         { *m = AccountAddress{} }
 func (m *AccountAddress) String() string { return proto.CompactTextString(m) }
 func (*AccountAddress) ProtoMessage()    {}
 func (*AccountAddress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{8}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{8}
 }
 func (m *AccountAddress) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountAddress.Unmarshal(m, b)
@@ -567,8 +563,8 @@ func (m *AccountAddress) XXX_Unmarshal(b []byte) error {
 func (m *AccountAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AccountAddress.Marshal(b, m, deterministic)
 }
-func (m *AccountAddress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AccountAddress.Merge(m, src)
+func (dst *AccountAddress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AccountAddress.Merge(dst, src)
 }
 func (m *AccountAddress) XXX_Size() int {
 	return xxx_messageInfo_AccountAddress.Size(m)
@@ -589,7 +585,7 @@ func (m *AccountAddress) GetValue() []byte {
 type AccountAndRoot struct {
 	Account              []byte   `protobuf:"bytes,1,opt,name=Account,proto3" json:"Account,omitempty"`
 	Root                 []byte   `protobuf:"bytes,2,opt,name=Root,proto3" json:"Root,omitempty"`
-	Compressed           bool     `protobuf:"varint,3,opt,name=Compressed,proto3" json:"Compressed,omitempty"`
+	Compressed           bool     `protobuf:"varint,3,opt,name=Compressed" json:"Compressed,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -599,7 +595,7 @@ func (m *AccountAndRoot) Reset()         { *m = AccountAndRoot{} }
 func (m *AccountAndRoot) String() string { return proto.CompactTextString(m) }
 func (*AccountAndRoot) ProtoMessage()    {}
 func (*AccountAndRoot) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{9}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{9}
 }
 func (m *AccountAndRoot) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountAndRoot.Unmarshal(m, b)
@@ -607,8 +603,8 @@ func (m *AccountAndRoot) XXX_Unmarshal(b []byte) error {
 func (m *AccountAndRoot) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AccountAndRoot.Marshal(b, m, deterministic)
 }
-func (m *AccountAndRoot) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AccountAndRoot.Merge(m, src)
+func (dst *AccountAndRoot) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AccountAndRoot.Merge(dst, src)
 }
 func (m *AccountAndRoot) XXX_Size() int {
 	return xxx_messageInfo_AccountAndRoot.Size(m)
@@ -641,13 +637,13 @@ func (m *AccountAndRoot) GetCompressed() bool {
 }
 
 type Peer struct {
-	Address              *PeerAddress    `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-	Bestblock            *NewBlockNotice `protobuf:"bytes,2,opt,name=bestblock,proto3" json:"bestblock,omitempty"`
-	State                int32           `protobuf:"varint,3,opt,name=state,proto3" json:"state,omitempty"`
-	Hidden               bool            `protobuf:"varint,4,opt,name=hidden,proto3" json:"hidden,omitempty"`
-	LashCheck            int64           `protobuf:"varint,5,opt,name=lashCheck,proto3" json:"lashCheck,omitempty"`
-	Selfpeer             bool            `protobuf:"varint,6,opt,name=selfpeer,proto3" json:"selfpeer,omitempty"`
-	Version              string          `protobuf:"bytes,7,opt,name=version,proto3" json:"version,omitempty"`
+	Address              *PeerAddress    `protobuf:"bytes,1,opt,name=address" json:"address,omitempty"`
+	Bestblock            *NewBlockNotice `protobuf:"bytes,2,opt,name=bestblock" json:"bestblock,omitempty"`
+	State                int32           `protobuf:"varint,3,opt,name=state" json:"state,omitempty"`
+	Hidden               bool            `protobuf:"varint,4,opt,name=hidden" json:"hidden,omitempty"`
+	LashCheck            int64           `protobuf:"varint,5,opt,name=lashCheck" json:"lashCheck,omitempty"`
+	Selfpeer             bool            `protobuf:"varint,6,opt,name=selfpeer" json:"selfpeer,omitempty"`
+	Version              string          `protobuf:"bytes,7,opt,name=version" json:"version,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -657,7 +653,7 @@ func (m *Peer) Reset()         { *m = Peer{} }
 func (m *Peer) String() string { return proto.CompactTextString(m) }
 func (*Peer) ProtoMessage()    {}
 func (*Peer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{10}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{10}
 }
 func (m *Peer) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Peer.Unmarshal(m, b)
@@ -665,8 +661,8 @@ func (m *Peer) XXX_Unmarshal(b []byte) error {
 func (m *Peer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Peer.Marshal(b, m, deterministic)
 }
-func (m *Peer) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Peer.Merge(m, src)
+func (dst *Peer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Peer.Merge(dst, src)
 }
 func (m *Peer) XXX_Size() int {
 	return xxx_messageInfo_Peer.Size(m)
@@ -727,7 +723,7 @@ func (m *Peer) GetVersion() string {
 }
 
 type PeerList struct {
-	Peers                []*Peer  `protobuf:"bytes,1,rep,name=peers,proto3" json:"peers,omitempty"`
+	Peers                []*Peer  `protobuf:"bytes,1,rep,name=peers" json:"peers,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -737,7 +733,7 @@ func (m *PeerList) Reset()         { *m = PeerList{} }
 func (m *PeerList) String() string { return proto.CompactTextString(m) }
 func (*PeerList) ProtoMessage()    {}
 func (*PeerList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{11}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{11}
 }
 func (m *PeerList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PeerList.Unmarshal(m, b)
@@ -745,8 +741,8 @@ func (m *PeerList) XXX_Unmarshal(b []byte) error {
 func (m *PeerList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PeerList.Marshal(b, m, deterministic)
 }
-func (m *PeerList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PeerList.Merge(m, src)
+func (dst *PeerList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PeerList.Merge(dst, src)
 }
 func (m *PeerList) XXX_Size() int {
 	return xxx_messageInfo_PeerList.Size(m)
@@ -766,10 +762,10 @@ func (m *PeerList) GetPeers() []*Peer {
 
 type ListParams struct {
 	Hash                 []byte   `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"`
-	Height               uint64   `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"`
-	Size                 uint32   `protobuf:"varint,3,opt,name=size,proto3" json:"size,omitempty"`
-	Offset               uint32   `protobuf:"varint,4,opt,name=offset,proto3" json:"offset,omitempty"`
-	Asc                  bool     `protobuf:"varint,5,opt,name=asc,proto3" json:"asc,omitempty"`
+	Height               uint64   `protobuf:"varint,2,opt,name=height" json:"height,omitempty"`
+	Size                 uint32   `protobuf:"varint,3,opt,name=size" json:"size,omitempty"`
+	Offset               uint32   `protobuf:"varint,4,opt,name=offset" json:"offset,omitempty"`
+	Asc                  bool     `protobuf:"varint,5,opt,name=asc" json:"asc,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -779,7 +775,7 @@ func (m *ListParams) Reset()         { *m = ListParams{} }
 func (m *ListParams) String() string { return proto.CompactTextString(m) }
 func (*ListParams) ProtoMessage()    {}
 func (*ListParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{12}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{12}
 }
 func (m *ListParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListParams.Unmarshal(m, b)
@@ -787,8 +783,8 @@ func (m *ListParams) XXX_Unmarshal(b []byte) error {
 func (m *ListParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListParams.Marshal(b, m, deterministic)
 }
-func (m *ListParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListParams.Merge(m, src)
+func (dst *ListParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListParams.Merge(dst, src)
 }
 func (m *ListParams) XXX_Size() int {
 	return xxx_messageInfo_ListParams.Size(m)
@@ -835,8 +831,8 @@ func (m *ListParams) GetAsc() bool {
 }
 
 type PageParams struct {
-	Offset               uint32   `protobuf:"varint,1,opt,name=offset,proto3" json:"offset,omitempty"`
-	Size                 uint32   `protobuf:"varint,2,opt,name=size,proto3" json:"size,omitempty"`
+	Offset               uint32   `protobuf:"varint,1,opt,name=offset" json:"offset,omitempty"`
+	Size                 uint32   `protobuf:"varint,2,opt,name=size" json:"size,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -846,7 +842,7 @@ func (m *PageParams) Reset()         { *m = PageParams{} }
 func (m *PageParams) String() string { return proto.CompactTextString(m) }
 func (*PageParams) ProtoMessage()    {}
 func (*PageParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{13}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{13}
 }
 func (m *PageParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PageParams.Unmarshal(m, b)
@@ -854,8 +850,8 @@ func (m *PageParams) XXX_Unmarshal(b []byte) error {
 func (m *PageParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PageParams.Marshal(b, m, deterministic)
 }
-func (m *PageParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PageParams.Merge(m, src)
+func (dst *PageParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PageParams.Merge(dst, src)
 }
 func (m *PageParams) XXX_Size() int {
 	return xxx_messageInfo_PageParams.Size(m)
@@ -881,10 +877,10 @@ func (m *PageParams) GetSize() uint32 {
 }
 
 type BlockBodyPaged struct {
-	Total                uint32     `protobuf:"varint,1,opt,name=total,proto3" json:"total,omitempty"`
-	Offset               uint32     `protobuf:"varint,2,opt,name=offset,proto3" json:"offset,omitempty"`
-	Size                 uint32     `protobuf:"varint,3,opt,name=size,proto3" json:"size,omitempty"`
-	Body                 *BlockBody `protobuf:"bytes,4,opt,name=body,proto3" json:"body,omitempty"`
+	Total                uint32     `protobuf:"varint,1,opt,name=total" json:"total,omitempty"`
+	Offset               uint32     `protobuf:"varint,2,opt,name=offset" json:"offset,omitempty"`
+	Size                 uint32     `protobuf:"varint,3,opt,name=size" json:"size,omitempty"`
+	Body                 *BlockBody `protobuf:"bytes,4,opt,name=body" json:"body,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
 	XXX_unrecognized     []byte     `json:"-"`
 	XXX_sizecache        int32      `json:"-"`
@@ -894,7 +890,7 @@ func (m *BlockBodyPaged) Reset()         { *m = BlockBodyPaged{} }
 func (m *BlockBodyPaged) String() string { return proto.CompactTextString(m) }
 func (*BlockBodyPaged) ProtoMessage()    {}
 func (*BlockBodyPaged) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{14}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{14}
 }
 func (m *BlockBodyPaged) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BlockBodyPaged.Unmarshal(m, b)
@@ -902,8 +898,8 @@ func (m *BlockBodyPaged) XXX_Unmarshal(b []byte) error {
 func (m *BlockBodyPaged) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BlockBodyPaged.Marshal(b, m, deterministic)
 }
-func (m *BlockBodyPaged) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BlockBodyPaged.Merge(m, src)
+func (dst *BlockBodyPaged) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BlockBodyPaged.Merge(dst, src)
 }
 func (m *BlockBodyPaged) XXX_Size() int {
 	return xxx_messageInfo_BlockBodyPaged.Size(m)
@@ -944,7 +940,7 @@ func (m *BlockBodyPaged) GetBody() *BlockBody {
 
 type BlockBodyParams struct {
 	Hashornumber         []byte      `protobuf:"bytes,1,opt,name=hashornumber,proto3" json:"hashornumber,omitempty"`
-	Paging               *PageParams `protobuf:"bytes,2,opt,name=paging,proto3" json:"paging,omitempty"`
+	Paging               *PageParams `protobuf:"bytes,2,opt,name=paging" json:"paging,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
 	XXX_unrecognized     []byte      `json:"-"`
 	XXX_sizecache        int32       `json:"-"`
@@ -954,7 +950,7 @@ func (m *BlockBodyParams) Reset()         { *m = BlockBodyParams{} }
 func (m *BlockBodyParams) String() string { return proto.CompactTextString(m) }
 func (*BlockBodyParams) ProtoMessage()    {}
 func (*BlockBodyParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{15}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{15}
 }
 func (m *BlockBodyParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BlockBodyParams.Unmarshal(m, b)
@@ -962,8 +958,8 @@ func (m *BlockBodyParams) XXX_Unmarshal(b []byte) error {
 func (m *BlockBodyParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BlockBodyParams.Marshal(b, m, deterministic)
 }
-func (m *BlockBodyParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BlockBodyParams.Merge(m, src)
+func (dst *BlockBodyParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BlockBodyParams.Merge(dst, src)
 }
 func (m *BlockBodyParams) XXX_Size() int {
 	return xxx_messageInfo_BlockBodyParams.Size(m)
@@ -989,7 +985,7 @@ func (m *BlockBodyParams) GetPaging() *PageParams {
 }
 
 type BlockHeaderList struct {
-	Blocks               []*Block `protobuf:"bytes,1,rep,name=blocks,proto3" json:"blocks,omitempty"`
+	Blocks               []*Block `protobuf:"bytes,1,rep,name=blocks" json:"blocks,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -999,7 +995,7 @@ func (m *BlockHeaderList) Reset()         { *m = BlockHeaderList{} }
 func (m *BlockHeaderList) String() string { return proto.CompactTextString(m) }
 func (*BlockHeaderList) ProtoMessage()    {}
 func (*BlockHeaderList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{16}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{16}
 }
 func (m *BlockHeaderList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BlockHeaderList.Unmarshal(m, b)
@@ -1007,8 +1003,8 @@ func (m *BlockHeaderList) XXX_Unmarshal(b []byte) error {
 func (m *BlockHeaderList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BlockHeaderList.Marshal(b, m, deterministic)
 }
-func (m *BlockHeaderList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BlockHeaderList.Merge(m, src)
+func (dst *BlockHeaderList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BlockHeaderList.Merge(dst, src)
 }
 func (m *BlockHeaderList) XXX_Size() int {
 	return xxx_messageInfo_BlockHeaderList.Size(m)
@@ -1028,9 +1024,9 @@ func (m *BlockHeaderList) GetBlocks() []*Block {
 
 type BlockMetadata struct {
 	Hash                 []byte       `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"`
-	Header               *BlockHeader `protobuf:"bytes,2,opt,name=header,proto3" json:"header,omitempty"`
-	Txcount              int32        `protobuf:"varint,3,opt,name=txcount,proto3" json:"txcount,omitempty"`
-	Size                 int64        `protobuf:"varint,4,opt,name=size,proto3" json:"size,omitempty"`
+	Header               *BlockHeader `protobuf:"bytes,2,opt,name=header" json:"header,omitempty"`
+	Txcount              int32        `protobuf:"varint,3,opt,name=txcount" json:"txcount,omitempty"`
+	Size                 int64        `protobuf:"varint,4,opt,name=size" json:"size,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -1040,7 +1036,7 @@ func (m *BlockMetadata) Reset()         { *m = BlockMetadata{} }
 func (m *BlockMetadata) String() string { return proto.CompactTextString(m) }
 func (*BlockMetadata) ProtoMessage()    {}
 func (*BlockMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{17}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{17}
 }
 func (m *BlockMetadata) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BlockMetadata.Unmarshal(m, b)
@@ -1048,8 +1044,8 @@ func (m *BlockMetadata) XXX_Unmarshal(b []byte) error {
 func (m *BlockMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BlockMetadata.Marshal(b, m, deterministic)
 }
-func (m *BlockMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BlockMetadata.Merge(m, src)
+func (dst *BlockMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BlockMetadata.Merge(dst, src)
 }
 func (m *BlockMetadata) XXX_Size() int {
 	return xxx_messageInfo_BlockMetadata.Size(m)
@@ -1089,7 +1085,7 @@ func (m *BlockMetadata) GetSize() int64 {
 }
 
 type BlockMetadataList struct {
-	Blocks               []*BlockMetadata `protobuf:"bytes,1,rep,name=blocks,proto3" json:"blocks,omitempty"`
+	Blocks               []*BlockMetadata `protobuf:"bytes,1,rep,name=blocks" json:"blocks,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
 	XXX_unrecognized     []byte           `json:"-"`
 	XXX_sizecache        int32            `json:"-"`
@@ -1099,7 +1095,7 @@ func (m *BlockMetadataList) Reset()         { *m = BlockMetadataList{} }
 func (m *BlockMetadataList) String() string { return proto.CompactTextString(m) }
 func (*BlockMetadataList) ProtoMessage()    {}
 func (*BlockMetadataList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{18}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{18}
 }
 func (m *BlockMetadataList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BlockMetadataList.Unmarshal(m, b)
@@ -1107,8 +1103,8 @@ func (m *BlockMetadataList) XXX_Unmarshal(b []byte) error {
 func (m *BlockMetadataList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_BlockMetadataList.Marshal(b, m, deterministic)
 }
-func (m *BlockMetadataList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_BlockMetadataList.Merge(m, src)
+func (dst *BlockMetadataList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BlockMetadataList.Merge(dst, src)
 }
 func (m *BlockMetadataList) XXX_Size() int {
 	return xxx_messageInfo_BlockMetadataList.Size(m)
@@ -1128,8 +1124,8 @@ func (m *BlockMetadataList) GetBlocks() []*BlockMetadata {
 
 type CommitResult struct {
 	Hash                 []byte       `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"`
-	Error                CommitStatus `protobuf:"varint,2,opt,name=error,proto3,enum=types.CommitStatus" json:"error,omitempty"`
-	Detail               string       `protobuf:"bytes,3,opt,name=detail,proto3" json:"detail,omitempty"`
+	Error                CommitStatus `protobuf:"varint,2,opt,name=error,enum=types.CommitStatus" json:"error,omitempty"`
+	Detail               string       `protobuf:"bytes,3,opt,name=detail" json:"detail,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -1139,7 +1135,7 @@ func (m *CommitResult) Reset()         { *m = CommitResult{} }
 func (m *CommitResult) String() string { return proto.CompactTextString(m) }
 func (*CommitResult) ProtoMessage()    {}
 func (*CommitResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{19}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{19}
 }
 func (m *CommitResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitResult.Unmarshal(m, b)
@@ -1147,8 +1143,8 @@ func (m *CommitResult) XXX_Unmarshal(b []byte) error {
 func (m *CommitResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitResult.Marshal(b, m, deterministic)
 }
-func (m *CommitResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitResult.Merge(m, src)
+func (dst *CommitResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitResult.Merge(dst, src)
 }
 func (m *CommitResult) XXX_Size() int {
 	return xxx_messageInfo_CommitResult.Size(m)
@@ -1181,7 +1177,7 @@ func (m *CommitResult) GetDetail() string {
 }
 
 type CommitResultList struct {
-	Results              []*CommitResult `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
+	Results              []*CommitResult `protobuf:"bytes,1,rep,name=results" json:"results,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -1191,7 +1187,7 @@ func (m *CommitResultList) Reset()         { *m = CommitResultList{} }
 func (m *CommitResultList) String() string { return proto.CompactTextString(m) }
 func (*CommitResultList) ProtoMessage()    {}
 func (*CommitResultList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{20}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{20}
 }
 func (m *CommitResultList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitResultList.Unmarshal(m, b)
@@ -1199,8 +1195,8 @@ func (m *CommitResultList) XXX_Unmarshal(b []byte) error {
 func (m *CommitResultList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitResultList.Marshal(b, m, deterministic)
 }
-func (m *CommitResultList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitResultList.Merge(m, src)
+func (dst *CommitResultList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitResultList.Merge(dst, src)
 }
 func (m *CommitResultList) XXX_Size() int {
 	return xxx_messageInfo_CommitResultList.Size(m)
@@ -1219,8 +1215,8 @@ func (m *CommitResultList) GetResults() []*CommitResult {
 }
 
 type VerifyResult struct {
-	Tx                   *Tx          `protobuf:"bytes,1,opt,name=tx,proto3" json:"tx,omitempty"`
-	Error                VerifyStatus `protobuf:"varint,2,opt,name=error,proto3,enum=types.VerifyStatus" json:"error,omitempty"`
+	Tx                   *Tx          `protobuf:"bytes,1,opt,name=tx" json:"tx,omitempty"`
+	Error                VerifyStatus `protobuf:"varint,2,opt,name=error,enum=types.VerifyStatus" json:"error,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -1230,7 +1226,7 @@ func (m *VerifyResult) Reset()         { *m = VerifyResult{} }
 func (m *VerifyResult) String() string { return proto.CompactTextString(m) }
 func (*VerifyResult) ProtoMessage()    {}
 func (*VerifyResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{21}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{21}
 }
 func (m *VerifyResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VerifyResult.Unmarshal(m, b)
@@ -1238,8 +1234,8 @@ func (m *VerifyResult) XXX_Unmarshal(b []byte) error {
 func (m *VerifyResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VerifyResult.Marshal(b, m, deterministic)
 }
-func (m *VerifyResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VerifyResult.Merge(m, src)
+func (dst *VerifyResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VerifyResult.Merge(dst, src)
 }
 func (m *VerifyResult) XXX_Size() int {
 	return xxx_messageInfo_VerifyResult.Size(m)
@@ -1265,8 +1261,8 @@ func (m *VerifyResult) GetError() VerifyStatus {
 }
 
 type Personal struct {
-	Passphrase           string   `protobuf:"bytes,1,opt,name=passphrase,proto3" json:"passphrase,omitempty"`
-	Account              *Account `protobuf:"bytes,2,opt,name=account,proto3" json:"account,omitempty"`
+	Passphrase           string   `protobuf:"bytes,1,opt,name=passphrase" json:"passphrase,omitempty"`
+	Account              *Account `protobuf:"bytes,2,opt,name=account" json:"account,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1276,7 +1272,7 @@ func (m *Personal) Reset()         { *m = Personal{} }
 func (m *Personal) String() string { return proto.CompactTextString(m) }
 func (*Personal) ProtoMessage()    {}
 func (*Personal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{22}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{22}
 }
 func (m *Personal) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Personal.Unmarshal(m, b)
@@ -1284,8 +1280,8 @@ func (m *Personal) XXX_Unmarshal(b []byte) error {
 func (m *Personal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Personal.Marshal(b, m, deterministic)
 }
-func (m *Personal) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Personal.Merge(m, src)
+func (dst *Personal) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Personal.Merge(dst, src)
 }
 func (m *Personal) XXX_Size() int {
 	return xxx_messageInfo_Personal.Size(m)
@@ -1311,9 +1307,9 @@ func (m *Personal) GetAccount() *Account {
 }
 
 type ImportFormat struct {
-	Wif                  *SingleBytes `protobuf:"bytes,1,opt,name=wif,proto3" json:"wif,omitempty"`
-	Oldpass              string       `protobuf:"bytes,2,opt,name=oldpass,proto3" json:"oldpass,omitempty"`
-	Newpass              string       `protobuf:"bytes,3,opt,name=newpass,proto3" json:"newpass,omitempty"`
+	Wif                  *SingleBytes `protobuf:"bytes,1,opt,name=wif" json:"wif,omitempty"`
+	Oldpass              string       `protobuf:"bytes,2,opt,name=oldpass" json:"oldpass,omitempty"`
+	Newpass              string       `protobuf:"bytes,3,opt,name=newpass" json:"newpass,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -1323,7 +1319,7 @@ func (m *ImportFormat) Reset()         { *m = ImportFormat{} }
 func (m *ImportFormat) String() string { return proto.CompactTextString(m) }
 func (*ImportFormat) ProtoMessage()    {}
 func (*ImportFormat) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{23}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{23}
 }
 func (m *ImportFormat) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportFormat.Unmarshal(m, b)
@@ -1331,8 +1327,8 @@ func (m *ImportFormat) XXX_Unmarshal(b []byte) error {
 func (m *ImportFormat) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ImportFormat.Marshal(b, m, deterministic)
 }
-func (m *ImportFormat) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ImportFormat.Merge(m, src)
+func (dst *ImportFormat) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportFormat.Merge(dst, src)
 }
 func (m *ImportFormat) XXX_Size() int {
 	return xxx_messageInfo_ImportFormat.Size(m)
@@ -1366,7 +1362,7 @@ func (m *ImportFormat) GetNewpass() string {
 
 type Staking struct {
 	Amount               []byte   `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount,omitempty"`
-	When                 uint64   `protobuf:"varint,2,opt,name=when,proto3" json:"when,omitempty"`
+	When                 uint64   `protobuf:"varint,2,opt,name=when" json:"when,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1376,7 +1372,7 @@ func (m *Staking) Reset()         { *m = Staking{} }
 func (m *Staking) String() string { return proto.CompactTextString(m) }
 func (*Staking) ProtoMessage()    {}
 func (*Staking) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{24}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{24}
 }
 func (m *Staking) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Staking.Unmarshal(m, b)
@@ -1384,8 +1380,8 @@ func (m *Staking) XXX_Unmarshal(b []byte) error {
 func (m *Staking) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Staking.Marshal(b, m, deterministic)
 }
-func (m *Staking) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Staking.Merge(m, src)
+func (dst *Staking) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Staking.Merge(dst, src)
 }
 func (m *Staking) XXX_Size() int {
 	return xxx_messageInfo_Staking.Size(m)
@@ -1422,7 +1418,7 @@ func (m *Vote) Reset()         { *m = Vote{} }
 func (m *Vote) String() string { return proto.CompactTextString(m) }
 func (*Vote) ProtoMessage()    {}
 func (*Vote) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{25}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{25}
 }
 func (m *Vote) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Vote.Unmarshal(m, b)
@@ -1430,8 +1426,8 @@ func (m *Vote) XXX_Unmarshal(b []byte) error {
 func (m *Vote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Vote.Marshal(b, m, deterministic)
 }
-func (m *Vote) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Vote.Merge(m, src)
+func (dst *Vote) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Vote.Merge(dst, src)
 }
 func (m *Vote) XXX_Size() int {
 	return xxx_messageInfo_Vote.Size(m)
@@ -1457,8 +1453,8 @@ func (m *Vote) GetAmount() []byte {
 }
 
 type VoteParams struct {
-	Id                   string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Count                uint32   `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"`
+	Id                   string   `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Count                uint32   `protobuf:"varint,2,opt,name=count" json:"count,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1468,7 +1464,7 @@ func (m *VoteParams) Reset()         { *m = VoteParams{} }
 func (m *VoteParams) String() string { return proto.CompactTextString(m) }
 func (*VoteParams) ProtoMessage()    {}
 func (*VoteParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{26}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{26}
 }
 func (m *VoteParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VoteParams.Unmarshal(m, b)
@@ -1476,8 +1472,8 @@ func (m *VoteParams) XXX_Unmarshal(b []byte) error {
 func (m *VoteParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VoteParams.Marshal(b, m, deterministic)
 }
-func (m *VoteParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VoteParams.Merge(m, src)
+func (dst *VoteParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VoteParams.Merge(dst, src)
 }
 func (m *VoteParams) XXX_Size() int {
 	return xxx_messageInfo_VoteParams.Size(m)
@@ -1503,8 +1499,8 @@ func (m *VoteParams) GetCount() uint32 {
 }
 
 type AccountVoteInfo struct {
-	Staking              *Staking    `protobuf:"bytes,1,opt,name=staking,proto3" json:"staking,omitempty"`
-	Voting               []*VoteInfo `protobuf:"bytes,2,rep,name=voting,proto3" json:"voting,omitempty"`
+	Staking              *Staking    `protobuf:"bytes,1,opt,name=staking" json:"staking,omitempty"`
+	Voting               []*VoteInfo `protobuf:"bytes,2,rep,name=voting" json:"voting,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
 	XXX_unrecognized     []byte      `json:"-"`
 	XXX_sizecache        int32       `json:"-"`
@@ -1514,7 +1510,7 @@ func (m *AccountVoteInfo) Reset()         { *m = AccountVoteInfo{} }
 func (m *AccountVoteInfo) String() string { return proto.CompactTextString(m) }
 func (*AccountVoteInfo) ProtoMessage()    {}
 func (*AccountVoteInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{27}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{27}
 }
 func (m *AccountVoteInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountVoteInfo.Unmarshal(m, b)
@@ -1522,8 +1518,8 @@ func (m *AccountVoteInfo) XXX_Unmarshal(b []byte) error {
 func (m *AccountVoteInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AccountVoteInfo.Marshal(b, m, deterministic)
 }
-func (m *AccountVoteInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AccountVoteInfo.Merge(m, src)
+func (dst *AccountVoteInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AccountVoteInfo.Merge(dst, src)
 }
 func (m *AccountVoteInfo) XXX_Size() int {
 	return xxx_messageInfo_AccountVoteInfo.Size(m)
@@ -1549,8 +1545,8 @@ func (m *AccountVoteInfo) GetVoting() []*VoteInfo {
 }
 
 type VoteInfo struct {
-	Id                   string   `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
-	Candidates           []string `protobuf:"bytes,3,rep,name=candidates,proto3" json:"candidates,omitempty"`
+	Id                   string   `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
+	Candidates           []string `protobuf:"bytes,3,rep,name=candidates" json:"candidates,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1560,7 +1556,7 @@ func (m *VoteInfo) Reset()         { *m = VoteInfo{} }
 func (m *VoteInfo) String() string { return proto.CompactTextString(m) }
 func (*VoteInfo) ProtoMessage()    {}
 func (*VoteInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{28}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{28}
 }
 func (m *VoteInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VoteInfo.Unmarshal(m, b)
@@ -1568,8 +1564,8 @@ func (m *VoteInfo) XXX_Unmarshal(b []byte) error {
 func (m *VoteInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VoteInfo.Marshal(b, m, deterministic)
 }
-func (m *VoteInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VoteInfo.Merge(m, src)
+func (dst *VoteInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VoteInfo.Merge(dst, src)
 }
 func (m *VoteInfo) XXX_Size() int {
 	return xxx_messageInfo_VoteInfo.Size(m)
@@ -1595,8 +1591,8 @@ func (m *VoteInfo) GetCandidates() []string {
 }
 
 type VoteList struct {
-	Votes                []*Vote  `protobuf:"bytes,1,rep,name=votes,proto3" json:"votes,omitempty"`
-	Id                   string   `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	Votes                []*Vote  `protobuf:"bytes,1,rep,name=votes" json:"votes,omitempty"`
+	Id                   string   `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1606,7 +1602,7 @@ func (m *VoteList) Reset()         { *m = VoteList{} }
 func (m *VoteList) String() string { return proto.CompactTextString(m) }
 func (*VoteList) ProtoMessage()    {}
 func (*VoteList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{29}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{29}
 }
 func (m *VoteList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VoteList.Unmarshal(m, b)
@@ -1614,8 +1610,8 @@ func (m *VoteList) XXX_Unmarshal(b []byte) error {
 func (m *VoteList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_VoteList.Marshal(b, m, deterministic)
 }
-func (m *VoteList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_VoteList.Merge(m, src)
+func (dst *VoteList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VoteList.Merge(dst, src)
 }
 func (m *VoteList) XXX_Size() int {
 	return xxx_messageInfo_VoteList.Size(m)
@@ -1652,7 +1648,7 @@ func (m *NodeReq) Reset()         { *m = NodeReq{} }
 func (m *NodeReq) String() string { return proto.CompactTextString(m) }
 func (*NodeReq) ProtoMessage()    {}
 func (*NodeReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{30}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{30}
 }
 func (m *NodeReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NodeReq.Unmarshal(m, b)
@@ -1660,8 +1656,8 @@ func (m *NodeReq) XXX_Unmarshal(b []byte) error {
 func (m *NodeReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NodeReq.Marshal(b, m, deterministic)
 }
-func (m *NodeReq) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodeReq.Merge(m, src)
+func (dst *NodeReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeReq.Merge(dst, src)
 }
 func (m *NodeReq) XXX_Size() int {
 	return xxx_messageInfo_NodeReq.Size(m)
@@ -1687,8 +1683,8 @@ func (m *NodeReq) GetComponent() []byte {
 }
 
 type Name struct {
-	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	BlockNo              uint64   `protobuf:"varint,2,opt,name=blockNo,proto3" json:"blockNo,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	BlockNo              uint64   `protobuf:"varint,2,opt,name=blockNo" json:"blockNo,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1698,7 +1694,7 @@ func (m *Name) Reset()         { *m = Name{} }
 func (m *Name) String() string { return proto.CompactTextString(m) }
 func (*Name) ProtoMessage()    {}
 func (*Name) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{31}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{31}
 }
 func (m *Name) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Name.Unmarshal(m, b)
@@ -1706,8 +1702,8 @@ func (m *Name) XXX_Unmarshal(b []byte) error {
 func (m *Name) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Name.Marshal(b, m, deterministic)
 }
-func (m *Name) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Name.Merge(m, src)
+func (dst *Name) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Name.Merge(dst, src)
 }
 func (m *Name) XXX_Size() int {
 	return xxx_messageInfo_Name.Size(m)
@@ -1733,7 +1729,7 @@ func (m *Name) GetBlockNo() uint64 {
 }
 
 type NameInfo struct {
-	Name                 *Name    `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Name                 *Name    `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
 	Owner                []byte   `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty"`
 	Destination          []byte   `protobuf:"bytes,3,opt,name=destination,proto3" json:"destination,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -1745,7 +1741,7 @@ func (m *NameInfo) Reset()         { *m = NameInfo{} }
 func (m *NameInfo) String() string { return proto.CompactTextString(m) }
 func (*NameInfo) ProtoMessage()    {}
 func (*NameInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{32}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{32}
 }
 func (m *NameInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NameInfo.Unmarshal(m, b)
@@ -1753,8 +1749,8 @@ func (m *NameInfo) XXX_Unmarshal(b []byte) error {
 func (m *NameInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_NameInfo.Marshal(b, m, deterministic)
 }
-func (m *NameInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NameInfo.Merge(m, src)
+func (dst *NameInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NameInfo.Merge(dst, src)
 }
 func (m *NameInfo) XXX_Size() int {
 	return xxx_messageInfo_NameInfo.Size(m)
@@ -1787,8 +1783,8 @@ func (m *NameInfo) GetDestination() []byte {
 }
 
 type PeersParams struct {
-	NoHidden             bool     `protobuf:"varint,1,opt,name=noHidden,proto3" json:"noHidden,omitempty"`
-	ShowSelf             bool     `protobuf:"varint,2,opt,name=showSelf,proto3" json:"showSelf,omitempty"`
+	NoHidden             bool     `protobuf:"varint,1,opt,name=noHidden" json:"noHidden,omitempty"`
+	ShowSelf             bool     `protobuf:"varint,2,opt,name=showSelf" json:"showSelf,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1798,7 +1794,7 @@ func (m *PeersParams) Reset()         { *m = PeersParams{} }
 func (m *PeersParams) String() string { return proto.CompactTextString(m) }
 func (*PeersParams) ProtoMessage()    {}
 func (*PeersParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{33}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{33}
 }
 func (m *PeersParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PeersParams.Unmarshal(m, b)
@@ -1806,8 +1802,8 @@ func (m *PeersParams) XXX_Unmarshal(b []byte) error {
 func (m *PeersParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PeersParams.Marshal(b, m, deterministic)
 }
-func (m *PeersParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PeersParams.Merge(m, src)
+func (dst *PeersParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PeersParams.Merge(dst, src)
 }
 func (m *PeersParams) XXX_Size() int {
 	return xxx_messageInfo_PeersParams.Size(m)
@@ -1833,7 +1829,7 @@ func (m *PeersParams) GetShowSelf() bool {
 }
 
 type KeyParams struct {
-	Key                  []string `protobuf:"bytes,1,rep,name=key,proto3" json:"key,omitempty"`
+	Key                  []string `protobuf:"bytes,1,rep,name=key" json:"key,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1843,7 +1839,7 @@ func (m *KeyParams) Reset()         { *m = KeyParams{} }
 func (m *KeyParams) String() string { return proto.CompactTextString(m) }
 func (*KeyParams) ProtoMessage()    {}
 func (*KeyParams) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{34}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{34}
 }
 func (m *KeyParams) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeyParams.Unmarshal(m, b)
@@ -1851,8 +1847,8 @@ func (m *KeyParams) XXX_Unmarshal(b []byte) error {
 func (m *KeyParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_KeyParams.Marshal(b, m, deterministic)
 }
-func (m *KeyParams) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_KeyParams.Merge(m, src)
+func (dst *KeyParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeyParams.Merge(dst, src)
 }
 func (m *KeyParams) XXX_Size() int {
 	return xxx_messageInfo_KeyParams.Size(m)
@@ -1871,8 +1867,8 @@ func (m *KeyParams) GetKey() []string {
 }
 
 type ServerInfo struct {
-	Status               map[string]string      `protobuf:"bytes,1,rep,name=status,proto3" json:"status,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Config               map[string]*ConfigItem `protobuf:"bytes,2,rep,name=config,proto3" json:"config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Status               map[string]string      `protobuf:"bytes,1,rep,name=status" json:"status,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Config               map[string]*ConfigItem `protobuf:"bytes,2,rep,name=config" json:"config,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
 	XXX_unrecognized     []byte                 `json:"-"`
 	XXX_sizecache        int32                  `json:"-"`
@@ -1882,7 +1878,7 @@ func (m *ServerInfo) Reset()         { *m = ServerInfo{} }
 func (m *ServerInfo) String() string { return proto.CompactTextString(m) }
 func (*ServerInfo) ProtoMessage()    {}
 func (*ServerInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{35}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{35}
 }
 func (m *ServerInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ServerInfo.Unmarshal(m, b)
@@ -1890,8 +1886,8 @@ func (m *ServerInfo) XXX_Unmarshal(b []byte) error {
 func (m *ServerInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ServerInfo.Marshal(b, m, deterministic)
 }
-func (m *ServerInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServerInfo.Merge(m, src)
+func (dst *ServerInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerInfo.Merge(dst, src)
 }
 func (m *ServerInfo) XXX_Size() int {
 	return xxx_messageInfo_ServerInfo.Size(m)
@@ -1917,7 +1913,7 @@ func (m *ServerInfo) GetConfig() map[string]*ConfigItem {
 }
 
 type ConfigItem struct {
-	Props                map[string]string `protobuf:"bytes,2,rep,name=props,proto3" json:"props,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Props                map[string]string `protobuf:"bytes,2,rep,name=props" json:"props,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
 	XXX_sizecache        int32             `json:"-"`
@@ -1927,7 +1923,7 @@ func (m *ConfigItem) Reset()         { *m = ConfigItem{} }
 func (m *ConfigItem) String() string { return proto.CompactTextString(m) }
 func (*ConfigItem) ProtoMessage()    {}
 func (*ConfigItem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{36}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{36}
 }
 func (m *ConfigItem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConfigItem.Unmarshal(m, b)
@@ -1935,8 +1931,8 @@ func (m *ConfigItem) XXX_Unmarshal(b []byte) error {
 func (m *ConfigItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConfigItem.Marshal(b, m, deterministic)
 }
-func (m *ConfigItem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConfigItem.Merge(m, src)
+func (dst *ConfigItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfigItem.Merge(dst, src)
 }
 func (m *ConfigItem) XXX_Size() int {
 	return xxx_messageInfo_ConfigItem.Size(m)
@@ -1955,7 +1951,7 @@ func (m *ConfigItem) GetProps() map[string]string {
 }
 
 type EventList struct {
-	Events               []*Event `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"`
+	Events               []*Event `protobuf:"bytes,1,rep,name=events" json:"events,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1965,7 +1961,7 @@ func (m *EventList) Reset()         { *m = EventList{} }
 func (m *EventList) String() string { return proto.CompactTextString(m) }
 func (*EventList) ProtoMessage()    {}
 func (*EventList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{37}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{37}
 }
 func (m *EventList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EventList.Unmarshal(m, b)
@@ -1973,8 +1969,8 @@ func (m *EventList) XXX_Unmarshal(b []byte) error {
 func (m *EventList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EventList.Marshal(b, m, deterministic)
 }
-func (m *EventList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EventList.Merge(m, src)
+func (dst *EventList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EventList.Merge(dst, src)
 }
 func (m *EventList) XXX_Size() int {
 	return xxx_messageInfo_EventList.Size(m)
@@ -1994,9 +1990,9 @@ func (m *EventList) GetEvents() []*Event {
 
 // info and bps is json string
 type ConsensusInfo struct {
-	Type                 string   `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
-	Info                 string   `protobuf:"bytes,2,opt,name=info,proto3" json:"info,omitempty"`
-	Bps                  []string `protobuf:"bytes,3,rep,name=bps,proto3" json:"bps,omitempty"`
+	Type                 string   `protobuf:"bytes,1,opt,name=type" json:"type,omitempty"`
+	Info                 string   `protobuf:"bytes,2,opt,name=info" json:"info,omitempty"`
+	Bps                  []string `protobuf:"bytes,3,rep,name=bps" json:"bps,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2006,7 +2002,7 @@ func (m *ConsensusInfo) Reset()         { *m = ConsensusInfo{} }
 func (m *ConsensusInfo) String() string { return proto.CompactTextString(m) }
 func (*ConsensusInfo) ProtoMessage()    {}
 func (*ConsensusInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{38}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{38}
 }
 func (m *ConsensusInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConsensusInfo.Unmarshal(m, b)
@@ -2014,8 +2010,8 @@ func (m *ConsensusInfo) XXX_Unmarshal(b []byte) error {
 func (m *ConsensusInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConsensusInfo.Marshal(b, m, deterministic)
 }
-func (m *ConsensusInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConsensusInfo.Merge(m, src)
+func (dst *ConsensusInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConsensusInfo.Merge(dst, src)
 }
 func (m *ConsensusInfo) XXX_Size() int {
 	return xxx_messageInfo_ConsensusInfo.Size(m)
@@ -2048,7 +2044,7 @@ func (m *ConsensusInfo) GetBps() []string {
 }
 
 type EnterpriseConfigKey struct {
-	Key                  string   `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	Key                  string   `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2058,7 +2054,7 @@ func (m *EnterpriseConfigKey) Reset()         { *m = EnterpriseConfigKey{} }
 func (m *EnterpriseConfigKey) String() string { return proto.CompactTextString(m) }
 func (*EnterpriseConfigKey) ProtoMessage()    {}
 func (*EnterpriseConfigKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{39}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{39}
 }
 func (m *EnterpriseConfigKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EnterpriseConfigKey.Unmarshal(m, b)
@@ -2066,8 +2062,8 @@ func (m *EnterpriseConfigKey) XXX_Unmarshal(b []byte) error {
 func (m *EnterpriseConfigKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EnterpriseConfigKey.Marshal(b, m, deterministic)
 }
-func (m *EnterpriseConfigKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EnterpriseConfigKey.Merge(m, src)
+func (dst *EnterpriseConfigKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EnterpriseConfigKey.Merge(dst, src)
 }
 func (m *EnterpriseConfigKey) XXX_Size() int {
 	return xxx_messageInfo_EnterpriseConfigKey.Size(m)
@@ -2086,9 +2082,9 @@ func (m *EnterpriseConfigKey) GetKey() string {
 }
 
 type EnterpriseConfig struct {
-	Key                  string   `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
-	On                   bool     `protobuf:"varint,2,opt,name=on,proto3" json:"on,omitempty"`
-	Values               []string `protobuf:"bytes,3,rep,name=values,proto3" json:"values,omitempty"`
+	Key                  string   `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
+	On                   bool     `protobuf:"varint,2,opt,name=on" json:"on,omitempty"`
+	Values               []string `protobuf:"bytes,3,rep,name=values" json:"values,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2098,7 +2094,7 @@ func (m *EnterpriseConfig) Reset()         { *m = EnterpriseConfig{} }
 func (m *EnterpriseConfig) String() string { return proto.CompactTextString(m) }
 func (*EnterpriseConfig) ProtoMessage()    {}
 func (*EnterpriseConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_77a6da22d6a3feb1, []int{40}
+	return fileDescriptor_rpc_507fb1436ae53f14, []int{40}
 }
 func (m *EnterpriseConfig) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EnterpriseConfig.Unmarshal(m, b)
@@ -2106,8 +2102,8 @@ func (m *EnterpriseConfig) XXX_Unmarshal(b []byte) error {
 func (m *EnterpriseConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_EnterpriseConfig.Marshal(b, m, deterministic)
 }
-func (m *EnterpriseConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EnterpriseConfig.Merge(m, src)
+func (dst *EnterpriseConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EnterpriseConfig.Merge(dst, src)
 }
 func (m *EnterpriseConfig) XXX_Size() int {
 	return xxx_messageInfo_EnterpriseConfig.Size(m)
@@ -2196,9 +2192,8 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// AergoRPCServiceClient is the client API for AergoRPCService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+// Client API for AergoRPCService service
+
 type AergoRPCServiceClient interface {
 	// Returns the current state of this node
 	NodeState(ctx context.Context, in *NodeReq, opts ...grpc.CallOption) (*SingleBytes, error)
@@ -2294,7 +2289,7 @@ func NewAergoRPCServiceClient(cc *grpc.ClientConn) AergoRPCServiceClient {
 
 func (c *aergoRPCServiceClient) NodeState(ctx context.Context, in *NodeReq, opts ...grpc.CallOption) (*SingleBytes, error) {
 	out := new(SingleBytes)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/NodeState", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/NodeState", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2303,7 +2298,7 @@ func (c *aergoRPCServiceClient) NodeState(ctx context.Context, in *NodeReq, opts
 
 func (c *aergoRPCServiceClient) Metric(ctx context.Context, in *MetricsRequest, opts ...grpc.CallOption) (*Metrics, error) {
 	out := new(Metrics)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/Metric", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/Metric", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2312,7 +2307,7 @@ func (c *aergoRPCServiceClient) Metric(ctx context.Context, in *MetricsRequest,
 
 func (c *aergoRPCServiceClient) Blockchain(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*BlockchainStatus, error) {
 	out := new(BlockchainStatus)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/Blockchain", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/Blockchain", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2321,7 +2316,7 @@ func (c *aergoRPCServiceClient) Blockchain(ctx context.Context, in *Empty, opts
 
 func (c *aergoRPCServiceClient) GetChainInfo(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ChainInfo, error) {
 	out := new(ChainInfo)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetChainInfo", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetChainInfo", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2330,7 +2325,7 @@ func (c *aergoRPCServiceClient) GetChainInfo(ctx context.Context, in *Empty, opt
 
 func (c *aergoRPCServiceClient) ChainStat(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ChainStats, error) {
 	out := new(ChainStats)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/ChainStat", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/ChainStat", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2339,7 +2334,7 @@ func (c *aergoRPCServiceClient) ChainStat(ctx context.Context, in *Empty, opts .
 
 func (c *aergoRPCServiceClient) ListBlockHeaders(ctx context.Context, in *ListParams, opts ...grpc.CallOption) (*BlockHeaderList, error) {
 	out := new(BlockHeaderList)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/ListBlockHeaders", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/ListBlockHeaders", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2348,7 +2343,7 @@ func (c *aergoRPCServiceClient) ListBlockHeaders(ctx context.Context, in *ListPa
 
 func (c *aergoRPCServiceClient) ListBlockMetadata(ctx context.Context, in *ListParams, opts ...grpc.CallOption) (*BlockMetadataList, error) {
 	out := new(BlockMetadataList)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/ListBlockMetadata", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/ListBlockMetadata", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2356,7 +2351,7 @@ func (c *aergoRPCServiceClient) ListBlockMetadata(ctx context.Context, in *ListP
 }
 
 func (c *aergoRPCServiceClient) ListBlockStream(ctx context.Context, in *Empty, opts ...grpc.CallOption) (AergoRPCService_ListBlockStreamClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_AergoRPCService_serviceDesc.Streams[0], "/types.AergoRPCService/ListBlockStream", opts...)
+	stream, err := grpc.NewClientStream(ctx, &_AergoRPCService_serviceDesc.Streams[0], c.cc, "/types.AergoRPCService/ListBlockStream", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2388,7 +2383,7 @@ func (x *aergoRPCServiceListBlockStreamClient) Recv() (*Block, error) {
 }
 
 func (c *aergoRPCServiceClient) ListBlockMetadataStream(ctx context.Context, in *Empty, opts ...grpc.CallOption) (AergoRPCService_ListBlockMetadataStreamClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_AergoRPCService_serviceDesc.Streams[1], "/types.AergoRPCService/ListBlockMetadataStream", opts...)
+	stream, err := grpc.NewClientStream(ctx, &_AergoRPCService_serviceDesc.Streams[1], c.cc, "/types.AergoRPCService/ListBlockMetadataStream", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2421,7 +2416,7 @@ func (x *aergoRPCServiceListBlockMetadataStreamClient) Recv() (*BlockMetadata, e
 
 func (c *aergoRPCServiceClient) GetBlock(ctx context.Context, in *SingleBytes, opts ...grpc.CallOption) (*Block, error) {
 	out := new(Block)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetBlock", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetBlock", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2430,7 +2425,7 @@ func (c *aergoRPCServiceClient) GetBlock(ctx context.Context, in *SingleBytes, o
 
 func (c *aergoRPCServiceClient) GetBlockMetadata(ctx context.Context, in *SingleBytes, opts ...grpc.CallOption) (*BlockMetadata, error) {
 	out := new(BlockMetadata)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetBlockMetadata", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetBlockMetadata", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2439,7 +2434,7 @@ func (c *aergoRPCServiceClient) GetBlockMetadata(ctx context.Context, in *Single
 
 func (c *aergoRPCServiceClient) GetBlockBody(ctx context.Context, in *BlockBodyParams, opts ...grpc.CallOption) (*BlockBodyPaged, error) {
 	out := new(BlockBodyPaged)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetBlockBody", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetBlockBody", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2448,7 +2443,7 @@ func (c *aergoRPCServiceClient) GetBlockBody(ctx context.Context, in *BlockBodyP
 
 func (c *aergoRPCServiceClient) GetTX(ctx context.Context, in *SingleBytes, opts ...grpc.CallOption) (*Tx, error) {
 	out := new(Tx)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetTX", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetTX", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2457,7 +2452,7 @@ func (c *aergoRPCServiceClient) GetTX(ctx context.Context, in *SingleBytes, opts
 
 func (c *aergoRPCServiceClient) GetBlockTX(ctx context.Context, in *SingleBytes, opts ...grpc.CallOption) (*TxInBlock, error) {
 	out := new(TxInBlock)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetBlockTX", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetBlockTX", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2466,7 +2461,7 @@ func (c *aergoRPCServiceClient) GetBlockTX(ctx context.Context, in *SingleBytes,
 
 func (c *aergoRPCServiceClient) GetReceipt(ctx context.Context, in *SingleBytes, opts ...grpc.CallOption) (*Receipt, error) {
 	out := new(Receipt)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetReceipt", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetReceipt", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2475,7 +2470,7 @@ func (c *aergoRPCServiceClient) GetReceipt(ctx context.Context, in *SingleBytes,
 
 func (c *aergoRPCServiceClient) GetABI(ctx context.Context, in *SingleBytes, opts ...grpc.CallOption) (*ABI, error) {
 	out := new(ABI)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetABI", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetABI", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2484,7 +2479,7 @@ func (c *aergoRPCServiceClient) GetABI(ctx context.Context, in *SingleBytes, opt
 
 func (c *aergoRPCServiceClient) SendTX(ctx context.Context, in *Tx, opts ...grpc.CallOption) (*CommitResult, error) {
 	out := new(CommitResult)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/SendTX", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/SendTX", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2493,7 +2488,7 @@ func (c *aergoRPCServiceClient) SendTX(ctx context.Context, in *Tx, opts ...grpc
 
 func (c *aergoRPCServiceClient) SignTX(ctx context.Context, in *Tx, opts ...grpc.CallOption) (*Tx, error) {
 	out := new(Tx)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/SignTX", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/SignTX", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2502,7 +2497,7 @@ func (c *aergoRPCServiceClient) SignTX(ctx context.Context, in *Tx, opts ...grpc
 
 func (c *aergoRPCServiceClient) VerifyTX(ctx context.Context, in *Tx, opts ...grpc.CallOption) (*VerifyResult, error) {
 	out := new(VerifyResult)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/VerifyTX", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/VerifyTX", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2511,7 +2506,7 @@ func (c *aergoRPCServiceClient) VerifyTX(ctx context.Context, in *Tx, opts ...gr
 
 func (c *aergoRPCServiceClient) CommitTX(ctx context.Context, in *TxList, opts ...grpc.CallOption) (*CommitResultList, error) {
 	out := new(CommitResultList)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/CommitTX", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/CommitTX", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2520,7 +2515,7 @@ func (c *aergoRPCServiceClient) CommitTX(ctx context.Context, in *TxList, opts .
 
 func (c *aergoRPCServiceClient) GetState(ctx context.Context, in *SingleBytes, opts ...grpc.CallOption) (*State, error) {
 	out := new(State)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetState", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetState", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2529,7 +2524,7 @@ func (c *aergoRPCServiceClient) GetState(ctx context.Context, in *SingleBytes, o
 
 func (c *aergoRPCServiceClient) GetStateAndProof(ctx context.Context, in *AccountAndRoot, opts ...grpc.CallOption) (*AccountProof, error) {
 	out := new(AccountProof)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetStateAndProof", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetStateAndProof", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2538,7 +2533,7 @@ func (c *aergoRPCServiceClient) GetStateAndProof(ctx context.Context, in *Accoun
 
 func (c *aergoRPCServiceClient) CreateAccount(ctx context.Context, in *Personal, opts ...grpc.CallOption) (*Account, error) {
 	out := new(Account)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/CreateAccount", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/CreateAccount", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2547,7 +2542,7 @@ func (c *aergoRPCServiceClient) CreateAccount(ctx context.Context, in *Personal,
 
 func (c *aergoRPCServiceClient) GetAccounts(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*AccountList, error) {
 	out := new(AccountList)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetAccounts", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetAccounts", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2556,7 +2551,7 @@ func (c *aergoRPCServiceClient) GetAccounts(ctx context.Context, in *Empty, opts
 
 func (c *aergoRPCServiceClient) LockAccount(ctx context.Context, in *Personal, opts ...grpc.CallOption) (*Account, error) {
 	out := new(Account)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/LockAccount", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/LockAccount", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2565,7 +2560,7 @@ func (c *aergoRPCServiceClient) LockAccount(ctx context.Context, in *Personal, o
 
 func (c *aergoRPCServiceClient) UnlockAccount(ctx context.Context, in *Personal, opts ...grpc.CallOption) (*Account, error) {
 	out := new(Account)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/UnlockAccount", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/UnlockAccount", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2574,7 +2569,7 @@ func (c *aergoRPCServiceClient) UnlockAccount(ctx context.Context, in *Personal,
 
 func (c *aergoRPCServiceClient) ImportAccount(ctx context.Context, in *ImportFormat, opts ...grpc.CallOption) (*Account, error) {
 	out := new(Account)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/ImportAccount", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/ImportAccount", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2583,7 +2578,7 @@ func (c *aergoRPCServiceClient) ImportAccount(ctx context.Context, in *ImportFor
 
 func (c *aergoRPCServiceClient) ExportAccount(ctx context.Context, in *Personal, opts ...grpc.CallOption) (*SingleBytes, error) {
 	out := new(SingleBytes)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/ExportAccount", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/ExportAccount", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2592,7 +2587,7 @@ func (c *aergoRPCServiceClient) ExportAccount(ctx context.Context, in *Personal,
 
 func (c *aergoRPCServiceClient) QueryContract(ctx context.Context, in *Query, opts ...grpc.CallOption) (*SingleBytes, error) {
 	out := new(SingleBytes)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/QueryContract", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/QueryContract", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2601,7 +2596,7 @@ func (c *aergoRPCServiceClient) QueryContract(ctx context.Context, in *Query, op
 
 func (c *aergoRPCServiceClient) QueryContractState(ctx context.Context, in *StateQuery, opts ...grpc.CallOption) (*StateQueryProof, error) {
 	out := new(StateQueryProof)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/QueryContractState", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/QueryContractState", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2610,7 +2605,7 @@ func (c *aergoRPCServiceClient) QueryContractState(ctx context.Context, in *Stat
 
 func (c *aergoRPCServiceClient) GetPeers(ctx context.Context, in *PeersParams, opts ...grpc.CallOption) (*PeerList, error) {
 	out := new(PeerList)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetPeers", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetPeers", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2619,7 +2614,7 @@ func (c *aergoRPCServiceClient) GetPeers(ctx context.Context, in *PeersParams, o
 
 func (c *aergoRPCServiceClient) GetVotes(ctx context.Context, in *VoteParams, opts ...grpc.CallOption) (*VoteList, error) {
 	out := new(VoteList)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetVotes", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetVotes", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2628,7 +2623,7 @@ func (c *aergoRPCServiceClient) GetVotes(ctx context.Context, in *VoteParams, op
 
 func (c *aergoRPCServiceClient) GetAccountVotes(ctx context.Context, in *AccountAddress, opts ...grpc.CallOption) (*AccountVoteInfo, error) {
 	out := new(AccountVoteInfo)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetAccountVotes", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetAccountVotes", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2637,7 +2632,7 @@ func (c *aergoRPCServiceClient) GetAccountVotes(ctx context.Context, in *Account
 
 func (c *aergoRPCServiceClient) GetStaking(ctx context.Context, in *AccountAddress, opts ...grpc.CallOption) (*Staking, error) {
 	out := new(Staking)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetStaking", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetStaking", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2646,7 +2641,7 @@ func (c *aergoRPCServiceClient) GetStaking(ctx context.Context, in *AccountAddre
 
 func (c *aergoRPCServiceClient) GetNameInfo(ctx context.Context, in *Name, opts ...grpc.CallOption) (*NameInfo, error) {
 	out := new(NameInfo)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetNameInfo", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetNameInfo", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2654,7 +2649,7 @@ func (c *aergoRPCServiceClient) GetNameInfo(ctx context.Context, in *Name, opts
 }
 
 func (c *aergoRPCServiceClient) ListEventStream(ctx context.Context, in *FilterInfo, opts ...grpc.CallOption) (AergoRPCService_ListEventStreamClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_AergoRPCService_serviceDesc.Streams[2], "/types.AergoRPCService/ListEventStream", opts...)
+	stream, err := grpc.NewClientStream(ctx, &_AergoRPCService_serviceDesc.Streams[2], c.cc, "/types.AergoRPCService/ListEventStream", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2687,7 +2682,7 @@ func (x *aergoRPCServiceListEventStreamClient) Recv() (*Event, error) {
 
 func (c *aergoRPCServiceClient) ListEvents(ctx context.Context, in *FilterInfo, opts ...grpc.CallOption) (*EventList, error) {
 	out := new(EventList)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/ListEvents", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/ListEvents", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2696,7 +2691,7 @@ func (c *aergoRPCServiceClient) ListEvents(ctx context.Context, in *FilterInfo,
 
 func (c *aergoRPCServiceClient) GetServerInfo(ctx context.Context, in *KeyParams, opts ...grpc.CallOption) (*ServerInfo, error) {
 	out := new(ServerInfo)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetServerInfo", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetServerInfo", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2705,7 +2700,7 @@ func (c *aergoRPCServiceClient) GetServerInfo(ctx context.Context, in *KeyParams
 
 func (c *aergoRPCServiceClient) GetConsensusInfo(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ConsensusInfo, error) {
 	out := new(ConsensusInfo)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetConsensusInfo", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetConsensusInfo", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2714,7 +2709,7 @@ func (c *aergoRPCServiceClient) GetConsensusInfo(ctx context.Context, in *Empty,
 
 func (c *aergoRPCServiceClient) ChangeMembership(ctx context.Context, in *MembershipChange, opts ...grpc.CallOption) (*MembershipChangeReply, error) {
 	out := new(MembershipChangeReply)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/ChangeMembership", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/ChangeMembership", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2723,14 +2718,15 @@ func (c *aergoRPCServiceClient) ChangeMembership(ctx context.Context, in *Member
 
 func (c *aergoRPCServiceClient) GetEnterpriseConfig(ctx context.Context, in *EnterpriseConfigKey, opts ...grpc.CallOption) (*EnterpriseConfig, error) {
 	out := new(EnterpriseConfig)
-	err := c.cc.Invoke(ctx, "/types.AergoRPCService/GetEnterpriseConfig", in, out, opts...)
+	err := grpc.Invoke(ctx, "/types.AergoRPCService/GetEnterpriseConfig", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// AergoRPCServiceServer is the server API for AergoRPCService service.
+// Server API for AergoRPCService service
+
 type AergoRPCServiceServer interface {
 	// Returns the current state of this node
 	NodeState(context.Context, *NodeReq) (*SingleBytes, error)
@@ -3744,9 +3740,9 @@ var _AergoRPCService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "rpc.proto",
 }
 
-func init() { proto.RegisterFile("rpc.proto", fileDescriptor_77a6da22d6a3feb1) }
+func init() { proto.RegisterFile("rpc.proto", fileDescriptor_rpc_507fb1436ae53f14) }
 
-var fileDescriptor_77a6da22d6a3feb1 = []byte{
+var fileDescriptor_rpc_507fb1436ae53f14 = []byte{
 	// 2486 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x39, 0xeb, 0x56, 0x23, 0xc7,
 	0xd1, 0x92, 0x40, 0x42, 0x2a, 0x49, 0x30, 0xf4, 0xe2, 0x5d, 0x3e, 0x7d, 0xeb, 0x35, 0xe9, 0x38,