fix tx expire

plugin/dapp/privacy/wallet/privacy.go

@@ -606,7 +606,6 @@ func (policy *privacyPolicy) createPublic2PrivacyTx(req *types.ReqCreateTransact
 		Nonce:   policy.getWalletOperate().Nonce(),
 		To:      address.ExecAddress(types.ExecName(privacytypes.PrivacyX)),
 	}
-	tx.SetExpire(time.Duration(req.Expire))
 	tx.Signature = &types.Signature{
 		Signature: types.Encode(&privacytypes.PrivacySignatureParam{
 			ActionType: action.Ty,
@@ -687,7 +686,6 @@ func (policy *privacyPolicy) createPrivacy2PrivacyTx(req *types.ReqCreateTransac
 		Nonce:   policy.getWalletOperate().Nonce(),
 		To:      address.ExecAddress(types.ExecName(privacytypes.PrivacyX)),
 	}
-	tx.SetExpire(time.Duration(req.Expire))
 	if isPara {
 		tx.Fee, err = tx.GetRealFee(types.GInt("MinFee"))
 		if err != nil {
@@ -773,7 +771,6 @@ func (policy *privacyPolicy) createPrivacy2PublicTx(req *types.ReqCreateTransact
 		Nonce:   policy.getWalletOperate().Nonce(),
 		To:      address.ExecAddress(types.ExecName(privacytypes.PrivacyX)),
 	}
-	tx.SetExpire(time.Duration(req.Expire))
 	if isPara {
 		tx.Fee, err = tx.GetRealFee(types.GInt("MinFee"))
 		if err != nil {

plugin/dapp/privacy/wallet/privacybizpolicy.go

@@ -7,6 +7,7 @@ package wallet
 import (
 	"sync"
 	"sync/atomic"
+	"time"
 
 	"github.com/33cn/chain33/common"
 	"github.com/33cn/chain33/common/crypto"
@@ -152,6 +153,11 @@ func (policy *privacyPolicy) SignTransaction(key crypto.PrivKey, req *types.ReqS
 		bizlog.Error("SignTransaction", "action type ", action.Ty, "signature action type ", signParam.ActionType)
 		return
 	}
+	expire, err := types.ParseExpire(req.GetExpire())
+	if err != nil {
+		return
+	}
+	tx.SetExpire(time.Duration(expire))
 	switch action.Ty {
 	case privacytypes.ActionPublic2Privacy:
 		// 隐私交易的公对私动作，不存在交易组的操作