Skip to content

Commit bcee9d9

Browse files
AntrikshgwalSamWilsn
Antrikshgwal
authored and
SamWilsn
committed
Changed to_address to to_address_masked
1 parent 5614686 commit bcee9d9

File tree

54 files changed

+204
-204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+204
-204
lines changed

‎src/ethereum/arrow_glacier/utils/address.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from ..fork_types import Address
2323

2424

25-
def to_address(data: Uint | U256) -> Address:
25+
def to_address_masked(data: Uint | U256) -> Address:
2626
"""
2727
Convert a Uint or U256 value to a valid address (20 bytes).
2828

‎src/ethereum/arrow_glacier/vm/instructions/environment.py

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

2020
from ...fork_types import EMPTY_ACCOUNT
2121
from ...state import get_account
22-
from ...utils.address import to_address
22+
from ...utils.address import to_address_masked
2323
from ...vm.memory import buffer_read, memory_write
2424
from .. import Evm
2525
from ..exceptions import OutOfBoundsRead
@@ -71,7 +71,7 @@ def balance(evm: Evm) -> None:
7171
7272
"""
7373
# STACK
74-
address = to_address(pop(evm.stack))
74+
address = to_address_masked(pop(evm.stack))
7575

7676
# GAS
7777
if address in evm.accessed_addresses:
@@ -336,7 +336,7 @@ def extcodesize(evm: Evm) -> None:
336336
337337
"""
338338
# STACK
339-
address = to_address(pop(evm.stack))
339+
address = to_address_masked(pop(evm.stack))
340340

341341
# GAS
342342
if address in evm.accessed_addresses:
@@ -368,7 +368,7 @@ def extcodecopy(evm: Evm) -> None:
368368
369369
"""
370370
# STACK
371-
address = to_address(pop(evm.stack))
371+
address = to_address_masked(pop(evm.stack))
372372
memory_start_index = pop(evm.stack)
373373
code_start_index = pop(evm.stack)
374374
size = pop(evm.stack)
@@ -464,7 +464,7 @@ def extcodehash(evm: Evm) -> None:
464464
The current EVM frame.
465465
"""
466466
# STACK
467-
address = to_address(pop(evm.stack))
467+
address = to_address_masked(pop(evm.stack))
468468

469469
# GAS
470470
if address in evm.accessed_addresses:

‎src/ethereum/arrow_glacier/vm/instructions/system.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from ...utils.address import (
3131
compute_contract_address,
3232
compute_create2_contract_address,
33-
to_address,
33+
to_address_masked,
3434
)
3535
from .. import (
3636
Evm,
@@ -329,7 +329,7 @@ def call(evm: Evm) -> None:
329329
"""
330330
# STACK
331331
gas = Uint(pop(evm.stack))
332-
to = to_address(pop(evm.stack))
332+
to = to_address_masked(pop(evm.stack))
333333
value = pop(evm.stack)
334334
memory_input_start_position = pop(evm.stack)
335335
memory_input_size = pop(evm.stack)
@@ -408,7 +408,7 @@ def callcode(evm: Evm) -> None:
408408
"""
409409
# STACK
410410
gas = Uint(pop(evm.stack))
411-
code_address = to_address(pop(evm.stack))
411+
code_address = to_address_masked(pop(evm.stack))
412412
value = pop(evm.stack)
413413
memory_input_start_position = pop(evm.stack)
414414
memory_input_size = pop(evm.stack)
@@ -481,7 +481,7 @@ def selfdestruct(evm: Evm) -> None:
481481
The current EVM frame.
482482
"""
483483
# STACK
484-
beneficiary = to_address(pop(evm.stack))
484+
beneficiary = to_address_masked(pop(evm.stack))
485485

486486
# GAS
487487
gas_cost = GAS_SELF_DESTRUCT
@@ -546,7 +546,7 @@ def delegatecall(evm: Evm) -> None:
546546
"""
547547
# STACK
548548
gas = Uint(pop(evm.stack))
549-
code_address = to_address(pop(evm.stack))
549+
code_address = to_address_masked(pop(evm.stack))
550550
memory_input_start_position = pop(evm.stack)
551551
memory_input_size = pop(evm.stack)
552552
memory_output_start_position = pop(evm.stack)
@@ -604,7 +604,7 @@ def staticcall(evm: Evm) -> None:
604604
"""
605605
# STACK
606606
gas = Uint(pop(evm.stack))
607-
to = to_address(pop(evm.stack))
607+
to = to_address_masked(pop(evm.stack))
608608
memory_input_start_position = pop(evm.stack)
609609
memory_input_size = pop(evm.stack)
610610
memory_output_start_position = pop(evm.stack)

