Merge branch 'main' into stablecoin_transfer_macro

duneanalytics · Jun 20, 2024 · c5b5230 · c5b5230
2 parents e107d3d + 589dac7
commit c5b5230
Show file tree

Hide file tree

Showing 63 changed files with 81 additions and 106 deletions.
diff --git a/dex/models/_projects/oneinch/_meta/oneinch_blockchains.sql b/dex/models/_projects/oneinch/_meta/oneinch_blockchains.sql
@@ -3,7 +3,6 @@
         schema = 'oneinch',
         alias = 'blockchains',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/_meta/oneinch_mapped_contracts.sql b/dex/models/_projects/oneinch/_meta/oneinch_mapped_contracts.sql
@@ -3,7 +3,6 @@
         schema = 'oneinch',
         alias = 'mapped_contracts',
         materialized = 'table',
-        on_table_exists = 'drop',
         tags = ['prod_exclude'],
         unique_key = ['blockchain', 'address'],
     )

diff --git a/dex/models/_projects/oneinch/_meta/oneinch_mapped_methods.sql b/dex/models/_projects/oneinch/_meta/oneinch_mapped_methods.sql
@@ -3,7 +3,6 @@
         schema = 'oneinch',
         alias = 'mapped_methods',
         materialized = 'table',
-        on_table_exists = 'drop',
         tags = ['prod_exclude'],
         unique_key = ['blockchain', 'address', 'signature'],
     )

diff --git a/dex/models/_projects/oneinch/arbitrum/_meta/oneinch_arbitrum_mapped_contracts.sql b/dex/models/_projects/oneinch/arbitrum/_meta/oneinch_arbitrum_mapped_contracts.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_contracts',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/arbitrum/_meta/oneinch_arbitrum_mapped_methods.sql b/dex/models/_projects/oneinch/arbitrum/_meta/oneinch_arbitrum_mapped_methods.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_methods',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/avalanche_c/_meta/oneinch_avalanche_c_mapped_contracts.sql b/dex/models/_projects/oneinch/avalanche_c/_meta/oneinch_avalanche_c_mapped_contracts.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_contracts',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/avalanche_c/_meta/oneinch_avalanche_c_mapped_methods.sql b/dex/models/_projects/oneinch/avalanche_c/_meta/oneinch_avalanche_c_mapped_methods.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_methods',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/base/_meta/oneinch_base_mapped_contracts.sql b/dex/models/_projects/oneinch/base/_meta/oneinch_base_mapped_contracts.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_contracts',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/base/_meta/oneinch_base_mapped_methods.sql b/dex/models/_projects/oneinch/base/_meta/oneinch_base_mapped_methods.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_methods',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/bnb/_meta/oneinch_bnb_mapped_contracts.sql b/dex/models/_projects/oneinch/bnb/_meta/oneinch_bnb_mapped_contracts.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_contracts',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/bnb/_meta/oneinch_bnb_mapped_methods.sql b/dex/models/_projects/oneinch/bnb/_meta/oneinch_bnb_mapped_methods.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_methods',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/ethereum/_meta/oneinch_ethereum_mapped_contracts.sql b/dex/models/_projects/oneinch/ethereum/_meta/oneinch_ethereum_mapped_contracts.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_contracts',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/ethereum/_meta/oneinch_ethereum_mapped_methods.sql b/dex/models/_projects/oneinch/ethereum/_meta/oneinch_ethereum_mapped_methods.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_methods',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/fantom/_meta/oneinch_fantom_mapped_contracts.sql b/dex/models/_projects/oneinch/fantom/_meta/oneinch_fantom_mapped_contracts.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_contracts',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/fantom/_meta/oneinch_fantom_mapped_methods.sql b/dex/models/_projects/oneinch/fantom/_meta/oneinch_fantom_mapped_methods.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_methods',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/gnosis/_meta/oneinch_gnosis_mapped_contracts.sql b/dex/models/_projects/oneinch/gnosis/_meta/oneinch_gnosis_mapped_contracts.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_contracts',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/gnosis/_meta/oneinch_gnosis_mapped_methods.sql b/dex/models/_projects/oneinch/gnosis/_meta/oneinch_gnosis_mapped_methods.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_methods',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/oneinch_project_orders.sql b/dex/models/_projects/oneinch/oneinch_project_orders.sql
@@ -7,7 +7,7 @@
         incremental_strategy = 'merge',
         partition_by = ['block_month'],
         incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_time')],
