aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-12-19 18:23:46 +0800
committerGitHub <noreply@github.com>2016-12-19 18:23:46 +0800
commit7b623aab9dcb855a04737f2eb3c5004f8a53346a (patch)
tree6524a0fffdec287dddbab84e4dcf3a1a298c4e85
parente871ae12709c77c304a9633c0fd498972cf00603 (diff)
parentc44830ebf316bf22104d01aa114d2b6d765d7a76 (diff)
downloaddexon-7b623aab9dcb855a04737f2eb3c5004f8a53346a.tar
dexon-7b623aab9dcb855a04737f2eb3c5004f8a53346a.tar.gz
dexon-7b623aab9dcb855a04737f2eb3c5004f8a53346a.tar.bz2
dexon-7b623aab9dcb855a04737f2eb3c5004f8a53346a.tar.lz
dexon-7b623aab9dcb855a04737f2eb3c5004f8a53346a.tar.xz
dexon-7b623aab9dcb855a04737f2eb3c5004f8a53346a.tar.zst
dexon-7b623aab9dcb855a04737f2eb3c5004f8a53346a.zip
Merge pull request #3454 from karalabe/allow-zeroprice-tx
core: allow zero priced transactions from inexistent accounts too
-rw-r--r--core/tx_pool.go24
-rw-r--r--core/tx_pool_test.go4
-rw-r--r--light/txpool.go13
3 files changed, 9 insertions, 32 deletions
diff --git a/core/tx_pool.go b/core/tx_pool.go
index 65e076df9..c5421fa02 100644
--- a/core/tx_pool.go
+++ b/core/tx_pool.go
@@ -37,15 +37,14 @@ import (
var (
// Transaction Pool Errors
- ErrInvalidSender = errors.New("Invalid sender")
- ErrNonce = errors.New("Nonce too low")
- ErrCheap = errors.New("Gas price too low for acceptance")
- ErrBalance = errors.New("Insufficient balance")
- ErrNonExistentAccount = errors.New("Account does not exist or account balance too low")
- ErrInsufficientFunds = errors.New("Insufficient funds for gas * price + value")
- ErrIntrinsicGas = errors.New("Intrinsic gas too low")
- ErrGasLimit = errors.New("Exceeds block gas limit")
- ErrNegativeValue = errors.New("Negative value")
+ ErrInvalidSender = errors.New("Invalid sender")
+ ErrNonce = errors.New("Nonce too low")
+ ErrCheap = errors.New("Gas price too low for acceptance")
+ ErrBalance = errors.New("Insufficient balance")
+ ErrInsufficientFunds = errors.New("Insufficient funds for gas * price + value")
+ ErrIntrinsicGas = errors.New("Intrinsic gas too low")
+ ErrGasLimit = errors.New("Exceeds block gas limit")
+ ErrNegativeValue = errors.New("Negative value")
)
var (
@@ -287,13 +286,6 @@ func (pool *TxPool) validateTx(tx *types.Transaction) error {
if err != nil {
return ErrInvalidSender
}
-
- // Make sure the account exist. Non existent accounts
- // haven't got funds and well therefor never pass.
- if !currentState.Exist(from) {
- return ErrNonExistentAccount
- }
-
// Last but not least check for nonce errors
if currentState.GetNonce(from) > tx.Nonce() {
return ErrNonce
diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go
index 3e516735b..f5fcac19f 100644
--- a/core/tx_pool_test.go
+++ b/core/tx_pool_test.go
@@ -129,10 +129,6 @@ func TestInvalidTransactions(t *testing.T) {
pool, key := setupTxPool()
tx := transaction(0, big.NewInt(100), key)
- if err := pool.Add(tx); err != ErrNonExistentAccount {
- t.Error("expected", ErrNonExistentAccount)
- }
-
from, _ := deriveSender(tx)
currentState, _ := pool.currentState()
currentState.AddBalance(from, big.NewInt(1))
diff --git a/light/txpool.go b/light/txpool.go
index 4a06d317d..d0781593b 100644
--- a/light/txpool.go
+++ b/light/txpool.go
@@ -346,19 +346,8 @@ func (pool *TxPool) validateTx(ctx context.Context, tx *types.Transaction) error
if from, err = types.Sender(pool.signer, tx); err != nil {
return core.ErrInvalidSender
}
-
- // Make sure the account exist. Non existent accounts
- // haven't got funds and well therefor never pass.
- currentState := pool.currentState()
- if h, err := currentState.HasAccount(ctx, from); err == nil {
- if !h {
- return core.ErrNonExistentAccount
- }
- } else {
- return err
- }
-
// Last but not least check for nonce errors
+ currentState := pool.currentState()
if n, err := currentState.GetNonce(ctx, from); err == nil {
if n > tx.Nonce() {
return core.ErrNonce