Merge 1ad27dbb4f into 3778f1bf77

core/state/managed_state.go

@@ -82,6 +82,23 @@ func (ms *ManagedState) NewNonce(addr common.Address) uint64 {
 	return uint64(len(account.nonces)-1) + account.nstart
 }
 
+// GetNextNonce returns the canonical nonce for the managed or unmanaged account and increments it by one
+func (ms *ManagedState) GetNextNonce(addr common.Address) uint64 {
+	ms.mu.Lock()
+	defer ms.mu.Unlock()
+
+	var nonce uint64
+
+	if ms.hasAccount(addr) {
+		account := ms.getAccount(addr)
+		nonce = uint64(len(account.nonces)) + account.nstart
+	} else {
+		nonce = ms.StateDB.GetNonce(addr)
+	}
+	ms.StateDB.SetNonce(addr, nonce+1)
+	return nonce
+}
+
 // GetNonce returns the canonical nonce for the managed or unmanaged account
 func (ms *ManagedState) GetNonce(addr common.Address) uint64 {
 	ms.mu.RLock()

core/state/state_object.go

@@ -226,9 +226,11 @@ func (self *StateObject) SetCode(code []byte) {
 }
 
 func (self *StateObject) SetNonce(nonce uint64) {
+	if nonce > self.nonce {
 		self.nonce = nonce
 		self.dirty = true
 	}
+}
 
 func (self *StateObject) Nonce() uint64 {
 	return self.nonce

eth/api_backend.go

@@ -140,10 +140,7 @@ func (b *EthApiBackend) GetPoolTransaction(hash common.Hash) *types.Transaction
 }
 
 func (b *EthApiBackend) GetPoolNonce(ctx context.Context, addr common.Address) (uint64, error) {
-	b.eth.txMu.Lock()
+	return b.eth.txPool.State().GetNextNonce(addr), nil
-	defer b.eth.txMu.Unlock()
-
-	return b.eth.txPool.State().GetNonce(addr), nil
 }
 
 func (b *EthApiBackend) Stats() (pending int, queued int) {