diff --git a/dbt_subprojects/dex/macros/models/_project/paraswap/delta/v2/master.sql b/dbt_subprojects/dex/macros/models/_project/paraswap/delta/v2/master.sql index dfe25019bf8..0df9c5d12f1 100644 --- a/dbt_subprojects/dex/macros/models/_project/paraswap/delta/v2/master.sql +++ b/dbt_subprojects/dex/macros/models/_project/paraswap/delta/v2/master.sql @@ -1,14 +1,61 @@ {% macro delta_v2_master(blockchain) %} with {{ delta_v2_swap_settle(blockchain) }}, - {{ delta_v2_swap_settle_batch(blockchain) }} -select - date_trunc('month', call_block_time) AS block_month, - * -from delta_v2_swapSettle - union all -select - date_trunc('month', call_block_time) AS block_month, - * -from delta_v2_swapSettleBatch + {{ delta_v2_swap_settle_batch(blockchain) }}, + delta_v2_master as ( + (select + date_trunc('month', call_block_time) AS block_month, + * + from delta_v2_swapSettle + limit 1) + union all + select + date_trunc('month', call_block_time) AS block_month, + * + from delta_v2_swapSettleBatch + limit 1 + ) + select + +-- SELECT + delta_v2_master.blockchain, + 'velora_delta' as project, + 'v2' as version, + block_month, + DATE_TRUNC('day', call_block_time) as block_date, + call_block_time as block_time, + CASE + WHEN lower(t_dest_token.symbol) > lower(t_src_token.symbol) + THEN concat(t_src_token.symbol, '-', t_dest_token.symbol) + ELSE concat(t_dest_token.symbol, '-', t_src_token.symbol) + END as token_pair, + dest_amount / power(10, t_dest_token.decimals) as token_bought_amount, + src_amount / power(10, t_src_token.decimals) as token_sold_amount, + dest_amount as token_bought_amount_raw, + src_amount as token_sold_amount_raw, + COALESCE(dest_token_order_usd, src_token_order_usd) as amount_usd, + dest_token as token_bought_address, + src_token as token_sold_address, + owner as taker, + CAST(NULL AS VARBINARY) AS maker, -- TODO: consider `executor as maker`, + delta_v2_master.contract_address as project_contract_address, + call_tx_hash as tx_hash, + call_tx_from as tx_from, + call_tx_to as tx_to + -- tx_to, + -- trace_address, + -- evt_index +-- FROM {{ dex_model }} + from delta_v2_master + LEFT JOIN + {{ source('tokens', 'erc20') }} t_src_token + ON t_src_token.blockchain = '{{blockchain}}' + AND t_src_token.contract_address = src_token + LEFT JOIN + {{ source('tokens', 'erc20') }} t_dest_token + ON t_dest_token.blockchain = '{{blockchain}}' + AND t_dest_token.contract_address = dest_token + + order by block_time desc + limit 1 {% endmacro %} \ No newline at end of file diff --git a/dbt_subprojects/dex/macros/models/_project/paraswap/delta/v2/methods/swap_settle.sql b/dbt_subprojects/dex/macros/models/_project/paraswap/delta/v2/methods/swap_settle.sql index 907f15eba6f..e19210dfa36 100644 --- a/dbt_subprojects/dex/macros/models/_project/paraswap/delta/v2/methods/swap_settle.sql +++ b/dbt_subprojects/dex/macros/models/_project/paraswap/delta/v2/methods/swap_settle.sql @@ -5,7 +5,9 @@ v2_swap_settle_withParsedOrderData AS ( call_trace_address, call_block_time, call_block_number, - call_tx_hash, + call_tx_hash, + call_tx_from, + call_tx_to, orderWithSig, executor, executorData, @@ -89,6 +91,8 @@ SELECT call_block_number, call_block_time, call_tx_hash, + call_tx_from, + call_tx_to, executorFeeAmount as fee_amount, -- orderWithSig as order_with_sig, executor, diff --git a/dbt_subprojects/dex/macros/models/_project/paraswap/delta/v2/methods/swap_settle_batch.sql b/dbt_subprojects/dex/macros/models/_project/paraswap/delta/v2/methods/swap_settle_batch.sql index fc1e149555b..5145a2327a0 100644 --- a/dbt_subprojects/dex/macros/models/_project/paraswap/delta/v2/methods/swap_settle_batch.sql +++ b/dbt_subprojects/dex/macros/models/_project/paraswap/delta/v2/methods/swap_settle_batch.sql @@ -9,8 +9,8 @@ delta_v2_swap_settle_batch_ExpandedOrders as ( contract_address, -- varbinary -- call_success, -- boolean call_tx_hash, -- varbinary - -- call_tx_from, -- varbinary - -- call_tx_to, -- varbinary + call_tx_from, -- varbinary + call_tx_to, -- varbinary call_trace_address, -- array(bigint) call_block_time, -- timestamp call_block_number, -- bigint @@ -149,6 +149,8 @@ SELECT call_block_number, call_block_time, call_tx_hash, + call_tx_from, + call_tx_to, executorFeeAmount as fee_amount, -- orderWithSig as order_with_sig, executor,