defi-state-querier 0.4.22__py3-none-any.whl → 0.4.24__py3-none-any.whl

defi_services/__init__.py

@@ -1 +1 @@
-__version__ = "0.4.22"
+__version__ = "0.4.24"

defi_services/services/dex/dex_info/pancakeswap_info.py

@@ -22,14 +22,14 @@ PANCAKESWAP_V2_BSC_INFO = {
 }
 
 PANCAKESWAP_V3_BSC_INFO = {
-    'factory_address': '0x0BFbCF9fa4f9C56B0F40a671Ad40E0805A091865',
+    'factory_address': '0x0bfbcf9fa4f9c56b0f40a671ad40e0805a091865',
     'factory_abi': PANCAKESWAP_V3_FACTORY_ABI,
-    'master_chef_address': '0x556B9306565093C855AEA9AE92A594704c2Cd59e',
+    'master_chef_address': '0x556b9306565093c855aea9ae92a594704c2cd59e',
     'master_chef_abi': PANCAKESWAP_MASTERCHEF_V3_ABI,
-    "reward_token": "0x0E09FaBB73Bd3Ade0a17ECC321fD13a19e81cE82".lower(),
-    "NFT_manager_address": "0x46A15B0b27311cedF172AB29E4f4766fbE7F4364".lower(),
+    "NFT_manager_address": "0x46a15b0b27311cedf172ab29e4f4766fbe7f4364",
     "NFT_manager_abi": PANCAKE_V3_NON_FUNGIBLE_POSITION_TOKEN_ABI,
     'pool_abi': PANCAKESWAP_V3_POOL_ABI,
-    'forked': 'uniswap-v3'
+    'forked': 'uniswap-v3',
+    "reward_token": "0x0e09fabb73bd3ade0a17ecc321fd13a19e81ce82",
 
 }

defi_services/services/dex/dex_info/quickswap_info.py

@@ -14,9 +14,9 @@ QUICKSWAP_POLYGON_V3_INFO = {
     "NFT_manager_address": "0x8ef88e4c7cfbbac1c163f7eddd4b578792201de6",
     "NFT_manager_abi": QUICKSWAP_V3_NON_FUNGIBLE_POSITION_TOKEN_ABI,
     'pool_abi':QUICKSWAP_V3_POOL_ABI,
-    'finite_farming': '0x9923f42a02A82dA63EE0DbbC5f8E311e3DD8A1f8',
-    'infinite_farming': '0x8a26436e41d0b5fc4C6Ed36C1976fafBe173444E',
-    'farming_center': '0x7F281A8cdF66eF5e9db8434Ec6D97acc1bc01E78',
+    'finite_farming': '0x9923f42a02a82da63ee0dbbc5f8e311e3dd8a1f8',
+    'infinite_farming': '0x8a26436e41d0b5fc4c6ed36c1976fafbe173444e',
+    'farming_center': '0x7f281a8cdf66ef5e9db8434ec6d97acc1bc01e78',
     'forked': 'uniswap-v3'
 
 }

defi_services/services/dex/pancakeswap_v3_service.py

@@ -8,6 +8,7 @@ from defi_services.constants.entities.dex_constant import Dex
 from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.dex.dex_info.pancakeswap_info import PANCAKESWAP_V3_BSC_INFO
 from defi_services.services.dex.uniswap_v3_service import UniswapV3Services
+from defi_services.utils.get_fees import get_fees
 from defi_services.utils.sqrt_price_math import get_token_amount_of_pool, get_token_amount_of_user
 
 logger = logging.getLogger("PancakeSwap V3 State Service")
@@ -199,8 +200,7 @@ class PancakeSwapV3Service(UniswapV3Services):
 
     def decode_all_nft_token_of_user_function(
             self, decode_data: dict):
-        result = {'all_token': {}, 'stake_token': {}}
-        result['all_token'] = super().decode_all_nft_token_of_user_function(decode_data)
+        result = {'all_token': super().decode_all_nft_token_of_user_function(decode_data), 'stake_token': {}}
 
         for query_id, token_id in decode_data.items():
             contract_addr = query_id.split("_")[1]
@@ -235,33 +235,31 @@ class PancakeSwapV3Service(UniswapV3Services):
     def decode_user_info_function(self, user: str, supplied_data: dict, decoded_data: dict = None,
                                   stake: bool = True,
                                   block_number: int = "latest"):
-        user_data = supplied_data['user_data']
-        supplied_param = {'user_data': user_data['all_token']}
-        user_data['all_token'] = super().decode_user_info_function(user, supplied_param, decoded_data, stake,
-                                                                   block_number)
+        supplied_param = {'user_data': supplied_data['user_data'].get('all_token')}
+        user_data_with_liquidity = {
+            'all_token': super().decode_user_info_function(user, supplied_param, decoded_data, stake,
+                                                           block_number), 'stake_token': {}}
 
-        for token_id, value in user_data['stake_token'].items():
+        for token_id, value in supplied_data['user_data'].get('stake_token').items():
             master_chef_position = decoded_data.get(
                 f'userPositionInfos_{self.masterchef_addr}_{token_id}_{block_number}'.lower())
