Skip to content

Added support for custom unit decimals providing #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Added support for custom unit decimals providing #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f623754
Added support for custom unit decimals providing
asimaranov Jun 27, 2023
8a7b5fa
Fixed failed tests
asimaranov Jun 27, 2023
eab8c16
Fixed tests
asimaranov Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions eth_utils/currency.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ class denoms:
MAX_WEI = 2**256 - 1


def from_wei(number: int, unit: str) -> Union[int, decimal.Decimal]:
def from_wei(number: int, unit: Union[str, int]) -> Union[int, decimal.Decimal]:
"""
Takes a number of wei and converts it to any other ether unit.
"""
if unit.lower() not in units:
if is_string(number) and unit.lower() not in units:
raise ValueError(
"Unknown unit. Must be one of {0}".format("/".join(units.keys()))
)
Expand All @@ -51,7 +51,10 @@ def from_wei(number: int, unit: str) -> Union[int, decimal.Decimal]:
if number < MIN_WEI or number > MAX_WEI:
raise ValueError("value must be between 1 and 2**256 - 1")

unit_value = units[unit.lower()]
if is_integer(unit):
unit_value = decimal.Decimal(10) ** decimal.Decimal(unit)
else:
unit_value = units[unit.lower()]

with localcontext() as ctx:
ctx.prec = 999
Expand All @@ -61,11 +64,11 @@ def from_wei(number: int, unit: str) -> Union[int, decimal.Decimal]:
return result_value


def to_wei(number: Union[int, float, str, decimal.Decimal], unit: str) -> int:
def to_wei(number: Union[int, float, str, decimal.Decimal], unit: Union[str, int]) -> int:
"""
Takes a number of a unit and converts it to wei.
"""
if unit.lower() not in units:
if is_string(number) and unit.lower() not in units:
raise ValueError(
"Unknown unit. Must be one of {0}".format("/".join(units.keys()))
)
Expand All @@ -80,7 +83,11 @@ def to_wei(number: Union[int, float, str, decimal.Decimal], unit: str) -> int:
raise TypeError("Unsupported type. Must be one of integer, float, or string")

s_number = str(number)
unit_value = units[unit.lower()]

if is_integer(unit):
unit_value = decimal.Decimal(10) ** decimal.Decimal(unit)
else:
unit_value = units[unit.lower()]

if d_number == decimal.Decimal(0):
return 0
Expand Down
13 changes: 13 additions & 0 deletions tests/currency-utils/test_currency_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,19 @@ def test_float_ether(value):
assert from_wei(to_wei(value, "ether"), "ether") == decimal.Decimal(str(value))


@pytest.mark.parametrize(
"value",
[
1, # 1000000 wei
0.1, # 100000 wei
0.01, # 10000 wei
0.001, # 1000 wei
],
)
def test_float_usdt(value):
assert from_wei(to_wei(value, 6), 6) == decimal.Decimal(str(value))


@pytest.mark.parametrize(
"value",
[
Expand Down