add by hyb for wallet mtx

plugin/dapp/multisig/wallet/exec.go

@@ -10,9 +10,6 @@ import (
 
 //On_MultiSigAddresList 获取owner对应的多重签名地址列表
 func (policy *multisigPolicy) On_MultiSigAddresList(req *types.ReqString) (types.Message, error) {
-	policy.getWalletOperate().GetMutex().Lock()
-	defer policy.getWalletOperate().GetMutex().Unlock()
-
 	//获取本钱包中记录的所有多重签名地址
 	if req.Data == "" {
 		reply, err := policy.store.listOwnerAttrs()

plugin/dapp/privacy/wallet/exec.go

@@ -10,8 +10,6 @@ import (
 )
 
 func (policy *privacyPolicy) On_ShowPrivacyAccountSpend(req *privacytypes.ReqPrivBal4AddrToken) (types.Message, error) {
-	policy.getWalletOperate().GetMutex().Lock()
-	defer policy.getWalletOperate().GetMutex().Unlock()
 	reply, err := policy.showPrivacyAccountsSpend(req)
 	if err != nil {
 		bizlog.Error("showPrivacyAccountsSpend", "err", err.Error())
@@ -20,8 +18,6 @@ func (policy *privacyPolicy) On_ShowPrivacyAccountSpend(req *privacytypes.ReqPri
 }
 
 func (policy *privacyPolicy) On_ShowPrivacyKey(req *types.ReqString) (types.Message, error) {
-	policy.getWalletOperate().GetMutex().Lock()
-	defer policy.getWalletOperate().GetMutex().Unlock()
 	reply, err := policy.showPrivacyKeyPair(req)
 	if err != nil {
 		bizlog.Error("showPrivacyKeyPair", "err", err.Error())
@@ -30,6 +26,7 @@ func (policy *privacyPolicy) On_ShowPrivacyKey(req *types.ReqString) (types.Mess
 }
 
 func (policy *privacyPolicy) On_CreateTransaction(req *privacytypes.ReqCreatePrivacyTx) (types.Message, error) {
+
 	ok, err := policy.getWalletOperate().CheckWalletStatus()
 	if !ok {
 		bizlog.Error("createTransaction", "CheckWalletStatus cause error.", err)
@@ -57,8 +54,6 @@ func (policy *privacyPolicy) On_CreateTransaction(req *privacytypes.ReqCreatePri
 		bizlog.Error("createTransaction", "isRescanUtxosFlagScaning cause error.", err)
 		return nil, err
 	}
-	policy.getWalletOperate().GetMutex().Lock()
-	defer policy.getWalletOperate().GetMutex().Unlock()
 
 	reply, err := policy.createTransaction(req)
 	if err != nil {
@@ -68,8 +63,6 @@ func (policy *privacyPolicy) On_CreateTransaction(req *privacytypes.ReqCreatePri
 }
 
 func (policy *privacyPolicy) On_ShowPrivacyAccountInfo(req *privacytypes.ReqPPrivacyAccount) (types.Message, error) {
-	policy.getWalletOperate().GetMutex().Lock()
-	defer policy.getWalletOperate().GetMutex().Unlock()
 	reply, err := policy.getPrivacyAccountInfo(req)
 	if err != nil {
 		bizlog.Error("getPrivacyAccountInfo", "err", err.Error())
@@ -78,6 +71,7 @@ func (policy *privacyPolicy) On_ShowPrivacyAccountInfo(req *privacytypes.ReqPPri
 }
 
 func (policy *privacyPolicy) On_PrivacyTransactionList(req *privacytypes.ReqPrivacyTransactionList) (types.Message, error) {
+
 	if req.Direction != 0 && req.Direction != 1 {
 		bizlog.Error("getPrivacyTransactionList", "invalid direction ", req.Direction)
 		return nil, types.ErrInvalidParam
@@ -90,9 +84,6 @@ func (policy *privacyPolicy) On_PrivacyTransactionList(req *privacytypes.ReqPriv
 	}
 	req.SendRecvFlag = sendRecvFlag
 
-	policy.getWalletOperate().GetMutex().Lock()
-	defer policy.getWalletOperate().GetMutex().Unlock()
-
 	reply, err := policy.store.getWalletPrivacyTxDetails(req)
 	if err != nil {
 		bizlog.Error("getWalletPrivacyTxDetails", "err", err.Error())
@@ -101,8 +92,7 @@ func (policy *privacyPolicy) On_PrivacyTransactionList(req *privacytypes.ReqPriv
 }
 
 func (policy *privacyPolicy) On_RescanUtxos(req *privacytypes.ReqRescanUtxos) (types.Message, error) {
-	policy.getWalletOperate().GetMutex().Lock()
-	defer policy.getWalletOperate().GetMutex().Unlock()
+
 	reply, err := policy.rescanUTXOs(req)
 	if err != nil {
 		bizlog.Error("rescanUTXOs", "err", err.Error())
@@ -111,9 +101,6 @@ func (policy *privacyPolicy) On_RescanUtxos(req *privacytypes.ReqRescanUtxos) (t
 }
 
 func (policy *privacyPolicy) On_EnablePrivacy(req *privacytypes.ReqEnablePrivacy) (types.Message, error) {
-	operater := policy.getWalletOperate()
-	operater.GetMutex().Lock()
-	defer operater.GetMutex().Unlock()
 	reply, err := policy.enablePrivacy(req)
 	if err != nil {
 		bizlog.Error("enablePrivacy", "err", err.Error())

plugin/dapp/privacy/wallet/privacy.go

@@ -1008,8 +1008,6 @@ func (policy *privacyPolicy) buildAndStoreWalletTxDetail(param *buildStoreWallet
 
 func (policy *privacyPolicy) checkExpireFTXOOnTimer() {
 	operater := policy.getWalletOperate()
-	operater.GetMutex().Lock()
-	defer operater.GetMutex().Unlock()
 
 	header := operater.GetLastHeader()
 	if header == nil {

plugin/dapp/privacy/wallet/privacybizpolicy_test.go

@@ -119,9 +119,6 @@ func (mock *testDataMock) initMember() {
 
 func (mock *testDataMock) importPrivateKey(PrivKey *types.ReqWalletImportPrivkey) {
 	wallet := mock.wallet
-	wallet.GetMutex().Lock()
-	defer wallet.GetMutex().Unlock()
-
 	ok, err := wallet.CheckWalletStatus()
 	if !ok || err != nil {
 		return

plugin/dapp/ticket/wallet/ticket.go

@@ -448,8 +448,7 @@ func (policy *ticketPolicy) getTicketsByStatus(status int32) ([]*ty.Ticket, [][]
 	if err != nil {
 		return nil, nil, err
 	}
-	operater.GetMutex().Lock()
-	defer operater.GetMutex().Unlock()
+
 	ok, err := operater.CheckWalletStatus()
 	if !ok && err != types.ErrOnlyTicketUnLocked {
 		return nil, nil, err