-        unique_key = ['blockchain', 'block_number', 'tx_hash', 'call_trace_address', 'order_hash']
+        unique_key = ['blockchain', 'block_number', 'tx_hash', 'call_trace_address', 'order_hash', 'call_trade']
     )
 }}
 
@@ -65,6 +65,8 @@ meta as (
                 , order_start
                 , order_end
                 , order_deadline
+                , call_trade
+                , call_trades
             from {{ ref('oneinch_' + blockchain + '_project_orders') }}
             where call_success
             {% if not loop.last %} union all {% endif %}
@@ -79,6 +81,8 @@ meta as (
             , null as order_start
             , null as order_end
             , null as order_deadline
+            , 1 as call_trade
+            , 1 as call_trades
         from {{ ref('oneinch_lop') }}
         where call_success
     )
@@ -109,6 +113,7 @@ meta as (
         , tx_hash
         , call_trace_address
         , coalesce(order_hash, concat(tx_hash, to_big_endian_32(cast(counter as int)))) as order_hash
+        , call_trade
         , any_value(block_time) as block_time
         , any_value(project) as project
         , any_value(call_selector) as call_selector
@@ -127,11 +132,12 @@ meta as (
         , any_value(order_start) as order_start
         , any_value(order_end) as order_end
         , any_value(order_deadline) as order_deadline
+        , any_value(call_trades) as call_trades
         , any_value(flags) as flags
         , any_value(tag) as tag
     from (select * from orders, unnest(assets) as a(contract_address))
     left join prices using(blockchain, contract_address, minute)
-    group by 1, 2, 3, 4, 5
+    group by 1, 2, 3, 4, 5, 6
 )
 
 -- output --
@@ -161,6 +167,8 @@ select
     , order_start
     , order_end
     , order_deadline
+    , call_trade
+    , call_trades
     , flags
     , tag
     , date(date_trunc('month', block_time)) as block_month

diff --git a/dex/models/_projects/oneinch/optimism/_meta/oneinch_optimism_mapped_contracts.sql b/dex/models/_projects/oneinch/optimism/_meta/oneinch_optimism_mapped_contracts.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_contracts',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/optimism/_meta/oneinch_optimism_mapped_methods.sql b/dex/models/_projects/oneinch/optimism/_meta/oneinch_optimism_mapped_methods.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_methods',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/polygon/_meta/oneinch_polygon_mapped_contracts.sql b/dex/models/_projects/oneinch/polygon/_meta/oneinch_polygon_mapped_contracts.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_contracts',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/polygon/_meta/oneinch_polygon_mapped_methods.sql b/dex/models/_projects/oneinch/polygon/_meta/oneinch_polygon_mapped_methods.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_methods',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/zksync/_meta/oneinch_zksync_mapped_contracts.sql b/dex/models/_projects/oneinch/zksync/_meta/oneinch_zksync_mapped_contracts.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_contracts',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/dex/models/_projects/oneinch/zksync/_meta/oneinch_zksync_mapped_methods.sql b/dex/models/_projects/oneinch/zksync/_meta/oneinch_zksync_mapped_methods.sql
@@ -7,7 +7,6 @@
         schema = 'oneinch_' + blockchain,
         alias = 'mapped_methods',
         materialized = 'table',
-        on_table_exists = 'drop',
         unique_key = ['blockchain', 'address'],
     )
 }}

diff --git a/macros/models/_project/oneinch/oneinch_project_calls_macro.sql b/macros/models/_project/oneinch/oneinch_project_calls_macro.sql
@@ -1,7 +1,7 @@
 {% macro 
     oneinch_project_calls_macro(
         blockchain
-        , date_from = '2024-06-18'
+        , date_from = '2023-01-01'
     )
 %}
 

diff --git a/macros/models/_project/oneinch/oneinch_project_swaps_macro.sql b/macros/models/_project/oneinch/oneinch_project_swaps_macro.sql
@@ -1,7 +1,7 @@
 {% macro 
     oneinch_project_swaps_macro(
         blockchain
-        , date_from = '2024-06-18'
+        , date_from = '2023-01-01'
     ) 
 %}
 

