update 01/25

vendor/github.com/33cn/chain33/account/account.go

@@ -277,7 +277,7 @@ func (acc *DB) loadAccountsHistory(api client.QueueProtocolAPI, addrs []string,
 // GetBalance 获取某个状态下账户余额
 func (acc *DB) GetBalance(api client.QueueProtocolAPI, in *types.ReqBalance) ([]*types.Account, error) {
 	// load account
-	if in.AssetExec == in.Execer || "" == in.Execer {
+	if in.AssetExec == string(types.GetParaExec([]byte(in.Execer))) || "" == in.Execer {
 		addrs := in.GetAddresses()
 		var exaddrs []string
 		for _, addr := range addrs {

vendor/github.com/33cn/chain33/common/db/table/table_test.go

@@ -355,7 +355,7 @@ func TestReplace(t *testing.T) {
 	dir, ldb, kvdb := util.CreateTestDB()
 	defer util.CloseTestDB(dir, ldb)
 	opt := &Option{
-		Prefix:  "prefix",
+		Prefix:  "prefix-hello",
 		Name:    "name",
 		Primary: "Hash",
 		Index:   []string{"From", "To"},

vendor/github.com/33cn/chain33/executor/db.go

@@ -51,10 +51,13 @@ func NewStateDB(client queue.Client, stateHash []byte, localdb db.KVDB, opt *Sta
 	return db
 }
 
-func (s *StateDB) enableMVCC() {
+func (s *StateDB) enableMVCC(hash []byte) {
 	opt := s.opt
 	if opt.EnableMVCC {
-		v, err := s.local.GetVersion(s.stateHash)
+		if hash == nil {
+			hash = s.stateHash
+		}
+		v, err := s.local.GetVersion(hash)
 		if err == nil && v >= 0 {
 			s.version = v
 		} else if s.height > 0 {

vendor/github.com/33cn/chain33/executor/execenv.go

@@ -66,8 +66,8 @@ func newExecutor(ctx *executorCtx, exec *Executor, txs []*types.Transaction, rec
 	return e
 }
 
-func (e *executor) enableMVCC() {
-	e.stateDB.(*StateDB).enableMVCC()
+func (e *executor) enableMVCC(hash []byte) {
+	e.stateDB.(*StateDB).enableMVCC(hash)
 }
 
 // AddMVCC convert key value to mvcc kv data

vendor/github.com/33cn/chain33/executor/executor.go

@@ -147,7 +147,7 @@ func (exec *Executor) procExecQuery(msg queue.Message) {
 	opt := &StateDBOption{EnableMVCC: exec.pluginEnable["mvcc"], Height: header.GetHeight()}
 
 	db := NewStateDB(exec.client, data.StateHash, localdb, opt)
-	db.(*StateDB).enableMVCC()
+	db.(*StateDB).enableMVCC(nil)
 	driver.SetStateDB(db)
 	driver.SetAPI(exec.qclient)
 	driver.SetExecutorAPI(exec.qclient, exec.grpccli)
@@ -174,7 +174,7 @@ func (exec *Executor) procExecCheckTx(msg queue.Message) {
 		parentHash: datas.ParentHash,
 	}
 	execute := newExecutor(ctx, exec, datas.Txs, nil)
-	execute.enableMVCC()
+	execute.enableMVCC(nil)
 	//返回一个列表表示成功还是失败
 	result := &types.ReceiptCheckTxList{}
 	for i := 0; i < len(datas.Txs); i++ {
@@ -205,7 +205,7 @@ func (exec *Executor) procExecTxList(msg queue.Message) {
 		parentHash: datas.ParentHash,
 	}
 	execute := newExecutor(ctx, exec, datas.Txs, nil)
-	execute.enableMVCC()
+	execute.enableMVCC(nil)
 	var receipts []*types.Receipt
 	index := 0
 	for i := 0; i < len(datas.Txs); i++ {
@@ -274,7 +274,8 @@ func (exec *Executor) procExecAddBlock(msg queue.Message) {
 		parentHash: b.ParentHash,
 	}
 	execute := newExecutor(ctx, exec, b.Txs, datas.Receipts)
-	execute.enableMVCC()
+	//因为mvcc 还没有写入，所以目前的mvcc版本是前一个区块的版本
+	execute.enableMVCC(datas.PrevStatusHash)
 	var kvset types.LocalDBSet
 	for _, kv := range datas.KV {
 		execute.stateDB.Set(kv.Key, kv.Value)
@@ -297,6 +298,9 @@ func (exec *Executor) procExecAddBlock(msg queue.Message) {
 		}
 		if len(kvs) > 0 {
 			kvset.KV = append(kvset.KV, kvs...)
+			for _, kv := range kvs {
+				execute.localDB.Set(kv.Key, kv.Value)
+			}
 		}
 	}
 	for i := 0; i < len(b.Txs); i++ {
@@ -316,6 +320,9 @@ func (exec *Executor) procExecAddBlock(msg queue.Message) {
 				return
 			}
 			kvset.KV = append(kvset.KV, kv.KV...)
+			for _, kv := range kv.KV {
+				execute.localDB.Set(kv.Key, kv.Value)
+			}
 		}
 	}
 	msg.Reply(exec.client.NewMessage("", types.EventAddBlock, &kvset))
@@ -334,7 +341,7 @@ func (exec *Executor) procExecDelBlock(msg queue.Message) {
 		parentHash: b.ParentHash,
 	}
 	execute := newExecutor(ctx, exec, b.Txs, nil)
-	execute.enableMVCC()
+	execute.enableMVCC(nil)
 	var kvset types.LocalDBSet
 	for _, kv := range datas.KV {
 		execute.stateDB.Set(kv.Key, kv.Value)

vendor/github.com/33cn/chain33/executor/plugin_addrindex.go

@@ -15,7 +15,7 @@ func init() {
 }
 
 type addrindexPlugin struct {
-	*pluginBase
+	pluginBase
 }
 
 func (p *addrindexPlugin) CheckEnable(executor *executor, enable bool) (kvs []*types.KeyValue, ok bool, err error) {

vendor/github.com/33cn/chain33/executor/plugin_fee.go

@@ -11,7 +11,7 @@ func init() {
 }
 
 type feePlugin struct {
-	*pluginBase
+	pluginBase
 	fee types.TotalFee
 }
 

vendor/github.com/33cn/chain33/executor/plugin_kvmvcc.go

@@ -4,14 +4,16 @@
 
 package executor
 
-import "github.com/33cn/chain33/types"
+import (
+	"github.com/33cn/chain33/types"
+)
 
 func init() {
 	RegisterPlugin("mvcc", &mvccPlugin{})
 }
 
 type mvccPlugin struct {
-	*pluginBase
+	pluginBase
 }
 
 func (p *mvccPlugin) CheckEnable(executor *executor, enable bool) (kvs []*types.KeyValue, ok bool, err error) {
@@ -24,9 +26,6 @@ func (p *mvccPlugin) CheckEnable(executor *executor, enable bool) (kvs []*types.
 
 func (p *mvccPlugin) ExecLocal(executor *executor, data *types.BlockDetail) (kvs []*types.KeyValue, err error) {
 	kvs = AddMVCC(executor.localDB, data)
-	for _, kv := range kvs {
-		executor.localDB.Set(kv.Key, kv.Value)
-	}
 	return kvs, nil
 }
 

vendor/github.com/33cn/chain33/executor/plugin_stat.go

@@ -13,7 +13,7 @@ func init() {
 }
 
 type statPlugin struct {
-	*pluginBase
+	pluginBase
 }
 
 func (p *statPlugin) CheckEnable(executor *executor, enable bool) (kvs []*types.KeyValue, ok bool, err error) {
@@ -39,8 +39,10 @@ func countInfo(ex *executor, b *types.BlockDetail) ([]*types.KeyValue, error) {
 	if err != nil {
 		return nil, err
 	}
-	kvset.KV = append(kvset.KV, ticketkv.KV...)
-
+	if ticketkv == nil {
+		return nil, nil
+	}
+	kvset.KV = ticketkv.KV
 	return kvset.KV, nil
 }
 
@@ -51,8 +53,10 @@ func delCountInfo(ex *executor, b *types.BlockDetail) ([]*types.KeyValue, error)
 	if err != nil {
 		return nil, err
 	}
-	kvset.KV = append(kvset.KV, ticketkv.KV...)
-
+	if ticketkv == nil {
+		return nil, nil
+	}
+	kvset.KV = ticketkv.KV
 	return kvset.KV, nil
 }
 

vendor/github.com/33cn/chain33/executor/plugin_txindex.go

@@ -16,7 +16,7 @@ func init() {
 }
 
 type txindexPlugin struct {
-	*pluginBase
+	pluginBase
 }
 
 func (p *txindexPlugin) CheckEnable(executor *executor, enable bool) (kvs []*types.KeyValue, ok bool, err error) {

vendor/github.com/33cn/chain33/rpc/client.go

@@ -63,9 +63,6 @@ func (c *channelClient) ReWriteRawTx(param *types.ReWriteRawTx) ([]byte, error)
 	if err != nil {
 		return nil, err
 	}
-	if param.Execer != nil {
-		tx.Execer = param.Execer
-	}
 	if param.To != "" {
 		tx.To = param.To
 	}

vendor/github.com/33cn/chain33/rpc/grpchandler_test.go

@@ -1051,7 +1051,6 @@ func TestReWriteRawTx(t *testing.T) {
 	txHex1 := "0a05636f696e73122c18010a281080c2d72f222131477444795771577233553637656a7663776d333867396e7a6e7a434b58434b7120a08d0630a696c0b3f78dd9ec083a2131477444795771577233553637656a7663776d333867396e7a6e7a434b58434b71"
 	in := &types.ReWriteRawTx{
 		Tx:     txHex1,
-		Execer: []byte("paracross"),
 		Fee:    29977777777,
 		Expire: "130s",
 		To:     "aabbccdd",
@@ -1066,7 +1065,6 @@ func TestReWriteRawTx(t *testing.T) {
 	tx := &types.Transaction{}
 	err = types.Decode(data.Data, tx)
 	assert.Nil(t, err)
-	assert.Equal(t, tx.Execer, []byte(in.Execer))
 	assert.Equal(t, tx.Fee, in.Fee)
 	assert.Equal(t, int64(130000000000), tx.Expire)
 	assert.Equal(t, in.To, tx.To)

vendor/github.com/33cn/chain33/rpc/jrpchandler.go

@@ -48,7 +48,6 @@ func (c *Chain33) CreateRawTransaction(in *rpctypes.CreateTx, result *interface{
 func (c *Chain33) ReWriteRawTx(in *rpctypes.ReWriteRawTx, result *interface{}) error {
 	inpb := &types.ReWriteRawTx{
 		Tx:     in.Tx,
-		Execer: []byte(in.Execer),
 		To:     in.To,
 		Fee:    in.Fee,
 		Expire: in.Expire,
@@ -874,6 +873,9 @@ func (c *Chain33) IsNtpClockSync(in *types.ReqNil, result *interface{}) error {
 
 // QueryTotalFee query total fee
 func (c *Chain33) QueryTotalFee(in *types.LocalDBGet, result *interface{}) error {
+	if in == nil || len(in.Keys) > 1 {
+		return types.ErrInvalidParam
+	}
 	reply, err := c.cli.LocalGet(in)
 	if err != nil {
 		return err
@@ -925,58 +927,6 @@ func (c *Chain33) GetFatalFailure(in *types.ReqNil, result *interface{}) error {
 
 }
 
-// QueryTicketStat quert stat of ticket
-func (c *Chain33) QueryTicketStat(in *types.LocalDBGet, result *interface{}) error {
-	reply, err := c.cli.LocalGet(in)
-	if err != nil {
-		return err
-	}
-
-	var ticketStat types.TicketStatistic
-	err = types.Decode(reply.Values[0], &ticketStat)
-	if err != nil {
-		return err
-	}
-	*result = ticketStat
-	return nil
-}
-
-// QueryTicketInfo query ticket information
-func (c *Chain33) QueryTicketInfo(in *types.LocalDBGet, result *interface{}) error {
-	reply, err := c.cli.LocalGet(in)
-	if err != nil {
-		return err
-	}
-
-	var ticketInfo types.TicketMinerInfo
-	err = types.Decode(reply.Values[0], &ticketInfo)
-	if err != nil {
-		return err
-	}
-	*result = ticketInfo
-	return nil
-}
-
-// QueryTicketInfoList query ticket list information
-func (c *Chain33) QueryTicketInfoList(in *types.LocalDBList, result *interface{}) error {
-	reply, err := c.cli.LocalList(in)
-	if err != nil {
-		return err
-	}
-
-	var ticketInfo types.TicketMinerInfo
-	var ticketList []types.TicketMinerInfo
-	for _, v := range reply.Values {
-		err = types.Decode(v, &ticketInfo)
-		if err != nil {
-			return err
-		}
-		ticketList = append(ticketList, ticketInfo)
-	}
-	*result = ticketList
-	return nil
-}
-
 // DecodeRawTransaction decode rawtransaction
 func (c *Chain33) DecodeRawTransaction(in *types.ReqDecodeRawTransaction, result *interface{}) error {
 	reply, err := c.cli.DecodeRawTransaction(in)
@@ -1152,6 +1102,10 @@ func convertBlockDetails(details []*types.BlockDetail, retDetails *rpctypes.Bloc
 	for _, item := range details {
 		var bdtl rpctypes.BlockDetail
 		var block rpctypes.Block
+		if item == nil {
+			retDetails.Items = append(retDetails.Items, nil)
+			continue
+		}
 		block.BlockTime = item.Block.GetBlockTime()
 		block.Height = item.Block.GetHeight()
 		block.Version = item.Block.GetVersion()

vendor/github.com/33cn/chain33/rpc/jrpchandler_test.go

@@ -413,7 +413,6 @@ func TestChain33_ReWriteRawTx(t *testing.T) {
 
 	reTx := &rpctypes.ReWriteRawTx{
 		Tx:     txHex1,
-		Execer: "paracross",
 		Fee:    29977777777,
 		Expire: "130s",
 		To:     "aabbccdd",
@@ -428,7 +427,6 @@ func TestChain33_ReWriteRawTx(t *testing.T) {
 	tx := &types.Transaction{}
 	err = types.Decode(txData, tx)
 	assert.Nil(t, err)
-	assert.Equal(t, tx.Execer, []byte(reTx.Execer))
 	assert.Equal(t, tx.Fee, reTx.Fee)
 	assert.Equal(t, int64(130000000000), tx.Expire)
 	assert.Equal(t, reTx.To, tx.To)

vendor/github.com/33cn/chain33/rpc/server_test.go

@@ -104,11 +104,6 @@ func TestJSONClient_Call(t *testing.T) {
 	err = jsonClient.Call("Chain33.QueryTotalFee", &types.ReqSignRawTx{}, &fee)
 	assert.NotNil(t, err)
 
-	var ticket []types.TicketMinerInfo
-	api.On("LocalList", mock.Anything).Return(nil, errors.New("error value"))
-	err = jsonClient.Call("Chain33.QueryTicketInfoList", &types.ReqSignRawTx{}, &ticket)
-	assert.NotNil(t, err)
-
 	var retNtp bool
 	api.On("IsNtpClockSync", mock.Anything).Return(&types.Reply{IsOk: true, Msg: []byte("yes")}, nil)
 	err = jsonClient.Call("Chain33.IsNtpClockSync", &types.ReqNil{}, &retNtp)

vendor/github.com/33cn/chain33/rpc/types/types.go

@@ -377,7 +377,6 @@ type CreateTx struct {
 // ReWriteRawTx parameter
 type ReWriteRawTx struct {
 	Tx     string `json:"tx"`
-	Execer string `json:"execer"`
 	To     string `json:"to"`
 	Fee    int64  `json:"fee"`
 	Expire string `json:"expire"`

vendor/github.com/33cn/chain33/system/dapp/commands/block.go

@@ -288,7 +288,8 @@ func addBlockByHashsFlags(cmd *cobra.Command) {
 func getblockbyhashs(cmd *cobra.Command, args []string) {
 	rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
 	hashes, _ := cmd.Flags().GetString("hashes")
-	hashesArr := strings.Split(hashes, " ")
+	hashesArr := strings.Fields(hashes)
+
 	params := rpctypes.ReqHashes{
 		Hashes: hashesArr,
 	}

vendor/github.com/33cn/chain33/system/dapp/commands/tx.go

@@ -320,7 +320,6 @@ func addReWriteRawTxFlags(cmd *cobra.Command) {
 	cmd.Flags().StringP("tx", "s", "", "transaction hex")
 	cmd.MarkFlagRequired("tx")
 
-	cmd.Flags().StringP("execer", "x", "", "transaction execer (optional)")
 	cmd.Flags().StringP("to", "t", "", "to addr (optional)")
 	cmd.Flags().Float64P("fee", "f", 0, "transaction fee (optional)")
 	cmd.Flags().StringP("expire", "e", "120s", "expire time (optional)")
@@ -329,7 +328,6 @@ func addReWriteRawTxFlags(cmd *cobra.Command) {
 func reWriteRawTx(cmd *cobra.Command, args []string) {
 	rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
 	txHash, _ := cmd.Flags().GetString("tx")
-	execer, _ := cmd.Flags().GetString("execer")
 	to, _ := cmd.Flags().GetString("to")
 	fee, _ := cmd.Flags().GetFloat64("fee")
 	expire, _ := cmd.Flags().GetString("expire")
@@ -342,7 +340,6 @@ func reWriteRawTx(cmd *cobra.Command, args []string) {
 
 	params := rpctypes.ReWriteRawTx{
 		Tx:     txHash,
-		Execer: execer,
 		To:     to,
 		Fee:    feeInt64 * 1e4,
 		Expire: expire,

vendor/github.com/33cn/chain33/system/dapp/commands/wallet.go

@@ -310,7 +310,6 @@ func addSignRawTxFlags(cmd *cobra.Command) {
 	cmd.Flags().StringP("addr", "a", "", "account address (optional)")
 	cmd.Flags().StringP("expire", "e", "120s", "transaction expire time")
 	cmd.Flags().Float64P("fee", "f", 0, "transaction fee (optional)")
-	cmd.Flags().StringP("execer", "x", "", "new transaction execer (optional)")
 	cmd.Flags().StringP("to", "t", "", "new to addr (optional)")
 
 	// A duration string is a possibly signed sequence of
@@ -350,7 +349,6 @@ func signRawTx(cmd *cobra.Command, args []string) {
 	key, _ := cmd.Flags().GetString("key")
 	addr, _ := cmd.Flags().GetString("addr")
 	index, _ := cmd.Flags().GetInt32("index")
-	execer, _ := cmd.Flags().GetString("execer")
 	to, _ := cmd.Flags().GetString("to")
 	fee, _ := cmd.Flags().GetFloat64("fee")
 	expire, _ := cmd.Flags().GetString("expire")
@@ -367,7 +365,6 @@ func signRawTx(cmd *cobra.Command, args []string) {
 		Expire:    expire,
 		Index:     index,
 		Fee:       feeInt64 * 1e4,
-		NewExecer: []byte(execer),
 		NewToAddr: to,
 	}
 	ctx := jsonclient.NewRPCCtx(rpcLaddr, "Chain33.SignRawTx", params, nil)

vendor/github.com/33cn/chain33/types/proto/transaction.proto

@@ -54,7 +54,7 @@ message CreateTx {
 
 message ReWriteRawTx {
     string tx = 1;
-    bytes  execer = 2;
+    // bytes  execer = 2;
     string to     = 3;
     string expire = 4;
     int64  fee    = 5;

vendor/github.com/33cn/chain33/types/proto/wallet.proto

@@ -206,7 +206,7 @@ message ReqSignRawTx {
     // int32  mode  = 6;
     string token = 7;
     int64  fee   = 8;
-    bytes  newExecer = 9;
+    // bytes  newExecer = 9;
     string newToAddr = 10;
 }
 

vendor/github.com/33cn/chain33/types/transaction.pb.go

@@ -434,7 +434,7 @@ func (m *CreateTx) GetExecer() string {
 
 type ReWriteRawTx struct {
 	Tx string `protobuf:"bytes,1,opt,name=tx,proto3" json:"tx,omitempty"`
-	Execer               []byte   `protobuf:"bytes,2,opt,name=execer,proto3" json:"execer,omitempty"`
+	// bytes  execer = 2;
 	To                   string   `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"`
 	Expire               string   `protobuf:"bytes,4,opt,name=expire,proto3" json:"expire,omitempty"`
 	Fee                  int64    `protobuf:"varint,5,opt,name=fee,proto3" json:"fee,omitempty"`
@@ -475,13 +475,6 @@ func (m *ReWriteRawTx) GetTx() string {
 	return ""
 }
 
-func (m *ReWriteRawTx) GetExecer() []byte {
-	if m != nil {
-		return m.Execer
-	}
-	return nil
-}
-
 func (m *ReWriteRawTx) GetTo() string {
 	if m != nil {
 		return m.To
@@ -2080,89 +2073,89 @@ func init() {
 func init() { proto.RegisterFile("transaction.proto", fileDescriptor_2cc4e03d2c28c490) }
 
 var fileDescriptor_2cc4e03d2c28c490 = []byte{
-	// 1332 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xdd, 0x6e, 0x13, 0x47,
-	0x14, 0xd6, 0xee, 0xda, 0x89, 0x7d, 0x6c, 0x28, 0x59, 0x21, 0xb0, 0x10, 0x85, 0x74, 0x44, 0x25,
-	0x84, 0x50, 0x22, 0x25, 0xdc, 0xb5, 0x52, 0x0b, 0xa4, 0x02, 0x14, 0xa0, 0xed, 0x60, 0xa0, 0x6a,
-	0xab, 0x4a, 0x93, 0xf5, 0x89, 0x3d, 0xc5, 0xde, 0x71, 0x76, 0xc7, 0x61, 0xfd, 0x02, 0xbd, 0x69,
-	0xef, 0xfa, 0x48, 0x7d, 0x81, 0x3e, 0x46, 0x1f, 0xa3, 0x9a, 0x33, 0x33, 0xbb, 0xe3, 0x38, 0x41,
-	0x5c, 0x54, 0xea, 0xdd, 0x7c, 0x67, 0x8e, 0xcf, 0xcf, 0x77, 0x7e, 0x76, 0x0c, 0x5b, 0xba, 0x10,
-	0x79, 0x29, 0x32, 0x2d, 0x55, 0xbe, 0x33, 0x2f, 0x94, 0x56, 0x69, 0x5b, 0x2f, 0xe7, 0x58, 0xde,
-	0xe8, 0x67, 0x6a, 0x36, 0xf3, 0x42, 0xf6, 0x02, 0x2e, 0x3d, 0x2c, 0x4b, 0xd4, 0xe5, 0x13, 0xcc,
-	0xb1, 0x94, 0x65, 0x7a, 0x0d, 0x36, 0xc4, 0x4c, 0x2d, 0x72, 0x3d, 0x88, 0xb7, 0xa3, 0xbb, 0x09,
-	0x77, 0x28, 0xbd, 0x03, 0x97, 0x0a, 0xd4, 0x8b, 0x22, 0x7f, 0x38, 0x1a, 0x15, 0x58, 0x96, 0x83,
-	0x64, 0x3b, 0xba, 0xdb, 0xe5, 0xab, 0x42, 0xf6, 0x47, 0x04, 0x57, 0xad, 0xbd, 0xa1, 0xf1, 0x7f,
-	0x8c, 0xc5, 0x50, 0x7d, 0x53, 0x61, 0x96, 0xde, 0x84, 0x6e, 0xa6, 0x64, 0xae, 0xd5, 0x3b, 0xcc,
-	0x07, 0x11, 0xfd, 0xb4, 0x11, 0x5c, 0xe8, 0x34, 0x85, 0x56, 0xae, 0x34, 0x92, 0xaf, 0x3e, 0xa7,
-	0x73, 0x7a, 0x03, 0x3a, 0x58, 0x61, 0xf6, 0x52, 0xcc, 0x70, 0xd0, 0x22, 0x43, 0x35, 0x4e, 0x2f,
-	0x43, 0xac, 0xd5, 0xa0, 0x4d, 0xd2, 0x58, 0x2b, 0xf6, 0x5b, 0x04, 0x97, 0x6d, 0x38, 0x6f, 0xa5,
-	0x9e, 0x8c, 0x0a, 0xf1, 0xfe, 0x7f, 0x0a, 0xe4, 0x57, 0x1f, 0x87, 0xa7, 0xe5, 0x3f, 0x8c, 0xc3,
-	0xfa, 0x6a, 0xd5, 0xbe, 0x0e, 0xa1, 0x4d, 0xbe, 0x8c, 0xb2, 0x09, 0xc8, 0x59, 0xa7, 0xb3, 0x31,
-	0x5c, 0x2e, 0x67, 0x47, 0x6a, 0x4a, 0x86, 0xbb, 0xdc, 0xa1, 0xc0, 0x61, 0x12, 0x3a, 0x64, 0xff,
-	0x44, 0xd0, 0x79, 0x5c, 0xa0, 0xd0, 0x38, 0xac, 0x9c, 0xa7, 0xc8, 0x7b, 0xba, 0x30, 0xca, 0x2b,
-	0x90, 0x1c, 0x23, 0x3a, 0x4b, 0xe6, 0x58, 0xc7, 0xdd, 0x0a, 0xe2, 0xbe, 0x05, 0x20, 0xeb, 0xba,
-	0x10, 0x57, 0x1d, 0x1e, 0x48, 0xd2, 0x01, 0x6c, 0xca, 0x72, 0x48, 0xfc, 0x6c, 0xd0, 0xa5, 0x87,
-	0xe9, 0x36, 0xf4, 0x88, 0xa6, 0x57, 0x36, 0x93, 0x4d, 0x0a, 0x28, 0x14, 0xad, 0xd4, 0xa6, 0x73,
-	0xa6, 0x36, 0xd7, 0x60, 0xc3, 0x9c, 0xb1, 0x18, 0x74, 0x2d, 0x05, 0x16, 0xb1, 0x39, 0xf4, 0x39,
-	0xbe, 0x2d, 0xa4, 0x46, 0x2e, 0xde, 0xbb, 0x6c, 0xab, 0x3a, 0xdb, 0x2a, 0xf8, 0x5d, 0x4c, 0x59,
-	0x38, 0xe4, 0x58, 0x49, 0x42, 0x56, 0xb0, 0x9a, 0xcb, 0xc2, 0x77, 0x85, 0x43, 0x9e, 0x95, 0x76,
-	0xcd, 0x0a, 0xbb, 0x07, 0xd7, 0x1c, 0xb7, 0xcd, 0xb0, 0x3e, 0x29, 0xd4, 0x62, 0x6e, 0x74, 0x75,
-	0x55, 0x0e, 0xa2, 0xed, 0xe4, 0x6e, 0x97, 0x9b, 0x23, 0xbb, 0x05, 0x9d, 0xd7, 0x79, 0x29, 0xc7,
-	0xf9, 0xb0, 0x32, 0x6c, 0x8e, 0x84, 0x16, 0x14, 0x5b, 0x9f, 0xd3, 0x99, 0x29, 0xe8, 0xbd, 0x54,
-	0x8f, 0xc4, 0x54, 0xe4, 0x99, 0x29, 0xd5, 0x55, 0x68, 0xeb, 0xea, 0x29, 0xfa, 0xf8, 0x2d, 0x30,
-	0x94, 0xce, 0xc5, 0xd2, 0x0c, 0xab, 0x2b, 0xbf, 0x87, 0x74, 0x53, 0xc8, 0xd3, 0x77, 0xb8, 0x74,
-	0x99, 0x78, 0x78, 0x51, 0x3a, 0xec, 0x17, 0xe8, 0xbc, 0x92, 0xe3, 0x1c, 0x47, 0x43, 0xa2, 0x66,
-	0x41, 0xc1, 0xb9, 0x90, 0x1c, 0x32, 0x81, 0x92, 0xd4, 0x12, 0x46, 0x67, 0xa3, 0x3b, 0x5f, 0x1c,
-	0x79, 0x47, 0x7d, 0xee, 0x10, 0xd1, 0xb8, 0x24, 0x1f, 0x6d, 0x1e, 0xeb, 0x25, 0xfb, 0x3d, 0x86,
-	0x5e, 0xc0, 0x4b, 0x40, 0x7f, 0xb4, 0x42, 0xbf, 0xcd, 0x69, 0xaa, 0xc4, 0xc8, 0xb9, 0xf1, 0x30,
-	0xdd, 0x81, 0xae, 0xf1, 0x28, 0xf4, 0xa2, 0xb0, 0xcd, 0xd8, 0xdb, 0xbb, 0xb2, 0x43, 0x4b, 0x70,
-	0xe7, 0x95, 0x97, 0xf3, 0x46, 0xc5, 0x17, 0xa8, 0xd5, 0xb4, 0x6d, 0x93, 0xbb, 0xad, 0x9a, 0x2f,
-	0xe5, 0x55, 0x68, 0xe7, 0x2a, 0xcf, 0x90, 0x1a, 0x33, 0xe1, 0x16, 0xb8, 0x46, 0xd8, 0xac, 0x1b,
-	0xe1, 0x16, 0xc0, 0xd8, 0x54, 0xf3, 0x31, 0x8d, 0x48, 0x87, 0x32, 0x0b, 0x24, 0xc6, 0xfa, 0x04,
-	0xc5, 0xc8, 0x35, 0x62, 0x9f, 0x3b, 0x44, 0xc3, 0x82, 0x95, 0x1e, 0x80, 0x1b, 0x16, 0xac, 0x34,
-	0x7b, 0x00, 0xfd, 0x80, 0x8c, 0x32, 0xbd, 0xd3, 0x34, 0x48, 0x6f, 0x2f, 0x75, 0x59, 0x05, 0x1a,
-	0xb6, 0x69, 0xbe, 0x82, 0x4b, 0x5c, 0xe6, 0xe3, 0x3a, 0xdb, 0x74, 0x07, 0xda, 0x52, 0xe3, 0xcc,
-	0xff, 0x70, 0xe0, 0x7e, 0xb8, 0xa2, 0xf4, 0x4c, 0xe3, 0x8c, 0x5b, 0x35, 0xf6, 0x0c, 0xb6, 0xd6,
-	0xee, 0x82, 0x0a, 0x1a, 0x2b, 0x4d, 0x05, 0x6f, 0x86, 0x7c, 0xc7, 0x74, 0xd5, 0x08, 0xd8, 0xf7,
-	0xd0, 0x6d, 0xe2, 0xb0, 0xc5, 0x8e, 0x7c, 0xb1, 0x03, 0x93, 0xf1, 0x4a, 0x53, 0xdc, 0x3c, 0x5b,
-	0xc2, 0x15, 0x93, 0x3f, 0x43, 0xdf, 0x34, 0xef, 0xb7, 0xa7, 0x58, 0x9c, 0x4a, 0xa4, 0x8d, 0x51,
-	0x60, 0x26, 0x4f, 0x5d, 0x8f, 0x24, 0xdc, 0x43, 0x73, 0x73, 0x64, 0x67, 0xc3, 0xad, 0x2a, 0x0f,
-	0xcd, 0x8d, 0xae, 0x1e, 0x07, 0x9b, 0xcf, 0x43, 0xf6, 0x67, 0x04, 0x9b, 0x1c, 0x4f, 0x68, 0x3c,
-	0x52, 0x68, 0x09, 0x33, 0x35, 0x6e, 0x95, 0x0a, 0x27, 0x3b, 0x9e, 0x8a, 0x31, 0x19, 0x6c, 0x73,
-	0x3a, 0x9b, 0xc6, 0xc8, 0x6a, 0x5b, 0x6d, 0x6e, 0x81, 0xc9, 0x62, 0x24, 0x0b, 0xa4, 0xc2, 0xb8,
-	0x0e, 0x6f, 0x04, 0xb6, 0x0d, 0xe4, 0x78, 0xa2, 0x7d, 0x93, 0x59, 0x64, 0x6c, 0xc9, 0x7c, 0x84,
-	0x95, 0x6f, 0x32, 0x02, 0xec, 0x07, 0x00, 0x8e, 0x27, 0xdf, 0x15, 0xf2, 0x54, 0x64, 0xcb, 0xc6,
-	0x5f, 0x74, 0xa1, 0xbf, 0xf8, 0x62, 0x7f, 0x49, 0xe8, 0x8f, 0x5d, 0x87, 0xf6, 0x53, 0xac, 0xd6,
-	0x17, 0x1f, 0x5b, 0x40, 0x8f, 0xe3, 0x7c, 0xba, 0x1c, 0x56, 0xcf, 0xf2, 0x63, 0x65, 0xf2, 0x9e,
-	0x88, 0x72, 0xe2, 0xb7, 0x8f, 0x39, 0x07, 0x36, 0xe3, 0xf3, 0x73, 0x48, 0x82, 0x1c, 0xd2, 0x3b,
-	0xb0, 0x21, 0xe8, 0x6b, 0x38, 0x68, 0x51, 0x1b, 0xf6, 0x5d, 0x1b, 0xd2, 0x67, 0x8b, 0xbb, 0x3b,
-	0xf6, 0x19, 0x74, 0x39, 0x9e, 0x0c, 0xab, 0xe7, 0xb2, 0xd4, 0xab, 0x89, 0x26, 0x2e, 0x51, 0xb6,
-	0x5f, 0x47, 0x46, 0x4a, 0x1f, 0x37, 0x14, 0x1c, 0x60, 0x58, 0x3d, 0x15, 0xe5, 0x84, 0x7e, 0x63,
-	0x22, 0x17, 0xe5, 0x04, 0x4b, 0xdf, 0xcc, 0x16, 0x35, 0x0e, 0xe3, 0xc0, 0x61, 0xb0, 0x10, 0x92,
-	0xed, 0xa4, 0x59, 0x08, 0xec, 0x4b, 0xf3, 0xed, 0xa8, 0x29, 0x2a, 0xd3, 0xfb, 0xa6, 0xab, 0xe8,
-	0x78, 0x26, 0x9a, 0x40, 0x8b, 0x7b, 0x15, 0xb6, 0x63, 0x6a, 0x9a, 0xa1, 0x9c, 0xeb, 0xe7, 0x6a,
-	0xbc, 0x36, 0x1b, 0x57, 0x20, 0x99, 0xaa, 0xb1, 0x1b, 0x0c, 0x73, 0x64, 0xc2, 0x34, 0x26, 0xe9,
-	0xaf, 0x29, 0xdf, 0x86, 0xf8, 0xf0, 0x0d, 0x0d, 0x5f, 0x6f, 0xef, 0x13, 0xe7, 0xf3, 0x10, 0x97,
-	0x6f, 0xc4, 0x74, 0x81, 0x3c, 0x3e, 0x7c, 0x93, 0x7e, 0x0e, 0xad, 0xa9, 0x1a, 0x97, 0x14, 0x7f,
-	0x6f, 0x6f, 0xab, 0x0e, 0xcb, 0xbb, 0xe7, 0x74, 0xcd, 0x0e, 0x0c, 0xb3, 0x24, 0x3b, 0x10, 0x5a,
-	0xac, 0xb9, 0xf9, 0x48, 0x2b, 0x7f, 0x47, 0xd0, 0x19, 0x56, 0x1c, 0xcb, 0xc5, 0x54, 0x07, 0x3d,
-	0x12, 0x9d, 0xdf, 0x23, 0xb6, 0x53, 0x5d, 0x8f, 0x30, 0x6a, 0x42, 0xbb, 0xb5, 0xcf, 0x2b, 0xa5,
-	0xf9, 0x22, 0x3f, 0x80, 0x5e, 0x61, 0x5d, 0x8e, 0x84, 0x7b, 0x5c, 0x84, 0x4c, 0xd7, 0xe1, 0xf3,
-	0x50, 0xcd, 0x4c, 0xc7, 0xd1, 0x54, 0x65, 0xef, 0xb4, 0x9c, 0xf9, 0xbd, 0xde, 0x08, 0xcc, 0xd2,
-	0xb6, 0x1e, 0xe8, 0xed, 0xb0, 0x41, 0x43, 0x10, 0x48, 0xd8, 0x5f, 0x31, 0x6c, 0x05, 0x71, 0x1c,
-	0xa0, 0x16, 0x72, 0xea, 0xa2, 0x8d, 0x3e, 0x18, 0xed, 0x7d, 0xda, 0x4e, 0x26, 0x0c, 0xca, 0xf4,
-	0xfc, 0x48, 0xbd, 0x0a, 0x6d, 0xc4, 0x42, 0xa9, 0x63, 0xcb, 0xb1, 0xd9, 0x88, 0x84, 0x02, 0x16,
-	0x5b, 0xe7, 0xb3, 0xd8, 0x0e, 0x27, 0x6d, 0x25, 0xd7, 0x8d, 0xb3, 0xb9, 0x36, 0xef, 0xb7, 0xcd,
-	0x95, 0xf7, 0xdb, 0x0d, 0xe8, 0x1c, 0x17, 0x6a, 0x46, 0x1b, 0xcf, 0xbd, 0x9e, 0x3c, 0x3e, 0xc3,
-	0x4f, 0xf7, 0x2c, 0x3f, 0xc1, 0x6c, 0xc3, 0x07, 0x66, 0xfb, 0x6b, 0x48, 0xd7, 0x48, 0x2c, 0xd3,
-	0x7b, 0xe1, 0xfc, 0x0e, 0xd6, 0x69, 0xb4, 0x7a, 0x76, 0x8a, 0xb7, 0xa1, 0xe3, 0x96, 0x33, 0xcd,
-	0xaa, 0x89, 0xcd, 0xbf, 0x97, 0x2c, 0x60, 0xbb, 0x70, 0x9d, 0xe3, 0xc9, 0x01, 0x66, 0x6a, 0x44,
-	0x2f, 0xba, 0xe0, 0x2d, 0x71, 0xee, 0xeb, 0x88, 0x7d, 0x01, 0xdd, 0xd7, 0x25, 0x16, 0xf4, 0x04,
-	0x24, 0x15, 0x35, 0x97, 0x59, 0xad, 0x62, 0x80, 0xf9, 0x5a, 0x64, 0x2a, 0xd7, 0xe8, 0xf6, 0x42,
-	0x97, 0x7b, 0xc8, 0x7e, 0x82, 0xde, 0xeb, 0xf9, 0xb8, 0x10, 0x23, 0x7c, 0x81, 0x5a, 0x18, 0x0a,
-	0xa9, 0x02, 0x32, 0x1f, 0x93, 0x85, 0x0e, 0xaf, 0xb1, 0x31, 0x72, 0x8a, 0x45, 0xe9, 0x97, 0x73,
-	0x97, 0x7b, 0x78, 0xd1, 0x6a, 0x7e, 0x74, 0xfb, 0xc7, 0x4f, 0xc7, 0x52, 0x4f, 0x16, 0x47, 0x3b,
-	0x99, 0x9a, 0xed, 0xee, 0xef, 0x67, 0xf9, 0x6e, 0x36, 0x11, 0x32, 0xdf, 0xdf, 0xdf, 0x25, 0x92,
-	0x8e, 0x36, 0xe8, 0xdf, 0xdc, 0xfe, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x81, 0x12, 0x52, 0x09,
-	0xf7, 0x0d, 0x00, 0x00,
+	// 1329 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xdd, 0x8e, 0x13, 0xc7,
+	0x12, 0xd6, 0xcc, 0xd8, 0x5e, 0xbb, 0x6c, 0x38, 0xec, 0x08, 0x2d, 0x16, 0xe2, 0xc0, 0x9e, 0x16,
+	0x47, 0x42, 0x08, 0xed, 0x4a, 0xbb, 0xdc, 0x9d, 0x23, 0x25, 0xc0, 0x46, 0x80, 0x16, 0x48, 0xd2,
+	0x98, 0x1f, 0x25, 0x51, 0xa4, 0xde, 0x71, 0xad, 0xdd, 0xc1, 0x9e, 0xf6, 0xce, 0xb4, 0x97, 0xf1,
+	0x0b, 0xe4, 0x26, 0xb9, 0xcb, 0x23, 0xe5, 0x05, 0xf2, 0x18, 0x79, 0x8c, 0xa8, 0xab, 0xbb, 0x67,
+	0xda, 0xfb, 0x83, 0xb8, 0x88, 0x94, 0xbb, 0xfe, 0xaa, 0xcb, 0x55, 0x5f, 0xfd, 0x4e, 0x1b, 0x36,
+	0x75, 0x21, 0xf2, 0x52, 0x64, 0x5a, 0xaa, 0x7c, 0x67, 0x51, 0x28, 0xad, 0xd2, 0xb6, 0x5e, 0x2d,
+	0xb0, 0xbc, 0x39, 0xc8, 0xd4, 0x7c, 0xee, 0x85, 0xec, 0x25, 0x5c, 0x79, 0x54, 0x96, 0xa8, 0xcb,
+	0xa7, 0x98, 0x63, 0x29, 0xcb, 0x74, 0x0b, 0x3a, 0x62, 0xae, 0x96, 0xb9, 0x1e, 0xc6, 0xdb, 0xd1,
+	0xbd, 0x84, 0x3b, 0x94, 0xde, 0x85, 0x2b, 0x05, 0xea, 0x65, 0x91, 0x3f, 0x1a, 0x8f, 0x0b, 0x2c,
+	0xcb, 0x61, 0xb2, 0x1d, 0xdd, 0xeb, 0xf1, 0x75, 0x21, 0xfb, 0x35, 0x82, 0xeb, 0xd6, 0xde, 0xc8,
+	0xf8, 0x3f, 0xc6, 0x62, 0xa4, 0xbe, 0xaa, 0x30, 0x4b, 0x6f, 0x41, 0x2f, 0x53, 0x32, 0xd7, 0xea,
+	0x03, 0xe6, 0xc3, 0x88, 0x7e, 0xda, 0x08, 0x2e, 0x75, 0x9a, 0x42, 0x2b, 0x57, 0x1a, 0xc9, 0xd7,
+	0x80, 0xd3, 0x39, 0xbd, 0x09, 0x5d, 0xac, 0x30, 0x7b, 0x25, 0xe6, 0x38, 0x6c, 0x91, 0xa1, 0x1a,
+	0xa7, 0x57, 0x21, 0xd6, 0x6a, 0xd8, 0x26, 0x69, 0xac, 0x15, 0xfb, 0x39, 0x82, 0xab, 0x96, 0xce,
+	0x3b, 0xa9, 0xa7, 0xe3, 0x42, 0x7c, 0xfc, 0x87, 0x88, 0xfc, 0xe4, 0x79, 0xf8, 0xb4, 0xfc, 0x8d,
+	0x3c, 0xac, 0xaf, 0x56, 0xed, 0xeb, 0x10, 0xda, 0xe4, 0xcb, 0x28, 0x1b, 0x42, 0xce, 0x3a, 0x9d,
+	0x8d, 0xe1, 0x72, 0x35, 0x3f, 0x52, 0x33, 0x32, 0xdc, 0xe3, 0x0e, 0x05, 0x0e, 0x93, 0xd0, 0x21,
+	0xfb, 0x33, 0x82, 0xee, 0x93, 0x02, 0x85, 0xc6, 0x51, 0xe5, 0x3c, 0x45, 0xde, 0xd3, 0xa5, 0x2c,
+	0xaf, 0x41, 0x72, 0x8c, 0xe8, 0x2c, 0x99, 0x63, 0xcd, 0xbb, 0x15, 0xf0, 0xbe, 0x0d, 0x20, 0xeb,
+	0xba, 0x50, 0xae, 0xba, 0x3c, 0x90, 0xa4, 0x43, 0xd8, 0x90, 0xe5, 0x88, 0xf2, 0xd3, 0xa1, 0x4b,
+	0x0f, 0xd3, 0x6d, 0xe8, 0x53, 0x9a, 0x5e, 0xdb, 0x48, 0x36, 0x88, 0x50, 0x28, 0x5a, 0xab, 0x4d,
+	0xf7, 0x4c, 0x6d, 0xb6, 0xa0, 0x63, 0xce, 0x58, 0x0c, 0x7b, 0x36, 0x05, 0x16, 0xb1, 0xf7, 0x30,
+	0xe0, 0xf8, 0xae, 0x90, 0x1a, 0xb9, 0xf8, 0xe8, 0xa2, 0xad, 0xea, 0x68, 0x7d, 0xf4, 0x49, 0x18,
+	0x3d, 0x56, 0x0b, 0x59, 0xf8, 0xea, 0x3b, 0xe4, 0xa3, 0x6f, 0xd7, 0xd1, 0xb3, 0xfb, 0xb0, 0xe5,
+	0x72, 0xd8, 0x0c, 0xe5, 0xd3, 0x42, 0x2d, 0x17, 0x46, 0x57, 0x57, 0xe5, 0x30, 0xda, 0x4e, 0xee,
+	0xf5, 0xb8, 0x39, 0xb2, 0xdb, 0xd0, 0x7d, 0x93, 0x97, 0x72, 0x92, 0x8f, 0x2a, 0x93, 0xb5, 0xb1,
+	0xd0, 0x82, 0x38, 0x0c, 0x38, 0x9d, 0x99, 0x82, 0xfe, 0x2b, 0xf5, 0x58, 0xcc, 0x44, 0x9e, 0x99,
+	0x92, 0x5c, 0x87, 0xb6, 0xae, 0x9e, 0xa1, 0xe7, 0x69, 0x81, 0x49, 0xdd, 0x42, 0xac, 0xcc, 0x50,
+	0xba, 0x32, 0x7b, 0x48, 0x37, 0x85, 0x3c, 0xfd, 0x80, 0x2b, 0x17, 0x89, 0x87, 0x97, 0x85, 0xc3,
+	0x7e, 0x84, 0xee, 0x6b, 0x39, 0xc9, 0x71, 0x3c, 0xaa, 0x8c, 0xce, 0x92, 0xc8, 0x39, 0x4a, 0x0e,
+	0x19, 0xa2, 0x24, 0x8d, 0x2d, 0x51, 0x92, 0x6d, 0x41, 0x67, 0xb1, 0x3c, 0xf2, 0x8e, 0x06, 0xdc,
+	0x21, 0x4a, 0xe3, 0x8a, 0x7c, 0xb4, 0x79, 0xac, 0x57, 0xec, 0x97, 0x18, 0xfa, 0x41, 0x5e, 0x82,
+	0xf2, 0x38, 0x1f, 0x16, 0xb9, 0x98, 0x66, 0x4a, 0x8c, 0x9d, 0x1b, 0x0f, 0xd3, 0x1d, 0xe8, 0x19,
+	0x8f, 0x42, 0x2f, 0x0b, 0xdb, 0x74, 0xfd, 0xbd, 0x6b, 0x3b, 0xb4, 0xec, 0x76, 0x5e, 0x7b, 0x39,
+	0x6f, 0x54, 0x7c, 0x81, 0x5a, 0x4d, 0x7b, 0x36, 0xb1, 0xdb, 0xaa, 0xf9, 0x52, 0x5e, 0x87, 0x76,
+	0xae, 0xf2, 0x0c, 0xa9, 0x01, 0x13, 0x6e, 0x81, 0x6b, 0x84, 0x8d, 0xba, 0x11, 0x6e, 0x03, 0x4c,
+	0x4c, 0x35, 0x9f, 0xd0, 0x28, 0x74, 0x29, 0xb2, 0x40, 0x62, 0xac, 0x4f, 0x51, 0x8c, 0x5d, 0xc3,
+	0x0d, 0xb8, 0x43, 0x34, 0x14, 0x58, 0xe9, 0x21, 0xb8, 0xa1, 0xc0, 0x4a, 0xb3, 0x87, 0x30, 0x08,
+	0x92, 0x51, 0xa6, 0x77, 0x9b, 0x06, 0xe9, 0xef, 0xa5, 0x2e, 0xaa, 0x40, 0xc3, 0x36, 0xcd, 0x17,
+	0x70, 0x85, 0xcb, 0x7c, 0x52, 0x47, 0x9b, 0xee, 0x40, 0x5b, 0x6a, 0x9c, 0xfb, 0x1f, 0x0e, 0xdd,
+	0x0f, 0xd7, 0x94, 0x9e, 0x6b, 0x9c, 0x73, 0xab, 0xc6, 0x9e, 0xc3, 0xe6, 0xb9, 0xbb, 0xa0, 0x82,
+	0xc6, 0x4a, 0x53, 0xc1, 0x5b, 0x61, 0xbe, 0x63, 0xba, 0x6a, 0x04, 0xec, 0x5b, 0xe8, 0x35, 0x3c,
+	0x6c, 0xb1, 0x23, 0x5f, 0xec, 0xc0, 0x64, 0xbc, 0xd6, 0x14, 0xb7, 0xce, 0x96, 0x70, 0xcd, 0xe4,
+	0x0f, 0x30, 0x30, 0xcd, 0xfb, 0xf5, 0x29, 0x16, 0xa7, 0x12, 0x69, 0x33, 0x14, 0x98, 0xc9, 0x53,
+	0xd7, 0x23, 0x09, 0xf7, 0xd0, 0xdc, 0x1c, 0xd9, 0xd9, 0x70, 0x2b, 0xc9, 0x43, 0x73, 0xa3, 0xab,
+	0x27, 0xc1, 0x86, 0xf3, 0x90, 0xfd, 0x16, 0xc1, 0x06, 0xc7, 0x13, 0x1a, 0x8f, 0x14, 0x5a, 0xc2,
+	0x4c, 0x8d, 0x5b, 0x99, 0xc2, 0xc9, 0x8e, 0x67, 0x62, 0x42, 0x06, 0xdb, 0x9c, 0xce, 0xa6, 0x31,
+	0xb2, 0xda, 0x56, 0x9b, 0x5b, 0x60, 0xa2, 0x18, 0xcb, 0x02, 0xa9, 0x30, 0xae, 0xc3, 0x1b, 0x81,
+	0x6d, 0x03, 0x39, 0x99, 0x6a, 0xdf, 0x64, 0x16, 0x19, 0x5b, 0x32, 0x1f, 0x63, 0xe5, 0x9b, 0x8c,
+	0x00, 0x7b, 0x0f, 0xc0, 0xf1, 0xe4, 0x9b, 0x42, 0x9e, 0x8a, 0x6c, 0xd5, 0xf8, 0x8b, 0x2e, 0xf5,
+	0x17, 0x5f, 0xee, 0x2f, 0x09, 0xfd, 0xb1, 0x1b, 0xd0, 0x7e, 0x86, 0xd5, 0xf9, 0x05, 0xc7, 0x96,
+	0xd0, 0xe7, 0xb8, 0x98, 0xad, 0x46, 0xd5, 0xf3, 0xfc, 0x58, 0x99, 0xb8, 0xa7, 0xa2, 0x9c, 0xfa,
+	0xed, 0x63, 0xce, 0x81, 0xcd, 0xf8, 0xe2, 0x18, 0x92, 0x20, 0x86, 0xf4, 0x2e, 0x74, 0x04, 0x7d,
+	0xf5, 0x86, 0x2d, 0x6a, 0xc3, 0x81, 0x6b, 0x43, 0xfa, 0x3c, 0x71, 0x77, 0xc7, 0xfe, 0x03, 0x3d,
+	0x8e, 0x27, 0xa3, 0xea, 0x85, 0x2c, 0xf5, 0x7a, 0xa0, 0x89, 0x0b, 0x94, 0xed, 0xd7, 0xcc, 0x48,
+	0xe9, 0xf3, 0x86, 0x82, 0x03, 0x8c, 0xaa, 0x67, 0xa2, 0x9c, 0xd2, 0x6f, 0x0c, 0x73, 0x51, 0x4e,
+	0xb1, 0xf4, 0xcd, 0x6c, 0x51, 0xe3, 0x30, 0x0e, 0x1c, 0x06, 0x0b, 0x21, 0xd9, 0x4e, 0x9a, 0x85,
+	0xc0, 0xfe, 0x6f, 0xbe, 0x11, 0x75, 0x8a, 0xca, 0xf4, 0x81, 0xe9, 0x2a, 0x3a, 0x9e, 0x61, 0x13,
+	0x68, 0x71, 0xaf, 0xc2, 0x76, 0x4c, 0x4d, 0x33, 0x94, 0x0b, 0xfd, 0x42, 0x4d, 0xce, 0xcd, 0xc6,
+	0x35, 0x48, 0x66, 0x6a, 0xe2, 0x06, 0xc3, 0x1c, 0x99, 0x30, 0x8d, 0x49, 0xfa, 0xe7, 0x94, 0xef,
+	0x40, 0x7c, 0xf8, 0x96, 0x86, 0xaf, 0xbf, 0xf7, 0x2f, 0xe7, 0xf3, 0x10, 0x57, 0x6f, 0xc5, 0x6c,
+	0x89, 0x3c, 0x3e, 0x7c, 0x9b, 0xfe, 0x17, 0x5a, 0x33, 0x35, 0x29, 0x89, 0x7f, 0x7f, 0x6f, 0xb3,
+	0xa6, 0xe5, 0xdd, 0x73, 0xba, 0x66, 0x07, 0x26, 0xb3, 0x24, 0x3b, 0x10, 0x5a, 0x9c, 0x73, 0xf3,
+	0x99, 0x56, 0xfe, 0x88, 0xa0, 0x3b, 0xaa, 0x38, 0x96, 0xcb, 0x99, 0x0e, 0x7a, 0x24, 0xba, 0xb8,
+	0x47, 0x6c, 0xa7, 0xba, 0x1e, 0x61, 0xd4, 0x84, 0x76, 0x6b, 0x5f, 0x54, 0x4a, 0xf3, 0xe5, 0x7d,
+	0x08, 0xfd, 0xc2, 0xba, 0x1c, 0x0b, 0xf7, 0x88, 0x08, 0x33, 0x5d, 0xd3, 0xe7, 0xa1, 0x9a, 0x99,
+	0x8e, 0xa3, 0x99, 0xca, 0x3e, 0x68, 0x39, 0xf7, 0x7b, 0xbd, 0x11, 0x98, 0xa5, 0x6d, 0x3d, 0xd0,
+	0x1b, 0xa1, 0x43, 0x43, 0x10, 0x48, 0xd8, 0xef, 0x31, 0x6c, 0x06, 0x3c, 0x0e, 0x50, 0x0b, 0x39,
+	0x73, 0x6c, 0xa3, 0x4f, 0xb2, 0x7d, 0x40, 0xdb, 0xc9, 0xd0, 0xa0, 0x48, 0x2f, 0x66, 0xea, 0x55,
+	0x68, 0x23, 0x16, 0x4a, 0x1d, 0xdb, 0x1c, 0x9b, 0x8d, 0x48, 0x28, 0xc8, 0x62, 0xeb, 0xe2, 0x2c,
+	0xb6, 0xc3, 0x49, 0x5b, 0x8b, 0xb5, 0x73, 0x36, 0xd6, 0xe6, 0x9d, 0xb6, 0xb1, 0xf6, 0x4e, 0xbb,
+	0x09, 0xdd, 0xe3, 0x42, 0xcd, 0x69, 0xe3, 0xb9, 0x57, 0x92, 0xc7, 0x67, 0xf2, 0xd3, 0x3b, 0x9b,
+	0x9f, 0x60, 0xb6, 0xe1, 0x13, 0xb3, 0xfd, 0x25, 0xa4, 0xe7, 0x92, 0x58, 0xa6, 0xf7, 0xc3, 0xf9,
+	0x1d, 0x9e, 0x4f, 0xa3, 0xd5, 0xb3, 0x53, 0xbc, 0x0d, 0x5d, 0xb7, 0x9c, 0x69, 0x56, 0x0d, 0x37,
+	0xff, 0x5e, 0xb2, 0x80, 0xed, 0xc2, 0x0d, 0x8e, 0x27, 0x07, 0x98, 0xa9, 0x31, 0xbd, 0xdc, 0x82,
+	0xb7, 0xc4, 0x85, 0xaf, 0x23, 0xf6, 0x3f, 0xe8, 0xbd, 0x29, 0xb1, 0xa0, 0xa7, 0x1e, 0xa9, 0xa8,
+	0x85, 0xcc, 0x6a, 0x15, 0x03, 0xcc, 0xd7, 0x22, 0x53, 0xb9, 0x46, 0xb7, 0x17, 0x7a, 0xdc, 0x43,
+	0xf6, 0x3d, 0xf4, 0xdf, 0x2c, 0x26, 0x85, 0x18, 0xe3, 0x4b, 0xd4, 0xc2, 0xa4, 0x90, 0x2a, 0x20,
+	0xf3, 0x09, 0x59, 0xe8, 0xf2, 0x1a, 0x1b, 0x23, 0xa7, 0x58, 0x94, 0x7e, 0x39, 0xf7, 0xb8, 0x87,
+	0x97, 0xad, 0xe6, 0xc7, 0x77, 0xbe, 0xfb, 0xf7, 0x44, 0xea, 0xe9, 0xf2, 0x68, 0x27, 0x53, 0xf3,
+	0xdd, 0xfd, 0xfd, 0x2c, 0xdf, 0xcd, 0xa6, 0x42, 0xe6, 0xfb, 0xfb, 0xbb, 0x94, 0xa4, 0xa3, 0x0e,
+	0xfd, 0x6b, 0xdb, 0xff, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xc9, 0xbd, 0xf6, 0x73, 0xdf, 0x0d, 0x00,
+	0x00,
 }

vendor/github.com/33cn/chain33/types/wallet.pb.go

@@ -1356,7 +1356,7 @@ type ReqSignRawTx struct {
 	// int32  mode  = 6;
 	Token string `protobuf:"bytes,7,opt,name=token,proto3" json:"token,omitempty"`
 	Fee   int64  `protobuf:"varint,8,opt,name=fee,proto3" json:"fee,omitempty"`
-	NewExecer            []byte   `protobuf:"bytes,9,opt,name=newExecer,proto3" json:"newExecer,omitempty"`
+	// bytes  newExecer = 9;
 	NewToAddr            string   `protobuf:"bytes,10,opt,name=newToAddr,proto3" json:"newToAddr,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -1437,13 +1437,6 @@ func (m *ReqSignRawTx) GetFee() int64 {
 	return 0
 }
 
-func (m *ReqSignRawTx) GetNewExecer() []byte {
-	if m != nil {
-		return m.NewExecer
-	}
-	return nil
-}
-
 func (m *ReqSignRawTx) GetNewToAddr() string {
 	if m != nil {
 		return m.NewToAddr
@@ -1771,87 +1764,86 @@ func init() {
 func init() { proto.RegisterFile("wallet.proto", fileDescriptor_b88fd140af4deb6f) }
 
 var fileDescriptor_b88fd140af4deb6f = []byte{
-	// 1304 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x5f, 0x6e, 0x1b, 0x37,
-	0x13, 0xc7, 0x4a, 0x96, 0x6d, 0xd1, 0xb2, 0x93, 0x2c, 0x92, 0x40, 0xf0, 0xf7, 0x25, 0x71, 0x58,
-	0x24, 0x75, 0x81, 0xc2, 0x01, 0xa2, 0x97, 0xa2, 0x40, 0x81, 0x38, 0x7f, 0x1d, 0xc0, 0x49, 0x0d,
-	0x4a, 0x45, 0x81, 0xbe, 0x14, 0xd4, 0xee, 0x58, 0x22, 0xb4, 0x5a, 0xae, 0xb9, 0x94, 0x25, 0xdd,
-	0xa4, 0x07, 0xe8, 0x11, 0x7a, 0x91, 0xde, 0xa1, 0x8f, 0x3d, 0x44, 0x31, 0x43, 0x52, 0xbb, 0x9b,
-	0xb8, 0x0f, 0x41, 0xdf, 0xf8, 0x1b, 0x0e, 0x67, 0x38, 0xbf, 0x19, 0x0e, 0x87, 0xf5, 0x96, 0x32,
-	0xcb, 0xc0, 0x9e, 0x14, 0x46, 0x5b, 0x1d, 0x77, 0xec, 0xba, 0x80, 0xf2, 0xf0, 0x8e, 0x35, 0x32,
-	0x2f, 0x65, 0x62, 0x95, 0xce, 0xdd, 0xce, 0xe1, 0xed, 0x71, 0xa6, 0x93, 0x59, 0x32, 0x95, 0x2a,
-	0x48, 0xf6, 0x65, 0x92, 0xe8, 0x45, 0xee, 0x8f, 0x1e, 0x1e, 0xc0, 0x0a, 0x92, 0x85, 0xd5, 0xc6,
-	0x61, 0xfe, 0x47, 0x8b, 0x1d, 0xfc, 0x4c, 0xb6, 0x47, 0xab, 0xd7, 0x60, 0xa5, 0xca, 0x62, 0xce,
-	0x5a, 0x76, 0xd5, 0x8f, 0x8e, 0xa2, 0xe3, 0xbd, 0xe7, 0xf1, 0x09, 0xb9, 0x3a, 0x19, 0x55, 0x9e,
-	0x44, 0xcb, 0xae, 0xe2, 0x6f, 0xd9, 0x8e, 0x81, 0x04, 0x54, 0x61, 0xfb, 0xad, 0x86, 0xa2, 0x70,
-	0xd2, 0xd7, 0xd2, 0x4a, 0x11, 0x54, 0xe2, 0xfb, 0x6c, 0x7b, 0x0a, 0x6a, 0x32, 0xb5, 0xfd, 0xf6,
-	0x51, 0x74, 0xdc, 0x16, 0x1e, 0xc5, 0x77, 0x59, 0x47, 0xe5, 0x29, 0xac, 0xfa, 0x5b, 0x24, 0x76,
-	0x20, 0xfe, 0x3f, 0xeb, 0x52, 0x14, 0x56, 0xcd, 0xa1, 0xdf, 0xa1, 0x9d, 0x4a, 0x80, 0xb6, 0xe4,
-	0x1c, 0x03, 0xea, 0x6f, 0x3b, 0x5b, 0x0e, 0xc5, 0x87, 0x6c, 0xf7, 0xd2, 0xe8, 0xb9, 0x4c, 0x53,
-	0xd3, 0xdf, 0x39, 0x8a, 0x8e, 0xbb, 0x62, 0x83, 0xf1, 0x8c, 0x5d, 0x4d, 0x65, 0x39, 0xed, 0xef,
-	0x1e, 0x45, 0xc7, 0x3d, 0xe1, 0x51, 0xfc, 0x90, 0x31, 0x17, 0xd3, 0x47, 0x39, 0x87, 0x7e, 0x97,
-	0x4e, 0xd5, 0x24, 0x71, 0x9f, 0xed, 0x14, 0x72, 0x9d, 0x69, 0x99, 0xf6, 0x19, 0x1d, 0x0c, 0x90,
-	0xbf, 0x65, 0xb7, 0x9a, 0xac, 0x95, 0xf1, 0x80, 0x75, 0x6d, 0x00, 0xfd, 0xe8, 0xa8, 0x7d, 0xbc,
-	0xf7, 0xfc, 0x9e, 0x27, 0xa5, 0xa9, 0x2a, 0x2a, 0x3d, 0x7e, 0xcd, 0x62, 0xb7, 0x79, 0xea, 0xb2,
-	0x34, 0xb4, 0xda, 0x38, 0xbf, 0x46, 0x5d, 0xcf, 0x60, 0x4d, 0x69, 0xe8, 0x8a, 0x00, 0x91, 0xb1,
-	0x4c, 0x8e, 0x21, 0x23, 0xd6, 0xbb, 0xc2, 0x81, 0x38, 0x66, 0x5b, 0x14, 0x77, 0x9b, 0x84, 0xb4,
-	0x46, 0x16, 0x91, 0xaf, 0xa1, 0x95, 0xf3, 0x82, 0xf8, 0xed, 0x8a, 0x4a, 0xc0, 0x5f, 0xb0, 0x9e,
+	// 1292 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x5d, 0x6e, 0x1b, 0xb7,
+	0x13, 0xc7, 0x4a, 0x96, 0x6d, 0xd1, 0xb2, 0x93, 0x2c, 0x92, 0x40, 0xf0, 0xff, 0x9f, 0xc4, 0x61,
+	0x91, 0xd4, 0x05, 0x0a, 0x07, 0x88, 0x5e, 0x8a, 0x02, 0x05, 0xe2, 0x7c, 0x3a, 0x80, 0x93, 0x1a,
+	0x94, 0x8a, 0x02, 0x7d, 0x29, 0xa8, 0xdd, 0xb1, 0x44, 0x68, 0xb5, 0x5c, 0x73, 0x29, 0x4b, 0xba,
+	0x49, 0x0f, 0xd0, 0x23, 0xf4, 0x0c, 0x7d, 0xef, 0x3d, 0x7a, 0x88, 0x62, 0x86, 0xe4, 0x6a, 0x37,
+	0x71, 0x1f, 0x82, 0xbe, 0xf1, 0x37, 0x1c, 0xce, 0x70, 0x7e, 0xf3, 0x41, 0xb2, 0xde, 0x52, 0x66,
+	0x19, 0xd8, 0x93, 0xc2, 0x68, 0xab, 0xe3, 0x8e, 0x5d, 0x17, 0x50, 0x1e, 0xde, 0xb1, 0x46, 0xe6,
+	0xa5, 0x4c, 0xac, 0xd2, 0xb9, 0xdb, 0x39, 0xbc, 0x3d, 0xce, 0x74, 0x32, 0x4b, 0xa6, 0x52, 0x05,
+	0xc9, 0xbe, 0x4c, 0x12, 0xbd, 0xc8, 0xfd, 0xd1, 0xc3, 0x03, 0x58, 0x41, 0xb2, 0xb0, 0xda, 0x38,
+	0xcc, 0xff, 0x68, 0xb1, 0x83, 0x9f, 0xc9, 0xf6, 0x68, 0xf5, 0x1a, 0xac, 0x54, 0x59, 0xcc, 0x59,
+	0xcb, 0xae, 0xfa, 0xd1, 0x51, 0x74, 0xbc, 0xf7, 0x3c, 0x3e, 0x21, 0x57, 0x27, 0xa3, 0x8d, 0x27,
+	0xd1, 0xb2, 0xab, 0xf8, 0x5b, 0xb6, 0x63, 0x20, 0x01, 0x55, 0xd8, 0x7e, 0xab, 0xa1, 0x28, 0x9c,
+	0xf4, 0xb5, 0xb4, 0x52, 0x04, 0x95, 0xf8, 0x3e, 0xdb, 0x9e, 0x82, 0x9a, 0x4c, 0x6d, 0xbf, 0x7d,
+	0x14, 0x1d, 0xb7, 0x85, 0x47, 0xf1, 0x5d, 0xd6, 0x51, 0x79, 0x0a, 0xab, 0xfe, 0x16, 0x89, 0x1d,
+	0x88, 0xff, 0xcf, 0xba, 0x14, 0x85, 0x55, 0x73, 0xe8, 0x77, 0x68, 0x67, 0x23, 0x40, 0x5b, 0x72,
+	0x8e, 0x01, 0xf5, 0xb7, 0x9d, 0x2d, 0x87, 0xe2, 0x43, 0xb6, 0x7b, 0x69, 0xf4, 0x5c, 0xa6, 0xa9,
+	0xe9, 0xef, 0x1c, 0x45, 0xc7, 0x5d, 0x51, 0x61, 0x3c, 0x63, 0x57, 0x53, 0x59, 0x4e, 0xfb, 0xbb,
+	0x47, 0xd1, 0x71, 0x4f, 0x78, 0x14, 0x3f, 0x64, 0xcc, 0xc5, 0xf4, 0x51, 0xce, 0xa1, 0xdf, 0xa5,
+	0x53, 0x35, 0x49, 0xdc, 0x67, 0x3b, 0x85, 0x5c, 0x67, 0x5a, 0xa6, 0x7d, 0x46, 0x07, 0x03, 0xe4,
+	0x6f, 0xd9, 0xad, 0x26, 0x6b, 0x65, 0x3c, 0x60, 0x5d, 0x1b, 0x40, 0x3f, 0x3a, 0x6a, 0x1f, 0xef,
+	0x3d, 0xbf, 0xe7, 0x49, 0x69, 0xaa, 0x8a, 0x8d, 0x1e, 0xbf, 0x66, 0xb1, 0xdb, 0x3c, 0x75, 0x59,
+	0x1a, 0x5a, 0x6d, 0x9c, 0x5f, 0xa3, 0xae, 0x67, 0xb0, 0xa6, 0x34, 0x74, 0x45, 0x80, 0xc8, 0x58,
+	0x26, 0xc7, 0x90, 0x11, 0xeb, 0x5d, 0xe1, 0x40, 0x1c, 0xb3, 0x2d, 0x8a, 0xbb, 0x4d, 0x42, 0x5a,
+	0x23, 0x8b, 0xc8, 0xd7, 0xd0, 0xca, 0x79, 0x41, 0xfc, 0x76, 0xc5, 0x46, 0xc0, 0x5f, 0xb0, 0x9e,
 	0xf3, 0x7b, 0xb1, 0x3c, 0x43, 0x26, 0xee, 0xb3, 0xed, 0x82, 0x56, 0xe4, 0xb0, 0x27, 0x3c, 0xc2,
 	0x9b, 0x18, 0x99, 0xa7, 0xa5, 0x35, 0xde, 0x63, 0x80, 0xfc, 0xb7, 0x28, 0x98, 0x18, 0x5a, 0x69,
 	0x17, 0x65, 0xcc, 0x59, 0x4f, 0x95, 0x4e, 0x72, 0xae, 0x93, 0x19, 0x19, 0xda, 0x15, 0x0d, 0x99,
-	0xd3, 0x39, 0x5d, 0x58, 0xfd, 0x41, 0xe5, 0x2a, 0x9f, 0x90, 0x4d, 0xd2, 0xa9, 0x64, 0x78, 0x71,
-	0x55, 0x9e, 0xc9, 0x72, 0x08, 0x90, 0x52, 0x44, 0xbb, 0xa2, 0x12, 0x38, 0x0b, 0x23, 0x95, 0xcc,
-	0xbc, 0x97, 0xad, 0x60, 0xa1, 0x92, 0xf1, 0x17, 0xa1, 0xa4, 0x3d, 0xa9, 0x65, 0x7c, 0xc2, 0x76,
-	0xdc, 0x03, 0x0a, 0x99, 0xb9, 0xdb, 0xc8, 0x8c, 0xd7, 0x13, 0x41, 0x89, 0xbf, 0x63, 0xfb, 0x8d,
-	0x9d, 0xf8, 0x88, 0xb5, 0x65, 0x92, 0xf8, 0x47, 0x71, 0xe0, 0x0f, 0x87, 0x63, 0xb8, 0x75, 0x73,
-	0x66, 0xf8, 0x34, 0x90, 0xf4, 0x53, 0x4e, 0x04, 0x20, 0xcf, 0xb2, 0x2c, 0x97, 0xa9, 0x4f, 0xac,
-	0x47, 0xc8, 0x33, 0x26, 0x47, 0x2f, 0xdc, 0x7b, 0x6a, 0x8b, 0x00, 0xe3, 0xa7, 0xec, 0xc0, 0xdd,
+	0xd3, 0x39, 0x5d, 0x58, 0xfd, 0x41, 0xe5, 0x2a, 0x9f, 0x90, 0x4d, 0xd2, 0xd9, 0xc8, 0xf0, 0xe2,
+	0xaa, 0x3c, 0x93, 0xe5, 0x10, 0x20, 0xa5, 0x88, 0x76, 0xc5, 0x46, 0xe0, 0x2c, 0x8c, 0x54, 0x32,
+	0xf3, 0x5e, 0xb6, 0x82, 0x85, 0x8d, 0x8c, 0xbf, 0x08, 0x25, 0xed, 0x49, 0x2d, 0xe3, 0x13, 0xb6,
+	0xe3, 0x1a, 0x28, 0x64, 0xe6, 0x6e, 0x23, 0x33, 0x5e, 0x4f, 0x04, 0x25, 0xfe, 0x8e, 0xed, 0x37,
+	0x76, 0xe2, 0x23, 0xd6, 0x96, 0x49, 0xe2, 0x9b, 0xe2, 0xc0, 0x1f, 0x0e, 0xc7, 0x70, 0xeb, 0xe6,
+	0xcc, 0xf0, 0x69, 0x20, 0xe9, 0xa7, 0x9c, 0x08, 0x40, 0x9e, 0x65, 0x59, 0x2e, 0x53, 0x9f, 0x58,
+	0x8f, 0x90, 0x67, 0x4c, 0x8e, 0x5e, 0xb8, 0x7e, 0x6a, 0x8b, 0x00, 0xe3, 0xa7, 0xec, 0xc0, 0xdd,
 	0xea, 0x47, 0xe3, 0x42, 0xf4, 0x9c, 0x7c, 0x22, 0xe5, 0x8f, 0xd9, 0xde, 0x3b, 0xc8, 0x91, 0xa3,
 	0x73, 0x99, 0x4f, 0xb0, 0x24, 0x32, 0x99, 0x4f, 0xc8, 0x4d, 0x47, 0xd0, 0x9a, 0x3f, 0x41, 0x15,
-	0x8b, 0x2a, 0x2f, 0xd7, 0x17, 0xcb, 0x7f, 0xbb, 0x0b, 0xff, 0x9e, 0xf5, 0x86, 0xf2, 0x1a, 0x36,
-	0x7a, 0x31, 0xdb, 0x2a, 0x31, 0x17, 0x4e, 0x8b, 0xd6, 0xb5, 0xb3, 0xad, 0xc6, 0xd9, 0x47, 0xac,
-	0x2b, 0xa0, 0xc8, 0xd6, 0x94, 0xab, 0x1b, 0x0e, 0xf2, 0x33, 0x16, 0x0b, 0xb8, 0xf2, 0x85, 0x03,
-	0xf6, 0x62, 0x13, 0xbe, 0xce, 0x52, 0x04, 0xa1, 0xe0, 0x3d, 0xc4, 0x9d, 0x1c, 0x96, 0xb4, 0xe3,
-	0x0b, 0xd0, 0x43, 0xfe, 0x84, 0xed, 0x0b, 0xb8, 0xfa, 0x08, 0xcb, 0x90, 0xa3, 0x4d, 0x06, 0xa2,
-	0x7a, 0x06, 0x2e, 0x59, 0x7f, 0xe3, 0xb0, 0xd6, 0xc5, 0xce, 0x55, 0x49, 0x7d, 0x09, 0x7b, 0xc4,
-	0x68, 0x15, 0xaa, 0xde, 0x21, 0xb4, 0x44, 0x26, 0xc9, 0x65, 0x47, 0x38, 0x80, 0x85, 0x99, 0x2a,
-	0x03, 0x74, 0x9c, 0x92, 0xd0, 0x11, 0x95, 0x80, 0x9f, 0xb1, 0xfb, 0x1b, 0x3f, 0xef, 0xe7, 0x85,
-	0x36, 0xf6, 0xc2, 0xbf, 0xd9, 0x2f, 0x7c, 0xcd, 0xfc, 0xf7, 0xa8, 0x66, 0x6a, 0x08, 0x79, 0x3a,
-	0xd2, 0xa7, 0x69, 0x6a, 0xa0, 0x2c, 0x91, 0x51, 0xbc, 0x62, 0x60, 0x14, 0xd7, 0xf1, 0x01, 0x6b,
-	0x59, 0xed, 0x2d, 0xb4, 0xac, 0xae, 0x35, 0xc8, 0x76, 0xa3, 0x41, 0xc6, 0x6c, 0x2b, 0xd7, 0x16,
-	0x7c, 0x2f, 0xa0, 0x35, 0x5e, 0x4d, 0x95, 0x23, 0x3d, 0x83, 0x9c, 0x1a, 0xed, 0xae, 0x08, 0x30,
-	0x3e, 0x62, 0x7b, 0x16, 0x17, 0xc3, 0xf5, 0x7c, 0xac, 0x33, 0xea, 0xb5, 0x5d, 0x51, 0x17, 0xf1,
-	0x6f, 0xd8, 0xad, 0x7a, 0x26, 0xdf, 0x42, 0xbd, 0x37, 0x47, 0x75, 0xd7, 0xfc, 0x07, 0x76, 0xa7,
-	0xae, 0x7a, 0xde, 0x68, 0x5a, 0x51, 0xad, 0x69, 0xdd, 0x4c, 0xc8, 0xd7, 0xec, 0xde, 0xe6, 0xf8,
-	0x07, 0x30, 0x13, 0x78, 0x29, 0x33, 0x99, 0x27, 0xe0, 0x43, 0x8f, 0x42, 0xe8, 0xfc, 0xcf, 0x88,
-	0x1c, 0x51, 0x04, 0x17, 0x06, 0x5e, 0x19, 0x90, 0x16, 0xe2, 0xc7, 0xac, 0x97, 0xe0, 0x4a, 0x9b,
-	0x5f, 0x6b, 0x0e, 0xf7, 0xbc, 0x0c, 0xa9, 0x25, 0x6e, 0xf0, 0x0b, 0x68, 0x79, 0x6e, 0xa4, 0xfb,
-	0x68, 0x4a, 0x17, 0xbc, 0x6b, 0xab, 0x1e, 0x51, 0x07, 0xca, 0xad, 0xd1, 0xe9, 0xc2, 0x55, 0x82,
-	0xe3, 0xb3, 0x21, 0x8b, 0x1f, 0x30, 0xa6, 0x97, 0x39, 0x78, 0x87, 0x1d, 0xd7, 0x7d, 0x49, 0x72,
-	0xea, 0xc3, 0xb4, 0xda, 0xca, 0xcc, 0x7f, 0x61, 0x0e, 0xa0, 0xb4, 0x30, 0x2a, 0x01, 0xfa, 0xbe,
-	0xda, 0xc2, 0x01, 0x6e, 0xd8, 0xdd, 0x10, 0xd2, 0x5b, 0x95, 0xab, 0x72, 0xea, 0xa3, 0xfa, 0x8a,
-	0xed, 0x5f, 0x12, 0x86, 0x46, 0x58, 0xbd, 0x20, 0x3c, 0xf5, 0x1f, 0x9f, 0x8f, 0xa1, 0xd5, 0x88,
-	0xa1, 0x79, 0xbf, 0xf6, 0x27, 0xf7, 0xe3, 0x45, 0xe5, 0x53, 0xc0, 0xb5, 0x9e, 0xd5, 0x98, 0x34,
-	0x84, 0x9b, 0x4c, 0x7a, 0xd9, 0x7f, 0xf1, 0x08, 0x54, 0x4c, 0x1f, 0x74, 0xaa, 0x2e, 0xd7, 0xaf,
-	0x74, 0x7e, 0xa9, 0x26, 0xf1, 0x6d, 0xd6, 0xae, 0x9e, 0x0c, 0x2e, 0x31, 0xdd, 0xba, 0x08, 0x95,
-	0xae, 0x0b, 0x24, 0xec, 0x5a, 0x66, 0x0b, 0xf0, 0xe6, 0x1c, 0xc0, 0x41, 0x60, 0x8e, 0x76, 0x14,
-	0x18, 0x9f, 0x9b, 0x0d, 0xe6, 0x7f, 0x45, 0xac, 0x27, 0xe0, 0x6a, 0xa8, 0x26, 0xb9, 0x90, 0xcb,
-	0xd1, 0xea, 0xc6, 0x22, 0xac, 0xbd, 0xd7, 0xd6, 0x67, 0xef, 0xd5, 0xae, 0xce, 0x60, 0x15, 0x1c,
-	0x12, 0xc0, 0x90, 0x61, 0x55, 0x28, 0x13, 0x9e, 0x96, 0x47, 0xd5, 0x74, 0xd3, 0x71, 0x5d, 0xc4,
-	0x4d, 0x37, 0x94, 0x7b, 0x7c, 0x70, 0x3b, 0xde, 0x06, 0x3d, 0xb7, 0xdb, 0xac, 0x7d, 0x09, 0x40,
-	0xe3, 0x49, 0x5b, 0xe0, 0x12, 0xbb, 0x4d, 0x0e, 0xcb, 0x37, 0x2b, 0x48, 0xc0, 0xd0, 0x68, 0xd2,
-	0x13, 0x95, 0xc0, 0xef, 0xba, 0xc6, 0x40, 0xb3, 0x49, 0x57, 0x54, 0x02, 0xfe, 0x94, 0x1d, 0xb8,
-	0x2e, 0xbc, 0x89, 0x73, 0x73, 0xf3, 0xa8, 0x76, 0x73, 0x3e, 0x26, 0x3d, 0x6d, 0xec, 0x1b, 0x63,
-	0xde, 0x5c, 0x43, 0x6e, 0x71, 0x22, 0xc2, 0xa6, 0x32, 0xd7, 0xe9, 0x22, 0x03, 0xaf, 0x5c, 0x93,
-	0x20, 0xb9, 0x56, 0xfb, 0x5d, 0x47, 0xce, 0x06, 0xa3, 0x0f, 0x30, 0x46, 0x87, 0xec, 0x3a, 0xc0,
-	0xff, 0xc7, 0x3a, 0xef, 0x73, 0x3b, 0x78, 0x8e, 0x54, 0xa7, 0xd2, 0xca, 0xf0, 0x23, 0xe1, 0x9a,
-	0xff, 0x1d, 0x51, 0xa5, 0xb9, 0xf2, 0xaa, 0x75, 0x67, 0x9a, 0x5e, 0x90, 0x18, 0x7a, 0x95, 0x91,
-	0x9f, 0x5e, 0x82, 0x00, 0x4d, 0xe1, 0x0f, 0xec, 0xdb, 0x33, 0xad, 0xbf, 0xa8, 0xed, 0x85, 0x36,
-	0xda, 0xf9, 0xac, 0x8d, 0x6e, 0x6f, 0xda, 0xe8, 0x43, 0xc6, 0x8a, 0xc5, 0x78, 0x06, 0xeb, 0x42,
-	0xaa, 0x40, 0x71, 0x4d, 0x42, 0x65, 0xa6, 0x56, 0xee, 0x9b, 0xd8, 0xa3, 0x7b, 0x6c, 0x70, 0xad,
-	0x22, 0x7a, 0xee, 0x2e, 0x0e, 0xf1, 0xef, 0x90, 0xef, 0x2b, 0xff, 0x5f, 0xd1, 0x0f, 0x84, 0xbf,
-	0xbb, 0xb2, 0x53, 0xbd, 0xb0, 0xbe, 0xa7, 0xf9, 0xb1, 0xe9, 0x13, 0xe9, 0xcb, 0x47, 0xbf, 0x3c,
-	0x98, 0x28, 0x3b, 0x5d, 0x8c, 0x4f, 0x12, 0x3d, 0x7f, 0x36, 0x18, 0x24, 0xf9, 0x33, 0x1a, 0xf2,
-	0x07, 0x83, 0x67, 0x34, 0x8b, 0x8c, 0xb7, 0x69, 0x9c, 0x1f, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff,
-	0xb9, 0xa3, 0x5d, 0xe0, 0x29, 0x0c, 0x00, 0x00,
+	0x8b, 0x2a, 0x2f, 0xd7, 0x17, 0xcb, 0x7f, 0xbb, 0x0b, 0xff, 0x9e, 0xf5, 0x86, 0xf2, 0x1a, 0x2a,
+	0xbd, 0x98, 0x6d, 0x95, 0x98, 0x0b, 0xa7, 0x45, 0xeb, 0xda, 0xd9, 0x56, 0xe3, 0xec, 0x23, 0xd6,
+	0x15, 0x50, 0x64, 0x6b, 0xca, 0xd5, 0x0d, 0x07, 0xf9, 0x19, 0x8b, 0x05, 0x5c, 0xf9, 0xc2, 0x01,
+	0x7b, 0x51, 0x85, 0xaf, 0xb3, 0x14, 0x41, 0x28, 0x78, 0x0f, 0x71, 0x27, 0x87, 0x25, 0xed, 0xf8,
+	0x02, 0xf4, 0x90, 0x3f, 0x61, 0xfb, 0x02, 0xae, 0x3e, 0xc2, 0x32, 0xe4, 0xa8, 0xca, 0x40, 0x54,
+	0xcf, 0xc0, 0x25, 0xeb, 0x57, 0x0e, 0x6b, 0x53, 0xec, 0x5c, 0x95, 0x34, 0x97, 0x70, 0x46, 0x8c,
+	0x56, 0xa1, 0xea, 0x1d, 0x42, 0x4b, 0x64, 0x92, 0x5c, 0x76, 0x84, 0x03, 0x58, 0x98, 0xa9, 0x32,
+	0x40, 0xc7, 0x29, 0x09, 0x1d, 0xb1, 0x11, 0xf0, 0x33, 0x76, 0xbf, 0xf2, 0xf3, 0x7e, 0x5e, 0x68,
+	0x63, 0x2f, 0x7c, 0xcf, 0x7e, 0x61, 0x37, 0xf3, 0xdf, 0xa3, 0x9a, 0xa9, 0x21, 0xe4, 0xe9, 0x48,
+	0x9f, 0xa6, 0xa9, 0x81, 0xb2, 0x44, 0x46, 0xf1, 0x8a, 0x81, 0x51, 0x5c, 0xc7, 0x07, 0xac, 0x65,
+	0xb5, 0xb7, 0xd0, 0xb2, 0xba, 0x36, 0x20, 0xdb, 0x8d, 0x01, 0x19, 0xb3, 0xad, 0x5c, 0x5b, 0xf0,
+	0xb3, 0x80, 0xd6, 0x78, 0x35, 0x55, 0x8e, 0xf4, 0x0c, 0x72, 0x1a, 0xb4, 0xbb, 0x22, 0xc0, 0xf8,
+	0x88, 0xed, 0x59, 0x5c, 0x0c, 0xd7, 0xf3, 0xb1, 0xce, 0x68, 0xd6, 0x76, 0x45, 0x5d, 0xc4, 0xbf,
+	0x61, 0xb7, 0xea, 0x99, 0x7c, 0x0b, 0xf5, 0xd9, 0x1c, 0xd5, 0x5d, 0xf3, 0x1f, 0xd8, 0x9d, 0xba,
+	0xea, 0x79, 0x63, 0x68, 0x45, 0xb5, 0xa1, 0x75, 0x33, 0x21, 0x5f, 0xb3, 0x7b, 0xd5, 0xf1, 0x0f,
+	0x60, 0x26, 0xf0, 0x52, 0x66, 0x32, 0x4f, 0xc0, 0x87, 0x1e, 0x85, 0xd0, 0xf9, 0x5f, 0x11, 0x39,
+	0xa2, 0x08, 0x2e, 0x0c, 0xbc, 0x32, 0x20, 0x2d, 0xc4, 0x8f, 0x59, 0x2f, 0xc1, 0x95, 0x36, 0xbf,
+	0xd6, 0x1c, 0xee, 0x79, 0x19, 0x52, 0x4b, 0xdc, 0xe0, 0x13, 0xd0, 0xf2, 0xdc, 0x48, 0xf7, 0xd0,
+	0x94, 0x2e, 0x78, 0x37, 0x56, 0x3d, 0xa2, 0x09, 0x94, 0x5b, 0xa3, 0xd3, 0x85, 0xab, 0x04, 0xc7,
+	0x67, 0x43, 0x16, 0x3f, 0x60, 0x4c, 0x2f, 0x73, 0xf0, 0x0e, 0x3b, 0x6e, 0xfa, 0x92, 0xe4, 0xd4,
+	0x87, 0x69, 0xb5, 0x95, 0x99, 0x7f, 0xc2, 0x1c, 0x40, 0x69, 0x61, 0x54, 0x02, 0xf4, 0x7c, 0xb5,
+	0x85, 0x03, 0xdc, 0xb0, 0xbb, 0x21, 0xa4, 0xb7, 0x2a, 0x57, 0xe5, 0xd4, 0x47, 0xf5, 0x15, 0xdb,
+	0xbf, 0x24, 0x0c, 0x8d, 0xb0, 0x7a, 0x41, 0x78, 0xea, 0x1f, 0x3e, 0x1f, 0x43, 0xab, 0x11, 0x43,
+	0xf3, 0x7e, 0xed, 0x4f, 0xee, 0xc7, 0x8b, 0x8d, 0x4f, 0x01, 0xd7, 0x7a, 0x56, 0x63, 0xd2, 0x10,
+	0x6e, 0x32, 0xe9, 0x65, 0xff, 0xc5, 0x23, 0x50, 0x31, 0x7d, 0xd0, 0xa9, 0xba, 0x5c, 0xbf, 0xd2,
+	0xf9, 0xa5, 0x9a, 0xc4, 0xb7, 0x59, 0x7b, 0xd3, 0x32, 0xb8, 0xc4, 0x74, 0xeb, 0x22, 0x54, 0xba,
+	0x2e, 0x90, 0xb0, 0x6b, 0x99, 0x2d, 0xc0, 0x9b, 0x73, 0x00, 0x3f, 0x02, 0x73, 0xb4, 0xa3, 0xc0,
+	0xf8, 0xdc, 0x54, 0x98, 0xff, 0x19, 0xb1, 0x9e, 0x80, 0xab, 0xa1, 0x9a, 0xe4, 0x42, 0x2e, 0x47,
+	0xab, 0x1b, 0x8b, 0xb0, 0xd6, 0xaf, 0xad, 0xcf, 0xfa, 0xd5, 0xae, 0xce, 0x60, 0x15, 0x1c, 0x12,
+	0xc0, 0x90, 0x61, 0x55, 0x28, 0x13, 0x5a, 0xcb, 0xa3, 0xcd, 0xef, 0xa6, 0xe3, 0xa6, 0x88, 0xfb,
+	0xdd, 0x50, 0xee, 0xb1, 0xe1, 0x76, 0xbc, 0x0d, 0x6a, 0xb7, 0xdb, 0xac, 0x7d, 0x09, 0x40, 0xdf,
+	0x93, 0xb6, 0xc0, 0x25, 0x4e, 0x9b, 0x1c, 0x96, 0xae, 0xf5, 0xe9, 0xf7, 0xd1, 0x15, 0x1b, 0x01,
+	0x7f, 0xca, 0x0e, 0xdc, 0x9c, 0xad, 0x22, 0xa9, 0xee, 0x16, 0xd5, 0xee, 0xc6, 0xc7, 0xa4, 0xa7,
+	0x8d, 0x7d, 0x63, 0xcc, 0x9b, 0x6b, 0xc8, 0x2d, 0xfe, 0x79, 0x70, 0x6c, 0xcc, 0x75, 0xba, 0xc8,
+	0xc0, 0x2b, 0xd7, 0x24, 0x48, 0x9f, 0xd5, 0x7e, 0xd7, 0x85, 0x5f, 0x61, 0xf4, 0x01, 0xc6, 0xe8,
+	0x90, 0x3f, 0x07, 0xf8, 0xff, 0x58, 0xe7, 0x7d, 0x6e, 0x07, 0xcf, 0x91, 0xcc, 0x54, 0x5a, 0x19,
+	0xde, 0x1c, 0x5c, 0xf3, 0xbf, 0x23, 0xaa, 0x25, 0x57, 0x40, 0xb5, 0xf9, 0x4b, 0xff, 0x13, 0x0c,
+	0x9d, 0xfa, 0x2e, 0xf2, 0xff, 0x93, 0x20, 0x40, 0x53, 0xf8, 0xc6, 0xfa, 0x01, 0x4c, 0xeb, 0x2f,
+	0x1a, 0x6c, 0x61, 0x50, 0x76, 0x3e, 0x1b, 0x94, 0xdb, 0xd5, 0xa0, 0x7c, 0xc8, 0x58, 0xb1, 0x18,
+	0xcf, 0x60, 0x5d, 0x48, 0x15, 0x28, 0xae, 0x49, 0xa8, 0x90, 0xd4, 0xca, 0x3d, 0x04, 0x7b, 0x74,
+	0x8f, 0x0a, 0xd7, 0x72, 0xde, 0x73, 0x77, 0x71, 0x88, 0x7f, 0x87, 0x7c, 0x5f, 0xf9, 0x17, 0x89,
+	0xde, 0x18, 0x7c, 0xbf, 0x95, 0x9d, 0xea, 0x85, 0xf5, 0x53, 0xcb, 0x7f, 0x8c, 0x3e, 0x91, 0xbe,
+	0x7c, 0xf4, 0xcb, 0x83, 0x89, 0xb2, 0xd3, 0xc5, 0xf8, 0x24, 0xd1, 0xf3, 0x67, 0x83, 0x41, 0x92,
+	0x3f, 0xa3, 0x6f, 0xfc, 0x60, 0xf0, 0x8c, 0x7e, 0x1b, 0xe3, 0x6d, 0xfa, 0xb0, 0x0f, 0xfe, 0x09,
+	0x00, 0x00, 0xff, 0xff, 0x9c, 0xe0, 0x98, 0x89, 0x0b, 0x0c, 0x00, 0x00,
 }

vendor/github.com/33cn/chain33/wallet/wallet_proc.go

@@ -80,9 +80,6 @@ func (wallet *Wallet) ProcSignRawTx(unsigned *types.ReqSignRawTx) (string, error
 		return "", err
 	}
 
-	if unsigned.GetNewExecer() != nil {
-		tx.Execer = unsigned.NewExecer
-	}
 	if unsigned.NewToAddr != "" {
 		tx.To = unsigned.NewToAddr
 	}