diff --git a/macros/metrics/get_p2p_metrics.sql b/macros/metrics/get_p2p_metrics.sql index 7503514a..61fc2f1b 100644 --- a/macros/metrics/get_p2p_metrics.sql +++ b/macros/metrics/get_p2p_metrics.sql @@ -3,6 +3,7 @@ date , p2p_native_transfer_volume , p2p_token_transfer_volume + , p2p_stablecoin_transfer_volume , p2p_transfer_volume from {{ ref("fact_" ~ chain ~ "_p2p_transfer_volume") }} {% endmacro %} diff --git a/models/projects/arbitrum/core/ez_arbitrum_metrics.sql b/models/projects/arbitrum/core/ez_arbitrum_metrics.sql index 0a00deec..3a692d6b 100644 --- a/models/projects/arbitrum/core/ez_arbitrum_metrics.sql +++ b/models/projects/arbitrum/core/ez_arbitrum_metrics.sql @@ -67,12 +67,12 @@ select p2p_stablecoin_txns, p2p_stablecoin_dau, p2p_stablecoin_mau, - p2p_stablecoin_transfer_volume, + stablecoin_data.p2p_stablecoin_transfer_volume, nft_trading_volume, p2p_native_transfer_volume, p2p_token_transfer_volume, p2p_transfer_volume, - coalesce(artemis_stablecoin_transfer_volume, 0) - coalesce(p2p_stablecoin_transfer_volume, 0) as non_p2p_stablecoin_transfer_volume, + coalesce(artemis_stablecoin_transfer_volume, 0) - coalesce(stablecoin_data.p2p_stablecoin_transfer_volume, 0) as non_p2p_stablecoin_transfer_volume, coalesce(dex_volumes, 0) + coalesce(nft_trading_volume, 0) + coalesce(p2p_transfer_volume, 0) as settlement_volume from fundamental_data left join price_data on fundamental_data.date = price_data.date diff --git a/models/projects/avalanche/core/ez_avalanche_metrics.sql b/models/projects/avalanche/core/ez_avalanche_metrics.sql index ace2c12c..9910b11c 100644 --- a/models/projects/avalanche/core/ez_avalanche_metrics.sql +++ b/models/projects/avalanche/core/ez_avalanche_metrics.sql @@ -68,7 +68,7 @@ select p2p_stablecoin_txns, p2p_stablecoin_dau, p2p_stablecoin_mau, - p2p_stablecoin_transfer_volume, + stablecoin_data.p2p_stablecoin_transfer_volume, total_staked_native, total_staked_usd, issuance, @@ -76,7 +76,7 @@ select p2p_native_transfer_volume, p2p_token_transfer_volume, p2p_transfer_volume, - coalesce(artemis_stablecoin_transfer_volume, 0) - coalesce(p2p_stablecoin_transfer_volume, 0) as non_p2p_stablecoin_transfer_volume, + coalesce(artemis_stablecoin_transfer_volume, 0) - coalesce(stablecoin_data.p2p_stablecoin_transfer_volume, 0) as non_p2p_stablecoin_transfer_volume, coalesce(dex_volumes, 0) + coalesce(nft_trading_volume, 0) + coalesce(p2p_transfer_volume, 0) as settlement_volume from staking_data left join fundamental_data on staking_data.date = fundamental_data.date diff --git a/models/projects/base/core/ez_base_metrics.sql b/models/projects/base/core/ez_base_metrics.sql index 58afa2f8..46d68b63 100644 --- a/models/projects/base/core/ez_base_metrics.sql +++ b/models/projects/base/core/ez_base_metrics.sql @@ -58,12 +58,12 @@ select p2p_stablecoin_txns, p2p_stablecoin_dau, p2p_stablecoin_mau, - p2p_stablecoin_transfer_volume, + stablecoin_data.p2p_stablecoin_transfer_volume, nft_trading_volume, p2p_native_transfer_volume, p2p_token_transfer_volume, p2p_transfer_volume, - coalesce(artemis_stablecoin_transfer_volume, 0) - coalesce(p2p_stablecoin_transfer_volume, 0) as non_p2p_stablecoin_transfer_volume, + coalesce(artemis_stablecoin_transfer_volume, 0) - coalesce(stablecoin_data.p2p_stablecoin_transfer_volume, 0) as non_p2p_stablecoin_transfer_volume, coalesce(dex_volumes, 0) + coalesce(nft_trading_volume, 0) + coalesce(p2p_transfer_volume, 0) as settlement_volume from fundamental_data left join defillama_data on fundamental_data.date = defillama_data.date diff --git a/models/projects/ethereum/core/ez_ethereum_metrics.sql b/models/projects/ethereum/core/ez_ethereum_metrics.sql index b94ef7fd..44f575c9 100644 --- a/models/projects/ethereum/core/ez_ethereum_metrics.sql +++ b/models/projects/ethereum/core/ez_ethereum_metrics.sql @@ -85,7 +85,7 @@ select p2p_stablecoin_txns, p2p_stablecoin_dau, p2p_stablecoin_mau, - p2p_stablecoin_transfer_volume, + stablecoin_data.p2p_stablecoin_transfer_volume, censored_blocks, semi_censored_blocks, @@ -103,7 +103,7 @@ select p2p_native_transfer_volume, p2p_token_transfer_volume, p2p_transfer_volume, - coalesce(artemis_stablecoin_transfer_volume, 0) - coalesce(p2p_stablecoin_transfer_volume, 0) as non_p2p_stablecoin_transfer_volume, + coalesce(artemis_stablecoin_transfer_volume, 0) - coalesce(stablecoin_data.p2p_stablecoin_transfer_volume, 0) as non_p2p_stablecoin_transfer_volume, coalesce(dex_volumes, 0) + coalesce(nft_trading_volume, 0) + coalesce(p2p_transfer_volume, 0) as settlement_volume, blob_fees_native, blob_fees, diff --git a/models/projects/optimism/core/ez_optimism_metrics.sql b/models/projects/optimism/core/ez_optimism_metrics.sql index c63c081b..e4357147 100644 --- a/models/projects/optimism/core/ez_optimism_metrics.sql +++ b/models/projects/optimism/core/ez_optimism_metrics.sql @@ -76,12 +76,12 @@ select p2p_stablecoin_txns, p2p_stablecoin_dau, p2p_stablecoin_mau, - p2p_stablecoin_transfer_volume, + stablecoin_data.p2p_stablecoin_transfer_volume, nft_trading_volume, p2p_native_transfer_volume, p2p_token_transfer_volume, p2p_transfer_volume, - coalesce(artemis_stablecoin_transfer_volume, 0) - coalesce(p2p_stablecoin_transfer_volume, 0) as non_p2p_stablecoin_transfer_volume, + coalesce(artemis_stablecoin_transfer_volume, 0) - coalesce(stablecoin_data.p2p_stablecoin_transfer_volume, 0) as non_p2p_stablecoin_transfer_volume, coalesce(dex_volumes, 0) + coalesce(nft_trading_volume, 0) + coalesce(p2p_transfer_volume, 0) as settlement_volume from fundamental_data left join price_data on fundamental_data.date = price_data.date diff --git a/models/projects/polygon/core/ez_polygon_metrics.sql b/models/projects/polygon/core/ez_polygon_metrics.sql index f1605c4f..9aa19947 100644 --- a/models/projects/polygon/core/ez_polygon_metrics.sql +++ b/models/projects/polygon/core/ez_polygon_metrics.sql @@ -77,12 +77,12 @@ select p2p_stablecoin_txns, p2p_stablecoin_dau, p2p_stablecoin_mau, - p2p_stablecoin_transfer_volume, + stablecoin_data.p2p_stablecoin_transfer_volume, nft_trading_volume, p2p_native_transfer_volume, p2p_token_transfer_volume, p2p_transfer_volume, - coalesce(artemis_stablecoin_transfer_volume, 0) - coalesce(p2p_stablecoin_transfer_volume, 0) as non_p2p_stablecoin_transfer_volume, + coalesce(artemis_stablecoin_transfer_volume, 0) - coalesce(stablecoin_data.p2p_stablecoin_transfer_volume, 0) as non_p2p_stablecoin_transfer_volume, coalesce(dex_volumes, 0) + coalesce(nft_trading_volume, 0) + coalesce(p2p_transfer_volume, 0) as settlement_volume from fundamental_data left join price_data on fundamental_data.date = price_data.date diff --git a/models/projects/solana/core/ez_solana_metrics.sql b/models/projects/solana/core/ez_solana_metrics.sql index 2afe60d6..2db463ba 100644 --- a/models/projects/solana/core/ez_solana_metrics.sql +++ b/models/projects/solana/core/ez_solana_metrics.sql @@ -175,7 +175,7 @@ select p2p_stablecoin_txns, p2p_stablecoin_dau, p2p_stablecoin_mau, - p2p_stablecoin_transfer_volume, + stablecoin_data.p2p_stablecoin_transfer_volume, total_staked_native, total_staked_usd, issuance, diff --git a/models/projects/tron/core/ez_tron_metrics.sql b/models/projects/tron/core/ez_tron_metrics.sql index 1e4c2e4a..2b66268d 100644 --- a/models/projects/tron/core/ez_tron_metrics.sql +++ b/models/projects/tron/core/ez_tron_metrics.sql @@ -57,11 +57,11 @@ select p2p_stablecoin_txns, p2p_stablecoin_dau, p2p_stablecoin_mau, - p2p_stablecoin_transfer_volume, + stablecoin_data.p2p_stablecoin_transfer_volume, p2p_native_transfer_volume, p2p_token_transfer_volume, p2p_transfer_volume, - coalesce(artemis_stablecoin_transfer_volume, 0) - coalesce(p2p_stablecoin_transfer_volume, 0) as non_p2p_stablecoin_transfer_volume, + coalesce(artemis_stablecoin_transfer_volume, 0) - coalesce(stablecoin_data.p2p_stablecoin_transfer_volume, 0) as non_p2p_stablecoin_transfer_volume, coalesce(dex_volumes, 0) + coalesce(p2p_transfer_volume, 0) as settlement_volume from fundamental_data left join price_data on fundamental_data.date = price_data.date diff --git a/models/staging/tron/fact_tron_p2p_token_transfers.sql b/models/staging/tron/fact_tron_p2p_token_transfers.sql index 8af992c6..440d3040 100644 --- a/models/staging/tron/fact_tron_p2p_token_transfers.sql +++ b/models/staging/tron/fact_tron_p2p_token_transfers.sql @@ -4,4 +4,4 @@ ) }} -{{ filter_p2p_token_transfers("tron", blacklist=('TAFjULxiVgT4qWk6UZwjqwZXTSaGaqnVp4', 'TSSMHYeV2uE9qYH95DqyoCuNCzEL1NvU3S')) }} \ No newline at end of file +{{ filter_p2p_token_transfers("tron", blacklist=('TAFjULxiVgT4qWk6UZwjqwZXTSaGaqnVp4', 'TSSMHYeV2uE9qYH95DqyoCuNCzEL1NvU3S', 'TR95WcjR78Y4puyv8BkbFuxaf4WcvmmPpd')) }} \ No newline at end of file