fix lint

cowprotocol · Oct 1, 2024 · 1c71280 · 1c71280
1 parent 70702d7
commit 1c71280
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/cowamm/profitability/10k_growth/uni_v2_4047194.sql b/cowamm/profitability/10k_growth/uni_v2_4047194.sql
@@ -18,7 +18,10 @@ with date_range as (
 
 -- select the pool with the largest latest k
 pool as (
-    select contract_address, token0, token1
+    select
+        contract_address,
+        token0,
+        token1
     from "query_4117043(blockchain='{{blockchain}}',token_a='{{token_a}}',token_b='{{token_b}}')"
     where latest = 1
     order by (reserve0 * reserve1) desc
@@ -85,7 +88,7 @@ latest_syncs_per_day as (
         pool.token1,
         reserve1,
         rank() over (partition by (date_range.day) order by (evt_block_number, evt_index) desc) as latest
-    from "query_4117043(blockchain='{{blockchain}}',token_a='{{token_a}}',token_b='{{token_b}}')" syncs
+    from "query_4117043(blockchain='{{blockchain}}',token_a='{{token_a}}',token_b='{{token_b}}')" as syncs
     inner join date_range
         on day >= date(evt_block_time)
     inner join pool

diff --git a/cowamm/profitability/invariant_growth/uni_v2_4060136.sql b/cowamm/profitability/invariant_growth/uni_v2_4060136.sql
@@ -16,7 +16,10 @@ with date_range as (
 
 -- select the pool with the largest latest k
 pool as (
-    select contract_address, token0, token1
+    select
+        contract_address,
+        token0,
+        token1
     from "query_4117043(blockchain='{{blockchain}}',token_a='{{token_a}}',token_b='{{token_b}}')"
     where latest = 1
     order by (reserve0 * reserve1) desc
@@ -48,7 +51,7 @@ tvl_volume_per_swap as (
         (amount0In * p0.price / pow(10, p0.decimals)) + (amount1In * p1.price / pow(10, p1.decimals)) as volume_in,
         (amount0Out * p0.price / pow(10, p0.decimals)) + (amount1Out * p1.price / pow(10, p1.decimals)) as volume_out,
         (reserve0 * p0.price / pow(10, p0.decimals)) + (reserve1 * p1.price / pow(10, p1.decimals)) as tvl
-    from "query_4117043(blockchain='{{blockchain}}',token_a='{{token_a}}',token_b='{{token_b}}')" syncs
+    from "query_4117043(blockchain='{{blockchain}}',token_a='{{token_a}}',token_b='{{token_b}}')" as syncs
     inner join swaps
         on
             syncs.evt_tx_hash = swaps.evt_tx_hash
@@ -59,11 +62,11 @@ tvl_volume_per_swap as (
     inner join prices.usd as p0
         on
             date_trunc('minute', syncs.evt_block_time) = p0.minute
-            and p0.contract_address = syncs.token0
+            and syncs.token0 = p0.contract_address
     inner join prices.usd as p1
         on
             date_trunc('minute', syncs.evt_block_time) = p1.minute
-            and p1.contract_address = syncs.token1
+            and syncs.token1 = p1.contract_address
     where syncs.evt_block_time >= date(timestamp '{{start}}')
 )
 

diff --git a/cowamm/uni_v2_syncs_4117043.sql b/cowamm/uni_v2_syncs_4117043.sql
@@ -12,16 +12,16 @@ with pools as (
 )
 
 select
+    pools.*,
     tx_hash as evt_tx_hash,
     index as evt_index,
     block_time as evt_block_time,
     block_number as evt_block_number,
     varbinary_to_uint256(substr(data, 1, 32)) as reserve0,
     varbinary_to_uint256(substr(data, 33, 32)) as reserve1,
-    pools.*,
     rank() over (partition by (logs.contract_address) order by block_time desc) as latest
 from {{blockchain}}.logs
-join pools
-  on logs.contract_address = pools.contract_address
+inner join pools
+    on logs.contract_address = pools.contract_address
 where
     topic0 = 0x1c411e9a96e071241c2f21f7726b17ae89e3cab4c78be50e062b03a9fffbbad1 -- Sync