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

Changes from 1 commit
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
Prev Previous commit
Next Next commit
black applied
  • Loading branch information
@liquid-8
liquid-8 committed Jul 7, 2021
commit b8788eabec80ce33ab37a58b753186e2ddea6829
32 changes: 22 additions & 10 deletions uniswap/uniswap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,13 @@ def make_trade(
)
else:
return self._token_to_token_swap_input(
input_token, output_token, qty, recipient, fee, slippage,fee_on_transfer
input_token,
output_token,
qty,
recipient,
fee,
slippage,
fee_on_transfer,
)

@check_approval
Expand Down Expand Up @@ -462,9 +468,11 @@ def _eth_to_token_swap_input(
(1 - slippage) * self._get_eth_token_input_price(output_token, qty, fee)
)
if fee_on_transfer:
func=self.router.functions.swapExactETHForTokensSupportingFeeOnTransferTokens
func = (
self.router.functions.swapExactETHForTokensSupportingFeeOnTransferTokens
)
else:
func=self.router.functions.swapExactETHForTokens
func = self.router.functions.swapExactETHForTokens
return self._build_and_send_tx(
func(
amount_out_min,
Expand All @@ -476,7 +484,7 @@ def _eth_to_token_swap_input(
)
elif self.version == 3:
if fee_on_transfer:
raise Exception('fee on transfer not supported by Uniswap v3')
raise Exception("fee on transfer not supported by Uniswap v3")
return self._token_to_token_swap_input(
self.get_weth_address(), output_token, qty, recipient, fee, slippage
)
Expand Down Expand Up @@ -514,9 +522,11 @@ def _token_to_eth_swap_input(
(1 - slippage) * self._get_token_eth_input_price(input_token, qty, fee)
)
if fee_on_transfer:
func=self.router.functions.swapExactTokensForETHSupportingFeeOnTransferTokens
func = (
self.router.functions.swapExactTokensForETHSupportingFeeOnTransferTokens
)
else:
func=self.router.functions.swapExactTokensForETH
func = self.router.functions.swapExactTokensForETH
return self._build_and_send_tx(
func(
qty,
Expand All @@ -528,7 +538,7 @@ def _token_to_eth_swap_input(
)
elif self.version == 3:
if fee_on_transfer:
raise Exception('fee on transfer not supported by Uniswap v3')
raise Exception("fee on transfer not supported by Uniswap v3")
return self._token_to_token_swap_input(
input_token, self.get_weth_address(), qty, recipient, fee, slippage
)
Expand Down Expand Up @@ -575,9 +585,11 @@ def _token_to_token_swap_input(
)
)
if fee_on_transfer:
func=self.router.functions.swapExactTokensForTokensSupportingFeeOnTransferTokens
func = (
self.router.functions.swapExactTokensForTokensSupportingFeeOnTransferTokens
)
else:
func=self.router.functions.swapExactTokensForTokens
func = self.router.functions.swapExactTokensForTokens
return self._build_and_send_tx(
func(
qty,
Expand All @@ -589,7 +601,7 @@ def _token_to_token_swap_input(
)
elif self.version == 3:
if fee_on_transfer:
raise Exception('fee on transfer not supported by Uniswap v3')
raise Exception("fee on transfer not supported by Uniswap v3")
min_tokens_bought = int(
(1 - slippage)
* self._get_token_token_input_price(
Expand Down