privacy:update privacy tx storing

plugin/dapp/privacy/wallet/privacy.go

@@ -8,13 +8,14 @@ import (
 	"bytes"
 	"encoding/hex"
 	"errors"
-	"fmt"
 	"sort"
 	"strings"
 	"sync"
 	"time"
 	"unsafe"
 
+	"github.com/33cn/chain33/system/dapp"
+
 	"github.com/33cn/chain33/common"
 	"github.com/33cn/chain33/common/address"
 	"github.com/33cn/chain33/common/crypto"
@@ -965,46 +966,42 @@ func (policy *privacyPolicy) signatureTx(tx *types.Transaction, privacyInput *pr
 }
 
 func (policy *privacyPolicy) buildAndStoreWalletTxDetail(param *buildStoreWalletTxDetailParam) {
-	blockheight := param.block.Block.Height*maxTxNumPerBlock + int64(param.index)
-	heightstr := fmt.Sprintf("%018d", blockheight)
-	bizlog.Debug("buildAndStoreWalletTxDetail", "heightstr", heightstr, "addDelType", param.addDelType)
-	if AddTx == param.addDelType {
+
+	txInfo := param.txInfo
+	heightstr := dapp.HeightIndexStr(txInfo.blockHeight, int64(txInfo.txIndex))
+	bizlog.Debug("buildAndStoreWalletTxDetail", "heightstr", heightstr, "isRollBack", txInfo.isRollBack)
+	if !txInfo.isRollBack {
 		var txdetail types.WalletTxDetail
 		key := calcTxKey(heightstr)
-		txdetail.Tx = param.tx
-		txdetail.Height = param.block.Block.Height
-		txdetail.Index = int64(param.index)
-		txdetail.Receipt = param.block.Receipts[param.index]
-		txdetail.Blocktime = param.block.Block.BlockTime
+		txdetail.Tx = txInfo.tx
+		txdetail.Height = txInfo.blockHeight
+		txdetail.Index = int64(txInfo.txIndex)
+		txdetail.Receipt = txInfo.blockDetail.Receipts[txInfo.txIndex]
+		txdetail.Blocktime = txInfo.blockDetail.Block.BlockTime
 
-		txdetail.ActionName = txdetail.Tx.ActionName()
-		txdetail.Amount, _ = param.tx.Amount()
-		txdetail.Fromaddr = param.senderRecver
-		//txdetail.Spendrecv = param.utxos
+		txdetail.ActionName = txInfo.actionName
+		txdetail.Amount, _ = txInfo.tx.Amount()
+		txdetail.Fromaddr = param.addr
 
 		txdetailbyte, err := proto.Marshal(&txdetail)
 		if err != nil {
-			bizlog.Error("buildAndStoreWalletTxDetail err", "Height", param.block.Block.Height, "index", param.index)
+			bizlog.Error("buildAndStoreWalletTxDetail err", "Height", txInfo.blockHeight, "txHash", txInfo.txHashHex)
 			return
 		}
 
-		param.newbatch.Set(key, txdetailbyte)
-		if param.isprivacy {
-			//额外存储可以快速定位到接收隐私的交易
-			if sendTx == param.sendRecvFlag {
-				param.newbatch.Set(calcSendPrivacyTxKey(param.assetExec, param.tokenname, param.senderRecver, heightstr), key)
-			} else if recvTx == param.sendRecvFlag {
-				param.newbatch.Set(calcRecvPrivacyTxKey(param.assetExec, param.tokenname, param.senderRecver, heightstr), key)
-			}
+		txInfo.batch.Set(key, txdetailbyte)
+		//额外存储可以快速定位到接收隐私的交易
+		if sendTx == param.sendRecvFlag {
+			txInfo.batch.Set(calcSendPrivacyTxKey(txInfo.assetExec, txInfo.assetSymbol, param.addr, heightstr), key)
+		} else if recvTx == param.sendRecvFlag {
+			txInfo.batch.Set(calcRecvPrivacyTxKey(txInfo.assetExec, txInfo.assetSymbol, param.addr, heightstr), key)
 		}
 	} else {
-		param.newbatch.Delete(calcTxKey(heightstr))
-		if param.isprivacy {
-			if sendTx == param.sendRecvFlag {
-				param.newbatch.Delete(calcSendPrivacyTxKey(param.assetExec, param.tokenname, param.senderRecver, heightstr))
-			} else if recvTx == param.sendRecvFlag {
-				param.newbatch.Delete(calcRecvPrivacyTxKey(param.assetExec, param.tokenname, param.senderRecver, heightstr))
-			}
+		txInfo.batch.Delete(calcTxKey(heightstr))
+		if sendTx == param.sendRecvFlag {
+			txInfo.batch.Delete(calcSendPrivacyTxKey(txInfo.assetExec, txInfo.assetSymbol, param.addr, heightstr))
+		} else if recvTx == param.sendRecvFlag {
+			txInfo.batch.Delete(calcRecvPrivacyTxKey(txInfo.assetExec, txInfo.assetSymbol, param.addr, heightstr))
 		}
 	}
 }
@@ -1055,193 +1052,229 @@ func (policy *privacyPolicy) checkWalletStoreData() {
 	}
 }
 
-func (policy *privacyPolicy) addDelPrivacyTxsFromBlock(tx *types.Transaction, index int32, block *types.BlockDetail, newbatch db.Batch, addDelType int32) {
-	txhash := tx.Hash()
-	txhashstr := hex.EncodeToString(txhash)
-	_, err := tx.Amount()
-	if err != nil {
-		bizlog.Error("addDelPrivacyTxsFromBlock", "txhash", txhashstr, "addDelType", addDelType, "index", index, "tx.Amount() error", err)
-		return
-	}
+func (policy *privacyPolicy) addDelPrivacyTxsFromBlock(tx *types.Transaction, index int32, block *types.BlockDetail, batch db.Batch, addDelType int32) {
 
-	cfg := policy.getWalletOperate().GetAPI().GetConfig()
-	txExecRes := block.Receipts[index].Ty
-	var privateAction privacytypes.PrivacyAction
-	if err := types.Decode(tx.GetPayload(), &privateAction); err != nil {
-		bizlog.Error("addDelPrivacyTxsFromBlock", "txhash", txhashstr, "addDelType", addDelType, "index", index, "Decode tx.GetPayload() error", err)
+	privacyPairs, err := policy.getPrivacyKeyPairs()
+	//钱包未开启隐私功能，或不存在地址直接返回
+	if len(privacyPairs) == 0 {
+		bizlog.Debug("addDelPrivacyTxsFromBlock", "getPrivacyKeyPairs err", err)
 		return
 	}
-	bizlog.Info("addDelPrivacyTxsFromBlock", "Enter addDelPrivacyTxsFromBlock txhash", txhashstr, "index", index, "addDelType", addDelType)
 
-	privacyOutput := privateAction.GetOutput()
-	if privacyOutput == nil {
-		bizlog.Error("addDelPrivacyTxsFromBlock", "txhash", txhashstr, "addDelType", addDelType, "index", index, "privacyOutput is", privacyOutput)
+	txhash := tx.Hash()
+	txhashHex := hex.EncodeToString(txhash)
+	var action privacytypes.PrivacyAction
+	if err := types.Decode(tx.GetPayload(), &action); err != nil {
+		bizlog.Error("addDelPrivacyTxsFromBlock", "txhash", txhashHex, "addDelType", addDelType, "index", index, "Decode tx.GetPayload() error", err)
 		return
 	}
-	assetExec, tokenname := privateAction.GetAssetExecSymbol()
+
+	assetExec, assetSymbol := action.GetAssetExecSymbol()
 	if assetExec == "" {
 		assetExec = "coins"
 	}
-	RpubKey := privacyOutput.GetRpubKeytx()
-
-	totalUtxosLeft := len(privacyOutput.Keyoutput)
-	//处理output
-	if privacyInfo, err := policy.getPrivacyKeyPairs(); err == nil {
-		matchedCount := 0
-		utxoProcessed := make([]bool, len(privacyOutput.Keyoutput))
-		for _, info := range privacyInfo {
-			privacykeyParirs := info.PrivacyKeyPair
-			matched4addr := false
-			var utxos []*privacytypes.UTXO
-			for indexoutput, output := range privacyOutput.Keyoutput {
-				if utxoProcessed[indexoutput] {
-					continue
-				}
-				priv, err := privacy.RecoverOnetimePriKey(RpubKey, privacykeyParirs.ViewPrivKey, privacykeyParirs.SpendPrivKey, int64(indexoutput))
-				if err == nil {
-					recoverPub := priv.PubKey().Bytes()[:]
-					if bytes.Equal(recoverPub, output.Onetimepubkey) {
-						//为了避免匹配成功之后不必要的验证计算，需要统计匹配次数
-						//因为目前只会往一个隐私账户转账，
-						//1.一般情况下，只会匹配一次，如果是往其他钱包账户转账，
-						//2.但是如果是往本钱包的其他地址转账，因为可能存在的change，会匹配2次
-						matched4addr = true
-						totalUtxosLeft--
-						utxoProcessed[indexoutput] = true
-						//只有当该交易执行成功才进行相应的UTXO的处理
-						if types.ExecOk == txExecRes {
-							if AddTx == addDelType {
-								info2store := &privacytypes.PrivacyDBStore{
-									AssetExec:        assetExec,
-									Txhash:           txhash,
-									Tokenname:        tokenname,
-									Amount:           output.Amount,
-									OutIndex:         int32(indexoutput),
-									TxPublicKeyR:     RpubKey,
-									OnetimePublicKey: output.Onetimepubkey,
-									Owner:            *info.Addr,
-									Height:           block.Block.Height,
-									Txindex:          index,
-									Blockhash:        block.Block.Hash(cfg),
-								}
-
-								utxoGlobalIndex := &privacytypes.UTXOGlobalIndex{
-									Outindex: int32(indexoutput),
-									Txhash:   txhash,
-								}
-
-								utxoCreated := &privacytypes.UTXO{
-									Amount: output.Amount,
-									UtxoBasic: &privacytypes.UTXOBasic{
-										UtxoGlobalIndex: utxoGlobalIndex,
-										OnetimePubkey:   output.Onetimepubkey,
-									},
-								}
-
-								utxos = append(utxos, utxoCreated)
-								policy.store.setUTXO(info.Addr, &txhashstr, indexoutput, info2store, newbatch)
-								bizlog.Info("addDelPrivacyTxsFromBlock", "add tx txhash", txhashstr, "setUTXO addr ", *info.Addr, "indexoutput", indexoutput)
-							} else {
-								policy.store.unsetUTXO(assetExec, tokenname, *info.Addr, txhashstr, indexoutput, newbatch)
-								bizlog.Info("addDelPrivacyTxsFromBlock", "delete tx txhash", txhashstr, "unsetUTXO addr ", *info.Addr, "indexoutput", indexoutput)
-							}
-						} else {
-							//对于执行失败的交易，只需要将该交易记录在钱包就行
-							bizlog.Error("addDelPrivacyTxsFromBlock", "txhash", txhashstr, "txExecRes", txExecRes)
-							break
-						}
-					}
-				} else {
-					bizlog.Error("addDelPrivacyTxsFromBlock", "txhash", txhashstr, "RecoverOnetimePriKey error", err)
+
+	txInfo := &privacyTxInfo{
+		tx:          tx,
+		blockDetail: block,
+		blockHeight: block.GetBlock().GetHeight(),
+		actionName:  action.GetActionName(),
+		actionTy:    action.GetTy(),
+		input:       action.GetInput(),
+		output:      action.GetOutput(),
+		txIndex:     index,
+		txHash:      txhash,
+		txHashHex:   txhashHex,
+		batch:       batch,
+		assetSymbol: assetSymbol,
+		assetExec:   assetExec,
+		isRollBack:  addDelType != AddTx,
+		isExecOk:    types.ExecOk == block.Receipts[index].Ty,
+	}
+
+	bizlog.Debug("addDelPrivacyTxsFromBlock", "txhash", txhashHex, "actionName", txInfo.actionName,
+		"index", index, "isRollBack", txInfo.isRollBack, "isExecOk", txInfo.isExecOk)
+
+	if txInfo.actionTy == privacytypes.ActionPublic2Privacy {
+
+		// 公对私的发送方是公开的，检测是否为本钱包地址
+		txFrom := tx.From()
+		for _, key := range privacyPairs {
+			if *key.Addr == txFrom {
+				param := &buildStoreWalletTxDetailParam{
+					txInfo:       txInfo,
+					addr:         txInfo.tx.From(),
+					sendRecvFlag: sendTx,
 				}
+				policy.buildAndStoreWalletTxDetail(param)
+				break
 			}
-			if matched4addr {
-				matchedCount++
-				//匹配次数达到2次，不再对本钱包中的其他地址进行匹配尝试
-				bizlog.Debug("addDelPrivacyTxsFromBlock", "txhash", txhashstr, "address", *info.Addr, "totalUtxosLeft", totalUtxosLeft, "matchedCount", matchedCount)
+		}
+		policy.processOutputUtxos(txFrom, privacyPairs, txInfo)
+	} else if txInfo.actionTy == privacytypes.ActionPrivacy2Privacy {
+
+		sender := policy.processInputUtxos(txInfo)
+		policy.processOutputUtxos(sender, privacyPairs, txInfo)
+	} else if txInfo.actionTy == privacytypes.ActionPrivacy2Public {
+		sender := policy.processInputUtxos(txInfo)
+		policy.processOutputUtxos(sender, privacyPairs, txInfo)
+		// 私有到公开的接收方是公开的，检测是否为本钱包地址
+		txTo := action.GetPrivacy2Public().GetTo()
+		for _, key := range privacyPairs {
+			if *key.Addr == txTo {
 				param := &buildStoreWalletTxDetailParam{
-					assetExec:    assetExec,
-					tokenname:    tokenname,
-					block:        block,
-					tx:           tx,
-					index:        int(index),
-					newbatch:     newbatch,
-					senderRecver: *info.Addr,
-					isprivacy:    true,
-					addDelType:   addDelType,
+					txInfo:       txInfo,
+					addr:         txTo,
 					sendRecvFlag: recvTx,
-					utxos:        utxos,
 				}
 				policy.buildAndStoreWalletTxDetail(param)
-				if 2 == matchedCount || 0 == totalUtxosLeft || types.ExecOk != txExecRes {
-					bizlog.Info("addDelPrivacyTxsFromBlock", "txhash", txhashstr, "Get matched privacy transfer for address address", *info.Addr, "totalUtxosLeft", totalUtxosLeft, "matchedCount", matchedCount)
-					break
-				}
+				break
 			}
 		}
 	}
+}
+
+func (policy *privacyPolicy) processInputUtxos(txInfo *privacyTxInfo) string {
+
+	bizlog.Debug("processInputUtxos", "txhash", txInfo.txHashHex, "actionName", txInfo.actionName, "isExecOk", txInfo.isExecOk, "isRollBack", txInfo.isRollBack)
+
+	// utxo发送者
+	utxoSender := ""
+	var err error
+	// 区块回滚
+	if txInfo.isRollBack {
+
+		//当发生交易回撤时，从记录的STXO中查找相关的交易，并将其重置为FTXO，因为该交易大概率会在其他区块中再次执行
+		stxosInOneTx, _, _ := policy.store.getWalletFtxoStxo(STXOs4Tx)
+		for _, stxo := range stxosInOneTx {
+			if stxo.Txhash != txInfo.txHashHex {
+				continue
+			}
+			if txInfo.isExecOk {
+				err = policy.store.moveSTXO2FTXO(txInfo.tx, txInfo.txHashHex, txInfo.batch)
+				utxoSender = stxo.Sender
+			}
+			if err != nil {
+				bizlog.Error("processInputUtxos", "txHash", txInfo.txHashHex, "moveSTXO2FTXO err", err)
+			}
+		}
+	} else {
 
-	//处理input,对于公对私的交易类型，只会出现在output类型处理中
-	//如果该隐私交易是本钱包中的地址发送出去的，则需要对相应的utxo进行处理 TODO:处理其他节点构造并发起的隐私input(需要比较keyimage)
-	if AddTx == addDelType {
 		ftxos, keys := policy.store.getFTXOlist()
 		for i, ftxo := range ftxos {
-			//查询确认该交易是否为记录的支付交易
-			if ftxo.Txhash != txhashstr {
+			if ftxo.Txhash != txInfo.txHashHex {
 				continue
 			}
-			if types.ExecOk == txExecRes && privacytypes.ActionPublic2Privacy != privateAction.Ty {
-				bizlog.Info("addDelPrivacyTxsFromBlock", "txhash", txhashstr, "addDelType", addDelType, "moveFTXO2STXO, key", string(keys[i]), "txExecRes", txExecRes)
-				policy.store.moveFTXO2STXO(keys[i], txhashstr, newbatch)
-			} else if types.ExecOk != txExecRes && privacytypes.ActionPublic2Privacy != privateAction.Ty {
-				//如果执行失败
-				bizlog.Info("PrivacyTrading AddDelPrivacyTxsFromBlock", "txhash", txhashstr, "addDelType", addDelType, "moveFTXO2UTXO, key", string(keys[i]), "txExecRes", txExecRes)
-				policy.store.moveFTXO2UTXO(keys[i], newbatch)
+
+			if txInfo.isExecOk {
+				err = policy.store.moveFTXO2STXO(keys[i], txInfo.txHashHex, txInfo.batch)
+			} else {
+				policy.store.moveFTXO2UTXO(keys[i], txInfo.batch)
 			}
-			//该交易正常执行完毕，删除对其的关注
-			param := &buildStoreWalletTxDetailParam{
-				assetExec:    assetExec,
-				tokenname:    tokenname,
-				block:        block,
-				tx:           tx,
-				index:        int(index),
-				newbatch:     newbatch,
-				senderRecver: ftxo.Sender,
-				isprivacy:    true,
-				addDelType:   addDelType,
-				sendRecvFlag: sendTx,
-				utxos:        nil,
+			utxoSender = ftxo.Sender
+			if err != nil {
+				bizlog.Error("processInputUtxos", "txHash", txInfo.txHashHex, "moveSTXO2FTXO err", err)
 			}
-			policy.buildAndStoreWalletTxDetail(param)
+
 		}
-	} else {
-		//当发生交易回撤时，从记录的STXO中查找相关的交易，并将其重置为FTXO，因为该交易大概率会在其他区块中再次执行
-		stxosInOneTx, _, _ := policy.store.getWalletFtxoStxo(STXOs4Tx)
-		for _, ftxo := range stxosInOneTx {
-			if ftxo.Txhash == txhashstr {
-				param := &buildStoreWalletTxDetailParam{
-					assetExec:    assetExec,
-					tokenname:    tokenname,
-					block:        block,
-					tx:           tx,
-					index:        int(index),
-					newbatch:     newbatch,
-					senderRecver: "",
-					isprivacy:    true,
-					addDelType:   addDelType,
-					sendRecvFlag: sendTx,
-					utxos:        nil,
-				}
+	}
+	// 解析出发送者是本地钱包地址，记录交易
+	if utxoSender != "" {
+		param := &buildStoreWalletTxDetailParam{
+			txInfo:       txInfo,
+			addr:         utxoSender,
+			sendRecvFlag: sendTx,
+		}
+		policy.buildAndStoreWalletTxDetail(param)
+	}
+	return utxoSender
+}
 
-				if types.ExecOk == txExecRes && privacytypes.ActionPublic2Privacy != privateAction.Ty {
-					bizlog.Info("addDelPrivacyTxsFromBlock", "txhash", txhashstr, "addDelType", addDelType, "moveSTXO2FTXO txExecRes", txExecRes)
-					policy.store.moveSTXO2FTXO(tx, txhashstr, newbatch)
-					policy.buildAndStoreWalletTxDetail(param)
-				} else if types.ExecOk != txExecRes && privacytypes.ActionPublic2Privacy != privateAction.Ty {
-					bizlog.Info("addDelPrivacyTxsFromBlock", "txhash", txhashstr, "addDelType", addDelType)
-					policy.buildAndStoreWalletTxDetail(param)
-				}
+func (policy *privacyPolicy) processOutputUtxos(utxoSender string, keys []addrAndprivacy, txInfo *privacyTxInfo) {
+
+	bizlog.Debug("processOutputUtxos", "txhash", txInfo.txHashHex, "actionName", txInfo.actionName, "isExecOK", txInfo.isExecOk, "isRollBack", txInfo.isRollBack)
+	if txInfo.output == nil {
+		return
+	}
+	var recvUtxos []*privacytypes.PrivacyDBStore
+	// check utxo owner
+	omitCheck := false
+	owner := ""
+	receivers := make(map[string]struct{})
+	for index, out := range txInfo.output.GetKeyoutput() {
+
+		for _, key := range keys {
+			if omitCheck {
+				break
+			}
+			owner = ""
+			priv, err := privacy.RecoverOnetimePriKey(txInfo.output.GetRpubKeytx(), key.PrivacyKeyPair.ViewPrivKey, key.PrivacyKeyPair.SpendPrivKey, int64(index))
+			if err != nil {
+				bizlog.Error("addDelPrivacyTxsFromBlock", "txhash", txInfo.txHashHex, "actionName", txInfo.actionName, "RecoverOnetimePriKey error", err)
+			}
+			if bytes.Equal(priv.PubKey().Bytes()[:], out.GetOnetimepubkey()) {
+				owner = *key.Addr
+				receivers[owner] = struct{}{}
+				break
 			}
 		}
+
+		if len(owner) > 0 {
+			info2store := &privacytypes.PrivacyDBStore{
+				AssetExec:        txInfo.assetExec,
+				Txhash:           txInfo.txHash,
+				Tokenname:        txInfo.assetSymbol,
+				Amount:           out.Amount,
+				OutIndex:         int32(index),
+				TxPublicKeyR:     txInfo.output.GetRpubKeytx(),
+				OnetimePublicKey: out.Onetimepubkey,
+				Owner:            owner,
+				Height:           txInfo.blockHeight,
+				Txindex:          txInfo.txIndex,
+			}
+			recvUtxos = append(recvUtxos, info2store)
+		}
+
+		// 公对私的utxo只属于一个地址，只需检测第一个utxo
+		if txInfo.actionTy == privacytypes.ActionPublic2Privacy {
+			omitCheck = true
+		}
+	}
+
+	// add or del utxo in wallet
+	for _, utxo := range recvUtxos {
+
+		if !txInfo.isExecOk {
+			//对于执行失败的交易，只需要将该交易记录在钱包就行
+			break
+		}
+		var err error
+		if !txInfo.isRollBack {
+			err = policy.store.setUTXO(utxo, txInfo.txHashHex, txInfo.batch)
+		} else {
+			err = policy.store.unsetUTXO(utxo.AssetExec, utxo.Tokenname, utxo.Owner, txInfo.txHashHex, int(utxo.OutIndex), txInfo.batch)
+		}
+
+		if err != nil {
+			bizlog.Error("processOutputUtxos", "txHash", txInfo.txHashHex, "actionName", txInfo.actionName, "isRollBack", txInfo.isRollBack, "setUtxoErr", err)
+		}
+	}
+	// handle recv tx index
+	for receiver := range receivers {
+		// 如果utxo接收者有2个，说明发送者和接收者都是本钱包地址，且存在找零情况
+		// 这里需要过滤utxo找零接收情况，找零接收不是实际的交易接收方
+		if len(receivers) > 1 && receiver == utxoSender {
+			continue
+		}
+		// 私到公转账utxo接收者只可能是找零情况，不需要记录
+		if txInfo.actionTy == privacytypes.ActionPrivacy2Public {
+			continue
+		}
+		param := &buildStoreWalletTxDetailParam{
+			txInfo:       txInfo,
+			addr:         receiver,
+			sendRecvFlag: recvTx,
+		}
+		policy.buildAndStoreWalletTxDetail(param)
 	}
 }

plugin/dapp/privacy/wallet/privacy_test.go

@@ -181,7 +181,7 @@ func (mock *PrivacyMock) CreateUTXOs(sender string, pubkeypair string, amount in
 					}
 
 					utxos = append(utxos, utxoCreated)
-					mock.store.setUTXO(info.Addr, &txhashstr, indexoutput, info2store, dbbatch)
+					mock.store.setUTXO(info2store, txhashstr, dbbatch)
 				}
 			}
 		}

plugin/dapp/privacy/wallet/privacybizpolicy.go

@@ -170,18 +170,28 @@ func (policy *privacyPolicy) SignTransaction(key crypto.PrivKey, req *types.ReqS
 	return
 }
 
+type privacyTxInfo struct {
+	tx          *types.Transaction
+	blockDetail *types.BlockDetail
+	actionTy    int32
+	actionName  string
+	input       *privacytypes.PrivacyInput
+	output      *privacytypes.PrivacyOutput
+	txIndex     int32
+	blockHeight int64
+	isExecOk    bool
+	isRollBack  bool
+	txHash      []byte
+	txHashHex   string
+	assetExec   string
+	assetSymbol string
+	batch       db.Batch
+}
+
 type buildStoreWalletTxDetailParam struct {
-	assetExec    string
-	tokenname    string
-	block        *types.BlockDetail
-	tx           *types.Transaction
-	index        int
-	newbatch     db.Batch
-	senderRecver string
-	isprivacy    bool
-	addDelType   int32
+	txInfo       *privacyTxInfo
+	addr         string
 	sendRecvFlag int32
-	utxos        []*privacytypes.UTXO
 }
 
 // OnAddBlockTx 响应区块交易添加的处理

plugin/dapp/privacy/wallet/privacystore.go

@@ -642,7 +642,7 @@ func (store *privacyStore) selectCurrentWalletPrivacyTx(txDetal *types.Transacti
 							}
 
 							utxos = append(utxos, utxoCreated)
-							store.setUTXO(info.Addr, &txhash, indexoutput, info2store, newbatch)
+							store.setUTXO(info2store, txhash, newbatch)
 						}
 					}
 				}
@@ -671,25 +671,17 @@ func (store *privacyStore) selectCurrentWalletPrivacyTx(txDetal *types.Transacti
 //UTXO---->moveUTXO2FTXO---->FTXO---->moveFTXO2STXO---->STXO
 //1.calcUTXOKey------------>types.PrivacyDBStore 该kv值在db中的存储一旦写入就不再改变，除非产生该UTXO的交易被撤销
 //2.calcUTXOKey4TokenAddr-->calcUTXOKey，创建kv，方便查询现在某个地址下某种token的可用utxo
-func (store *privacyStore) setUTXO(addr, txhash *string, outindex int, dbStore *privacytypes.PrivacyDBStore, newbatch db.Batch) error {
-	if 0 == len(*addr) || 0 == len(*txhash) {
-		bizlog.Error("setUTXO addr or txhash is nil")
-		return types.ErrInvalidParam
-	}
-	if dbStore == nil {
-		bizlog.Error("setUTXO privacy is nil")
-		return types.ErrInvalidParam
-	}
+func (store *privacyStore) setUTXO(utxoInfo *privacytypes.PrivacyDBStore, txHash string, newbatch db.Batch) error {
 
-	privacyStorebyte, err := proto.Marshal(dbStore)
+	privacyStorebyte, err := proto.Marshal(utxoInfo)
 	if err != nil {
 		bizlog.Error("setUTXO proto.Marshal err!", "err", err)
 		return types.ErrMarshal
 	}
-
-	utxoKey := calcUTXOKey(*txhash, outindex)
-	bizlog.Debug("setUTXO", "addr", *addr, "tx with hash", *txhash, "amount:", dbStore.Amount/types.Coin)
-	newbatch.Set(calcUTXOKey4TokenAddr(dbStore.AssetExec, dbStore.Tokenname, *addr, *txhash, outindex), utxoKey)
+	outIndex := int(utxoInfo.OutIndex)
+	utxoKey := calcUTXOKey(txHash, outIndex)
+	bizlog.Debug("setUTXO", "addr", utxoInfo.Owner, "tx with hash", txHash, "amount:", utxoInfo.Amount/types.Coin)
+	newbatch.Set(calcUTXOKey4TokenAddr(utxoInfo.AssetExec, utxoInfo.Tokenname, utxoInfo.Owner, txHash, outIndex), utxoKey)
 	newbatch.Set(utxoKey, privacyStorebyte)
 	return nil
 }

plugin/dapp/privacy/wallet/privacystore_test.go

@@ -117,16 +117,11 @@ func testStore_storeScanPrivacyInputUTXO(t *testing.T) {
 }
 
 func testStore_setUTXO(t *testing.T) {
-	var addr, txhash string
+	var txhash string
 	store := createStore(t)
 	dbbatch := store.NewBatch(true)
-	err := store.setUTXO(&addr, &txhash, 0, nil, dbbatch)
-	assert.NotNil(t, err)
-
-	addr = "setUTXO"
-	txhash = "TXHASH"
-	err = store.setUTXO(&addr, &txhash, 0, nil, dbbatch)
-	assert.NotNil(t, err)
+	err := store.setUTXO(&pt.PrivacyDBStore{}, txhash, dbbatch)
+	assert.Nil(t, err)
 }
 
 func testStore_selectPrivacyTransactionToWallet(t *testing.T) {