Skip to content

Commit 78c6df9

Browse files
committed
added easy access to deadline
1 parent 8af1e7f commit 78c6df9

1 file changed

Lines changed: 6 additions & 17 deletions

File tree

‎uniswap/uniswap.py‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,17 @@ def __init__(
130130
web3: Web3 = None,
131131
version: int = 1,
132132
max_slippage: float = 0.1,
133+
deadline: int = None,
133134
) -> None:
134135
self.address: AddressLike = _str_to_addr(address) if isinstance(
135136
address, str
136137
) else address
137138
self.private_key = private_key
138139
self.version = version
139140

141+
if deadline:
142+
self.deadline = deadline
143+
140144
# TODO: Write tests for slippage
141145
self.max_slippage = max_slippage
142146

@@ -440,14 +444,6 @@ def make_trade(
440444
output_token: AddressLike,
441445
qty: Union[int, Wei],
442446
recipient: AddressLike = None,
443-
params: dict = {
444-
"gas_limit": 5,
445-
"nonce": 5,
446-
"gas_price": 5,
447-
"deadline": 1654000000,
448-
"max_slippage_bps": 50
449-
450-
},
451447
) -> HexBytes:
452448
"""Make a trade by defining the qty of the input token."""
453449
if input_token == ETH_ADDRESS:
@@ -470,15 +466,6 @@ def make_trade_output(
470466
output_token: AddressLike,
471467
qty: Union[int, Wei],
472468
recipient: AddressLike = None,
473-
params: dict = {
474-
"gas_limit": 5,
475-
"nonce": 5,
476-
"gas_price": 5,
477-
"deadline": 1654000000,
478-
"max_slippage_bps": 50
479-
480-
},
481-
482469
) -> HexBytes:
483470
"""Make a trade by defining the qty of the output token."""
484471
if input_token == ETH_ADDRESS:
@@ -762,6 +749,8 @@ def _is_approved(self, token: AddressLike) -> bool:
762749
# ------ Tx Utils ------------------------------------------------------------------
763750
def _deadline(self) -> int:
764751
"""Get a predefined deadline. 10min by default (same as the Uniswap SDK)."""
752+
if self.deadline:
753+
return self.deadline
765754
return int(time.time()) + 10 * 60
766755

767756
def _build_and_send_tx(

0 commit comments

Comments
 (0)