55from typing import List ,Any ,Optional ,Union ,Tuple ,Dict
66
77from web3 import Web3
8- from web3 .eth import Contract
9- from web3 .contract import ContractFunction
8+ from web3 .contract import Contract
9+ from web3 .contract . contract import ContractFunction
1010from web3 .exceptions import BadFunctionCallOutput ,ContractLogicError
1111from web3 .types import (
1212TxParams ,
3434_netid_to_name ,
3535_poolmanager_contract_addresses ,
3636ETH_ADDRESS ,
37+ NOHOOK_ADDRESS ,
3738)
3839
3940logger = logging .getLogger (__name__ )
@@ -86,17 +87,22 @@ def __init__(
8687
8788self .last_nonce :Nonce = self .w3 .eth .get_transaction_count (self .address )
8889
90+ max_approval_hex = f"0x{ 64 * 'f' }
91+ self .max_approval_int = int (max_approval_hex ,16 )
92+ max_approval_check_hex = f"0x{ 15 * '0' } { 49 * 'f' }
93+ self .max_approval_check_int = int (max_approval_check_hex ,16 )
94+
8995if poolmanager_contract_addr is None :
9096poolmanager_contract_addr = _poolmanager_contract_addresses [self .network ]
9197
92- self .poolmanager_contract = _load_contract (
98+ self .router = _load_contract (
9399self .w3 ,
94100abi_name = "uniswap-v4/poolmanager" ,
95101address = _str_to_addr (poolmanager_contract_addr ),
96102 )
97103
98104if hasattr (self ,"poolmanager_contract" ):
99- logger .info (f"Using pool manager contract:{ self .poolmanager_contract } )
105+ logger .info (f"Using pool manager contract:{ self .router } )
100106
101107# ------ Contract calls ------------------------------------------------------------
102108
@@ -109,9 +115,8 @@ def get_price(
109115qty :int ,
110116fee :int ,
111117tick_spacing :int ,
112- zero_to_one :bool = true ,
113118sqrt_price_limit_x96 :int = 0 ,
114- zero_for_one :bool = true ,
119+ zero_for_one :bool = True ,
115120hooks :AddressLike = NOHOOK_ADDRESS ,
116121 )-> int :
117122"""
@@ -285,7 +290,7 @@ def swap(
285290fee :int ,
286291tick_spacing :int ,
287292sqrt_price_limit_x96 :int = 0 ,
288- zero_for_one :bool = true ,
293+ zero_for_one :bool = True ,
289294hooks :AddressLike = NOHOOK_ADDRESS ,
290295 )-> HexBytes :
291296"""
@@ -593,7 +598,7 @@ def get_token(self, address: AddressLike, abi_name: str = "erc20") -> ERC20Token
593598return ERC20Token (symbol ,address ,name ,decimals )
594599
595600def get_pool_id (self ,currency0 :AddressLike ,currency1 :AddressLike ,fee :int ,tickSpacing :int ,hooks :AddressLike = ETH )-> bytes :
596- if currency0 > currency1 :
601+ if int ( currency0 ) > ( currency1 ) :
597602currency0 ,currency1 = currency1 ,currency0
598603return self .w3 .keccak_solidity (["address" ,"address" ,"int24" ,"int24" ,"address" ], [(currency0 ,currency1 ,fee ,tickSpacing ,hooks )])
599604