Skip to content

fix/enhancement: removes over-approval, adds manual approve #136

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

Merged
ErikBjare merged 16 commits into from
Jul 12, 2021
Merged

fix/enhancement: removes over-approval, adds manual approve #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fb09126
Update constants.py
liquid-8 Jul 2, 2021
c2bbfa7
Merge branch 'uniswap-python:master' into master
liquid-8 Jul 2, 2021
a21021a
Update uniswap.py
liquid-8 Jul 4, 2021
74e87cb
Update uniswap.py
liquid-8 Jul 5, 2021
87a14d9
Update uniswap.py
liquid-8 Jul 5, 2021
949a10d
Update uniswap/uniswap.py
liquid-8 Jul 5, 2021
b59f6cc
Update uniswap/uniswap.py
liquid-8 Jul 5, 2021
724527f
Update uniswap/uniswap.py
liquid-8 Jul 5, 2021
463890a
Update uniswap/uniswap.py
liquid-8 Jul 5, 2021
4759a0e
fix: remove duplicate lines
ErikBjare Jul 5, 2021
0165409
fix: remove duplicate lines
ErikBjare Jul 5, 2021
e8403ca
Create black.yml
liquid-8 Jul 6, 2021
69d0af4
Delete black.yml
liquid-8 Jul 6, 2021
b8788ea
black applied
liquid-8 Jul 7, 2021
06c59d2
Issue #73 fix
liquid-8 Jul 9, 2021
7d9a75a
Merge branch 'uniswap-python:master' into master
liquid-8 Jul 9, 2021
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
7 changes: 1 addition & 6 deletions uniswap/decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,7 @@ def approved(self: Any, *args: Any, **kwargs: Any) -> Any:
is_approved = self._is_approved(token)
# logger.warning(f"Approved? {token}: {is_approved}")
if not is_approved:
self._approve(token)
if token_two:
is_approved = self._is_approved(token_two)
# logger.warning(f"Approved? {token_two}: {is_approved}")
if not is_approved:
self._approve(token_two)
self.approve(token)
return method(self, *args, **kwargs)

return approved
Expand Down
2 changes: 1 addition & 1 deletion uniswap/uniswap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ def remove_liquidity(self, token: str, max_token: int) -> HexBytes:
return self._build_and_send_tx(function)

# ------ Approval Utils ------------------------------------------------------------
def _approve(self, token: AddressLike, max_approval: Optional[int] = None) -> None:
def approve(self, token: AddressLike, max_approval: Optional[int] = None) -> None:
"""Give an exchange/router max approval of a token."""
max_approval = self.max_approval_int if not max_approval else max_approval
contract_addr = (
Expand Down