4 files changed, 61 insertions, 5 deletions

diff --git a/core/state/managed_state.go b/core/state/managed_state.go
index 0fcc1be67..ddf337af3 100644
--- a/core/state/managed_state.go
+++ b/core/state/managed_state.go
@@ -20,6 +20,7 @@ type ManagedState struct {
 	accounts map[string]*account
 }
 
+// ManagedState returns a new managed state with the statedb as it's backing layer
 func ManageState(statedb *StateDB) *ManagedState {
 	return &ManagedState{
 		StateDB:  statedb,
@@ -27,14 +28,16 @@ func ManageState(statedb *StateDB) *ManagedState {
 	}
 }
 
+// SetState sets the backing layer of the managed state
 func (ms *ManagedState) SetState(statedb *StateDB) {
 	ms.mu.Lock()
 	defer ms.mu.Unlock()
 	ms.StateDB = statedb
 }
 
+// RemoveNonce removed the nonce from the managed state and all future pending nonces
 func (ms *ManagedState) RemoveNonce(addr common.Address, n uint64) {
-	if ms.hasAccount(addr) {
+	if ms.HasAccount(addr) {
 		ms.mu.Lock()
 		defer ms.mu.Unlock()
 
@@ -47,6 +50,7 @@ func (ms *ManagedState) RemoveNonce(addr common.Address, n uint64) {
 	}
 }
 
+// NewNonce returns the new canonical nonce for the managed account
 func (ms *ManagedState) NewNonce(addr common.Address) uint64 {
 	ms.mu.RLock()
 	defer ms.mu.RUnlock()
@@ -61,11 +65,31 @@ func (ms *ManagedState) NewNonce(addr common.Address) uint64 {
 	return uint64(len(account.nonces)) + account.nstart
 }
 
-func (ms *ManagedState) hasAccount(addr common.Address) bool {
+// GetNonce returns the canonical nonce for the managed or unmanged account
+func (ms *ManagedState) GetNonce(addr common.Address) uint64 {
+	if ms.HasAccount(addr) {
+		account := ms.getAccount(addr)
+		return uint64(len(account.nonces)) + account.nstart
+	} else {
+		return ms.StateDB.GetNonce(addr)
+	}
+}
+
+// SetNonce sets the new canonical nonce for the managed state
+func (ms *ManagedState) SetNonce(addr common.Address, nonce uint64) {
+	so := ms.GetOrNewStateObject(addr)
+	so.SetNonce(nonce)
+
+	ms.accounts[addr.Str()] = newAccount(so)
+}
+
+// HasAccount returns whether the given address is managed or not
+func (ms *ManagedState) HasAccount(addr common.Address) bool {
 	_, ok := ms.accounts[addr.Str()]
 	return ok
 }
 
+// populate the managed state
 func (ms *ManagedState) getAccount(addr common.Address) *account {
 	straddr := addr.Str()
 	if account, ok := ms.accounts[straddr]; !ok {
diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go
index b61f59e6d..766231d21 100644
--- a/core/state/managed_state_test.go
+++ b/core/state/managed_state_test.go
@@ -87,3 +87,21 @@ func TestRemoteNonceChange(t *testing.T) {
 		t.Error("expected nonce after remote update to be", 201, "got", nonce)
 	}
 }
+
+func TestSetNonce(t *testing.T) {
+	ms, _ := create()
+
+	var addr common.Address
+	ms.SetNonce(addr, 10)
+
+	if ms.GetNonce(addr) != 10 {
+		t.Errorf("Expected nonce of 10, got", ms.GetNonce(addr))
+	}
+
+	addr[0] = 1
+	ms.StateDB.SetNonce(addr, 1)
+
+	if ms.GetNonce(addr) != 1 {
+		t.Errorf("Expected nonce of 1, got", ms.GetNonce(addr))
+	}
+}
diff --git a/core/transaction_pool.go b/core/transaction_pool.go
index d642a1de4..930efdaec 100644
--- a/core/transaction_pool.go
+++ b/core/transaction_pool.go
@@ -90,6 +90,7 @@ func (pool *TxPool) ValidateTransaction(tx *types.Transaction) error {
 }
 
 func (self *TxPool) addTx(tx *types.Transaction) {
+	self.txs[tx.Hash()] = tx
 }
 
 func (self *TxPool) add(tx *types.Transaction) error {
@@ -107,7 +108,7 @@ func (self *TxPool) add(tx *types.Transaction) error {
 		return err
 	}
 
-	self.txs[hash] = tx
+	self.addTx(tx)
 
 	var toname string
 	if to := tx.To(); to != nil {
@@ -122,9 +123,7 @@ func (self *TxPool) add(tx *types.Transaction) error {
 	txplogger.Debugf("(t) %x => %s (%v) %x\n", from, toname, tx.Value, tx.Hash())
 
 	// Notify the subscribers
-	//println("post")
 	go self.eventMux.Post(TxPreEvent{tx})
-	//println("done post")
 
 	return nil
 }
diff --git a/eth/backend.go b/eth/backend.go
index 6b60af1f1..317ee7373 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -436,6 +436,21 @@ func (self *Ethereum) txBroadcastLoop() {
 	for obj := range self.txSub.Chan() {
 		event := obj.(core.TxPreEvent)
 		self.net.Broadcast("eth", TxMsg, []*types.Transaction{event.Tx})
+		self.syncAccounts(event.Tx)
+	}
+}
+
+// keep accounts synced up
+func (self *Ethereum) syncAccounts(tx *types.Transaction) {
+	from, err := tx.From()
+	if err != nil {
+		return
+	}
+
+	if self.accountManager.HasAccount(from.Bytes()) {
+		if self.chainManager.TxState().GetNonce(from) < tx.Nonce() {
+			self.chainManager.TxState().SetNonce(from, tx.Nonce()+1)
+		}
 	}
 }