diff --git a/nft/models/_sector/trades/chains/solana/nft_solana_base_trades.sql b/nft/models/_sector/trades/chains/solana/nft_solana_base_trades.sql
diff --git a/...s/chains/solana/nft_solana_old_trades.sql → ...els/_sector/nft/nft_solana_old_trades.sql b/...s/chains/solana/nft_solana_old_trades.sql → ...els/_sector/nft/nft_solana_old_trades.sql
diff --git a/...rades/chains/solana/nft_solana_trades.sql → .../models/_sector/nft/nft_solana_trades.sql b/...rades/chains/solana/nft_solana_trades.sql → .../models/_sector/nft/nft_solana_trades.sql
diff --git a/...hains/solana/nft_solana_trades_schema.yml → .../_sector/nft/nft_solana_trades_schema.yml b/...hains/solana/nft_solana_trades_schema.yml → .../_sector/nft/nft_solana_trades_schema.yml
@@ -136,17 +136,3 @@ models:
      - &inner_instruction_index
        name: inner_instruction_index
        description: "inner index of instruction call"
-
-  - name: nft_solana_base_trades
-    meta:
-      blockchain: solana
-      sector: nft
-      contributors: [ 0xRob ]
-    config:
-      tags: [ 'solana','nft' ]
-    description: >
-      nft solana trades with the schema of nft_trades, mainly used to include volume and tx counts into nft.trades
-    tests:
-      - check_columns_nft_base_trades
-      - dbt_utils.unique_combination_of_columns:
-          combination_of_columns: [ 'block_number','tx_hash','sub_tx_trade_id' ]
diff --git a/...ctor/trades/chains/solana/old/_schema.yml → solana/models/_sector/nft/old/_schema.yml b/...ctor/trades/chains/solana/old/_schema.yml → solana/models/_sector/nft/old/_schema.yml
diff --git a/...ns/solana/old/magiceden_solana_events.sql → ...ector/nft/old/magiceden_solana_events.sql b/...ns/solana/old/magiceden_solana_events.sql → ...ector/nft/old/magiceden_solana_events.sql
diff --git a/...ains/solana/old/opensea_solana_events.sql → ..._sector/nft/old/opensea_solana_events.sql b/...ains/solana/old/opensea_solana_events.sql → ..._sector/nft/old/opensea_solana_events.sql
diff --git a/...rades/chains/solana/platforms/_schema.yml → .../models/_sector/nft/platforms/_schema.yml b/...rades/chains/solana/platforms/_schema.yml → .../models/_sector/nft/platforms/_schema.yml
diff --git a/...platforms/magiceden_mmm_solana_trades.sql → ...platforms/magiceden_mmm_solana_trades.sql b/...platforms/magiceden_mmm_solana_trades.sql → ...platforms/magiceden_mmm_solana_trades.sql
diff --git a/.../platforms/magiceden_v2_solana_trades.sql → .../platforms/magiceden_v2_solana_trades.sql b/.../platforms/magiceden_v2_solana_trades.sql → .../platforms/magiceden_v2_solana_trades.sql
diff --git a/.../platforms/magiceden_v3_solana_trades.sql → .../platforms/magiceden_v3_solana_trades.sql b/.../platforms/magiceden_v3_solana_trades.sql → .../platforms/magiceden_v3_solana_trades.sql
diff --git a/...platforms/tensorswap_v1_solana_trades.sql → ...platforms/tensorswap_v1_solana_trades.sql b/...platforms/tensorswap_v1_solana_trades.sql → ...platforms/tensorswap_v1_solana_trades.sql
diff --git a/...platforms/tensorswap_v2_solana_trades.sql → ...platforms/tensorswap_v2_solana_trades.sql b/...platforms/tensorswap_v2_solana_trades.sql → ...platforms/tensorswap_v2_solana_trades.sql
diff --git a/solana/models/solana_utils/solana_utils_schema.yml b/solana/models/solana_utils/solana_utils_schema.yml
@@ -14,6 +14,8 @@ models:
         name: token_mint_address
       - &address
         name: address
+      - &account_type
+        name: account_type
       - &updated_at
         name: updated_at
 

diff --git a/solana/models/solana_utils/solana_utils_token_accounts.sql b/solana/models/solana_utils/solana_utils_token_accounts.sql
@@ -12,10 +12,10 @@
                                     \'["ilemi"]\') }}')
 }}
 
-WITH 
+WITH
       distinct_accounts as (
             SELECT
-                  aa.address 
+                  aa.address
                   , max_by(aa.token_balance_owner, aa.block_time) as token_balance_owner
                   , max_by(aa.token_mint_address, aa.block_time) as token_mint_address
             FROM {{ source('solana','account_activity') }} aa
@@ -25,5 +25,10 @@ WITH
             {% endif %}
             group by 1
       )
-
-SELECT * FROM distinct_accounts
+SELECT
+*
+, case when nft.account_mint is not null then 'nft'
+      else 'fungible'
+      end as account_type
+FROM distinct_accounts da
+LEFT JOIN {{ ref('tokens_solana_nft')}} nft ON da.token_mint_address = nft.account_mint
diff --git a/solana/package-lock.yml b/solana/package-lock.yml
@@ -1,4 +1,4 @@
 packages:
 - package: dbt-labs/dbt_utils
   version: 1.2.0
