tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ethereum/eth-go into develop

Browse Source
This commit is contained in:
Maran 2014-05-28 15:54:56 +02:00
commit a453b5514d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ethchain/state_manager.go
View File

@ -105,8 +105,11 @@ func (sm *StateManager) ApplyTransactions(state *State, block *Block, txs []*Tra
for _, tx := range txs {
usedGas, err := sm.ApplyTransaction(state, block, tx)
if err != nil {
if IsNonceErr(err) {
continue
}
ethutil.Config.Log.Infoln(err)
//continue
}
accumelative := new(big.Int).Set(totalUsedGas.Add(totalUsedGas, usedGas))
@ -116,7 +119,7 @@ func (sm *StateManager) ApplyTransactions(state *State, block *Block, txs []*Tra
validTxs = append(validTxs, tx)
}
return receipts, txs
return receipts, validTxs
}
func (sm *StateManager) ApplyTransaction(state *State, block *Block, tx *Transaction) (totalGasUsed *big.Int, err error) {

4
ethchain/transaction_pool.go
View File

@ -106,7 +106,7 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, state *State, toContract
sender := state.GetAccount(tx.Sender())
if sender.Nonce != tx.Nonce {
err = fmt.Errorf("[TXPL] Invalid account nonce, state nonce is %d transaction nonce is %d instead", sender.Nonce, tx.Nonce)
err = NonceError(tx.Nonce, sender.Nonce)
return
}
@ -235,7 +235,7 @@ func (pool *TxPool) RemoveInvalid(state *State) {
tx := e.Value.(*Transaction)
sender := state.GetAccount(tx.Sender())
err := pool.ValidateTransaction(tx)
if err != nil || sender.Nonce != tx.Nonce {
if err != nil || sender.Nonce >= tx.Nonce {
pool.pool.Remove(e)
}
}