1 files changed, 33 insertions, 11 deletions

diff --git a/ethchain/transaction_pool.go b/ethchain/transaction_pool.go
index ba2ffcef5..24836222a 100644
--- a/ethchain/transaction_pool.go
+++ b/ethchain/transaction_pool.go
@@ -22,6 +22,7 @@ type TxMsgTy byte
 const (
 	TxPre = iota
 	TxPost
+	minGasPrice = 1000000
 )
 
 type TxMsg struct {
@@ -89,9 +90,11 @@ func (pool *TxPool) addTransaction(tx *Transaction) {
 	pool.Ethereum.Broadcast(ethwire.MsgTxTy, []interface{}{tx.RlpData()})
 }
 
+/*
 // Process transaction validates the Tx and processes funds from the
 // sender to the recipient.
 func (pool *TxPool) ProcessTransaction(tx *Transaction, state *State, toContract bool) (gas *big.Int, err error) {
+	fmt.Printf("state root before update %x\n", state.Root())
 	defer func() {
 		if r := recover(); r != nil {
 			ethutil.Config.Log.Infoln(r)
@@ -101,6 +104,7 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, state *State, toContract
 
 	gas = new(big.Int)
 	addGas := func(g *big.Int) { gas.Add(gas, g) }
+	addGas(GasTx)
 
 	// Get the sender
 	sender := state.GetAccount(tx.Sender())
@@ -110,28 +114,37 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, state *State, toContract
 		return
 	}
 
+	sender.Nonce += 1
+	defer func() {
+		//state.UpdateStateObject(sender)
+		// Notify all subscribers
+		pool.Ethereum.Reactor().Post("newTx:post", tx)
+	}()
+
 	txTotalBytes := big.NewInt(int64(len(tx.Data)))
 	txTotalBytes.Div(txTotalBytes, ethutil.Big32)
 	addGas(new(big.Int).Mul(txTotalBytes, GasSStore))
 
+	rGas := new(big.Int).Set(gas)
+	rGas.Mul(gas, tx.GasPrice)
+
 	// Make sure there's enough in the sender's account. Having insufficient
 	// funds won't invalidate this transaction but simple ignores it.
-	//totAmount := new(big.Int).Add(tx.Value, new(big.Int).Mul(TxFee, TxFeeRat))
-	totAmount := new(big.Int).Add(tx.Value, new(big.Int).Mul(tx.Gas, tx.GasPrice))
+	totAmount := new(big.Int).Add(tx.Value, rGas)
 	if sender.Amount.Cmp(totAmount) < 0 {
 		err = fmt.Errorf("[TXPL] Insufficient amount in sender's (%x) account", tx.Sender())
 		return
 	}
+	state.UpdateStateObject(sender)
+	fmt.Printf("state root after sender update %x\n", state.Root())
 
 	// Get the receiver
 	receiver := state.GetAccount(tx.Recipient)
-	sender.Nonce += 1
 
 	// Send Tx to self
 	if bytes.Compare(tx.Recipient, tx.Sender()) == 0 {
-		addGas(GasTx)
 		// Subtract the fee
-		sender.SubAmount(new(big.Int).Mul(GasTx, tx.GasPrice))
+		sender.SubAmount(rGas)
 	} else {
 		// Subtract the amount from the senders account
 		sender.SubAmount(totAmount)
@@ -140,17 +153,14 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, state *State, toContract
 		receiver.AddAmount(tx.Value)
 
 		state.UpdateStateObject(receiver)
+		fmt.Printf("state root after receiver update %x\n", state.Root())
 	}
 
-	state.UpdateStateObject(sender)
-
 	ethutil.Config.Log.Infof("[TXPL] Processed Tx %x\n", tx.Hash())
 
-	// Notify all subscribers
-	pool.Ethereum.Reactor().Post("newTx:post", tx)
-
 	return
 }
+*/
 
 func (pool *TxPool) ValidateTransaction(tx *Transaction) error {
 	// Get the last block so we can retrieve the sender and receiver from
@@ -161,17 +171,27 @@ func (pool *TxPool) ValidateTransaction(tx *Transaction) error {
 		return errors.New("[TXPL] No last block on the block chain")
 	}
 
+	if len(tx.Recipient) != 20 {
+		return fmt.Errorf("[TXPL] Invalid recipient. len = %d", len(tx.Recipient))
+	}
+
 	// Get the sender
 	//sender := pool.Ethereum.StateManager().procState.GetAccount(tx.Sender())
 	sender := pool.Ethereum.StateManager().CurrentState().GetAccount(tx.Sender())
 
-	totAmount := new(big.Int).Add(tx.Value, new(big.Int).Mul(TxFee, TxFeeRat))
+	totAmount := new(big.Int).Set(tx.Value)
 	// Make sure there's enough in the sender's account. Having insufficient
 	// funds won't invalidate this transaction but simple ignores it.
 	if sender.Amount.Cmp(totAmount) < 0 {
 		return fmt.Errorf("[TXPL] Insufficient amount in sender's (%x) account", tx.Sender())
 	}
 
+	if tx.IsContract() {
+		if tx.GasPrice.Cmp(big.NewInt(minGasPrice)) < 0 {
+			return fmt.Errorf("[TXPL] Gasprice to low, %s given should be at least %d.", tx.GasPrice, minGasPrice)
+		}
+	}
+
 	// Increment the nonce making each tx valid only once to prevent replay
 	// attacks
 
@@ -200,6 +220,8 @@ out:
 				// Call blocking version.
 				pool.addTransaction(tx)
 
+				ethutil.Config.Log.Debugf("(t) %x => %x (%v) %x\n", tx.Sender()[:4], tx.Recipient[:4], tx.Value, tx.Hash())
+
 				// Notify the subscribers
 				pool.Ethereum.Reactor().Post("newTx:pre", tx)
 			}