Merge branch 'duneanalytics:main' into main

5afe · Aug 7, 2024 · 5ea0fd7 · 5ea0fd7
2 parents f11a6c6 + e742a6f
commit 5ea0fd7
Show file tree

Hide file tree

Showing 237 changed files with 2,276 additions and 133 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,8 @@
 .DS_Store
 .vscode
 manifest.json
-macros/dune/create_views_of_dependencies.sql
-macros/dune/alter_table_locations.sql
+dbt_macros/dune/create_views_of_dependencies.sql
+dbt_macros/dune/alter_table_locations.sql
 scripts/integration_test/test_diffs_tokens/*
 .vs
 

diff --git a/macros/public/base58_decode.sql → dbt_macros/deprecated_udfs/base58_decode.sql b/macros/public/base58_decode.sql → dbt_macros/deprecated_udfs/base58_decode.sql
diff --git a/macros/public/bytea2numeric_v3.sql → ...cros/deprecated_udfs/bytea2numeric_v3.sql b/macros/public/bytea2numeric_v3.sql → ...cros/deprecated_udfs/bytea2numeric_v3.sql
diff --git a/macros/public/get_balancer_link.sql → ...ros/deprecated_udfs/get_balancer_link.sql b/macros/public/get_balancer_link.sql → ...ros/deprecated_udfs/get_balancer_link.sql
diff --git a/macros/public/get_chain_explorer.sql → ...os/deprecated_udfs/get_chain_explorer.sql b/macros/public/get_chain_explorer.sql → ...os/deprecated_udfs/get_chain_explorer.sql
diff --git a/macros/public/get_chain_explorer_address.sql → ...cated_udfs/get_chain_explorer_address.sql b/macros/public/get_chain_explorer_address.sql → ...cated_udfs/get_chain_explorer_address.sql
diff --git a/macros/public/get_chain_explorer_tx_hash.sql → ...cated_udfs/get_chain_explorer_tx_hash.sql b/macros/public/get_chain_explorer_tx_hash.sql → ...cated_udfs/get_chain_explorer_tx_hash.sql
diff --git a/macros/public/get_chain_native_token.sql → ...eprecated_udfs/get_chain_native_token.sql b/macros/public/get_chain_native_token.sql → ...eprecated_udfs/get_chain_native_token.sql
diff --git a/macros/public/get_href.sql → dbt_macros/deprecated_udfs/get_href.sql b/macros/public/get_href.sql → dbt_macros/deprecated_udfs/get_href.sql
diff --git a/macros/dune/__init__.py → dbt_macros/dune/__init__.py b/macros/dune/__init__.py → dbt_macros/dune/__init__.py
diff --git a/macros/dune/adapters.sql → dbt_macros/dune/adapters.sql b/macros/dune/adapters.sql → dbt_macros/dune/adapters.sql
diff --git a/macros/dune/create_bindings.sql → dbt_macros/dune/create_bindings.sql b/macros/dune/create_bindings.sql → dbt_macros/dune/create_bindings.sql
diff --git a/macros/dune/enforce_join_distribution.sql → ...macros/dune/enforce_join_distribution.sql b/macros/dune/enforce_join_distribution.sql → ...macros/dune/enforce_join_distribution.sql
diff --git a/macros/dune/expose_dataset.sql → dbt_macros/dune/expose_dataset.sql b/macros/dune/expose_dataset.sql → dbt_macros/dune/expose_dataset.sql
diff --git a/macros/dune/expose_spells.sql → dbt_macros/dune/expose_spells.sql b/macros/dune/expose_spells.sql → dbt_macros/dune/expose_spells.sql
diff --git a/macros/dune/expose_spells_hide_trino.sql → dbt_macros/dune/expose_spells_hide_trino.sql b/macros/dune/expose_spells_hide_trino.sql → dbt_macros/dune/expose_spells_hide_trino.sql
diff --git a/macros/dune/generate_alias_name.sql → dbt_macros/dune/generate_alias_name.sql b/macros/dune/generate_alias_name.sql → dbt_macros/dune/generate_alias_name.sql
diff --git a/macros/dune/generate_schema_name.sql → dbt_macros/dune/generate_schema_name.sql b/macros/dune/generate_schema_name.sql → dbt_macros/dune/generate_schema_name.sql
diff --git a/macros/dune/incremental.sql → dbt_macros/dune/incremental.sql b/macros/dune/incremental.sql → dbt_macros/dune/incremental.sql
diff --git a/...ne/incremental_days_forward_predicate.sql → ...ne/incremental_days_forward_predicate.sql b/...ne/incremental_days_forward_predicate.sql → ...ne/incremental_days_forward_predicate.sql
diff --git a/macros/dune/incremental_predicate.sql → dbt_macros/dune/incremental_predicate.sql b/macros/dune/incremental_predicate.sql → dbt_macros/dune/incremental_predicate.sql
diff --git a/macros/dune/is_incremental.sql → dbt_macros/dune/is_incremental.sql b/macros/dune/is_incremental.sql → dbt_macros/dune/is_incremental.sql
diff --git a/macros/dune/macros_schema.yml → dbt_macros/dune/macros_schema.yml b/macros/dune/macros_schema.yml → dbt_macros/dune/macros_schema.yml
diff --git a/macros/dune/mark_as_spell.sql → dbt_macros/dune/mark_as_spell.sql b/macros/dune/mark_as_spell.sql → dbt_macros/dune/mark_as_spell.sql
diff --git a/macros/dune/no-relation-listing.sql → dbt_macros/dune/no-relation-listing.sql b/macros/dune/no-relation-listing.sql → dbt_macros/dune/no-relation-listing.sql
diff --git a/macros/dune/optimize_spell.sql → dbt_macros/dune/optimize_spell.sql b/macros/dune/optimize_spell.sql → dbt_macros/dune/optimize_spell.sql
diff --git a/macros/dune/ref.sql → dbt_macros/dune/ref.sql b/macros/dune/ref.sql → dbt_macros/dune/ref.sql
diff --git a/macros/dune/return_node.sql → dbt_macros/dune/return_node.sql b/macros/dune/return_node.sql → dbt_macros/dune/return_node.sql
diff --git a/macros/dune/schema.sql → dbt_macros/dune/schema.sql b/macros/dune/schema.sql → dbt_macros/dune/schema.sql
diff --git a/macros/dune/set_trino_session_property.sql → ...acros/dune/set_trino_session_property.sql b/macros/dune/set_trino_session_property.sql → ...acros/dune/set_trino_session_property.sql
diff --git a/macros/dune/source.sql → dbt_macros/dune/source.sql b/macros/dune/source.sql → dbt_macros/dune/source.sql
diff --git a/...eneric-tests/check_column_types_macro.sql → ...eneric-tests/check_column_types_macro.sql b/...eneric-tests/check_column_types_macro.sql → ...eneric-tests/check_column_types_macro.sql
diff --git a/macros/generic-tests/check_seed_macro.sql → ...macros/generic-tests/check_seed_macro.sql b/macros/generic-tests/check_seed_macro.sql → ...macros/generic-tests/check_seed_macro.sql
diff --git a/...ric-tests/equal_rowcount_with_sources.sql → ...ric-tests/equal_rowcount_with_sources.sql b/...ric-tests/equal_rowcount_with_sources.sql → ...ric-tests/equal_rowcount_with_sources.sql
diff --git a/macros/generic-tests/not_zero_address.sql → ...macros/generic-tests/not_zero_address.sql b/macros/generic-tests/not_zero_address.sql → ...macros/generic-tests/not_zero_address.sql
diff --git a/macros/models/_sector/add_tx_columns.sql → dbt_macros/shared/add_tx_columns.sql b/macros/models/_sector/add_tx_columns.sql → dbt_macros/shared/add_tx_columns.sql
diff --git a/macros/public/all_evm_chains.sql → dbt_macros/shared/all_evm_chains.sql b/macros/public/all_evm_chains.sql → dbt_macros/shared/all_evm_chains.sql
diff --git a/macros/public/all_op_chains.sql → dbt_macros/shared/all_op_chains.sql b/macros/public/all_op_chains.sql → dbt_macros/shared/all_op_chains.sql
diff --git a/...ct/balancer/balancer_bpt_prices_macro.sql → ...ed/balancer/balancer_bpt_prices_macro.sql b/...ct/balancer/balancer_bpt_prices_macro.sql → ...ed/balancer/balancer_bpt_prices_macro.sql
diff --git a/...ct/balancer/balancer_bpt_supply_macro.sql → ...ed/balancer/balancer_bpt_supply_macro.sql b/...ct/balancer/balancer_bpt_supply_macro.sql → ...ed/balancer/balancer_bpt_supply_macro.sql
diff --git a/...ect/balancer/balancer_liquidity_macro.sql → ...red/balancer/balancer_liquidity_macro.sql b/...ect/balancer/balancer_liquidity_macro.sql → ...red/balancer/balancer_liquidity_macro.sql
diff --git a/..._token_supply_changes_daily_agg_macro.sql → ..._token_supply_changes_daily_agg_macro.sql b/..._token_supply_changes_daily_agg_macro.sql → ..._token_supply_changes_daily_agg_macro.sql
diff --git a/...ancer_pool_token_supply_changes_macro.sql → ...ancer_pool_token_supply_changes_macro.sql b/...ancer_pool_token_supply_changes_macro.sql → ...ancer_pool_token_supply_changes_macro.sql
diff --git a/.../balancer/balancer_protocol_fee_macro.sql → .../balancer/balancer_protocol_fee_macro.sql b/.../balancer/balancer_protocol_fee_macro.sql → .../balancer/balancer_protocol_fee_macro.sql
diff --git a/...token_balance_changes_daily_agg_macro.sql → ...token_balance_changes_daily_agg_macro.sql b/...token_balance_changes_daily_agg_macro.sql → ...token_balance_changes_daily_agg_macro.sql
diff --git a/.../balancer_token_balance_changes_macro.sql → .../balancer_token_balance_changes_macro.sql b/.../balancer_token_balance_changes_macro.sql → .../balancer_token_balance_changes_macro.sql
diff --git a/...balancer/balancer_transfers_bpt_macro.sql → ...balancer/balancer_transfers_bpt_macro.sql b/...balancer/balancer_transfers_bpt_macro.sql → ...balancer/balancer_transfers_bpt_macro.sql
diff --git a/...public/evm_get_calldata_gas_from_data.sql → ...shared/evm_get_calldata_gas_from_data.sql b/...public/evm_get_calldata_gas_from_data.sql → ...shared/evm_get_calldata_gas_from_data.sql
diff --git a/dbt_subprojects/daily_spellbook/dbt_project.yml b/dbt_subprojects/daily_spellbook/dbt_project.yml
@@ -24,7 +24,7 @@ vars:
 model-paths: ["models", "../../sources"]
 test-paths: ["tests"]
 seed-paths: ["seeds"]
-macro-paths: ["macros", "../../macros"]
+macro-paths: ["macros", "../../dbt_macros"]
 
 target-path: "target" # directory which will store compiled SQL files
 clean-targets: # directories to be removed by `dbt clean`

diff --git a/...roject/chainlink/chainlink_ccip_macro.sql → ...roject/chainlink/chainlink_ccip_macro.sql b/...roject/chainlink/chainlink_ccip_macro.sql → ...roject/chainlink/chainlink_ccip_macro.sql
diff --git a/...kens/creator_tokens_inspect_contracts.sql → ...kens/creator_tokens_inspect_contracts.sql b/...kens/creator_tokens_inspect_contracts.sql → ...kens/creator_tokens_inspect_contracts.sql
diff --git a/.../_meta/oneinch_mapped_contracts_macro.sql → .../_meta/oneinch_mapped_contracts_macro.sql b/.../_meta/oneinch_mapped_contracts_macro.sql → .../_meta/oneinch_mapped_contracts_macro.sql
diff --git a/...roject_swaps_exposed_blockchains_list.sql → ...roject_swaps_exposed_blockchains_list.sql b/...roject_swaps_exposed_blockchains_list.sql → ...roject_swaps_exposed_blockchains_list.sql
diff --git a/...einch_project_orders_cfg_events_macro.sql → ...einch_project_orders_cfg_events_macro.sql b/...einch_project_orders_cfg_events_macro.sql → ...einch_project_orders_cfg_events_macro.sql
diff --git a/...inch_project_orders_cfg_methods_macro.sql → ...inch_project_orders_cfg_methods_macro.sql b/...inch_project_orders_cfg_methods_macro.sql → ...inch_project_orders_cfg_methods_macro.sql
diff --git a/...h/project/oneinch_project_calls_macro.sql → ...h/project/oneinch_project_calls_macro.sql b/...h/project/oneinch_project_calls_macro.sql → ...h/project/oneinch_project_calls_macro.sql
diff --git a/.../project/oneinch_project_orders_macro.sql → .../project/oneinch_project_orders_macro.sql b/.../project/oneinch_project_orders_macro.sql → .../project/oneinch_project_orders_macro.sql
diff --git a/...oneinch_project_orders_raw_logs_macro.sql → ...oneinch_project_orders_raw_logs_macro.sql b/...oneinch_project_orders_raw_logs_macro.sql → ...oneinch_project_orders_raw_logs_macro.sql
diff --git a/...einch_project_orders_raw_traces_macro.sql → ...einch_project_orders_raw_traces_macro.sql b/...einch_project_orders_raw_traces_macro.sql → ...einch_project_orders_raw_traces_macro.sql
diff --git a/...h/project/oneinch_project_swaps_macro.sql → ...h/project/oneinch_project_swaps_macro.sql b/...h/project/oneinch_project_swaps_macro.sql → ...h/project/oneinch_project_swaps_macro.sql
diff --git a/..._project/yield_yak/yield_yak_balances.sql → .../project/yield_yak/yield_yak_balances.sql b/..._project/yield_yak/yield_yak_balances.sql → .../project/yield_yak/yield_yak_balances.sql
diff --git a/...ield_yak/yield_yak_deposits_withdraws.sql → ...ield_yak/yield_yak_deposits_withdraws.sql b/...ield_yak/yield_yak_deposits_withdraws.sql → ...ield_yak/yield_yak_deposits_withdraws.sql
diff --git a/...project/yield_yak/yield_yak_reinvests.sql → ...project/yield_yak/yield_yak_reinvests.sql b/...project/yield_yak/yield_yak_reinvests.sql → ...project/yield_yak/yield_yak_reinvests.sql
diff --git a/...roject/yield_yak/yield_yak_strategies.sql → ...roject/yield_yak/yield_yak_strategies.sql b/...roject/yield_yak/yield_yak_strategies.sql → ...roject/yield_yak/yield_yak_strategies.sql
diff --git a/...yield_yak/yield_yak_user_yrt_balances.sql → ...yield_yak/yield_yak_user_yrt_balances.sql b/...yield_yak/yield_yak_user_yrt_balances.sql → ...yield_yak/yield_yak_user_yrt_balances.sql
diff --git a/...yield_yak/yield_yak_yak_adapter_swaps.sql → ...yield_yak/yield_yak_yak_adapter_swaps.sql b/...yield_yak/yield_yak_yak_adapter_swaps.sql → ...yield_yak/yield_yak_yak_adapter_swaps.sql
diff --git a/...project/yield_yak/yield_yak_yak_swaps.sql → ...project/yield_yak/yield_yak_yak_swaps.sql b/...project/yield_yak/yield_yak_yak_swaps.sql → ...project/yield_yak/yield_yak_yak_swaps.sql
diff --git a/.../yield_yak/yield_yak_yield_strategies.sql → .../yield_yak/yield_yak_yield_strategies.sql b/.../yield_yak/yield_yak_yield_strategies.sql → .../yield_yak/yield_yak_yield_strategies.sql
diff --git a/...vents/addresses_events_first_activity.sql → ...vents/addresses_events_first_activity.sql b/...vents/addresses_events_first_activity.sql → ...vents/addresses_events_first_activity.sql
diff --git a/...ents/addresses_events_first_funded_by.sql → ...ents/addresses_events_first_funded_by.sql b/...ents/addresses_events_first_funded_by.sql → ...ents/addresses_events_first_funded_by.sql
diff --git a/macros/models/_sector/add_pool_price_usd.sql → .../macros/sector/alm/add_pool_price_usd.sql b/macros/models/_sector/add_pool_price_usd.sql → .../macros/sector/alm/add_pool_price_usd.sql
diff --git a/..._sector/alm/arrakis_compatible_trades.sql → .../sector/alm/arrakis_compatible_trades.sql b/..._sector/alm/arrakis_compatible_trades.sql → .../sector/alm/arrakis_compatible_trades.sql
diff --git a/macros/models/_sector/attestation/eas.sql → ...ellbook/macros/sector/attestation/eas.sql b/macros/models/_sector/attestation/eas.sql → ...ellbook/macros/sector/attestation/eas.sql
diff --git a/...acts/contracts_base_iterated_creators.sql → ...acts/contracts_base_iterated_creators.sql b/...acts/contracts_base_iterated_creators.sql → ...acts/contracts_base_iterated_creators.sql
diff --git a/...ntracts/contracts_base_starting_level.sql → ...ntracts/contracts_base_starting_level.sql b/...ntracts/contracts_base_starting_level.sql → ...ntracts/contracts_base_starting_level.sql
diff --git a/.../contracts/contracts_contract_mapping.sql → .../contracts/contracts_contract_mapping.sql b/.../contracts/contracts_contract_mapping.sql → .../contracts/contracts_contract_mapping.sql
diff --git a/...ontracts/find_self_destruct_contracts.sql → ...ontracts/find_self_destruct_contracts.sql b/...ontracts/find_self_destruct_contracts.sql → ...ontracts/find_self_destruct_contracts.sql
diff --git a/.../_sector/dex/uniswap_compatible_pools.sql → ...s/sector/dex/uniswap_compatible_pools.sql b/.../_sector/dex/uniswap_compatible_pools.sql → ...s/sector/dex/uniswap_compatible_pools.sql
diff --git a/...lances/fungible/balances_fungible_day.sql → ...sector/fungible/balances_fungible_day.sql b/...lances/fungible/balances_fungible_day.sql → ...sector/fungible/balances_fungible_day.sql
diff --git a/...ances/fungible/balances_fungible_hour.sql → ...ector/fungible/balances_fungible_hour.sql b/...ances/fungible/balances_fungible_hour.sql → ...ector/fungible/balances_fungible_hour.sql
diff --git a/...ces/fungible/balances_fungible_latest.sql → ...tor/fungible/balances_fungible_latest.sql b/...ces/fungible/balances_fungible_latest.sql → ...tor/fungible/balances_fungible_latest.sql
diff --git a/...ngible/balances_fungible_noncompliant.sql → ...ngible/balances_fungible_noncompliant.sql b/...ngible/balances_fungible_noncompliant.sql → ...ngible/balances_fungible_noncompliant.sql
diff --git a/...s/_sector/fungible/fungible_transfers.sql → ...os/sector/fungible/fungible_transfers.sql b/...s/_sector/fungible/fungible_transfers.sql → ...os/sector/fungible/fungible_transfers.sql
diff --git a/macros/models/_sector/gas/gas_prices.sql → ...pellbook/macros/sector/gas/gas_prices.sql b/macros/models/_sector/gas/gas_prices.sql → ...pellbook/macros/sector/gas/gas_prices.sql
diff --git a/...s/_sector/inscription/inscription_all.sql → ...os/sector/inscription/inscription_all.sql b/...s/_sector/inscription/inscription_all.sql → ...os/sector/inscription/inscription_all.sql
diff --git a/...ector/inscription/inscription_deploys.sql → ...ector/inscription/inscription_deploys.sql b/...ector/inscription/inscription_deploys.sql → ...ector/inscription/inscription_deploys.sql
diff --git a/..._sector/inscription/inscription_mints.sql → .../sector/inscription/inscription_mints.sql b/..._sector/inscription/inscription_mints.sql → .../sector/inscription/inscription_mints.sql
diff --git a/...ctor/referral/enrich_referral_rewards.sql → ...ctor/referral/enrich_referral_rewards.sql b/...ctor/referral/enrich_referral_rewards.sql → ...ctor/referral/enrich_referral_rewards.sql
diff --git a/...ral/platforms/fabric_referral_rewards.sql → ...ral/platforms/fabric_referral_rewards.sql b/...ral/platforms/fabric_referral_rewards.sql → ...ral/platforms/fabric_referral_rewards.sql
diff --git a/...al/platforms/mintfun_referral_rewards.sql → ...al/platforms/mintfun_referral_rewards.sql b/...al/platforms/mintfun_referral_rewards.sql → ...al/platforms/mintfun_referral_rewards.sql
diff --git a/...ral/platforms/mirror_referral_rewards.sql → ...ral/platforms/mirror_referral_rewards.sql b/...ral/platforms/mirror_referral_rewards.sql → ...ral/platforms/mirror_referral_rewards.sql
diff --git a/.../platforms/paragraph_referral_rewards.sql → .../platforms/paragraph_referral_rewards.sql b/.../platforms/paragraph_referral_rewards.sql → .../platforms/paragraph_referral_rewards.sql
diff --git a/...platforms/rabbithole_referral_rewards.sql → ...platforms/rabbithole_referral_rewards.sql b/...platforms/rabbithole_referral_rewards.sql → ...platforms/rabbithole_referral_rewards.sql
diff --git a/...l/platforms/soundxyz_referral_rewards.sql → ...l/platforms/soundxyz_referral_rewards.sql b/...l/platforms/soundxyz_referral_rewards.sql → ...l/platforms/soundxyz_referral_rewards.sql
diff --git a/...latforms/soundxyz_v2_referral_rewards.sql → ...latforms/soundxyz_v2_referral_rewards.sql b/...latforms/soundxyz_v2_referral_rewards.sql → ...latforms/soundxyz_v2_referral_rewards.sql
diff --git a/...erral/platforms/zora_referral_rewards.sql → ...erral/platforms/zora_referral_rewards.sql b/...erral/platforms/zora_referral_rewards.sql → ...erral/platforms/zora_referral_rewards.sql
diff --git a/...s/_sector/social/enrich_social_trades.sql → ...os/sector/social/enrich_social_trades.sql b/...s/_sector/social/enrich_social_trades.sql → ...os/sector/social/enrich_social_trades.sql
diff --git a/...ector/transfers/erc20/transfers_erc20.sql → ...ector/transfers/erc20/transfers_erc20.sql b/...ector/transfers/erc20/transfers_erc20.sql → ...ector/transfers/erc20/transfers_erc20.sql
diff --git a/...ansfers/erc20/transfers_erc20_agg_day.sql → ...ansfers/erc20/transfers_erc20_agg_day.sql b/...ansfers/erc20/transfers_erc20_agg_day.sql → ...ansfers/erc20/transfers_erc20_agg_day.sql
diff --git a/...nsfers/erc20/transfers_erc20_agg_hour.sql → ...nsfers/erc20/transfers_erc20_agg_hour.sql b/...nsfers/erc20/transfers_erc20_agg_hour.sql → ...nsfers/erc20/transfers_erc20_agg_hour.sql
diff --git a/...ers/erc20/transfers_erc20_rolling_day.sql → ...ers/erc20/transfers_erc20_rolling_day.sql b/...ers/erc20/transfers_erc20_rolling_day.sql → ...ers/erc20/transfers_erc20_rolling_day.sql
diff --git a/...rs/erc20/transfers_erc20_rolling_hour.sql → ...rs/erc20/transfers_erc20_rolling_hour.sql b/...rs/erc20/transfers_erc20_rolling_hour.sql → ...rs/erc20/transfers_erc20_rolling_hour.sql
diff --git a/dbt_subprojects/daily_spellbook/models/_sector/alm/README.md b/dbt_subprojects/daily_spellbook/models/_sector/alm/README.md
@@ -74,7 +74,7 @@ Adoption of `arrakis_` for macro names.
 
 ### Macro Usage Example
 
-Below is an example of how to use the [`arrakis_compatible_v2_trades` macro](/macros/models/_sector/alm/arrakis_compatible_trades.sql) macro within our project. This macro is designed to standardize the trades data for projects compatible with Arrakis V2 on various blockchains.
+Below is an example of how to use the [`arrakis_compatible_v2_trades` macro](/dbt_macros/models/_sector/alm/arrakis_compatible_trades.sql) macro within our project. This macro is designed to standardize the trades data for projects compatible with Arrakis V2 on various blockchains.
 
 ```sql
 {{

diff --git a/...dels/_sector/gas/fees/gas_fees_schema.yml → ...lbook/models/_sector/gas/fees/_schema.yml b/...dels/_sector/gas/fees/gas_fees_schema.yml → ...lbook/models/_sector/gas/fees/_schema.yml
@@ -3,11 +3,11 @@ version: 2
 models:
   - name: gas_fees
     meta:
-      blockchain: ethereum, bnb, avalanche_c, optimism, arbitrum, zksync, zora, base, scroll
+      blockchain: ethereum, bnb, avalanche_c, optimism, arbitrum, zksync, zora, base, scroll, mantle
       sector: gas
-      contributors: soispoke
+      contributors: soispoke, ilemi, 0xRob, jeff-dude
     config:
-      tags: ['ethereum', 'bnb', 'avalanche_c', 'optimism', 'arbitrum','zksync','zora','scroll','gas', 'fees']
+      tags: ['ethereum', 'bnb', 'avalanche_c', 'optimism', 'arbitrum','zksync','zora','scroll','mantle','gas','fees']
     description: >
         Gas Fees across chains
     columns:

diff --git a/dbt_subprojects/daily_spellbook/models/_sector/gas/fees/ethereum/gas_ethereum_fees.sql b/dbt_subprojects/daily_spellbook/models/_sector/gas/fees/ethereum/gas_ethereum_fees.sql
@@ -54,14 +54,23 @@ SELECT
      blocks.difficulty,
      txns.type AS transaction_type
 FROM {{ source('ethereum', 'transactions') }} txns
-INNER JOIN {{ source('ethereum', 'blocks') }} blocks ON txns.block_number = blocks.number
-LEFT JOIN {{ source('ethereum', 'blobs_submissions') }} blob ON txns.hash = blob.tx_hash
-LEFT JOIN {{ source('prices', 'usd') }} p ON p.minute = date_trunc('minute', txns.block_time)
-     AND p.blockchain = 'ethereum'
-     AND p.symbol = 'WETH'
- {% if is_incremental() %}
-     AND {{ incremental_predicate('p.minute') }}
-WHERE {{ incremental_predicate('txns.block_time') }}
+INNER JOIN {{ source('ethereum', 'blocks') }} blocks
+    ON txns.block_number = blocks.number
+    {% if is_incremental() %}
     AND {{ incremental_predicate('blocks.time') }}
+    {% endif %}
+LEFT JOIN {{ source('ethereum', 'blobs_submissions') }} blob
+    ON txns.hash = blob.tx_hash
+    {% if is_incremental() %}
     AND {{ incremental_predicate('blob.block_time') }}
+    {% endif %}
+LEFT JOIN {{ source('prices', 'usd') }} p
+    ON p.minute = date_trunc('minute', txns.block_time)
+    AND p.blockchain = 'ethereum'
+    AND p.symbol = 'WETH'
+    {% if is_incremental() %}
+    AND {{ incremental_predicate('p.minute') }}
+    {% endif %}
+{% if is_incremental() %}
+WHERE {{ incremental_predicate('txns.block_time') }}
 {% endif %}
diff --git a/dbt_subprojects/daily_spellbook/models/_sector/gas/fees/gas_fees.sql b/dbt_subprojects/daily_spellbook/models/_sector/gas/fees/gas_fees.sql
@@ -1,25 +1,28 @@
 {{ config(
         schema = 'gas',
         alias = 'fees',
-        post_hook='{{ expose_spells(\'["ethereum","bnb","avalanche_c","optimism","arbitrum","zksync","zora","base","scroll"]\',
+        post_hook='{{ expose_spells(\'["ethereum","bnb","avalanche_c","optimism","arbitrum","zksync","zora","base","scroll","mantle"]\',
                                 "sector",
                                 "gas",
-                                \'["soispoke"]\') }}'
+                                \'["soispoke", "ilemi", "0xRob", "jeff-dude"]\') }}'
         )
 }}
 
 {% set gas_fees_models = [
-'gas_ethereum_fees',
-'gas_bnb_fees',
-'gas_avalanche_c_fees',
-'gas_optimism_fees',
-'gas_arbitrum_fees',
-'gas_zksync_fees',
-'gas_zora_fees',
-'gas_base_fees',
-'gas_scroll_fees'
+    'gas_ethereum_fees',
+    'gas_bnb_fees',
+    'gas_avalanche_c_fees',
+    'gas_optimism_fees',
+    'gas_arbitrum_fees',
+    'gas_zksync_fees',
+    'gas_zora_fees',
+    'gas_base_fees',
+    'gas_scroll_fees'
 ] %}
 
+--remove mantle for now:
+    --'gas_mantle_fees'
+
 SELECT *
 FROM (
     {% for gas_model in gas_fees_models %}

diff --git a/dbt_subprojects/daily_spellbook/models/_sector/gas/fees/mantle/_schema.yml b/dbt_subprojects/daily_spellbook/models/_sector/gas/fees/mantle/_schema.yml
@@ -0,0 +1,78 @@
+version: 2
+
+models:
+  - name: gas_mantle_fees
+    meta:
+      blockchain: mantle
+      sector: gas
+      contributors: soispoke, ilemi
+    config:
+      tags: ['mantle', 'gas', 'fees']
+    description: >
+        Gas Fees on mantle rollup Layer 2
+    tests:
+      - dbt_utils.unique_combination_of_columns:
+          combination_of_columns:
+            - block_number
+            - tx_hash
+    columns:
+      - &blockchain
+        name: blockchain
+        description: "Blockchain name"    
+      - &block_time
+        name: block_time
+        description: "Timestamp for block event time in UTC"
+      - &block_number
+        name: block_number
+        description: "Block number"
+      - &tx_hash
+        name: tx_hash
+        description: "Primary key of the transaction"
+      - &tx_sender
+        name: tx_sender
+        description: "Initiated the transaction"
+      - &tx_receiver
+        name: tx_receiver
+        description: "Received the transaction"
+      - &native_token_symbol
+        name: native_token_symbol
+        description: "Symbol of native token (ETH) for the Ethereum Blockchain"
+      - &tx_amount_native
+        name: tx_amount_native
+        description: "Amount of native tokens (ETH) transferred from sender to recipient"
+      - &tx_amount_usd
+        name: tx_amount_usd
+        description: "Amount of $USD transferred from sender to recipient"
+      - &tx_fee_native
+        name: tx_fee_native
+        description: "Total amount of native tokens (ETH) paid in gas fees"
+      - &tx_fee_usd
+        name: tx_fee_usd
+        description: "Total amount of $USD paid in gas fees"
+      - &burned_native
+        name: burned_native
+        description: "Total amount of native tokens (ETH) burned for this transaction, not applicable to L2 because transactions only indirectly burn gas on L1"
+      - &burned_usd
+        name: burned_usd
+        description: "Total amount of $USD burned for this transaction, not applicable to L2 because transactions only indirectly burn gas on L1"    
+      - &validator
+        name: validator
+        description: "Address of blockchain validator for this transaction within the block, also referred to as miner before the Merge when Ethereum's consensus mechanism was PoW"  
+      - &gas_price_gwei
+        name: gas_price_gwei
+        description: "Gas price (per gas unit) denoted in gwei"
+      - &gas_price_usd
+        name: gas_price_usd
+        description: "Gas price (per gas unit) denoted in $USD"
+      - &gas_used
+        name: gas_used
+        description: "Amount of L2 gas units consumed by the transaction"
+      - &gas_limit
+        name: gas_limit
+        description: "Maximum amount of gas units that can be consumed by the transaction on zksync L2"
+      - &gas_usage_percent
+        name: gas_usage_percent
+        description: "Percentage of Gas Used relative to the gas limit on zksync L2"
+      - &type
+        name: type
+        description: "Legacy (Pre Typed-Transactions), AccessList (EIP-2930), DynamicFee (EIP-1559), EIP-712, or Priority (L1 -> L2 Transactions)"
diff --git a/dbt_subprojects/daily_spellbook/models/_sector/gas/fees/mantle/gas_mantle_fees.sql b/dbt_subprojects/daily_spellbook/models/_sector/gas/fees/mantle/gas_mantle_fees.sql
@@ -0,0 +1,55 @@
+{{ config(
+    tags = ['prod_exclude'],
+    schema = 'gas_mantle',
+    alias = 'fees',
+    partition_by = ['block_month'],
+    materialized = 'incremental',
+    file_format = 'delta',
+    incremental_strategy='merge',
+    incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_time')],
+    unique_key = ['tx_hash','block_number']
+    )
+}}
+
+SELECT
+     'mantle' as blockchain,
+     date_trunc('day', block_time) AS block_date,
+     CAST(date_trunc('month', block_time) AS DATE) AS block_month,
+     block_number,
+     block_time,
+     txns.hash AS tx_hash,
+     txns."from" AS tx_sender,
+     txns.to AS tx_receiver,
+     'ETH' as native_token_symbol,
+     value/1e18 AS tx_amount_native,
+     value/1e18 * p.price AS tx_amount_usd,
+     (l1_fee/1e18 + ((txns.gas_used/1e18) * txns.gas_price)) as tx_fee_native,
+     (l1_fee/1e18 + ((txns.gas_used/1e18) * txns.gas_price)) * p.price AS tx_fee_usd,
+     cast(NULL as double) AS burned_native, -- Not applicable for L2s
+     cast(NULL as double) AS burned_usd, -- Not applicable for L2s
+     cast(NULL as VARBINARY) as validator, -- Not applicable for L2s
+     txns.gas_price/1e9 as gas_price_gwei,
+     txns.gas_price/1e18 * p.price as gas_price_usd,
+     txns.gas_used as gas_used,
+     txns.gas_limit as gas_limit,
+     CASE
+        WHEN txns.gas_limit = 0 THEN NULL
+        WHEN txns.gas_limit != 0 THEN txns.gas_used / txns.gas_limit * 100
+     END AS gas_usage_percent,
+     type as transaction_type
+FROM {{ source('mantle','transactions') }} txns
+INNER JOIN {{ source('mantle','blocks') }} blocks
+    ON blocks.number = txns.block_number
+    {% if is_incremental() %}
+    AND {{ incremental_predicate('blocks.time') }}
+    {% endif %}
+LEFT JOIN {{ source('prices','usd') }} p
+    ON p.minute = date_trunc('minute', txns.block_time)
+    AND p.blockchain = 'mantle'
+    AND p.symbol = 'WETH'
+    {% if is_incremental() %}
+    AND {{ incremental_predicate('p.minute') }}
+    {% endif %}
+{% if is_incremental() %}
+WHERE {{ incremental_predicate('txns.block_time') }}
+{% endif %}
diff --git a/dbt_subprojects/daily_spellbook/models/contracts/readme.md b/dbt_subprojects/daily_spellbook/models/contracts/readme.md
@@ -9,7 +9,7 @@
 
 # Contract Mapping
 
-Table models are defined in [`macros/models/_sector/contracts`](/macros/models/_sector/contracts)
+Table models are defined in [`macros/models/_sector/contracts`](../macros/models/_sector/contracts)
 
 This repository contains all the source code for `contracts.contract_mapping` that you can use to join contract addresses on each chain to pull our mapped project names in the `contract_project` field.
 

diff --git a/dbt_subprojects/daily_spellbook/models/evms/evms_info.sql b/dbt_subprojects/daily_spellbook/models/evms/evms_info.sql
@@ -41,7 +41,7 @@ FROM (
         , (1088, 'metis_andromeda', 'Metis Andromeda', NULL, NULL, NULL, NULL, 'https://andromeda-explorer.metis.io/', timestamp '2021-11-18 22:19', 'Optimistic Virtual Machine', 'Ethereum', 'Ethereum')
         , (5000, 'mantle', 'Mantle', 'Layer 2', 'Optimistic Rollup', 'MNT', NULL, 'https://explorer.mantle.xyz/', timestamp '2023-07-02 18:21', 'Optimistic Virtual Machine', 'Ethereum', 'Ethereum')
         , (59144, 'linea', 'Linea', 'Layer 2', 'ZK Rollup', 'ETH', 0xe5d7c2a44ffddf6b295a15c148167daaaf5cf34f, 'https://lineascan.build/', timestamp '2023-07-06 13:15', NULL, 'Ethereum Blobs', 'Ethereum')
-        , (42170, 'arbitrum_nova', 'Arbitrum Nova', 'Layer 2', 'Optimistic Rollup', 'ETH', NULL, 'https://nova-explorer.arbitrum.io/', timestamp '2022-06-25 04:01', 'Arbitrum', 'Ethereum', 'Ethereum')
+        , (42170, 'nova', 'Arbitrum Nova', 'Layer 2', 'Optimistic Rollup', 'ETH', NULL, 'https://nova-explorer.arbitrum.io/', timestamp '2022-06-25 04:01', 'Arbitrum', 'Ethereum', 'Ethereum')
         , (288, 'boba', 'Boba Network', 'Layer 2', 'Optimistic Rollup', 'ETH', NULL, 'https://bobascan.com/', timestamp '2021-10-28 05:03', 'Optimistic Virtual Machine', 'Ethereum', 'Ethereum')
         , (7700, 'canto', 'Canto', 'Layer 2', NULL, 'ETH', NULL, 'https://evm.explorer.canto.io/', timestamp '2022-07-26 19:27', NULL, 'Ethereum', 'Ethereum')
         , (420, 'optimism_goerli', 'Optimism Goerli', 'Testnet', 'Optimistic Rollup', 'GTH', 0x4200000000000000000000000000000000000006, 'https://optimism-goerli.blockscout.com/', timestamp '2022-06-09 16:55', 'OP Stack', 'Goerli', 'Goerli')

diff --git a/dbt_subprojects/dex/dbt_project.yml b/dbt_subprojects/dex/dbt_project.yml
@@ -22,7 +22,7 @@ vars:
 model-paths: ["models", "../../sources"]
 test-paths: ["tests"]
 seed-paths: ["seeds"]
-macro-paths: ["macros", "../../macros"]
+macro-paths: ["macros", "../../dbt_macros"]
 
 target-path: "target" # directory which will store compiled SQL files
 clean-targets: # directories to be removed by `dbt clean`

diff --git a/macros/models/_sector/add_amount_usd.sql → ...subprojects/dex/macros/add_amount_usd.sql b/macros/models/_sector/add_amount_usd.sql → ...subprojects/dex/macros/add_amount_usd.sql
diff --git a/macros/public/bytea2numeric.sql → .../models/_project/zeroex/bytea2numeric.sql b/macros/public/bytea2numeric.sql → .../models/_project/zeroex/bytea2numeric.sql
diff --git a/dbt_subprojects/dex/models/_projects/zeroex/arbitrum/zeroex_arbitrum_settler_trades.sql b/dbt_subprojects/dex/models/_projects/zeroex/arbitrum/zeroex_arbitrum_settler_trades.sql
@@ -288,6 +288,7 @@ results_usd AS (
             THEN varbinary_substring(taker_indicator_string, 18,20) ELSE taker END AS taker,
         maker,
         tag,
+        zid,
         tx_hash,
         tx_from,
         tx_to,

diff --git a/...subprojects/dex/models/_projects/zeroex/avalanche_c/zeroex_avalanche_c_settler_trades.sql b/...subprojects/dex/models/_projects/zeroex/avalanche_c/zeroex_avalanche_c_settler_trades.sql
@@ -288,6 +288,7 @@ results_usd AS (
             THEN varbinary_substring(taker_indicator_string, 18,20) ELSE taker END AS taker,
         maker,
         tag,
+        zid,
         tx_hash,
         tx_from,
         tx_to,

diff --git a/dbt_subprojects/dex/models/_projects/zeroex/base/zeroex_base_settler_trades.sql b/dbt_subprojects/dex/models/_projects/zeroex/base/zeroex_base_settler_trades.sql
@@ -288,6 +288,7 @@ results_usd AS (
             THEN varbinary_substring(taker_indicator_string, 18,20) ELSE taker END AS taker,
         maker,
         tag,
+        zid,
         tx_hash,
         tx_from,
         tx_to,

diff --git a/dbt_subprojects/dex/models/_projects/zeroex/bnb/zeroex_bnb_settler_trades.sql b/dbt_subprojects/dex/models/_projects/zeroex/bnb/zeroex_bnb_settler_trades.sql
@@ -290,6 +290,7 @@ results_usd AS (
             THEN varbinary_substring(taker_indicator_string, 18,20) ELSE taker END AS taker,
         maker,
         tag,
+        zid,
         tx_hash,
         tx_from,
         tx_to,

diff --git a/dbt_subprojects/dex/models/_projects/zeroex/ethereum/zeroex_ethereum_settler_trades.sql b/dbt_subprojects/dex/models/_projects/zeroex/ethereum/zeroex_ethereum_settler_trades.sql
@@ -290,6 +290,7 @@ results_usd AS (
             THEN varbinary_substring(taker_indicator_string, 18,20) ELSE taker END AS taker,
         maker,
         tag,
+        zid,
         tx_hash,
         tx_from,
         tx_to,

diff --git a/dbt_subprojects/dex/models/_projects/zeroex/optimism/zeroex_optimism_settler_trades.sql b/dbt_subprojects/dex/models/_projects/zeroex/optimism/zeroex_optimism_settler_trades.sql
@@ -290,6 +290,7 @@ results_usd AS (
             THEN varbinary_substring(taker_indicator_string, 18,20) ELSE taker END AS taker,
         maker,
         tag,
+        zid,
         tx_hash,
         tx_from,
         tx_to,

diff --git a/dbt_subprojects/dex/models/_projects/zeroex/polygon/zeroex_polygon_settler_trades.sql b/dbt_subprojects/dex/models/_projects/zeroex/polygon/zeroex_polygon_settler_trades.sql
@@ -290,6 +290,7 @@ results_usd AS (
             THEN varbinary_substring(taker_indicator_string, 18,20) ELSE taker END AS taker,
         maker,
         tag,
+        zid,
         tx_hash,
         tx_from,
         tx_to,

diff --git a/dbt_subprojects/dex/models/_projects/zeroex/zeroex_api_fills_deduped.sql b/dbt_subprojects/dex/models/_projects/zeroex/zeroex_api_fills_deduped.sql
@@ -19,7 +19,10 @@
   ,ref('zeroex_optimism_api_fills_deduped')
   ,ref('zeroex_polygon_api_fills_deduped')
   ,ref('zeroex_bnb_api_fills_deduped')
-  ,ref('zeroex_ethereum_settler_trades')
+] %}
+
+{% set settler_models = [  
+  ref('zeroex_ethereum_settler_trades')
   ,ref('zeroex_base_settler_trades')
   ,ref('zeroex_polygon_settler_trades')
   ,ref('zeroex_optimism_settler_trades')
@@ -56,6 +59,46 @@ FROM (
       ,tx_to
       ,trace_address
       ,evt_index
+      ,affiliate_address
+      ,null as zid 
+    FROM {{ model }}
+    {% if not loop.last %}
+    UNION ALL
+    {% endif %}
+    {% endfor %}
+)
+
+UNION ALL 
+
+SELECT *
+FROM (
+    {% for model in settler_models %}
+    SELECT
+      blockchain
+      ,version
+      ,block_month
+      ,block_date
+      ,block_time
+      ,maker_symbol
+      ,taker_symbol
+      ,token_pair
+      ,maker_token_amount
+      ,taker_token_amount
+      ,maker_token_amount_raw
+      ,taker_token_amount_raw
+      ,volume_usd
+      ,maker_token
+      ,taker_token
+      ,taker
+      ,maker
+      ,contract_address
+      ,tx_hash
+      ,tx_from
+      ,tx_to
+      ,trace_address
+      ,evt_index
+      ,tag as affiliate_address 
+      ,zid
     FROM {{ model }}
     {% if not loop.last %}
     UNION ALL
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,7 +74,7 @@ Adoption of `arrakis_` for macro names. @@
     ### Macro Usage Example
-    Below is an example of how to use the [`arrakis_compatible_v2_trades` macro](/macros/models/_sector/alm/arrakis_compatible_trades.sql) macro within our project. This macro is designed to standardize the trades data for projects compatible with Arrakis V2 on various blockchains.
+    Below is an example of how to use the [`arrakis_compatible_v2_trades` macro](/dbt_macros/models/_sector/alm/arrakis_compatible_trades.sql) macro within our project. This macro is designed to standardize the trades data for projects compatible with Arrakis V2 on various blockchains.
     ```sql
     {{
@@ Expand Down @@