‎src/ethereum/berlin/utils/address.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from ..fork_types import Address
2323

2424

25-
def to_address(data: Uint | U256) -> Address:
25+
def to_address_masked(data: Uint | U256) -> Address:
2626
"""
2727
Convert a Uint or U256 value to a valid address (20 bytes).
2828

‎src/ethereum/berlin/vm/instructions/environment.py

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

2020
from ...fork_types import EMPTY_ACCOUNT
2121
from ...state import get_account
22-
from ...utils.address import to_address
22+
from ...utils.address import to_address_masked
2323
from ...vm.memory import buffer_read, memory_write
2424
from .. import Evm
2525
from ..exceptions import OutOfBoundsRead
@@ -71,7 +71,7 @@ def balance(evm: Evm) -> None:
7171
7272
"""
7373
# STACK
74-
address = to_address(pop(evm.stack))
74+
address = to_address_masked(pop(evm.stack))
7575

7676
# GAS
7777
if address in evm.accessed_addresses:
@@ -336,7 +336,7 @@ def extcodesize(evm: Evm) -> None:
336336
337337
"""
338338
# STACK
339-
address = to_address(pop(evm.stack))
339+
address = to_address_masked(pop(evm.stack))
340340

341341
# GAS
342342
if address in evm.accessed_addresses:
@@ -368,7 +368,7 @@ def extcodecopy(evm: Evm) -> None:
368368
369369
"""
370370
# STACK
371-
address = to_address(pop(evm.stack))
371+
address = to_address_masked(pop(evm.stack))
372372
memory_start_index = pop(evm.stack)
373373
code_start_index = pop(evm.stack)
374374
size = pop(evm.stack)
@@ -464,7 +464,7 @@ def extcodehash(evm: Evm) -> None:
464464
The current EVM frame.
465465
"""
466466
# STACK
467-
address = to_address(pop(evm.stack))
467+
address = to_address_masked(pop(evm.stack))
468468

469469
# GAS
470470
if address in evm.accessed_addresses:

‎src/ethereum/berlin/vm/instructions/system.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from ...utils.address import (
3131
compute_contract_address,
3232
compute_create2_contract_address,
33-
to_address,
33+
to_address_masked,
3434
)
3535
from .. import (
3636
Evm,
@@ -330,7 +330,7 @@ def call(evm: Evm) -> None:
330330
"""
331331
# STACK
332332
gas = Uint(pop(evm.stack))
333-
to = to_address(pop(evm.stack))
333+
to = to_address_masked(pop(evm.stack))
334334
value = pop(evm.stack)
335335
memory_input_start_position = pop(evm.stack)
336336
memory_input_size = pop(evm.stack)
@@ -409,7 +409,7 @@ def callcode(evm: Evm) -> None:
409409
"""
410410
# STACK
411411
gas = Uint(pop(evm.stack))
412-
code_address = to_address(pop(evm.stack))
412+
code_address = to_address_masked(pop(evm.stack))
413413
value = pop(evm.stack)
414414
memory_input_start_position = pop(evm.stack)
415415
memory_input_size = pop(evm.stack)
@@ -482,7 +482,7 @@ def selfdestruct(evm: Evm) -> None:
482482
The current EVM frame.
483483
"""
484484
# STACK
485-
beneficiary = to_address(pop(evm.stack))
485+
beneficiary = to_address_masked(pop(evm.stack))
486486

487487
# GAS
488488
gas_cost = GAS_SELF_DESTRUCT
@@ -558,7 +558,7 @@ def delegatecall(evm: Evm) -> None:
558558
"""
559559
# STACK
560560
gas = Uint(pop(evm.stack))
561-
code_address = to_address(pop(evm.stack))
561+
code_address = to_address_masked(pop(evm.stack))
562562
memory_input_start_position = pop(evm.stack)
563563
memory_input_size = pop(evm.stack)
564564
memory_output_start_position = pop(evm.stack)
@@ -616,7 +616,7 @@ def staticcall(evm: Evm) -> None:
616616
"""
617617
# STACK
618618
gas = Uint(pop(evm.stack))
619-
to = to_address(pop(evm.stack))
619+
to = to_address_masked(pop(evm.stack))
620620
memory_input_start_position = pop(evm.stack)
621621
memory_input_size = pop(evm.stack)
622622
memory_output_start_position = pop(evm.stack)

