Feat/more data for delta v2 gas corrected

dbt_macros/dune/expose_spells.sql → dbt_macros/dune/config_trino_properties.sql

@@ -1,3 +1,12 @@
+{%- macro trino_properties(properties) -%}
+  map_from_entries(ARRAY[
+  {%- for key, value in properties.items() %}
+      ROW('{{ key }}', '{{ value }}')
+      {%- if not loop.last -%},{%- endif -%}
+    {%- endfor %}
+  ])
+{%- endmacro -%}
+
 {% macro expose_spells(blockchains, spell_type, spell_name, contributors) %}
   {%- set validated_contributors = tojson(fromjson(contributors | as_text)) -%}
   {%- if ("%s" % validated_contributors) == "null" -%}
@@ -24,11 +33,20 @@
   {%- endif -%}
 {%- endmacro -%}
 
-{%- macro trino_properties(properties) -%}
-  map_from_entries(ARRAY[
-  {%- for key, value in properties.items() %}
-      ROW('{{ key }}', '{{ value }}')
-      {%- if not loop.last -%},{%- endif -%}
-    {%- endfor %}
-  ])
-{%- endmacro -%}
+{% macro hide_spells() %}
+  {%- if target.name == 'prod' -%}
+    {%- set properties = {
+            'dune.public': 'false',
+            'dune.data_explorer.category': 'abstraction',
+            'dune.vacuum': '{"enabled":true}'
+          } -%}
+    {%- if model.config.materialized == "view" -%}
+      CALL {{ model.database }}._internal.alter_view_properties('{{ model.schema }}', '{{ model.alias }}',
+        {{ trino_properties(properties) }}
+      )
+    {%- else -%}
+      ALTER TABLE {{ this }}
+        SET PROPERTIES extra_properties = {{ trino_properties(properties) }}
+    {%- endif -%}
+  {%- endif -%}
+{%- endmacro -%}

dbt_subprojects/dex/macros/models/_project/paraswap/delta/map_internal_to_dex.sql

@@ -34,13 +34,42 @@ select
         COALESCE(evt_index, 0) as evt_index, -- TMP: after joining envents in swapSettle can remove it
         order_index,
         method
+        {% if version == 'v2' %}
+        ,from_hex(regexp_replace(
+                try_cast(
+                  TRY_CAST(
+                    BITWISE_RIGHT_SHIFT(partnerAndFee, 96) AS VARBINARY
+                  ) as VARCHAR
+                ),
+                '0x(00){12}'
+              )) AS partnerAddress
+        ,computed_order_hash
+        ,evt_order_hash
+        ,bridgeMultiCallHandler
+        ,bridgeOutputToken
+        ,bridgeMaxRelayerFee
+        ,bridgeDestinationChainId
+        ,bridge        
+        ,"order"        
+        ,"owner"
+        ,ordersCount
+        ,call_block_number as block_number
+        ,raw_tx_gas_used
+        ,raw_tx_gas_price
+        ,{{from_alias}}.gas_fee_usd
+        ,wnt_price_usd
+        ,executor
+        ,evt_return_amount -- uint256
+        ,evt_protocol_fee -- uint256
+        ,evt_partner_fee -- uint256
+        {% endif %}
     from {{from_alias}}  
         LEFT JOIN 
         {{ source('tokens', 'erc20') }} t_src_token 
             ON t_src_token.blockchain = '{{blockchain}}'
-            AND t_src_token.contract_address = src_token
+            AND t_src_token.contract_address = src_token_for_joining
         LEFT JOIN 
         {{ source('tokens', 'erc20') }} t_dest_token
             ON t_dest_token.blockchain = '{{blockchain}}'
-            AND t_dest_token.contract_address = dest_token
+            AND t_dest_token.contract_address = dest_token_for_joining
 {% endmacro %}

dbt_subprojects/dex/macros/models/_project/paraswap/delta/v2/compute_order_hash.sql

