duneanalytics · jeff-dude · Aug 6, 2024 · Jul 25, 2024 · Jul 29, 2024 · Jul 29, 2024
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/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/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/trades/readme.md b/dbt_subprojects/dex/models/trades/readme.md
@@ -74,7 +74,7 @@ Adoption of the `base_` prefix for table aliases and `uniswap_` for macro names.
 
 ### Macro Usage Example
 
-One of the key components in the dex.trades redesign is the utilization of dbt macros to standardize and simplify the process of data transformation across different blockchains and projects. Below is an example of how to use the [`uniswap_compatible_v2_trades` macro](/macros/models/_sector/dex/uniswap_compatible_trades.sql) macro within our project. This macro is designed to standardize the trades data for projects compatible with Uniswap V2 on various blockchains.
+One of the key components in the dex.trades redesign is the utilization of dbt macros to standardize and simplify the process of data transformation across different blockchains and projects. Below is an example of how to use the [`uniswap_compatible_v2_trades` macro](/dbt_subprojects/dex/macros/models/_project/uniswap_compatible_trades.sql) macro within our project. This macro is designed to standardize the trades data for projects compatible with Uniswap V2 on various blockchains.
 
 ```sql
 {{

diff --git a/dbt_subprojects/hourly_spellbook/dbt_project.yml b/dbt_subprojects/hourly_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/..._abstraction/erc4337_account_deployed.sql → ..._abstraction/erc4337_account_deployed.sql b/..._abstraction/erc4337_account_deployed.sql → ..._abstraction/erc4337_account_deployed.sql
diff --git a/...nt_abstraction/erc4337_userops_basics.sql → ...nt_abstraction/erc4337_userops_basics.sql b/...nt_abstraction/erc4337_userops_basics.sql → ...nt_abstraction/erc4337_userops_basics.sql
diff --git a/...straction/erc4337_userops_enrichments.sql → ...straction/erc4337_userops_enrichments.sql b/...straction/erc4337_userops_enrichments.sql → ...straction/erc4337_userops_enrichments.sql
diff --git a/macros/models/_sector/cex/cex_evms.sql → ..._spellbook/macros/sector/cex/cex_evms.sql b/macros/models/_sector/cex/cex_evms.sql → ..._spellbook/macros/sector/cex/cex_evms.sql
diff --git a/macros/models/_sector/cex/cex_flows.sql → ...spellbook/macros/sector/cex/cex_flows.sql b/macros/models/_sector/cex/cex_flows.sql → ...spellbook/macros/sector/cex/cex_flows.sql
diff --git a/...ending/lending_aave_compatible_borrow.sql → ...ending/lending_aave_compatible_borrow.sql b/...ending/lending_aave_compatible_borrow.sql → ...ending/lending_aave_compatible_borrow.sql
diff --git a/...ng/lending_aave_compatible_flashloans.sql → ...ng/lending_aave_compatible_flashloans.sql b/...ng/lending_aave_compatible_flashloans.sql → ...ng/lending_aave_compatible_flashloans.sql
diff --git a/...ending/lending_aave_compatible_supply.sql → ...ending/lending_aave_compatible_supply.sql b/...ending/lending_aave_compatible_supply.sql → ...ending/lending_aave_compatible_supply.sql
diff --git a/...ng/lending_compound_compatible_borrow.sql → ...ng/lending_compound_compatible_borrow.sql b/...ng/lending_compound_compatible_borrow.sql → ...ng/lending_compound_compatible_borrow.sql
diff --git a/...ng/lending_compound_compatible_supply.sql → ...ng/lending_compound_compatible_supply.sql b/...ng/lending_compound_compatible_supply.sql → ...ng/lending_compound_compatible_supply.sql
diff --git a/..._sector/lending/lending_enrich_borrow.sql → .../sector/lending/lending_enrich_borrow.sql b/..._sector/lending/lending_enrich_borrow.sql → .../sector/lending/lending_enrich_borrow.sql
diff --git a/...tor/lending/lending_enrich_flashloans.sql → ...tor/lending/lending_enrich_flashloans.sql b/...tor/lending/lending_enrich_flashloans.sql → ...tor/lending/lending_enrich_flashloans.sql
diff --git a/..._sector/lending/lending_enrich_supply.sql → .../sector/lending/lending_enrich_supply.sql b/..._sector/lending/lending_enrich_supply.sql → .../sector/lending/lending_enrich_supply.sql
diff --git a/dbt_subprojects/nft/dbt_project.yml b/dbt_subprojects/nft/dbt_project.yml
@@ -25,7 +25,7 @@ model-paths: ["models", "../../sources"]
 # ../tests/* should be added to a separate shared folder
 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/...odels/_project/seaport/seaport_traces.sql → ...s/nft/macros/platforms/seaport_traces.sql b/...odels/_project/seaport/seaport_traces.sql → ...s/nft/macros/platforms/seaport_traces.sql
diff --git a/dbt_subprojects/solana/dbt_project.yml b/dbt_subprojects/solana/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/dbt_subprojects/tokens/dbt_project.yml b/dbt_subprojects/tokens/dbt_project.yml
@@ -24,7 +24,7 @@ vars:
 model-paths: ["models", "../../sources"]
 # test-paths: ["tests"]
 # seed-paths: ["seeds"]
-macro-paths: ["../../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/.../models/_sector/tokens/balances_daily.sql → ...tokens/macros/balances/balances_daily.sql b/.../models/_sector/tokens/balances_daily.sql → ...tokens/macros/balances/balances_daily.sql
diff --git a/...els/_sector/tokens/balances_daily_agg.sql → ...ns/macros/balances/balances_daily_agg.sql b/...els/_sector/tokens/balances_daily_agg.sql → ...ns/macros/balances/balances_daily_agg.sql
diff --git a/...models/_sector/tokens/balances_enrich.sql → ...okens/macros/balances/balances_enrich.sql b/...models/_sector/tokens/balances_enrich.sql → ...okens/macros/balances/balances_enrich.sql
diff --git a/...ls/_sector/tokens/balances_fix_schema.sql → ...s/macros/balances/balances_fix_schema.sql b/...ls/_sector/tokens/balances_fix_schema.sql → ...s/macros/balances/balances_fix_schema.sql
diff --git a/...models/_sector/tokens/create_balances.sql → ...okens/macros/balances/create_balances.sql b/...models/_sector/tokens/create_balances.sql → ...okens/macros/balances/create_balances.sql
diff --git a/.../models/_sector/tokens/transfers_base.sql → ...okens/macros/transfers/transfers_base.sql b/.../models/_sector/tokens/transfers_base.sql → ...okens/macros/transfers/transfers_base.sql
diff --git a/...r/tokens/transfers_base_wrapped_token.sql → ...ransfers/transfers_base_wrapped_token.sql b/...r/tokens/transfers_base_wrapped_token.sql → ...ransfers/transfers_base_wrapped_token.sql
diff --git a/...odels/_sector/tokens/transfers_enrich.sql → ...ens/macros/transfers/transfers_enrich.sql b/...odels/_sector/tokens/transfers_enrich.sql → ...ens/macros/transfers/transfers_enrich.sql
diff --git a/docs/macros/macro_overview.md b/docs/macros/macro_overview.md
@@ -4,19 +4,20 @@ There are various use cases for macros in DBT, but the main focus for wizards in
 
 ## Directory Path for Macros
 
-- Path: `spellbook/macros/models/`
-- Within this path, there are two main subdirectories:
+Path: `dbt_subprojects/<project>/macros/` <br>
+Within this path, there are two main subdirectories, replicating the structure in `models/`:
 
-  1. **\_project**
+  1. **\project**
      - For standalone project spell lineages.
-  2. **\_sector**
+  2. **\sector**
      - For sector-level spell lineages, e.g., `dex.trades` lineage.
 
-  - **Note**: The ‘\_’ prefix in directory paths is used to keep them at the top & easily accessible, reserved for the most frequently used directories.
+Some exceptions to the project specific path are listed in [other macro use cases](#other-macro-use-cases)
 
+### My Multi Word Header
 ## Design Principles for Macros
 
-Following [this](/macros/models/_sector/dex/uniswap_compatible_trades.sql) example, where uniswap compatible projects code lives, the key design principles include:
+Following [this](/dbt_subprojects/dex/macros/models/_project/uniswap_compatible_trades.sql) example, where uniswap compatible projects code lives, the key design principles include:
 
 - **Assign Arguments**
   - Define arguments expected to be passed in via each model that calls the macro.
@@ -27,7 +28,7 @@ Following [this](/macros/models/_sector/dex/uniswap_compatible_trades.sql) examp
 - **Multiple Macros in One File**
   - It's common to have multiple macros within a single file, such as various versions of the uniswap contract code. Group similar macros together logically.
 
-Within models, such as uniswap v2, call macro code with [this approach](/models/_sector/dex/trades/ethereum/platforms/uniswap_v2_ethereum_base_trades.sql).
+Within models, such as uniswap v2, call macro code with [this approach](/dbt_subprojects/dex/target/compiled/dex/models/trades/ethereum/platforms/uniswap_v2_ethereum_base_trades.sql).
 
 ## When to Use a Macro
 
@@ -46,13 +47,13 @@ Within models, such as uniswap v2, call macro code with [this approach](/models/
 
 ## Other Macro Use Cases
 
-1. **Generic Test Queries**
+1. **Generic Test Queries** (`dbt_macros/generic-tests`)
    - Seed tests within model schema files call a seed macro containing the test query.
-2. **Universal Use Cases in Spellbook**
+2. **Universal Use Cases in Spellbook** (`dbt_macros/shared`)
    - incremental predicates, containing the incremental filter which can be controlled in one location and called across multiple models.
    - incremental days forward, which can chunk data from the source into smaller time frames to help bypass performance limitations.
-   - Macros with lists for for-loops in models, like [`all_evm_chains`](/macros/public/all_evm_chains.sql).
-3. **Dune Team Specific Cases**
+   - Macros with lists for for-loops in models, like [`all_evm_chains`](/dbt_macros/shared/all_evm_chains.sql).
+3. **Dune Team Specific Cases** (`dbt_macros/dune`)
    - Overriding dbt-trino core macros for Spellbook-specific scenarios.
    - Backend database specific code in pre or post hooks for spell optimization.
 

diff --git a/docs/models/model_config_block.md b/docs/models/model_config_block.md
@@ -35,7 +35,7 @@ Each model within Spellbook contains a config block with various properties. Dep
 
 4. **incremental_predicates**
    - Filters the target to the same date range as the source, for improved performance & less data in memory.
-   - Universal incremental macro can be found [here](/macros/incremental_predicate.sql).
+   - Universal incremental macro can be found [here](/dbt_macros/dune/incremental_predicate.sql).
    - **Note**: This is a newer addition to Spellbook. Please add this property for new incremental spells.
 
 ## Optional Configs for Materialized as Table / Incremental

diff --git a/docs/models/model_overview.md b/docs/models/model_overview.md
@@ -68,7 +68,7 @@ Required for DBT to understand the models within the project. Key areas within s
     - If is incremental checks, done via jinja syntax
       - This needs to be applied on all sources which have events / transactions / any time-series data set
       - If no, full refresh and/or initial historical load on incremental model and bypass incremental filter, but apply filter for earliest date of activity for particular model
-      - If yes, apply [incremental predicate macro](/macros/incremental_predicate.sql) filter [on the source](/macros/models/_sector/dex/uniswap_compatible_trades.sql#L29-L32), to match incremental predicate filter on target in the config block
+      - If yes, apply [incremental predicate macro](/dbt_macros/dune/incremental_predicate.sql) filter [on the source](/dbt_subprojects/dex/macros/models/_project/uniswap_compatible_trades.sql#L29-L32), to match incremental predicate filter on target in the config block
   - Optional use cases:
     - Lookup to existing spell, within itself, using the {{ this }} syntax
 

diff --git a/docs/seeds/seed_overview.md b/docs/seeds/seed_overview.md
@@ -14,7 +14,7 @@ Seeds will be required in these sector-level spell additions to ensure proper le
 3. Within the [model schema file](/models/_sector/dex/trades/arbitrum/_schema.yml#L20-L23), call the [generic seed test](/tests/generic/check_dex_base_trades_seed.sql) with parameters necessary:
    - Seed file name.
    - Filter(s) for project versions, if the spell is split into versions per project.
-4. Ultimately, following the above steps, the test query built and executed against seed files lives in the generic seed macro [here](/macros/generic-tests/check_seed_macro.sql).
+4. Ultimately, following the above steps, the test query built and executed against seed files lives in the generic seed macro [here](/dbt_macros/generic-tests/check_seed_macro.sql).
 
 ## How Do I Track Seed Tests Running During Development?
 

diff --git a/macros/public/public_macros_schema.yml b/macros/public/public_macros_schema.yml
diff --git a/scripts/alter_table_locations.py b/scripts/alter_table_locations.py
@@ -72,7 +72,7 @@ def get_rename_command(self, table_dict):
         return rename_command
 
     def generate_macro_file(self, tables_dict):
-        f = open("../macros/dune/alter_table_locations.sql", 'w')
+        f = open("../dbt_macros/dune/alter_table_locations.sql", 'w')
         f.write("{% macro alter_table_locations() %}")
         for table, table_dict in tables_dict.items():
             # alter_command = self.get_alter_command(table_dict)
-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 @@