-            pending_cake = decoded_data.get(f'pendingCake_{self.masterchef_addr}_{token_id}_{block_number}'.lower())
-            nft_position = decoded_data.get(
-                f'positions_{self.nft_token_manager_addr}_{token_id}_{block_number}'.lower())
-
-            user_data['stake_token'][token_id].update({
-                'liquidity': master_chef_position[0],
-                'tick_lower': master_chef_position[2],
-                'tick_upper': master_chef_position[3],
-                'reward': master_chef_position[5] / 10 ** 18,
-                'farming_pid': master_chef_position[7],
-                'pending_cake': pending_cake / 10 ** 18,
-                'fee_growth_inside0': nft_position[8],
-                'fee_growth_inside1': nft_position[9],
-                'tokens_owed0': nft_position[10],
-                'tokens_owed1': nft_position[11]
-
-            })
-
-        return user_data
+            liquidity = master_chef_position[0]
+            if liquidity > 0:
+                nft_position = decoded_data.get(
+                    f'positions_{self.nft_token_manager_addr}_{token_id}_{block_number}'.lower())
+                user_data_with_liquidity['stake_token'][token_id] = {
+                    'liquidity': master_chef_position[0],
+                    'tick_lower': master_chef_position[2],
+                    'tick_upper': master_chef_position[3],
+                    'reward': master_chef_position[5] / 10 ** 18,
+                    'farming_pid': master_chef_position[7],
+                    'pending_cake': decoded_data.get(
+                        f'pendingCake_{self.masterchef_addr}_{token_id}_{block_number}'.lower()) / 10 ** 18,
+                    'fee_growth_inside0_x128': nft_position[8],
+                    'fee_growth_inside1_x128': nft_position[9],
+                }
+
+        return user_data_with_liquidity
 
     def get_user_token_amount_function(self, user: str, supplied_data: dict, block_number: int = "latest"):
         user_data = supplied_data['user_data']
@@ -280,7 +278,6 @@ class PancakeSwapV3Service(UniswapV3Services):
                                           block_number: int = "latest"):
         user_data = supplied_data['user_data']
         lp_token_info = supplied_data['lp_token_info']
-
         supplied_param = {'user_data': user_data['all_token'],
                           'lp_token_info': lp_token_info}
         user_data['all_token'] = super().decode_user_token_amount_function(user, supplied_param, decoded_data,
@@ -292,28 +289,24 @@ class PancakeSwapV3Service(UniswapV3Services):
                 'pool_address': lp_token_address
             })
             liquidity = value.get('liquidity')
-            if liquidity > 0:
-                token0_decimals = lp_token_info.get(lp_token_address, {}).get("token0_decimals")
-                token1_decimals = lp_token_info.get(lp_token_address, {}).get("token1_decimals")
-                price = lp_token_info.get(lp_token_address, {}).get("price")
-
-                tick = lp_token_info.get(lp_token_address, {}).get('tick')
-                tick_lower = value.get('tick_lower')
-                tick_upper = value.get('tick_upper')
-                if price and tick:
-                    sqrt_price_x96 = math.sqrt(price) * 2 ** 96
-
-                    token0_amount, token1_amount = get_token_amount_of_user(liquidity=liquidity,
-                                                                            sqrt_price_x96=sqrt_price_x96,
-                                                                            tick=tick, tick_upper=tick_upper,
-                                                                            tick_lower=tick_lower)
-
-                    user_data['stake_token'][token_id].update(
-                        {
-                            'token0_amount': token0_amount / 10 ** token0_decimals,
-                            'token1_amount': token1_amount / 10 ** token1_decimals,
-                        }
-                    )
+            token0_decimals = lp_token_info.get(lp_token_address, {}).get("token0_decimals")
+            token1_decimals = lp_token_info.get(lp_token_address, {}).get("token1_decimals")
+            price = lp_token_info.get(lp_token_address, {}).get("price")
+            tick = lp_token_info.get(lp_token_address, {}).get('tick')
+            tick_lower = value.get('tick_lower')
+            tick_upper = value.get('tick_upper')
+            if price and tick:
+                sqrt_price_x96 = math.sqrt(price) * 2 ** 96
+                token0_amount, token1_amount = get_token_amount_of_user(liquidity=liquidity,
+                                                                        sqrt_price_x96=sqrt_price_x96,
+                                                                        tick=tick, tick_upper=tick_upper,
+                                                                        tick_lower=tick_lower)
+                user_data['stake_token'][token_id].update(
+                    {
+                        'token0_amount': token0_amount / 10 ** token0_decimals,
+                        'token1_amount': token1_amount / 10 ** token1_decimals,
+                    }
+                )
         return user_data
 
     def get_rewards_balance_function_info(self, user, supplied_data, block_number: int = "latest"):
@@ -324,11 +317,15 @@ class PancakeSwapV3Service(UniswapV3Services):
             lp_token_address = value.get('pool_address')
             tick_lower = value.get('tick_lower')
             tick_upper = value.get('tick_upper')
