Skip to content

fix p2.1 #371

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
liquid-8 merged 1 commit into from
Jan 9, 2024
Merged

fix p2.1 #371

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions uniswap/uniswap4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def __init__(
provider: Optional[str] = None,
web3: Optional[Web3] = None,
default_slippage: float = 0.01,
poolmanager_contract_addr: Optional[AddressLike,str] = None,
poolmanager_contract_addr: Optional[str] = None,
) -> None:
"""
:param address: The public address of the ETH wallet to use.
Expand Down Expand Up @@ -91,12 +91,14 @@ def __init__(
self.max_approval_check_int = int(max_approval_check_hex, 16)

if poolmanager_contract_addr is None:
self.poolmanager_contract_addr = _poolmanager_contract_addresses[self.network]
self.poolmanager_contract_addr: AddressLike = _poolmanager_contract_addresses[self.network]
else:
self.poolmanager_contract_addr: AddressLike = poolmanager_contract_addr

self.router = _load_contract(
self.w3,
abi_name="uniswap-v4/poolmanager",
address=_str_to_addr(poolmanager_contract_addr),
address=_str_to_addr(self.poolmanager_contract_addr),
)

if hasattr(self, "poolmanager_contract"):
Expand Down Expand Up @@ -155,7 +157,7 @@ def get_price(
try:
price = int(self.w3.eth.call(signed_txn))
except ContractLogicError as revert:
price = int(self.w3.codec.decode(["int128[]","uint160","uint32"], bytes(revert))[1])
price = int(self.w3.codec.decode(["int128[]","uint160","uint32"], bytes(revert.data))[1])
return price

def get_slot0(
Expand Down