upgrade protobuf

plugin/dapp/evm/executor/exec.go

@@ -98,8 +98,7 @@ func (evm *EVMExecutor) Exec(tx *types.Transaction, index int) (*types.Receipt,
 	// 从状态机中获取数据变更和变更日志
 	data, logs := evm.mStateDB.GetChangedData(curVer.GetId())
 
-	contractReceipt := &evmtypes.ReceiptEVMContract{msg.From().String(), execName, contractAddr.String(), usedGas, ret}
-
+	contractReceipt := &evmtypes.ReceiptEVMContract{Caller: msg.From().String(), ContractName: execName, ContractAddr: contractAddr.String(), UsedGas: usedGas, Ret: ret}
 	logs = append(logs, &types.ReceiptLog{evmtypes.TyLogCallContract, types.Encode(contractReceipt)})
 	logs = append(logs, evm.mStateDB.GetReceiptLogs(contractAddr.String())...)
 

plugin/dapp/evm/types/evmcontract.pb.go

-// Copyright Fuzamei Corp. 2018 All Rights Reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: evmcontract.proto
 
-/*
-Package types is a generated protocol buffer package.
-
-It is generated from these files:
-	evmcontract.proto
-
-It has these top-level messages:
-	EVMContractObject
-	EVMContractData
-	EVMContractState
-	EVMContractAction
-	ReceiptEVMContract
-	EVMStateChangeItem
-	EVMContractDataCmd
-	EVMContractStateCmd
-	ReceiptEVMContractCmd
-	CheckEVMAddrReq
-	CheckEVMAddrResp
-	EstimateEVMGasReq
-	EstimateEVMGasResp
-	EvmDebugReq
-	EvmDebugResp
-*/
 package types
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -45,17 +20,40 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
-// 合约对象信息
+//合约对象信息
 type EVMContractObject struct {
-	Addr  string            `protobuf:"bytes,1,opt,name=addr" json:"addr,omitempty"`
-	Data  *EVMContractData  `protobuf:"bytes,2,opt,name=data" json:"data,omitempty"`
-	State *EVMContractState `protobuf:"bytes,3,opt,name=state" json:"state,omitempty"`
+	Addr                 string            `protobuf:"bytes,1,opt,name=addr,proto3" json:"addr,omitempty"`
+	Data                 *EVMContractData  `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	State                *EVMContractState `protobuf:"bytes,3,opt,name=state,proto3" json:"state,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
 func (m *EVMContractObject) Reset()         { *m = EVMContractObject{} }
 func (m *EVMContractObject) String() string { return proto.CompactTextString(m) }
 func (*EVMContractObject) ProtoMessage()    {}
-func (*EVMContractObject) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (*EVMContractObject) Descriptor() ([]byte, []int) {
+	return fileDescriptor_74353de561acd7c6, []int{0}
+}
+
+func (m *EVMContractObject) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EVMContractObject.Unmarshal(m, b)
+}
+func (m *EVMContractObject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EVMContractObject.Marshal(b, m, deterministic)
+}
+func (m *EVMContractObject) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EVMContractObject.Merge(m, src)
+}
+func (m *EVMContractObject) XXX_Size() int {
+	return xxx_messageInfo_EVMContractObject.Size(m)
+}
+func (m *EVMContractObject) XXX_DiscardUnknown() {
+	xxx_messageInfo_EVMContractObject.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EVMContractObject proto.InternalMessageInfo
 
 func (m *EVMContractObject) GetAddr() string {
 	if m != nil {
@@ -80,18 +78,41 @@ func (m *EVMContractObject) GetState() *EVMContractState {
 
 // 存放合约固定数据
 type EVMContractData struct {
-	Creator  string `protobuf:"bytes,1,opt,name=creator" json:"creator,omitempty"`
-	Name     string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
-	Alias    string `protobuf:"bytes,3,opt,name=alias" json:"alias,omitempty"`
-	Addr     string `protobuf:"bytes,4,opt,name=addr" json:"addr,omitempty"`
+	Creator              string   `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"`
+	Name                 string   `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Alias                string   `protobuf:"bytes,3,opt,name=alias,proto3" json:"alias,omitempty"`
+	Addr                 string   `protobuf:"bytes,4,opt,name=addr,proto3" json:"addr,omitempty"`
 	Code                 []byte   `protobuf:"bytes,5,opt,name=code,proto3" json:"code,omitempty"`
 	CodeHash             []byte   `protobuf:"bytes,6,opt,name=codeHash,proto3" json:"codeHash,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *EVMContractData) Reset()         { *m = EVMContractData{} }
 func (m *EVMContractData) String() string { return proto.CompactTextString(m) }
 func (*EVMContractData) ProtoMessage()    {}
-func (*EVMContractData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (*EVMContractData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_74353de561acd7c6, []int{1}
+}
+
+func (m *EVMContractData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EVMContractData.Unmarshal(m, b)
+}
+func (m *EVMContractData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EVMContractData.Marshal(b, m, deterministic)
+}
+func (m *EVMContractData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EVMContractData.Merge(m, src)
+}
+func (m *EVMContractData) XXX_Size() int {
+	return xxx_messageInfo_EVMContractData.Size(m)
+}
+func (m *EVMContractData) XXX_DiscardUnknown() {
+	xxx_messageInfo_EVMContractData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EVMContractData proto.InternalMessageInfo
 
 func (m *EVMContractData) GetCreator() string {
 	if m != nil {
@@ -137,16 +158,39 @@ func (m *EVMContractData) GetCodeHash() []byte {
 
 // 存放合约变化数据
 type EVMContractState struct {
-	Nonce       uint64            `protobuf:"varint,1,opt,name=nonce" json:"nonce,omitempty"`
-	Suicided    bool              `protobuf:"varint,2,opt,name=suicided" json:"suicided,omitempty"`
+	Nonce                uint64            `protobuf:"varint,1,opt,name=nonce,proto3" json:"nonce,omitempty"`
+	Suicided             bool              `protobuf:"varint,2,opt,name=suicided,proto3" json:"suicided,omitempty"`
 	StorageHash          []byte            `protobuf:"bytes,3,opt,name=storageHash,proto3" json:"storageHash,omitempty"`
-	Storage     map[string][]byte `protobuf:"bytes,4,rep,name=storage" json:"storage,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Storage              map[string][]byte `protobuf:"bytes,4,rep,name=storage,proto3" json:"storage,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
 func (m *EVMContractState) Reset()         { *m = EVMContractState{} }
 func (m *EVMContractState) String() string { return proto.CompactTextString(m) }
 func (*EVMContractState) ProtoMessage()    {}
-func (*EVMContractState) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (*EVMContractState) Descriptor() ([]byte, []int) {
+	return fileDescriptor_74353de561acd7c6, []int{2}
+}
+
+func (m *EVMContractState) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EVMContractState.Unmarshal(m, b)
+}
+func (m *EVMContractState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EVMContractState.Marshal(b, m, deterministic)
+}
+func (m *EVMContractState) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EVMContractState.Merge(m, src)
+}
+func (m *EVMContractState) XXX_Size() int {
+	return xxx_messageInfo_EVMContractState.Size(m)
+}
+func (m *EVMContractState) XXX_DiscardUnknown() {
+	xxx_messageInfo_EVMContractState.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EVMContractState proto.InternalMessageInfo
 
 func (m *EVMContractState) GetNonce() uint64 {
 	if m != nil {
@@ -179,23 +223,46 @@ func (m *EVMContractState) GetStorage() map[string][]byte {
 // 创建/调用合约的请求结构
 type EVMContractAction struct {
 	// 转账金额
-	Amount uint64 `protobuf:"varint,1,opt,name=amount" json:"amount,omitempty"`
+	Amount uint64 `protobuf:"varint,1,opt,name=amount,proto3" json:"amount,omitempty"`
 	// 消耗限制，默认为Transaction.Fee
-	GasLimit uint64 `protobuf:"varint,2,opt,name=gasLimit" json:"gasLimit,omitempty"`
+	GasLimit uint64 `protobuf:"varint,2,opt,name=gasLimit,proto3" json:"gasLimit,omitempty"`
 	// gas价格，默认为1
-	GasPrice uint32 `protobuf:"varint,3,opt,name=gasPrice" json:"gasPrice,omitempty"`
+	GasPrice uint32 `protobuf:"varint,3,opt,name=gasPrice,proto3" json:"gasPrice,omitempty"`
 	// 合约数据
 	Code []byte `protobuf:"bytes,4,opt,name=code,proto3" json:"code,omitempty"`
 	// 合约别名，方便识别
-	Alias string `protobuf:"bytes,5,opt,name=alias" json:"alias,omitempty"`
+	Alias string `protobuf:"bytes,5,opt,name=alias,proto3" json:"alias,omitempty"`
 	// 交易备注
-	Note string `protobuf:"bytes,6,opt,name=note" json:"note,omitempty"`
+	Note                 string   `protobuf:"bytes,6,opt,name=note,proto3" json:"note,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *EVMContractAction) Reset()         { *m = EVMContractAction{} }
 func (m *EVMContractAction) String() string { return proto.CompactTextString(m) }
 func (*EVMContractAction) ProtoMessage()    {}
-func (*EVMContractAction) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (*EVMContractAction) Descriptor() ([]byte, []int) {
+	return fileDescriptor_74353de561acd7c6, []int{3}
+}
+
+func (m *EVMContractAction) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EVMContractAction.Unmarshal(m, b)
+}
+func (m *EVMContractAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EVMContractAction.Marshal(b, m, deterministic)
+}
+func (m *EVMContractAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EVMContractAction.Merge(m, src)
+}
+func (m *EVMContractAction) XXX_Size() int {
+	return xxx_messageInfo_EVMContractAction.Size(m)
+}
+func (m *EVMContractAction) XXX_DiscardUnknown() {
+	xxx_messageInfo_EVMContractAction.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EVMContractAction proto.InternalMessageInfo
 
 func (m *EVMContractAction) GetAmount() uint64 {
 	if m != nil {
@@ -241,18 +308,41 @@ func (m *EVMContractAction) GetNote() string {
 
 // 合约创建/调用日志
 type ReceiptEVMContract struct {
-	Caller       string `protobuf:"bytes,1,opt,name=caller" json:"caller,omitempty"`
-	ContractName string `protobuf:"bytes,2,opt,name=contractName" json:"contractName,omitempty"`
-	ContractAddr string `protobuf:"bytes,3,opt,name=contractAddr" json:"contractAddr,omitempty"`
-	UsedGas      uint64 `protobuf:"varint,4,opt,name=usedGas" json:"usedGas,omitempty"`
+	Caller       string `protobuf:"bytes,1,opt,name=caller,proto3" json:"caller,omitempty"`
+	ContractName string `protobuf:"bytes,2,opt,name=contractName,proto3" json:"contractName,omitempty"`
+	ContractAddr string `protobuf:"bytes,3,opt,name=contractAddr,proto3" json:"contractAddr,omitempty"`
+	UsedGas      uint64 `protobuf:"varint,4,opt,name=usedGas,proto3" json:"usedGas,omitempty"`
 	// 创建合约返回的代码
 	Ret                  []byte   `protobuf:"bytes,5,opt,name=ret,proto3" json:"ret,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *ReceiptEVMContract) Reset()         { *m = ReceiptEVMContract{} }
 func (m *ReceiptEVMContract) String() string { return proto.CompactTextString(m) }
 func (*ReceiptEVMContract) ProtoMessage()    {}
-func (*ReceiptEVMContract) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (*ReceiptEVMContract) Descriptor() ([]byte, []int) {
+	return fileDescriptor_74353de561acd7c6, []int{4}
+}
+
+func (m *ReceiptEVMContract) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReceiptEVMContract.Unmarshal(m, b)
+}
+func (m *ReceiptEVMContract) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReceiptEVMContract.Marshal(b, m, deterministic)
+}
+func (m *ReceiptEVMContract) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReceiptEVMContract.Merge(m, src)
+}
+func (m *ReceiptEVMContract) XXX_Size() int {
+	return xxx_messageInfo_ReceiptEVMContract.Size(m)
+}
+func (m *ReceiptEVMContract) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReceiptEVMContract.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReceiptEVMContract proto.InternalMessageInfo
 
 func (m *ReceiptEVMContract) GetCaller() string {
 	if m != nil {
@@ -291,15 +381,38 @@ func (m *ReceiptEVMContract) GetRet() []byte {
 
 // 用于保存EVM只能合约中的状态数据变更
 type EVMStateChangeItem struct {
-	Key          string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
+	Key                  string   `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	PreValue             []byte   `protobuf:"bytes,2,opt,name=preValue,proto3" json:"preValue,omitempty"`
 	CurrentValue         []byte   `protobuf:"bytes,3,opt,name=currentValue,proto3" json:"currentValue,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *EVMStateChangeItem) Reset()         { *m = EVMStateChangeItem{} }
 func (m *EVMStateChangeItem) String() string { return proto.CompactTextString(m) }
 func (*EVMStateChangeItem) ProtoMessage()    {}
-func (*EVMStateChangeItem) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (*EVMStateChangeItem) Descriptor() ([]byte, []int) {
+	return fileDescriptor_74353de561acd7c6, []int{5}
+}
+
+func (m *EVMStateChangeItem) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EVMStateChangeItem.Unmarshal(m, b)
+}
+func (m *EVMStateChangeItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EVMStateChangeItem.Marshal(b, m, deterministic)
+}
+func (m *EVMStateChangeItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EVMStateChangeItem.Merge(m, src)
+}
+func (m *EVMStateChangeItem) XXX_Size() int {
+	return xxx_messageInfo_EVMStateChangeItem.Size(m)
+}
+func (m *EVMStateChangeItem) XXX_DiscardUnknown() {
+	xxx_messageInfo_EVMStateChangeItem.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EVMStateChangeItem proto.InternalMessageInfo
 
 func (m *EVMStateChangeItem) GetKey() string {
 	if m != nil {
@@ -324,18 +437,41 @@ func (m *EVMStateChangeItem) GetCurrentValue() []byte {
 
 // 存放合约固定数据
 type EVMContractDataCmd struct {
-	Creator  string `protobuf:"bytes,1,opt,name=creator" json:"creator,omitempty"`
-	Name     string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
-	Alias    string `protobuf:"bytes,3,opt,name=alias" json:"alias,omitempty"`
-	Addr     string `protobuf:"bytes,4,opt,name=addr" json:"addr,omitempty"`
-	Code     string `protobuf:"bytes,5,opt,name=code" json:"code,omitempty"`
-	CodeHash string `protobuf:"bytes,6,opt,name=codeHash" json:"codeHash,omitempty"`
+	Creator              string   `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"`
+	Name                 string   `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Alias                string   `protobuf:"bytes,3,opt,name=alias,proto3" json:"alias,omitempty"`
+	Addr                 string   `protobuf:"bytes,4,opt,name=addr,proto3" json:"addr,omitempty"`
+	Code                 string   `protobuf:"bytes,5,opt,name=code,proto3" json:"code,omitempty"`
+	CodeHash             string   `protobuf:"bytes,6,opt,name=codeHash,proto3" json:"codeHash,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *EVMContractDataCmd) Reset()         { *m = EVMContractDataCmd{} }
 func (m *EVMContractDataCmd) String() string { return proto.CompactTextString(m) }
 func (*EVMContractDataCmd) ProtoMessage()    {}
-func (*EVMContractDataCmd) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (*EVMContractDataCmd) Descriptor() ([]byte, []int) {
+	return fileDescriptor_74353de561acd7c6, []int{6}
+}
+
+func (m *EVMContractDataCmd) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EVMContractDataCmd.Unmarshal(m, b)
+}
+func (m *EVMContractDataCmd) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EVMContractDataCmd.Marshal(b, m, deterministic)
+}
+func (m *EVMContractDataCmd) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EVMContractDataCmd.Merge(m, src)
+}
+func (m *EVMContractDataCmd) XXX_Size() int {
+	return xxx_messageInfo_EVMContractDataCmd.Size(m)
+}
+func (m *EVMContractDataCmd) XXX_DiscardUnknown() {
+	xxx_messageInfo_EVMContractDataCmd.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EVMContractDataCmd proto.InternalMessageInfo
 
 func (m *EVMContractDataCmd) GetCreator() string {
 	if m != nil {
@@ -381,16 +517,39 @@ func (m *EVMContractDataCmd) GetCodeHash() string {
 
 // 存放合约变化数据
 type EVMContractStateCmd struct {
-	Nonce       uint64            `protobuf:"varint,1,opt,name=nonce" json:"nonce,omitempty"`
-	Suicided    bool              `protobuf:"varint,2,opt,name=suicided" json:"suicided,omitempty"`
-	StorageHash string            `protobuf:"bytes,3,opt,name=storageHash" json:"storageHash,omitempty"`
-	Storage     map[string]string `protobuf:"bytes,4,rep,name=storage" json:"storage,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Nonce                uint64            `protobuf:"varint,1,opt,name=nonce,proto3" json:"nonce,omitempty"`
+	Suicided             bool              `protobuf:"varint,2,opt,name=suicided,proto3" json:"suicided,omitempty"`
+	StorageHash          string            `protobuf:"bytes,3,opt,name=storageHash,proto3" json:"storageHash,omitempty"`
+	Storage              map[string]string `protobuf:"bytes,4,rep,name=storage,proto3" json:"storage,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
 func (m *EVMContractStateCmd) Reset()         { *m = EVMContractStateCmd{} }
 func (m *EVMContractStateCmd) String() string { return proto.CompactTextString(m) }
 func (*EVMContractStateCmd) ProtoMessage()    {}
-func (*EVMContractStateCmd) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (*EVMContractStateCmd) Descriptor() ([]byte, []int) {
+	return fileDescriptor_74353de561acd7c6, []int{7}
+}
+
+func (m *EVMContractStateCmd) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EVMContractStateCmd.Unmarshal(m, b)
+}
+func (m *EVMContractStateCmd) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EVMContractStateCmd.Marshal(b, m, deterministic)
+}
+func (m *EVMContractStateCmd) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EVMContractStateCmd.Merge(m, src)
+}
+func (m *EVMContractStateCmd) XXX_Size() int {
+	return xxx_messageInfo_EVMContractStateCmd.Size(m)
+}
+func (m *EVMContractStateCmd) XXX_DiscardUnknown() {
+	xxx_messageInfo_EVMContractStateCmd.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EVMContractStateCmd proto.InternalMessageInfo
 
 func (m *EVMContractStateCmd) GetNonce() uint64 {
 	if m != nil {
@@ -422,19 +581,42 @@ func (m *EVMContractStateCmd) GetStorage() map[string]string {
 
 // 合约创建/调用日志
 type ReceiptEVMContractCmd struct {
-	Caller string `protobuf:"bytes,1,opt,name=caller" json:"caller,omitempty"`
+	Caller string `protobuf:"bytes,1,opt,name=caller,proto3" json:"caller,omitempty"`
 	// 合约创建时才会返回此内容
-	ContractName string `protobuf:"bytes,2,opt,name=contractName" json:"contractName,omitempty"`
-	ContractAddr string `protobuf:"bytes,3,opt,name=contractAddr" json:"contractAddr,omitempty"`
-	UsedGas      uint64 `protobuf:"varint,4,opt,name=usedGas" json:"usedGas,omitempty"`
+	ContractName string `protobuf:"bytes,2,opt,name=contractName,proto3" json:"contractName,omitempty"`
+	ContractAddr string `protobuf:"bytes,3,opt,name=contractAddr,proto3" json:"contractAddr,omitempty"`
+	UsedGas      uint64 `protobuf:"varint,4,opt,name=usedGas,proto3" json:"usedGas,omitempty"`
 	// 创建合约返回的代码
-	Ret string `protobuf:"bytes,5,opt,name=ret" json:"ret,omitempty"`
+	Ret                  string   `protobuf:"bytes,5,opt,name=ret,proto3" json:"ret,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *ReceiptEVMContractCmd) Reset()         { *m = ReceiptEVMContractCmd{} }
 func (m *ReceiptEVMContractCmd) String() string { return proto.CompactTextString(m) }
 func (*ReceiptEVMContractCmd) ProtoMessage()    {}
-func (*ReceiptEVMContractCmd) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (*ReceiptEVMContractCmd) Descriptor() ([]byte, []int) {
+	return fileDescriptor_74353de561acd7c6, []int{8}
+}
+
+func (m *ReceiptEVMContractCmd) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReceiptEVMContractCmd.Unmarshal(m, b)
+}
+func (m *ReceiptEVMContractCmd) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReceiptEVMContractCmd.Marshal(b, m, deterministic)
+}
+func (m *ReceiptEVMContractCmd) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReceiptEVMContractCmd.Merge(m, src)
+}
+func (m *ReceiptEVMContractCmd) XXX_Size() int {
+	return xxx_messageInfo_ReceiptEVMContractCmd.Size(m)
+}
+func (m *ReceiptEVMContractCmd) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReceiptEVMContractCmd.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReceiptEVMContractCmd proto.InternalMessageInfo
 
 func (m *ReceiptEVMContractCmd) GetCaller() string {
 	if m != nil {
@@ -472,13 +654,36 @@ func (m *ReceiptEVMContractCmd) GetRet() string {
 }
 
 type CheckEVMAddrReq struct {
-	Addr string `protobuf:"bytes,1,opt,name=addr" json:"addr,omitempty"`
+	Addr                 string   `protobuf:"bytes,1,opt,name=addr,proto3" json:"addr,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *CheckEVMAddrReq) Reset()         { *m = CheckEVMAddrReq{} }
 func (m *CheckEVMAddrReq) String() string { return proto.CompactTextString(m) }
 func (*CheckEVMAddrReq) ProtoMessage()    {}
-func (*CheckEVMAddrReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (*CheckEVMAddrReq) Descriptor() ([]byte, []int) {
+	return fileDescriptor_74353de561acd7c6, []int{9}
+}
+
+func (m *CheckEVMAddrReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CheckEVMAddrReq.Unmarshal(m, b)
+}
+func (m *CheckEVMAddrReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CheckEVMAddrReq.Marshal(b, m, deterministic)
+}
+func (m *CheckEVMAddrReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckEVMAddrReq.Merge(m, src)
+}
+func (m *CheckEVMAddrReq) XXX_Size() int {
+	return xxx_messageInfo_CheckEVMAddrReq.Size(m)
+}
+func (m *CheckEVMAddrReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_CheckEVMAddrReq.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CheckEVMAddrReq proto.InternalMessageInfo
 
 func (m *CheckEVMAddrReq) GetAddr() string {
 	if m != nil {
@@ -488,16 +693,39 @@ func (m *CheckEVMAddrReq) GetAddr() string {
 }
 
 type CheckEVMAddrResp struct {
-	Contract     bool   `protobuf:"varint,1,opt,name=contract" json:"contract,omitempty"`
-	ContractAddr string `protobuf:"bytes,2,opt,name=contractAddr" json:"contractAddr,omitempty"`
-	ContractName string `protobuf:"bytes,3,opt,name=contractName" json:"contractName,omitempty"`
-	AliasName    string `protobuf:"bytes,4,opt,name=aliasName" json:"aliasName,omitempty"`
+	Contract             bool     `protobuf:"varint,1,opt,name=contract,proto3" json:"contract,omitempty"`
+	ContractAddr         string   `protobuf:"bytes,2,opt,name=contractAddr,proto3" json:"contractAddr,omitempty"`
+	ContractName         string   `protobuf:"bytes,3,opt,name=contractName,proto3" json:"contractName,omitempty"`
+	AliasName            string   `protobuf:"bytes,4,opt,name=aliasName,proto3" json:"aliasName,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *CheckEVMAddrResp) Reset()         { *m = CheckEVMAddrResp{} }
 func (m *CheckEVMAddrResp) String() string { return proto.CompactTextString(m) }
 func (*CheckEVMAddrResp) ProtoMessage()    {}
-func (*CheckEVMAddrResp) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (*CheckEVMAddrResp) Descriptor() ([]byte, []int) {
+	return fileDescriptor_74353de561acd7c6, []int{10}
+}
+
+func (m *CheckEVMAddrResp) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CheckEVMAddrResp.Unmarshal(m, b)
+}
+func (m *CheckEVMAddrResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CheckEVMAddrResp.Marshal(b, m, deterministic)
+}
+func (m *CheckEVMAddrResp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckEVMAddrResp.Merge(m, src)
+}
+func (m *CheckEVMAddrResp) XXX_Size() int {
+	return xxx_messageInfo_CheckEVMAddrResp.Size(m)
+}
+func (m *CheckEVMAddrResp) XXX_DiscardUnknown() {
+	xxx_messageInfo_CheckEVMAddrResp.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CheckEVMAddrResp proto.InternalMessageInfo
 
 func (m *CheckEVMAddrResp) GetContract() bool {
 	if m != nil {
@@ -528,16 +756,39 @@ func (m *CheckEVMAddrResp) GetAliasName() string {
 }
 
 type EstimateEVMGasReq struct {
-	To     string `protobuf:"bytes,1,opt,name=to" json:"to,omitempty"`
+	To                   string   `protobuf:"bytes,1,opt,name=to,proto3" json:"to,omitempty"`
 	Code                 []byte   `protobuf:"bytes,2,opt,name=code,proto3" json:"code,omitempty"`
-	Caller string `protobuf:"bytes,3,opt,name=caller" json:"caller,omitempty"`
-	Amount uint64 `protobuf:"varint,4,opt,name=amount" json:"amount,omitempty"`
+	Caller               string   `protobuf:"bytes,3,opt,name=caller,proto3" json:"caller,omitempty"`
+	Amount               uint64   `protobuf:"varint,4,opt,name=amount,proto3" json:"amount,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *EstimateEVMGasReq) Reset()         { *m = EstimateEVMGasReq{} }
 func (m *EstimateEVMGasReq) String() string { return proto.CompactTextString(m) }
 func (*EstimateEVMGasReq) ProtoMessage()    {}
-func (*EstimateEVMGasReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (*EstimateEVMGasReq) Descriptor() ([]byte, []int) {
+	return fileDescriptor_74353de561acd7c6, []int{11}
+}
+
+func (m *EstimateEVMGasReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EstimateEVMGasReq.Unmarshal(m, b)
+}
+func (m *EstimateEVMGasReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EstimateEVMGasReq.Marshal(b, m, deterministic)
+}
+func (m *EstimateEVMGasReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EstimateEVMGasReq.Merge(m, src)
+}
+func (m *EstimateEVMGasReq) XXX_Size() int {
+	return xxx_messageInfo_EstimateEVMGasReq.Size(m)
+}
+func (m *EstimateEVMGasReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_EstimateEVMGasReq.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EstimateEVMGasReq proto.InternalMessageInfo
 
 func (m *EstimateEVMGasReq) GetTo() string {
 	if m != nil {
@@ -568,13 +819,36 @@ func (m *EstimateEVMGasReq) GetAmount() uint64 {
 }
 
 type EstimateEVMGasResp struct {
-	Gas uint64 `protobuf:"varint,1,opt,name=gas" json:"gas,omitempty"`
+	Gas                  uint64   `protobuf:"varint,1,opt,name=gas,proto3" json:"gas,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *EstimateEVMGasResp) Reset()         { *m = EstimateEVMGasResp{} }
 func (m *EstimateEVMGasResp) String() string { return proto.CompactTextString(m) }
 func (*EstimateEVMGasResp) ProtoMessage()    {}
-func (*EstimateEVMGasResp) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (*EstimateEVMGasResp) Descriptor() ([]byte, []int) {
+	return fileDescriptor_74353de561acd7c6, []int{12}
+}
+
+func (m *EstimateEVMGasResp) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EstimateEVMGasResp.Unmarshal(m, b)
+}
+func (m *EstimateEVMGasResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EstimateEVMGasResp.Marshal(b, m, deterministic)
+}
+func (m *EstimateEVMGasResp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EstimateEVMGasResp.Merge(m, src)
+}
+func (m *EstimateEVMGasResp) XXX_Size() int {
+	return xxx_messageInfo_EstimateEVMGasResp.Size(m)
+}
+func (m *EstimateEVMGasResp) XXX_DiscardUnknown() {
+	xxx_messageInfo_EstimateEVMGasResp.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EstimateEVMGasResp proto.InternalMessageInfo
 
 func (m *EstimateEVMGasResp) GetGas() uint64 {
 	if m != nil {
@@ -585,13 +859,36 @@ func (m *EstimateEVMGasResp) GetGas() uint64 {
 
 type EvmDebugReq struct {
 	// 0 query, 1 set, -1 clear
-	Optype int32 `protobuf:"varint,1,opt,name=optype" json:"optype,omitempty"`
+	Optype               int32    `protobuf:"varint,1,opt,name=optype,proto3" json:"optype,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *EvmDebugReq) Reset()         { *m = EvmDebugReq{} }
 func (m *EvmDebugReq) String() string { return proto.CompactTextString(m) }
 func (*EvmDebugReq) ProtoMessage()    {}
-func (*EvmDebugReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (*EvmDebugReq) Descriptor() ([]byte, []int) {
+	return fileDescriptor_74353de561acd7c6, []int{13}
+}
+
+func (m *EvmDebugReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EvmDebugReq.Unmarshal(m, b)
+}
+func (m *EvmDebugReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EvmDebugReq.Marshal(b, m, deterministic)
+}
+func (m *EvmDebugReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EvmDebugReq.Merge(m, src)
+}
+func (m *EvmDebugReq) XXX_Size() int {
+	return xxx_messageInfo_EvmDebugReq.Size(m)
+}
+func (m *EvmDebugReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_EvmDebugReq.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EvmDebugReq proto.InternalMessageInfo
 
 func (m *EvmDebugReq) GetOptype() int32 {
 	if m != nil {
@@ -601,13 +898,36 @@ func (m *EvmDebugReq) GetOptype() int32 {
 }
 
 type EvmDebugResp struct {
-	DebugStatus string `protobuf:"bytes,1,opt,name=debugStatus" json:"debugStatus,omitempty"`
+	DebugStatus          string   `protobuf:"bytes,1,opt,name=debugStatus,proto3" json:"debugStatus,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *EvmDebugResp) Reset()         { *m = EvmDebugResp{} }
 func (m *EvmDebugResp) String() string { return proto.CompactTextString(m) }
 func (*EvmDebugResp) ProtoMessage()    {}
-func (*EvmDebugResp) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (*EvmDebugResp) Descriptor() ([]byte, []int) {
+	return fileDescriptor_74353de561acd7c6, []int{14}
+}
+
+func (m *EvmDebugResp) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EvmDebugResp.Unmarshal(m, b)
+}
+func (m *EvmDebugResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EvmDebugResp.Marshal(b, m, deterministic)
+}
+func (m *EvmDebugResp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EvmDebugResp.Merge(m, src)
+}
+func (m *EvmDebugResp) XXX_Size() int {
+	return xxx_messageInfo_EvmDebugResp.Size(m)
+}
+func (m *EvmDebugResp) XXX_DiscardUnknown() {
+	xxx_messageInfo_EvmDebugResp.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EvmDebugResp proto.InternalMessageInfo
 
 func (m *EvmDebugResp) GetDebugStatus() string {
 	if m != nil {
@@ -620,11 +940,13 @@ func init() {
 	proto.RegisterType((*EVMContractObject)(nil), "types.EVMContractObject")
 	proto.RegisterType((*EVMContractData)(nil), "types.EVMContractData")
 	proto.RegisterType((*EVMContractState)(nil), "types.EVMContractState")
+	proto.RegisterMapType((map[string][]byte)(nil), "types.EVMContractState.StorageEntry")
 	proto.RegisterType((*EVMContractAction)(nil), "types.EVMContractAction")
 	proto.RegisterType((*ReceiptEVMContract)(nil), "types.ReceiptEVMContract")
 	proto.RegisterType((*EVMStateChangeItem)(nil), "types.EVMStateChangeItem")
 	proto.RegisterType((*EVMContractDataCmd)(nil), "types.EVMContractDataCmd")
 	proto.RegisterType((*EVMContractStateCmd)(nil), "types.EVMContractStateCmd")
+	proto.RegisterMapType((map[string]string)(nil), "types.EVMContractStateCmd.StorageEntry")
 	proto.RegisterType((*ReceiptEVMContractCmd)(nil), "types.ReceiptEVMContractCmd")
 	proto.RegisterType((*CheckEVMAddrReq)(nil), "types.CheckEVMAddrReq")
 	proto.RegisterType((*CheckEVMAddrResp)(nil), "types.CheckEVMAddrResp")
@@ -634,9 +956,9 @@ func init() {
 	proto.RegisterType((*EvmDebugResp)(nil), "types.EvmDebugResp")
 }
 
-func init() { proto.RegisterFile("evmcontract.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("evmcontract.proto", fileDescriptor_74353de561acd7c6) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_74353de561acd7c6 = []byte{
 	// 716 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0x41, 0x6f, 0xd3, 0x4a,
 	0x10, 0x96, 0x63, 0x27, 0x8d, 0x27, 0x79, 0xaf, 0xed, 0xbe, 0xf7, 0xfa, 0xac, 0x8a, 0x43, 0xb4,