-            position_key = self.get_position_key(tick_lower, tick_upper)
-            query_id = f'positions_{lp_token_address}_{[tick_upper, tick_lower]}_{block_number}'.lower()
-            rpc_calls[query_id] = self.state_service.get_function_info(
-                address=lp_token_address, abi=self.pool_info['pool_abi'], fn_name="positions", fn_paras=[position_key]
-            )
+            for fnc in ['feeGrowthGlobal0X128', 'feeGrowthGlobal1X128']:
+                query_id = f'{fnc}_{lp_token_address}_{block_number}'.lower()
+                rpc_calls[query_id] = self.state_service.get_function_info(
+                    address=lp_token_address, abi=self.pool_info['pool_abi'], fn_name=fnc)
+
+            for param in [tick_lower, tick_upper]:
+                query_id = f'ticks_{lp_token_address}_{param}_{block_number}'.lower()
+                rpc_calls[query_id] = self.state_service.get_function_info(
+                    address=lp_token_address, abi=self.pool_info['pool_abi'], fn_name="ticks", fn_paras=[param])
         return rpc_calls
 
     def calculate_rewards_balance(
@@ -338,39 +335,40 @@ class PancakeSwapV3Service(UniswapV3Services):
 
         supplied_param = {'user_data': user_data['all_token'],
                           'lp_token_info': lp_token_info}
-        user_data['all_token'] = super().calculate_rewards_balance(user, supplied_param, decoded_data,
-                                                                   block_number)
+        user_data['all_token'] = super().calculate_rewards_balance(user, supplied_param, decoded_data, block_number)
         for token_id, value in user_data['stake_token'].items():
+            lp_token_address = value.get('pool_address')
+            tick_lower = value.get('tick_lower')
+            tick_upper = value.get('tick_upper')
+            fee_growth_inside_0_x128 = value.get('fee_growth_inside0_x128')
+            fee_growth_inside_1_x128 = value.get('fee_growth_inside1_x128')
+            fee_growth_global_0 = decoded_data.get(f'feeGrowthGlobal0X128_{lp_token_address}_{block_number}'.lower())
+            fee_growth_global_1 = decoded_data.get(f'feeGrowthGlobal1X128_{lp_token_address}_{block_number}'.lower())
+            fee_growth_0_low_x128 = decoded_data.get(f'ticks_{lp_token_address}_{tick_lower}_{block_number}'.lower())[2]
+            fee_growth_1_low_x128 = decoded_data.get(f'ticks_{lp_token_address}_{tick_lower}_{block_number}'.lower())[3]
+            fee_growth_0_hi_x128 = decoded_data.get(f'ticks_{lp_token_address}_{tick_upper}_{block_number}'.lower())[2]
+            fee_growth_1_hi_x128 = decoded_data.get(f'ticks_{lp_token_address}_{tick_upper}_{block_number}'.lower())[3]
             liquidity = value.get('liquidity')
-            if liquidity > 0:
-                try:
-                    lp_token_address = value.get('pool_address')
-                    tick_lower = value.get('tick_lower')
-                    tick_upper = value.get('tick_upper')
-                    pool_position = decoded_data.get(
-                        f'positions_{lp_token_address}_{[tick_upper, tick_lower]}_{block_number}'.lower())
-
-                    pool_fee_growth_inside0 = pool_position[1]
-                    pool_fee_growth_inside1 = pool_position[2]
-                    fee_growth_inside0 = value.get('fee_growth_inside0')
-                    fee_growth_inside1 = value.get('fee_growth_inside1')
-                    liquidity = value.get('liquidity')
-                    token0_decimals = lp_token_info.get(lp_token_address, {}).get("token0_decimals")
-                    token1_decimals = lp_token_info.get(lp_token_address, {}).get("token1_decimals")
-                    token0_reward = ((pool_fee_growth_inside0 - fee_growth_inside0) / 2 ** 128 * liquidity + value.get(
-                        'tokens_owed0')) / 10 ** token0_decimals
-                    token1_reward = ((pool_fee_growth_inside1 - fee_growth_inside1) / 2 ** 128 * liquidity + value.get(
-                        'tokens_owed1')) / 10 ** token1_decimals
-                except Exception:
-                    continue
-
-            else:
-                token0_reward = 0
-                token1_reward = 0
-
-            user_data['stake_token'][token_id].update({
-                'token0_reward': token0_reward,
-                'token1_reward': token1_reward
-            })
+            token0_decimals = lp_token_info.get(lp_token_address, {}).get("token0_decimals")
+            token1_decimals = lp_token_info.get(lp_token_address, {}).get("token1_decimals")
+            tick = lp_token_info.get(lp_token_address, {}).get('tick')
+            if tick and token0_decimals and token1_decimals:
+                token0_reward, token1_reward = get_fees(
+                    fee_growth_global_0=fee_growth_global_0,
+                    fee_growth_global_1=fee_growth_global_1,
+                    fee_growth_0_low=fee_growth_0_low_x128,
+                    fee_growth_1_low=fee_growth_1_low_x128,
+                    fee_growth_0_hi=fee_growth_0_hi_x128,
+                    fee_growth_1_hi=fee_growth_1_hi_x128,
+                    fee_growth_inside_0=fee_growth_inside_0_x128,
+                    fee_growth_inside_1=fee_growth_inside_1_x128,
+                    liquidity=liquidity, tick_lower=tick_lower,
+                    tick_upper=tick_upper, tick_current=tick,
+                    decimals0=token0_decimals, decimals1=token1_decimals)
+
+                user_data['stake_token'][token_id].update({
+                    'token0_reward': token0_reward,
+                    'token1_reward': token1_reward
+                })
 
         return user_data

defi_services/services/dex/quickswap_v3_service.py

@@ -5,6 +5,7 @@ from defi_services.constants.entities.dex_constant import Dex
 from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.dex.dex_info.quickswap_info import QUICKSWAP_POLYGON_V3_INFO
 from defi_services.services.dex.uniswap_v3_service import UniswapV3Services
+from defi_services.utils.get_fees import get_fees
 
 logger = logging.getLogger("QuickSwap V3 State Service")
 
@@ -116,21 +117,21 @@ class QuickSwapV3Services(UniswapV3Services):
     def decode_user_info_function(self, user: str, supplied_data: dict, decoded_data: dict = None, stake: bool = False,
                                   block_number: int = "latest"):
         user_data = supplied_data['user_data']
+        user_data_with_liquidity = {}
         for token_id, value in user_data.items():
             position = decoded_data.get(f'positions_{self.nft_token_manager_addr}_{token_id}_{block_number}'.lower())
-            user_data[token_id].update({
-                'token0': position[2],
-                'token1': position[3],
-                'tick_lower': position[4],
-                'tick_upper': position[5],
-                'liquidity': position[6],
-                'fee_growth_inside0': position[7],
-                'fee_growth_inside1': position[8],
-                'tokens_owed0': position[9],
-                'tokens_owed1': position[10]
-
-            })
-        return user_data
+            liquidity = position[6]
+            if liquidity > 0:
+                user_data_with_liquidity[token_id] = {
+                    'token0': position[2],
+                    'token1': position[3],
+                    'tick_lower': position[4],
+                    'tick_upper': position[5],
+                    'liquidity': liquidity,
+                    'fee_growth_inside0_x128': position[7],
+                    'fee_growth_inside1_x128': position[8],
+                }
+        return user_data_with_liquidity
 
     def get_user_token_amount_function(self, user: str, supplied_data: dict, block_number: int = "latest"):
         user_data = supplied_data['user_data']
@@ -138,7 +139,7 @@ class QuickSwapV3Services(UniswapV3Services):
         for token_id, value in user_data.items():
             token0 = value.get('token0')
             token1 = value.get('token1')
-            query_id = f'allPool_{self.factory_addr}_{token_id}_{block_number}'.lower()
+            query_id = f'getPool_{self.factory_addr}_{token_id}_{block_number}'.lower()
             rpc_calls[query_id] = self.state_service.get_function_info(
                 self.factory_addr, self.factory_abi, fn_name="poolByPair", fn_paras=[token0, token1]
             )
@@ -151,44 +152,65 @@ class QuickSwapV3Services(UniswapV3Services):
 
         return rpc_calls
 
+    def get_rewards_balance_function_info(self, user, supplied_data, block_number: int = "latest"):
+        user_data = supplied_data['user_data']
+        rpc_calls = {}
+        for token_id, value in user_data.items():
+            lp_token_address = value.get('pool_address')
+            tick_lower = value.get('tick_lower')
+            tick_upper = value.get('tick_upper')
+            for fnc in ['totalFeeGrowth0Token', 'totalFeeGrowth1Token']:
+                query_id = f'{fnc}_{lp_token_address}_{block_number}'.lower()
+                rpc_calls[query_id] = self.state_service.get_function_info(
+                    address=lp_token_address, abi=self.pool_info['pool_abi'], fn_name=fnc)
+
+            for param in [tick_lower, tick_upper]:
+                query_id = f'ticks_{lp_token_address}_{param}_{block_number}'.lower()
+                rpc_calls[query_id] = self.state_service.get_function_info(
+                    address=lp_token_address, abi=self.pool_info['pool_abi'], fn_name="ticks", fn_paras=[param])
+
+        return rpc_calls
+
     def calculate_rewards_balance(
             self, user: str, supplied_data: dict, decoded_data: dict, block_number: int = "latest"):
         lp_token_info = supplied_data['lp_token_info']
         user_data = supplied_data['user_data']
 
         for token_id, value in user_data.items():
+            lp_token_address = value.get('pool_address')
+            tick_lower = value.get('tick_lower')
+            tick_upper = value.get('tick_upper')
+            fee_growth_inside_0_x128 = value.get('fee_growth_inside0_x128')
+            fee_growth_inside_1_x128 = value.get('fee_growth_inside1_x128')
+            fee_growth_global_0 = decoded_data.get(
+                f'totalFeeGrowth0Token_{lp_token_address}_{block_number}'.lower())
+            fee_growth_global_1 = decoded_data.get(
+                f'totalFeeGrowth1Token_{lp_token_address}_{block_number}'.lower())
+            fee_growth_0_low_x128 = decoded_data.get(f'ticks_{lp_token_address}_{tick_lower}_{block_number}'.lower())[2]
+            fee_growth_1_low_x128 = decoded_data.get(f'ticks_{lp_token_address}_{tick_lower}_{block_number}'.lower())[3]
+            fee_growth_0_hi_x128 = decoded_data.get(f'ticks_{lp_token_address}_{tick_upper}_{block_number}'.lower())[2]
+            fee_growth_1_hi_x128 = decoded_data.get(f'ticks_{lp_token_address}_{tick_upper}_{block_number}'.lower())[3]
             liquidity = value.get('liquidity')
-            if liquidity > 0:
-                lp_token_address = value.get('pool_address')
-                tick_lower = value.get('tick_lower')
-                tick_upper = value.get('tick_upper')
-                pool_position = decoded_data.get(
-                    f'positions_{lp_token_address}_{[tick_upper, tick_lower]}_{block_number}'.lower())
-
-                pool_fee_growth_inside0 = pool_position[2]
-                pool_fee_growth_inside1 = pool_position[3]
-                fee_growth_inside0 = value.get('fee_growth_inside0')
-                fee_growth_inside1 = value.get('fee_growth_inside1')
-                liquidity = value.get('liquidity')
-                token0_decimals = lp_token_info.get(lp_token_address, {}).get("token0_decimals")
-                token1_decimals = lp_token_info.get(lp_token_address, {}).get("token1_decimals")
-                token0_reward = ((pool_fee_growth_inside0 - fee_growth_inside0) / 2 ** 128 * liquidity + value.get(
-                    'tokens_owed0')) / 10 ** token0_decimals
-                token1_reward = ((pool_fee_growth_inside1 - fee_growth_inside1) / 2 ** 128 * liquidity + value.get(
-                    'tokens_owed1')) / 10 ** token1_decimals
-
-            else:
-                token0_reward = 0
-                token1_reward = 0
-
-            user_data[token_id].update({
-                'token0_reward': token0_reward,
-                'token1_reward': token1_reward
-            })
-
-        return user_data
-
-    def get_position_key(self, tick_lower, tick_upper):
-        owner = int(self.nft_token_manager_addr, 16)
-        key = (((owner << 24) | (tick_lower & 0xFFFFFF)) << 24) | (tick_upper & 0xFFFFFF)
-        return '0x' + format(key, '064x')
+            tick = lp_token_info.get(lp_token_address, {}).get('tick')
+            token0_decimals = lp_token_info.get(lp_token_address, {}).get("token0_decimals")
+            token1_decimals = lp_token_info.get(lp_token_address, {}).get("token1_decimals")
+            if tick and token0_decimals and token1_decimals:
+                token0_reward, token1_reward = get_fees(
+                    fee_growth_global_0=fee_growth_global_0,
+                    fee_growth_global_1=fee_growth_global_1,
+                    fee_growth_0_low=fee_growth_0_low_x128,
+                    fee_growth_1_low=fee_growth_1_low_x128,
+                    fee_growth_0_hi=fee_growth_0_hi_x128,
+                    fee_growth_1_hi=fee_growth_1_hi_x128,
+                    fee_growth_inside_0=fee_growth_inside_0_x128,
+                    fee_growth_inside_1=fee_growth_inside_1_x128,
+                    liquidity=liquidity, tick_lower=tick_lower,
+                    tick_upper=tick_upper, tick_current=tick,
+                    decimals0=token0_decimals, decimals1=token1_decimals)
+
+                user_data[token_id].update({
+                    'token0_reward': token0_reward,
+                    'token1_reward': token1_reward
+                })
+
+        return user_data

defi_services/services/dex/uniswap_v3_service.py

@@ -1,13 +1,13 @@
 import copy
 import logging
 import math
-from web3 import Web3
 from defi_services.abis.token.erc20_abi import ERC20_ABI
 from defi_services.constants.chain_constant import Chain
 from defi_services.constants.entities.dex_constant import Dex
 from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.dex.dex_info.uniswap_info import UNISWAP_V3_ETH_INFO
 from defi_services.services.dex_protocol_services import DexProtocolServices
+from defi_services.utils.get_fees import get_fees
 from defi_services.utils.sqrt_price_math import get_token_amount_of_user, get_token_amount_of_pool
 
 logger = logging.getLogger("UniSwap V3 State Service")
@@ -212,22 +212,22 @@ class UniswapV3Services(DexProtocolServices):
     def decode_user_info_function(self, user: str, supplied_data: dict, decoded_data: dict = None, stake: bool = False,
                                   block_number: int = "latest"):
         user_data = supplied_data['user_data']
+        user_data_with_liquidity = {}
         for token_id, value in user_data.items():
             position = decoded_data.get(f'positions_{self.nft_token_manager_addr}_{token_id}_{block_number}'.lower())
-            user_data[token_id].update({
-                'token0': position[2],
-                'token1': position[3],
-                'fee': position[4],
-                'tick_lower': position[5],
-                'tick_upper': position[6],
-                'liquidity': position[7],
-                'fee_growth_inside0': position[8],
-                'fee_growth_inside1': position[9],
-                'tokens_owed0': position[10],
-                'tokens_owed1': position[11]
-            })
-
-        return user_data
+            liquidity = position[7]
+            if liquidity > 0:
+                user_data_with_liquidity[token_id] = {
+                    'token0': position[2],
+                    'token1': position[3],
+                    'fee': position[4],
+                    'tick_lower': position[5],
+                    'tick_upper': position[6],
+                    'liquidity': position[7],
+                    'fee_growth_inside0_x128': position[8],
+                    'fee_growth_inside1_x128': position[9],
+                }
+        return user_data_with_liquidity
 
     def get_user_token_amount_function(self, user: str, supplied_data: dict, block_number: int = "latest"):
         user_data = supplied_data['user_data']
@@ -236,7 +236,7 @@ class UniswapV3Services(DexProtocolServices):
             token0 = value.get('token0')
             token1 = value.get('token1')
             fee = value.get('fee')
-            query_id = f'allPool_{self.factory_addr}_{token_id}_{block_number}'.lower()
+            query_id = f'getPool_{self.factory_addr}_{token_id}_{block_number}'.lower()
             rpc_calls[query_id] = self.state_service.get_function_info(
                 self.factory_addr, self.factory_abi, fn_name="getPool", fn_paras=[token0, token1, fee]
             )
@@ -256,36 +256,35 @@ class UniswapV3Services(DexProtocolServices):
         result = {}
 
         for token_id, value in user_data.items():
-            lp_token_address = decoded_data.get(f'allPool_{self.factory_addr}_{token_id}_{block_number}'.lower())
+            lp_token_address = decoded_data.get(f'getPool_{self.factory_addr}_{token_id}_{block_number}'.lower())
             user_data[token_id].update({
                 'pool_address': lp_token_address
             })
             liquidity = value.get('liquidity')
-            if liquidity > 0:
-                result[token_id] = copy.deepcopy(user_data[token_id])
-                token0 = value.get('token0')
-                token1 = value.get('token1')
-                token0_decimals = decoded_data.get(f'decimals_{token0}_{block_number}'.lower())
-                token1_decimals = decoded_data.get(f'decimals_{token1}_{block_number}'.lower())
-                price = lp_token_info.get(lp_token_address, {}).get("price")
-
-                tick = lp_token_info.get(lp_token_address, {}).get('tick')
-                tick_upper = value.get('tick_upper')
-                tick_lower = value.get('tick_lower')
-                if price and tick:
-                    sqrt_price_x96 = (math.sqrt(price)) * 2 ** 96
-
-                    token0_amount, token1_amount = get_token_amount_of_user(liquidity=liquidity,
-                                                                            sqrt_price_x96=sqrt_price_x96,
-                                                                            tick=tick, tick_upper=tick_upper,
-                                                                            tick_lower=tick_lower)
-                    result[token_id].update(
-                        {
-                            'token0_amount': token0_amount / 10 ** token0_decimals,
-                            'token1_amount': token1_amount / 10 ** token1_decimals,
+            result[token_id] = copy.deepcopy(user_data[token_id])
+            token0 = value.get('token0')
+            token1 = value.get('token1')
+            token0_decimals = decoded_data.get(f'decimals_{token0}_{block_number}'.lower())
+            token1_decimals = decoded_data.get(f'decimals_{token1}_{block_number}'.lower())
+            price = lp_token_info.get(lp_token_address, {}).get("price")
 
-                        }
-                    )
+            tick = lp_token_info.get(lp_token_address, {}).get('tick')
+            tick_upper = value.get('tick_upper')
+            tick_lower = value.get('tick_lower')
+            if price and tick:
+                sqrt_price_x96 = (math.sqrt(price)) * 2 ** 96
+
+                token0_amount, token1_amount = get_token_amount_of_user(
+                    liquidity=liquidity,
+                    sqrt_price_x96=sqrt_price_x96,
+                    tick=tick, tick_upper=tick_upper,
+                    tick_lower=tick_lower)
+                result[token_id].update(
+                    {
+                        'token0_amount': token0_amount / 10 ** token0_decimals,
+                        'token1_amount': token1_amount / 10 ** token1_decimals,
+                    }
+                )
 
         return result
 
@@ -296,11 +295,16 @@ class UniswapV3Services(DexProtocolServices):
             lp_token_address = value.get('pool_address')
             tick_lower = value.get('tick_lower')
             tick_upper = value.get('tick_upper')
-            position_key = self.get_position_key(tick_lower, tick_upper)
-            query_id = f'positions_{lp_token_address}_{[tick_upper, tick_lower]}_{block_number}'.lower()
-            rpc_calls[query_id] = self.state_service.get_function_info(
-                address=lp_token_address, abi=self.pool_info['pool_abi'], fn_name="positions", fn_paras=[position_key]
-            )
+            for fnc in ['feeGrowthGlobal0X128', 'feeGrowthGlobal1X128']:
+                query_id = f'{fnc}_{lp_token_address}_{block_number}'.lower()
+                rpc_calls[query_id] = self.state_service.get_function_info(
+                    address=lp_token_address, abi=self.pool_info['pool_abi'], fn_name=fnc)
+
+            for param in [tick_lower, tick_upper]:
+                query_id = f'ticks_{lp_token_address}_{param}_{block_number}'.lower()
+                rpc_calls[query_id] = self.state_service.get_function_info(
+                    address=lp_token_address, abi=self.pool_info['pool_abi'], fn_name="ticks", fn_paras=[param])
+
         return rpc_calls
 
     def calculate_rewards_balance(
@@ -309,46 +313,44 @@ class UniswapV3Services(DexProtocolServices):
         user_data = supplied_data['user_data']
 
         for token_id, value in user_data.items():
+            lp_token_address = value.get('pool_address')
+            tick_lower = value.get('tick_lower')
+            tick_upper = value.get('tick_upper')
+            fee_growth_inside_0_x128 = value.get('fee_growth_inside0_x128')
+            fee_growth_inside_1_x128 = value.get('fee_growth_inside1_x128')
+            fee_growth_global_0 = decoded_data.get(
+                f'feeGrowthGlobal0X128_{lp_token_address}_{block_number}'.lower())
+            fee_growth_global_1 = decoded_data.get(
+                f'feeGrowthGlobal1X128_{lp_token_address}_{block_number}'.lower())
+            fee_growth_0_low_x128 = decoded_data.get(f'ticks_{lp_token_address}_{tick_lower}_{block_number}'.lower())[2]
+            fee_growth_1_low_x128 = decoded_data.get(f'ticks_{lp_token_address}_{tick_lower}_{block_number}'.lower())[3]
+            fee_growth_0_hi_x128 = decoded_data.get(f'ticks_{lp_token_address}_{tick_upper}_{block_number}'.lower())[2]
+            fee_growth_1_hi_x128 = decoded_data.get(f'ticks_{lp_token_address}_{tick_upper}_{block_number}'.lower())[3]
             liquidity = value.get('liquidity')
-            if liquidity > 0:
-                lp_token_address = value.get('pool_address')
-                tick_lower = value.get('tick_lower')
-                tick_upper = value.get('tick_upper')
-                pool_position = decoded_data.get(
-                    f'positions_{lp_token_address}_{[tick_upper, tick_lower]}_{block_number}'.lower())
-
-                pool_fee_growth_inside0 = pool_position[1]
-                pool_fee_growth_inside1 = pool_position[2]
-                fee_growth_inside0 = value.get('fee_growth_inside0')
-                fee_growth_inside1 = value.get('fee_growth_inside1')
-                liquidity = value.get('liquidity')
-                token0_decimals = lp_token_info.get(lp_token_address, {}).get("token0_decimals")
-                token1_decimals = lp_token_info.get(lp_token_address, {}).get("token1_decimals")
-                token0_reward = ((pool_fee_growth_inside0 - fee_growth_inside0) / 2 ** 128 * liquidity + value.get(
-                    'tokens_owed0')) / 10 ** token0_decimals
-                token1_reward = ((pool_fee_growth_inside1 - fee_growth_inside1) / 2 ** 128 * liquidity + value.get(
-                    'tokens_owed1')) / 10 ** token1_decimals
-                if token0_reward > 0 or token1_reward > 0:
-                    print(token_id)
-
-            else:
-                token0_reward = 0
-                token1_reward = 0
-
-            user_data[token_id].update({
-                'token0_reward': token0_reward,
-                'token1_reward': token1_reward
-            })
+            tick = lp_token_info.get(lp_token_address, {}).get('tick')
+            token0_decimals = lp_token_info.get(lp_token_address, {}).get("token0_decimals")
+            token1_decimals = lp_token_info.get(lp_token_address, {}).get("token1_decimals")
+            if tick and token0_decimals and token1_decimals:
+                token0_reward, token1_reward = get_fees(
+                    fee_growth_global_0=fee_growth_global_0,
+                    fee_growth_global_1=fee_growth_global_1,
+                    fee_growth_0_low=fee_growth_0_low_x128,
+                    fee_growth_1_low=fee_growth_1_low_x128,
+                    fee_growth_0_hi=fee_growth_0_hi_x128,
+                    fee_growth_1_hi=fee_growth_1_hi_x128,
+                    fee_growth_inside_0=fee_growth_inside_0_x128,
+                    fee_growth_inside_1=fee_growth_inside_1_x128,
+                    liquidity=liquidity, tick_lower=tick_lower,
+                    tick_upper=tick_upper, tick_current=tick,
+                    decimals0=token0_decimals, decimals1=token1_decimals)
+
+                user_data[token_id].update({
+                    'token0_reward': token0_reward,
+                    'token1_reward': token1_reward
+                })
 
         return user_data
 
-    def get_position_key(self, tick_lower, tick_upper):
-        data_to_hash = Web3.solidityKeccak(
-            ['address', 'int24', 'int24'],
-            [Web3.toChecksumAddress(self.nft_token_manager_addr), tick_lower, tick_upper]
-        )
-        return data_to_hash.hex()
-
     def checksum_address(self, address):
         if self.web3.isAddress(address):
             address = self.web3.toChecksumAddress(address)

defi_services/utils/get_fees.py

@@ -0,0 +1,33 @@
+def get_fees(fee_growth_global_0, fee_growth_global_1, fee_growth_0_low, fee_growth_0_hi, fee_growth_inside_0,
+             fee_growth_1_low, fee_growth_1_hi, fee_growth_inside_1, liquidity, decimals0, decimals1, tick_lower,
+             tick_upper, tick_current):
+    if tick_current >= tick_upper:
+        tick_upper_fee_growth_above_0 = sub_in_256(fee_growth_global_0, fee_growth_0_hi)
+        tick_upper_fee_growth_above_1 = sub_in_256(fee_growth_global_1, fee_growth_1_hi)
+    else:
+        tick_upper_fee_growth_above_0 = fee_growth_0_hi
+        tick_upper_fee_growth_above_1 = fee_growth_1_hi
+    if tick_current >= tick_lower:
+        tick_lower_fee_growth_below_0 = fee_growth_0_low
+        tick_lower_fee_growth_below_1 = fee_growth_1_low
+    else:
+        tick_lower_fee_growth_below_0 = sub_in_256(fee_growth_global_0, fee_growth_0_low)
+        tick_lower_fee_growth_below_1 = sub_in_256(fee_growth_global_1, fee_growth_1_low)
+
+    fr_t1_0 = sub_in_256(sub_in_256(fee_growth_global_0, tick_lower_fee_growth_below_0),
+                         tick_upper_fee_growth_above_0)
+    fr_t1_1 = sub_in_256(sub_in_256(fee_growth_global_1, tick_lower_fee_growth_below_1),
+                         tick_upper_fee_growth_above_1)
+    uncollect_fee_0 = liquidity * sub_in_256(fr_t1_0, fee_growth_inside_0) / 2 ** 128
+    uncollect_fee_1 = liquidity * sub_in_256(fr_t1_1, fee_growth_inside_1) / 2 ** 128
+    return uncollect_fee_0 / 10 ** decimals0, uncollect_fee_1 / 10 ** decimals1
+
+
+def sub_in_256(a: int, b: int) -> int:
+    """
+    Performs subtraction on two 256-bit unsigned integers, handling overflow.
+    """
+
+    MAX_UINT256 = (1 << 256) - 1
+    result = (a - b) % (MAX_UINT256 + 1)  # Handle overflow using modulo
+    return result

{defi_state_querier-0.4.22.dist-info → defi_state_querier-0.4.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: defi-state-querier
-Version: 0.4.22
+Version: 0.4.24
 Summary: Calculate apy, apr, and wallet information,... in decentralized applications.
 Home-page: https://github.com/Centic-io/defi-state-querier
 Author: Viet-Bang Pham

{defi_state_querier-0.4.22.dist-info → defi_state_querier-0.4.24.dist-info}/RECORD

@@ -1,4 +1,4 @@
-defi_services/__init__.py,sha256=dTG-jzL6gT1bOj-aXPys00hnioYMNGLuF9EnbsEF7HI,23
+defi_services/__init__.py,sha256=WWrTOK_Nz_e97GQCElAGK_CtxVsM2uOWZphO5msHKOs,23
 defi_services/abis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/abis/dex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/abis/dex/biswap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -271,18 +271,18 @@ defi_services/services/token_services.py,sha256=ncGdOpATIb9tGFa9cY1dQq3hFRwbhcYw
 defi_services/services/dex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/services/dex/pancakeswap_service.py,sha256=MR3x5lvZrZWqrAiSwIe-0ANBhGJ9u0iWvpYDFrxW8_w,4635
 defi_services/services/dex/pancakeswap_v2_service.py,sha256=iEWF2u40zLj0C0zvIon40lCKU-jMeCXs63RApNmpJ1o,13096
-defi_services/services/dex/pancakeswap_v3_service.py,sha256=HHLNondh7lRlcP1bmuR6eFzbDs_FPWqhMFIbK3LY2zc,19320
+defi_services/services/dex/pancakeswap_v3_service.py,sha256=DUBXVQQRsQM5Z404zmLjFBPCpk572AGw8XcUeSc3_2s,20171
 defi_services/services/dex/quickswap_v2_service.py,sha256=vpjBNcPlxwOW-WqTuxYKK2coVZhXDjK39nEq8X6awQU,1155
-defi_services/services/dex/quickswap_v3_service.py,sha256=J99UjBFZgQjJRj85p7unqnLBzTea7VjIwTNXQ0OJKRA,9143
+defi_services/services/dex/quickswap_v3_service.py,sha256=q-zCRyvH3XCnqE7_Tdw4APBHGR1PKow7uE_ai6fUCi8,10925
 defi_services/services/dex/spookyswap_v2_service.py,sha256=CBM0_NZTsiqBxkIHm_Ll-oTzlPZsd0TYVh4itcBNBA0,6982
 defi_services/services/dex/sushiswap_service.py,sha256=1_vCvLjQZmjOK55xUpotAgrQKqywL8txhPpBUQuFHMw,3099
 defi_services/services/dex/sushiswap_v2_service.py,sha256=QyOVdTv06sWR_SYphxGGxla3eMN3Q8sRjXU6vPPTr4Q,3834
 defi_services/services/dex/sushiswap_v3_service.py,sha256=fTBJfbyU4nSei_XCWxHKRZxzPRNwLrda3VORgKRAnYo,3141
 defi_services/services/dex/uniswap_v2_service.py,sha256=q2p92JKxAmzSs5JzH5QJsGNWUZ0rgurpYC981y7uR9k,10474
-defi_services/services/dex/uniswap_v3_service.py,sha256=K0Z1LGeJTpxqjsQdMn98IzkZ-7LJDTv_n6_bI6kcHBE,17251
+defi_services/services/dex/uniswap_v3_service.py,sha256=PzZb-icwZrUx9odrJx0nqZEuLXyfwW8F--R9djCK0xw,17852
 defi_services/services/dex/dex_info/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-defi_services/services/dex/dex_info/pancakeswap_info.py,sha256=xHNyUb8tAFNU2QXn95CEuXPMFfKg1aWgeOqsawhWvkA,1709
-defi_services/services/dex/dex_info/quickswap_info.py,sha256=KGgAkvCwR9u_RnLmHXhpLEUfLVQCOsrWMADq0qliBKo,963
+defi_services/services/dex/dex_info/pancakeswap_info.py,sha256=oGQfc_3Skv4581p-saTylD8VBkEGnYT6bpR5F_y_hEc,1694
+defi_services/services/dex/dex_info/quickswap_info.py,sha256=79ul5xG6rKa2IVj2ptJrQzTyG9A5vweHodU28B1lpro,963
 defi_services/services/dex/dex_info/spookyswap_info.py,sha256=oNwWsFsXE0R7b72ZDCmrhDOKwN_-T7y3N0sX26TmhIA,535
 defi_services/services/dex/dex_info/sushiswap_info.py,sha256=VnfZR6c4bsjWTTaTPxO1c1W2fjhspHQfanSP2uCFuu8,4219
 defi_services/services/dex/dex_info/uniswap_info.py,sha256=RhEXmbERg_k5NsgMKnlrgRHE7LKbyWL0wxHUy3Vt4mM,897
@@ -384,6 +384,7 @@ defi_services/services/vault/vault_info/fantom/trava_ftm.py,sha256=dy8us4Lt0jrS9
 defi_services/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/utils/apy.py,sha256=zQ9wrID79uccLj9pJI5Q9KhTDWXeBt9JaEVjNnYmnyg,356
 defi_services/utils/convert_address.py,sha256=UdElOSrUKsKIB90sYbrRPUlO6KfIruf3Q6KiMaL8_4k,1070
+defi_services/utils/get_fees.py,sha256=L8Xivqev5M73IC2s7FaEP97EDymoazw_YhJBOja73c8,1742
 defi_services/utils/graph_operations.py,sha256=2-onMqflUqOrbVsy7JGFyeTMOcwTgPoZ3uGWruWMA_k,6271
 defi_services/utils/init_dex_services.py,sha256=kbSoq4BR8lu8kURUoDOaOS4A-ynv4CgqS0kDA5IcZlA,529
 defi_services/utils/init_services.py,sha256=dnE3R0oGS9S8wYAW29kBY2_A_FYoXzkNyD4uHAZXFLE,804
@@ -392,8 +393,8 @@ defi_services/utils/market_service.py,sha256=imPtPHBkpEx5JnhqeIWYqbCjsIEm8IKBYHN
 defi_services/utils/memory_storage.py,sha256=BOT8laB0iVSCGE-oDlpWJQLbSC6X2blKX4zuQbs4inc,851
 defi_services/utils/sqrt_price_math.py,sha256=9lgUeWFT4wjl3Vq3b7-jZ2bGvvZx7dDBSfVnM3lsZ8o,5575
 defi_services/utils/thread_proxy.py,sha256=5Z8biAyEReUkh3vfJSvEv7GwMe3CsE5M8CbghkQtePw,2951
-defi_state_querier-0.4.22.dist-info/LICENSE,sha256=6jmfxa8nUIwfKnzZUxAHJSJ_IS7h7mpbJq26cWjoo-o,1063
-defi_state_querier-0.4.22.dist-info/METADATA,sha256=NuRarAiEP46xXS58xZWcUYpBaxDL32gQkwFHPSKWfrc,4376
-defi_state_querier-0.4.22.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-defi_state_querier-0.4.22.dist-info/top_level.txt,sha256=C-OTxHK6MknKK-nAbEzCPDUl1M6pktRhgJrmsozdf6g,14
-defi_state_querier-0.4.22.dist-info/RECORD,,
+defi_state_querier-0.4.24.dist-info/LICENSE,sha256=6jmfxa8nUIwfKnzZUxAHJSJ_IS7h7mpbJq26cWjoo-o,1063
+defi_state_querier-0.4.24.dist-info/METADATA,sha256=wB9cy6ruyNflAZZQQmaCQr1IJ-DRvwA6x3k5FiFvSug,4376
+defi_state_querier-0.4.24.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+defi_state_querier-0.4.24.dist-info/top_level.txt,sha256=C-OTxHK6MknKK-nAbEzCPDUl1M6pktRhgJrmsozdf6g,14
+defi_state_querier-0.4.24.dist-info/RECORD,,