diff --git a/core/transaction_pool.go b/core/transaction_pool.go index d3aec9050249177114e634c901f93a47050fcc8b..7a901fcae5c6baecead24642b109e79ff2ec365b 100644 --- a/core/transaction_pool.go +++ b/core/transaction_pool.go @@ -1,6 +1,7 @@ package core import ( + "errors" "fmt" "github.com/ethereum/go-ethereum/core/types" @@ -9,7 +10,11 @@ import ( "github.com/ethereum/go-ethereum/logger" ) -var txplogger = logger.NewLogger("TXP") +var ( + txplogger = logger.NewLogger("TXP") + + ErrInvalidSender = errors.New("Invalid sender") +) const txPoolQueueSize = 50 @@ -60,22 +65,23 @@ func (pool *TxPool) ValidateTransaction(tx *types.Transaction) error { return fmt.Errorf("Invalid recipient. len = %d", len(tx.To())) } + // Validate curve param v, _, _ := tx.Curve() if v > 28 || v < 27 { return fmt.Errorf("tx.v != (28 || 27) => %v", v) } + // Validate sender address + senderAddr := tx.From() + if senderAddr == nil || len(senderAddr) != 20 { + return ErrInvalidSender + } + /* XXX this kind of validation needs to happen elsewhere in the gui when sending txs. Other clients should do their own validation. Value transfer could throw error but doesn't necessarily invalidate the tx. Gas can still be payed for and miner can still be rewarded for their inclusion and processing. - // Get the sender - senderAddr := tx.From() - if senderAddr == nil { - return fmt.Errorf("invalid sender") - } sender := pool.stateQuery.GetAccount(senderAddr) - 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. diff --git a/core/transaction_pool_test.go b/core/transaction_pool_test.go index 7f192fc4dd6b26e0e310dfc9d12fa5babc5b81e6..b2d981f0166884c65c34fe81e9ea260ee93859a9 100644 --- a/core/transaction_pool_test.go +++ b/core/transaction_pool_test.go @@ -85,3 +85,13 @@ func TestRemoveInvalid(t *testing.T) { t.Error("expected pool size to be 1, is", pool.Size()) } } + +func TestInvalidSender(t *testing.T) { + pool, _ := setup() + tx := new(types.Transaction) + tx.V = 28 + err := pool.ValidateTransaction(tx) + if err != ErrInvalidSender { + t.Error("expected %v, got %v", ErrInvalidSender, err) + } +}