Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extend main rewards query to all chains #102

Merged
merged 3 commits into from
Dec 23, 2024
Merged

Extend main rewards query to all chains #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a12b97b
extend main rewards query to all chains
harisang Dec 23, 2024
d9f8825
rename main query
harisang Dec 23, 2024
dec4a57
fix parameter in hyperlink
harisang Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...ocol/accounting/rewards/mainnet/.sqlfluff → cowprotocol/accounting/rewards/.sqlfluff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ relative_slippage_tolerance=0.3
significant_slippage_value=1000
time='2024-08-27 00:00:00'
blockchain=ethereum
upper_cap=0.012
lower_cap=-0.01
0 ...rval_from_time_interval_query_3333356.sql → ...rval_from_time_interval_query_3333356.sql
View file
Open in desktop
File renamed without changes.
0 ...ainnet/excluded_batches_query_3490353.sql → ...ewards/excluded_batches_query_3490353.sql
View file
Open in desktop
File renamed without changes.
0 ...nnet/full_bonding_pools_query_4056263.sql → ...ards/full_bonding_pools_query_4056263.sql
View file
Open in desktop
File renamed without changes.
58 changes: 35 additions & 23 deletions ...innet/mainnet_dashboard_query_2510345.sql → .../main_rewards_dashboard_query_2510345.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,33 @@
with

block_range as (
select * from "query_3333356(blockchain='ethereum',start_time='{{start_time}}',end_time='{{end_time}}')"
select * from "query_3333356(blockchain='{{blockchain}}',start_time='{{start_time}}',end_time='{{end_time}}')"
),

solver_slippage as (
select
solver_address as solver,
slippage_wei * 1.0 / pow(10, 18) as slippage
from "query_4070065(blockchain='ethereum',start_time='{{start_time}}',end_time='{{end_time}}',slippage_table_name='slippage_per_solver')"
from "query_4070065(blockchain='{{blockchain}}',start_time='{{start_time}}',end_time='{{end_time}}',slippage_table_name='slippage_per_solver')"
),

named_results as (
select * from "query_1541516(blockchain='ethereum',end_time='{{end_time}}',vouch_cte_name='named_results')"
select * from "query_1541516(blockchain='{{blockchain}}',end_time='{{end_time}}',vouch_cte_name='named_results')"
),