-sha1_hash: d4f259856543b0ef301e0b3b0bbc94ccb6b12a54
+sha1_hash: eb1031c07e7c89332527e572f2e44613ce5b62bf
diff --git a/nft/seeds/trades/solana_trades/_schema.yml → solana/seeds/nft_solana_trades/_schema.yml b/nft/seeds/trades/solana_trades/_schema.yml → solana/seeds/nft_solana_trades/_schema.yml
diff --git a/...ades/magiceden_mmm_solana_trades_seed.csv → ...ades/magiceden_mmm_solana_trades_seed.csv b/...ades/magiceden_mmm_solana_trades_seed.csv → ...ades/magiceden_mmm_solana_trades_seed.csv
diff --git a/...rades/magiceden_solana_trades_solscan.csv → ...rades/magiceden_solana_trades_solscan.csv b/...rades/magiceden_solana_trades_solscan.csv → ...rades/magiceden_solana_trades_solscan.csv
diff --git a/...rades/magiceden_v2_solana_trades_seed.csv → ...rades/magiceden_v2_solana_trades_seed.csv b/...rades/magiceden_v2_solana_trades_seed.csv → ...rades/magiceden_v2_solana_trades_seed.csv
diff --git a/...rades/magiceden_v3_solana_trades_seed.csv → ...rades/magiceden_v3_solana_trades_seed.csv b/...rades/magiceden_v3_solana_trades_seed.csv → ...rades/magiceden_v3_solana_trades_seed.csv
diff --git a/...ades/tensorswap_v1_solana_trades_seed.csv → ...ades/tensorswap_v1_solana_trades_seed.csv b/...ades/tensorswap_v1_solana_trades_seed.csv → ...ades/tensorswap_v1_solana_trades_seed.csv
diff --git a/...ades/tensorswap_v2_solana_trades_seed.csv → ...ades/tensorswap_v2_solana_trades_seed.csv b/...ades/tensorswap_v2_solana_trades_seed.csv → ...ades/tensorswap_v2_solana_trades_seed.csv
diff --git a/.../solana/opensea_solana_trades_solscan.csv → ...opensea/opensea_solana_trades_solscan.csv b/.../solana/opensea_solana_trades_solscan.csv → ...opensea/opensea_solana_trades_solscan.csv
diff --git a/nft/seeds/opensea/solana/schema.yml → solana/seeds/opensea/schema.yml b/nft/seeds/opensea/solana/schema.yml → solana/seeds/opensea/schema.yml
diff --git a/...olana/magiceden_solana_assert_samples.sql → ...olana/magiceden_solana_assert_samples.sql b/...olana/magiceden_solana_assert_samples.sql → ...olana/magiceden_solana_assert_samples.sql
diff --git a/.../solana/opensea_solana_assert_samples.sql → .../solana/opensea_solana_assert_samples.sql b/.../solana/opensea_solana_assert_samples.sql → .../solana/opensea_solana_assert_samples.sql
diff --git a/sources/oneinch/arbitrum/oneinch_arbitrum_sources.yml b/sources/oneinch/arbitrum/oneinch_arbitrum_sources.yml
@@ -129,11 +129,14 @@ sources:
         loaded_at_field: call_block_time
       - name: AggregationRouterV6_call_fillContractOrderArgs
         loaded_at_field: call_block_time
-      - name: mapped_contracts
       - name: project_orders
         loaded_at_field: block_time
       - name: project_calls
         loaded_at_field: block_time
       - name: lop
         loaded_at_field: block_time
+
+  - name: oneinch_arbitrum
+    tables:
+      - name: mapped_contracts
 
diff --git a/sources/oneinch/avalanche_c/oneinch_avalanche_c_sources.yml b/sources/oneinch/avalanche_c/oneinch_avalanche_c_sources.yml
@@ -115,10 +115,14 @@ sources:
         loaded_at_field: call_block_time
       - name: AggregationRouterV6_call_fillContractOrderArgs
         loaded_at_field: call_block_time
-      - name: mapped_contracts
       - name: project_orders
         loaded_at_field: block_time
       - name: project_calls
         loaded_at_field: block_time
       - name: lop
-        loaded_at_field: block_time
+        loaded_at_field: block_time
+
+
+  - name: oneinch_avalanche_c
+    tables:
+      - name: mapped_contracts