Merge branch 'develop' into interop

Conflicts:
	peer.go

1 files changed, 7 insertions, 0 deletions

diff --git a/ethchain/transaction_pool.go b/ethchain/transaction_pool.go
index bc7bde797..6220f29a3 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 {
@@ -181,6 +182,12 @@ func (pool *TxPool) ValidateTransaction(tx *Transaction) error {
 		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