-- BEGIN SOLVER REWARDS
batch_rewards as (
select --noqa: ST06
from_hex(rbr.solver) as winning_solver,
-- Unpacking the needed data
cast(cast(rbr.data.fee as varchar) as int256) as fee, -- noqa: RF01
cast(cast(rbr.data.execution_cost as varchar) as int256) as execution_cost, -- noqa: RF01
cast(cast(rbr.data.capped_payment as varchar) as int256) as capped_payment -- noqa: RF01
from cowswap.raw_batch_rewards as rbr
select
rbr.solver as winning_solver,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why don't we need to use the from_hex() and cast() methods anymore?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the solver, the reason we were using from_hex() was that the solver was stored as a string (and not as varbinary) in the cowswap.raw_batch_rewards table.

As for the different casts for fees, executions costs etc, i think they were just unnecessary, and an overkill. It looks like we wanted to get to an int256 but the queries also work with the decimal(38,0) type that is what we use here anyways.

Definitely this is not very well-thought through, so we could also make the raw order/batch tables return int256 instead.

rbr.network_fee as fee,
rbr.execution_cost,
--rnr.capped_payment,
case
when rbr.uncapped_payment_native_token > {{upper_cap}} * pow(10, 18) then {{upper_cap}} * (pow(10, 18))
when rbr.uncapped_payment_native_token < {{lower_cap}} * pow(10, 18) then {{lower_cap}} * pow(10, 18)
else rbr.uncapped_payment_native_token
end as capped_payment
from "query_4351957(blockchain='{{blockchain}}')" as rbr
where
rbr.block_deadline > (select start_block from block_range)
and rbr.block_deadline <= (select end_block from block_range)
Expand Down Expand Up @@ -52,15 +56,23 @@ conversion_prices as (
(
select avg(price) from prices.usd
where
blockchain = 'ethereum'
blockchain = 'ethereum' -- use cow price from mainnet
and contract_address = 0xdef1ca1fb7fbcdc777520aa7f396b4e015f497ab
and date(minute) = cast('{{end_time}}' as timestamp) - interval '1' day
) as cow_price,
(
select avg(price) from prices.usd
where
blockchain = 'ethereum'
and contract_address = 0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2
blockchain = '{{blockchain}}' -- use native prices from respective chains
and contract_address = (
select
case
when '{{blockchain}}' = 'ethereum' then 0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2
when '{{blockchain}}' = 'gnosis' then 0xe91d153e0b41518a2ce8dd3d7944fa863463a97d
when '{{blockchain}}' = 'arbitrum' then 0x82aF49447D8a07e3bd95BD0d56f35241523fBab1
when '{{blockchain}}' = 'base' then 0x4200000000000000000000000000000000000006
end
)
and date(minute) = cast('{{end_time}}' as timestamp) - interval '1' day
) as eth_price
),
Expand All @@ -70,7 +82,7 @@ order_quotes as (
select
order_uid,
quote_solver
from cow_protocol_ethereum.order_rewards
from "query_4364122(blockchain='{{blockchain}}')"
where
block_number > (select start_block from block_range)
and block_number <= (select end_block from block_range)
Expand All @@ -81,7 +93,7 @@ winning_quotes as (
oq.order_uid,
quote_solver as solver
from order_quotes as oq
inner join cow_protocol_ethereum.trades as t on oq.order_uid = t.order_uid and oq.quote_solver != 0x0000000000000000000000000000000000000000
inner join cow_protocol_{{blockchain}}.trades as t on oq.order_uid = t.order_uid and oq.quote_solver != 0x0000000000000000000000000000000000000000
),

quote_rewards as (
Expand Down Expand Up @@ -113,15 +125,15 @@ combined_data as (
concat(
'<a href="https://dune.com/queries/2332678?SolverAddress=',
cast(ar.solver as varchar),
'&start_time={{start_time}}&end_time={{end_time}}&min_absolute_slippage_tolerance=0&relative_slippage_tolerance=0&significant_slippage_value=0" target="_blank">link</a>'
'&blockchain={{blockchain}}&start_time={{start_time}}&end_time={{end_time}}&min_absolute_slippage_tolerance=0&relative_slippage_tolerance=0&significant_slippage_value=0" target="_blank">link</a>'
) as slippage_per_tx,
concat(environment, '-', name) as name --noqa: RF04
from aggregate_results as ar
full outer join solver_slippage as ss
on ar.solver = ss.solver
full outer join quote_rewards as qr
on ar.solver = qr.solver
left join cow_protocol_ethereum.solvers as s
left join cow_protocol_{{blockchain}}.solvers as s
on coalesce(ar.solver, ss.solver, qr.solver) = s.address
),

Expand All @@ -133,7 +145,7 @@ service_fee_flag as (
when service_fee then 0.85
else 1
end as service_fee_factor
from "query_4298142(start_time='{{start_time}}', end_time='{{end_time}}')"
from "query_4298142(blockchain='{{blockchain}}', start_time='{{start_time}}', end_time='{{end_time}}')"
),

combined_data_after_service_fee as (
Expand Down Expand Up @@ -176,7 +188,7 @@ select --noqa: ST06
when reimbursement_eth < 0 and total_cow_reward > 0
then 0
else reimbursement_eth
end as eth_transfer,
end as native_token_transfer,
case
when is_overdraft then null
when reimbursement_eth > 0 and total_cow_reward < 0
Expand All @@ -188,13 +200,13 @@ select --noqa: ST06
case
when is_overdraft then total_outgoing_eth
end as overdraft,
slippage_eth,
slippage_eth as slippage_native_token,
slippage_per_tx,
service_fee_enabled,
reimbursement_eth,
reimbursement_eth as reimbursement_native_token,
reimbursement_cow,
total_cow_reward,
network_fee_eth,
execution_cost_eth
network_fee_eth as network_fee_native_token,
execution_cost_eth as execution_cost_native_token
from extended_payout_data as epd
left join named_results as nr on epd.solver = nr.solver
0 ...ds/mainnet/partner_fees_query_3602560.sql → ...ng/rewards/partner_fees_query_3602560.sql
View file
Open in desktop
File renamed without changes.
0 ...t/reduced_bonding_pools_query_4065709.sql → ...s/reduced_bonding_pools_query_4065709.sql
View file
Open in desktop
File renamed without changes.
0 ...rds/mainnet/service_fee_query_4298142.sql → ...ing/rewards/service_fee_query_4298142.sql
View file
Open in desktop
File renamed without changes.
0 ...ainnet/unusual_slippage_query_2332678.sql → ...ewards/unusual_slippage_query_2332678.sql
View file
Open in desktop
File renamed without changes.
0 .../mainnet/vouch_registry_query_1541516.sql → .../rewards/vouch_registry_query_1541516.sql
View file
Open in desktop
File renamed without changes.
Loading