‎src/ethereum/byzantium/utils/address.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from ..fork_types import Address
2222

2323

24-
def to_address(data: Uint | U256) -> Address:
24+
def to_address_masked(data: Uint | U256) -> Address:
2525
"""
2626
Convert a Uint or U256 value to a valid address (20 bytes).
2727

‎src/ethereum/byzantium/vm/instructions/environment.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from ethereum.utils.numeric import ceil32
1818

1919
from ...state import get_account
20-
from ...utils.address import to_address
20+
from ...utils.address import to_address_masked
2121
from ...vm.memory import buffer_read, memory_write
2222
from .. import Evm
2323
from ..exceptions import OutOfBoundsRead
@@ -68,7 +68,7 @@ def balance(evm: Evm) -> None:
6868
6969
"""
7070
# STACK
71-
address = to_address(pop(evm.stack))
71+
address = to_address_masked(pop(evm.stack))
7272

7373
# GAS
7474
charge_gas(evm, GAS_BALANCE)
@@ -329,7 +329,7 @@ def extcodesize(evm: Evm) -> None:
329329
330330
"""
331331
# STACK
332-
address = to_address(pop(evm.stack))
332+
address = to_address_masked(pop(evm.stack))
333333

334334
# GAS
335335
charge_gas(evm, GAS_EXTERNAL)
@@ -355,7 +355,7 @@ def extcodecopy(evm: Evm) -> None:
355355
356356
"""
357357
# STACK
358-
address = to_address(pop(evm.stack))
358+
address = to_address_masked(pop(evm.stack))
359359
memory_start_index = pop(evm.stack)
360360
code_start_index = pop(evm.stack)
361361
size = pop(evm.stack)

‎src/ethereum/byzantium/vm/instructions/system.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
is_account_alive,
2525
set_account_balance,
2626
)
27-
from ...utils.address import compute_contract_address, to_address
27+
from ...utils.address import compute_contract_address, to_address_masked
2828
from .. import (
2929
Evm,
3030
Message,
@@ -256,7 +256,7 @@ def call(evm: Evm) -> None:
256256
"""
257257
# STACK
258258
gas = Uint(pop(evm.stack))
259-
to = to_address(pop(evm.stack))
259+
to = to_address_masked(pop(evm.stack))
260260
value = pop(evm.stack)
261261
memory_input_start_position = pop(evm.stack)
262262
memory_input_size = pop(evm.stack)
@@ -329,7 +329,7 @@ def callcode(evm: Evm) -> None:
329329
"""
330330
# STACK
331331
gas = Uint(pop(evm.stack))
332-
code_address = to_address(pop(evm.stack))
332+
code_address = to_address_masked(pop(evm.stack))
333333
value = pop(evm.stack)
334334
memory_input_start_position = pop(evm.stack)
335335
memory_input_size = pop(evm.stack)
@@ -395,7 +395,7 @@ def selfdestruct(evm: Evm) -> None:
395395
The current EVM frame.
396396
"""
397397
# STACK
398-
beneficiary = to_address(pop(evm.stack))
398+
beneficiary = to_address_masked(pop(evm.stack))
399399

400400
# GAS
401401
gas_cost = GAS_SELF_DESTRUCT
@@ -466,7 +466,7 @@ def delegatecall(evm: Evm) -> None:
466466
"""
467467
# STACK
468468
gas = Uint(pop(evm.stack))
469-
code_address = to_address(pop(evm.stack))
469+
code_address = to_address_masked(pop(evm.stack))
470470
memory_input_start_position = pop(evm.stack)
471471
memory_input_size = pop(evm.stack)
472472
memory_output_start_position = pop(evm.stack)
@@ -517,7 +517,7 @@ def staticcall(evm: Evm) -> None:
517517
"""
518518
# STACK
519519
gas = Uint(pop(evm.stack))
520-
to = to_address(pop(evm.stack))
520+
to = to_address_masked(pop(evm.stack))
521521
memory_input_start_position = pop(evm.stack)
522522
memory_input_size = pop(evm.stack)
523523
memory_output_start_position = pop(evm.stack)

‎src/ethereum/cancun/utils/address.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from ..fork_types import Address
2323

2424

25-
def to_address(data: Uint | U256) -> Address:
25+
def to_address_masked(data: Uint | U256) -> Address:
2626
"""
2727
Convert a Uint or U256 value to a valid address (20 bytes).
2828

0 commit comments

Comments
 (0)