From e10df9117b74b0b2f0bdb9f997720dedde97fd20 Mon Sep 17 00:00:00 2001 From: drethereum <71602799+drethereum@users.noreply.github.com> Date: Wed, 22 Mar 2023 12:25:20 -0600 Subject: [PATCH] AN-2945/bridge-names (#24) --- models/defillama/bronze/bronze__defillama_bridges.sql | 1 + models/defillama/bronze/bronze__defillama_bridges.yml | 3 ++- models/defillama/bronze/bronze__defillama_chains.yml | 2 +- models/defillama/bronze/bronze__defillama_dexes.yml | 2 +- models/defillama/bronze/bronze__defillama_protocols.yml | 2 +- models/defillama/bronze/bronze__defillama_stablecoins.yml | 2 +- models/defillama/gold/defillama__dim_bridges.sql | 1 + models/defillama/gold/defillama__dim_bridges.yml | 4 +++- models/defillama/gold/defillama__fact_bridge_volume.sql | 1 + models/defillama/gold/defillama__fact_bridge_volume.yml | 2 ++ models/defillama/silver/silver__defillama_bridge_volume.sql | 5 ++++- 11 files changed, 18 insertions(+), 7 deletions(-) diff --git a/models/defillama/bronze/bronze__defillama_bridges.sql b/models/defillama/bronze/bronze__defillama_bridges.sql index 3e03475..9b76fb4 100644 --- a/models/defillama/bronze/bronze__defillama_bridges.sql +++ b/models/defillama/bronze/bronze__defillama_bridges.sql @@ -16,6 +16,7 @@ SELECT SELECT VALUE:id::STRING AS bridge_id, VALUE:name::STRING AS bridge, + VALUE:displayName::STRING AS bridge_name, VALUE:chains AS chains, CASE WHEN VALUE:destinationChain::STRING ilike 'false' OR VALUE:destinationChain::STRING = '-' THEN NULL diff --git a/models/defillama/bronze/bronze__defillama_bridges.yml b/models/defillama/bronze/bronze__defillama_bridges.yml index b33b49e..1b11b4b 100644 --- a/models/defillama/bronze/bronze__defillama_bridges.yml +++ b/models/defillama/bronze/bronze__defillama_bridges.yml @@ -1,6 +1,6 @@ version: 2 models: - - name: silver__defillama_bridges + - name: bronze__defillama_bridges tests: - dbt_utils.unique_combination_of_columns: combination_of_columns: @@ -13,6 +13,7 @@ models: - name: BRIDGE tests: - not_null + - name: BRIDGE_NAME - name: CHAINS - name: DESTINATION_CHAIN - name: _INSERTED_TIMESTAMP diff --git a/models/defillama/bronze/bronze__defillama_chains.yml b/models/defillama/bronze/bronze__defillama_chains.yml index 23ad41b..a447191 100644 --- a/models/defillama/bronze/bronze__defillama_chains.yml +++ b/models/defillama/bronze/bronze__defillama_chains.yml @@ -1,6 +1,6 @@ version: 2 models: - - name: silver__defillama_chains + - name: bronze__defillama_chains tests: - dbt_utils.unique_combination_of_columns: combination_of_columns: diff --git a/models/defillama/bronze/bronze__defillama_dexes.yml b/models/defillama/bronze/bronze__defillama_dexes.yml index bd6958d..c990a06 100644 --- a/models/defillama/bronze/bronze__defillama_dexes.yml +++ b/models/defillama/bronze/bronze__defillama_dexes.yml @@ -1,6 +1,6 @@ version: 2 models: - - name: silver__defillama_dexes + - name: bronze__defillama_dexes tests: - dbt_utils.unique_combination_of_columns: combination_of_columns: diff --git a/models/defillama/bronze/bronze__defillama_protocols.yml b/models/defillama/bronze/bronze__defillama_protocols.yml index 52918cd..a75b941 100644 --- a/models/defillama/bronze/bronze__defillama_protocols.yml +++ b/models/defillama/bronze/bronze__defillama_protocols.yml @@ -1,6 +1,6 @@ version: 2 models: - - name: silver__defillama_protocols + - name: bronze__defillama_protocols tests: - dbt_utils.unique_combination_of_columns: combination_of_columns: diff --git a/models/defillama/bronze/bronze__defillama_stablecoins.yml b/models/defillama/bronze/bronze__defillama_stablecoins.yml index 5ef7c1c..f1e0e5b 100644 --- a/models/defillama/bronze/bronze__defillama_stablecoins.yml +++ b/models/defillama/bronze/bronze__defillama_stablecoins.yml @@ -1,6 +1,6 @@ version: 2 models: - - name: silver__defillama_stablecoins + - name: bronze__defillama_stablecoins tests: - dbt_utils.unique_combination_of_columns: combination_of_columns: diff --git a/models/defillama/gold/defillama__dim_bridges.sql b/models/defillama/gold/defillama__dim_bridges.sql index 9291235..e381c38 100644 --- a/models/defillama/gold/defillama__dim_bridges.sql +++ b/models/defillama/gold/defillama__dim_bridges.sql @@ -15,6 +15,7 @@ SELECT bridge_id, bridge, + bridge_name, chains, destination_chain FROM {{ ref('bronze__defillama_bridges') }} \ No newline at end of file diff --git a/models/defillama/gold/defillama__dim_bridges.yml b/models/defillama/gold/defillama__dim_bridges.yml index e10e923..01b3a8a 100644 --- a/models/defillama/gold/defillama__dim_bridges.yml +++ b/models/defillama/gold/defillama__dim_bridges.yml @@ -7,7 +7,9 @@ models: - name: BRIDGE_ID description: Unique identifier of the bridge. - name: BRIDGE - description: Name of the bridge. + description: The name of the listed bridge. + - name: BRIDGE_NAME + description: The more descriptive, official display name of the bridge. - name: CHAINS description: Array of the various chains or networks that the bridge interacts with. - name: DESTINATION_CHAIN diff --git a/models/defillama/gold/defillama__fact_bridge_volume.sql b/models/defillama/gold/defillama__fact_bridge_volume.sql index 7bf3024..bb41948 100644 --- a/models/defillama/gold/defillama__fact_bridge_volume.sql +++ b/models/defillama/gold/defillama__fact_bridge_volume.sql @@ -16,6 +16,7 @@ SELECT TIMESTAMP :: DATE AS DATE, bridge_id, bridge, + bridge_name, deposit_txs, deposit_usd, withdraw_txs, diff --git a/models/defillama/gold/defillama__fact_bridge_volume.yml b/models/defillama/gold/defillama__fact_bridge_volume.yml index 5a2a727..e6c0a8a 100644 --- a/models/defillama/gold/defillama__fact_bridge_volume.yml +++ b/models/defillama/gold/defillama__fact_bridge_volume.yml @@ -10,6 +10,8 @@ models: description: Unique identifier of the bridge. - name: BRIDGE description: Name of the bridge. + - name: BRIDGE_NAME + description: The more descriptive, official display name of the bridge. - name: DEPOSIT_TXS description: Total number of deposit transactions to the bridge. - name: DEPOSIT_USD diff --git a/models/defillama/silver/silver__defillama_bridge_volume.sql b/models/defillama/silver/silver__defillama_bridge_volume.sql index c62f920..2710b4f 100644 --- a/models/defillama/silver/silver__defillama_bridge_volume.sql +++ b/models/defillama/silver/silver__defillama_bridge_volume.sql @@ -12,6 +12,7 @@ WITH bridge_base AS ( SELECT bridge_id, bridge, + bridge_name, ethereum.streamline.udf_api( 'GET',CONCAT('https://bridges.llama.fi/bridgevolume/all?id=',bridge_id),{},{} ) AS read, @@ -20,6 +21,7 @@ FROM ( SELECT bridge_id, bridge, + bridge_name, row_num FROM {{ ref('bronze__defillama_bridges') }} WHERE row_num BETWEEN {{ item * 10 + 1 }} AND {{ (item + 1) * 10}} @@ -47,6 +49,7 @@ UNION ALL SELECT bridge_id, bridge, + bridge_name, TO_TIMESTAMP(VALUE:date::INTEGER) AS timestamp, VALUE:depositTxs::INTEGER AS deposit_txs, VALUE:depositUSD::INTEGER AS deposit_usd, @@ -55,4 +58,4 @@ SELECT _inserted_timestamp, CONCAT(bridge_id,'-',bridge,'-',timestamp) AS id FROM bridge_base, - LATERAL FLATTEN (input=> read:data) \ No newline at end of file + LATERAL FLATTEN (input=> read:data) \ No newline at end of file