aboutsummaryrefslogtreecommitdiffstats
path: root/ethchain/transaction_pool.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-05-09 00:26:46 +0800
committerobscuren <geffobscura@gmail.com>2014-05-09 00:26:46 +0800
commitd709815106824a3469b5f4152fd32705d7d142d4 (patch)
treedb68e4b228f0a46e73a0ca841beacf87e92a68af /ethchain/transaction_pool.go
parentf0440e85dc306f270666e3aee1fe419b684a2ae8 (diff)
downloadgo-tangerine-d709815106824a3469b5f4152fd32705d7d142d4.tar.gz
go-tangerine-d709815106824a3469b5f4152fd32705d7d142d4.tar.zst
go-tangerine-d709815106824a3469b5f4152fd32705d7d142d4.zip
Added trans state and removed watch address etc
The transient state can be used to test out changes before committing them to the proc state. The transient state is currently being used by the gui to support proper nonce updating without having to wait for a block. This used to be done by a cached state mechanism which can now safely by removed.
Diffstat (limited to 'ethchain/transaction_pool.go')
-rw-r--r--ethchain/transaction_pool.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/ethchain/transaction_pool.go b/ethchain/transaction_pool.go
index 72836d6cb..56deae0c6 100644
--- a/ethchain/transaction_pool.go
+++ b/ethchain/transaction_pool.go
@@ -148,8 +148,7 @@ func (pool *TxPool) ValidateTransaction(tx *Transaction) error {
}
// Get the sender
- accountState := pool.Ethereum.StateManager().GetAddrState(tx.Sender())
- sender := accountState.Object
+ sender := pool.Ethereum.StateManager().procState.GetAccount(tx.Sender())
totAmount := new(big.Int).Add(tx.Value, new(big.Int).Mul(TxFee, TxFeeRat))
// Make sure there's enough in the sender's account. Having insufficient