Update Rollup Economics (duneanalytics#4857)

* add zora revenue and new op chain cost * Add gas used
clizzard7 · Dec 4, 2023 · ca57bfd · ca57bfd
1 parent 52399cd
commit ca57bfd
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 9 deletions.
diff --git a/models/rollup_economics/ethereum/l1_data_fees.sql b/models/rollup_economics/ethereum/l1_data_fees.sql
@@ -19,7 +19,8 @@ with tx_batch_appends as (
     t.hash,
     (cast(gas_used as double) * (cast(gas_price as double) / 1e18)) as gas_spent,
     p.price * (cast(gas_used as double) * (cast(gas_price as double) / 1e18)) as gas_spent_usd,
-    length(t.data) as data_length
+    length(t.data) as data_length,
+    gas_used
     FROM
     (
       SELECT
@@ -99,7 +100,8 @@ with tx_batch_appends as (
       t.hash,
       (cast(t.gas_used as double) * (cast(t.gas_price as double) / 1e18)) as gas_spent,
       p.price * (cast(t.gas_used as double) * (cast(t.gas_price as double) / 1e18)) as gas_spent_usd,
-      length(t.data) as data_length
+      length(t.data) as data_length,
+      t.gas_used
     FROM
       {{ source('ethereum','transactions') }} as t
       INNER JOIN (
@@ -110,7 +112,7 @@ with tx_batch_appends as (
             MAX(CASE WHEN submitter_type = 'L2OutputOracle' AND role_type = 'from_address' THEN address ELSE NULL END) AS "l2_output_oracle_from_address",
             MAX(CASE WHEN submitter_type = 'L2OutputOracle' AND role_type = 'to_address' THEN address ELSE NULL END) AS "l2_output_oracle_to_address"
         FROM {{ ref('addresses_ethereum_l2_batch_submitters') }}
-        WHERE protocol_name IN ('OP Mainnet', 'Base', 'Public Goods Network', 'Zora Network', 'Aevo')
+        WHERE protocol_name IN ('OP Mainnet', 'Base', 'Public Goods Network', 'Zora', 'Aevo', 'Mode', 'Lyra', 'Orderly Network')
         GROUP BY protocol_name
       ) as op ON (
           t."from" = op.l1_batch_inbox_from_address
@@ -135,7 +137,8 @@ with tx_batch_appends as (
     t.hash,
     (cast(gas_used as double) * (cast(gas_price as double) / 1e18)) as gas_spent,
     p.price * (cast(gas_used as double) * (cast(gas_price as double) / 1e18)) as gas_spent_usd,
-    (length(t.data)) AS input_length
+    (length(t.data)) AS data_length,
+    gas_used
     FROM {{ source('ethereum','transactions') }} AS t
     INNER JOIN {{ source('prices','usd') }} p
       ON p.minute = date_trunc('minute', t.block_time)
@@ -157,7 +160,8 @@ with tx_batch_appends as (
     t.hash,
     (cast(gas_used as double) * (cast(gas_price as double) / 1e18)) as gas_spent,
     p.price * (cast(gas_used as double) * (cast(gas_price as double) / 1e18)) as gas_spent_usd,
-    (length(t.data)) AS input_length
+    (length(t.data)) AS data_length,
+    gas_used
     FROM {{ source('ethereum','transactions') }} AS t
     INNER JOIN {{ source('prices','usd') }} p
       ON p.minute = date_trunc('minute', t.block_time)
@@ -179,7 +183,8 @@ with tx_batch_appends as (
     t.hash,
     (cast(gas_used as double) * (cast(gas_price as double) / 1e18)) as gas_spent,
     p.price * (cast(gas_used as double) * (cast(gas_price as double) / 1e18)) as gas_spent_usd,
-    (length(t.data)) AS input_length
+    (length(t.data)) AS data_length,
+    gas_used
     FROM {{ source('ethereum','transactions') }} AS t
     INNER JOIN {{ source('prices','usd') }} p
       ON p.minute = date_trunc('minute', t.block_time)
@@ -204,7 +209,8 @@ with tx_batch_appends as (
     t.hash,
     (cast(gas_used as double) * (cast(gas_price as double) / 1e18)) as gas_spent,
     p.price * (cast(gas_used as double) * (cast(gas_price as double) / 1e18)) as gas_spent_usd,
-    (length(t.data)) AS input_length
+    (length(t.data)) AS data_length,
+    gas_used
     FROM {{ source('ethereum','transactions') }} AS t
     INNER JOIN {{ source('prices','usd') }} p
       ON p.minute = date_trunc('minute', t.block_time)
@@ -228,7 +234,8 @@ with tx_batch_appends as (
     t.hash,
     (cast(gas_used as double) * (cast(gas_price as double) / 1e18)) as gas_spent,
     p.price * (cast(gas_used as double) * (cast(gas_price as double) / 1e18)) as gas_spent_usd,
-    (length(t.data)) AS input_length
+    (length(t.data)) AS data_length,
+    gas_used
     FROM {{ source('ethereum','transactions') }} AS t
     INNER JOIN {{ source('prices','usd') }} p
       ON p.minute = date_trunc('minute', t.block_time)
@@ -259,7 +266,8 @@ txs.hash,
 bxs.time as block_time,
 txs.data_length,
 gas_spent,
-gas_spent_usd
+gas_spent_usd,
+gas_used
 FROM tx_batch_appends txs
 INNER JOIN block_basefees bxs
 ON txs.block_number = bxs.block_number
diff --git a/models/rollup_economics/ethereum/l2_revenue.sql b/models/rollup_economics/ethereum/l2_revenue.sql
@@ -151,4 +151,37 @@ WHERE
   {% else %}
   AND t.block_time >= timestamp '2022-01-01'
   {% endif %}
+GROUP BY 1,2
+
+UNION ALL
+
+SELECT
+  date_trunc('day', t.block_time) AS day
+  , 'zora' AS name
+  , SUM(
+    CASE WHEN cast(t.gas_price as double) = cast(0 as double) THEN 0
+    ELSE (l1_fee + (cast(t.gas_used as double) * cast(t.gas_price as double))) /POWER(10,18)
+    END
+  ) AS l2_rev
+  , SUM(
+    p.price *
+    (CASE WHEN cast(t.gas_price as double) = cast(0 as double) THEN 0
+    ELSE (l1_fee + (cast(t.gas_used as double) * cast(t.gas_price as double))) /POWER(10,18)
+    END)
+  ) AS l2_rev_usd
+FROM {{ source('zora','transactions') }} t
+INNER JOIN {{ source('prices','usd') }} p
+  ON p.minute = date_trunc('minute', t.block_time)
+  AND p.blockchain is null
+  AND p.symbol = 'ETH'
+  {% if is_incremental() %}
+  AND {{incremental_predicate('p.minute')}}
+  {% endif %}
+WHERE
+  1 = 1
+  {% if is_incremental() %}
+  AND {{incremental_predicate('t.block_time')}}
+  {% else %}
+  AND t.block_time >= timestamp '2023-06-12' --when zora network launched
+  {% endif %}
 GROUP BY 1,2