correct nonce fetch

plugin/dapp/cross2eth/ebrelayer/relayer/ethereum/ethereum.go

@@ -664,7 +664,7 @@ func (ethRelayer *Relayer4Ethereum) handleLogWithdraw(chain33Msg *events.Chain33
 	}
 	//param: from,to,evm-packdata,amount
 	//交易构造
-	tx, err := ethRelayer.newTx(ethRelayer.ethSender, toAddr, intputData, value)
+	tx, err := ethtxs.NewTx(ethRelayer.clientSpec, ethRelayer.ethSender, toAddr, intputData, value)
 	if err != nil {
 		relayerLog.Error("handleLogWithdraw", "newTx err", err)
 		err = errors.New("ErrNewTx")
@@ -771,43 +771,6 @@ func (ethRelayer *Relayer4Ethereum) packBalanceOfData(_to common.Address) ([]byt
 	}
 	return abidata, nil
 }
-func (ethRelayer *Relayer4Ethereum) newTx(from, to common.Address, input []byte, value *big.Int) (*types.Transaction, error) {
-
-	price, err := ethRelayer.clientSpec.SuggestGasPrice(context.Background())
-	if err != nil {
-		return nil, err
-	}
-
-	nonce, err := ethRelayer.clientSpec.PendingNonceAt(context.Background(), from)
-	if err != nil {
-		return nil, err
-	}
-	var gas uint64 = 21000
-	if input != nil {
-		var msg ethereum.CallMsg
-		msg.To = &to
-		msg.Data = input
-		gas, err = ethRelayer.clientSpec.EstimateGas(context.Background(), msg)
-		if err != nil {
-			//return nil,err
-			relayerLog.Error("handleLogWithdraw", "EstimateGas err", err)
-			gas = 80000
-		}
-		//略微增加gas数量，>=120%
-		gas = uint64(float64(gas) * 1.2)
-	}
-
-	ntx := types.NewTx(&types.LegacyTx{
-		Nonce:    nonce,
-		GasPrice: price,
-		To:       &to,
-		Data:     input,
-		Value:    value,
-		Gas:      gas,
-	})
-
-	return ntx, nil
-}
 
 func (ethRelayer *Relayer4Ethereum) handleLogLockBurn(chain33Msg *events.Chain33Msg) {
 	//对于通过代理人登录的中继器，不处理lock和burn事件

plugin/dapp/cross2eth/ebrelayer/relayer/ethereum/ethtxs/utils.go

@@ -8,6 +8,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/ethereum/go-ethereum/core/types"
+
 	"github.com/33cn/plugin/plugin/dapp/cross2eth/ebrelayer/relayer/ethereum/ethinterface"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
@@ -145,3 +147,40 @@ func GetEthTxStatus(client ethinterface.EthClientSpec, txhash common.Hash) strin
 
 	return status
 }
+
+func NewTx(clientSpec ethinterface.EthClientSpec, from, to common.Address, input []byte, value *big.Int) (*types.Transaction, error) {
+	price, err := clientSpec.SuggestGasPrice(context.Background())
+	if err != nil {
+		return nil, err
+	}
+
+	nonce, err := getNonce(from, clientSpec)
+	if err != nil {
+		return nil, err
+	}
+	var gas uint64 = 21000
+	if input != nil {
+		var msg ethereum.CallMsg
+		msg.To = &to
+		msg.Data = input
+		gas, err = clientSpec.EstimateGas(context.Background(), msg)
+		if err != nil {
+			//return nil,err
+			txslog.Error("handleLogWithdraw", "EstimateGas err", err)
+			gas = 80000
+		}
+		//略微增加gas数量，>=120%
+		gas = uint64(float64(gas) * 1.2)
+	}
+
+	ntx := types.NewTx(&types.LegacyTx{
+		Nonce:    nonce.Uint64(),
+		GasPrice: price,
+		To:       &to,
+		Data:     input,
+		Value:    value,
+		Gas:      gas,
+	})
+
+	return ntx, nil
+}