@@ -0,0 +1,67 @@
+{% macro compute_order_hash(blockchain) %}
+
+{% set network_to_chain_id = {
+    'ethereum': 1,
+    'optimism': 10,
+    'base': 8453,    
+} %}
+
+-- SELECT
+  keccak(
+    concat(
+      X'1901',
+
+      -- domain separator
+      keccak(
+        concat(
+          keccak(to_utf8('EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)')),
+          keccak(to_utf8('Portikus')),
+          keccak(to_utf8('2.0.0')),
+          lpad(cast(cast({{ network_to_chain_id[blockchain]}} AS uint256) AS varbinary), 32, X'00'),
+          lpad(from_hex('0000000000bbf5c5fd284e657f01bd000933c96d'), 32, X'00')
+        )
+      ),
+
+      -- struct hash
+      keccak(
+        concat(
+          keccak(to_utf8('Order(address owner,address beneficiary,address srcToken,address destToken,uint256 srcAmount,uint256 destAmount,uint256 expectedDestAmount,uint256 deadline,uint256 nonce,uint256 partnerAndFee,bytes permit)')),
+        --   lpad(from_hex('12924049e2d21664e35387c69429c98e9891a820'), 32, X'00'), -- owner
+        lpad(owner, 32, X'00'), 
+        --   lpad(from_hex('12924049e2d21664e35387c69429c98e9891a820'), 32, X'00'), -- beneficiary
+          lpad(beneficiary, 32, X'00'), -- beneficiary
+        --   lpad(from_hex('04c154b66cb340f3ae24111cc767e0184ed00cc6'), 32, X'00'), -- srcToken
+          lpad(srcToken, 32, X'00'), -- srcToken
+        --   lpad(from_hex('eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee'), 32, X'00'), -- destToken
+          lpad(destToken, 32, X'00'), -- destToken
+        --   lpad(cast(cast('1202939820354578' AS uint256) AS varbinary), 32, X'00'), -- srcAmount
+          lpad(cast(srcAmount AS varbinary), 32, X'00'), -- srcAmount
+        --   lpad(cast(cast('868930905657826' AS uint256) AS varbinary), 32, X'00'), -- destAmount
+          lpad(cast(destAmount AS varbinary), 32, X'00'), -- destAmount
+        --   lpad(cast(cast('873297392620931' AS uint256) AS varbinary), 32, X'00'), -- expectedDestAmount
+          lpad(cast(expectedDestAmount AS varbinary), 32, X'00'), -- expectedDestAmount
+        --   lpad(cast(cast('1740790593' AS uint256) AS varbinary), 32, X'00'), -- deadline
+          lpad(cast(deadline AS varbinary), 32, X'00'), -- deadline
+        --   lpad(cast(cast('1740787014424' AS uint256) AS varbinary), 32, X'00'), -- nonce
+          lpad(cast(nonce AS varbinary), 32, X'00'), -- nonce
+        --   lpad(cast(cast('90631063861114836560958097440945986548822432573276877133894239693005947666432' AS uint256) AS varbinary), 32, X'00'), -- partnerAndFee
+          lpad(cast(partnerAndFee AS varbinary), 32, X'00'), -- partnerAndFee
+        --   permit:
+        --   lpad( 
+        --     keccak(from_hex(
+        --       '00000000000000000000000012924049e2d21664e35387c69429c98e9891a8200000000000000000000000000000000000bbf5c5fd284e657f01bd000933c96d0000000000000000000000000000000000000000000000000004461140adac120000000000000000000000000000000000000000000000000000000067c641b2000000000000000000000000000000000000000000000000000000000000001bae25978476dcaf13eb21c5140c058bc49fd4d087f0f0d23b1ccede8f9288bb33450886d34539305ede3448c44206e89074d91afcdc8e07cabbe23cf45c67dd7c'
+        --     )),
+        --     32, X'00'
+        --   )
+          lpad( 
+            keccak(permit),
+            32, X'00'
+          )
+        )
+      )
+    )
+  )
+  -- ) AS eip712_final_hash
+
+
+{% endmacro %}

dbt_subprojects/dex/macros/models/_project/paraswap/delta/v2/compute_order_hash_with_bridge.sql

