From 7443acdfcb2e023dcafcf6dc39fcd38671abe20d Mon Sep 17 00:00:00 2001
From: drethereum <trevor.wenokur@gmail.com>
Date: Fri, 16 Jan 2026 12:00:53 -0700
Subject: [PATCH] macro

---
 macros/curated_package/unverify_tvl.sql       | 71 ++++++++++++-------
 .../silver_reads__uniswap_v2_reads.sql        |  8 ++-
 2 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/macros/curated_package/unverify_tvl.sql b/macros/curated_package/unverify_tvl.sql
index f5576c53..ed9e86b3 100644
--- a/macros/curated_package/unverify_tvl.sql
+++ b/macros/curated_package/unverify_tvl.sql
@@ -1,32 +1,51 @@
 {% macro unverify_tvl() %}
   {% if var('HEAL_MODEL', false) and is_incremental() %}
-        -- Only target platforms that use verified_check_enabled
-        -- Delete rows that are invalid in BOTH v2 and v3/v4 styles
-        DELETE FROM {{ this }} t
-        WHERE EXISTS (
-            SELECT 1 
+        /*
+        Delete TVL rows that no longer have a corresponding reads record.
+
+        Only applies to platforms that use the verified_check_enabled system.
+        Reads records can be removed upstream by unverify_contract_reads() when tokens lose verification,
+        but high-value pools (verified_check_enabled='false') are protected and kept.
+
+        TVL structure varies by version:
+          - v2 style: contract_address=token, address=pool  |  reads: contract_address=pool, address=NULL
+          - v3/v4 style: contract_address=token, address=pool  |  reads: contract_address=token, address=pool
+        */
+        WITH platforms_using_verified_check AS (
+            -- Platforms that have at least one record using the verified_check system
+            SELECT DISTINCT platform
             FROM {{ ref('streamline__contract_reads_records') }}
             WHERE metadata:verified_check_enabled::STRING = 'true'
-            AND platform = t.platform
-        ) --necessary for the complete_tvl model
-        AND 
-            -- Not valid in v2 style (address as pool)
-            NOT EXISTS (
-                SELECT 1
-                FROM {{ ref('streamline__contract_reads_records') }} r
-                WHERE r.metadata:verified_check_enabled::STRING = 'true'
-                AND r.address IS NULL
-                AND r.contract_address = t.address
-            )
-        AND
-            -- Not valid in v3/v4 style (token-address combo)
-            NOT EXISTS (
-                SELECT 1
-                FROM {{ ref('streamline__contract_reads_records') }} r
-                WHERE r.metadata:verified_check_enabled::STRING = 'true'
-                AND r.address IS NOT NULL
-                AND r.contract_address = t.contract_address
-                AND r.address = t.address
-            );
+        ),
+        valid_v2_pools AS (
+            -- v2 style: reads record has pool as contract_address, address is NULL
+            SELECT contract_address AS pool_address, platform
+            FROM {{ ref('streamline__contract_reads_records') }}
+            WHERE address IS NULL
+        ),
+        valid_v3_v4_combos AS (
+            -- v3/v4 style: reads record has token as contract_address, pool as address
+            SELECT contract_address AS token_address, address AS pool_address, platform
+            FROM {{ ref('streamline__contract_reads_records') }}
+            WHERE address IS NOT NULL
+        )
+        DELETE FROM {{ this }} t
+        WHERE t.platform IN (SELECT platform FROM platforms_using_verified_check)
+          AND NOT (
+              -- Keep if valid in v2 style (t.address is the pool)
+              EXISTS (
+                  SELECT 1 FROM valid_v2_pools v
+                  WHERE v.pool_address = t.address
+                    AND v.platform = t.platform
+              )
+              OR
+              -- Keep if valid in v3/v4 style (t.contract_address is token, t.address is pool)
+              EXISTS (
+                  SELECT 1 FROM valid_v3_v4_combos v
+                  WHERE v.token_address = t.contract_address
+                    AND v.pool_address = t.address
+                    AND v.platform = t.platform
+              )
+          );
   {% endif %}
 {% endmacro %}
\ No newline at end of file
diff --git a/models/curated_package/contract_reads/streamline/records/uniswap/silver_reads__uniswap_v2_reads.sql b/models/curated_package/contract_reads/streamline/records/uniswap/silver_reads__uniswap_v2_reads.sql
index c5721bab..3fd4b578 100644
--- a/models/curated_package/contract_reads/streamline/records/uniswap/silver_reads__uniswap_v2_reads.sql
+++ b/models/curated_package/contract_reads/streamline/records/uniswap/silver_reads__uniswap_v2_reads.sql
@@ -63,10 +63,12 @@ liquidity_pools AS (
         version,
         platform,
         -- Track qualification path for unverify logic
+        -- If both tokens are verified, subject to unverify. Otherwise protected (high-value pool with unverified tokens)
         CASE
-            WHEN pool_address IN (SELECT pool_address FROM high_value_pools)
-            THEN 'false'
-            ELSE 'true'
+            WHEN token0 IN (SELECT token_address FROM verified_contracts)
+                 AND token1 IN (SELECT token_address FROM verified_contracts)
+            THEN 'true'
+            ELSE 'false'
         END AS verified_check_enabled
     FROM
         {{ ref('silver_dex__paircreated_evt_v2_pools') }}