switch to dbt solvers table (#357)

* switch to dbt solvers table

* make backwards compatible

* fix one more query

Author: harisang

cowprotocol/accounting/rewards/main_rewards_dashboard_query_2510345.sql

@@ -132,6 +132,16 @@ aggregate_results as (
     from solver_competition_rewards as pr left outer join fees_and_costs as fc on pr.solver = fc.solver
 ),
 
+solvers as (
+    select
+        address,
+        environment,
+        name,
+        whitelisted as active
+    from dune.cowprotocol.solvers
+    where blockchain = '{{blockchain}}'
+),
+
 combined_data as (
     select
         coalesce(ar.solver, ss.solver, qr.solver) as solver,
@@ -154,7 +164,7 @@ combined_data as (
         on ar.solver = ss.solver
     full outer join quote_rewards as qr
         on ar.solver = qr.solver
-    left join cow_protocol_{{blockchain}}.solvers as s
+    left join solvers as s
         on coalesce(ar.solver, ss.solver, qr.solver) = s.address
 ),
 

cowprotocol/accounting/rewards/overdrafts_tracker_5936281.sql

@@ -34,6 +34,16 @@ most_recent_updates as (
         from overdraft_update_events
     )
     where rn = 1
+),
+
+solvers as (
+    select
+        address,
+        environment,
+        name,
+        whitelisted as active
+    from dune.cowprotocol.solvers
+    where blockchain = '{{blockchain}}'
 )
 
 select
@@ -43,6 +53,6 @@ select
     s.active,
     coalesce(mru.new_overdraft, 0) as current_ovedraft_native_token_atoms,
     coalesce(mru.new_overdraft, 0) / pow(10,18) as current_overdraft_native_token_units
-from cow_protocol_{{blockchain}}.solvers as s left join most_recent_updates as mru on s.address = mru.solver
+from solvers as s left join most_recent_updates as mru on s.address = mru.solver
 where coalesce(mru.new_overdraft, 0) > 0
 order by coalesce(mru.new_overdraft, 0) desc

cowprotocol/accounting/rewards/unusual_slippage_query_2332678.sql

@@ -17,11 +17,21 @@ url_helper as (
             when '{{blockchain}}' = 'bnb' then 'bsc'
             else '{{blockchain}}'
         end
+),
+
+solvers as (
+    select
+        address,
+        environment,
+        name,
+        whitelisted as active
+    from dune.cowprotocol.solvers
+    where blockchain = '{{blockchain}}'
 )
 
 select  --noqa: ST06
     rpt.block_time,
-    concat(environment, '-', name) as solver_name,
+    concat(s.environment, '-', s.name) as solver_name,
     concat(
         '<a href="https://dune.com/queries/4059683',
         '?blockchain={{blockchain}}',
@@ -47,7 +57,7 @@ select  --noqa: ST06
     network_fee_usd
 from results_per_tx as rpt
 inner join cow_protocol_{{blockchain}}.batches as b on rpt.tx_hash = b.tx_hash
-inner join cow_protocol_{{blockchain}}.solvers on address = rpt.solver_address
+inner join solvers as s on s.address = rpt.solver_address
 where (
     abs(slippage_usd) > {{min_absolute_slippage_tolerance}}
     and

cowprotocol/accounting/rewards/vouch_registry_query_1541516.sql

@@ -97,6 +97,16 @@ valid_vouches as (
     where time_rank = 1
 ),
 
+solvers as (
+    select
+        address,
+        environment,
+        name,
+        whitelisted as active
+    from dune.cowprotocol.solvers
+    where blockchain = '{{blockchain}}'
+),
+
 named_results as (
     select
         vv.solver,
@@ -105,7 +115,7 @@ named_results as (
         bp.pool_name,
         concat(environment, '-', s.name) as solver_name
     from valid_vouches as vv
-    inner join cow_protocol_{{blockchain}}.solvers as s on vv.solver = s.address
+    inner join solvers as s on vv.solver = s.address
     inner join full_bonding_pools as bp on vv.pool_address = bp.pool_address
 )
 

cowprotocol/accounting/slippage/slippage_query_3427730.sql

@@ -1,3 +1,13 @@
+with solvers as (
+    select
+        address,
+        environment,
+        name,
+        whitelisted as active
+    from dune.cowprotocol.solvers
+    where blockchain = '{{blockchain}}'
+)
+
 select
     solver_address,
     concat(environment, '-', name) as solver_name,
@@ -12,5 +22,4 @@ select
         '" target="_blank">link</a>'
     ) as slippage_per_transaction
 from "query_4070065(blockchain='{{blockchain}}',start_time='{{start_time}}',end_time='{{end_time}}',slippage_table_name='slippage_per_solver')"
-inner join cow_protocol_{{blockchain}}.solvers
-    on solver_address = address
+inner join solvers as s on solver_address = s.address

cowprotocol/alerts/solver_daily_revert_rate_base_query_6228775.sql

@@ -22,12 +22,21 @@ breakdown_per_solver as (
         100 * sum(is_revert) * 1.0000 / count(*) as percent_of_reverts
     from batch_data
     group by solver
+),
+
+solvers as (
+    select
+        address,
+        environment,
+        name,
+        whitelisted as active
+    from dune.cowprotocol.solvers
+    where blockchain = '{{blockchain}}'
 )
 
 select
     s.environment,
     s.name,
     a.*
-from breakdown_per_solver as a inner join cow_protocol_{{blockchain}}.solvers as s
-    on a.solver = s.address
+from breakdown_per_solver as a inner join solvers as s on a.solver = s.address
 where a.total_num_winning_solutions > 20

cowprotocol/monitoring/solver_approvals_4173928.sql

@@ -1,5 +1,4 @@
-with
-ranked as (
+with ranked as (
     select
         evt_tx_hash as tx_hash,
         evt_block_time as block_time,
@@ -8,23 +7,33 @@ ranked as (
         contract_address as token,
         a.value,
         rank() over (partition by spender, contract_address order by evt_block_number desc, evt_index desc) as rk
-    from erc20_{{blockchain}}.evt_Approval as a
+    from erc20_{{blockchain}}.evt_approval as a
     inner join {{blockchain}}.transactions on evt_tx_hash = hash
-    where owner = 0x9008D19f58AAbD9eD0D60971565AA8510560ab41
+    where owner = 0x9008d19f58aabd9ed0d60971565aa8510560ab41
+),
+
+solvers as (
+    select
+        address,
+        environment,
+        name,
+        whitelisted as active
+    from dune.cowprotocol.solvers
+    where blockchain = '{{blockchain}}'
 )
 
 select --noqa: ST06
     block_time,
     tx_hash,
     responsible_address,
     case
-        when responsible_address = 0x05C5494572E4aB2d48D3AB3aAF6bD4e7b1c98382 or responsible_address = 0xd8ca5fe380b68171155c7069b8df166db28befdd then 'PROPOSER-ACCOUNT'
+        when responsible_address = 0x05c5494572e4ab2d48d3ab3aaf6bd4e7b1c98382 or responsible_address = 0xd8ca5fe380b68171155c7069b8df166db28befdd then 'PROPOSER-ACCOUNT'
         else coalesce(concat(environment, '-', name), 'NON-SOLVER')
     end as responsible_solver,
     spender,
     token,
     value
 from ranked as r
-left outer join cow_protocol_{{blockchain}}.solvers as s on r.responsible_address = s.address
+left outer join solvers as s on r.responsible_address = s.address
 where rk = 1 and value > 0
 order by block_time desc

cowprotocol/revenue/daily_revenue_by_integration_per_chain_4515022.sql

@@ -3,11 +3,20 @@
 --  {{ui_fee_recipient}} - the partner address that receives the CoW Swap UI fee
 --  {{blockchain}} - the chain for which to collect the data
 
+with solvers as (
+    select
+        address,
+        environment,
+        name,
+        whitelisted as active
+    from dune.cowprotocol.solvers
+    where blockchain = '{{blockchain}}'
+)
+
 select
     s.name,
     date(block_time) as "day",
     coalesce(sum("Limit"), 0) + coalesce(sum("Market"), 0) + coalesce(sum("UI Fee"), 0) + coalesce(sum("Partner Fee Share"), 0) as total
 from "query_4217030(blockchain='{{blockchain}}',ui_fee_recipient='{{ui_fee_recipient}}')" as r
-left join cow_protocol_{{blockchain}}.solvers as s
-    on r.solver = s.address
+left join solvers as s on r.solver = s.address
 group by 1, 2

cowprotocol/revenue/daily_revenue_by_solver_per_chain_4515000.sql

@@ -3,11 +3,20 @@
 --  {{ui_fee_recipient}} - the partner address that receives the CoW Swap UI fee
 --  {{blockchain}} - the chain for which to collect the data
 
+with solvers as (
+    select
+        address,
+        environment,
+        name,
+        whitelisted as active
+    from dune.cowprotocol.solvers
+    where blockchain = '{{blockchain}}'
+)
+
 select
     s.name,
     date(block_time) as "day",
     coalesce(sum("Limit"), 0) + coalesce(sum("Market"), 0) + coalesce(sum("UI Fee"), 0) + coalesce(sum("Partner Fee Share"), 0) as total
 from "query_4217030(blockchain='{{blockchain}}',ui_fee_recipient='{{ui_fee_recipient}}')" as r
-left join cow_protocol_{{blockchain}}.solvers as s
-    on r.solver = s.address
+left join solvers as s on r.solver = s.address
 group by 1, 2

cowprotocol/solver_dashboard/active_solvers_1372857.sql

@@ -6,38 +6,39 @@
 -- Parameters
 -- {{blockchain}}: string the blockchain to query
 
-with
-solver_latest_batches as (
+with solver_latest_batches as (
     select
         solver_address,
         max(block_time) as latest_settlement
     from cow_protocol_{{blockchain}}.batches
     group by solver_address
 ),
 
+solvers as (
+    select
+        address,
+        environment,
+        name,
+        whitelisted as active
+    from dune.cowprotocol.solvers
+    where blockchain = '{{blockchain}}'
+),
+
 active_solvers as (
     select
         address,
         environment,
         name,
         coalesce(latest_settlement, timestamp '1970-01-01') as latest_settlement
-    from cow_protocol_{{blockchain}}.solvers
-    full outer join solver_latest_batches
-        on address = solver_address
-    where
-        environment not in ('test', 'service')
-        and active = true
+    from solvers full outer join solver_latest_batches on address = solver_address
+    where environment not in ('test', 'service') and active = true
 )
 
 select
     prod.name,
     prod.address as prod_address,
     barn.address as barn_address,
     greatest(prod.latest_settlement, barn.latest_settlement) as latest_settlement
-from active_solvers as prod
-inner join active_solvers as barn
-    on
-        prod.name = barn.name
-        and prod.environment = 'prod'
-        and barn.environment = 'barn'
+from active_solvers as prodinner join active_solvers as barn
+    on prod.name = barn.name and prod.environment = 'prod' and barn.environment = 'barn'
 order by greatest(prod.latest_settlement, barn.latest_settlement) desc