@@ -0,0 +1,76 @@
+{% macro compute_order_hash_with_bridge(blockchain) %}
+
+{% set network_to_chain_id = {
+    'ethereum': 1,
+    'optimism': 10,
+    'base': 8453,    
+} %}
+
+-- SELECT
+  keccak(
+    concat(
+      X'1901',
+
+      -- domain separator
+      keccak(
+        concat(
+          keccak(to_utf8('EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)')),
+          keccak(to_utf8('Portikus')),
+          keccak(to_utf8('2.0.0')),
+          lpad(cast(cast({{ network_to_chain_id[blockchain]}} AS uint256) AS varbinary), 32, X'00'),
+          lpad(from_hex('0000000000bbf5c5fd284e657f01bd000933c96d'), 32, X'00')
+        )
+      ),
+
+      -- Order struct hash
+      keccak(
+        concat(
+          keccak(to_utf8(
+            'Order(address owner,address beneficiary,address srcToken,address destToken,uint256 srcAmount,uint256 destAmount,uint256 expectedDestAmount,uint256 deadline,uint256 nonce,uint256 partnerAndFee,bytes permit,Bridge bridge)Bridge(uint256 maxRelayerFee,uint256 destinationChainId,address outputToken,address multiCallHandler)'
+          )),
+
+          -- lpad(from_hex('6d383975c64eebe1251e50c3ab0e53537342bde9'), 32, X'00'), -- owner
+          lpad(owner, 32, X'00'),
+          -- lpad(from_hex('6d383975c64eebe1251e50c3ab0e53537342bde9'), 32, X'00'), -- beneficiary
+          lpad(beneficiary, 32, X'00'), -- beneficiary
+          -- lpad(from_hex('f469fbd2abcd6b9de8e169d128226c0fc90a012e'), 32, X'00'), -- srcToken
+          lpad(srcToken, 32, X'00'), -- srcToken
+          -- lpad(from_hex('eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee'), 32, X'00'), -- destToken
+          lpad(destToken, 32, X'00'), -- destToken
+          -- lpad(cast(cast('422561' as uint256) AS varbinary), 32, X'00'),
+          lpad(cast(srcAmount AS varbinary), 32, X'00'), -- srcAmount
+          -- lpad(cast(cast('168106215780811752' as uint256) AS varbinary), 32, X'00'),
+          lpad(cast(destAmount AS varbinary), 32, X'00'), -- destAmount
+          -- lpad(cast(cast('168950970633981661' as uint256) AS varbinary), 32, X'00'),
+          lpad(cast(expectedDestAmount AS varbinary), 32, X'00'), -- expectedDestAmount
+          -- lpad(cast(cast('1747024424' as uint256) AS varbinary), 32, X'00'),
+          lpad(cast(deadline AS varbinary), 32, X'00'), -- deadline
+          -- lpad(cast(cast('1747020844040' as uint256) AS varbinary), 32, X'00'),
+          lpad(cast(nonce AS varbinary), 32, X'00'), -- nonce
+          -- lpad(cast(cast('90631063861114836560958097440945986548822432573276877133894239693005947666447' as uint256) AS varbinary), 32, X'00'),
+          lpad(cast(partnerAndFee AS varbinary), 32, X'00'), -- partnerAndFee
+
+          -- Permit (empty: 0x, not 0x00)
+          -- lpad(keccak(from_hex('')), 32, X'00'),
+          lpad( 
+            keccak(permit),
+            32, X'00'
+          ),
+          -- Bridge struct hash (inlined)          
+          keccak(
+            concat(
+              keccak(to_utf8('Bridge(uint256 maxRelayerFee,uint256 destinationChainId,address outputToken,address multiCallHandler)')),
+              lpad(cast(cast(bridgeMaxRelayerFee as uint256) AS varbinary), 32, X'00'),
+              lpad(cast(cast(bridgeDestinationChainId as uint256) AS varbinary), 32, X'00'),
+              lpad(bridgeOutputToken, 32, X'00'),
+              lpad(bridgeMultiCallHandler, 32, X'00')
+            )
+          )
+        )
+      )
+    )
+  )
+  -- ) AS eip712_body_hash;
+
+
+{% endmacro %}

dbt_subprojects/dex/macros/models/_project/paraswap/delta/v2/executor_fee_amount.sql

@@ -16,7 +16,8 @@
 --     }
 CASE
     WHEN executor = 0x6bb000067005450704003100632eb93ea00c0000 THEN varbinary_to_uint256(varbinary_substring(executorData,  161, 32))
-    -- WHEN executor = 0x0500b5050c40e06ed700005dd7cb0ef0b0d0a000 THEN "TODO: join augustus executor contract call and return the output"
+    -- WHEN executor = 0x10100dcac00088044067a00d520a0f7900000770 THEN "TODO: join augustus executor contract call and return the output"
+    -- 0x0500b5050c40e06ed700005dd7cb0ef0b0d0a000 - staging one
     ELSE 0
 END as "executorFeeAmount"
 {% endmacro %}

dbt_subprojects/dex/macros/models/_project/paraswap/delta/v2/executor_fee_amount_usd.sql

@@ -1,8 +1,13 @@
 {% macro gas_fee_usd() %}
- COALESCE( 
-        d.price * w.executorFeeAmount / POWER(10, d.decimals), -- compute directly (dest token is gas fee compensation if it's augustus axecutor)
-        s.price *  w.srcAmount / POWER(10, s.decimals) * CAST (w.executorFeeAmount AS DECIMAL) / (CAST (w.destAmount AS DECIMAL)), -- compute pro-rata based on src token if it's augustus executor
-        -- TODO: also add 3rd party executor fee compensation -- based on spent native token, divided by amount of orders if multiple
-        0
-    )  AS gas_fee_usd
+  case
+    WHEN w.executorFeeAmount > 0
+      then
+        COALESCE( 
+                d.price * w.executorFeeAmount / POWER(10, d.decimals), -- compute directly (dest token is gas fee compensation if it's augustus axecutor)
+                s.price *  w.srcAmount / POWER(10, s.decimals) * CAST (w.executorFeeAmount AS DECIMAL) / (CAST (w.destAmount AS DECIMAL)) -- compute pro-rata based on src token if it's augustus executor        
+        )
+      else
+        -- if can't parse executorFeeAmount - fall back to spent native token, divided by amount of orders if multiple
+        wnt_usd.price * raw_tx_gas_used * raw_tx_gas_price  / POWER(10, wnt_usd.decimals) / ordersCount
+    END AS gas_fee_usd
 {% endmacro %}