Merge branch 'master' into trade-localdb

plugin/dapp/guess/executor/guess.go

@@ -20,21 +20,13 @@ func init() {
 	ety.InitFuncList(types.ListMethod(&Guess{}))
 }
 
-type subConfig struct {
-	ParaRemoteGrpcClient string `json:"paraRemoteGrpcClient"`
-}
-
-var cfg subConfig
-
 // Init Guess
 func Init(name string, sub []byte) {
 	driverName := GetName()
 	if name != driverName {
 		panic("system dapp can't be rename")
 	}
-	if sub != nil {
-		types.MustDecode(sub, &cfg)
-	}
+
 	drivers.Register(driverName, newGuessGame, types.GetDappFork(driverName, "Enable"))
 }
 

plugin/dapp/guess/executor/guessdb.go

@@ -5,17 +5,12 @@
 package executor
 
 import (
-	"context"
 	"fmt"
 	"strings"
-	"time"
 
 	"github.com/33cn/chain33/common/db"
 	"github.com/33cn/chain33/common/db/table"
 
-	"github.com/33cn/chain33/client"
-	"google.golang.org/grpc"
-
 	"github.com/33cn/chain33/account"
 	"github.com/33cn/chain33/common"
 	dbm "github.com/33cn/chain33/common/db"
@@ -48,12 +43,6 @@ const (
 
 	//MaxExpireHeight 距离游戏创建区块的最大过期高度差
 	MaxExpireHeight = 1000000
-
-	//grpcRecSize 接收缓冲大小
-	grpcRecSize int = 30 * 1024 * 1024
-
-	//retryNum 失败时的重试次数
-	retryNum = 10
 )
 
 //Action 具体动作执行
@@ -67,9 +56,7 @@ type Action struct {
 	execaddr     string
 	localDB      dbm.KVDB
 	index        int
-	api          client.QueueProtocolAPI
-	conn         *grpc.ClientConn
-	grpcClient   types.Chain33Client
+	mainHeight   int64
 }
 
 //NewAction 生成Action对象
@@ -77,19 +64,6 @@ func NewAction(guess *Guess, tx *types.Transaction, index int) *Action {
 	hash := tx.Hash()
 	fromAddr := tx.From()
 
-	msgRecvOp := grpc.WithMaxMsgSize(grpcRecSize)
-	paraRemoteGrpcClient := types.Conf("config.consensus").GStr("ParaRemoteGrpcClient")
-	if types.IsPara() && paraRemoteGrpcClient == "" {
-		panic("ParaRemoteGrpcClient error")
-	}
-
-	conn, err := grpc.Dial(paraRemoteGrpcClient, grpc.WithInsecure(), msgRecvOp)
-
-	if err != nil {
-		panic(err)
-	}
-	grpcClient := types.NewChain33Client(conn)
-
 	return &Action{
 		coinsAccount: guess.GetCoinsAccount(),
 		db:           guess.GetStateDB(),
@@ -100,9 +74,7 @@ func NewAction(guess *Guess, tx *types.Transaction, index int) *Action {
 		execaddr:     dapp.ExecAddress(string(tx.Execer)),
 		localDB:      guess.GetLocalDB(),
 		index:        index,
-		api:          guess.GetAPI(),
-		conn:         conn,
-		grpcClient:   grpcClient,
+		mainHeight:   guess.GetMainHeight(),
 	}
 }
 
@@ -299,7 +271,7 @@ func (action *Action) readGame(id string) (*gty.GuessGame, error) {
 func (action *Action) newGame(gameID string, start *gty.GuessGameStart) (*gty.GuessGame, error) {
 	game := &gty.GuessGame{
 		GameID: gameID,
-		Status: gty.GuessGameActionStart,
+		Status: gty.GuessGameStatusStart,
 		//StartTime:   action.blocktime,
 		StartTxHash:    gameID,
 		Topic:          start.Topic,
@@ -375,16 +347,7 @@ func (action *Action) GameStart(start *gty.GuessGameStart) (*types.Receipt, erro
 	gameID := common.ToHex(action.txhash)
 	game, _ := action.newGame(gameID, start)
 	game.StartTime = action.blocktime
-	if types.IsPara() {
-		mainHeight := action.GetMainHeightByTxHash(action.txhash)
-		if mainHeight < 0 {
-			logger.Error("GameStart", "mainHeight", mainHeight)
-			return nil, gty.ErrGuessStatus
-		}
-		game.StartHeight = mainHeight
-	} else {
-		game.StartHeight = action.height
-	}
+	game.StartHeight = action.mainHeight
 	game.AdminAddr = action.fromaddr
 	game.PreIndex = 0
 	game.Index = action.getIndex()
@@ -831,18 +794,7 @@ func (action *Action) changeAllAddrIndex(game *gty.GuessGame) {
 
 //refreshStatusByTime 检测游戏是否过期，是否可以下注
 func (action *Action) refreshStatusByTime(game *gty.GuessGame) (canBet bool) {
-
-	var mainHeight int64
-	if types.IsPara() {
-		mainHeight = action.GetMainHeightByTxHash(action.txhash)
-		if mainHeight < 0 {
-			logger.Error("RefreshStatusByTime", "mainHeight err", mainHeight)
-			return true
-		}
-	} else {
-		mainHeight = action.height
-	}
-
+	mainHeight := action.mainHeight
 	//如果完全由管理员驱动状态变化，则除了保护性过期判断外，不需要做其他判断。
 	if game.DrivenByAdmin {
 
@@ -899,18 +851,3 @@ func (action *Action) checkTime(start *gty.GuessGameStart) bool {
 
 	return false
 }
-
-// GetMainHeightByTxHash get Block height
-func (action *Action) GetMainHeightByTxHash(txHash []byte) int64 {
-	for i := 0; i < retryNum; i++ {
-		req := &types.ReqHash{Hash: txHash}
-		txDetail, err := action.grpcClient.QueryTransaction(context.Background(), req)
-		if err != nil {
-			time.Sleep(time.Second)
-		} else {
-			return txDetail.GetHeight()
-		}
-	}
-
-	return -1
-}

plugin/dapp/paracross/cmd/build/testcase.sh

@@ -107,7 +107,7 @@ function para_transfer2account() {
 }
 
 function para_configkey() {
-    tx=$(${1} config config_tx -o add -k "${2}" -v "${3}")
+    tx=$(${1} config config_tx -o add -c "${2}" -v "${3}")
     sign=$(${CLI} wallet sign -k 0xc34b5d9d44ac7b754806f761d3d4d2c4fe5214f6b074c19f069c4f5c2a29c8cc -d "${tx}")
     send=$(${CLI} wallet send -d "${sign}")
     echo "${send}"

plugin/dapp/privacy/autotest/privacy.toml

@@ -10,7 +10,7 @@ dep = ["import1", "import2", "import3"]
 id = "import1"
 command = "account import_key -k 0x88b2fb90411935872f0501dd13345aba19b5fac9b00eb0dddd7df977d4d5477e -l privacy_test1"
 
-#import privacy test addr,17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT
+#import privacy test addr, 17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT
 [[SimpleCase]]
 id = "import2"
 command = "account import_key -k 0xa0c6f46de8d275ce21e935afa5363e9b8a087fe604e05f7a9eef1258dc781c3a -l privacy_test2"
@@ -63,7 +63,7 @@ dep = ["enablePrivacy"]
 #pub2priv
 [[PubToPrivCase]]
 id = "pub2priv1"
-command = "privacy pub2priv -a 99 -f 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -p d736dcff89c2e588d1fc3d44ba956af4d15d0a01eb1aedaf58fcbc2bdd09591fec9fd83ea6eee18c5a0fd8f1d167b1f8b020d8a6203be49f0bf3f410473fc534"
+command = "send privacy pub2priv -a 99 -p d736dcff89c2e588d1fc3d44ba956af4d15d0a01eb1aedaf58fcbc2bdd09591fec9fd83ea6eee18c5a0fd8f1d167b1f8b020d8a6203be49f0bf3f410473fc534 -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 from = "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 to = "17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT"
 amount = "99"
@@ -73,7 +73,7 @@ dep = ["trans1"]
 
 [[PubToPrivCase]]
 id = "pub2priv2"
-command = "privacy pub2priv -a 99 -f 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -p d45063357ab3454cfb7ee87db8f9ca2772d11bd82d4f681ce00ae44fe5929e8fd964867dae1b19b265b7f68d4ad965cfd4a0aaf71580344adf9fce28cfebadab"
+command = "send privacy pub2priv -a 99 -p d45063357ab3454cfb7ee87db8f9ca2772d11bd82d4f681ce00ae44fe5929e8fd964867dae1b19b265b7f68d4ad965cfd4a0aaf71580344adf9fce28cfebadab -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 from = "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 to = "1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt"
 amount = "99"
@@ -83,7 +83,7 @@ dep = ["trans1"]
 
 [[PubToPrivCase]]
 id = "pub2priv3"
-command = "privacy pub2priv -a 199 -f 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -p dda1ae3184c1f4faca5b4e4be3dfea1c5026338764aca1d2c3e8e3c0b0001f4f4d5eb1761cd27dcbf36e2559c66173bc0d46ecc4feb72dee9e60896a696a5a06"
+command = "send privacy pub2priv -a 199 -p dda1ae3184c1f4faca5b4e4be3dfea1c5026338764aca1d2c3e8e3c0b0001f4f4d5eb1761cd27dcbf36e2559c66173bc0d46ecc4feb72dee9e60896a696a5a06 -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 from = "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 to = "12HKLEn6g4FH39yUbHh4EVJWcFo5CXg22d"
 amount = "199"
@@ -94,7 +94,7 @@ dep = ["trans1"]
 #failpub2priv
 [[PubToPrivCase]]
 id = "failpub2priv1"
-command = "privacy pub2priv -a 1000 -f 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -p d736dcff89c2e588d1fc3d44ba956af4d15d0a01eb1aedaf58fcbc2bdd09591fec9fd83ea6eee18c5a0fd8f1d167b1f8b020d8a6203be49f0bf3f410473fc534"
+command = "privacy pub2priv -a 1000 -p d736dcff89c2e588d1fc3d44ba956af4d15d0a01eb1aedaf58fcbc2bdd09591fec9fd83ea6eee18c5a0fd8f1d167b1f8b020d8a6203be49f0bf3f410473fc534 -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 from = "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 to = "17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT"
 amount = "1000"
@@ -105,7 +105,7 @@ fail = true
 
 [[PubToPrivCase]]
 id = "failpub2priv2"
-command = "privacy pub2priv -a 603 -f 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -p d45063357ab3454cfb7ee87db8f9ca2772d11bd82d4f681ce00ae44fe5929e8fd964867dae1b19b265b7f68d4ad965cfd4a0aaf71580344adf9fce28cfebadab"
+command = "privacy pub2priv -a 603 -p d45063357ab3454cfb7ee87db8f9ca2772d11bd82d4f681ce00ae44fe5929e8fd964867dae1b19b265b7f68d4ad965cfd4a0aaf71580344adf9fce28cfebadab -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 from = "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 to = "1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt"
 amount = "603"
@@ -118,7 +118,7 @@ fail = true
 
 [[PrivToPrivCase]]
 id = "priv2priv1"
-command = "privacy priv2priv -a 39 -f 17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT -p 0a9d212b2505aefaa8da370319088bbccfac097b007f52ed71d8133456c8185823c8eac43c5e937953d7b6c8e68b0db1f4f03df4946a29f524875118960a35fb"
+command = "send privacy priv2priv -a 39 -f 17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT -p 0a9d212b2505aefaa8da370319088bbccfac097b007f52ed71d8133456c8185823c8eac43c5e937953d7b6c8e68b0db1f4f03df4946a29f524875118960a35fb -k 17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT"
 from = "17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT"
 to = "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 amount = "39"
@@ -128,7 +128,7 @@ dep = ["pub2priv1"]
 
 [[PrivToPrivCase]]
 id = "priv2priv2"
-command = "privacy priv2priv -a 49 -f 1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt -p 0a9d212b2505aefaa8da370319088bbccfac097b007f52ed71d8133456c8185823c8eac43c5e937953d7b6c8e68b0db1f4f03df4946a29f524875118960a35fb"
+command = "send privacy priv2priv -a 49 -f 1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt -p 0a9d212b2505aefaa8da370319088bbccfac097b007f52ed71d8133456c8185823c8eac43c5e937953d7b6c8e68b0db1f4f03df4946a29f524875118960a35fb -k 1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt"
 from = "1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt"
 to = "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 amount = "49"
@@ -138,7 +138,7 @@ dep = ["pub2priv2"]
 
 [[PrivToPrivCase]]
 id = "priv2priv3"
-command = "privacy priv2priv -a 69 -f 12HKLEn6g4FH39yUbHh4EVJWcFo5CXg22d -p 0a9d212b2505aefaa8da370319088bbccfac097b007f52ed71d8133456c8185823c8eac43c5e937953d7b6c8e68b0db1f4f03df4946a29f524875118960a35fb"
+command = "send privacy priv2priv -a 69 -f 12HKLEn6g4FH39yUbHh4EVJWcFo5CXg22d -p 0a9d212b2505aefaa8da370319088bbccfac097b007f52ed71d8133456c8185823c8eac43c5e937953d7b6c8e68b0db1f4f03df4946a29f524875118960a35fb -k 12HKLEn6g4FH39yUbHh4EVJWcFo5CXg22d"
 from = "12HKLEn6g4FH39yUbHh4EVJWcFo5CXg22d"
 to = "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 amount = "69"
@@ -150,7 +150,7 @@ dep = ["pub2priv3"]
 
 [[PrivToPrivCase]]
 id = "failpriv2priv1"
-command = "privacy priv2priv -a 100 -f 17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT -p 0a9d212b2505aefaa8da370319088bbccfac097b007f52ed71d8133456c8185823c8eac43c5e937953d7b6c8e68b0db1f4f03df4946a29f524875118960a35fb"
+command = "send privacy priv2priv -a 100 -f 17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT -p 0a9d212b2505aefaa8da370319088bbccfac097b007f52ed71d8133456c8185823c8eac43c5e937953d7b6c8e68b0db1f4f03df4946a29f524875118960a35fb -k 17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT"
 from = "17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT"
 to = "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 amount = "100"
@@ -161,7 +161,7 @@ fail = true
 
 [[PrivToPrivCase]]
 id = "failpriv2priv2"
-command = "privacy priv2priv -a 51 -f 1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt -p 0a9d212b2505aefaa8da370319088bbccfac097b007f52ed71d8133456c8185823c8eac43c5e937953d7b6c8e68b0db1f4f03df4946a29f524875118960a35fb"
+command = "send privacy priv2priv -a 51 -f 1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt -p 0a9d212b2505aefaa8da370319088bbccfac097b007f52ed71d8133456c8185823c8eac43c5e937953d7b6c8e68b0db1f4f03df4946a29f524875118960a35fb -k 1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt"
 from = "1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt"
 to = "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 amount = "51"
@@ -174,7 +174,7 @@ fail = true
 
 [[PrivToPubCase]]
 id = "priv2pub1"
-command = "privacy priv2pub -a 48 -f 17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT -t 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
+command = "send privacy priv2pub -a 48 -f 17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT -t 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -k 17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT"
 from = "17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT"
 to = "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 amount = "48"
@@ -184,7 +184,7 @@ dep = ["priv2priv1"]
 
 [[PrivToPubCase]]
 id = "priv2pub2"
-command = "privacy priv2pub -a 48 -f 1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt -t 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
+command = "send privacy priv2pub -a 48 -f 1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt -t 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -k 1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt"
 from = "1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt"
 to = "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 amount = "48"
@@ -194,7 +194,7 @@ dep = ["priv2priv2"]
 
 [[PrivToPubCase]]
 id = "priv2pub3"
-command = "privacy priv2pub -a 69 -f 12HKLEn6g4FH39yUbHh4EVJWcFo5CXg22d -t 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
+command = "send privacy priv2pub -a 69 -f 12HKLEn6g4FH39yUbHh4EVJWcFo5CXg22d -t 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -k 12HKLEn6g4FH39yUbHh4EVJWcFo5CXg22d"
 from = "12HKLEn6g4FH39yUbHh4EVJWcFo5CXg22d"
 to = "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 amount = "69"
@@ -206,7 +206,7 @@ dep = ["priv2priv3"]
 
 [[PrivToPubCase]]
 id = "failpriv2pub1"
-command = "privacy priv2pub -a 100 -f 17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT -t 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
+command = "send privacy priv2pub -a 100 -f 17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT -t 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -k 17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT"
 from = "17UZr5eJVxDRW1gs7rausQwaSUPtvcpxGT"
 to = "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 amount = "100"
@@ -217,7 +217,7 @@ fail = true
 
 [[PrivToPubCase]]
 id = "failpriv2pub2"
-command = "privacy priv2pub -a 3 -f 1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt -t 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
+command = "send privacy priv2pub -a 3 -f 1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt -t 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -k 1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt"
 from = "1D9xKRnLvV2zMtSxSx33ow1GF4pcbLcNRt"
 to = "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 amount = "3"

plugin/dapp/privacy/commands/privacy.go

@@ -36,9 +36,9 @@ func PrivacyCmd() *cobra.Command {
 	cmd.AddCommand(
 		showPrivacyKeyCmd(),
 		showPrivacyAccountSpendCmd(),
-		public2PrivacyCmd(),
-		privacy2PrivacyCmd(),
-		privacy2PublicCmd(),
+		createPub2PrivTxCmd(),
+		createPriv2PrivTxCmd(),
+		createPriv2PubTxCmd(),
 		showAmountsOfUTXOCmd(),
 		showUTXOs4SpecifiedAmountCmd(),
 		createUTXOsCmd(),
@@ -79,38 +79,34 @@ func showPrivacyKey(cmd *cobra.Command, args []string) {
 	ctx.Run()
 }
 
-// public2PrivacyCmd public address to privacy address
-func public2PrivacyCmd() *cobra.Command {
+// CreatePub2PrivTxCmd create a public to privacy transaction
+func createPub2PrivTxCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "pub2priv",
-		Short: "Public to privacy from pubkeypair amout note",
-		Run:   public2Privacy,
+		Short: "Create a public to privacy transaction",
+		Run:   createPub2PrivTx,
 	}
-	public2PrivacyFlag(cmd)
+	createPub2PrivTxFlags(cmd)
 	return cmd
 }
 
-func public2PrivacyFlag(cmd *cobra.Command) {
-	cmd.Flags().StringP("from", "f", "", "from account address")
-	cmd.MarkFlagRequired("from")
-
-	cmd.Flags().StringP("pubkeypair", "p", "", "to view spend public key pair")
+func createPub2PrivTxFlags(cmd *cobra.Command) {
+	cmd.Flags().StringP("pubkeypair", "p", "", "public key pair")
 	cmd.MarkFlagRequired("pubkeypair")
-
-	cmd.Flags().Float64P("amount", "a", 0, "transfer amount")
+	cmd.Flags().Float64P("amount", "a", 0.0, "transfer amount, at most 4 decimal places")
 	cmd.MarkFlagRequired("amount")
 
-	cmd.Flags().StringP("note", "n", "", "transfer note")
+	cmd.Flags().StringP("symbol", "s", "BTY", "token symbol")
+	cmd.Flags().StringP("note", "n", "", "note for transaction")
 	cmd.Flags().Int64P("expire", "", 0, "transfer expire, default one hour")
 	cmd.Flags().IntP("expiretype", "", 1, "0: height  1: time default is 1")
-
 }
 
-func public2Privacy(cmd *cobra.Command, args []string) {
+func createPub2PrivTx(cmd *cobra.Command, args []string) {
 	rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
-	from, _ := cmd.Flags().GetString("from")
 	pubkeypair, _ := cmd.Flags().GetString("pubkeypair")
-	amount, _ := cmd.Flags().GetFloat64("amount")
+	amount := cmdtypes.GetAmountValue(cmd, "amount")
+	tokenname, _ := cmd.Flags().GetString("symbol")
 	note, _ := cmd.Flags().GetString("note")
 	expire, _ := cmd.Flags().GetInt64("expire")
 	expiretype, _ := cmd.Flags().GetInt("expiretype")
@@ -121,62 +117,59 @@ func public2Privacy(cmd *cobra.Command, args []string) {
 		}
 	} else if expiretype == 1 {
 		if expire <= 0 {
-			expire = int64(time.Hour)
+			expire = int64(time.Hour / time.Second)
 		}
 	} else {
 		fmt.Println("Invalid expiretype", expiretype)
 		return
 	}
 
-	amountInt64 := int64(amount*types.InputPrecision) * types.Multiple1E4 //支持4位小数输入，多余的输入将被截断
-	params := pty.ReqPub2Pri{
-		Sender:     from,
-		Pubkeypair: pubkeypair,
-		Amount:     amountInt64,
+	params := types.ReqCreateTransaction{
+		Tokenname:  tokenname,
+		Type:       types.PrivacyTypePublic2Privacy,
+		Amount:     amount,
 		Note:       note,
-		Tokenname:  types.BTY,
+		Pubkeypair: pubkeypair,
 		Expire:     expire,
 	}
-
-	var res rpctypes.ReplyHash
-	ctx := jsonclient.NewRPCCtx(rpcLaddr, "privacy.MakeTxPublic2privacy", params, &res)
-	ctx.Run()
+	ctx := jsonclient.NewRPCCtx(rpcLaddr, "privacy.CreateRawTransaction", params, nil)
+	ctx.RunWithoutMarshal()
 }
 
-// privacy address to privacy address
-func privacy2PrivacyCmd() *cobra.Command {
+// CreatePriv2PrivTxCmd create a privacy to privacy transaction
+func createPriv2PrivTxCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "priv2priv",
-		Short: "Privacy to privacy from toviewpubkey tospendpubkey amout note",
-		Run:   privacy2Privacy,
+		Short: "Create a privacy to privacy transaction",
+		Run:   createPriv2PrivTx,
 	}
-	privacy2PrivacyFlag(cmd)
+	createPriv2PrivTxFlags(cmd)
 	return cmd
 }
 
-func privacy2PrivacyFlag(cmd *cobra.Command) {
-	cmd.Flags().StringP("from", "f", "", "from account address")
-	cmd.MarkFlagRequired("from")
-
-	cmd.Flags().StringP("pubkeypair", "p", "", "to view spend public key pair")
+func createPriv2PrivTxFlags(cmd *cobra.Command) {
+	cmd.Flags().StringP("pubkeypair", "p", "", "public key pair")
 	cmd.MarkFlagRequired("pubkeypair")
-
-	cmd.Flags().Float64P("amount", "a", 0.0, "transfer amount")
+	cmd.Flags().Float64P("amount", "a", 0.0, "transfer amount, at most 4 decimal places")
 	cmd.MarkFlagRequired("amount")
+	cmd.Flags().StringP("from", "f", "", "from address")
+	cmd.MarkFlagRequired("from")
 
-	cmd.Flags().StringP("note", "n", "", "transfer note")
-	cmd.Flags().Int32P("mixcount", "m", defMixCount, "transfer note")
+	cmd.Flags().Int32P("mixcount", "m", defMixCount, "utxo mix count")
+	cmd.Flags().StringP("symbol", "s", "BTY", "token symbol")
+	cmd.Flags().StringP("note", "n", "", "note for transaction")
 	cmd.Flags().Int64P("expire", "", 0, "transfer expire, default one hour")
 	cmd.Flags().IntP("expiretype", "", 1, "0: height  1: time default is 1")
 }
 
-func privacy2Privacy(cmd *cobra.Command, args []string) {
+func createPriv2PrivTx(cmd *cobra.Command, args []string) {
 	rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
-	from, _ := cmd.Flags().GetString("from")
 	pubkeypair, _ := cmd.Flags().GetString("pubkeypair")
-	amount, _ := cmd.Flags().GetFloat64("amount")
-	mixcount, _ := cmd.Flags().GetInt32("mixcount")
+	amount := cmdtypes.GetAmountValue(cmd, "amount")
+	mixCount, _ := cmd.Flags().GetInt32("mixcount")
+	tokenname, _ := cmd.Flags().GetString("symbol")
 	note, _ := cmd.Flags().GetString("note")
+	sender, _ := cmd.Flags().GetString("from")
 	expire, _ := cmd.Flags().GetInt64("expire")
 	expiretype, _ := cmd.Flags().GetInt("expiretype")
 	if expiretype == 0 {
@@ -186,63 +179,60 @@ func privacy2Privacy(cmd *cobra.Command, args []string) {
 		}
 	} else if expiretype == 1 {
 		if expire <= 0 {
-			expire = int64(time.Hour)
+			expire = int64(time.Hour / time.Second)
 		}
 	} else {
 		fmt.Println("Invalid expiretype", expiretype)
 		return
 	}
 
-	amountInt64 := int64(amount*types.InputPrecision) * types.Multiple1E4 //支持4位小数输入，多余的输入将被截断
-	params := pty.ReqPri2Pri{
-		Sender:     from,
-		Pubkeypair: pubkeypair,
-		Amount:     amountInt64,
-		Mixin:      mixcount,
+	params := types.ReqCreateTransaction{
+		Tokenname:  tokenname,
+		Type:       types.PrivacyTypePrivacy2Privacy,
+		Amount:     amount,
 		Note:       note,
-		Tokenname:  types.BTY,
+		Pubkeypair: pubkeypair,
+		From:       sender,
+		Mixcount:   mixCount,
 		Expire:     expire,
 	}
-
-	var res rpctypes.ReplyHash
-	ctx := jsonclient.NewRPCCtx(rpcLaddr, "privacy.MakeTxPrivacy2privacy", params, &res)
-	ctx.Run()
+	ctx := jsonclient.NewRPCCtx(rpcLaddr, "privacy.CreateRawTransaction", params, nil)
+	ctx.RunWithoutMarshal()
 }
 
-// privacy address to public address
-func privacy2PublicCmd() *cobra.Command {
+// CreatePriv2PubTxCmd create a privacy to public transaction
+func createPriv2PubTxCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "priv2pub",
-		Short: "Public to privacy from toviewpubkey tospendpubkey amout note",
-		Run:   privacy2Public,
+		Short: "Create a privacy to public transaction",
+		Run:   createPriv2PubTx,
 	}
-	privacy2Publiclag(cmd)
+	createPriv2PubTxFlags(cmd)
 	return cmd
 }
 
-func privacy2Publiclag(cmd *cobra.Command) {
-	cmd.Flags().StringP("from", "f", "", "from account address")
+func createPriv2PubTxFlags(cmd *cobra.Command) {
+	cmd.Flags().Float64P("amount", "a", 0.0, "transfer amount, at most 4 decimal places")
+	cmd.MarkFlagRequired("amount")
+	cmd.Flags().StringP("from", "f", "", "from address")
 	cmd.MarkFlagRequired("from")
-
-	cmd.Flags().StringP("to", "t", "", "to account address")
+	cmd.Flags().StringP("to", "t", "", "to address")
 	cmd.MarkFlagRequired("to")
 
-	cmd.Flags().Float64P("amount", "a", 0.0, "transfer amount")
-	cmd.MarkFlagRequired("amount")
-
-	cmd.Flags().StringP("note", "n", "", "transfer note")
-	cmd.Flags().Int32P("mixcount", "m", defMixCount, "transfer note")
+	cmd.Flags().Int32P("mixcount", "m", defMixCount, "utxo mix count")
+	cmd.Flags().StringP("symbol", "s", "BTY", "token symbol")
+	cmd.Flags().StringP("note", "n", "", "note for transaction")
 	cmd.Flags().Int64P("expire", "", 0, "transfer expire, default one hour")
 	cmd.Flags().IntP("expiretype", "", 1, "0: height  1: time default is 1")
-
 }
 
-func privacy2Public(cmd *cobra.Command, args []string) {
+func createPriv2PubTx(cmd *cobra.Command, args []string) {
 	rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
+	amount := cmdtypes.GetAmountValue(cmd, "amount")
+	mixCount, _ := cmd.Flags().GetInt32("mixcount")
+	tokenname, _ := cmd.Flags().GetString("symbol")
 	from, _ := cmd.Flags().GetString("from")
 	to, _ := cmd.Flags().GetString("to")
-	amount, _ := cmd.Flags().GetFloat64("amount")
-	mixcount, _ := cmd.Flags().GetInt32("mixcount")
 	note, _ := cmd.Flags().GetString("note")
 	expire, _ := cmd.Flags().GetInt64("expire")
 	expiretype, _ := cmd.Flags().GetInt("expiretype")
@@ -253,27 +243,25 @@ func privacy2Public(cmd *cobra.Command, args []string) {
 		}
 	} else if expiretype == 1 {
 		if expire <= 0 {
-			expire = int64(time.Hour)
+			expire = int64(time.Hour / time.Second)
 		}
 	} else {
 		fmt.Println("Invalid expiretype", expiretype)
 		return
 	}
 
-	amountInt64 := int64(amount*types.InputPrecision) * types.Multiple1E4 //支持4位小数输入，多余的输入将被截断
-	params := pty.ReqPri2Pub{
-		Sender:    from,
-		Receiver:  to,
-		Amount:    amountInt64,
+	params := types.ReqCreateTransaction{
+		Tokenname: tokenname,
+		Type:      types.PrivacyTypePrivacy2Public,
+		Amount:    amount,
 		Note:      note,
-		Tokenname: types.BTY,
-		Mixin:     mixcount,
+		From:      from,
+		To:        to,
+		Mixcount:  mixCount,
 		Expire:    expire,
 	}
-
-	var res rpctypes.ReplyHash
-	ctx := jsonclient.NewRPCCtx(rpcLaddr, "privacy.MakeTxPrivacy2public", params, &res)
-	ctx.Run()
+	ctx := jsonclient.NewRPCCtx(rpcLaddr, "privacy.CreateRawTransaction", params, nil)
+	ctx.RunWithoutMarshal()
 }
 
 func showPrivacyAccountSpendCmd() *cobra.Command {

plugin/dapp/privacy/crypto/ring_signature_crypto.go

@@ -22,6 +22,7 @@ import (
 
 func init() {
 	crypto.Register(privacytypes.SignNameRing, &RingSignED25519{})
+	crypto.RegisterType(privacytypes.SignNameRing, privacytypes.RingBaseonED25519)
 }
 
 // RingSignature 环签名中对于crypto.Signature接口实现
@@ -156,7 +157,7 @@ func (pubkey *RingSignPublicKey) VerifyBytes(msg []byte, sign crypto.Signature)
 		return false
 	}
 	tx := new(types.Transaction)
-	if err := types.Decode(msg, tx); err != nil || !bytes.Equal([]byte(privacytypes.PrivacyX), tx.Execer) {
+	if err := types.Decode(msg, tx); err != nil || !bytes.Equal([]byte(privacytypes.PrivacyX), types.GetRealExecName(tx.Execer)) {
 		// 目前只有隐私交易用到了环签名
 		return false
 	}

plugin/dapp/privacy/executor/exec.go

@@ -102,7 +102,7 @@ func (p *privacy) Exec_Privacy2Public(payload *ty.Privacy2Public, tx *types.Tran
 	}
 	txhashstr := hex.EncodeToString(tx.Hash())
 	coinsAccount := p.GetCoinsAccount()
-	receipt, err := coinsAccount.ExecDeposit(tx.To, address.ExecAddress(string(tx.Execer)), payload.Amount)
+	receipt, err := coinsAccount.ExecDeposit(payload.To, address.ExecAddress(string(tx.Execer)), payload.Amount)
 	if err != nil {
 		privacylog.Error("PrivacyTrading Exec", "ActionPrivacy2Public txhash", txhashstr, "ExecDeposit error ", err)
 		return nil, err

plugin/dapp/privacy/executor/privacy.go

@@ -273,16 +273,20 @@ func (p *privacy) CheckTx(tx *types.Transaction, index int) error {
 		totalOutput += output.Amount
 	}
 
-	var feeAmount int64
-	if action.Ty == pty.ActionPrivacy2Privacy {
-		feeAmount = totalInput - totalOutput
-	} else {
-		feeAmount = totalInput - totalOutput - amount
-	}
+	//平行链下的隐私交易，utxo不需要燃烧，fee只收取主链的bty，和utxo无关联
+	if !types.IsPara() {
+
+		var feeAmount int64
+		if action.Ty == pty.ActionPrivacy2Privacy {
+			feeAmount = totalInput - totalOutput
+		} else {
+			feeAmount = totalInput - totalOutput - amount
+		}
 
-	if feeAmount < pty.PrivacyTxFee {
-		privacylog.Error("PrivacyTrading CheckTx", "txhash", txhashstr, "fee available:", feeAmount, "required:", pty.PrivacyTxFee)
-		return pty.ErrPrivacyTxFeeNotEnough
+		if feeAmount < pty.PrivacyTxFee {
+			privacylog.Error("PrivacyTrading CheckTx", "txhash", txhashstr, "fee available:", feeAmount, "required:", pty.PrivacyTxFee)
+			return pty.ErrPrivacyTxFeeNotEnough
+		}
 	}
 	return nil
 }

plugin/dapp/privacy/proto/privacy.proto

@@ -38,6 +38,7 @@ message Privacy2Public {
     string        tokenname = 1;
     int64         amount    = 2;
     string        note      = 3;
+    string        to        = 6;
     PrivacyInput  input     = 4;
     PrivacyOutput output    = 5;
 }
@@ -193,49 +194,6 @@ message PrivacyAction4Print {
     int32 ty = 4;
 }
 
-message ReqPub2Pri {
-    //接收人可见公钥A
-    // string viewPublic  = 1;
-    //接收人花费公钥B
-    // string spendPublic = 2;
-    string tokenname = 3;
-    int64  amount    = 4;
-    string note      = 5;
-    //发送人地址
-    string sender     = 6;
-    int32  mixin      = 7;
-    string pubkeypair = 8;
-    int64  expire     = 9;
-}
-
-message ReqPri2Pri {
-    //接收人可见公钥A
-    // string viewPublic  = 1; //A
-    //接收人花费公钥B
-    // string spendPublic = 2; //B
-    string tokenname = 3;
-    int64  amount    = 4;
-    string note      = 5;
-    //隐私交易发起人地址
-    string sender = 6;
-    int32  mixin  = 7;
-    //	string txhash      = 7;
-    string pubkeypair = 8;
-    int64  expire     = 9;
-}
-
-message ReqPri2Pub {
-    string receiver  = 1;
-    string tokenname = 2;
-    int64  amount    = 3;
-    string note      = 4;
-    //隐私交易发起人地址
-    string sender = 5;
-    int32  mixin  = 6;
-    //	string txhash     = 6;
-    int64 expire = 7;
-}
-
 message ReqCreateUTXOs {
     // string viewPublic  = 1; //接收人可见公钥A
     // string spendPublic = 2; //接收人花费公钥B
@@ -456,12 +414,6 @@ service privacy {
     rpc ShowPrivacyKey(ReqString) returns (ReplyPrivacyPkPair) {}
     // 创建一系列UTXO
     rpc CreateUTXOs(ReqCreateUTXOs) returns (Reply) {}
-    // 将资金从公开到隐私转移
-    rpc MakeTxPublic2Privacy(ReqPub2Pri) returns (Reply) {}
-    // 将资产从隐私到隐私进行转移
-    rpc MakeTxPrivacy2Privacy(ReqPri2Pri) returns (Reply) {}
-    // 将资产从隐私到公开进行转移
-    rpc MakeTxPrivacy2Public(ReqPri2Pub) returns (Reply) {}
     // 扫描UTXO以及获取扫描UTXO后的状态
     rpc RescanUtxos(ReqRescanUtxos) returns (RepRescanUtxos) {}
     // 使能隐私账户

plugin/dapp/privacy/rpc/rpc.go

@@ -33,33 +33,6 @@ func (g *channelClient) CreateUTXOs(ctx context.Context, in *pty.ReqCreateUTXOs)
 	return data.(*types.Reply), nil
 }
 
-// 将资金从公开到隐私转移
-func (g *channelClient) MakeTxPublic2Privacy(ctx context.Context, in *pty.ReqPub2Pri) (*types.Reply, error) {
-	data, err := g.ExecWalletFunc(pty.PrivacyX, "Public2Privacy", in)
-	if err != nil {
-		return nil, err
-	}
-	return data.(*types.Reply), nil
-}
-
-// 将资产从隐私到隐私进行转移
-func (g *channelClient) MakeTxPrivacy2Privacy(ctx context.Context, in *pty.ReqPri2Pri) (*types.Reply, error) {
-	data, err := g.ExecWalletFunc(pty.PrivacyX, "Privacy2Privacy", in)
-	if err != nil {
-		return nil, err
-	}
-	return data.(*types.Reply), nil
-}
-
-// 将资产从隐私到公开进行转移
-func (g *channelClient) MakeTxPrivacy2Public(ctx context.Context, in *pty.ReqPri2Pub) (*types.Reply, error) {
-	data, err := g.ExecWalletFunc(pty.PrivacyX, "Privacy2Public", in)
-	if err != nil {
-		return nil, err
-	}
-	return data.(*types.Reply), nil
-}
-
 // 扫描UTXO以及获取扫描UTXO后的状态
 func (g *channelClient) RescanUtxos(ctx context.Context, in *pty.ReqRescanUtxos) (*pty.RepRescanUtxos, error) {
 	data, err := g.ExecWalletFunc(pty.PrivacyX, "RescanUtxos", in)
@@ -122,41 +95,6 @@ func (c *Jrpc) ShowPrivacykey(in *types.ReqString, result *json.RawMessage) erro
 	return err
 }
 
-// MakeTxPublic2privacy create public to privacy trasaction for json rpc
-func (c *Jrpc) MakeTxPublic2privacy(in *pty.ReqPub2Pri, result *interface{}) error {
-	reply, err := c.cli.MakeTxPublic2Privacy(context.Background(), in)
-	if err != nil {
-		return err
-	}
-
-	*result = rpctypes.ReplyHash{Hash: common.ToHex(reply.GetMsg())}
-
-	return nil
-}
-
-// MakeTxPrivacy2privacy create privacy to privacy transaction
-func (c *Jrpc) MakeTxPrivacy2privacy(in *pty.ReqPri2Pri, result *interface{}) error {
-	reply, err := c.cli.MakeTxPrivacy2Privacy(context.Background(), in)
-	if err != nil {
-		return err
-	}
-
-	*result = rpctypes.ReplyHash{Hash: common.ToHex(reply.GetMsg())}
-
-	return nil
-}
-
-// MakeTxPrivacy2public make privacy to public trasaction
-func (c *Jrpc) MakeTxPrivacy2public(in *pty.ReqPri2Pub, result *interface{}) error {
-	reply, err := c.cli.MakeTxPrivacy2Public(context.Background(), in)
-	if err != nil {
-		return err
-	}
-	*result = rpctypes.ReplyHash{Hash: common.ToHex(reply.GetMsg())}
-
-	return nil
-}
-
 // CreateUTXOs create utxos for json rpc
 func (c *Jrpc) CreateUTXOs(in *pty.ReqCreateUTXOs, result *interface{}) error {
 

plugin/dapp/privacy/rpc/rpc_channel_test.go

@@ -45,10 +45,6 @@ func TestRPCChannel(t *testing.T) {
 		{fn: testShowPrivacyKey},
 		{fn: testShowPrivacyAccountInfo},
 		{fn: testShowPrivacyAccountSpend},
-		{fn: testPublic2Privacy},
-		{fn: testPrivacy2Privacy},
-		{fn: testPrivacy2Public},
-		{fn: testPrivacy2Public},
 		{fn: testShowAmountsOfUTXO},
 		{fn: testShowUTXOs4SpecifiedAmount},
 		{fn: testCreateUTXOs},
@@ -98,51 +94,6 @@ func testShowPrivacyAccountSpend(t *testing.T, jrpc *jsonclient.JSONClient) erro
 	return err
 }
 
-func testPublic2Privacy(t *testing.T, jrpc *jsonclient.JSONClient) error {
-	params := pty.ReqPub2Pri{
-		Sender:     "13cS5G1BDN2YfGudsxRxr7X25yu6ZdgxMU",
-		Pubkeypair: "92fe6cfec2e19cd15f203f83b5d440ddb63d0cb71559f96dc81208d819fea85886b08f6e874fca15108d244b40f9086d8c03260d4b954a40dfb3cbe41ebc7389",
-		Amount:     1234,
-		Note:       "for test",
-		Tokenname:  types.BTY,
-		Expire:     int64(time.Hour),
-	}
-	var res rpctypes.ReplyHash
-	err := jrpc.Call("privacy.MakeTxPublic2privacy", params, &res)
-	return err
-}
-
-func testPrivacy2Privacy(t *testing.T, jrpc *jsonclient.JSONClient) error {
-	params := pty.ReqPri2Pri{
-		Sender:     "13cS5G1BDN2YfGudsxRxr7X25yu6ZdgxMU",
-		Pubkeypair: "92fe6cfec2e19cd15f203f83b5d440ddb63d0cb71559f96dc81208d819fea85886b08f6e874fca15108d244b40f9086d8c03260d4b954a40dfb3cbe41ebc7389",
-		Amount:     234567,
-		Mixin:      16,
-		Note:       "for test",
-		Tokenname:  types.BTY,
-		Expire:     int64(time.Hour),
-	}
-	var res rpctypes.ReplyHash
-	err := jrpc.Call("privacy.MakeTxPrivacy2privacy", params, &res)
-	return err
-}
-
-func testPrivacy2Public(t *testing.T, jrpc *jsonclient.JSONClient) error {
-	params := pty.ReqPri2Pub{
-		Sender:    "13cS5G1BDN2YfGudsxRxr7X25yu6ZdgxMU",
-		Receiver:  "1EDDghAtgBsamrNEtNmYdQzC1QEhLkr87t",
-		Amount:    123456,
-		Note:      "for test",
-		Tokenname: types.BTY,
-		Mixin:     16,
-		Expire:    int64(time.Hour),
-	}
-
-	var res rpctypes.ReplyHash
-	err := jrpc.Call("privacy.MakeTxPrivacy2public", params, &res)
-	return err
-}
-
 func testShowAmountsOfUTXO(t *testing.T, jrpc *jsonclient.JSONClient) error {
 	reqPrivacyToken := pty.ReqPrivacyToken{Token: types.BTY}
 	var params rpctypes.Query4Jrpc

plugin/dapp/privacy/types/privacy.pb.go

@@ -353,6 +353,7 @@ type Privacy2Public struct {
 	Tokenname            string         `protobuf:"bytes,1,opt,name=tokenname,proto3" json:"tokenname,omitempty"`
 	Amount               int64          `protobuf:"varint,2,opt,name=amount,proto3" json:"amount,omitempty"`
 	Note                 string         `protobuf:"bytes,3,opt,name=note,proto3" json:"note,omitempty"`
+	To                   string         `protobuf:"bytes,6,opt,name=to,proto3" json:"to,omitempty"`
 	Input                *PrivacyInput  `protobuf:"bytes,4,opt,name=input,proto3" json:"input,omitempty"`
 	Output               *PrivacyOutput `protobuf:"bytes,5,opt,name=output,proto3" json:"output,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
@@ -406,6 +407,13 @@ func (m *Privacy2Public) GetNote() string {
 	return ""
 }
 
+func (m *Privacy2Public) GetTo() string {
+	if m != nil {
+		return m.To
+	}
+	return ""
+}
+
 func (m *Privacy2Public) GetInput() *PrivacyInput {
 	if m != nil {
 		return m.Input
@@ -1877,280 +1885,6 @@ func _PrivacyAction4Print_OneofSizer(msg proto.Message) (n int) {
 	return n
 }
 
-type ReqPub2Pri struct {
-	//接收人可见公钥A
-	// string viewPublic  = 1;
-	//接收人花费公钥B
-	// string spendPublic = 2;
-	Tokenname string `protobuf:"bytes,3,opt,name=tokenname,proto3" json:"tokenname,omitempty"`
-	Amount    int64  `protobuf:"varint,4,opt,name=amount,proto3" json:"amount,omitempty"`
-	Note      string `protobuf:"bytes,5,opt,name=note,proto3" json:"note,omitempty"`
-	//发送人地址
-	Sender               string   `protobuf:"bytes,6,opt,name=sender,proto3" json:"sender,omitempty"`
-	Mixin                int32    `protobuf:"varint,7,opt,name=mixin,proto3" json:"mixin,omitempty"`
-	Pubkeypair           string   `protobuf:"bytes,8,opt,name=pubkeypair,proto3" json:"pubkeypair,omitempty"`
-	Expire               int64    `protobuf:"varint,9,opt,name=expire,proto3" json:"expire,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *ReqPub2Pri) Reset()         { *m = ReqPub2Pri{} }
-func (m *ReqPub2Pri) String() string { return proto.CompactTextString(m) }
-func (*ReqPub2Pri) ProtoMessage()    {}
-func (*ReqPub2Pri) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{31}
-}
-
-func (m *ReqPub2Pri) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ReqPub2Pri.Unmarshal(m, b)
-}
-func (m *ReqPub2Pri) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ReqPub2Pri.Marshal(b, m, deterministic)
-}
-func (m *ReqPub2Pri) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReqPub2Pri.Merge(m, src)
-}
-func (m *ReqPub2Pri) XXX_Size() int {
-	return xxx_messageInfo_ReqPub2Pri.Size(m)
-}
-func (m *ReqPub2Pri) XXX_DiscardUnknown() {
-	xxx_messageInfo_ReqPub2Pri.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ReqPub2Pri proto.InternalMessageInfo
-
-func (m *ReqPub2Pri) GetTokenname() string {
-	if m != nil {
-		return m.Tokenname
-	}
-	return ""
-}
-
-func (m *ReqPub2Pri) GetAmount() int64 {
-	if m != nil {
-		return m.Amount
-	}
-	return 0
-}
-
-func (m *ReqPub2Pri) GetNote() string {
-	if m != nil {
-		return m.Note
-	}
-	return ""
-}
-
-func (m *ReqPub2Pri) GetSender() string {
-	if m != nil {
-		return m.Sender
-	}
-	return ""
-}
-
-func (m *ReqPub2Pri) GetMixin() int32 {
-	if m != nil {
-		return m.Mixin
-	}
-	return 0
-}
-
-func (m *ReqPub2Pri) GetPubkeypair() string {
-	if m != nil {
-		return m.Pubkeypair
-	}
-	return ""
-}
-
-func (m *ReqPub2Pri) GetExpire() int64 {
-	if m != nil {
-		return m.Expire
-	}
-	return 0
-}
-
-type ReqPri2Pri struct {
-	//接收人可见公钥A
-	// string viewPublic  = 1; //A
-	//接收人花费公钥B
-	// string spendPublic = 2; //B
-	Tokenname string `protobuf:"bytes,3,opt,name=tokenname,proto3" json:"tokenname,omitempty"`
-	Amount    int64  `protobuf:"varint,4,opt,name=amount,proto3" json:"amount,omitempty"`
-	Note      string `protobuf:"bytes,5,opt,name=note,proto3" json:"note,omitempty"`
-	//隐私交易发起人地址
-	Sender string `protobuf:"bytes,6,opt,name=sender,proto3" json:"sender,omitempty"`
-	Mixin  int32  `protobuf:"varint,7,opt,name=mixin,proto3" json:"mixin,omitempty"`
-	//	string txhash      = 7;
-	Pubkeypair           string   `protobuf:"bytes,8,opt,name=pubkeypair,proto3" json:"pubkeypair,omitempty"`
-	Expire               int64    `protobuf:"varint,9,opt,name=expire,proto3" json:"expire,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *ReqPri2Pri) Reset()         { *m = ReqPri2Pri{} }
-func (m *ReqPri2Pri) String() string { return proto.CompactTextString(m) }
-func (*ReqPri2Pri) ProtoMessage()    {}
-func (*ReqPri2Pri) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{32}
-}
-
-func (m *ReqPri2Pri) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ReqPri2Pri.Unmarshal(m, b)
-}
-func (m *ReqPri2Pri) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ReqPri2Pri.Marshal(b, m, deterministic)
-}
-func (m *ReqPri2Pri) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReqPri2Pri.Merge(m, src)
-}
-func (m *ReqPri2Pri) XXX_Size() int {
-	return xxx_messageInfo_ReqPri2Pri.Size(m)
-}
-func (m *ReqPri2Pri) XXX_DiscardUnknown() {
-	xxx_messageInfo_ReqPri2Pri.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ReqPri2Pri proto.InternalMessageInfo
-
-func (m *ReqPri2Pri) GetTokenname() string {
-	if m != nil {
-		return m.Tokenname
-	}
-	return ""
-}
-
-func (m *ReqPri2Pri) GetAmount() int64 {
-	if m != nil {
-		return m.Amount
-	}
-	return 0
-}
-
-func (m *ReqPri2Pri) GetNote() string {
-	if m != nil {
-		return m.Note
-	}
-	return ""
-}
-
-func (m *ReqPri2Pri) GetSender() string {
-	if m != nil {
-		return m.Sender
-	}
-	return ""
-}
-
-func (m *ReqPri2Pri) GetMixin() int32 {
-	if m != nil {
-		return m.Mixin
-	}
-	return 0
-}
-
-func (m *ReqPri2Pri) GetPubkeypair() string {
-	if m != nil {
-		return m.Pubkeypair
-	}
-	return ""
-}
-
-func (m *ReqPri2Pri) GetExpire() int64 {
-	if m != nil {
-		return m.Expire
-	}
-	return 0
-}
-
-type ReqPri2Pub struct {
-	Receiver  string `protobuf:"bytes,1,opt,name=receiver,proto3" json:"receiver,omitempty"`
-	Tokenname string `protobuf:"bytes,2,opt,name=tokenname,proto3" json:"tokenname,omitempty"`
-	Amount    int64  `protobuf:"varint,3,opt,name=amount,proto3" json:"amount,omitempty"`
-	Note      string `protobuf:"bytes,4,opt,name=note,proto3" json:"note,omitempty"`
-	//隐私交易发起人地址
-	Sender string `protobuf:"bytes,5,opt,name=sender,proto3" json:"sender,omitempty"`
-	Mixin  int32  `protobuf:"varint,6,opt,name=mixin,proto3" json:"mixin,omitempty"`
-	//	string txhash     = 6;
-	Expire               int64    `protobuf:"varint,7,opt,name=expire,proto3" json:"expire,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *ReqPri2Pub) Reset()         { *m = ReqPri2Pub{} }
-func (m *ReqPri2Pub) String() string { return proto.CompactTextString(m) }
-func (*ReqPri2Pub) ProtoMessage()    {}
-func (*ReqPri2Pub) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{33}
-}
-
-func (m *ReqPri2Pub) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ReqPri2Pub.Unmarshal(m, b)
-}
-func (m *ReqPri2Pub) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ReqPri2Pub.Marshal(b, m, deterministic)
-}
-func (m *ReqPri2Pub) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReqPri2Pub.Merge(m, src)
-}
-func (m *ReqPri2Pub) XXX_Size() int {
-	return xxx_messageInfo_ReqPri2Pub.Size(m)
-}
-func (m *ReqPri2Pub) XXX_DiscardUnknown() {
-	xxx_messageInfo_ReqPri2Pub.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ReqPri2Pub proto.InternalMessageInfo
-
-func (m *ReqPri2Pub) GetReceiver() string {
-	if m != nil {
-		return m.Receiver
-	}
-	return ""
-}
-
-func (m *ReqPri2Pub) GetTokenname() string {
-	if m != nil {
-		return m.Tokenname
-	}
-	return ""
-}
-
-func (m *ReqPri2Pub) GetAmount() int64 {
-	if m != nil {
-		return m.Amount
-	}
-	return 0
-}
-
-func (m *ReqPri2Pub) GetNote() string {
-	if m != nil {
-		return m.Note
-	}
-	return ""
-}
-
-func (m *ReqPri2Pub) GetSender() string {
-	if m != nil {
-		return m.Sender
-	}
-	return ""
-}
-
-func (m *ReqPri2Pub) GetMixin() int32 {
-	if m != nil {
-		return m.Mixin
-	}
-	return 0
-}
-
-func (m *ReqPri2Pub) GetExpire() int64 {
-	if m != nil {
-		return m.Expire
-	}
-	return 0
-}
-
 type ReqCreateUTXOs struct {
 	// string viewPublic  = 1; //接收人可见公钥A
 	// string spendPublic = 2; //接收人花费公钥B
@@ -2170,7 +1904,7 @@ func (m *ReqCreateUTXOs) Reset()         { *m = ReqCreateUTXOs{} }
 func (m *ReqCreateUTXOs) String() string { return proto.CompactTextString(m) }
 func (*ReqCreateUTXOs) ProtoMessage()    {}
 func (*ReqCreateUTXOs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{34}
+	return fileDescriptor_dde03d4df7a6e99a, []int{31}
 }
 
 func (m *ReqCreateUTXOs) XXX_Unmarshal(b []byte) error {
@@ -2254,7 +1988,7 @@ func (m *ReplyPrivacyPkPair) Reset()         { *m = ReplyPrivacyPkPair{} }
 func (m *ReplyPrivacyPkPair) String() string { return proto.CompactTextString(m) }
 func (*ReplyPrivacyPkPair) ProtoMessage()    {}
 func (*ReplyPrivacyPkPair) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{35}
+	return fileDescriptor_dde03d4df7a6e99a, []int{32}
 }
 
 func (m *ReplyPrivacyPkPair) XXX_Unmarshal(b []byte) error {
@@ -2301,7 +2035,7 @@ func (m *ReqPrivBal4AddrToken) Reset()         { *m = ReqPrivBal4AddrToken{} }
 func (m *ReqPrivBal4AddrToken) String() string { return proto.CompactTextString(m) }
 func (*ReqPrivBal4AddrToken) ProtoMessage()    {}
 func (*ReqPrivBal4AddrToken) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{36}
+	return fileDescriptor_dde03d4df7a6e99a, []int{33}
 }
 
 func (m *ReqPrivBal4AddrToken) XXX_Unmarshal(b []byte) error {
@@ -2348,7 +2082,7 @@ func (m *ReplyPrivacyBalance) Reset()         { *m = ReplyPrivacyBalance{} }
 func (m *ReplyPrivacyBalance) String() string { return proto.CompactTextString(m) }
 func (*ReplyPrivacyBalance) ProtoMessage()    {}
 func (*ReplyPrivacyBalance) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{37}
+	return fileDescriptor_dde03d4df7a6e99a, []int{34}
 }
 
 func (m *ReplyPrivacyBalance) XXX_Unmarshal(b []byte) error {
@@ -2403,7 +2137,7 @@ func (m *PrivacyDBStore) Reset()         { *m = PrivacyDBStore{} }
 func (m *PrivacyDBStore) String() string { return proto.CompactTextString(m) }
 func (*PrivacyDBStore) ProtoMessage()    {}
 func (*PrivacyDBStore) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{38}
+	return fileDescriptor_dde03d4df7a6e99a, []int{35}
 }
 
 func (m *PrivacyDBStore) XXX_Unmarshal(b []byte) error {
@@ -2506,7 +2240,7 @@ func (m *UTXO) Reset()         { *m = UTXO{} }
 func (m *UTXO) String() string { return proto.CompactTextString(m) }
 func (*UTXO) ProtoMessage()    {}
 func (*UTXO) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{39}
+	return fileDescriptor_dde03d4df7a6e99a, []int{36}
 }
 
 func (m *UTXO) XXX_Unmarshal(b []byte) error {
@@ -2554,7 +2288,7 @@ func (m *UTXOHaveTxHash) Reset()         { *m = UTXOHaveTxHash{} }
 func (m *UTXOHaveTxHash) String() string { return proto.CompactTextString(m) }
 func (*UTXOHaveTxHash) ProtoMessage()    {}
 func (*UTXOHaveTxHash) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{40}
+	return fileDescriptor_dde03d4df7a6e99a, []int{37}
 }
 
 func (m *UTXOHaveTxHash) XXX_Unmarshal(b []byte) error {
@@ -2607,7 +2341,7 @@ func (m *UTXOs) Reset()         { *m = UTXOs{} }
 func (m *UTXOs) String() string { return proto.CompactTextString(m) }
 func (*UTXOs) ProtoMessage()    {}
 func (*UTXOs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{41}
+	return fileDescriptor_dde03d4df7a6e99a, []int{38}
 }
 
 func (m *UTXOs) XXX_Unmarshal(b []byte) error {
@@ -2646,7 +2380,7 @@ func (m *UTXOHaveTxHashs) Reset()         { *m = UTXOHaveTxHashs{} }
 func (m *UTXOHaveTxHashs) String() string { return proto.CompactTextString(m) }
 func (*UTXOHaveTxHashs) ProtoMessage()    {}
 func (*UTXOHaveTxHashs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{42}
+	return fileDescriptor_dde03d4df7a6e99a, []int{39}
 }
 
 func (m *UTXOHaveTxHashs) XXX_Unmarshal(b []byte) error {
@@ -2687,7 +2421,7 @@ func (m *ReqUTXOGlobalIndex) Reset()         { *m = ReqUTXOGlobalIndex{} }
 func (m *ReqUTXOGlobalIndex) String() string { return proto.CompactTextString(m) }
 func (*ReqUTXOGlobalIndex) ProtoMessage()    {}
 func (*ReqUTXOGlobalIndex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{43}
+	return fileDescriptor_dde03d4df7a6e99a, []int{40}
 }
 
 func (m *ReqUTXOGlobalIndex) XXX_Unmarshal(b []byte) error {
@@ -2741,7 +2475,7 @@ func (m *UTXOBasic) Reset()         { *m = UTXOBasic{} }
 func (m *UTXOBasic) String() string { return proto.CompactTextString(m) }
 func (*UTXOBasic) ProtoMessage()    {}
 func (*UTXOBasic) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{44}
+	return fileDescriptor_dde03d4df7a6e99a, []int{41}
 }
 
 func (m *UTXOBasic) XXX_Unmarshal(b []byte) error {
@@ -2788,7 +2522,7 @@ func (m *UTXOIndex4Amount) Reset()         { *m = UTXOIndex4Amount{} }
 func (m *UTXOIndex4Amount) String() string { return proto.CompactTextString(m) }
 func (*UTXOIndex4Amount) ProtoMessage()    {}
 func (*UTXOIndex4Amount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{45}
+	return fileDescriptor_dde03d4df7a6e99a, []int{42}
 }
 
 func (m *UTXOIndex4Amount) XXX_Unmarshal(b []byte) error {
@@ -2836,7 +2570,7 @@ func (m *ResUTXOGlobalIndex) Reset()         { *m = ResUTXOGlobalIndex{} }
 func (m *ResUTXOGlobalIndex) String() string { return proto.CompactTextString(m) }
 func (*ResUTXOGlobalIndex) ProtoMessage()    {}
 func (*ResUTXOGlobalIndex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{46}
+	return fileDescriptor_dde03d4df7a6e99a, []int{43}
 }
 
 func (m *ResUTXOGlobalIndex) XXX_Unmarshal(b []byte) error {
@@ -2894,7 +2628,7 @@ func (m *FTXOsSTXOsInOneTx) Reset()         { *m = FTXOsSTXOsInOneTx{} }
 func (m *FTXOsSTXOsInOneTx) String() string { return proto.CompactTextString(m) }
 func (*FTXOsSTXOsInOneTx) ProtoMessage()    {}
 func (*FTXOsSTXOsInOneTx) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{47}
+	return fileDescriptor_dde03d4df7a6e99a, []int{44}
 }
 
 func (m *FTXOsSTXOsInOneTx) XXX_Unmarshal(b []byte) error {
@@ -2962,7 +2696,7 @@ func (m *RealKeyInput) Reset()         { *m = RealKeyInput{} }
 func (m *RealKeyInput) String() string { return proto.CompactTextString(m) }
 func (*RealKeyInput) ProtoMessage()    {}
 func (*RealKeyInput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{48}
+	return fileDescriptor_dde03d4df7a6e99a, []int{45}
 }
 
 func (m *RealKeyInput) XXX_Unmarshal(b []byte) error {
@@ -3008,7 +2742,7 @@ func (m *UTXOBasics) Reset()         { *m = UTXOBasics{} }
 func (m *UTXOBasics) String() string { return proto.CompactTextString(m) }
 func (*UTXOBasics) ProtoMessage()    {}
 func (*UTXOBasics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{49}
+	return fileDescriptor_dde03d4df7a6e99a, []int{46}
 }
 
 func (m *UTXOBasics) XXX_Unmarshal(b []byte) error {
@@ -3061,7 +2795,7 @@ func (m *CreateTransactionCache) Reset()         { *m = CreateTransactionCache{}
 func (m *CreateTransactionCache) String() string { return proto.CompactTextString(m) }
 func (*CreateTransactionCache) ProtoMessage()    {}
 func (*CreateTransactionCache) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{50}
+	return fileDescriptor_dde03d4df7a6e99a, []int{47}
 }
 
 func (m *CreateTransactionCache) XXX_Unmarshal(b []byte) error {
@@ -3157,7 +2891,7 @@ func (m *ReqCacheTxList) Reset()         { *m = ReqCacheTxList{} }
 func (m *ReqCacheTxList) String() string { return proto.CompactTextString(m) }
 func (*ReqCacheTxList) ProtoMessage()    {}
 func (*ReqCacheTxList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{51}
+	return fileDescriptor_dde03d4df7a6e99a, []int{48}
 }
 
 func (m *ReqCacheTxList) XXX_Unmarshal(b []byte) error {
@@ -3203,7 +2937,7 @@ func (m *ReplyCacheTxList) Reset()         { *m = ReplyCacheTxList{} }
 func (m *ReplyCacheTxList) String() string { return proto.CompactTextString(m) }
 func (*ReplyCacheTxList) ProtoMessage()    {}
 func (*ReplyCacheTxList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{52}
+	return fileDescriptor_dde03d4df7a6e99a, []int{49}
 }
 
 func (m *ReplyCacheTxList) XXX_Unmarshal(b []byte) error {
@@ -3243,7 +2977,7 @@ func (m *ReqPrivacyAccount) Reset()         { *m = ReqPrivacyAccount{} }
 func (m *ReqPrivacyAccount) String() string { return proto.CompactTextString(m) }
 func (*ReqPrivacyAccount) ProtoMessage()    {}
 func (*ReqPrivacyAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{53}
+	return fileDescriptor_dde03d4df7a6e99a, []int{50}
 }
 
 func (m *ReqPrivacyAccount) XXX_Unmarshal(b []byte) error {
@@ -3296,7 +3030,7 @@ func (m *ReqPPrivacyAccount) Reset()         { *m = ReqPPrivacyAccount{} }
 func (m *ReqPPrivacyAccount) String() string { return proto.CompactTextString(m) }
 func (*ReqPPrivacyAccount) ProtoMessage()    {}
 func (*ReqPPrivacyAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{54}
+	return fileDescriptor_dde03d4df7a6e99a, []int{51}
 }
 
 func (m *ReqPPrivacyAccount) XXX_Unmarshal(b []byte) error {
@@ -3354,7 +3088,7 @@ func (m *ReplyPrivacyAccount) Reset()         { *m = ReplyPrivacyAccount{} }
 func (m *ReplyPrivacyAccount) String() string { return proto.CompactTextString(m) }
 func (*ReplyPrivacyAccount) ProtoMessage()    {}
 func (*ReplyPrivacyAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{55}
+	return fileDescriptor_dde03d4df7a6e99a, []int{52}
 }
 
 func (m *ReplyPrivacyAccount) XXX_Unmarshal(b []byte) error {
@@ -3408,7 +3142,7 @@ func (m *ReqCreateCacheTxKey) Reset()         { *m = ReqCreateCacheTxKey{} }
 func (m *ReqCreateCacheTxKey) String() string { return proto.CompactTextString(m) }
 func (*ReqCreateCacheTxKey) ProtoMessage()    {}
 func (*ReqCreateCacheTxKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{56}
+	return fileDescriptor_dde03d4df7a6e99a, []int{53}
 }
 
 func (m *ReqCreateCacheTxKey) XXX_Unmarshal(b []byte) error {
@@ -3463,7 +3197,7 @@ func (m *ReqPrivacyTransactionList) Reset()         { *m = ReqPrivacyTransaction
 func (m *ReqPrivacyTransactionList) String() string { return proto.CompactTextString(m) }
 func (*ReqPrivacyTransactionList) ProtoMessage()    {}
 func (*ReqPrivacyTransactionList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{57}
+	return fileDescriptor_dde03d4df7a6e99a, []int{54}
 }
 
 func (m *ReqPrivacyTransactionList) XXX_Unmarshal(b []byte) error {
@@ -3545,7 +3279,7 @@ func (m *ReqRescanUtxos) Reset()         { *m = ReqRescanUtxos{} }
 func (m *ReqRescanUtxos) String() string { return proto.CompactTextString(m) }
 func (*ReqRescanUtxos) ProtoMessage()    {}
 func (*ReqRescanUtxos) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{58}
+	return fileDescriptor_dde03d4df7a6e99a, []int{55}
 }
 
 func (m *ReqRescanUtxos) XXX_Unmarshal(b []byte) error {
@@ -3592,7 +3326,7 @@ func (m *RepRescanResult) Reset()         { *m = RepRescanResult{} }
 func (m *RepRescanResult) String() string { return proto.CompactTextString(m) }
 func (*RepRescanResult) ProtoMessage()    {}
 func (*RepRescanResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{59}
+	return fileDescriptor_dde03d4df7a6e99a, []int{56}
 }
 
 func (m *RepRescanResult) XXX_Unmarshal(b []byte) error {
@@ -3639,7 +3373,7 @@ func (m *RepRescanUtxos) Reset()         { *m = RepRescanUtxos{} }
 func (m *RepRescanUtxos) String() string { return proto.CompactTextString(m) }
 func (*RepRescanUtxos) ProtoMessage()    {}
 func (*RepRescanUtxos) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{60}
+	return fileDescriptor_dde03d4df7a6e99a, []int{57}
 }
 
 func (m *RepRescanUtxos) XXX_Unmarshal(b []byte) error {
@@ -3685,7 +3419,7 @@ func (m *ReqEnablePrivacy) Reset()         { *m = ReqEnablePrivacy{} }
 func (m *ReqEnablePrivacy) String() string { return proto.CompactTextString(m) }
 func (*ReqEnablePrivacy) ProtoMessage()    {}
 func (*ReqEnablePrivacy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{61}
+	return fileDescriptor_dde03d4df7a6e99a, []int{58}
 }
 
 func (m *ReqEnablePrivacy) XXX_Unmarshal(b []byte) error {
@@ -3726,7 +3460,7 @@ func (m *PriAddrResult) Reset()         { *m = PriAddrResult{} }
 func (m *PriAddrResult) String() string { return proto.CompactTextString(m) }
 func (*PriAddrResult) ProtoMessage()    {}
 func (*PriAddrResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{62}
+	return fileDescriptor_dde03d4df7a6e99a, []int{59}
 }
 
 func (m *PriAddrResult) XXX_Unmarshal(b []byte) error {
@@ -3779,7 +3513,7 @@ func (m *RepEnablePrivacy) Reset()         { *m = RepEnablePrivacy{} }
 func (m *RepEnablePrivacy) String() string { return proto.CompactTextString(m) }
 func (*RepEnablePrivacy) ProtoMessage()    {}
 func (*RepEnablePrivacy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{63}
+	return fileDescriptor_dde03d4df7a6e99a, []int{60}
 }
 
 func (m *RepEnablePrivacy) XXX_Unmarshal(b []byte) error {
@@ -3821,7 +3555,7 @@ func (m *PrivacySignatureParam) Reset()         { *m = PrivacySignatureParam{} }
 func (m *PrivacySignatureParam) String() string { return proto.CompactTextString(m) }
 func (*PrivacySignatureParam) ProtoMessage()    {}
 func (*PrivacySignatureParam) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{64}
+	return fileDescriptor_dde03d4df7a6e99a, []int{61}
 }
 
 func (m *PrivacySignatureParam) XXX_Unmarshal(b []byte) error {
@@ -3877,7 +3611,7 @@ func (m *WalletAccountPrivacy) Reset()         { *m = WalletAccountPrivacy{} }
 func (m *WalletAccountPrivacy) String() string { return proto.CompactTextString(m) }
 func (*WalletAccountPrivacy) ProtoMessage()    {}
 func (*WalletAccountPrivacy) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dde03d4df7a6e99a, []int{65}
+	return fileDescriptor_dde03d4df7a6e99a, []int{62}
 }
 
 func (m *WalletAccountPrivacy) XXX_Unmarshal(b []byte) error {
@@ -3960,9 +3694,6 @@ func init() {
 	proto.RegisterType((*Privacy2Privacy4Print)(nil), "types.Privacy2Privacy4Print")
 	proto.RegisterType((*Privacy2Public4Print)(nil), "types.Privacy2Public4Print")
 	proto.RegisterType((*PrivacyAction4Print)(nil), "types.PrivacyAction4Print")
-	proto.RegisterType((*ReqPub2Pri)(nil), "types.ReqPub2Pri")
-	proto.RegisterType((*ReqPri2Pri)(nil), "types.ReqPri2Pri")
-	proto.RegisterType((*ReqPri2Pub)(nil), "types.ReqPri2Pub")
 	proto.RegisterType((*ReqCreateUTXOs)(nil), "types.ReqCreateUTXOs")
 	proto.RegisterType((*ReplyPrivacyPkPair)(nil), "types.ReplyPrivacyPkPair")
 	proto.RegisterType((*ReqPrivBal4AddrToken)(nil), "types.ReqPrivBal4AddrToken")
@@ -4000,157 +3731,150 @@ func init() {
 func init() { proto.RegisterFile("privacy.proto", fileDescriptor_dde03d4df7a6e99a) }
 
 var fileDescriptor_dde03d4df7a6e99a = []byte{
-	// 2393 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4f, 0x6f, 0x1c, 0x49,
-	0x15, 0x77, 0xcf, 0x1f, 0xdb, 0xfd, 0x3c, 0xb6, 0x27, 0x9d, 0xb1, 0x77, 0x32, 0x89, 0xa2, 0x50,
-	0xbb, 0x0a, 0x61, 0x41, 0x46, 0x6b, 0x2c, 0xed, 0x26, 0x04, 0x65, 0x3d, 0x8e, 0x93, 0x8c, 0xbc,
-	0x89, 0x4d, 0x79, 0x56, 0x20, 0xb4, 0x48, 0xd4, 0xcc, 0x94, 0xed, 0x96, 0x7b, 0xba, 0xdb, 0xdd,
-	0x3d, 0xf6, 0xcc, 0x69, 0xe1, 0x82, 0x38, 0x70, 0x40, 0x02, 0x71, 0x01, 0x71, 0xe3, 0x8e, 0x04,
-	0x07, 0x0e, 0x1c, 0xb8, 0xc0, 0x89, 0xef, 0xc0, 0x37, 0xe0, 0x33, 0xa0, 0xfa, 0xd3, 0xdd, 0x55,
-	0x35, 0x3d, 0xb6, 0x13, 0x0c, 0x12, 0x17, 0x6b, 0xea, 0xd5, 0xab, 0x57, 0xbf, 0xf7, 0xea, 0xbd,
-	0x57, 0xef, 0x55, 0x1b, 0x96, 0xc3, 0xc8, 0x3d, 0x27, 0xfd, 0xc9, 0x46, 0x18, 0x05, 0x49, 0xe0,
-	0x54, 0x93, 0x49, 0x48, 0xe3, 0x56, 0xad, 0x1f, 0x0c, 0x87, 0x81, 0x2f, 0x88, 0xad, 0x5b, 0x49,
-	0x44, 0xfc, 0x98, 0xf4, 0x13, 0x37, 0x23, 0xd5, 0x2e, 0x88, 0xe7, 0xd1, 0x44, 0x8c, 0xd0, 0xbf,
-	0x2c, 0x58, 0x3e, 0x10, 0x72, 0xb6, 0x39, 0x97, 0xf3, 0x0c, 0x56, 0xc2, 0x51, 0xcf, 0x73, 0xfb,
-	0x9b, 0x52, 0x7e, 0xd3, 0x7a, 0x60, 0x3d, 0x5a, 0xda, 0x5c, 0xdb, 0xe0, 0x1b, 0x6c, 0x1c, 0x88,
-	0x49, 0xb9, 0xe8, 0xd5, 0x1c, 0x36, 0xd8, 0x9d, 0x36, 0xac, 0xca, 0x9f, 0x99, 0x84, 0x12, 0x97,
-	0xb0, 0x9e, 0x4a, 0x90, 0xb3, 0xb9, 0x08, 0x73, 0x01, 0x07, 0x91, 0x92, 0xb8, 0xf4, 0x66, 0x59,
-	0x07, 0x91, 0x8a, 0xe0, 0x93, 0x1c, 0x84, 0xc6, 0xee, 0xac, 0x40, 0x29, 0x99, 0x34, 0x2b, 0x0f,
-	0xac, 0x47, 0x55, 0x5c, 0x4a, 0x26, 0xed, 0x05, 0xa8, 0x9e, 0x13, 0x6f, 0x44, 0xd1, 0xcf, 0x2c,
-	0x58, 0xd1, 0x55, 0x70, 0xee, 0x81, 0x9d, 0x04, 0xa7, 0xd4, 0xf7, 0xc9, 0x90, 0x72, 0x65, 0x6d,
-	0x9c, 0x13, 0x9c, 0x75, 0x98, 0x27, 0xc3, 0x60, 0xe4, 0x27, 0x5c, 0x8b, 0x32, 0x96, 0x23, 0xc7,
-	0x81, 0x8a, 0x1f, 0x24, 0xb4, 0x59, 0xe5, 0x0b, 0xf8, 0x6f, 0xe7, 0x1b, 0x30, 0x1f, 0x8c, 0x92,
-	0x70, 0x94, 0x34, 0x17, 0x38, 0xdc, 0x86, 0x0e, 0x77, 0x9f, 0xcf, 0x61, 0xc9, 0x83, 0xfe, 0x64,
-	0xc1, 0xaa, 0x61, 0x8b, 0x1b, 0xc4, 0xf2, 0x35, 0xa8, 0xba, 0x3e, 0x83, 0x32, 0xcf, 0xa1, 0xdc,
-	0xd6, 0xa1, 0x74, 0xd8, 0x14, 0x16, 0x1c, 0x6f, 0x09, 0xfb, 0x8f, 0xcc, 0x82, 0x9a, 0xfd, 0xff,
-	0x43, 0xd4, 0xe5, 0x22, 0xd4, 0x95, 0xb7, 0x40, 0x5d, 0xbd, 0x06, 0xea, 0x5d, 0x58, 0xfd, 0xbc,
-	0xfb, 0xfd, 0xfd, 0x97, 0x5e, 0xd0, 0x23, 0x5e, 0xc7, 0x1f, 0xd0, 0x31, 0xc3, 0x95, 0x8c, 0x4f,
-	0x48, 0x7c, 0xc2, 0x11, 0xd4, 0xb0, 0x1c, 0x39, 0x2d, 0x58, 0x0c, 0x46, 0x89, 0xcb, 0x78, 0xa4,
-	0x07, 0x65, 0x63, 0xf4, 0x63, 0x0b, 0x16, 0xf7, 0xa8, 0x00, 0xa2, 0x28, 0x66, 0x69, 0x8a, 0x7d,
-	0x0a, 0xab, 0xa3, 0x64, 0x1c, 0x28, 0x7b, 0x35, 0x4b, 0x0f, 0xca, 0x4a, 0x04, 0x18, 0x48, 0xb0,
-	0xc9, 0xce, 0x20, 0x9c, 0xd2, 0x49, 0x67, 0x48, 0x8e, 0xa9, 0x04, 0x97, 0x8d, 0xd1, 0xb7, 0xa1,
-	0xa6, 0x9a, 0xc3, 0xf9, 0x3a, 0xe7, 0x15, 0x56, 0xb3, 0xf8, 0x36, 0xab, 0x72, 0x9b, 0x14, 0x28,
-	0xce, 0x18, 0x50, 0x07, 0xec, 0x53, 0x2a, 0x6d, 0x33, 0x13, 0xff, 0x07, 0xb0, 0x1c, 0xf8, 0x34,
-	0x71, 0x87, 0x34, 0x1c, 0xf5, 0x4e, 0xa9, 0x88, 0xdf, 0x1a, 0xd6, 0x89, 0xe8, 0x87, 0x59, 0xe6,
-	0x90, 0xe2, 0xee, 0x81, 0x8d, 0xc3, 0x51, 0x6f, 0x8f, 0x4e, 0x92, 0x31, 0x97, 0x58, 0xc3, 0x39,
-	0xc1, 0xd9, 0xe0, 0x3b, 0xcb, 0x13, 0x13, 0xe6, 0xa8, 0x4b, 0x9c, 0x19, 0x22, 0x9c, 0xb3, 0xa0,
-	0x10, 0x1a, 0x2f, 0xa3, 0x60, 0x14, 0x16, 0x9c, 0xda, 0x7f, 0xc7, 0xe8, 0xe8, 0x37, 0x16, 0x2c,
-	0x7f, 0x16, 0xf4, 0x89, 0xc7, 0x38, 0x3b, 0x09, 0x1d, 0xb2, 0xbd, 0x4e, 0xa8, 0x7b, 0x7c, 0x92,
-	0xed, 0x25, 0x46, 0x4e, 0x13, 0x16, 0x92, 0xb1, 0x2b, 0xf7, 0x60, 0x0e, 0x92, 0x0e, 0x35, 0xdf,
-	0x29, 0xeb, 0xbe, 0xa3, 0xf8, 0x5b, 0x45, 0xf3, 0xb7, 0x29, 0x73, 0x57, 0x8b, 0xcc, 0xfd, 0x25,
-	0xac, 0x60, 0x7a, 0xc6, 0xa0, 0x1d, 0x70, 0x93, 0xc6, 0x59, 0xd4, 0xbd, 0x31, 0xa3, 0x8e, 0x11,
-	0x9c, 0x7d, 0x68, 0x1c, 0x17, 0xd8, 0x4f, 0x1a, 0xe5, 0xae, 0x34, 0x4a, 0x91, 0x89, 0x71, 0xe1,
-	0x42, 0xf4, 0x3e, 0x2c, 0x8b, 0x70, 0xdf, 0xa3, 0x93, 0xe7, 0x24, 0x21, 0x2c, 0x7e, 0x07, 0x24,
-	0x21, 0xdc, 0xe9, 0x6a, 0x98, 0xff, 0x46, 0xdb, 0xb0, 0x9a, 0x89, 0x14, 0x38, 0x67, 0x1e, 0xd8,
-	0x3a, 0xcc, 0x67, 0xee, 0xc5, 0x04, 0xc8, 0x11, 0xea, 0x32, 0x45, 0x63, 0x55, 0xd1, 0x36, 0xd4,
-	0x8f, 0x75, 0xa1, 0xb1, 0xf4, 0xf4, 0x75, 0x53, 0x0d, 0x31, 0x8d, 0xa7, 0xf8, 0xd1, 0x33, 0x58,
-	0xc5, 0xf4, 0x4c, 0x3a, 0x6c, 0x97, 0x59, 0xc9, 0x69, 0x40, 0x95, 0x9b, 0x4b, 0xda, 0x4e, 0x0c,
-	0x66, 0x65, 0x2b, 0xf4, 0x14, 0x6a, 0xdb, 0xfc, 0xd7, 0x73, 0x9a, 0x10, 0xd7, 0x9b, 0xa9, 0x56,
-	0x03, 0xaa, 0x7d, 0x65, 0xb9, 0x18, 0xa0, 0x37, 0x70, 0x1b, 0xd3, 0xd0, 0x9b, 0xa4, 0x77, 0x2d,
-	0xe7, 0x8d, 0x9d, 0x8f, 0xa1, 0x46, 0x14, 0xa1, 0x52, 0xab, 0x34, 0xeb, 0xa9, 0xfb, 0x61, 0x8d,
-	0x11, 0x61, 0x70, 0x22, 0x26, 0x8f, 0xa9, 0x18, 0xef, 0x1f, 0x09, 0x4e, 0xe7, 0x29, 0xac, 0x78,
-	0xaa, 0x03, 0xa7, 0x66, 0x4a, 0x53, 0xa3, 0xe6, 0xdd, 0xd8, 0xe0, 0x45, 0x5f, 0x40, 0x03, 0xd3,
-	0x3e, 0x75, 0xc3, 0x44, 0x8f, 0xeb, 0x62, 0x3b, 0xbd, 0x6d, 0x3c, 0xff, 0xc2, 0x82, 0x65, 0xa9,
-	0xf6, 0xfe, 0x11, 0xdb, 0xd4, 0xd9, 0x06, 0x5b, 0xe8, 0xf4, 0x9a, 0x84, 0x12, 0xe8, 0xfb, 0x9a,
-	0xe6, 0x92, 0x51, 0x8e, 0x5e, 0x93, 0x70, 0xd7, 0x4f, 0xa2, 0x09, 0xce, 0x57, 0xb5, 0x9e, 0xc2,
-	0x8a, 0x3e, 0xe9, 0xd4, 0xa1, 0xcc, 0x5c, 0x4a, 0x9c, 0x09, 0xfb, 0xc9, 0xe0, 0xf3, 0xab, 0x3f,
-	0x3d, 0x10, 0x3e, 0x78, 0x52, 0xfa, 0xc4, 0x42, 0xbf, 0xb6, 0xa0, 0xde, 0x4d, 0x03, 0x26, 0x45,
-	0xf5, 0x5c, 0x46, 0x55, 0x9c, 0xa3, 0x7a, 0x28, 0x51, 0x99, 0xbc, 0x82, 0x10, 0xe7, 0xc0, 0xb2,
-	0x85, 0x0c, 0x98, 0x3e, 0xa9, 0x02, 0xb3, 0x0b, 0x80, 0xd9, 0x2a, 0xb0, 0x3d, 0x58, 0x33, 0xa2,
-	0x6f, 0xeb, 0x20, 0x72, 0x45, 0xcc, 0xc8, 0x14, 0x22, 0xe4, 0x14, 0x5d, 0x59, 0x25, 0xe3, 0xca,
-	0xfa, 0xb9, 0x05, 0x2b, 0xe9, 0x4d, 0x90, 0x8b, 0x29, 0xf4, 0xdd, 0x17, 0xb3, 0x72, 0xe8, 0xbd,
-	0xe2, 0x1c, 0x2a, 0xc4, 0x5d, 0x7d, 0x7d, 0xd9, 0xca, 0xf5, 0xb5, 0x0f, 0xab, 0x99, 0x7f, 0x5c,
-	0x01, 0xa7, 0xf0, 0x1e, 0xb2, 0xcd, 0xc4, 0xf8, 0x12, 0x1c, 0xf5, 0x3e, 0x94, 0x32, 0x3f, 0x9a,
-	0xba, 0x15, 0xd7, 0x8c, 0x5b, 0x51, 0x82, 0xcf, 0xef, 0x46, 0x17, 0x6e, 0x6b, 0x8e, 0x2f, 0x25,
-	0x4d, 0x5d, 0x6b, 0xb6, 0x7a, 0xad, 0x6d, 0x4d, 0x87, 0xc1, 0xba, 0x19, 0x06, 0x72, 0x27, 0x25,
-	0x18, 0x7e, 0x65, 0x41, 0x43, 0xaf, 0x42, 0xf3, 0xcd, 0x6e, 0xa8, 0xfe, 0xdb, 0x34, 0x8a, 0xba,
-	0x56, 0x51, 0x79, 0x24, 0x91, 0xa5, 0x45, 0xd2, 0xdf, 0x2d, 0x58, 0x33, 0x2a, 0xd2, 0x1b, 0xc7,
-	0xf5, 0x4d, 0xbd, 0x2e, 0xbd, 0x53, 0x50, 0xe1, 0x49, 0x54, 0xb2, 0xce, 0x7b, 0x17, 0x45, 0xfe,
-	0xc6, 0xec, 0xab, 0xd5, 0xa8, 0x37, 0xa2, 0x47, 0xb9, 0x48, 0x8f, 0xca, 0x5b, 0xeb, 0x51, 0xbd,
-	0xb6, 0x1e, 0x3f, 0x2d, 0x65, 0x3e, 0x29, 0xda, 0x33, 0xa9, 0xc6, 0xee, 0x8c, 0x26, 0xed, 0x6e,
-	0x61, 0x93, 0x26, 0x16, 0x15, 0xb4, 0x6a, 0xaf, 0x66, 0xb5, 0x6a, 0xf7, 0x8a, 0x5b, 0xb5, 0x4c,
-	0xd0, 0x54, 0xc3, 0xb6, 0x3b, 0xa3, 0x61, 0xbb, 0x5b, 0xd8, 0xb0, 0x29, 0x80, 0xae, 0xd9, 0xb6,
-	0xfd, 0xc5, 0x02, 0x60, 0xf7, 0xf7, 0xa8, 0xc7, 0xb0, 0xe8, 0xc7, 0x58, 0x9e, 0x7d, 0x8c, 0x95,
-	0x2b, 0xdd, 0x71, 0x1d, 0xe6, 0x63, 0xea, 0x0f, 0x68, 0xc4, 0xfd, 0xd1, 0xc6, 0x72, 0xc4, 0x92,
-	0xf3, 0xd0, 0x1d, 0xbb, 0x3e, 0x77, 0xba, 0x2a, 0x16, 0x03, 0xe7, 0x3e, 0x80, 0xc8, 0x3a, 0x21,
-	0x71, 0xa3, 0xe6, 0x22, 0x5f, 0xa1, 0x50, 0x98, 0x34, 0x3a, 0x0e, 0xdd, 0x88, 0x36, 0x6d, 0xb1,
-	0xb3, 0x18, 0x65, 0xf0, 0x23, 0xf7, 0xff, 0x12, 0xfe, 0x9f, 0x15, 0xf8, 0xa3, 0x1e, 0x4b, 0xef,
-	0x11, 0x2b, 0x14, 0xce, 0x69, 0x24, 0x63, 0x28, 0x1b, 0xeb, 0xaa, 0x95, 0x66, 0xab, 0x56, 0x2e,
-	0x54, 0xad, 0x52, 0xa8, 0x5a, 0xb5, 0x58, 0xb5, 0x79, 0x55, 0xb5, 0x1c, 0xfa, 0x82, 0x06, 0xfd,
-	0xaf, 0x16, 0xaf, 0x9b, 0x77, 0x22, 0x4a, 0x12, 0xca, 0xab, 0xa5, 0xff, 0x8d, 0xf5, 0x45, 0x0d,
-	0x28, 0xad, 0xcf, 0x07, 0xef, 0x6c, 0xfd, 0x2f, 0xc0, 0x51, 0x6b, 0xc7, 0x83, 0xd3, 0x03, 0xc6,
-	0xfd, 0x10, 0x56, 0xe2, 0x93, 0xe0, 0xe2, 0x70, 0xd4, 0xef, 0xd3, 0x38, 0x3e, 0x1a, 0x79, 0xfc,
-	0x28, 0x16, 0xb1, 0x41, 0x35, 0x76, 0xad, 0x98, 0xbb, 0xa2, 0x4f, 0x59, 0xd5, 0xc7, 0x0b, 0xe3,
-	0x36, 0xf1, 0xb6, 0xb6, 0x07, 0x83, 0x48, 0x54, 0xc7, 0x0e, 0x54, 0xc8, 0x60, 0x90, 0x1e, 0x30,
-	0xff, 0x9d, 0x57, 0x82, 0x25, 0xa5, 0x12, 0x44, 0xdf, 0xd5, 0x6b, 0xdb, 0x36, 0xf1, 0x88, 0xdf,
-	0xa7, 0xce, 0x03, 0x58, 0x92, 0x17, 0xb5, 0x22, 0x47, 0x25, 0xb1, 0x36, 0xaa, 0x27, 0x98, 0x65,
-	0xbe, 0x4d, 0x87, 0xe8, 0x0f, 0xa5, 0xec, 0x8d, 0xe1, 0x79, 0xfb, 0x30, 0x09, 0x22, 0x6a, 0x94,
-	0x3e, 0x79, 0xf7, 0xf4, 0x6e, 0x0e, 0x27, 0x0a, 0xa6, 0x8e, 0xd1, 0xe3, 0x8b, 0xea, 0x05, 0x41,
-	0x2d, 0x19, 0x67, 0xad, 0x0e, 0x96, 0xed, 0x98, 0x46, 0x73, 0x3e, 0x84, 0xba, 0xd4, 0x24, 0x23,
-	0x72, 0x1f, 0xa8, 0xe1, 0x29, 0x3a, 0xb3, 0x5a, 0x70, 0xe1, 0xd3, 0x88, 0x7b, 0x83, 0x8d, 0xc5,
-	0x40, 0xe9, 0x2d, 0x17, 0x67, 0xf5, 0x96, 0xb6, 0xde, 0x5b, 0xde, 0x03, 0xbb, 0xe7, 0x05, 0xfd,
-	0x53, 0x6e, 0x04, 0x10, 0xfd, 0x75, 0x46, 0x40, 0x6f, 0xa0, 0xc2, 0xeb, 0xd7, 0x59, 0xc5, 0xd4,
-	0x06, 0xd8, 0xac, 0x4c, 0x6b, 0x93, 0xd8, 0xed, 0xcb, 0x2c, 0x5f, 0x57, 0xaa, 0x3a, 0x4e, 0xc7,
-	0x39, 0x0b, 0x0a, 0x61, 0x85, 0xd1, 0x5f, 0x91, 0x73, 0xda, 0x1d, 0xbf, 0x62, 0x96, 0xbe, 0xa4,
-	0x91, 0x4b, 0x38, 0x87, 0x34, 0xbf, 0x1c, 0xe9, 0x3b, 0x96, 0xaf, 0xde, 0xf1, 0x43, 0xa8, 0x8a,
-	0x00, 0xfd, 0x0a, 0x54, 0x19, 0x35, 0xed, 0x5e, 0x96, 0x94, 0x45, 0x58, 0xcc, 0x20, 0x2c, 0x9e,
-	0x73, 0x72, 0x74, 0xb1, 0xf3, 0x4c, 0x14, 0xaf, 0x0a, 0xc9, 0x28, 0xfc, 0xf4, 0x05, 0xd8, 0xe4,
-	0x46, 0x47, 0x2c, 0xce, 0xce, 0xcc, 0xf7, 0x86, 0xcb, 0x2b, 0x86, 0x16, 0x2c, 0x0e, 0xdd, 0xf1,
-	0x4e, 0x56, 0x33, 0x54, 0x71, 0x36, 0xd6, 0x7c, 0xaf, 0xac, 0x74, 0x92, 0x31, 0xd8, 0x99, 0xfe,
-	0x45, 0xcf, 0x16, 0x96, 0xf6, 0x5a, 0x7a, 0xe5, 0x5b, 0x51, 0x5e, 0x25, 0x1f, 0x14, 0xbd, 0xd6,
-	0x08, 0x22, 0xc2, 0x50, 0xe7, 0x9d, 0x1e, 0x2f, 0xdb, 0xb7, 0x87, 0x06, 0x40, 0xfd, 0x40, 0x1f,
-	0xa6, 0xf6, 0xd7, 0xdb, 0xba, 0xfc, 0xd0, 0xe4, 0x21, 0xfc, 0xd2, 0x62, 0x16, 0x8b, 0x6f, 0xce,
-	0x62, 0x3b, 0x50, 0x67, 0x92, 0x55, 0x90, 0xdc, 0x76, 0x4b, 0x9b, 0xef, 0x29, 0x18, 0xd4, 0x69,
-	0x3c, 0xb5, 0x00, 0xfd, 0xd6, 0x82, 0x5b, 0x2f, 0x98, 0x1f, 0x1d, 0xb2, 0x3f, 0x1d, 0x7f, 0xdf,
-	0xa7, 0xdd, 0xf1, 0xd5, 0x85, 0x9f, 0x4c, 0xe4, 0x25, 0x2d, 0x91, 0xe7, 0x29, 0xb9, 0xac, 0xa6,
-	0x64, 0xe3, 0x29, 0x27, 0xef, 0xc3, 0x32, 0xcf, 0xad, 0xce, 0xf4, 0xdc, 0x1f, 0x40, 0x0d, 0x53,
-	0xe2, 0x65, 0x8f, 0x88, 0x08, 0x6a, 0x11, 0x25, 0x1e, 0xaf, 0x11, 0xd3, 0x06, 0xb1, 0x8a, 0x35,
-	0x1a, 0xcb, 0xf5, 0x69, 0xcf, 0x13, 0xb9, 0xe7, 0xf9, 0x19, 0x1b, 0x54, 0xb4, 0x05, 0x90, 0x1d,
-	0x52, 0x9c, 0x1f, 0xa3, 0x75, 0xf9, 0x31, 0xfe, 0xa3, 0x04, 0xeb, 0xe2, 0x7e, 0xec, 0xe6, 0x5f,
-	0x0b, 0x76, 0x48, 0xff, 0x84, 0xaa, 0x4d, 0x6b, 0x4d, 0x34, 0xad, 0xf7, 0x01, 0xfa, 0x9c, 0x97,
-	0xed, 0x2b, 0xd3, 0xb6, 0x42, 0x61, 0xc7, 0x1b, 0xbb, 0xc7, 0x3e, 0x9f, 0x15, 0x36, 0xcb, 0xc6,
-	0xdc, 0xca, 0x09, 0x49, 0x46, 0xb1, 0x4c, 0xb9, 0x72, 0xe4, 0x6c, 0xc1, 0x92, 0xf2, 0x9d, 0x42,
-	0x96, 0xc7, 0x4e, 0xda, 0x74, 0xe7, 0x33, 0x58, 0x65, 0x9b, 0x79, 0xf9, 0x7e, 0x2c, 0x0c, 0x9a,
-	0x75, 0x7f, 0x0b, 0xda, 0x9b, 0x8a, 0x6a, 0x7b, 0xac, 0x31, 0x3a, 0x5f, 0x4d, 0xed, 0xb5, 0xc8,
-	0x57, 0xdc, 0x32, 0xed, 0x15, 0x4b, 0x83, 0xe9, 0xbe, 0x64, 0x1b, 0xbe, 0x84, 0xda, 0xa2, 0xe0,
-	0x60, 0xf6, 0xeb, 0x8e, 0x3f, 0x73, 0xe3, 0xa4, 0xf0, 0x2a, 0xbd, 0xf4, 0xda, 0x42, 0x9f, 0x40,
-	0x9d, 0x5f, 0xa9, 0xaa, 0x94, 0x0f, 0xa0, 0x9c, 0x8c, 0xd3, 0xc3, 0x2c, 0xb2, 0x0e, 0x9b, 0x46,
-	0xbb, 0x70, 0x2b, 0x7f, 0xe7, 0xda, 0xee, 0x8b, 0xca, 0xe3, 0x72, 0xe7, 0x4f, 0xe1, 0x95, 0x72,
-	0x78, 0xe8, 0x47, 0x3c, 0x17, 0x1e, 0x18, 0x72, 0xae, 0x5d, 0x13, 0xb0, 0xcb, 0x7f, 0xe0, 0xc6,
-	0xa1, 0x47, 0x26, 0xc3, 0x60, 0x40, 0xe5, 0x53, 0xa8, 0x4a, 0x42, 0x5f, 0x1a, 0x2f, 0x62, 0x72,
-	0x0b, 0x94, 0x3b, 0x2d, 0xf3, 0x82, 0x9a, 0x72, 0x08, 0x99, 0xfd, 0x11, 0x54, 0x8f, 0x64, 0x7e,
-	0x2a, 0xe0, 0xe1, 0x53, 0xd7, 0x00, 0xf0, 0x9a, 0x01, 0x90, 0x85, 0xa1, 0xb4, 0x33, 0xbb, 0xad,
-	0x2f, 0xb7, 0x55, 0x13, 0x16, 0x58, 0xa0, 0xe7, 0x21, 0x98, 0x0e, 0xd1, 0x3f, 0x2d, 0xb8, 0xa3,
-	0xbc, 0x30, 0xe6, 0xe7, 0xc2, 0x0f, 0xef, 0x72, 0xa9, 0x08, 0x6a, 0xcc, 0x79, 0x31, 0xed, 0x9f,
-	0xbf, 0xf0, 0xc8, 0xb1, 0xcc, 0x8b, 0x1a, 0x8d, 0x49, 0x18, 0xb8, 0x11, 0x15, 0x21, 0x22, 0xd4,
-	0xc9, 0x09, 0x79, 0xc5, 0x59, 0x51, 0x2b, 0x4e, 0x07, 0x2a, 0x47, 0x51, 0x30, 0x4c, 0x6b, 0x56,
-	0xf6, 0x9b, 0x69, 0xc0, 0xce, 0x8d, 0xc6, 0xb1, 0x8c, 0x9b, 0x74, 0xc8, 0x42, 0x3b, 0xa6, 0x74,
-	0x20, 0x13, 0xdb, 0x02, 0x57, 0x4f, 0xa1, 0xa0, 0x27, 0xdc, 0xb1, 0x31, 0x8d, 0xfb, 0xc4, 0xff,
-	0x9c, 0x1b, 0xb9, 0x01, 0x55, 0xb6, 0x58, 0x38, 0xa5, 0x8d, 0xc5, 0x80, 0xef, 0x9a, 0x6b, 0xc1,
-	0x7f, 0xa3, 0xc7, 0xb0, 0x8a, 0x69, 0x28, 0xd6, 0x62, 0x1a, 0x8f, 0xbc, 0x62, 0x67, 0x2a, 0x5a,
-	0x7a, 0xc2, 0xb6, 0x0d, 0xd5, 0x6d, 0x53, 0x2e, 0x2b, 0xe7, 0x72, 0xda, 0x50, 0x8f, 0xf4, 0x0d,
-	0x62, 0xe3, 0x39, 0xc6, 0xd8, 0x1f, 0x4f, 0xf1, 0xa3, 0x47, 0x2c, 0xea, 0xce, 0x76, 0x7d, 0xd2,
-	0xf3, 0x68, 0xfa, 0x41, 0x2e, 0x53, 0xb1, 0xa4, 0xa8, 0x88, 0x3a, 0xfc, 0xdb, 0x07, 0x2b, 0x96,
-	0x2f, 0x57, 0xa6, 0x13, 0xef, 0xef, 0x71, 0x65, 0x16, 0x31, 0xff, 0xcd, 0x12, 0xea, 0x30, 0x3e,
-	0x96, 0x5d, 0x07, 0xfb, 0x89, 0xda, 0x3c, 0xd4, 0xf5, 0x4d, 0x37, 0x60, 0x21, 0x92, 0x3a, 0xe8,
-	0x0f, 0xb8, 0xda, 0xa6, 0x38, 0x65, 0x42, 0xbf, 0xcf, 0xdf, 0x6d, 0x0e, 0xdd, 0x63, 0x9f, 0x24,
-	0xa3, 0x88, 0x1e, 0x90, 0x88, 0x0c, 0xd9, 0x99, 0x0a, 0x2f, 0xec, 0x4e, 0x42, 0x2a, 0x0d, 0xa6,
-	0x50, 0x9c, 0x8f, 0x00, 0x58, 0x4c, 0xf5, 0x78, 0x7e, 0x93, 0x06, 0x2b, 0x48, 0x7c, 0x0a, 0x93,
-	0xf3, 0x18, 0x96, 0x23, 0x25, 0x89, 0xc6, 0xf2, 0x86, 0x2e, 0x4c, 0xb0, 0x3a, 0x27, 0xfa, 0x9d,
-	0x05, 0x8d, 0xef, 0xf1, 0xcf, 0xcf, 0x32, 0xdc, 0x53, 0x85, 0xef, 0x03, 0x9c, 0xbb, 0xf4, 0x42,
-	0x16, 0x30, 0xe2, 0xba, 0x51, 0x28, 0x2c, 0x9a, 0xf9, 0x28, 0x72, 0xcf, 0xf7, 0xb2, 0xd0, 0x53,
-	0x49, 0x8c, 0x23, 0x0e, 0xa9, 0x3f, 0x90, 0x22, 0xc4, 0x47, 0x33, 0x95, 0xc4, 0x83, 0x8c, 0x0f,
-	0xa5, 0x10, 0xf1, 0x11, 0x46, 0xa3, 0x6d, 0xfe, 0xa4, 0x02, 0x0b, 0xca, 0x37, 0xe8, 0xc3, 0x93,
-	0xe0, 0x42, 0x42, 0x64, 0x7b, 0xd4, 0x33, 0x15, 0xcf, 0x0e, 0x93, 0xc8, 0xf5, 0x8f, 0x5b, 0x77,
-	0x72, 0xdf, 0x32, 0xfa, 0x33, 0x34, 0xc7, 0xae, 0x35, 0xb5, 0xed, 0x5c, 0xcb, 0x57, 0x2b, 0xe4,
-	0x56, 0x4d, 0x15, 0x81, 0xe6, 0x9c, 0xc7, 0xd0, 0x78, 0x4d, 0x4e, 0x69, 0x77, 0x6c, 0x7c, 0xa5,
-	0xbe, 0x95, 0x2f, 0x97, 0xaf, 0x20, 0x53, 0x4b, 0x9f, 0xc0, 0x9a, 0x5c, 0x6a, 0x7c, 0x55, 0x56,
-	0xd7, 0x8a, 0x27, 0x88, 0x4b, 0xb6, 0xd5, 0x3f, 0xed, 0x9a, 0x4b, 0x47, 0xbd, 0xa9, 0xa5, 0xdf,
-	0x81, 0x25, 0x35, 0x3a, 0x15, 0x3d, 0x15, 0x72, 0x6b, 0xcd, 0x0c, 0x43, 0x4e, 0x46, 0x73, 0xce,
-	0x0e, 0x2c, 0xeb, 0xde, 0xff, 0x5e, 0x2e, 0x40, 0x9b, 0x68, 0xe5, 0x13, 0x7a, 0xbc, 0xa0, 0x39,
-	0xa7, 0x03, 0x0d, 0x61, 0x54, 0x4c, 0x2e, 0x94, 0xdc, 0xeb, 0xdc, 0x35, 0x8d, 0xae, 0x4c, 0xb6,
-	0x0a, 0x2e, 0x51, 0x34, 0xd7, 0x9b, 0xe7, 0xff, 0x19, 0xf1, 0xad, 0x7f, 0x07, 0x00, 0x00, 0xff,
-	0xff, 0xe2, 0x8f, 0xf6, 0xab, 0x60, 0x21, 0x00, 0x00,
+	// 2284 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x39, 0x4d, 0x6f, 0x1c, 0x49,
+	0xd9, 0xee, 0xf9, 0xb0, 0xdd, 0x8f, 0xc7, 0xf6, 0xa4, 0x32, 0xf6, 0x4e, 0x26, 0x56, 0x94, 0xb7,
+	0x76, 0x95, 0x37, 0x2c, 0xc8, 0x68, 0x8d, 0xa5, 0xfd, 0x20, 0x28, 0xeb, 0x71, 0x9c, 0x64, 0xe4,
+	0x4d, 0x6c, 0xca, 0x5e, 0x81, 0xd0, 0x22, 0x51, 0x9e, 0x29, 0xdb, 0x2d, 0xf7, 0x74, 0xb7, 0xbb,
+	0x7b, 0xec, 0x99, 0xd3, 0x72, 0x42, 0x1c, 0x38, 0x20, 0x81, 0xb8, 0x80, 0xb8, 0x71, 0xe7, 0xc0,
+	0x0f, 0x40, 0x42, 0x70, 0x42, 0xe2, 0x27, 0xf0, 0x0f, 0xf8, 0x0d, 0xa8, 0x3e, 0xba, 0xab, 0xaa,
+	0xdd, 0x63, 0x3b, 0x60, 0x2e, 0xa3, 0xae, 0xa7, 0x9e, 0x7a, 0xbe, 0xea, 0xf9, 0xac, 0x81, 0xc5,
+	0x28, 0xf6, 0x2e, 0x68, 0x7f, 0xb2, 0x1e, 0xc5, 0x61, 0x1a, 0xa2, 0x7a, 0x3a, 0x89, 0x58, 0xd2,
+	0x69, 0xf4, 0xc3, 0xe1, 0x30, 0x0c, 0x24, 0xb0, 0x73, 0x2f, 0x8d, 0x69, 0x90, 0xd0, 0x7e, 0xea,
+	0xe5, 0xa0, 0xc6, 0x25, 0xf5, 0x7d, 0x96, 0xca, 0x15, 0xfe, 0x97, 0x03, 0x8b, 0xfb, 0x92, 0xce,
+	0x96, 0xc0, 0x42, 0xcf, 0x61, 0x29, 0x1a, 0x1d, 0xf9, 0x5e, 0x7f, 0x43, 0xd1, 0x6f, 0x3b, 0x8f,
+	0x9d, 0xa7, 0x0b, 0x1b, 0x2b, 0xeb, 0x82, 0xc1, 0xfa, 0xbe, 0xdc, 0x54, 0x87, 0x5e, 0xcf, 0x90,
+	0x02, 0x3a, 0xea, 0xc2, 0xb2, 0xfa, 0xcc, 0x29, 0x54, 0x04, 0x85, 0xd5, 0x8c, 0x82, 0xda, 0xd5,
+	0x24, 0x8a, 0x07, 0x84, 0x10, 0x19, 0x48, 0x50, 0x6f, 0x57, 0x6d, 0x21, 0x32, 0x12, 0x62, 0x53,
+	0x08, 0x61, 0xa1, 0xa3, 0x25, 0xa8, 0xa4, 0x93, 0x76, 0xed, 0xb1, 0xf3, 0xb4, 0x4e, 0x2a, 0xe9,
+	0xa4, 0x3b, 0x07, 0xf5, 0x0b, 0xea, 0x8f, 0x18, 0xfe, 0xb9, 0x03, 0x4b, 0xb6, 0x0a, 0x68, 0x0d,
+	0xdc, 0x34, 0x3c, 0x63, 0x41, 0x40, 0x87, 0x4c, 0x28, 0xeb, 0x12, 0x0d, 0x40, 0xab, 0x30, 0x4b,
+	0x87, 0xe1, 0x28, 0x48, 0x85, 0x16, 0x55, 0xa2, 0x56, 0x08, 0x41, 0x2d, 0x08, 0x53, 0xd6, 0xae,
+	0x8b, 0x03, 0xe2, 0x1b, 0x7d, 0x0b, 0x66, 0xc3, 0x51, 0x1a, 0x8d, 0xd2, 0xf6, 0x9c, 0x10, 0xb7,
+	0x65, 0x8b, 0xbb, 0x27, 0xf6, 0x88, 0xc2, 0xc1, 0x7f, 0x72, 0x60, 0xb9, 0x60, 0x8b, 0x3b, 0x94,
+	0xe5, 0x1b, 0x50, 0xf7, 0x02, 0x2e, 0xca, 0xac, 0x10, 0xe5, 0xbe, 0x2d, 0x4a, 0x8f, 0x6f, 0x11,
+	0x89, 0xf1, 0x8e, 0x62, 0xff, 0x85, 0x5b, 0xd0, 0xb2, 0xff, 0x7f, 0x29, 0x75, 0xd5, 0x90, 0x9a,
+	0xdf, 0x5b, 0x28, 0x44, 0x76, 0x49, 0x25, 0x0d, 0xb5, 0x16, 0xb5, 0x77, 0xd0, 0xa2, 0x7e, 0x0b,
+	0x2d, 0x76, 0x60, 0xf9, 0xcb, 0xc3, 0x1f, 0xee, 0xbd, 0xf2, 0xc3, 0x23, 0xea, 0xf7, 0x82, 0x01,
+	0x1b, 0x73, 0x39, 0xd3, 0xf1, 0x29, 0x4d, 0x4e, 0x85, 0x44, 0x0d, 0xa2, 0x56, 0xa8, 0x03, 0xf3,
+	0xe1, 0x28, 0xf5, 0x38, 0x8e, 0xf2, 0xa8, 0x7c, 0x8d, 0x7f, 0xea, 0xc0, 0xfc, 0x2e, 0x93, 0x82,
+	0x18, 0x8a, 0x3a, 0x96, 0xa2, 0x9f, 0xc3, 0xf2, 0x28, 0x1d, 0x87, 0x06, 0xaf, 0x76, 0xe5, 0x71,
+	0xd5, 0x88, 0x88, 0x82, 0x24, 0xa4, 0x88, 0xce, 0x45, 0x38, 0x63, 0x93, 0xde, 0x90, 0x9e, 0x30,
+	0x25, 0x5c, 0xbe, 0xc6, 0xdf, 0x85, 0x86, 0x69, 0x0e, 0xf4, 0x4d, 0x81, 0x2b, 0xad, 0xe6, 0x08,
+	0x36, 0xcb, 0x8a, 0x4d, 0x26, 0x28, 0xc9, 0x11, 0x70, 0x0f, 0xdc, 0x33, 0xa6, 0x6c, 0x33, 0x55,
+	0xfe, 0x0f, 0x60, 0x31, 0x0c, 0x58, 0xea, 0x0d, 0x59, 0x34, 0x3a, 0x3a, 0x63, 0x32, 0x9e, 0x1b,
+	0xc4, 0x06, 0xe2, 0x1f, 0xe7, 0x99, 0x44, 0x91, 0x5b, 0x03, 0x97, 0x44, 0xa3, 0xa3, 0x5d, 0x36,
+	0x49, 0xc7, 0x82, 0x62, 0x83, 0x68, 0x00, 0x5a, 0x17, 0x9c, 0xd5, 0x8d, 0x49, 0x73, 0x34, 0x95,
+	0x9c, 0xb9, 0x44, 0x44, 0xa3, 0xe0, 0x08, 0x5a, 0xaf, 0xe2, 0x70, 0x14, 0x95, 0xdc, 0xda, 0xff,
+	0xc6, 0xe8, 0xf8, 0xb7, 0x0e, 0x2c, 0x7e, 0x11, 0xf6, 0xa9, 0xcf, 0x31, 0x7b, 0x29, 0x1b, 0x72,
+	0x5e, 0xa7, 0xcc, 0x3b, 0x39, 0xcd, 0x79, 0xc9, 0x15, 0x6a, 0xc3, 0x5c, 0x3a, 0xf6, 0x14, 0x0f,
+	0xee, 0x20, 0xd9, 0xd2, 0xf2, 0x9d, 0xaa, 0xed, 0x3b, 0x86, 0xbf, 0xd5, 0x2c, 0x7f, 0xbb, 0x62,
+	0xee, 0x7a, 0x99, 0xb9, 0xbf, 0x86, 0x25, 0xc2, 0xce, 0xb9, 0x68, 0xfb, 0xc2, 0xa4, 0x49, 0x1e,
+	0x85, 0x6f, 0x8b, 0x51, 0xc8, 0x01, 0x68, 0x0f, 0x5a, 0x27, 0x25, 0xf6, 0x53, 0x46, 0x79, 0xa8,
+	0x8c, 0x52, 0x66, 0x62, 0x52, 0x7a, 0x10, 0xbf, 0x0f, 0x8b, 0x32, 0xfc, 0x77, 0xd9, 0xe4, 0x05,
+	0x4d, 0x29, 0x8f, 0xe7, 0x01, 0x4d, 0xa9, 0x70, 0xba, 0x06, 0x11, 0xdf, 0x78, 0x0b, 0x96, 0x73,
+	0x92, 0x52, 0xce, 0xa9, 0x17, 0xb6, 0x0a, 0xb3, 0xb9, 0x7b, 0x71, 0x02, 0x6a, 0x85, 0x0f, 0xb9,
+	0xa2, 0x89, 0xa9, 0x68, 0x17, 0x9a, 0x27, 0x36, 0xd1, 0x44, 0x79, 0xfa, 0x6a, 0x51, 0x0d, 0xb9,
+	0x4d, 0xae, 0xe0, 0xe3, 0xe7, 0xb0, 0x4c, 0xd8, 0xb9, 0x72, 0xd8, 0x43, 0x6e, 0x25, 0xd4, 0x82,
+	0xba, 0x30, 0x97, 0xb2, 0x9d, 0x5c, 0x4c, 0xcb, 0x5e, 0xf8, 0x19, 0x34, 0xb6, 0xc4, 0xd7, 0x0b,
+	0x96, 0x52, 0xcf, 0x9f, 0xaa, 0x56, 0x0b, 0xea, 0x7d, 0xe3, 0xb8, 0x5c, 0xe0, 0xb7, 0x70, 0x9f,
+	0xb0, 0xc8, 0x9f, 0x64, 0xb5, 0x57, 0xe0, 0x26, 0xe8, 0x63, 0x68, 0x50, 0x83, 0xa8, 0xd2, 0x2a,
+	0xcb, 0x7a, 0x26, 0x3f, 0x62, 0x21, 0x62, 0x02, 0x28, 0xe6, 0xf4, 0xb8, 0x8a, 0xc9, 0xde, 0xb1,
+	0xc4, 0x44, 0xcf, 0x60, 0xc9, 0x37, 0x1d, 0x38, 0x33, 0x53, 0x96, 0x1a, 0x2d, 0xef, 0x26, 0x05,
+	0x5c, 0xfc, 0x15, 0xb4, 0x08, 0xeb, 0x33, 0x2f, 0x4a, 0xed, 0xb8, 0x2e, 0xb7, 0xd3, 0xbb, 0xc6,
+	0xf3, 0x2f, 0x1d, 0x58, 0x54, 0x6a, 0xef, 0x1d, 0x73, 0xa6, 0x68, 0x0b, 0x5c, 0xa9, 0xd3, 0x1b,
+	0x1a, 0x29, 0x41, 0xdf, 0xb7, 0x34, 0x57, 0x88, 0x6a, 0xf5, 0x86, 0x46, 0x3b, 0x41, 0x1a, 0x4f,
+	0x88, 0x3e, 0xd5, 0x79, 0x06, 0x4b, 0xf6, 0x26, 0x6a, 0x42, 0x95, 0xbb, 0x94, 0xbc, 0x13, 0xfe,
+	0xc9, 0xc5, 0x17, 0xad, 0x40, 0x76, 0x21, 0x62, 0xf1, 0x59, 0xe5, 0x13, 0x07, 0xff, 0xc6, 0x81,
+	0xe6, 0x61, 0x16, 0x30, 0x99, 0x54, 0x2f, 0x54, 0x54, 0x25, 0x5a, 0xaa, 0x27, 0x4a, 0xaa, 0x22,
+	0xae, 0x04, 0x24, 0x5a, 0xb0, 0xfc, 0x20, 0x17, 0xcc, 0xde, 0x34, 0x05, 0x73, 0x4b, 0x04, 0x73,
+	0x4d, 0xc1, 0x76, 0x61, 0xa5, 0x10, 0x7d, 0x9b, 0xfb, 0xb1, 0x27, 0x63, 0x46, 0xa5, 0x10, 0x49,
+	0xa7, 0xac, 0x64, 0x55, 0x0a, 0x25, 0xeb, 0x17, 0x0e, 0x2c, 0x65, 0x95, 0x40, 0x93, 0x29, 0xf5,
+	0xdd, 0x97, 0xd3, 0x72, 0xe8, 0x5a, 0x79, 0x0e, 0x95, 0xe4, 0x6e, 0x2e, 0x5f, 0xae, 0x51, 0xbe,
+	0xf6, 0x60, 0x39, 0xf7, 0x8f, 0x1b, 0xc4, 0x29, 0xad, 0x43, 0x6e, 0x31, 0x31, 0xbe, 0x02, 0x64,
+	0xd6, 0x43, 0x45, 0xf3, 0xa3, 0x2b, 0x55, 0x71, 0xa5, 0x50, 0x15, 0x95, 0xf0, 0xba, 0x36, 0x7a,
+	0x70, 0xdf, 0x72, 0x7c, 0x45, 0xe9, 0x4a, 0x59, 0x73, 0xcd, 0xb2, 0xb6, 0x79, 0x35, 0x0c, 0x56,
+	0x8b, 0x61, 0xa0, 0x38, 0x19, 0xc1, 0xf0, 0x6b, 0x07, 0x5a, 0x76, 0x57, 0xaa, 0x99, 0xdd, 0x51,
+	0x3f, 0xb8, 0x51, 0x68, 0xf2, 0x3a, 0x65, 0xed, 0x91, 0x92, 0x2c, 0x6b, 0x92, 0xfe, 0xe6, 0xc0,
+	0x4a, 0xa1, 0x43, 0xbd, 0x73, 0xb9, 0xbe, 0x6d, 0xf7, 0xa9, 0x0f, 0x4a, 0x3a, 0x3c, 0x25, 0x95,
+	0xea, 0xf3, 0xfe, 0x13, 0x45, 0xfe, 0xca, 0xed, 0x6b, 0xf5, 0xac, 0x77, 0xa2, 0x47, 0xb5, 0x4c,
+	0x8f, 0xda, 0x3b, 0xeb, 0x51, 0xbf, 0xb5, 0x1e, 0x3f, 0xab, 0xe4, 0x3e, 0x29, 0xc7, 0x35, 0xa5,
+	0xc6, 0xce, 0x94, 0xa1, 0xed, 0x61, 0xe9, 0xd0, 0x26, 0x0f, 0x95, 0x8c, 0x6e, 0xaf, 0xa7, 0x8d,
+	0x6e, 0x6b, 0xe5, 0xa3, 0x5b, 0x4e, 0xe8, 0xca, 0x00, 0xb7, 0x33, 0x65, 0x80, 0x7b, 0x58, 0x3a,
+	0xc0, 0x19, 0x02, 0xdd, 0x72, 0x8c, 0xfb, 0xb3, 0x23, 0xda, 0x9f, 0xed, 0x98, 0xd1, 0x94, 0x89,
+	0xa2, 0x67, 0x5f, 0x65, 0x75, 0xfa, 0x55, 0xd6, 0x6e, 0x74, 0xc9, 0x55, 0x98, 0x4d, 0x58, 0x30,
+	0x60, 0xb1, 0x1a, 0x44, 0xd4, 0x4a, 0x97, 0xf2, 0x39, 0x21, 0x90, 0x5c, 0xa0, 0x47, 0x00, 0x32,
+	0xf3, 0x44, 0xd4, 0x8b, 0xdb, 0xf3, 0xe2, 0x84, 0x01, 0xe1, 0xd4, 0xd8, 0x38, 0xf2, 0x62, 0xd6,
+	0x76, 0x25, 0x67, 0xb9, 0xc2, 0x5f, 0x01, 0x32, 0x5b, 0x80, 0xfd, 0xb3, 0x7d, 0x8e, 0xfd, 0x04,
+	0x96, 0x92, 0xd3, 0xf0, 0xf2, 0x60, 0xd4, 0xef, 0xb3, 0x24, 0x39, 0x1e, 0xf9, 0xe2, 0x26, 0xe7,
+	0x49, 0x01, 0x5a, 0xe0, 0x5a, 0x2b, 0x72, 0xc5, 0x9f, 0xf3, 0xe2, 0x2d, 0xfa, 0x9b, 0x2e, 0xf5,
+	0x37, 0xb7, 0x06, 0x83, 0x58, 0x36, 0x39, 0x08, 0x6a, 0x74, 0x30, 0x88, 0x95, 0xaf, 0x8b, 0x6f,
+	0x5d, 0xd0, 0x2b, 0x46, 0x41, 0xc7, 0xdf, 0xb7, 0x5b, 0x94, 0x2e, 0xf5, 0x69, 0xd0, 0x67, 0xe8,
+	0x31, 0x2c, 0xa8, 0x7c, 0x6b, 0xd0, 0x31, 0x41, 0xbc, 0x1b, 0x3e, 0x92, 0xc8, 0x2a, 0x6c, 0xb2,
+	0x25, 0xfe, 0x63, 0x25, 0x1f, 0x1d, 0x5f, 0x74, 0x0f, 0xd2, 0x30, 0x66, 0x85, 0x0a, 0xa6, 0x9b,
+	0x60, 0xeb, 0x36, 0x2b, 0xd3, 0x6f, 0xb3, 0x6a, 0xdd, 0xa6, 0xac, 0x7b, 0xbd, 0xc2, 0xa8, 0x26,
+	0x8b, 0x10, 0x86, 0x46, 0x3a, 0xce, 0x3b, 0x56, 0xa2, 0xba, 0x6a, 0x0b, 0x86, 0x3e, 0x84, 0xa6,
+	0xd2, 0x24, 0x07, 0x0a, 0x1f, 0x68, 0x90, 0x2b, 0x70, 0x6e, 0xb5, 0xf0, 0x32, 0x60, 0xb1, 0xf0,
+	0x06, 0x97, 0xc8, 0x85, 0x31, 0x22, 0xcc, 0x4f, 0x1b, 0x11, 0x5c, 0x7b, 0x44, 0x58, 0x03, 0xf7,
+	0xc8, 0x0f, 0xfb, 0x67, 0xc2, 0x08, 0x20, 0xc7, 0xa4, 0x1c, 0x80, 0xdf, 0x42, 0x4d, 0xb4, 0x21,
+	0xd3, 0x6a, 0xe2, 0x3a, 0xb8, 0xbc, 0xda, 0x76, 0x69, 0xe2, 0xf5, 0x55, 0xb0, 0x36, 0x8d, 0xe2,
+	0x2c, 0xe0, 0x44, 0xa3, 0xe0, 0x08, 0x96, 0x38, 0xfc, 0x35, 0xbd, 0x60, 0x87, 0xe3, 0xd7, 0xdc,
+	0xd2, 0xd7, 0xf4, 0xe3, 0xa9, 0xc0, 0x50, 0xe6, 0x57, 0x2b, 0x9b, 0x63, 0xf5, 0x66, 0x8e, 0x1f,
+	0x42, 0x5d, 0x06, 0xe8, 0xff, 0x41, 0x9d, 0x43, 0xb3, 0x26, 0x74, 0xc1, 0x38, 0x44, 0xe4, 0x0e,
+	0x26, 0x72, 0x2a, 0xd7, 0xd2, 0x25, 0xe8, 0xb9, 0xec, 0x41, 0x0c, 0x50, 0xa1, 0x7e, 0xdb, 0x07,
+	0x48, 0x11, 0x1b, 0x1f, 0xf3, 0x38, 0x3b, 0x2f, 0x8e, 0x8d, 0xd7, 0x27, 0xfe, 0x0e, 0xcc, 0x0f,
+	0xbd, 0xf1, 0x76, 0x9e, 0xfa, 0xeb, 0x24, 0x5f, 0x5b, 0xbe, 0x57, 0x35, 0x06, 0x82, 0x04, 0xdc,
+	0x5c, 0xff, 0xb2, 0xe9, 0xd3, 0xb1, 0x1e, 0xc1, 0x6e, 0x1c, 0xf9, 0x75, 0xb3, 0xb3, 0x5f, 0x36,
+	0x74, 0x4b, 0x20, 0x26, 0xd0, 0x14, 0x0d, 0xbb, 0xe8, 0xbe, 0xb6, 0x86, 0x05, 0x01, 0xed, 0x0b,
+	0x7d, 0x92, 0xd9, 0xdf, 0xee, 0xce, 0xf5, 0xa5, 0xa9, 0x4b, 0xf8, 0x95, 0xc3, 0x2d, 0x96, 0xdc,
+	0x9d, 0xc5, 0xb6, 0xa1, 0xc9, 0x29, 0x9b, 0x42, 0x0a, 0xdb, 0x2d, 0x6c, 0xbc, 0x67, 0xc8, 0x60,
+	0x6e, 0x93, 0x2b, 0x07, 0xf0, 0xef, 0x1c, 0xb8, 0xf7, 0x92, 0xfb, 0xd1, 0x01, 0xff, 0xe9, 0x05,
+	0x7b, 0x01, 0x3b, 0x1c, 0xdf, 0x5c, 0xbf, 0x55, 0x22, 0xaf, 0x58, 0x89, 0x5c, 0xa7, 0xe4, 0xaa,
+	0x99, 0x92, 0x0b, 0x13, 0xb9, 0x6e, 0xa7, 0x73, 0xcf, 0xad, 0x4f, 0xf5, 0xdc, 0x1f, 0x41, 0x83,
+	0x30, 0xea, 0xe7, 0x6f, 0x41, 0x18, 0x1a, 0x31, 0xa3, 0xbe, 0x28, 0xf5, 0x59, 0x9f, 0x5f, 0x27,
+	0x16, 0x8c, 0xe7, 0xfa, 0xac, 0x75, 0x8d, 0xbd, 0x0b, 0x7d, 0xc7, 0x05, 0x28, 0xde, 0x04, 0xc8,
+	0x2f, 0x29, 0xd1, 0xd7, 0xe8, 0x5c, 0x7f, 0x8d, 0x7f, 0xaf, 0xc0, 0xaa, 0xac, 0x8f, 0x87, 0xfa,
+	0x11, 0x78, 0x9b, 0xf6, 0x4f, 0x99, 0x39, 0x7b, 0x34, 0xe4, 0xec, 0xf1, 0x08, 0xa0, 0x2f, 0x70,
+	0x39, 0x5f, 0x95, 0xb6, 0x0d, 0x08, 0xbf, 0xde, 0xc4, 0x3b, 0x09, 0xc4, 0xae, 0xb4, 0x59, 0xbe,
+	0x16, 0x56, 0x4e, 0x69, 0x3a, 0x4a, 0x54, 0xca, 0x55, 0x2b, 0xb4, 0x09, 0x0b, 0xc6, 0xf3, 0xb3,
+	0xea, 0x72, 0x50, 0x36, 0x3b, 0xe9, 0x1d, 0x62, 0xa2, 0x4d, 0x2d, 0xbe, 0x1f, 0x4b, 0x83, 0xe6,
+	0x4d, 0xfc, 0x9c, 0x35, 0x1a, 0x9b, 0xb6, 0x27, 0x16, 0x22, 0xfa, 0xff, 0xcc, 0x5e, 0xf3, 0xe2,
+	0xc4, 0xbd, 0xa2, 0xbd, 0x12, 0x65, 0x30, 0xdb, 0x97, 0xdc, 0x82, 0x2f, 0xe1, 0xae, 0x6c, 0x38,
+	0xb8, 0xfd, 0x0e, 0xc7, 0x5f, 0x78, 0x49, 0x5a, 0x5a, 0x4a, 0xaf, 0x2d, 0x5b, 0xf8, 0x13, 0x68,
+	0x8a, 0x92, 0x6a, 0x52, 0xf9, 0x00, 0xaa, 0xe9, 0x38, 0xbb, 0xcc, 0x32, 0xeb, 0xf0, 0x6d, 0xbc,
+	0x03, 0xf7, 0xf4, 0x73, 0xc5, 0x56, 0x5f, 0x76, 0x1e, 0xd7, 0x3b, 0x7f, 0x26, 0x5e, 0x45, 0x8b,
+	0x87, 0x7f, 0x22, 0x72, 0xe1, 0x7e, 0x81, 0xce, 0xad, 0x7b, 0x02, 0x5e, 0xfc, 0x07, 0x5e, 0x12,
+	0xf9, 0x74, 0x32, 0x0c, 0x07, 0x4c, 0xbd, 0x68, 0x99, 0x20, 0xfc, 0x75, 0xe1, 0x61, 0x43, 0xb1,
+	0xc0, 0xda, 0x69, 0xb9, 0x17, 0x34, 0x8c, 0x4b, 0xc8, 0xed, 0x8f, 0xa1, 0x7e, 0xac, 0xf2, 0x53,
+	0x09, 0x8e, 0xd8, 0xba, 0x85, 0x00, 0x6f, 0xb8, 0x00, 0xaa, 0x31, 0x54, 0x76, 0xe6, 0xd5, 0xfa,
+	0x7a, 0x5b, 0xb5, 0x61, 0x8e, 0x07, 0xba, 0x0e, 0xc1, 0x6c, 0x89, 0xff, 0xe9, 0xc0, 0x03, 0xe3,
+	0xa1, 0x48, 0xdf, 0x8b, 0xb8, 0xbc, 0xeb, 0xa9, 0x62, 0x68, 0x70, 0xe7, 0x25, 0xac, 0x7f, 0xf1,
+	0xd2, 0xa7, 0x27, 0x2a, 0x2f, 0x5a, 0x30, 0x4e, 0x61, 0xe0, 0xc5, 0x4c, 0x86, 0x88, 0x54, 0x47,
+	0x03, 0x74, 0xc7, 0x59, 0x33, 0x3b, 0x4e, 0x04, 0xb5, 0xe3, 0x38, 0x1c, 0x66, 0x3d, 0x2b, 0xff,
+	0xe6, 0x1a, 0xf0, 0x7b, 0x63, 0x49, 0xa2, 0xe2, 0x26, 0x5b, 0xf2, 0xd0, 0x4e, 0x18, 0x1b, 0xa8,
+	0xc4, 0x36, 0x27, 0xd4, 0x33, 0x20, 0xf8, 0x33, 0xe1, 0xd8, 0x84, 0x25, 0x7d, 0x1a, 0x7c, 0x29,
+	0x8c, 0xdc, 0x82, 0x3a, 0x3f, 0x2c, 0x9d, 0xd2, 0x25, 0x72, 0x21, 0xb8, 0x6a, 0x2d, 0xc4, 0x37,
+	0xfe, 0x14, 0x96, 0x09, 0x8b, 0xe4, 0x59, 0xc2, 0x92, 0x91, 0x5f, 0xee, 0x4c, 0x65, 0x47, 0x4f,
+	0x39, 0xdb, 0xc8, 0x64, 0x9b, 0x61, 0x39, 0x1a, 0x0b, 0x75, 0xa1, 0x19, 0xdb, 0x0c, 0x92, 0xc2,
+	0x54, 0x5d, 0xe0, 0x4f, 0xae, 0xe0, 0xe3, 0xa7, 0x3c, 0xea, 0xce, 0x77, 0x02, 0x7a, 0xe4, 0xb3,
+	0xec, 0x7f, 0x96, 0x5c, 0xc5, 0x8a, 0xa1, 0x22, 0xee, 0x89, 0x27, 0x6c, 0xde, 0x2c, 0x5f, 0xaf,
+	0x4c, 0x2f, 0xd9, 0xdb, 0x15, 0xca, 0xcc, 0x13, 0xf1, 0xcd, 0x13, 0xea, 0x30, 0x39, 0x51, 0x53,
+	0x07, 0xff, 0xc4, 0x5d, 0x11, 0xea, 0x36, 0xd3, 0x75, 0x98, 0x8b, 0x95, 0x0e, 0xf6, 0x3b, 0x9c,
+	0xc5, 0x94, 0x64, 0x48, 0xf8, 0x0f, 0x7a, 0xfc, 0x3e, 0xf0, 0x4e, 0x02, 0x9a, 0x8e, 0x62, 0xb6,
+	0x4f, 0x63, 0x3a, 0xe4, 0x77, 0x2a, 0xbd, 0xf0, 0x70, 0x12, 0x31, 0x65, 0x30, 0x03, 0x82, 0x3e,
+	0x02, 0xe0, 0x31, 0x75, 0x24, 0xf2, 0x9b, 0x32, 0x58, 0x49, 0xe2, 0x33, 0x90, 0xd0, 0xa7, 0xb0,
+	0x18, 0x1b, 0x49, 0x34, 0x51, 0x15, 0xba, 0x34, 0xc1, 0xda, 0x98, 0xf8, 0xf7, 0x0e, 0xb4, 0x7e,
+	0x20, 0xfe, 0x55, 0x54, 0xe1, 0x9e, 0x29, 0xfc, 0x08, 0xe0, 0xc2, 0x63, 0x97, 0xaa, 0x81, 0x91,
+	0xe5, 0xc6, 0x80, 0xf0, 0x68, 0x16, 0xab, 0xd8, 0xbb, 0xd8, 0xcd, 0x43, 0xcf, 0x04, 0x71, 0x8c,
+	0x24, 0x62, 0xc1, 0x40, 0x91, 0x90, 0xff, 0x7d, 0x98, 0x20, 0x11, 0x64, 0x62, 0xa9, 0x88, 0xc8,
+	0xb7, 0x74, 0x0b, 0xb6, 0xf1, 0x8f, 0x0a, 0xcc, 0x19, 0x7f, 0x2d, 0x1e, 0x9c, 0x86, 0x97, 0x4a,
+	0x44, 0xce, 0xa3, 0x99, 0xab, 0x78, 0x7e, 0x90, 0xc6, 0x5e, 0x70, 0xd2, 0x79, 0xa0, 0x7d, 0xab,
+	0x30, 0x9f, 0xe1, 0x19, 0x5e, 0xd6, 0xcc, 0xb1, 0x73, 0x45, 0x9f, 0x36, 0xc0, 0x9d, 0x86, 0x49,
+	0x02, 0xcf, 0xa0, 0xef, 0xc1, 0x82, 0xe9, 0xeb, 0xc6, 0x29, 0x03, 0xdc, 0x59, 0x29, 0x3a, 0xb5,
+	0x00, 0xe3, 0x19, 0xb4, 0x0d, 0x8b, 0xb6, 0x2f, 0xbd, 0xa7, 0x09, 0x58, 0x1b, 0x1d, 0xbd, 0x61,
+	0x7b, 0x1f, 0x9e, 0x41, 0x3d, 0x68, 0x49, 0x11, 0x09, 0xbd, 0x34, 0x32, 0x19, 0x7a, 0x58, 0x54,
+	0xc1, 0xd8, 0xec, 0x94, 0x94, 0x24, 0x3c, 0x73, 0x34, 0x2b, 0xfe, 0x3e, 0xfe, 0xce, 0xbf, 0x03,
+	0x00, 0x00, 0xff, 0xff, 0x4e, 0x70, 0x4a, 0x03, 0x85, 0x1e, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -4170,12 +3894,6 @@ type PrivacyClient interface {
 	ShowPrivacyKey(ctx context.Context, in *types.ReqString, opts ...grpc.CallOption) (*ReplyPrivacyPkPair, error)
 	// 创建一系列UTXO
 	CreateUTXOs(ctx context.Context, in *ReqCreateUTXOs, opts ...grpc.CallOption) (*types.Reply, error)
-	// 将资金从公开到隐私转移
-	MakeTxPublic2Privacy(ctx context.Context, in *ReqPub2Pri, opts ...grpc.CallOption) (*types.Reply, error)
-	// 将资产从隐私到隐私进行转移
-	MakeTxPrivacy2Privacy(ctx context.Context, in *ReqPri2Pri, opts ...grpc.CallOption) (*types.Reply, error)
-	// 将资产从隐私到公开进行转移
-	MakeTxPrivacy2Public(ctx context.Context, in *ReqPri2Pub, opts ...grpc.CallOption) (*types.Reply, error)
 	// 扫描UTXO以及获取扫描UTXO后的状态
 	RescanUtxos(ctx context.Context, in *ReqRescanUtxos, opts ...grpc.CallOption) (*RepRescanUtxos, error)
 	// 使能隐私账户
@@ -4210,33 +3928,6 @@ func (c *privacyClient) CreateUTXOs(ctx context.Context, in *ReqCreateUTXOs, opt
 	return out, nil
 }
 
-func (c *privacyClient) MakeTxPublic2Privacy(ctx context.Context, in *ReqPub2Pri, opts ...grpc.CallOption) (*types.Reply, error) {
-	out := new(types.Reply)
-	err := c.cc.Invoke(ctx, "/types.privacy/MakeTxPublic2Privacy", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *privacyClient) MakeTxPrivacy2Privacy(ctx context.Context, in *ReqPri2Pri, opts ...grpc.CallOption) (*types.Reply, error) {
-	out := new(types.Reply)
-	err := c.cc.Invoke(ctx, "/types.privacy/MakeTxPrivacy2Privacy", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *privacyClient) MakeTxPrivacy2Public(ctx context.Context, in *ReqPri2Pub, opts ...grpc.CallOption) (*types.Reply, error) {
-	out := new(types.Reply)
-	err := c.cc.Invoke(ctx, "/types.privacy/MakeTxPrivacy2Public", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *privacyClient) RescanUtxos(ctx context.Context, in *ReqRescanUtxos, opts ...grpc.CallOption) (*RepRescanUtxos, error) {
 	out := new(RepRescanUtxos)
 	err := c.cc.Invoke(ctx, "/types.privacy/RescanUtxos", in, out, opts...)
@@ -4271,12 +3962,6 @@ type PrivacyServer interface {
 	ShowPrivacyKey(context.Context, *types.ReqString) (*ReplyPrivacyPkPair, error)
 	// 创建一系列UTXO
 	CreateUTXOs(context.Context, *ReqCreateUTXOs) (*types.Reply, error)
-	// 将资金从公开到隐私转移
-	MakeTxPublic2Privacy(context.Context, *ReqPub2Pri) (*types.Reply, error)
-	// 将资产从隐私到隐私进行转移
-	MakeTxPrivacy2Privacy(context.Context, *ReqPri2Pri) (*types.Reply, error)
-	// 将资产从隐私到公开进行转移
-	MakeTxPrivacy2Public(context.Context, *ReqPri2Pub) (*types.Reply, error)
 	// 扫描UTXO以及获取扫描UTXO后的状态
 	RescanUtxos(context.Context, *ReqRescanUtxos) (*RepRescanUtxos, error)
 	// 使能隐私账户
@@ -4325,60 +4010,6 @@ func _Privacy_CreateUTXOs_Handler(srv interface{}, ctx context.Context, dec func
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Privacy_MakeTxPublic2Privacy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ReqPub2Pri)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(PrivacyServer).MakeTxPublic2Privacy(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/types.privacy/MakeTxPublic2Privacy",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PrivacyServer).MakeTxPublic2Privacy(ctx, req.(*ReqPub2Pri))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Privacy_MakeTxPrivacy2Privacy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ReqPri2Pri)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(PrivacyServer).MakeTxPrivacy2Privacy(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/types.privacy/MakeTxPrivacy2Privacy",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PrivacyServer).MakeTxPrivacy2Privacy(ctx, req.(*ReqPri2Pri))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Privacy_MakeTxPrivacy2Public_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ReqPri2Pub)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(PrivacyServer).MakeTxPrivacy2Public(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/types.privacy/MakeTxPrivacy2Public",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PrivacyServer).MakeTxPrivacy2Public(ctx, req.(*ReqPri2Pub))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Privacy_RescanUtxos_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ReqRescanUtxos)
 	if err := dec(in); err != nil {
@@ -4446,18 +4077,6 @@ var _Privacy_serviceDesc = grpc.ServiceDesc{
 			Handler:    _Privacy_CreateUTXOs_Handler,
 		},
 		{
-			MethodName: "MakeTxPublic2Privacy",
-			Handler:    _Privacy_MakeTxPublic2Privacy_Handler,
-		},
-		{
-			MethodName: "MakeTxPrivacy2Privacy",
-			Handler:    _Privacy_MakeTxPrivacy2Privacy_Handler,
-		},
-		{
-			MethodName: "MakeTxPrivacy2Public",
-			Handler:    _Privacy_MakeTxPrivacy2Public_Handler,
-		},
-		{
 			MethodName: "RescanUtxos",
 			Handler:    _Privacy_RescanUtxos_Handler,
 		},

plugin/dapp/privacy/wallet/exec.go

@@ -29,36 +29,6 @@ func (policy *privacyPolicy) On_ShowPrivacyKey(req *types.ReqString) (types.Mess
 	return reply, err
 }
 
-func (policy *privacyPolicy) On_Public2Privacy(req *privacytypes.ReqPub2Pri) (types.Message, error) {
-	policy.getWalletOperate().GetMutex().Lock()
-	defer policy.getWalletOperate().GetMutex().Unlock()
-	reply, err := policy.sendPublic2PrivacyTransaction(req)
-	if err != nil {
-		bizlog.Error("sendPublic2PrivacyTransaction", "err", err.Error())
-	}
-	return reply, err
-}
-
-func (policy *privacyPolicy) On_Privacy2Privacy(req *privacytypes.ReqPri2Pri) (types.Message, error) {
-	policy.getWalletOperate().GetMutex().Lock()
-	defer policy.getWalletOperate().GetMutex().Unlock()
-	reply, err := policy.sendPrivacy2PrivacyTransaction(req)
-	if err != nil {
-		bizlog.Error("sendPrivacy2PrivacyTransaction", "err", err.Error())
-	}
-	return reply, err
-}
-
-func (policy *privacyPolicy) On_Privacy2Public(req *privacytypes.ReqPri2Pub) (types.Message, error) {
-	policy.getWalletOperate().GetMutex().Lock()
-	defer policy.getWalletOperate().GetMutex().Unlock()
-	reply, err := policy.sendPrivacy2PublicTransaction(req)
-	if err != nil {
-		bizlog.Error("sendPrivacy2PublicTransaction", "err", err.Error())
-	}
-	return reply, err
-}
-
 func (policy *privacyPolicy) On_CreateUTXOs(req *privacytypes.ReqCreateUTXOs) (types.Message, error) {
 	policy.getWalletOperate().GetMutex().Lock()
 	defer policy.getWalletOperate().GetMutex().Unlock()

plugin/dapp/privacy/wallet/privacy.go

@@ -171,7 +171,7 @@ func (policy *privacyPolicy) createUTXOsByPub2Priv(priv crypto.PrivKey, reqCreat
 	}
 
 	tx := &types.Transaction{
-		Execer:  []byte("privacy"),
+		Execer:  []byte(types.ExecName(privacytypes.PrivacyX)),
 		Payload: types.Encode(action),
 		Nonce:   operater.Nonce(),
 		To:      address.ExecAddress(privacytypes.PrivacyX),
@@ -601,10 +601,10 @@ func (policy *privacyPolicy) createPublic2PrivacyTx(req *types.ReqCreateTransact
 		Value: &privacytypes.PrivacyAction_Public2Privacy{Public2Privacy: value},
 	}
 	tx := &types.Transaction{
-		Execer:  []byte(privacytypes.PrivacyX),
+		Execer:  []byte(types.ExecName(privacytypes.PrivacyX)),
 		Payload: types.Encode(action),
 		Nonce:   policy.getWalletOperate().Nonce(),
-		To:      address.ExecAddress(privacytypes.PrivacyX),
+		To:      address.ExecAddress(types.ExecName(privacytypes.PrivacyX)),
 	}
 	tx.Signature = &types.Signature{
 		Signature: types.Encode(&privacytypes.PrivacySignatureParam{
@@ -619,10 +619,16 @@ func (policy *privacyPolicy) createPublic2PrivacyTx(req *types.ReqCreateTransact
 }
 
 func (policy *privacyPolicy) createPrivacy2PrivacyTx(req *types.ReqCreateTransaction) (*types.Transaction, error) {
+
+	//需要燃烧的utxo
+	utxoBurnedAmount := privacytypes.PrivacyTxFee
+	if types.IsPara() {
+		utxoBurnedAmount = 0
+	}
 	buildInfo := &buildInputInfo{
 		tokenname: req.GetTokenname(),
 		sender:    req.GetFrom(),
-		amount:    req.GetAmount() + privacytypes.PrivacyTxFee,
+		amount:    req.GetAmount() + utxoBurnedAmount,
 		mixcount:  req.GetMixcount(),
 	}
 	privacyInfo, err := policy.getPrivacykeyPair(req.GetFrom())
@@ -653,7 +659,7 @@ func (policy *privacyPolicy) createPrivacy2PrivacyTx(req *types.ReqCreateTransac
 		selectedAmounTotal += input.Amount
 	}
 	//构造输出UTXO
-	privacyOutput, err := generateOuts(viewPublic, spendPublic, viewPub4chgPtr, spendPub4chgPtr, req.GetAmount(), selectedAmounTotal, privacytypes.PrivacyTxFee)
+	privacyOutput, err := generateOuts(viewPublic, spendPublic, viewPub4chgPtr, spendPub4chgPtr, req.GetAmount(), selectedAmounTotal, utxoBurnedAmount)
 	if err != nil {
 		return nil, err
 	}
@@ -671,11 +677,11 @@ func (policy *privacyPolicy) createPrivacy2PrivacyTx(req *types.ReqCreateTransac
 	}
 
 	tx := &types.Transaction{
-		Execer:  []byte(privacytypes.PrivacyX),
+		Execer:  []byte(types.ExecName(privacytypes.PrivacyX)),
 		Payload: types.Encode(action),
 		Fee:     privacytypes.PrivacyTxFee,
 		Nonce:   policy.getWalletOperate().Nonce(),
-		To:      address.ExecAddress(privacytypes.PrivacyX),
+		To:      address.ExecAddress(types.ExecName(privacytypes.PrivacyX)),
 	}
 	// 创建交易成功，将已经使用掉的UTXO冻结
 	policy.saveFTXOInfo(tx, req.GetTokenname(), req.GetFrom(), hex.EncodeToString(tx.Hash()), selectedUtxo)
@@ -690,10 +696,16 @@ func (policy *privacyPolicy) createPrivacy2PrivacyTx(req *types.ReqCreateTransac
 }
 
 func (policy *privacyPolicy) createPrivacy2PublicTx(req *types.ReqCreateTransaction) (*types.Transaction, error) {
+
+	//需要燃烧的utxo
+	utxoBurnedAmount := privacytypes.PrivacyTxFee
+	if types.IsPara() {
+		utxoBurnedAmount = 0
+	}
 	buildInfo := &buildInputInfo{
 		tokenname: req.GetTokenname(),
 		sender:    req.GetFrom(),
-		amount:    req.GetAmount() + privacytypes.PrivacyTxFee,
+		amount:    req.GetAmount() + utxoBurnedAmount,
 		mixcount:  req.GetMixcount(),
 	}
 	privacyInfo, err := policy.getPrivacykeyPair(req.GetFrom())
@@ -722,7 +734,7 @@ func (policy *privacyPolicy) createPrivacy2PublicTx(req *types.ReqCreateTransact
 	changeAmount := selectedAmounTotal - req.GetAmount()
 	//step 2,generateOuts
 	//构造输出UTXO,只生成找零的UTXO
-	privacyOutput, err := generateOuts(nil, nil, viewPub4chgPtr, spendPub4chgPtr, 0, changeAmount, privacytypes.PrivacyTxFee)
+	privacyOutput, err := generateOuts(nil, nil, viewPub4chgPtr, spendPub4chgPtr, 0, changeAmount, utxoBurnedAmount)
 	if err != nil {
 		return nil, err
 	}
@@ -733,6 +745,7 @@ func (policy *privacyPolicy) createPrivacy2PublicTx(req *types.ReqCreateTransact
 		Note:      req.GetNote(),
 		Input:     privacyInput,
 		Output:    privacyOutput,
+		To:        req.GetTo(),
 	}
 	action := &privacytypes.PrivacyAction{
 		Ty:    privacytypes.ActionPrivacy2Public,
@@ -740,11 +753,11 @@ func (policy *privacyPolicy) createPrivacy2PublicTx(req *types.ReqCreateTransact
 	}
 
 	tx := &types.Transaction{
-		Execer:  []byte(privacytypes.PrivacyX),
+		Execer:  []byte(types.ExecName(privacytypes.PrivacyX)),
 		Payload: types.Encode(action),
 		Fee:     privacytypes.PrivacyTxFee,
 		Nonce:   policy.getWalletOperate().Nonce(),
-		To:      req.GetTo(),
+		To:      address.ExecAddress(types.ExecName(privacytypes.PrivacyX)),
 	}
 	// 创建交易成功，将已经使用掉的UTXO冻结
 	policy.saveFTXOInfo(tx, req.GetTokenname(), req.GetFrom(), hex.EncodeToString(tx.Hash()), selectedUtxo)
@@ -959,188 +972,6 @@ func (policy *privacyPolicy) showPrivacyAccountsSpend(req *privacytypes.ReqPrivB
 	return utxoHaveTxHashs, nil
 }
 
-func (policy *privacyPolicy) sendPublic2PrivacyTransaction(public2private *privacytypes.ReqPub2Pri) (*types.Reply, error) {
-	if ok, err := policy.getWalletOperate().CheckWalletStatus(); !ok {
-		bizlog.Error("sendPublic2PrivacyTransaction", "CheckWalletStatus error", err)
-		return nil, err
-	}
-	if ok, err := policy.isRescanUtxosFlagScaning(); ok {
-		bizlog.Error("sendPublic2PrivacyTransaction", "isRescanUtxosFlagScaning error", err)
-		return nil, err
-	}
-	if public2private == nil {
-		bizlog.Error("sendPublic2PrivacyTransaction public2private is nil")
-		return nil, types.ErrInvalidParam
-	}
-	if len(public2private.GetTokenname()) <= 0 {
-		bizlog.Error("sendPublic2PrivacyTransaction tokenname is nil")
-		return nil, types.ErrInvalidParam
-	}
-	if !checkAmountValid(public2private.GetAmount()) {
-		bizlog.Error("sendPublic2PrivacyTransaction", "invalid amount", public2private.GetAmount())
-		return nil, types.ErrAmount
-	}
-
-	priv, err := policy.getPrivKeyByAddr(public2private.GetSender())
-	if err != nil {
-		bizlog.Error("sendPublic2PrivacyTransaction", "getPrivKeyByAddr error", err)
-		return nil, err
-	}
-
-	return policy.transPub2PriV2(priv, public2private)
-}
-
-//公开向隐私账户转账
-func (policy *privacyPolicy) transPub2PriV2(priv crypto.PrivKey, reqPub2Pri *privacytypes.ReqPub2Pri) (*types.Reply, error) {
-	viewPubSlice, spendPubSlice, err := parseViewSpendPubKeyPair(reqPub2Pri.Pubkeypair)
-	if err != nil {
-		bizlog.Error("transPub2Pri", "parseViewSpendPubKeyPair error", err)
-		return nil, err
-	}
-
-	viewPublic := (*[32]byte)(unsafe.Pointer(&viewPubSlice[0]))
-	spendPublic := (*[32]byte)(unsafe.Pointer(&spendPubSlice[0]))
-	//因为此时是pub2priv的交易，此时不需要构造找零的输出，同时设置fee为0，也是为了简化计算
-	privacyOutput, err := generateOuts(viewPublic, spendPublic, nil, nil, reqPub2Pri.Amount, reqPub2Pri.Amount, 0)
-	if err != nil {
-		bizlog.Error("transPub2Pri", "generateOuts error", err)
-		return nil, err
-	}
-
-	operater := policy.getWalletOperate()
-	value := &privacytypes.Public2Privacy{
-		Tokenname: reqPub2Pri.Tokenname,
-		Amount:    reqPub2Pri.Amount,
-		Note:      reqPub2Pri.Note,
-		Output:    privacyOutput,
-	}
-	action := &privacytypes.PrivacyAction{
-		Ty:    privacytypes.ActionPublic2Privacy,
-		Value: &privacytypes.PrivacyAction_Public2Privacy{Public2Privacy: value},
-	}
-	tx := &types.Transaction{
-		Execer:  []byte("privacy"),
-		Payload: types.Encode(action),
-		Nonce:   operater.Nonce(),
-		// TODO: 采用隐私合约地址来设定目标合约接收的目标地址,让验证通过
-		To: address.ExecAddress(privacytypes.PrivacyX),
-	}
-	tx.SetExpire(time.Duration(reqPub2Pri.GetExpire()))
-	txSize := types.Size(tx) + types.SignatureSize
-	realFee := int64((txSize+1023)>>types.Size1Kshiftlen) * types.GInt("MinFee")
-	tx.Fee = realFee
-	tx.Sign(int32(operater.GetSignType()), priv)
-
-	reply, err := operater.GetAPI().SendTx(tx)
-	if err != nil {
-		bizlog.Error("transPub2PriV2", "Send err", err)
-		return nil, err
-	}
-	return reply, err
-}
-
-func (policy *privacyPolicy) sendPrivacy2PrivacyTransaction(privacy2privacy *privacytypes.ReqPri2Pri) (*types.Reply, error) {
-	if ok, err := policy.getWalletOperate().CheckWalletStatus(); !ok {
-		bizlog.Error("sendPrivacy2PrivacyTransaction", "CheckWalletStatus error", err)
-		return nil, err
-	}
-	if ok, err := policy.isRescanUtxosFlagScaning(); ok {
-		bizlog.Error("sendPrivacy2PrivacyTransaction", "isRescanUtxosFlagScaning error", err)
-		return nil, err
-	}
-	if privacy2privacy == nil {
-		bizlog.Error("sendPrivacy2PrivacyTransaction input para is nil")
-		return nil, types.ErrInvalidParam
-	}
-	if !checkAmountValid(privacy2privacy.GetAmount()) {
-		bizlog.Error("sendPrivacy2PrivacyTransaction", "invalid amount ", privacy2privacy.GetAmount())
-		return nil, types.ErrAmount
-	}
-
-	privacyInfo, err := policy.getPrivacykeyPair(privacy2privacy.GetSender())
-	if err != nil {
-		bizlog.Error("sendPrivacy2PrivacyTransaction", "getPrivacykeyPair error ", err)
-		return nil, err
-	}
-
-	return policy.transPri2PriV2(privacyInfo, privacy2privacy)
-}
-func (policy *privacyPolicy) transPri2PriV2(privacykeyParirs *privacy.Privacy, reqPri2Pri *privacytypes.ReqPri2Pri) (*types.Reply, error) {
-	buildInfo := &buildInputInfo{
-		tokenname: reqPri2Pri.Tokenname,
-		sender:    reqPri2Pri.Sender,
-		amount:    reqPri2Pri.Amount + privacytypes.PrivacyTxFee,
-		mixcount:  reqPri2Pri.Mixin,
-	}
-
-	//step 1,buildInput
-	privacyInput, utxosInKeyInput, realkeyInputSlice, selectedUtxo, err := policy.buildInput(privacykeyParirs, buildInfo)
-	if err != nil {
-		bizlog.Error("transPri2PriV2", "buildInput error", err)
-		return nil, err
-	}
-
-	//step 2,generateOuts
-	viewPublicSlice, spendPublicSlice, err := parseViewSpendPubKeyPair(reqPri2Pri.Pubkeypair)
-	if err != nil {
-		bizlog.Error("transPub2Pri", "parseViewSpendPubKeyPair  ", err)
-		return nil, err
-	}
-
-	viewPub4change, spendPub4change := privacykeyParirs.ViewPubkey.Bytes(), privacykeyParirs.SpendPubkey.Bytes()
-	viewPublic := (*[32]byte)(unsafe.Pointer(&viewPublicSlice[0]))
-	spendPublic := (*[32]byte)(unsafe.Pointer(&spendPublicSlice[0]))
-	viewPub4chgPtr := (*[32]byte)(unsafe.Pointer(&viewPub4change[0]))
-	spendPub4chgPtr := (*[32]byte)(unsafe.Pointer(&spendPub4change[0]))
-
-	selectedAmounTotal := int64(0)
-	for _, input := range privacyInput.Keyinput {
-		selectedAmounTotal += input.Amount
-	}
-	//构造输出UTXO
-	privacyOutput, err := generateOuts(viewPublic, spendPublic, viewPub4chgPtr, spendPub4chgPtr, reqPri2Pri.Amount, selectedAmounTotal, privacytypes.PrivacyTxFee)
-	if err != nil {
-		bizlog.Error("transPub2Pri", "generateOuts  ", err)
-		return nil, err
-	}
-
-	operater := policy.getWalletOperate()
-	value := &privacytypes.Privacy2Privacy{
-		Tokenname: reqPri2Pri.Tokenname,
-		Amount:    reqPri2Pri.Amount,
-		Note:      reqPri2Pri.Note,
-		Input:     privacyInput,
-		Output:    privacyOutput,
-	}
-	action := &privacytypes.PrivacyAction{
-		Ty:    privacytypes.ActionPrivacy2Privacy,
-		Value: &privacytypes.PrivacyAction_Privacy2Privacy{Privacy2Privacy: value},
-	}
-
-	tx := &types.Transaction{
-		Execer:  []byte(privacytypes.PrivacyX),
-		Payload: types.Encode(action),
-		Fee:     privacytypes.PrivacyTxFee,
-		Nonce:   operater.Nonce(),
-		// TODO: 采用隐私合约地址来设定目标合约接收的目标地址,让验证通过
-		To: address.ExecAddress(privacytypes.PrivacyX),
-	}
-	tx.SetExpire(time.Duration(reqPri2Pri.GetExpire()))
-	//完成了input和output的添加之后，即已经完成了交易基本内容的添加，
-	//这时候就需要进行交易的签名了
-	err = policy.signatureTx(tx, privacyInput, utxosInKeyInput, realkeyInputSlice)
-	if err != nil {
-		return nil, err
-	}
-	reply, err := operater.GetAPI().SendTx(tx)
-	if err != nil {
-		bizlog.Error("transPub2Pri", "SendTx  ", err)
-		return nil, err
-	}
-	policy.saveFTXOInfo(tx, reqPri2Pri.Tokenname, reqPri2Pri.Sender, hex.EncodeToString(tx.Hash()), selectedUtxo)
-	return reply, nil
-}
-
 func (policy *privacyPolicy) signatureTx(tx *types.Transaction, privacyInput *privacytypes.PrivacyInput, utxosInKeyInput []*privacytypes.UTXOBasics, realkeyInputSlice []*privacytypes.RealKeyInput) (err error) {
 	tx.Signature = nil
 	data := types.Encode(tx)
@@ -1165,110 +996,11 @@ func (policy *privacyPolicy) signatureTx(tx *types.Transaction, privacyInput *pr
 		Ty:        privacytypes.RingBaseonED25519,
 		Signature: ringSignData,
 		// 这里填的是隐私合约的公钥，让框架保持一致
-		Pubkey: address.ExecPubKey(privacytypes.PrivacyX),
+		Pubkey: address.ExecPubKey(types.ExecName(privacytypes.PrivacyX)),
 	}
 	return nil
 }
 
-func (policy *privacyPolicy) sendPrivacy2PublicTransaction(privacy2Pub *privacytypes.ReqPri2Pub) (*types.Reply, error) {
-	if ok, err := policy.getWalletOperate().CheckWalletStatus(); !ok {
-		bizlog.Error("sendPrivacy2PublicTransaction", "CheckWalletStatus error", err)
-		return nil, err
-	}
-	if ok, err := policy.isRescanUtxosFlagScaning(); ok {
-		bizlog.Error("sendPrivacy2PublicTransaction", "isRescanUtxosFlagScaning error", err)
-		return nil, err
-	}
-	if privacy2Pub == nil {
-		bizlog.Error("privacy2privacy input para is nil")
-		return nil, types.ErrInvalidParam
-	}
-	if !checkAmountValid(privacy2Pub.GetAmount()) {
-		return nil, types.ErrAmount
-	}
-	//get 'a'
-	privacyInfo, err := policy.getPrivacykeyPair(privacy2Pub.GetSender())
-	if err != nil {
-		bizlog.Error("sendPrivacy2PublicTransaction", "getPrivacykeyPair error", err)
-		return nil, err
-	}
-
-	return policy.transPri2PubV2(privacyInfo, privacy2Pub)
-}
-
-func (policy *privacyPolicy) transPri2PubV2(privacykeyParirs *privacy.Privacy, reqPri2Pub *privacytypes.ReqPri2Pub) (*types.Reply, error) {
-	buildInfo := &buildInputInfo{
-		tokenname: reqPri2Pub.Tokenname,
-		sender:    reqPri2Pub.Sender,
-		amount:    reqPri2Pub.Amount + privacytypes.PrivacyTxFee,
-		mixcount:  reqPri2Pub.Mixin,
-	}
-	//step 1,buildInput
-	privacyInput, utxosInKeyInput, realkeyInputSlice, selectedUtxo, err := policy.buildInput(privacykeyParirs, buildInfo)
-	if err != nil {
-		bizlog.Error("transPri2PubV2", "buildInput error", err)
-		return nil, err
-	}
-
-	viewPub4change, spendPub4change := privacykeyParirs.ViewPubkey.Bytes(), privacykeyParirs.SpendPubkey.Bytes()
-	viewPub4chgPtr := (*[32]byte)(unsafe.Pointer(&viewPub4change[0]))
-	spendPub4chgPtr := (*[32]byte)(unsafe.Pointer(&spendPub4change[0]))
-
-	selectedAmounTotal := int64(0)
-	for _, input := range privacyInput.Keyinput {
-		if input.Amount <= 0 {
-			return nil, types.ErrAmount
-		}
-		selectedAmounTotal += input.Amount
-	}
-	changeAmount := selectedAmounTotal - reqPri2Pub.Amount
-	//step 2,generateOuts
-	//构造输出UTXO,只生成找零的UTXO
-	privacyOutput, err := generateOuts(nil, nil, viewPub4chgPtr, spendPub4chgPtr, 0, changeAmount, privacytypes.PrivacyTxFee)
-	if err != nil {
-		bizlog.Error("transPri2PubV2", "generateOuts error", err)
-		return nil, err
-	}
-
-	operater := policy.getWalletOperate()
-	value := &privacytypes.Privacy2Public{
-		Tokenname: reqPri2Pub.Tokenname,
-		Amount:    reqPri2Pub.Amount,
-		Note:      reqPri2Pub.Note,
-		Input:     privacyInput,
-		Output:    privacyOutput,
-	}
-	action := &privacytypes.PrivacyAction{
-		Ty:    privacytypes.ActionPrivacy2Public,
-		Value: &privacytypes.PrivacyAction_Privacy2Public{Privacy2Public: value},
-	}
-
-	tx := &types.Transaction{
-		Execer:  []byte(privacytypes.PrivacyX),
-		Payload: types.Encode(action),
-		Fee:     privacytypes.PrivacyTxFee,
-		Nonce:   operater.Nonce(),
-		To:      reqPri2Pub.Receiver,
-	}
-	tx.SetExpire(time.Duration(reqPri2Pub.GetExpire()))
-	//step 3,generate ring signature
-	err = policy.signatureTx(tx, privacyInput, utxosInKeyInput, realkeyInputSlice)
-	if err != nil {
-		bizlog.Error("transPri2PubV2", "signatureTx error", err)
-		return nil, err
-	}
-
-	reply, err := operater.GetAPI().SendTx(tx)
-	if err != nil {
-		bizlog.Error("transPri2PubV2", "SendTx error", err)
-		return nil, err
-	}
-	txhashstr := hex.EncodeToString(tx.Hash())
-	policy.saveFTXOInfo(tx, reqPri2Pub.Tokenname, reqPri2Pub.Sender, txhashstr, selectedUtxo)
-	bizlog.Info("transPri2PubV2", "txhash", txhashstr)
-	return reply, nil
-}
-
 func (policy *privacyPolicy) buildAndStoreWalletTxDetail(param *buildStoreWalletTxDetailParam) {
 	blockheight := param.block.Block.Height*maxTxNumPerBlock + int64(param.index)
 	heightstr := fmt.Sprintf("%018d", blockheight)

plugin/dapp/privacy/wallet/privacybizpolicy_test.go

@@ -360,117 +360,6 @@ func Test_CreateUTXOs(t *testing.T) {
 	}
 }
 
-func Test_SendPublic2PrivacyTransaction(t *testing.T) {
-	mock := &testDataMock{mockMempool: true}
-	mock.init()
-	mock.enablePrivacy()
-
-	testCases := []struct {
-		req       *ty.ReqPub2Pri
-		needReply *types.Reply
-		needError error
-	}{
-		{
-			needError: types.ErrInvalidParam,
-		},
-		{
-			req: &ty.ReqPub2Pri{
-				Tokenname:  types.BTY,
-				Amount:     10 * types.Coin,
-				Sender:     testAddrs[0],
-				Pubkeypair: testPubkeyPairs[0],
-			},
-			needReply: &types.Reply{IsOk: true},
-			needError: types.ErrAddrNotExist,
-		},
-	}
-
-	for index, testCase := range testCases {
-		_, getErr := mock.wallet.GetAPI().ExecWalletFunc(ty.PrivacyX, "Public2Privacy", testCase.req)
-		require.Equalf(t, getErr, testCase.needError, "Publick2Privacy test case index %d", index)
-	}
-}
-
-func Test_SendPrivacy2PrivacyTransaction(t *testing.T) {
-	mock := &testDataMock{
-		mockMempool:    true,
-		mockBlockChain: true,
-	}
-	mock.init()
-	mock.enablePrivacy()
-	// 创建辅助对象
-	privacyMock := privacy.PrivacyMock{}
-	privacyMock.Init(mock.wallet, mock.password)
-	// 创建几条可用UTXO
-	privacyMock.CreateUTXOs(testAddrs[0], testPubkeyPairs[0], 17*types.Coin, 10000, 5)
-	mock.setBlockChainHeight(10020)
-
-	testCases := []struct {
-		req       *ty.ReqPri2Pri
-		needReply *types.Reply
-		needError error
-	}{
-		{
-			needError: types.ErrInvalidParam,
-		},
-		{
-			req: &ty.ReqPri2Pri{
-				Tokenname:  types.BTY,
-				Amount:     10 * types.Coin,
-				Sender:     testAddrs[0],
-				Pubkeypair: testPubkeyPairs[1],
-			},
-			needReply: &types.Reply{IsOk: true},
-			needError: types.ErrAddrNotExist,
-		},
-	}
-
-	for index, testCase := range testCases {
-		_, getErr := mock.wallet.GetAPI().ExecWalletFunc(ty.PrivacyX, "Privacy2Privacy", testCase.req)
-		require.Equalf(t, getErr, testCase.needError, "Privacy2Privacy test case index %d", index)
-	}
-}
-
-func Test_SendPrivacy2PublicTransaction(t *testing.T) {
-	mock := &testDataMock{
-		mockMempool:    true,
-		mockBlockChain: true,
-	}
-	mock.init()
-	mock.enablePrivacy()
-	// 创建辅助对象
-	privacyMock := privacy.PrivacyMock{}
-	privacyMock.Init(mock.wallet, mock.password)
-	// 创建几条可用UTXO
-	privacyMock.CreateUTXOs(testAddrs[0], testPubkeyPairs[0], 17*types.Coin, 10000, 5)
-	mock.setBlockChainHeight(10020)
-
-	testCases := []struct {
-		req       *ty.ReqPri2Pub
-		needReply *types.Reply
-		needError error
-	}{
-		{
-			needError: types.ErrInvalidParam,
-		},
-		{
-			req: &ty.ReqPri2Pub{
-				Tokenname: types.BTY,
-				Amount:    10 * types.Coin,
-				Sender:    testAddrs[0],
-				Receiver:  testAddrs[0],
-			},
-			needReply: &types.Reply{IsOk: true},
-			needError: types.ErrAddrNotExist,
-		},
-	}
-
-	for index, testCase := range testCases {
-		_, getErr := mock.wallet.GetAPI().ExecWalletFunc(ty.PrivacyX, "Privacy2Public", testCase.req)
-		require.Equalf(t, getErr, testCase.needError, "Privacy2Public test case index %d", index)
-	}
-}
-
 func Test_CreateTransaction(t *testing.T) {
 	mock := &testDataMock{
 		mockMempool:    true,

plugin/dapp/ticket/commands/ticket.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/33cn/chain33/common"
 	"github.com/33cn/chain33/rpc/jsonclient"
 	rpctypes "github.com/33cn/chain33/rpc/types"
 	"github.com/33cn/chain33/types"
@@ -25,7 +24,6 @@ func TicketCmd() *cobra.Command {
 		Short: "Ticket management",
 		Args:  cobra.MinimumNArgs(1),
 	}
-
 	cmd.AddCommand(
 		BindMinerCmd(),
 		CountTicketCmd(),
@@ -130,7 +128,7 @@ func closeTicket(cmd *cobra.Command, args []string) {
 		MinerAddress: bindAddr,
 	}
 
-	var res types.ReplyHashes
+	var res rpctypes.ReplyHashes
 	rpc, err := jsonclient.NewJSONClient(rpcLaddr)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
@@ -146,12 +144,7 @@ func closeTicket(cmd *cobra.Command, args []string) {
 		return
 	}
 
-	var tx txHashes
-	for _, hash := range res.Hashes {
-		tx.Hashes = append(tx.Hashes, common.ToHex(hash))
-	}
-
-	data, err := json.MarshalIndent(tx, "", "    ")
+	data, err := json.MarshalIndent(res, "", "    ")
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		return

plugin/dapp/ticket/commands/types.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.
-
-package commands
-
-type txHashes struct {
-	Hashes []string `json:"hashes"`
-}

plugin/dapp/ticket/rpc/jrpc_channel_test.go

@@ -46,13 +46,13 @@ func TestJRPCChannel(t *testing.T) {
 }
 
 func testCountTicketCmd(t *testing.T, jrpc *jsonclient.JSONClient) error {
-	var res types.ReplyHashes
-	return jrpc.Call("ticket.CloseTickets", nil, &res)
+	var res int64
+	return jrpc.Call("ticket.GetTicketCount", nil, &res)
 }
 
 func testCloseTicketCmd(t *testing.T, jrpc *jsonclient.JSONClient) error {
-	var res int64
-	return jrpc.Call("ticket.GetTicketCount", nil, &res)
+	var res types.ReplyHashes
+	return jrpc.Call("ticket.CloseTickets", nil, &res)
 }
 
 func testGetColdAddrByMinerCmd(t *testing.T, jrpc *jsonclient.JSONClient) error {

plugin/dapp/ticket/rpc/rpc.go

@@ -5,8 +5,6 @@
 package rpc
 
 import (
-	"encoding/hex"
-
 	"github.com/33cn/chain33/common"
 	"github.com/33cn/chain33/common/address"
 	rpctypes "github.com/33cn/chain33/rpc/types"
@@ -115,7 +113,7 @@ func (c *Jrpc) CloseTickets(in *ty.TicketClose, result *interface{}) error {
 	}
 	var hashes rpctypes.ReplyHashes
 	for _, has := range resp.Hashes {
-		hashes.Hashes = append(hashes.Hashes, hex.EncodeToString(has))
+		hashes.Hashes = append(hashes.Hashes, common.ToHex(has))
 	}
 	*result = &hashes
 	return nil

plugin/dapp/ticket/rpc/rpc_real_test.go

@@ -8,9 +8,12 @@ package rpc_test
 import (
 	"testing"
 
+	rpctypes "github.com/33cn/chain33/rpc/types"
 	_ "github.com/33cn/chain33/system"
 	"github.com/33cn/chain33/util/testnode"
 	_ "github.com/33cn/plugin/plugin"
+	ty "github.com/33cn/plugin/plugin/dapp/ticket/types"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestNewTicket(t *testing.T) {
@@ -19,4 +22,10 @@ func TestNewTicket(t *testing.T) {
 	mock33 := testnode.NewWithConfig(cfg, sub, nil)
 	defer mock33.Close()
 	mock33.WaitHeight(5)
+	mock33.Listen()
+	//选票(可以用hotwallet 关闭选票)
+	in := &ty.TicketClose{MinerAddress: mock33.GetHotAddress()}
+	var res rpctypes.ReplyHashes
+	err := mock33.GetJSONC().Call("ticket.CloseTickets", in, &res)
+	assert.Nil(t, err)
 }

vendor/github.com/33cn/chain33/build/autotest/gitlabci/gitlab-ci-autotest.sh

@@ -214,7 +214,7 @@ function auto_test() {
     fi
 
     echo "=========== #config token blacklist ============="
-    rawData=$(${CLI} config config_tx -k token-blacklist -o add -v BTC)
+    rawData=$(${CLI} config config_tx -c token-blacklist -o add -v BTC)
     signData=$(${CLI} wallet sign -d "${rawData}" -k 0xc34b5d9d44ac7b754806f761d3d4d2c4fe5214f6b074c19f069c4f5c2a29c8cc)
     hash=$(${CLI} wallet send -d "${signData}")
     block_wait "${CLI}" 2

vendor/github.com/33cn/chain33/build/autotest/jerkinsci/jerkins-ci-autotest.sh

@@ -130,7 +130,7 @@ function start_chain33() {
     fi
 
     echo "=========== #config token blacklist ============="
-    rawData=$(${CLI} config config_tx -k token-blacklist -o add -v BTC)
+    rawData=$(${CLI} config config_tx -c token-blacklist -o add -v BTC)
     signData=$(${CLI} wallet sign -d "${rawData}" -k 0xc34b5d9d44ac7b754806f761d3d4d2c4fe5214f6b074c19f069c4f5c2a29c8cc)
     hash=$(${CLI} wallet send -d "${signData}")
 

vendor/github.com/33cn/chain33/build/autotest/local/local-autotest.sh

@@ -143,7 +143,7 @@ function start_chain33() {
     fi
 
     echo "=========== #config token blacklist ============="
-    rawData=$(${CLI} config config_tx -k token-blacklist -o add -v BTC)
+    rawData=$(${CLI} config config_tx -c token-blacklist -o add -v BTC)
     signData=$(${CLI} wallet sign -d "${rawData}" -k 0xc34b5d9d44ac7b754806f761d3d4d2c4fe5214f6b074c19f069c4f5c2a29c8cc)
     hash=$(${CLI} wallet send -d "${signData}")
 

vendor/github.com/33cn/chain33/build/util/black_list.sh

 #!/usr/bin/env bash
-guodun="$(../chain33-cli config config_tx -k token-blacklist -o add -v BTY --paraName "user.p.guodun.")"
-fzmtest="$(../chain33-cli config config_tx -k token-blacklist -o add -v BTY --paraName "user.p.fzmtest.")"
+guodun="$(../chain33-cli config config_tx -c token-blacklist -o add -v BTY --paraName "user.p.guodun.")"
+fzmtest="$(../chain33-cli config config_tx -c token-blacklist -o add -v BTY --paraName "user.p.fzmtest.")"
 echo "cli wallet sign -d $guodun -a 1JmFaA6unrCFYEWPGRi7uuXY1KthTJxJEP -e 1h > d:/b.txt"
 echo "cli wallet sign -d $fzmtest -a 1JmFaA6unrCFYEWPGRi7uuXY1KthTJxJEP -e 1h >> d:/b.txt"

vendor/github.com/33cn/chain33/build/util/manage.sh

 #!/usr/bin/env bash
-fzmtest="$(../chain33-cli --paraName user.p.fzmtest. config config_tx -k lottery-creator -o add -v 15nn4D2ppUj8tmyHfdm8g4EvtqpBYUS7DM)"
+fzmtest="$(../chain33-cli --paraName user.p.fzmtest. config config_tx -c lottery-creator -o add -v 15nn4D2ppUj8tmyHfdm8g4EvtqpBYUS7DM)"
 echo "cli wallet sign -d $fzmtest -a 1JmFaA6unrCFYEWPGRi7uuXY1KthTJxJEP -e 1h >> d:/b.txt"

vendor/github.com/33cn/chain33/build/util/manage_list.sh

 #!/usr/bin/env bash
-guodun1=$(../chain33-cli config config_tx -k token-blacklist -o add -v BTY --paraName "user.p.$2.")
-guodun2=$(../chain33-cli config config_tx -k token-finisher -o add -v "$1" --paraName "user.p.$2.")
+guodun1=$(../chain33-cli config config_tx -c token-blacklist -o add -v BTY --paraName "user.p.$2.")
+guodun2=$(../chain33-cli config config_tx -c token-finisher -o add -v "$1" --paraName "user.p.$2.")
 echo "cli wallet sign -d $guodun1 -a 1JmFaA6unrCFYEWPGRi7uuXY1KthTJxJEP -e 1h > d:/b.txt"
 echo "cli wallet sign -d $guodun2 -a 1JmFaA6unrCFYEWPGRi7uuXY1KthTJxJEP -e 1h >> d:/b.txt"

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

@@ -88,9 +88,9 @@ func isAllowLocalKey2(execer []byte, key []byte) error {
 		err := errors.Wrapf(types.ErrLocalKeyLen, "isAllowLocalKey too short. key=%s exec=%s", string(key), string(execer))
 		return err
 	}
-	if key[minkeylen-1] != '-' {
+	if key[minkeylen-1] != '-' || key[len(types.LocalPrefix)] != '-' {
 		err := errors.Wrapf(types.ErrLocalPrefix,
-			"isAllowLocalKey prefix last char is not '-'. key=%s exec=%s minkeylen=%d title=%s",
+			"isAllowLocalKey prefix last char or separator is not '-'. key=%s exec=%s minkeylen=%d title=%s",
 			string(key), string(execer), minkeylen, types.GetTitle())
 		return err
 	}

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

@@ -130,6 +130,8 @@ func TestKeyAllow_evm(t *testing.T) {
 func TestKeyLocalAllow(t *testing.T) {
 	err := isAllowLocalKey([]byte("token"), []byte("LODB-token-"))
 	assert.Equal(t, err, types.ErrLocalKeyLen)
+	err = isAllowLocalKey([]byte("token"), []byte("LODB_token-a"))
+	assert.Equal(t, err, types.ErrLocalPrefix)
 	err = isAllowLocalKey([]byte("token"), []byte("LODB-token-a"))
 	assert.Nil(t, err)
 	err = isAllowLocalKey([]byte(""), []byte("LODB--a"))

vendor/github.com/33cn/chain33/rpc/grpcclient/api_test.go

@@ -46,6 +46,37 @@ func TestMultipleGRPC(t *testing.T) {
 	assert.Equal(t, reply.Hash, []byte("hello"))
 }
 
+func TestMultipleGRPCLocalhost(t *testing.T) {
+	qapi := new(mocks.QueueProtocolAPI)
+	qapi.On("Query", "ticket", "RandNumHash", mock.Anything).Return(&types.ReplyHash{Hash: []byte("hello")}, nil)
+	//testnode setup
+	rpcCfg := new(types.RPC)
+	rpcCfg.GrpcBindAddr = "localhost:8003"
+	rpcCfg.JrpcBindAddr = "localhost:8004"
+	rpcCfg.MainnetJrpcAddr = rpcCfg.JrpcBindAddr
+	rpcCfg.Whitelist = []string{"localhost", "0.0.0.0"}
+	rpcCfg.JrpcFuncWhitelist = []string{"*"}
+	rpcCfg.GrpcFuncWhitelist = []string{"*"}
+	rpc.InitCfg(rpcCfg)
+	server := rpc.NewGRpcServer(&qmocks.Client{}, qapi)
+	assert.NotNil(t, server)
+	go server.Listen()
+	time.Sleep(time.Second)
+	//一个IP 有效，一个IP 无效
+	paraRemoteGrpcClient := "localhost:8004,localhost:8003,localhost"
+	conn, err := grpc.Dial(grpcclient.NewMultipleURL(paraRemoteGrpcClient), grpc.WithInsecure())
+	assert.Nil(t, err)
+	grpcClient := types.NewChain33Client(conn)
+	param := &types.ReqRandHash{
+		ExecName: "ticket",
+		BlockNum: 5,
+		Hash:     []byte("hello"),
+	}
+	reply, err := grpcClient.QueryRandNum(context.Background(), param)
+	assert.Nil(t, err)
+	assert.Equal(t, reply.Hash, []byte("hello"))
+}
+
 func TestNewParaClient(t *testing.T) {
 	qapi := new(mocks.QueueProtocolAPI)
 	qapi.On("Query", "ticket", "RandNumHash", mock.Anything).Return(&types.ReplyHash{Hash: []byte("hello")}, nil)

vendor/github.com/33cn/chain33/rpc/grpcclient/resolver.go

@@ -62,7 +62,7 @@ func (*multipleBuilder) Build(target resolver.Target, cc resolver.ClientConn, op
 			return nil, err
 		}
 
-		if net.ParseIP(host) != nil {
+		if host != "" {
 			r.addrs = append(r.addrs, resolver.Address{Addr: host + ":" + port})
 		}
 	}

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

@@ -47,8 +47,8 @@ func ConfigTxCmd() *cobra.Command {
 }
 
 func addConfigTxFlags(cmd *cobra.Command) {
-	cmd.Flags().StringP("key", "k", "", "key string")
-	cmd.MarkFlagRequired("key")
+	cmd.Flags().StringP("config_key", "c", "", "config key string")
+	cmd.MarkFlagRequired("config_key")
 
 	cmd.Flags().StringP("operation", "o", "", "adding or deletion operation")
 	cmd.MarkFlagRequired("operation")
@@ -60,7 +60,7 @@ func addConfigTxFlags(cmd *cobra.Command) {
 
 func configTx(cmd *cobra.Command, args []string) {
 	paraName, _ := cmd.Flags().GetString("paraName")
-	key, _ := cmd.Flags().GetString("key")
+	key, _ := cmd.Flags().GetString("config_key")
 	op, _ := cmd.Flags().GetString("operation")
 	opAddr, _ := cmd.Flags().GetString("value")