Flashloans Migration - #1 - Aave - Ready for review (#4294)

* Flashloans Migration - #1 - Aave * fix avax
duneanalytics · Sep 12, 2023 · 09ab15c · 09ab15c
1 parent 58b79b0
commit 09ab15c
Show file tree

Hide file tree

Showing 24 changed files with 137 additions and 69 deletions.
diff --git a/models/aave/aave_flashloans.sql b/models/aave/aave_flashloans.sql
@@ -1,5 +1,7 @@
 {{ config(
-      alias = alias('flashloans')
+      tags = ['dunesql']
+      , partition_by = ['block_month']
+      , alias = alias('flashloans')
       , materialized = 'incremental'
       , file_format = 'delta'
       , incremental_strategy = 'merge'
@@ -27,6 +29,7 @@ FROM (
       , project
       , version
       , block_time
+      , block_month
       , block_number
       , amount
       , amount_usd
@@ -39,7 +42,7 @@ FROM (
       , contract_address
     FROM {{ aave_model }}
     {% if is_incremental() %}
-    WHERE block_time >= date_trunc("day", now() - interval '1 week')
+    WHERE block_time >= date_trunc('day', now() - interval '7' Day)
     {% endif %}
     {% if not loop.last %}
     UNION ALL

diff --git a/models/aave/aave_schema.yml b/models/aave/aave_schema.yml
@@ -79,3 +79,4 @@ models:
       - name: currency_symbol
       - name: recipient
       - name: contract_address
+      - name: block_month
diff --git a/models/aave/arbitrum/aave_arbitrum_flashloans.sql b/models/aave/arbitrum/aave_arbitrum_flashloans.sql
@@ -1,5 +1,7 @@
 {{ config(
-      alias = alias('flashloans')
+      tags = ['dunesql']
+      , partition_by = ['block_month']
+      , alias = alias('flashloans')
       , materialized = 'incremental'
       , file_format = 'delta'
       , incremental_strategy = 'merge'
@@ -21,6 +23,7 @@ FROM (
       SELECT blockchain
       , project
       , version
+      , block_month
       , block_time
       , block_number
       , amount
@@ -34,7 +37,7 @@ FROM (
       , contract_address
     FROM {{ aave_model }}
     {% if is_incremental() %}
-    WHERE block_time >= date_trunc("day", now() - interval '1 week')
+    WHERE block_time >= date_trunc('day', now() - interval '7' Day)
     {% endif %}
     {% if not loop.last %}
     UNION ALL

diff --git a/models/aave/arbitrum/aave_arbitrum_schema.yml b/models/aave/arbitrum/aave_arbitrum_schema.yml
@@ -30,6 +30,7 @@ models:
       - name: currency_symbol
       - name: recipient
       - name: contract_address
+      - name: block_month
 
  - name: aave_arbitrum_flashloans
    meta:
@@ -59,4 +60,5 @@ models:
       - name: currency_contract
       - name: currency_symbol
       - name: recipient
-      - name: contract_address
+      - name: contract_address
+      - name: block_month
diff --git a/models/aave/arbitrum/aave_v3_arbitrum_flashloans.sql b/models/aave/arbitrum/aave_v3_arbitrum_flashloans.sql
@@ -1,7 +1,9 @@
 {{ config(
-    schema = 'aave_v3_arbitrum'
+    tags = ['dunesql']
+    , schema = 'aave_v3_arbitrum'
     , alias = alias('flashloans')
     , materialized = 'incremental'
+    , partition_by = ['block_month']
     , file_format = 'delta'
     , incremental_strategy = 'merge'
     , unique_key = ['tx_hash', 'evt_index']
@@ -23,23 +25,24 @@ WITH flashloans AS (
     , flash.evt_tx_hash AS tx_hash
     , flash.evt_index
     , CAST(flash.premium AS double) AS fee
-    , CASE WHEN flash.asset='{{aave_mock_address}}' THEN '{{weth_address}}' ELSE flash.asset END AS currency_contract
-    , CASE WHEN flash.asset='{{aave_mock_address}}' THEN 'ETH' ELSE erc20.symbol END AS currency_symbol
-    , CASE WHEN flash.asset='{{aave_mock_address}}' THEN 18 ELSE erc20.decimals END AS currency_decimals
+    , CASE WHEN flash.asset= {{aave_mock_address}} THEN {{weth_address}} ELSE flash.asset END AS currency_contract
+    , CASE WHEN flash.asset= {{aave_mock_address}} THEN 'ETH' ELSE erc20.symbol END AS currency_symbol
+    , CASE WHEN flash.asset= {{aave_mock_address}} THEN 18 ELSE erc20.decimals END AS currency_decimals
     , flash.target AS recipient
     , flash.contract_address
     FROM {{ source('aave_v3_arbitrum','L2Pool_evt_FlashLoan') }} flash
     LEFT JOIN {{ ref('tokens_arbitrum_erc20') }} erc20
         ON flash.asset = erc20.contract_address
     WHERE CAST(flash.amount AS double) > 0
         {% if is_incremental() %}
-        AND flash.evt_block_time >= date_trunc("day", now() - interval '1 week')
+        AND flash.evt_block_time >= date_trunc('day', now() - interval '7' Day)
         {% endif %}
     )
 
 SELECT 'arbitrum'                                                       AS blockchain
      , 'Aave'                                                           AS project
      , '3'                                                              AS version
+     , CAST(date_trunc('Month', flash.block_time) as date)              AS block_month
      , flash.block_time
      , flash.block_number
      , flash.amount_raw / POWER(10, flash.currency_decimals)            AS amount

diff --git a/models/aave/avalanche_c/aave_avalanche_c_flashloans.sql b/models/aave/avalanche_c/aave_avalanche_c_flashloans.sql
@@ -1,5 +1,7 @@
 {{ config(
-      alias = alias('flashloans')
+      tags = ['dunesql']
+      , partition_by = ['block_month']
+      , alias = alias('flashloans')
       , materialized = 'incremental'
       , file_format = 'delta'
       , incremental_strategy = 'merge'
@@ -22,6 +24,7 @@ FROM (
       SELECT blockchain
       , project
       , version
+      , block_month
       , block_time
       , block_number
       , amount
@@ -35,7 +38,7 @@ FROM (
       , contract_address
     FROM {{ aave_model }}
     {% if is_incremental() %}
-    WHERE block_time >= date_trunc("day", now() - interval '1 week')
+    WHERE block_time >= date_trunc('day', now() - interval '7' Day)
     {% endif %}
     {% if not loop.last %}
     UNION ALL

diff --git a/models/aave/avalanche_c/aave_avalanche_c_schema.yml b/models/aave/avalanche_c/aave_avalanche_c_schema.yml
@@ -30,6 +30,7 @@ models:
       - name: currency_symbol
       - name: recipient
       - name: contract_address
+      - name: block_month
 
  - name: aave_v3_avalanche_c_flashloans
    meta:
@@ -60,6 +61,7 @@ models:
       - name: currency_symbol
       - name: recipient
       - name: contract_address
+      - name: block_month
 
  - name: aave_avalanche_c_flashloans
    meta:
@@ -89,4 +91,5 @@ models:
       - name: currency_contract
       - name: currency_symbol
       - name: recipient
-      - name: contract_address
+      - name: contract_address
+      - name: block_month
diff --git a/models/aave/avalanche_c/aave_v2_avalanche_c_flashloans.sql b/models/aave/avalanche_c/aave_v2_avalanche_c_flashloans.sql
@@ -1,5 +1,7 @@
 {{ config(
-    schema = 'aave_v2_avalanche_c'
+    tags = ['dunesql']
+    , partition_by = ['block_month']
+    , schema = 'aave_v2_avalanche_c'
     , alias = alias('flashloans')
     , materialized = 'incremental'
     , file_format = 'delta'
@@ -23,22 +25,23 @@ WITH flashloans AS (
     , flash.evt_tx_hash AS tx_hash
     , flash.evt_index
     , CAST(flash.premium AS double) AS fee
-    , CASE WHEN flash.asset='{{aave_mock_address}}' THEN '{{wavax_address}}' ELSE flash.asset END AS currency_contract
-    , CASE WHEN flash.asset='{{aave_mock_address}}' THEN 'AVAX' ELSE erc20.symbol END AS currency_symbol
-    , CASE WHEN flash.asset='{{aave_mock_address}}' THEN 18 ELSE erc20.decimals END AS currency_decimals
+    , CASE WHEN flash.asset= {{aave_mock_address}} THEN {{wavax_address}} ELSE flash.asset END AS currency_contract
+    , CASE WHEN flash.asset= {{aave_mock_address}} THEN 'AVAX' ELSE erc20.symbol END AS currency_symbol
+    , CASE WHEN flash.asset= {{aave_mock_address}} THEN 18 ELSE erc20.decimals END AS currency_decimals
     , flash.target AS recipient
     , flash.contract_address
     FROM {{ source('aave_v2_avalanche_c','LendingPool_evt_FlashLoan') }} flash
     LEFT JOIN {{ ref('tokens_avalanche_c_erc20') }} erc20 ON flash.asset = erc20.contract_address
     WHERE CAST(flash.amount AS double) > 0
         {% if is_incremental() %}
-        AND flash.evt_block_time >= date_trunc("day", now() - interval '1 week')
+        AND flash.evt_block_time >= date_trunc('day', now() - interval '7' Day)
         {% endif %}
     )
 
 SELECT 'avalanche_c'                                                    AS blockchain
      , 'Aave'                                                           AS project
      , '2'                                                              AS version
+     , CAST(date_trunc('Month', flash.block_time) as date)              AS block_month
      , flash.block_time
      , flash.block_number
      , flash.amount_raw / POWER(10, flash.currency_decimals)            AS amount

diff --git a/models/aave/avalanche_c/aave_v3_avalanche_c_flashloans.sql b/models/aave/avalanche_c/aave_v3_avalanche_c_flashloans.sql
@@ -1,5 +1,7 @@
 {{ config(
-    schema = 'aave_v3_avalanche_c'
+    tags = ['dunesql']
+    , partition_by = ['block_month']
+    , schema = 'aave_v3_avalanche_c'
     , alias = alias('flashloans')
     , materialized = 'incremental'
     , file_format = 'delta'
@@ -23,22 +25,23 @@ WITH flashloans AS (
     , flash.evt_tx_hash AS tx_hash
     , flash.evt_index
     , CAST(flash.premium AS double) AS fee
-    , CASE WHEN flash.asset='{{aave_mock_address}}' THEN '{{wavax_address}}' ELSE flash.asset END AS currency_contract
-    , CASE WHEN flash.asset='{{aave_mock_address}}' THEN 'AVAX' ELSE erc20.symbol END AS currency_symbol
-    , CASE WHEN flash.asset='{{aave_mock_address}}' THEN 18 ELSE erc20.decimals END AS currency_decimals
+    , CASE WHEN flash.asset= {{aave_mock_address}} THEN {{wavax_address}} ELSE flash.asset END AS currency_contract
+    , CASE WHEN flash.asset= {{aave_mock_address}} THEN 'AVAX' ELSE erc20.symbol END AS currency_symbol
+    , CASE WHEN flash.asset= {{aave_mock_address}} THEN 18 ELSE erc20.decimals END AS currency_decimals
     , flash.target AS recipient
     , flash.contract_address
     FROM {{ source('aave_v3_avalanche_c','Pool_evt_FlashLoan') }} flash
     LEFT JOIN {{ ref('tokens_avalanche_c_erc20') }} erc20 ON flash.asset = erc20.contract_address
     WHERE CAST(flash.amount AS double) > 0
         {% if is_incremental() %}
-        AND flash.evt_block_time >= date_trunc("day", now() - interval '1 week')
+        AND flash.evt_block_time >= date_trunc('day', now() - interval '7' Day)
         {% endif %}
     )
 
 SELECT 'avalanche_c' AS blockchain
 , 'Aave' AS project
 , '3' AS version
+, CAST(date_trunc('Month', flash.block_time) as date) AS block_month
 , flash.block_time
 , flash.block_number
 , flash.amount_raw/POWER(10, flash.currency_decimals) AS amount

diff --git a/models/aave/ethereum/aave_ethereum_flashloans.sql b/models/aave/ethereum/aave_ethereum_flashloans.sql
@@ -1,5 +1,7 @@
 {{ config(
-      alias = alias('flashloans')
+      tags = ['dunesql']
+      , partition_by = ['block_month']
+      , alias = alias('flashloans')
       , materialized = 'incremental'
       , file_format = 'delta'
       , incremental_strategy = 'merge'
@@ -23,6 +25,7 @@ FROM (
       SELECT blockchain
       , project
       , version
+      , block_month
       , block_time
       , block_number
       , amount
@@ -36,7 +39,7 @@ FROM (
       , contract_address
     FROM {{ aave_model }}
     {% if is_incremental() %}
-    WHERE block_time >= date_trunc("day", now() - interval '1 week')
+    WHERE block_time >= date_trunc('day', now() - interval '7' Day)
     {% endif %}
     {% if not loop.last %}
     UNION ALL

diff --git a/models/aave/ethereum/aave_ethereum_schema.yml b/models/aave/ethereum/aave_ethereum_schema.yml
@@ -345,6 +345,7 @@ models:
       - name: currency_symbol
       - name: recipient
       - name: contract_address
+      - name: block_month
 
  - name: aave_v2_ethereum_flashloans
    meta:
@@ -375,6 +376,7 @@ models:
       - name: currency_symbol
       - name: recipient
       - name: contract_address
+      - name: block_month
 
  - name: aave_v3_ethereum_flashloans
    meta:
@@ -405,6 +407,7 @@ models:
       - name: currency_symbol
       - name: recipient
       - name: contract_address
+      - name: block_month
 
  - name: aave_ethereum_flashloans
    meta:
@@ -434,4 +437,5 @@ models:
       - name: currency_contract
       - name: currency_symbol
       - name: recipient
-      - name: contract_address
+      - name: contract_address
+      - name: block_month
diff --git a/models/aave/ethereum/aave_v1_ethereum_flashloans.sql b/models/aave/ethereum/aave_v1_ethereum_flashloans.sql
@@ -1,5 +1,7 @@
 {{ config(
-    schema = 'aave_v1_ethereum'
+    tags = ['dunesql']
+    , partition_by = ['block_month']
+    , schema = 'aave_v1_ethereum'
     , alias = alias('flashloans')
     , materialized = 'incremental'
     , file_format = 'delta'
@@ -19,22 +21,23 @@ WITH flashloans AS (
     , flash.evt_tx_hash AS tx_hash
     , flash.evt_index
     , CAST(flash._totalFee AS double) AS fee
-    , CASE WHEN flash._reserve='{{aave_mock_address}}' THEN '{{weth_address}}' ELSE flash._reserve END AS currency_contract
-    , CASE WHEN flash._reserve='{{aave_mock_address}}' THEN 'ETH' ELSE erc20.symbol END AS currency_symbol
-    , CASE WHEN flash._reserve='{{aave_mock_address}}' THEN 18 ELSE erc20.decimals END AS currency_decimals
+    , CASE WHEN flash._reserve= {{aave_mock_address}} THEN {{weth_address}} ELSE flash._reserve END AS currency_contract
+    , CASE WHEN flash._reserve= {{aave_mock_address}} THEN 'ETH' ELSE erc20.symbol END AS currency_symbol
+    , CASE WHEN flash._reserve= {{aave_mock_address}} THEN 18 ELSE erc20.decimals END AS currency_decimals
     , flash._target AS recipient
     , flash.contract_address AS contract_address
     FROM {{ source('aave_ethereum','LendingPool_evt_FlashLoan') }} flash
     LEFT JOIN {{ ref('tokens_ethereum_erc20') }} erc20 ON flash._reserve = erc20.contract_address
     WHERE CAST(flash._amount AS double) > 0
         {% if is_incremental() %}
-        AND flash.evt_block_time >= date_trunc("day", now() - interval '1 week')
+        AND flash.evt_block_time >= date_trunc('day', now() - interval '7' Day)
         {% endif %}
     )
 
 SELECT 'ethereum' AS blockchain
 , 'Aave' AS project
 , '1' AS version
+, CAST(date_trunc('Month', flash.block_time) as date) AS block_month
 , flash.block_time
 , flash.block_number
 , flash.amount_raw/POWER(10, flash.currency_decimals) AS amount

diff --git a/models/aave/ethereum/aave_v2_ethereum_flashloans.sql b/models/aave/ethereum/aave_v2_ethereum_flashloans.sql
@@ -1,5 +1,7 @@
 {{ config(
-    schema = 'aave_v2_ethereum'
+    tags = ['dunesql']
+    , partition_by = ['block_month']
+    , schema = 'aave_v2_ethereum'
     , alias = alias('flashloans')
     , materialized = 'incremental'
     , file_format = 'delta'
@@ -19,22 +21,23 @@ WITH flashloans AS (
     , flash.evt_tx_hash AS tx_hash
     , flash.evt_index
     , CAST(flash.premium AS double) AS fee
-    , CASE WHEN flash.asset='{{aave_mock_address}}' THEN '{{weth_address}}' ELSE flash.asset END AS currency_contract
-    , CASE WHEN flash.asset='{{aave_mock_address}}' THEN 'ETH' ELSE erc20.symbol END AS currency_symbol
-    , CASE WHEN flash.asset='{{aave_mock_address}}' THEN 18 ELSE erc20.decimals END AS currency_decimals
+    , CASE WHEN flash.asset= {{aave_mock_address}} THEN {{weth_address}} ELSE flash.asset END AS currency_contract
+    , CASE WHEN flash.asset= {{aave_mock_address}} THEN 'ETH' ELSE erc20.symbol END AS currency_symbol
+    , CASE WHEN flash.asset= {{aave_mock_address}} THEN 18 ELSE erc20.decimals END AS currency_decimals
     , flash.target AS recipient
     , flash.contract_address
     FROM {{ source('aave_v2_ethereum','LendingPool_evt_FlashLoan') }} flash
     LEFT JOIN {{ ref('tokens_ethereum_erc20') }} erc20 ON flash.asset = erc20.contract_address
     WHERE CAST(flash.amount AS double) > 0
         {% if is_incremental() %}
-        AND flash.evt_block_time >= date_trunc("day", now() - interval '1 week')
+        AND flash.evt_block_time >= date_trunc('day', now() - interval '7' Day)
         {% endif %}
     )
 
 SELECT 'ethereum' AS blockchain
 , 'Aave' AS project
 , '2' AS version
+, CAST(date_trunc('Month', flash.block_time) as date) AS block_month
 , flash.block_time
 , flash.block_number
 , flash.amount_raw/POWER(10, flash.currency_decimals) AS amount