Add Balancer and Hashflow to dex.trades_migration_beta

models/balancer/arbitrum/balancer_arbitrum_schema.yml

@@ -161,7 +161,6 @@ models:
             - version
             - tx_hash
             - evt_index
-            - trace_address
       - check_dex_seed:
           blockchain: arbitrum
           project: balancer
@@ -174,6 +173,7 @@ models:
       - &version
         name: version
         description: "Version of the project"
+      - *block_month
       - *block_date
       - *block_time
       - &token_bought_symbol
@@ -226,9 +226,6 @@ models:
       - &tx_to
         name: tx_to
         description: "transaction.to"
-      - &trace_address
-        name: trace_address
-        description: ""
       - *evt_index
 
   - name: balancer_v2_arbitrum_liquidity
@@ -340,7 +337,6 @@ models:
             - version
             - tx_hash
             - evt_index
-            - trace_address
       - check_dex_seed:
           blockchain: arbitrum
           project: balancer
@@ -370,5 +366,4 @@ models:
       - name: tx_hash
       - name: tx_from
       - name: tx_to
-      - name: trace_address
       - name: evt_index

models/balancer/arbitrum/balancer_arbitrum_trades.sql

@@ -19,6 +19,7 @@ FROM (
         blockchain,
         project,
         version,
+        block_month,
         block_date,
         block_time,
         token_bought_symbol,
@@ -39,7 +40,6 @@ FROM (
         tx_hash,
         tx_from,
         tx_to,
-        trace_address,
         evt_index
     FROM {{ dex_model }}
     {% if not loop.last %}

models/balancer/arbitrum/balancer_v2_arbitrum_trades.sql

@@ -6,7 +6,7 @@
     materialized = 'incremental',
     file_format = 'delta',
     incremental_strategy = 'merge',
-    unique_key = ['block_date', 'blockchain', 'project', 'version', 'tx_hash', 'evt_index', 'trace_address'],
+    unique_key = ['block_date', 'blockchain', 'project', 'version', 'tx_hash', 'evt_index'],
     post_hook = '{{ expose_spells(\'["arbitrum"]\',
                                 "project",
                                 "balancer_v2",
@@ -49,7 +49,6 @@ WITH
             swap.poolId AS pool_id,
             swap_fees.swap_fee_percentage / POWER(10, 18) AS swap_fee,
             swap.evt_tx_hash AS tx_hash,
-            '' AS trace_address,
             swap.evt_index
         FROM
             swap_fees
@@ -140,7 +139,6 @@ SELECT
     dexs.tx_hash,
     tx."from" AS tx_from,
     tx.to AS tx_to,
-    dexs.trace_address,
     dexs.evt_index
 FROM
     dexs

models/balancer/avalanche_c/balancer_avalanche_c_schema.yml

@@ -20,7 +20,6 @@ models:
             - version
             - tx_hash
             - evt_index
-            - trace_address
       - check_dex_seed:
           blockchain: avalanche_c
           project: balancer
@@ -35,6 +34,9 @@ models:
       - &version
         name: version
         description: "Version of the project"
+      - &block_month
+        name: block_month
+        description: "Block month in UTC"
       - &block_date
         name: block_date
         description: "Block date in UTC"
@@ -95,9 +97,6 @@ models:
       - &tx_to
         name: tx_to
         description: "transaction.to"
-      - &trace_address
-        name: trace_address
-        description: "Trace address"
       - &evt_index
         name: evt_index
         description: "Event index"
@@ -120,7 +119,6 @@ models:
             - version
             - tx_hash
             - evt_index
-            - trace_address
       - check_dex_seed:
           blockchain: avalanche_c
           project: balancer
@@ -150,7 +148,6 @@ models:
       - name: tx_hash
       - name: tx_from
       - name: tx_to
-      - name: trace_address
       - name: evt_index
 
   - name: balancer_avalanche_c_pools_tokens_weights
@@ -273,9 +270,7 @@ models:
         name: contract_address
         description: "Address of BPT being transfered"
       - *block_date
-      - &block_month
-        name: block_month
-        description: "UTC event block month"
+      - *block_month
       - *evt_index
       - &evt_block_time
         name: evt_block_time

models/balancer/avalanche_c/balancer_avalanche_c_trades.sql

@@ -20,6 +20,7 @@ FROM (
         blockchain,
         project,
         version,
+        block_month,
         block_date,
         block_time,
         token_bought_symbol,
@@ -40,7 +41,6 @@ FROM (
         tx_hash,
         tx_from,
         tx_to,
-        trace_address,
         evt_index
     FROM {{ dex_model }}
     {% if not loop.last %}

models/balancer/avalanche_c/balancer_v2_avalanche_c_trades.sql

@@ -6,7 +6,7 @@
     materialized = 'incremental',
     file_format = 'delta',
     incremental_strategy = 'merge',
-    unique_key = ['block_date', 'blockchain', 'project', 'version', 'tx_hash', 'evt_index', 'trace_address'],
+    unique_key = ['block_date', 'blockchain', 'project', 'version', 'tx_hash', 'evt_index'],
     post_hook = '{{ expose_spells(\'["avalanche_c"]\',
                                 "project",
                                 "balancer_v2",

models/balancer/balancer_schema.yml

@@ -20,6 +20,9 @@ models:
       - &version
         name: version
         description: "Version of the project"
+      - &block_month
+        name: block_month
+        description: "Block month in UTC"
       - &block_date
         name: block_date
         description: "Block date in UTC"
@@ -80,9 +83,6 @@ models:
       - &tx_to
         name: tx_to
         description: "transaction.to"
-      - &trace_address
-        name: trace_address
-        description: ""
       - &evt_index
         name: evt_index
         description: 'Event index'

models/balancer/balancer_trades.sql

@@ -27,6 +27,7 @@ FROM (
         blockchain,
         project,
         version,
+        block_month,
         block_date,
         block_time,
         token_bought_symbol,
@@ -47,7 +48,6 @@ FROM (
         tx_hash,
         tx_from,
         tx_to,
-        trace_address,
         evt_index
     FROM {{ dex_model }}
     {% if not loop.last %}

models/balancer/base/balancer_base_schema.yml

@@ -20,7 +20,6 @@ models:
             - version
             - tx_hash
             - evt_index
-            - trace_address
       - check_dex_seed:
           blockchain: base
           project: balancer
@@ -35,6 +34,9 @@ models:
       - &version
         name: version
         description: "Version of the project"
+      - &block_month
+        name: block_month
+        description: "Block month in UTC"
       - &block_date
         name: block_date
         description: "Block date in UTC"
@@ -95,9 +97,6 @@ models:
       - &tx_to
         name: tx_to
         description: "transaction.to"
-      - &trace_address
-        name: trace_address
-        description: "Trace address"
       - &evt_index
         name: evt_index
         description: "Event index"
@@ -120,7 +119,6 @@ models:
             - version
             - tx_hash
             - evt_index
-            - trace_address
       - check_dex_seed:
           blockchain: base
           project: balancer
@@ -297,9 +295,7 @@ models:
       - *blockchain
       - *contract_address
       - *block_date
-      - &block_month
-        name: block_month
-        description: "UTC event block month"
+      - *block_month
       - &evt_tx_hash
         name: evt_tx_hash
         description: 'Transaction hash of transfer event'

models/balancer/base/balancer_base_trades.sql

@@ -20,6 +20,7 @@ FROM (
         blockchain,
         project,
         version,
+        block_month,
         block_date,
         block_time,
         token_bought_symbol,
@@ -40,7 +41,6 @@ FROM (
         tx_hash,
         tx_from,
         tx_to,
-        trace_address,
         evt_index
     FROM {{ dex_model }}
     {% if not loop.last %}

models/balancer/base/balancer_v2_base_trades.sql

@@ -6,7 +6,7 @@
     materialized = 'incremental',
     file_format = 'delta',
     incremental_strategy = 'merge',
-    unique_key = ['block_date', 'blockchain', 'project', 'version', 'tx_hash', 'evt_index', 'trace_address'],
+    unique_key = ['block_date', 'blockchain', 'project', 'version', 'tx_hash', 'evt_index'],
     post_hook = '{{ expose_spells(\'["base"]\',
                                 "project",
                                 "balancer_v2",
@@ -49,7 +49,6 @@ WITH
             swap.poolId AS pool_id,
             swap_fees.swap_fee_percentage / POWER(10, 18) AS swap_fee,
             swap.evt_tx_hash AS tx_hash,
-            '' AS trace_address,
             swap.evt_index
         FROM
             swap_fees
@@ -140,7 +139,6 @@ SELECT
     dexs.tx_hash,
     tx."from" AS tx_from,
     tx.to AS tx_to,
-    dexs.trace_address,
     dexs.evt_index
 FROM
     dexs

models/balancer/ethereum/balancer_ethereum_schema.yml

@@ -267,6 +267,7 @@ models:
       - &version
         name: version
         description: "Version of the project"
+      - *block_month
       - *block_date
       - *block_time
       - &token_bought_symbol
@@ -319,9 +320,6 @@ models:
       - &tx_to
         name: tx_to
         description: "transaction.to"
-      - &trace_address
-        name: trace_address
-        description: ""
       - *evt_index
 
   - name: balancer_v1_ethereum_trades
@@ -347,6 +345,7 @@ models:
       - *blockchain
       - *project
       - *version
+      - *block_month
       - *block_date
       - *block_time
       - *token_bought_symbol
@@ -367,7 +366,6 @@ models:
       - *tx_hash
       - *tx_from
       - *tx_to
-      - *trace_address
       - *evt_index
 
   - name: balancer_v2_ethereum_trades
@@ -388,7 +386,6 @@ models:
             - version
             - tx_hash
             - evt_index
-            - trace_address
       - check_dex_seed:
           blockchain: ethereum
           project: balancer
@@ -418,7 +415,6 @@ models:
       - name: tx_hash
       - name: tx_from
       - name: tx_to
-      - name: trace_address
       - name: evt_index
 
   - name: balancer_v2_ethereum_liquidity

models/balancer/ethereum/balancer_ethereum_trades.sql

@@ -20,6 +20,7 @@ FROM (
         blockchain,
         project,
         version,
+        block_month,
         block_date,
         block_time,
         token_bought_symbol,
@@ -40,7 +41,6 @@ FROM (
         tx_hash,
         tx_from,
         tx_to,
-        trace_address,
         evt_index
     FROM {{ dex_model }}
     {% if not loop.last %}

models/balancer/ethereum/balancer_v1_ethereum_trades.sql

@@ -2,7 +2,7 @@
     schema = 'balancer_v1_ethereum',
     tags = ['dunesql'],
     alias = alias('trades'),
-    partition_by = ['block_date'],
+    partition_by = ['block_month'],
     materialized = 'incremental',
     file_format = 'delta',
     incremental_strategy = 'merge',
@@ -49,6 +49,7 @@ select
     'balancer' AS project,
     version,
     evt_block_time AS block_time,
+    CAST(date_trunc('month', evt_block_time) AS DATE) AS block_month,
     TRY_CAST(date_trunc('day', evt_block_time) AS DATE) AS block_date,
     erc20a.symbol AS token_bought_symbol,
     erc20b.symbol AS token_sold_symbol,
@@ -74,8 +75,7 @@ select
     evt_tx_hash AS tx_hash,
     tx."from" AS tx_from,
     tx.to AS tx_to,
-    evt_index,
-    CAST(NULL AS VARCHAR(5)) AS trace_address
+    evt_index
 FROM v1 trades
 INNER JOIN {{ source('ethereum', 'transactions') }} tx
     ON trades.evt_tx_hash = tx.hash