Skip to content

Commit 9190303

Browse files
Shashwat-Nautiyalgurukamath
Shashwat-Nautiyal
and
gurukamath
authored
validate_transaction now raises InvalidTransaction exception (#1138)
* validate_transaction now raises InvalidTransaction * Update src/ethereum/cancun/transactions.py Co-authored-by: Guruprasad Kamath <[email protected]> * Update src/ethereum/cancun/transactions.py Co-authored-by: Guruprasad Kamath <[email protected]> * Update src/ethereum/cancun/transactions.py Co-authored-by: Guruprasad Kamath <[email protected]> * exception specified within InvalidTransaction * isort formatting issue resolved * fix issues from static checks --------- Co-authored-by: Guruprasad Kamath <[email protected]> Co-authored-by: Guruprasad Kamath <[email protected]>
1 parent de3c950 commit 9190303

File tree

26 files changed

+88
-88
lines changed

26 files changed

+88
-88
lines changed

‎src/ethereum/arrow_glacier/transactions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from ethereum.crypto.elliptic_curve import SECP256K1N, secp256k1_recover
1515
from ethereum.crypto.hash import Hash32, keccak256
16-
from ethereum.exceptions import InvalidBlock, InvalidSignatureError
16+
from ethereum.exceptions import InvalidSignatureError, InvalidTransaction
1717

1818
from .exceptions import TransactionTypeError
1919
from .fork_types import Address
@@ -146,14 +146,14 @@ def validate_transaction(tx: Transaction) -> Uint:
146146
147147
Raises
148148
------
149-
InvalidBlock :
149+
InvalidTransaction :
150150
If the transaction is not valid.
151151
"""
152152
intrinsic_gas = calculate_intrinsic_cost(tx)
153153
if intrinsic_gas > tx.gas:
154-
raise InvalidBlock
154+
raise InvalidTransaction("Insufficient gas")
155155
if U256(tx.nonce) >= U256(U64.MAX_VALUE):
156-
raise InvalidBlock
156+
raise InvalidTransaction("Nonce too high")
157157
return intrinsic_gas
158158

159159

‎src/ethereum/berlin/transactions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from ethereum.crypto.elliptic_curve import SECP256K1N, secp256k1_recover
1515
from ethereum.crypto.hash import Hash32, keccak256
16-
from ethereum.exceptions import InvalidBlock, InvalidSignatureError
16+
from ethereum.exceptions import InvalidSignatureError, InvalidTransaction
1717

1818
from .exceptions import TransactionTypeError
1919
from .fork_types import Address
@@ -118,14 +118,14 @@ def validate_transaction(tx: Transaction) -> Uint:
118118
119119
Raises
120120
------
121-
InvalidBlock :
121+
InvalidTransaction :
122122
If the transaction is not valid.
123123
"""
124124
intrinsic_gas = calculate_intrinsic_cost(tx)
125125
if intrinsic_gas > tx.gas:
126-
raise InvalidBlock
126+
raise InvalidTransaction("Insufficient gas")
127127
if U256(tx.nonce) >= U256(U64.MAX_VALUE):
128-
raise InvalidBlock
128+
raise InvalidTransaction("Nonce too high")
129129
return intrinsic_gas
130130

131131

‎src/ethereum/byzantium/transactions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from ethereum.crypto.elliptic_curve import SECP256K1N, secp256k1_recover
1515
from ethereum.crypto.hash import Hash32, keccak256
16-
from ethereum.exceptions import InvalidBlock, InvalidSignatureError
16+
from ethereum.exceptions import InvalidSignatureError, InvalidTransaction
1717

1818
from .fork_types import Address
1919

@@ -68,14 +68,14 @@ def validate_transaction(tx: Transaction) -> Uint:
6868
6969
Raises
7070
------
71-
InvalidBlock :
71+
InvalidTransaction :
7272
If the transaction is not valid.
7373
"""
7474
intrinsic_gas = calculate_intrinsic_cost(tx)
7575
if intrinsic_gas > tx.gas:
76-
raise InvalidBlock
76+
raise InvalidTransaction("Insufficient gas")
7777
if U256(tx.nonce) >= U256(U64.MAX_VALUE):
78-
raise InvalidBlock
78+
raise InvalidTransaction("Nonce too high")
7979
return intrinsic_gas
8080

8181

‎src/ethereum/cancun/transactions.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from ethereum.crypto.elliptic_curve import SECP256K1N, secp256k1_recover
1515
from ethereum.crypto.hash import Hash32, keccak256
16-
from ethereum.exceptions import InvalidBlock, InvalidSignatureError
16+
from ethereum.exceptions import InvalidSignatureError, InvalidTransaction
1717

1818
from .exceptions import TransactionTypeError
1919
from .fork_types import Address, VersionedHash
@@ -176,18 +176,18 @@ def validate_transaction(tx: Transaction) -> Uint:
176176
177177
Raises
178178
------
179-
InvalidBlock :
179+
InvalidTransaction :
180180
If the transaction is not valid.
181181
"""
182182
from .vm.interpreter import MAX_CODE_SIZE
183183

184184
intrinsic_gas = calculate_intrinsic_cost(tx)
185185
if intrinsic_gas > tx.gas:
186-
raise InvalidBlock
186+
raise InvalidTransaction("Insufficient gas")
187187
if U256(tx.nonce) >= U256(U64.MAX_VALUE):
188-
raise InvalidBlock
188+
raise InvalidTransaction("Nonce too high")
189189
if tx.to == Bytes0(b"") and len(tx.data) > 2 * MAX_CODE_SIZE:
190-
raise InvalidBlock
190+
raise InvalidTransaction("Code size too large")
191191

192192
return intrinsic_gas
193193

‎src/ethereum/constantinople/transactions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from ethereum.crypto.elliptic_curve import SECP256K1N, secp256k1_recover
1515
from ethereum.crypto.hash import Hash32, keccak256
16-
from ethereum.exceptions import InvalidBlock, InvalidSignatureError
16+
from ethereum.exceptions import InvalidSignatureError, InvalidTransaction
1717

1818
from .fork_types import Address
1919

@@ -68,14 +68,14 @@ def validate_transaction(tx: Transaction) -> Uint:
6868
6969
Raises
7070
------
71-
InvalidBlock :
71+
InvalidTransaction :
7272
If the transaction is not valid.
7373
"""
7474
intrinsic_gas = calculate_intrinsic_cost(tx)
7575
if intrinsic_gas > tx.gas:
76-
raise InvalidBlock
76+
raise InvalidTransaction("Insufficient gas")
7777
if U256(tx.nonce) >= U256(U64.MAX_VALUE):
78-
raise InvalidBlock
78+
raise InvalidTransaction("Nonce too high")
7979
return intrinsic_gas
8080

8181

‎src/ethereum/dao_fork/transactions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from ethereum.crypto.elliptic_curve import SECP256K1N, secp256k1_recover
1515
from ethereum.crypto.hash import Hash32, keccak256
16-
from ethereum.exceptions import InvalidBlock, InvalidSignatureError
16+
from ethereum.exceptions import InvalidSignatureError, InvalidTransaction
1717

1818
from .fork_types import Address
1919

@@ -68,14 +68,14 @@ def validate_transaction(tx: Transaction) -> Uint:
6868
6969
Raises
7070
------
71-
InvalidBlock :
71+
InvalidTransaction :
7272
If the transaction is not valid.
7373
"""
7474
intrinsic_gas = calculate_intrinsic_cost(tx)
7575
if intrinsic_gas > tx.gas:
76-
raise InvalidBlock
76+
raise InvalidTransaction("Insufficient gas")
7777
if U256(tx.nonce) >= U256(U64.MAX_VALUE):
78-
raise InvalidBlock
78+
raise InvalidTransaction("Nonce too high")
7979
return intrinsic_gas
8080

8181

‎src/ethereum/frontier/transactions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from ethereum.crypto.elliptic_curve import SECP256K1N, secp256k1_recover
1515
from ethereum.crypto.hash import Hash32, keccak256
16-
from ethereum.exceptions import InvalidBlock, InvalidSignatureError
16+
from ethereum.exceptions import InvalidSignatureError, InvalidTransaction
1717

1818
from .fork_types import Address
1919

@@ -67,14 +67,14 @@ def validate_transaction(tx: Transaction) -> Uint:
6767
6868
Raises
6969
------
70-
InvalidBlock :
70+
InvalidTransaction :
7171
If the transaction is not valid.
7272
"""
7373
intrinsic_gas = calculate_intrinsic_cost(tx)
7474
if intrinsic_gas > tx.gas:
75-
raise InvalidBlock
75+
raise InvalidTransaction("insufficient gas")
7676
if U256(tx.nonce) >= U256(U64.MAX_VALUE):
77-
raise InvalidBlock
77+
raise InvalidTransaction("nonce too high")
7878
return intrinsic_gas
7979

8080

‎src/ethereum/gray_glacier/transactions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from ethereum.crypto.elliptic_curve import SECP256K1N, secp256k1_recover
1515
from ethereum.crypto.hash import Hash32, keccak256
16-
from ethereum.exceptions import InvalidBlock, InvalidSignatureError
16+
from ethereum.exceptions import InvalidSignatureError, InvalidTransaction
1717

1818
from .exceptions import TransactionTypeError
1919
from .fork_types import Address
@@ -146,14 +146,14 @@ def validate_transaction(tx: Transaction) -> Uint:
146146
147147
Raises
148148
------
149-
InvalidBlock :
149+
InvalidTransaction :
150150
If the transaction is not valid.
151151
"""
152152
intrinsic_gas = calculate_intrinsic_cost(tx)
153153
if intrinsic_gas > tx.gas:
154-
raise InvalidBlock
154+
raise InvalidTransaction("Insufficient gas")
155155
if U256(tx.nonce) >= U256(U64.MAX_VALUE):
156-
raise InvalidBlock
156+
raise InvalidTransaction("Nonce too high")
157157
return intrinsic_gas
158158

159159

‎src/ethereum/homestead/transactions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from ethereum.crypto.elliptic_curve import SECP256K1N, secp256k1_recover
1515
from ethereum.crypto.hash import Hash32, keccak256
16-
from ethereum.exceptions import InvalidBlock, InvalidSignatureError
16+
from ethereum.exceptions import InvalidSignatureError, InvalidTransaction
1717

1818
from .fork_types import Address
1919

@@ -68,14 +68,14 @@ def validate_transaction(tx: Transaction) -> Uint:
6868
6969
Raises
7070
------
71-
InvalidBlock :
71+
InvalidTransaction :
7272
If the transaction is not valid.
7373
"""
7474
intrinsic_gas = calculate_intrinsic_cost(tx)
7575
if intrinsic_gas > tx.gas:
76-
raise InvalidBlock
76+
raise InvalidTransaction("Insufficient gas")
7777
if U256(tx.nonce) >= U256(U64.MAX_VALUE):
78-
raise InvalidBlock
78+
raise InvalidTransaction("Nonce too high")
7979
return intrinsic_gas
8080

8181

‎src/ethereum/istanbul/transactions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from ethereum.crypto.elliptic_curve import SECP256K1N, secp256k1_recover
1515
from ethereum.crypto.hash import Hash32, keccak256
16-
from ethereum.exceptions import InvalidBlock, InvalidSignatureError
16+
from ethereum.exceptions import InvalidSignatureError, InvalidTransaction
1717

1818
from .fork_types import Address
1919

@@ -68,14 +68,14 @@ def validate_transaction(tx: Transaction) -> Uint:
6868
6969
Raises
7070
------
71-
InvalidBlock :
71+
InvalidTransaction :
7272
If the transaction is not valid.
7373
"""
7474
intrinsic_gas = calculate_intrinsic_cost(tx)
7575
if intrinsic_gas > tx.gas:
76-
raise InvalidBlock
76+
raise InvalidTransaction("Insufficient gas")
7777
if U256(tx.nonce) >= U256(U64.MAX_VALUE):
78-
raise InvalidBlock
78+
raise InvalidTransaction("Nonce too high")
7979
return intrinsic_gas
8080

8181

0 commit comments

Comments
 (0)