Fixed Pair data

dipdup-io · Feb 5, 2025 · c056812 · c056812
1 parent 697430a
commit c056812
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/dex_screener/handlers/hydradx/asset/asset_type/hydration_token_asset.py b/dex_screener/handlers/hydradx/asset/asset_type/hydration_token_asset.py
@@ -14,7 +14,11 @@ class HydrationTokenAsset(BaseHydrationAsset):
     async def handle_register_asset(cls, event: SubstrateEvent) -> Asset:
         try:
             return await super(cls, cls).handle_register_asset(event)
-        except (RemainingScaleBytesNotEmptyException, NotImplementedError):
+        except ValueError:
+            pass
+        except RemainingScaleBytesNotEmptyException:
+            pass
+        except NotImplementedError:
             pass
 
         match event.data.args:
@@ -43,7 +47,11 @@ async def handle_register_asset(cls, event: SubstrateEvent) -> Asset:
     async def handle_update_asset(cls, event: SubstrateEvent) -> Asset:
         try:
             return await super().handle_update_asset(event)
-        except (ValueError, RemainingScaleBytesNotEmptyException, NotImplementedError):
+        except ValueError:
+            pass
+        except RemainingScaleBytesNotEmptyException:
+            pass
+        except NotImplementedError:
             pass
 
         match event.data.args:

diff --git a/dex_screener/handlers/hydradx/isolated_pool/on_pool_created.py b/dex_screener/handlers/hydradx/isolated_pool/on_pool_created.py
@@ -5,6 +5,7 @@
 from dex_screener.models import DexKey
 from dex_screener.models import Pair
 from dex_screener.models import Pool
+from dex_screener.models.dto import DexScreenerEventInfoDTO
 from dex_screener.types.hydradx.substrate_events.xyk_pool_created import XYKPoolCreatedPayload
 
 
@@ -25,16 +26,18 @@ async def on_pool_created(
     asset_b = await Asset.get(id=event.payload['asset_b'])
     await pool.assets.add(asset_a, asset_b)
 
+    event_info = DexScreenerEventInfoDTO.from_event(event)
+
     pair_id = event.payload['pool']
     if not await Pair.exists(id=pair_id):
         pair = await Pair.create(
             id=pair_id,
-            dex_key=DexKey[event.data.header_extra['specName']],
+            dex_key=pool.dex_key,
             asset_0_id=min(asset_a.id, asset_b.id),
             asset_1_id=max(asset_a.id, asset_b.id),
             pool=pool,
-            created_at_block_id=event.level,
-            created_at_txn_id=event.data.header['hash'],
+            created_at_block_id=event_info.block_id,
+            created_at_txn_id=event_info.tx_id,
             # fee_bps
         )
         ctx.logger.info('Pair created: %s.', pair.id)