diff --git a/models/chainlink/arbitrum/chainlink_arbitrum_ccip_send_requested.sql b/models/chainlink/arbitrum/chainlink_arbitrum_ccip_send_requested.sql index ff503df4cbe..6b31099b5c7 100644 --- a/models/chainlink/arbitrum/chainlink_arbitrum_ccip_send_requested.sql +++ b/models/chainlink/arbitrum/chainlink_arbitrum_ccip_send_requested.sql @@ -43,7 +43,8 @@ SELECT MAX(token) AS token, MAX(fee_token) AS fee_token, MAX(destination_selector) AS destination_selector, - MAX(destination_blockchain) AS destination_blockchain + MAX(destination_blockchain) AS destination_blockchain, + MAX(tx_hash) AS tx_hash FROM combined_logs GROUP BY diff --git a/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_locked_logs.sql b/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_locked_logs.sql deleted file mode 100644 index 991ebae66c0..00000000000 --- a/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_locked_logs.sql +++ /dev/null @@ -1,28 +0,0 @@ -{{ - config( - - alias='ccip_tokens_locked_logs', - materialized='view' - ) -}} - -SELECT - 'arbitrum' as blockchain, - block_hash, - contract_address, - data, - topic0, - topic1, - topic2, - topic3, - tx_hash, - block_number, - block_time, - index, - tx_index, - tx_from, - bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens -FROM - {{ source('arbitrum', 'logs') }} logs -WHERE - topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked \ No newline at end of file diff --git a/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql b/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql new file mode 100644 index 00000000000..0ba0898558a --- /dev/null +++ b/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql @@ -0,0 +1,62 @@ +{{ + config( + schema='chainlink_arbitrum', + alias='ccip_tokens_transferred_logs', + materialized='incremental', + file_format='delta', + incremental_strategy='merge', + unique_key=['blockchain', 'tx_hash', 'index'] + ) +}} + +{% set project_start_date = '2023-07-06' %} + +SELECT + 'arbitrum' as blockchain, + block_hash, + contract_address, + data, + topic0, + topic1, + topic2, + topic3, + tx_hash, + block_number, + block_time, + index, + tx_index, + tx_from, + bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens +FROM + {{ source('arbitrum', 'logs') }} logs +WHERE + topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked + AND block_time >= TIMESTAMP '{{project_start_date}}' + {% if is_incremental() %} + AND {{ incremental_predicate('block_time') }} + {% endif %} +UNION ALL +SELECT + 'arbitrum' as blockchain, + block_hash, + contract_address, + data, + topic0, + topic1, + topic2, + topic3, + tx_hash, + block_number, + block_time, + index, + tx_index, + tx_from, + bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens +FROM + {{ source('arbitrum', 'logs') }} logs +WHERE + topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) + AND block_time >= TIMESTAMP '{{project_start_date}}' + {% if is_incremental() %} + AND {{ incremental_predicate('block_time') }} + {% endif %} \ No newline at end of file diff --git a/models/chainlink/arbitrum/chainlink_arbitrum_schema.yml b/models/chainlink/arbitrum/chainlink_arbitrum_schema.yml index 9f20eb83dc3..4c6e0f3f926 100644 --- a/models/chainlink/arbitrum/chainlink_arbitrum_schema.yml +++ b/models/chainlink/arbitrum/chainlink_arbitrum_schema.yml @@ -1105,6 +1105,7 @@ models: - &destination_chain_selector name: destination_chain_selector description: "Destination Chain Selector" + - *tx_hash - name: chainlink_arbitrum_ccip_send_requested_daily meta: @@ -1168,15 +1169,21 @@ models: name: trace_address description: "Trace Address" - - name: chainlink_arbitrum_ccip_tokens_locked_logs + - name: chainlink_arbitrum_ccip_tokens_transferred_logs meta: blockchain: "arbitrum" project: chainlink contributors: ["linkpool_jon"] config: - tags: ["chainlink", "ccip", "tokens", "locked", "logs", "arbitrum"] + tags: ["chainlink", "ccip", "tokens", "transferred", "logs", "arbitrum"] description: > - Chainlink CCIP Tokens Locked Logs + Chainlink CCIP Tokens Transferred Logs + tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - blockchain + - tx_hash + - index columns: - *blockchain - *block_hash diff --git a/models/chainlink/avalanche_c/chainlink_avalanche_c_ccip_send_requested.sql b/models/chainlink/avalanche_c/chainlink_avalanche_c_ccip_send_requested.sql index fb3d2a1b6f0..3d825fc1cac 100644 --- a/models/chainlink/avalanche_c/chainlink_avalanche_c_ccip_send_requested.sql +++ b/models/chainlink/avalanche_c/chainlink_avalanche_c_ccip_send_requested.sql @@ -43,7 +43,8 @@ SELECT MAX(token) AS token, MAX(fee_token) AS fee_token, MAX(destination_selector) AS destination_selector, - MAX(destination_blockchain) AS destination_blockchain + MAX(destination_blockchain) AS destination_blockchain, + MAX(tx_hash) AS tx_hash FROM combined_logs GROUP BY diff --git a/models/chainlink/avalanche_c/chainlink_avalanche_c_ccip_tokens_locked_logs.sql b/models/chainlink/avalanche_c/chainlink_avalanche_c_ccip_tokens_locked_logs.sql deleted file mode 100644 index 62b496e8a6f..00000000000 --- a/models/chainlink/avalanche_c/chainlink_avalanche_c_ccip_tokens_locked_logs.sql +++ /dev/null @@ -1,28 +0,0 @@ -{{ - config( - - alias='ccip_tokens_locked_logs', - materialized='view' - ) -}} - -SELECT - 'avalanche_c' as blockchain, - block_hash, - contract_address, - data, - topic0, - topic1, - topic2, - topic3, - tx_hash, - block_number, - block_time, - index, - tx_index, - tx_from, - bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens -FROM - {{ source('avalanche_c', 'logs') }} logs -WHERE - topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked \ No newline at end of file diff --git a/models/chainlink/avalanche_c/chainlink_avalanche_c_ccip_tokens_transferred_logs.sql b/models/chainlink/avalanche_c/chainlink_avalanche_c_ccip_tokens_transferred_logs.sql new file mode 100644 index 00000000000..bf4010d6417 --- /dev/null +++ b/models/chainlink/avalanche_c/chainlink_avalanche_c_ccip_tokens_transferred_logs.sql @@ -0,0 +1,62 @@ +{{ + config( + schema='chainlink_avalanche_c', + alias='ccip_tokens_transferred_logs', + materialized='incremental', + file_format='delta', + incremental_strategy='merge', + unique_key=['blockchain', 'tx_hash', 'index'] + ) +}} + +{% set project_start_date = '2023-07-06' %} + +SELECT + 'avalanche_c' as blockchain, + block_hash, + contract_address, + data, + topic0, + topic1, + topic2, + topic3, + tx_hash, + block_number, + block_time, + index, + tx_index, + tx_from, + bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens +FROM + {{ source('avalanche_c', 'logs') }} logs +WHERE + topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked + AND block_time >= TIMESTAMP '{{project_start_date}}' + {% if is_incremental() %} + AND {{ incremental_predicate('block_time') }} + {% endif %} +UNION ALL +SELECT + 'avalanche_c' as blockchain, + block_hash, + contract_address, + data, + topic0, + topic1, + topic2, + topic3, + tx_hash, + block_number, + block_time, + index, + tx_index, + tx_from, + bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens +FROM + {{ source('avalanche_c', 'logs') }} logs +WHERE + topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) + AND block_time >= TIMESTAMP '{{project_start_date}}' + {% if is_incremental() %} + AND {{ incremental_predicate('block_time') }} + {% endif %} \ No newline at end of file diff --git a/models/chainlink/avalanche_c/chainlink_avalanche_c_schema.yml b/models/chainlink/avalanche_c/chainlink_avalanche_c_schema.yml index 3cf51e62f7c..1a8e8453f98 100644 --- a/models/chainlink/avalanche_c/chainlink_avalanche_c_schema.yml +++ b/models/chainlink/avalanche_c/chainlink_avalanche_c_schema.yml @@ -1337,6 +1337,7 @@ models: - &destination_chain_selector name: destination_chain_selector description: "Destination Chain Selector" + - *tx_hash - name: chainlink_avalanche_c_ccip_send_requested_daily meta: @@ -1400,15 +1401,22 @@ models: name: trace_address description: "Trace Address" - - name: chainlink_avalanche_c_ccip_tokens_locked_logs + - name: chainlink_avalanche_c_ccip_tokens_transferred_logs meta: blockchain: "avalanche_c" project: chainlink contributors: ["linkpool_jon"] config: - tags: ["chainlink", "ccip", "tokens", "locked", "logs", "avalanche_c"] + tags: + ["chainlink", "ccip", "tokens", "transferred", "logs", "avalanche_c"] description: > - Chainlink CCIP Tokens Locked Logs + Chainlink CCIP Tokens Transferred Logs + tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - blockchain + - tx_hash + - index columns: - *blockchain - *block_hash diff --git a/models/chainlink/base/chainlink_base_ccip_send_requested.sql b/models/chainlink/base/chainlink_base_ccip_send_requested.sql index c7785f75a92..7c20fbc529f 100644 --- a/models/chainlink/base/chainlink_base_ccip_send_requested.sql +++ b/models/chainlink/base/chainlink_base_ccip_send_requested.sql @@ -43,7 +43,8 @@ SELECT MAX(token) AS token, MAX(fee_token) AS fee_token, MAX(destination_selector) AS destination_selector, - MAX(destination_blockchain) AS destination_blockchain + MAX(destination_blockchain) AS destination_blockchain, + MAX(tx_hash) AS tx_hash FROM combined_logs GROUP BY diff --git a/models/chainlink/base/chainlink_base_ccip_tokens_locked_logs.sql b/models/chainlink/base/chainlink_base_ccip_tokens_locked_logs.sql deleted file mode 100644 index 708d8e4f13c..00000000000 --- a/models/chainlink/base/chainlink_base_ccip_tokens_locked_logs.sql +++ /dev/null @@ -1,28 +0,0 @@ -{{ - config( - - alias='ccip_tokens_locked_logs', - materialized='view' - ) -}} - -SELECT - 'base' as blockchain, - block_hash, - contract_address, - data, - topic0, - topic1, - topic2, - topic3, - tx_hash, - block_number, - block_time, - index, - tx_index, - tx_from, - bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens -FROM - {{ source('base', 'logs') }} logs -WHERE - topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked \ No newline at end of file diff --git a/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql b/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql new file mode 100644 index 00000000000..e3ccaf7e238 --- /dev/null +++ b/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql @@ -0,0 +1,62 @@ +{{ + config( + schema='chainlink_base', + alias='ccip_tokens_transferred_logs', + materialized='incremental', + file_format='delta', + incremental_strategy='merge', + unique_key=['blockchain', 'tx_hash', 'index'] + ) +}} + +{% set project_start_date = '2023-07-06' %} + +SELECT + 'base' as blockchain, + block_hash, + contract_address, + data, + topic0, + topic1, + topic2, + topic3, + tx_hash, + block_number, + block_time, + index, + tx_index, + tx_from, + bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens +FROM + {{ source('base', 'logs') }} logs +WHERE + topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked + AND block_time >= TIMESTAMP '{{project_start_date}}' + {% if is_incremental() %} + AND {{ incremental_predicate('block_time') }} + {% endif %} +UNION ALL +SELECT + 'base' as blockchain, + block_hash, + contract_address, + data, + topic0, + topic1, + topic2, + topic3, + tx_hash, + block_number, + block_time, + index, + tx_index, + tx_from, + bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens +FROM + {{ source('base', 'logs') }} logs +WHERE + topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) + AND block_time >= TIMESTAMP '{{project_start_date}}' + {% if is_incremental() %} + AND {{ incremental_predicate('block_time') }} + {% endif %} diff --git a/models/chainlink/base/chainlink_base_schema.yml b/models/chainlink/base/chainlink_base_schema.yml index fc35ab3505f..4edc8571bdc 100644 --- a/models/chainlink/base/chainlink_base_schema.yml +++ b/models/chainlink/base/chainlink_base_schema.yml @@ -188,6 +188,7 @@ models: - &destination_chain_selector name: destination_chain_selector description: "Destination Chain Selector" + - *tx_hash - name: chainlink_base_ccip_send_requested_daily meta: @@ -263,15 +264,21 @@ models: name: trace_address description: "Trace Address" - - name: chainlink_base_ccip_tokens_locked_logs + - name: chainlink_base_ccip_tokens_transferred_logs meta: blockchain: "base" project: chainlink contributors: ["linkpool_jon"] config: - tags: ["chainlink", "ccip", "tokens", "locked", "logs", "base"] + tags: ["chainlink", "ccip", "tokens", "transferred", "logs", "base"] description: > - Chainlink CCIP Tokens Locked Logs + Chainlink CCIP Tokens Transferred Logs + tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - blockchain + - tx_hash + - index columns: - *blockchain - *block_hash diff --git a/models/chainlink/bnb/chainlink_bnb_ccip_send_requested.sql b/models/chainlink/bnb/chainlink_bnb_ccip_send_requested.sql index c91dd8914c3..bbeb85d9b9f 100644 --- a/models/chainlink/bnb/chainlink_bnb_ccip_send_requested.sql +++ b/models/chainlink/bnb/chainlink_bnb_ccip_send_requested.sql @@ -43,7 +43,8 @@ SELECT MAX(token) AS token, MAX(fee_token) AS fee_token, MAX(destination_selector) AS destination_selector, - MAX(destination_blockchain) AS destination_blockchain + MAX(destination_blockchain) AS destination_blockchain, + MAX(tx_hash) AS tx_hash FROM combined_logs GROUP BY diff --git a/models/chainlink/bnb/chainlink_bnb_ccip_tokens_locked_logs.sql b/models/chainlink/bnb/chainlink_bnb_ccip_tokens_locked_logs.sql deleted file mode 100644 index a5b94717420..00000000000 --- a/models/chainlink/bnb/chainlink_bnb_ccip_tokens_locked_logs.sql +++ /dev/null @@ -1,28 +0,0 @@ -{{ - config( - - alias='ccip_tokens_locked_logs', - materialized='view' - ) -}} - -SELECT - 'bnb' as blockchain, - block_hash, - contract_address, - data, - topic0, - topic1, - topic2, - topic3, - tx_hash, - block_number, - block_time, - index, - tx_index, - tx_from, - bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens -FROM - {{ source('bnb', 'logs') }} logs -WHERE - topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked \ No newline at end of file diff --git a/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql b/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql new file mode 100644 index 00000000000..10dcca600d8 --- /dev/null +++ b/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql @@ -0,0 +1,62 @@ +{{ + config( + schema='chainlink_bnb', + alias='ccip_tokens_transferred_logs', + materialized='incremental', + file_format='delta', + incremental_strategy='merge', + unique_key=['blockchain', 'tx_hash', 'index'] + ) +}} + +{% set project_start_date = '2023-07-06' %} + +SELECT + 'bnb' as blockchain, + block_hash, + contract_address, + data, + topic0, + topic1, + topic2, + topic3, + tx_hash, + block_number, + block_time, + index, + tx_index, + tx_from, + bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens +FROM + {{ source('bnb', 'logs') }} logs +WHERE + topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked + AND block_time >= TIMESTAMP '{{project_start_date}}' + {% if is_incremental() %} + AND {{ incremental_predicate('block_time') }} + {% endif %} +UNION ALL +SELECT + 'bnb' as blockchain, + block_hash, + contract_address, + data, + topic0, + topic1, + topic2, + topic3, + tx_hash, + block_number, + block_time, + index, + tx_index, + tx_from, + bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens +FROM + {{ source('bnb', 'logs') }} logs +WHERE + topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) + AND block_time >= TIMESTAMP '{{project_start_date}}' + {% if is_incremental() %} + AND {{ incremental_predicate('block_time') }} + {% endif %} \ No newline at end of file diff --git a/models/chainlink/bnb/chainlink_bnb_schema.yml b/models/chainlink/bnb/chainlink_bnb_schema.yml index 67708f65b12..c8c8f6a7a18 100644 --- a/models/chainlink/bnb/chainlink_bnb_schema.yml +++ b/models/chainlink/bnb/chainlink_bnb_schema.yml @@ -1312,6 +1312,7 @@ models: - &destination_chain_selector name: destination_chain_selector description: "Destination Chain Selector" + - *tx_hash - name: chainlink_bnb_ccip_send_requested_daily meta: @@ -1375,15 +1376,21 @@ models: name: trace_address description: "Trace Address" - - name: chainlink_bnb_ccip_tokens_locked_logs + - name: chainlink_bnb_ccip_tokens_transferred_logs meta: blockchain: "bnb" project: chainlink contributors: ["linkpool_jon"] config: - tags: ["chainlink", "ccip", "tokens", "locked", "logs", "bnb"] + tags: ["chainlink", "ccip", "tokens", "transferred", "logs", "bnb"] description: > - Chainlink CCIP Tokens Locked Logs + Chainlink CCIP Tokens Transferred Logs + tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - blockchain + - tx_hash + - index columns: - *blockchain - *block_hash diff --git a/models/chainlink/chainlink_ccip_send_requested.sql b/models/chainlink/chainlink_ccip_send_requested.sql index 48ccd4dbb21..d7e87769acf 100644 --- a/models/chainlink/chainlink_ccip_send_requested.sql +++ b/models/chainlink/chainlink_ccip_send_requested.sql @@ -29,7 +29,8 @@ FROM ( token, fee_token, destination_selector, - destination_blockchain + destination_blockchain, + tx_hash FROM {{ ref(model) }} {% if not loop.last %} UNION ALL diff --git a/models/chainlink/chainlink_ccip_tokens_locked_logs.sql b/models/chainlink/chainlink_ccip_tokens_transferred_logs.sql similarity index 62% rename from models/chainlink/chainlink_ccip_tokens_locked_logs.sql rename to models/chainlink/chainlink_ccip_tokens_transferred_logs.sql index ecb848c936e..10fe3fdd681 100644 --- a/models/chainlink/chainlink_ccip_tokens_locked_logs.sql +++ b/models/chainlink/chainlink_ccip_tokens_transferred_logs.sql @@ -1,7 +1,7 @@ {{ config( - alias='ccip_tokens_locked_logs', + alias='ccip_tokens_transferred_logs', post_hook='{{ expose_spells(\'["arbitrum", "avalanche_c", "base", "bnb", "ethereum", "optimism", "polygon"]\', "project", "chainlink", @@ -10,13 +10,13 @@ }} {% set models = [ - 'chainlink_arbitrum_ccip_tokens_locked_logs', - 'chainlink_avalanche_c_ccip_tokens_locked_logs', - 'chainlink_base_ccip_tokens_locked_logs', - 'chainlink_bnb_ccip_tokens_locked_logs', - 'chainlink_ethereum_ccip_tokens_locked_logs', - 'chainlink_optimism_ccip_tokens_locked_logs', - 'chainlink_polygon_ccip_tokens_locked_logs' + 'chainlink_arbitrum_ccip_tokens_transferred_logs', + 'chainlink_avalanche_c_ccip_tokens_transferred_logs', + 'chainlink_base_ccip_tokens_transferred_logs', + 'chainlink_bnb_ccip_tokens_transferred_logs', + 'chainlink_ethereum_ccip_tokens_transferred_logs', + 'chainlink_optimism_ccip_tokens_transferred_logs', + 'chainlink_polygon_ccip_tokens_transferred_logs' ] %} SELECT * diff --git a/models/chainlink/chainlink_schema.yml b/models/chainlink/chainlink_schema.yml index f84714e468b..7d72f847e9d 100644 --- a/models/chainlink/chainlink_schema.yml +++ b/models/chainlink/chainlink_schema.yml @@ -2187,6 +2187,7 @@ models: - &destination_selector name: destination_selector description: "Destination Selector" + - *tx_hash - name: chainlink_ccip_send_requested_daily meta: @@ -2299,7 +2300,7 @@ models: name: trace_address description: "Trace Address" - - name: chainlink_ccip_tokens_locked_logs + - name: chainlink_ccip_tokens_transferred_logs meta: blockchain: [ @@ -2320,7 +2321,7 @@ models: "chainlink", "ccip", "tokens", - "locked", + "transferred", "logs", "arbitrum", "avalanche_c", @@ -2331,7 +2332,13 @@ models: "polygon", ] description: > - Chainlink CCIP Tokens Locked Logs + Chainlink CCIP Tokens Transferred Logs + tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - blockchain + - tx_hash + - index columns: - *blockchain - *block_hash diff --git a/models/chainlink/ethereum/chainlink_ethereum_ccip_send_requested.sql b/models/chainlink/ethereum/chainlink_ethereum_ccip_send_requested.sql index 9f690abad12..2b2e52e273f 100644 --- a/models/chainlink/ethereum/chainlink_ethereum_ccip_send_requested.sql +++ b/models/chainlink/ethereum/chainlink_ethereum_ccip_send_requested.sql @@ -43,7 +43,8 @@ SELECT MAX(token) AS token, MAX(fee_token) AS fee_token, MAX(destination_selector) AS destination_selector, - MAX(destination_blockchain) AS destination_blockchain + MAX(destination_blockchain) AS destination_blockchain, + MAX(tx_hash) AS tx_hash FROM combined_logs GROUP BY diff --git a/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_locked_logs.sql b/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_locked_logs.sql deleted file mode 100644 index 21a47901b68..00000000000 --- a/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_locked_logs.sql +++ /dev/null @@ -1,28 +0,0 @@ -{{ - config( - - alias='ccip_tokens_locked_logs', - materialized='view' - ) -}} - -SELECT - 'ethereum' as blockchain, - block_hash, - contract_address, - data, - topic0, - topic1, - topic2, - topic3, - tx_hash, - block_number, - block_time, - index, - tx_index, - tx_from, - bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens -FROM - {{ source('ethereum', 'logs') }} logs -WHERE - topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked \ No newline at end of file diff --git a/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql b/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql new file mode 100644 index 00000000000..c338be21f5a --- /dev/null +++ b/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql @@ -0,0 +1,62 @@ +{{ + config( + schema='chainlink_ethereum', + alias='ccip_tokens_transferred_logs', + materialized='incremental', + file_format='delta', + incremental_strategy='merge', + unique_key=['blockchain', 'tx_hash', 'index'] + ) +}} + +{% set project_start_date = '2023-07-06' %} + +SELECT + 'ethereum' as blockchain, + block_hash, + contract_address, + data, + topic0, + topic1, + topic2, + topic3, + tx_hash, + block_number, + block_time, + index, + tx_index, + tx_from, + bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens +FROM + {{ source('ethereum', 'logs') }} logs +WHERE + topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked + AND block_time >= TIMESTAMP '{{project_start_date}}' + {% if is_incremental() %} + AND {{ incremental_predicate('block_time') }} + {% endif %} +UNION ALL +SELECT + 'ethereum' as blockchain, + block_hash, + contract_address, + data, + topic0, + topic1, + topic2, + topic3, + tx_hash, + block_number, + block_time, + index, + tx_index, + tx_from, + bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens +FROM + {{ source('ethereum', 'logs') }} logs +WHERE + topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) + AND block_time >= TIMESTAMP '{{project_start_date}}' + {% if is_incremental() %} + AND {{ incremental_predicate('block_time') }} + {% endif %} \ No newline at end of file diff --git a/models/chainlink/ethereum/chainlink_ethereum_schema.yml b/models/chainlink/ethereum/chainlink_ethereum_schema.yml index 589becf217b..a2a57605566 100644 --- a/models/chainlink/ethereum/chainlink_ethereum_schema.yml +++ b/models/chainlink/ethereum/chainlink_ethereum_schema.yml @@ -1309,6 +1309,7 @@ models: - &destination_chain_selector name: destination_chain_selector description: "Destination Chain Selector" + - *tx_hash - name: chainlink_ethereum_ccip_send_requested_daily meta: @@ -1372,15 +1373,21 @@ models: name: trace_address description: "Trace Address" - - name: chainlink_ethereum_ccip_tokens_locked_logs + - name: chainlink_ethereum_ccip_tokens_transferred_logs meta: blockchain: "ethereum" project: chainlink contributors: ["linkpool_jon"] config: - tags: ["chainlink", "ccip", "tokens", "locked", "logs", "ethereum"] + tags: ["chainlink", "ccip", "tokens", "transferred", "logs", "ethereum"] description: > - Chainlink CCIP Tokens Locked Logs + Chainlink CCIP Tokens Transferred Logs + tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - blockchain + - tx_hash + - index columns: - *blockchain - *block_hash diff --git a/models/chainlink/optimism/chainlink_optimism_ccip_send_requested.sql b/models/chainlink/optimism/chainlink_optimism_ccip_send_requested.sql index e3727e3f0bc..6263a0ece0c 100644 --- a/models/chainlink/optimism/chainlink_optimism_ccip_send_requested.sql +++ b/models/chainlink/optimism/chainlink_optimism_ccip_send_requested.sql @@ -43,7 +43,8 @@ SELECT MAX(token) AS token, MAX(fee_token) AS fee_token, MAX(destination_selector) AS destination_selector, - MAX(destination_blockchain) AS destination_blockchain + MAX(destination_blockchain) AS destination_blockchain, + MAX(tx_hash) AS tx_hash FROM combined_logs GROUP BY diff --git a/models/chainlink/optimism/chainlink_optimism_ccip_tokens_locked_logs.sql b/models/chainlink/optimism/chainlink_optimism_ccip_tokens_locked_logs.sql deleted file mode 100644 index cc139e4fa08..00000000000 --- a/models/chainlink/optimism/chainlink_optimism_ccip_tokens_locked_logs.sql +++ /dev/null @@ -1,28 +0,0 @@ -{{ - config( - - alias='ccip_tokens_locked_logs', - materialized='view' - ) -}} - -SELECT - 'optimism' as blockchain, - block_hash, - contract_address, - data, - topic0, - topic1, - topic2, - topic3, - tx_hash, - block_number, - block_time, - index, - tx_index, - tx_from, - bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens -FROM - {{ source('optimism', 'logs') }} logs -WHERE - topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked \ No newline at end of file diff --git a/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql b/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql new file mode 100644 index 00000000000..5527d43f66e --- /dev/null +++ b/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql @@ -0,0 +1,62 @@ +{{ + config( + schema='chainlink_optimism', + alias='ccip_tokens_transferred_logs', + materialized='incremental', + file_format='delta', + incremental_strategy='merge', + unique_key=['blockchain', 'tx_hash', 'index'] + ) +}} + +{% set project_start_date = '2023-07-06' %} + +SELECT + 'optimism' as blockchain, + block_hash, + contract_address, + data, + topic0, + topic1, + topic2, + topic3, + tx_hash, + block_number, + block_time, + index, + tx_index, + tx_from, + bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens +FROM + {{ source('optimism', 'logs') }} logs +WHERE + topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked + AND block_time >= TIMESTAMP '{{project_start_date}}' + {% if is_incremental() %} + AND {{ incremental_predicate('block_time') }} + {% endif %} +UNION ALL +SELECT + 'optimism' as blockchain, + block_hash, + contract_address, + data, + topic0, + topic1, + topic2, + topic3, + tx_hash, + block_number, + block_time, + index, + tx_index, + tx_from, + bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens +FROM + {{ source('optimism', 'logs') }} logs +WHERE + topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) + AND block_time >= TIMESTAMP '{{project_start_date}}' + {% if is_incremental() %} + AND {{ incremental_predicate('block_time') }} + {% endif %} \ No newline at end of file diff --git a/models/chainlink/optimism/chainlink_optimism_schema.yml b/models/chainlink/optimism/chainlink_optimism_schema.yml index 10bdc375a52..a0f43ab513a 100644 --- a/models/chainlink/optimism/chainlink_optimism_schema.yml +++ b/models/chainlink/optimism/chainlink_optimism_schema.yml @@ -842,6 +842,7 @@ models: - &destination_chain_selector name: destination_chain_selector description: "Destination Chain Selector" + - *tx_hash - name: chainlink_optimism_ccip_send_requested_daily meta: @@ -905,7 +906,7 @@ models: name: trace_address description: "Trace Address" - - name: chainlink_optimism_ccip_tokens_locked_logs + - name: chainlink_optimism_ccip_tokens_transferred_logs meta: blockchain: "optimism" project: chainlink @@ -913,7 +914,13 @@ models: config: tags: ["chainlink", "ccip", "tokens", "locked", "logs", "optimism"] description: > - Chainlink CCIP Tokens Locked Logs + Chainlink CCIP Tokens Transferred Logs + tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - blockchain + - tx_hash + - index columns: - *blockchain - *block_hash diff --git a/models/chainlink/polygon/chainlink_polygon_ccip_send_requested.sql b/models/chainlink/polygon/chainlink_polygon_ccip_send_requested.sql index cda42559e4d..18ebe35e5c2 100644 --- a/models/chainlink/polygon/chainlink_polygon_ccip_send_requested.sql +++ b/models/chainlink/polygon/chainlink_polygon_ccip_send_requested.sql @@ -43,7 +43,8 @@ SELECT MAX(token) AS token, MAX(fee_token) AS fee_token, MAX(destination_selector) AS destination_selector, - MAX(destination_blockchain) AS destination_blockchain + MAX(destination_blockchain) AS destination_blockchain, + MAX(tx_hash) AS tx_hash FROM combined_logs GROUP BY diff --git a/models/chainlink/polygon/chainlink_polygon_ccip_tokens_locked_logs.sql b/models/chainlink/polygon/chainlink_polygon_ccip_tokens_locked_logs.sql deleted file mode 100644 index f9984fa8426..00000000000 --- a/models/chainlink/polygon/chainlink_polygon_ccip_tokens_locked_logs.sql +++ /dev/null @@ -1,28 +0,0 @@ -{{ - config( - - alias='ccip_tokens_locked_logs', - materialized='view' - ) -}} - -SELECT - 'polygon' as blockchain, - block_hash, - contract_address, - data, - topic0, - topic1, - topic2, - topic3, - tx_hash, - block_number, - block_time, - index, - tx_index, - tx_from, - bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens -FROM - {{ source('polygon', 'logs') }} logs -WHERE - topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked \ No newline at end of file diff --git a/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql b/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql new file mode 100644 index 00000000000..d3f62ff5600 --- /dev/null +++ b/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql @@ -0,0 +1,62 @@ +{{ + config( + schema='chainlink_polygon', + alias='ccip_tokens_transferred_logs', + materialized='incremental', + file_format='delta', + incremental_strategy='merge', + unique_key=['blockchain', 'tx_hash', 'index'] + ) +}} + +{% set project_start_date = '2023-07-06' %} + +SELECT + 'polygon' as blockchain, + block_hash, + contract_address, + data, + topic0, + topic1, + topic2, + topic3, + tx_hash, + block_number, + block_time, + index, + tx_index, + tx_from, + bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens +FROM + {{ source('polygon', 'logs') }} logs +WHERE + topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked + AND block_time >= TIMESTAMP '{{project_start_date}}' + {% if is_incremental() %} + AND {{ incremental_predicate('block_time') }} + {% endif %} +UNION ALL +SELECT + 'polygon' as blockchain, + block_hash, + contract_address, + data, + topic0, + topic1, + topic2, + topic3, + tx_hash, + block_number, + block_time, + index, + tx_index, + tx_from, + bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens +FROM + {{ source('polygon', 'logs') }} logs +WHERE + topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) + AND block_time >= TIMESTAMP '{{project_start_date}}' + {% if is_incremental() %} + AND {{ incremental_predicate('block_time') }} + {% endif %} \ No newline at end of file diff --git a/models/chainlink/polygon/chainlink_polygon_schema.yml b/models/chainlink/polygon/chainlink_polygon_schema.yml index c16d68e63ad..16c2e898440 100644 --- a/models/chainlink/polygon/chainlink_polygon_schema.yml +++ b/models/chainlink/polygon/chainlink_polygon_schema.yml @@ -1333,6 +1333,7 @@ models: - &destination_chain_selector name: destination_chain_selector description: "Destination Chain Selector" + - *tx_hash - name: chainlink_polygon_ccip_send_requested_daily meta: @@ -1396,15 +1397,21 @@ models: name: trace_address description: "Trace Address" - - name: chainlink_polygon_ccip_tokens_locked_logs + - name: chainlink_polygon_ccip_tokens_transferred_logs meta: blockchain: "polygon" project: chainlink contributors: ["linkpool_jon"] config: - tags: ["chainlink", "ccip", "tokens", "locked", "logs", "polygon"] + tags: ["chainlink", "ccip", "tokens", "transferred", "logs", "polygon"] description: > - Chainlink CCIP Tokens Locked Logs + Chainlink CCIP Tokens Transferred Logs + tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - blockchain + - tx_hash + - index columns: - *blockchain - *block_hash