From 8b8029078593e3228c50aaa78891546181e6f641 Mon Sep 17 00:00:00 2001 From: AnonJon Date: Tue, 9 Apr 2024 13:41:33 -0500 Subject: [PATCH 1/7] add in burned event --- ...chainlink_arbitrum_ccip_send_requested.sql | 3 +- ...nlink_arbitrum_ccip_tokens_locked_logs.sql | 28 ----------- ..._arbitrum_ccip_tokens_transferred_logs.sql | 49 +++++++++++++++++++ .../arbitrum/chainlink_arbitrum_schema.yml | 7 +-- ...inlink_avalanche_c_ccip_send_requested.sql | 3 +- ...nk_avalanche_c_ccip_tokens_locked_logs.sql | 28 ----------- ...alanche_c_ccip_tokens_transferred_logs.sql | 49 +++++++++++++++++++ .../chainlink_avalanche_c_schema.yml | 8 +-- .../chainlink_base_ccip_send_requested.sql | 3 +- ...chainlink_base_ccip_tokens_locked_logs.sql | 28 ----------- ...link_base_ccip_tokens_transferred_logs.sql | 49 +++++++++++++++++++ .../chainlink/base/chainlink_base_schema.yml | 7 +-- .../bnb/chainlink_bnb_ccip_send_requested.sql | 3 +- .../chainlink_bnb_ccip_tokens_locked_logs.sql | 28 ----------- ...nlink_bnb_ccip_tokens_transferred_logs.sql | 49 +++++++++++++++++++ models/chainlink/bnb/chainlink_bnb_schema.yml | 7 +-- .../chainlink_ccip_send_requested.sql | 3 +- ...hainlink_ccip_tokens_transferred_logs.sql} | 16 +++--- models/chainlink/chainlink_schema.yml | 7 +-- ...chainlink_ethereum_ccip_send_requested.sql | 3 +- ...nlink_ethereum_ccip_tokens_locked_logs.sql | 28 ----------- ..._ethereum_ccip_tokens_transferred_logs.sql | 49 +++++++++++++++++++ .../ethereum/chainlink_ethereum_schema.yml | 7 +-- ...chainlink_optimism_ccip_send_requested.sql | 3 +- ...nlink_optimism_ccip_tokens_locked_logs.sql | 28 ----------- ..._optimism_ccip_tokens_transferred_logs.sql | 49 +++++++++++++++++++ .../optimism/chainlink_optimism_schema.yml | 5 +- .../chainlink_polygon_ccip_send_requested.sql | 3 +- ...inlink_polygon_ccip_tokens_locked_logs.sql | 28 ----------- ...k_polygon_ccip_tokens_transferred_logs.sql | 49 +++++++++++++++++++ .../polygon/chainlink_polygon_schema.yml | 7 +-- 31 files changed, 399 insertions(+), 235 deletions(-) delete mode 100644 models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_locked_logs.sql create mode 100644 models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql delete mode 100644 models/chainlink/avalanche_c/chainlink_avalanche_c_ccip_tokens_locked_logs.sql create mode 100644 models/chainlink/avalanche_c/chainlink_avalanche_c_ccip_tokens_transferred_logs.sql delete mode 100644 models/chainlink/base/chainlink_base_ccip_tokens_locked_logs.sql create mode 100644 models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql delete mode 100644 models/chainlink/bnb/chainlink_bnb_ccip_tokens_locked_logs.sql create mode 100644 models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql rename models/chainlink/{chainlink_ccip_tokens_locked_logs.sql => chainlink_ccip_tokens_transferred_logs.sql} (62%) delete mode 100644 models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_locked_logs.sql create mode 100644 models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql delete mode 100644 models/chainlink/optimism/chainlink_optimism_ccip_tokens_locked_logs.sql create mode 100644 models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql delete mode 100644 models/chainlink/polygon/chainlink_polygon_ccip_tokens_locked_logs.sql create mode 100644 models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql 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..4a6f919a510 --- /dev/null +++ b/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql @@ -0,0 +1,49 @@ +{{ + config( + + alias='ccip_tokens_transferred_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 +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) \ 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..7b4bea54af0 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,15 @@ 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 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..ba41308743c --- /dev/null +++ b/models/chainlink/avalanche_c/chainlink_avalanche_c_ccip_tokens_transferred_logs.sql @@ -0,0 +1,49 @@ +{{ + config( + + alias='ccip_tokens_transferred_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 +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) \ 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..6d368f01538 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,16 @@ 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 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..65f24598123 --- /dev/null +++ b/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql @@ -0,0 +1,49 @@ +{{ + config( + + alias='ccip_tokens_transferred_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 +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) \ No newline at end of file diff --git a/models/chainlink/base/chainlink_base_schema.yml b/models/chainlink/base/chainlink_base_schema.yml index fc35ab3505f..0977d2c0a5c 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,15 @@ 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 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..4a6f919a510 --- /dev/null +++ b/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql @@ -0,0 +1,49 @@ +{{ + config( + + alias='ccip_tokens_transferred_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 +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) \ 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..60a2038d236 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,15 @@ 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 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..f7846a2148c 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,7 @@ models: "polygon", ] description: > - Chainlink CCIP Tokens Locked Logs + Chainlink CCIP Tokens Transferred Logs 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..d8efe53ff60 --- /dev/null +++ b/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql @@ -0,0 +1,49 @@ +{{ + config( + + alias='ccip_tokens_transferred_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 +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) \ 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..c7497c8415e 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,15 @@ 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 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..820ec49f01a --- /dev/null +++ b/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql @@ -0,0 +1,49 @@ +{{ + config( + + alias='ccip_tokens_transferred_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 +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) \ 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..52072a9ce36 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,7 @@ models: config: tags: ["chainlink", "ccip", "tokens", "locked", "logs", "optimism"] description: > - Chainlink CCIP Tokens Locked Logs + Chainlink CCIP Tokens Transferred Logs 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..633f7f1d12b --- /dev/null +++ b/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql @@ -0,0 +1,49 @@ +{{ + config( + + alias='ccip_tokens_transferred_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 +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) \ 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..c2f80e71781 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,15 @@ 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 columns: - *blockchain - *block_hash From f9fd05949058969bc8fe8314ea5f0ce932c47d89 Mon Sep 17 00:00:00 2001 From: AnonJon Date: Fri, 12 Apr 2024 16:06:45 -0500 Subject: [PATCH 2/7] add in incremental filter --- ...nk_arbitrum_ccip_tokens_transferred_logs.sql | 17 ++++++++++++++--- ...avalanche_c_ccip_tokens_transferred_logs.sql | 17 ++++++++++++++--- ...inlink_base_ccip_tokens_transferred_logs.sql | 17 ++++++++++++++--- ...ainlink_bnb_ccip_tokens_transferred_logs.sql | 17 ++++++++++++++--- ...nk_ethereum_ccip_tokens_transferred_logs.sql | 17 ++++++++++++++--- ...nk_optimism_ccip_tokens_transferred_logs.sql | 17 ++++++++++++++--- ...ink_polygon_ccip_tokens_transferred_logs.sql | 17 ++++++++++++++--- 7 files changed, 98 insertions(+), 21 deletions(-) diff --git a/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql b/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql index 4a6f919a510..1440c4bf796 100644 --- a/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql @@ -1,11 +1,14 @@ {{ config( - alias='ccip_tokens_transferred_logs', - materialized='view' + materialized='incremental', + file_format='delta', + incremental_strategy='merge', ) }} +{% set incremental_interval = '7' %} + SELECT 'arbitrum' as blockchain, block_hash, @@ -24,8 +27,12 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('arbitrum', 'logs') }} logs + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked + AND block_time >= CAST('2023-07-06' AS date) UNION ALL SELECT 'arbitrum' as blockchain, @@ -45,5 +52,9 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('arbitrum', 'logs') }} logs + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} WHERE - topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) \ No newline at end of file + topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) + AND block_time >= CAST('2023-07-06' AS date) \ 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 index ba41308743c..6f62a65293a 100644 --- 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 @@ -1,11 +1,14 @@ {{ config( - alias='ccip_tokens_transferred_logs', - materialized='view' + materialized='incremental', + file_format='delta', + incremental_strategy='merge', ) }} +{% set incremental_interval = '7' %} + SELECT 'avalanche_c' as blockchain, block_hash, @@ -24,8 +27,12 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('avalanche_c', 'logs') }} logs + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked + AND block_time >= CAST('2023-07-06' AS date) UNION ALL SELECT 'avalanche_c' as blockchain, @@ -45,5 +52,9 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('avalanche_c', 'logs') }} logs + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} WHERE - topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) \ No newline at end of file + topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) + AND block_time >= CAST('2023-07-06' AS date) \ 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 index 65f24598123..52a95ffb8e7 100644 --- a/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql @@ -1,11 +1,14 @@ {{ config( - alias='ccip_tokens_transferred_logs', - materialized='view' + materialized='incremental', + file_format='delta', + incremental_strategy='merge', ) }} +{% set incremental_interval = '7' %} + SELECT 'base' as blockchain, block_hash, @@ -24,8 +27,12 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('base', 'logs') }} logs + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked + AND block_time >= CAST('2023-07-06' AS date) UNION ALL SELECT 'base' as blockchain, @@ -45,5 +52,9 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('base', 'logs') }} logs + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} WHERE - topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) \ No newline at end of file + topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) + AND block_time >= CAST('2023-07-06' AS date) \ 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 index 4a6f919a510..1440c4bf796 100644 --- a/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql @@ -1,11 +1,14 @@ {{ config( - alias='ccip_tokens_transferred_logs', - materialized='view' + materialized='incremental', + file_format='delta', + incremental_strategy='merge', ) }} +{% set incremental_interval = '7' %} + SELECT 'arbitrum' as blockchain, block_hash, @@ -24,8 +27,12 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('arbitrum', 'logs') }} logs + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked + AND block_time >= CAST('2023-07-06' AS date) UNION ALL SELECT 'arbitrum' as blockchain, @@ -45,5 +52,9 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('arbitrum', 'logs') }} logs + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} WHERE - topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) \ No newline at end of file + topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) + AND block_time >= CAST('2023-07-06' AS date) \ 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 index d8efe53ff60..e4d40d37426 100644 --- a/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql @@ -1,11 +1,14 @@ {{ config( - alias='ccip_tokens_transferred_logs', - materialized='view' + materialized='incremental', + file_format='delta', + incremental_strategy='merge', ) }} +{% set incremental_interval = '7' %} + SELECT 'ethereum' as blockchain, block_hash, @@ -24,8 +27,12 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('ethereum', 'logs') }} logs + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked + AND block_time >= CAST('2023-07-06' AS date) UNION ALL SELECT 'ethereum' as blockchain, @@ -45,5 +52,9 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('ethereum', 'logs') }} logs + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} WHERE - topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) \ No newline at end of file + topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) + AND block_time >= CAST('2023-07-06' AS date) \ 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 index 820ec49f01a..b338ba4bb73 100644 --- a/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql @@ -1,11 +1,14 @@ {{ config( - alias='ccip_tokens_transferred_logs', - materialized='view' + materialized='incremental', + file_format='delta', + incremental_strategy='merge', ) }} +{% set incremental_interval = '7' %} + SELECT 'optimism' as blockchain, block_hash, @@ -24,8 +27,12 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('optimism', 'logs') }} logs + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked + AND block_time >= CAST('2023-07-06' AS date) UNION ALL SELECT 'optimism' as blockchain, @@ -45,5 +52,9 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('optimism', 'logs') }} logs + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} WHERE - topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) \ No newline at end of file + topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) + AND block_time >= CAST('2023-07-06' AS date) \ 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 index 633f7f1d12b..e6385d6fe17 100644 --- a/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql @@ -1,11 +1,14 @@ {{ config( - alias='ccip_tokens_transferred_logs', - materialized='view' + materialized='incremental', + file_format='delta', + incremental_strategy='merge', ) }} +{% set incremental_interval = '7' %} + SELECT 'polygon' as blockchain, block_hash, @@ -24,8 +27,12 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('polygon', 'logs') }} logs + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked + AND block_time >= CAST('2023-07-06' AS date) UNION ALL SELECT 'polygon' as blockchain, @@ -45,5 +52,9 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('polygon', 'logs') }} logs + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} WHERE - topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) \ No newline at end of file + topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) + AND block_time >= CAST('2023-07-06' AS date) \ No newline at end of file From 2a855db932328309024286957b26477ba0fb71e2 Mon Sep 17 00:00:00 2001 From: AnonJon Date: Fri, 12 Apr 2024 16:26:30 -0500 Subject: [PATCH 3/7] add in incremental filter --- ...nlink_arbitrum_ccip_tokens_transferred_logs.sql | 14 +++++++------- ...nk_avalanche_c_ccip_tokens_transferred_logs.sql | 14 +++++++------- ...chainlink_base_ccip_tokens_transferred_logs.sql | 14 +++++++------- .../chainlink_bnb_ccip_tokens_transferred_logs.sql | 14 +++++++------- ...nlink_ethereum_ccip_tokens_transferred_logs.sql | 14 +++++++------- ...nlink_optimism_ccip_tokens_transferred_logs.sql | 14 +++++++------- ...inlink_polygon_ccip_tokens_transferred_logs.sql | 14 +++++++------- 7 files changed, 49 insertions(+), 49 deletions(-) diff --git a/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql b/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql index 1440c4bf796..7c267429d36 100644 --- a/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql @@ -27,12 +27,12 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('arbitrum', 'logs') }} logs - {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) - {% endif %} WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked AND block_time >= CAST('2023-07-06' AS date) + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} UNION ALL SELECT 'arbitrum' as blockchain, @@ -52,9 +52,9 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('arbitrum', 'logs') }} logs - {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) - {% endif %} WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) - AND block_time >= CAST('2023-07-06' AS date) \ No newline at end of file + AND block_time >= CAST('2023-07-06' AS date) + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} \ 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 index 6f62a65293a..2a64620a3df 100644 --- 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 @@ -27,12 +27,12 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('avalanche_c', 'logs') }} logs - {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) - {% endif %} WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked AND block_time >= CAST('2023-07-06' AS date) + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} UNION ALL SELECT 'avalanche_c' as blockchain, @@ -52,9 +52,9 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('avalanche_c', 'logs') }} logs - {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) - {% endif %} WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) - AND block_time >= CAST('2023-07-06' AS date) \ No newline at end of file + AND block_time >= CAST('2023-07-06' AS date) + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} \ 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 index 52a95ffb8e7..d74e57ed954 100644 --- a/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql @@ -27,12 +27,12 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('base', 'logs') }} logs - {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) - {% endif %} WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked AND block_time >= CAST('2023-07-06' AS date) + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} UNION ALL SELECT 'base' as blockchain, @@ -52,9 +52,9 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('base', 'logs') }} logs - {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) - {% endif %} WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) - AND block_time >= CAST('2023-07-06' AS date) \ No newline at end of file + AND block_time >= CAST('2023-07-06' AS date) + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} diff --git a/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql b/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql index 1440c4bf796..7c267429d36 100644 --- a/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql @@ -27,12 +27,12 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('arbitrum', 'logs') }} logs - {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) - {% endif %} WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked AND block_time >= CAST('2023-07-06' AS date) + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} UNION ALL SELECT 'arbitrum' as blockchain, @@ -52,9 +52,9 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('arbitrum', 'logs') }} logs - {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) - {% endif %} WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) - AND block_time >= CAST('2023-07-06' AS date) \ No newline at end of file + AND block_time >= CAST('2023-07-06' AS date) + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} \ 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 index e4d40d37426..cc06c4f16e9 100644 --- a/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql @@ -27,12 +27,12 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('ethereum', 'logs') }} logs - {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) - {% endif %} WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked AND block_time >= CAST('2023-07-06' AS date) + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} UNION ALL SELECT 'ethereum' as blockchain, @@ -52,9 +52,9 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('ethereum', 'logs') }} logs - {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) - {% endif %} WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) - AND block_time >= CAST('2023-07-06' AS date) \ No newline at end of file + AND block_time >= CAST('2023-07-06' AS date) + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} \ 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 index b338ba4bb73..b69abb4e96f 100644 --- a/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql @@ -27,12 +27,12 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('optimism', 'logs') }} logs - {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) - {% endif %} WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked AND block_time >= CAST('2023-07-06' AS date) + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} UNION ALL SELECT 'optimism' as blockchain, @@ -52,9 +52,9 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('optimism', 'logs') }} logs - {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) - {% endif %} WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) - AND block_time >= CAST('2023-07-06' AS date) \ No newline at end of file + AND block_time >= CAST('2023-07-06' AS date) + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} \ 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 index e6385d6fe17..e481d00d9cd 100644 --- a/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql @@ -27,12 +27,12 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('polygon', 'logs') }} logs - {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) - {% endif %} WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked AND block_time >= CAST('2023-07-06' AS date) + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} UNION ALL SELECT 'polygon' as blockchain, @@ -52,9 +52,9 @@ SELECT bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM {{ source('polygon', 'logs') }} logs - {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) - {% endif %} WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) - AND block_time >= CAST('2023-07-06' AS date) \ No newline at end of file + AND block_time >= CAST('2023-07-06' AS date) + {% if is_incremental() %} + AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + {% endif %} \ No newline at end of file From 585db7cf468dc6cc37642ba5594efe3e32be9e61 Mon Sep 17 00:00:00 2001 From: AnonJon Date: Sat, 20 Apr 2024 13:10:23 +0100 Subject: [PATCH 4/7] update filter --- .../chainlink_arbitrum_ccip_tokens_transferred_logs.sql | 6 ++---- .../chainlink_avalanche_c_ccip_tokens_transferred_logs.sql | 6 ++---- .../base/chainlink_base_ccip_tokens_transferred_logs.sql | 6 ++---- .../bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql | 6 ++---- .../chainlink_ethereum_ccip_tokens_transferred_logs.sql | 6 ++---- .../chainlink_optimism_ccip_tokens_transferred_logs.sql | 5 ++--- .../chainlink_polygon_ccip_tokens_transferred_logs.sql | 5 ++--- 7 files changed, 14 insertions(+), 26 deletions(-) diff --git a/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql b/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql index 7c267429d36..8825030c5c3 100644 --- a/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql @@ -7,8 +7,6 @@ ) }} -{% set incremental_interval = '7' %} - SELECT 'arbitrum' as blockchain, block_hash, @@ -31,7 +29,7 @@ WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked AND block_time >= CAST('2023-07-06' AS date) {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + AND {{ incremental_predicate('block_time') }} {% endif %} UNION ALL SELECT @@ -56,5 +54,5 @@ WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) AND block_time >= CAST('2023-07-06' AS date) {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + AND {{ incremental_predicate('block_time') }} {% endif %} \ 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 index 2a64620a3df..a1ff4da36e1 100644 --- 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 @@ -7,8 +7,6 @@ ) }} -{% set incremental_interval = '7' %} - SELECT 'avalanche_c' as blockchain, block_hash, @@ -31,7 +29,7 @@ WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked AND block_time >= CAST('2023-07-06' AS date) {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + AND {{ incremental_predicate('block_time') }} {% endif %} UNION ALL SELECT @@ -56,5 +54,5 @@ WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) AND block_time >= CAST('2023-07-06' AS date) {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + AND {{ incremental_predicate('block_time') }} {% endif %} \ 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 index d74e57ed954..0638ce710ea 100644 --- a/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql @@ -7,8 +7,6 @@ ) }} -{% set incremental_interval = '7' %} - SELECT 'base' as blockchain, block_hash, @@ -31,7 +29,7 @@ WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked AND block_time >= CAST('2023-07-06' AS date) {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + AND {{ incremental_predicate('block_time') }} {% endif %} UNION ALL SELECT @@ -56,5 +54,5 @@ WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) AND block_time >= CAST('2023-07-06' AS date) {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + AND {{ incremental_predicate('block_time') }} {% endif %} diff --git a/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql b/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql index 7c267429d36..8825030c5c3 100644 --- a/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql @@ -7,8 +7,6 @@ ) }} -{% set incremental_interval = '7' %} - SELECT 'arbitrum' as blockchain, block_hash, @@ -31,7 +29,7 @@ WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked AND block_time >= CAST('2023-07-06' AS date) {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + AND {{ incremental_predicate('block_time') }} {% endif %} UNION ALL SELECT @@ -56,5 +54,5 @@ WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) AND block_time >= CAST('2023-07-06' AS date) {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + AND {{ incremental_predicate('block_time') }} {% endif %} \ 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 index cc06c4f16e9..8ea129f6e05 100644 --- a/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql @@ -7,8 +7,6 @@ ) }} -{% set incremental_interval = '7' %} - SELECT 'ethereum' as blockchain, block_hash, @@ -31,7 +29,7 @@ WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked AND block_time >= CAST('2023-07-06' AS date) {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + AND {{ incremental_predicate('block_time') }} {% endif %} UNION ALL SELECT @@ -56,5 +54,5 @@ WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) AND block_time >= CAST('2023-07-06' AS date) {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + AND {{ incremental_predicate('block_time') }} {% endif %} \ 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 index b69abb4e96f..a7fb777e6ab 100644 --- a/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql @@ -7,7 +7,6 @@ ) }} -{% set incremental_interval = '7' %} SELECT 'optimism' as blockchain, @@ -31,7 +30,7 @@ WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked AND block_time >= CAST('2023-07-06' AS date) {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + AND {{ incremental_predicate('block_time') }} {% endif %} UNION ALL SELECT @@ -56,5 +55,5 @@ WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) AND block_time >= CAST('2023-07-06' AS date) {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + AND {{ incremental_predicate('block_time') }} {% endif %} \ 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 index e481d00d9cd..208d339db89 100644 --- a/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql @@ -7,7 +7,6 @@ ) }} -{% set incremental_interval = '7' %} SELECT 'polygon' as blockchain, @@ -31,7 +30,7 @@ WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked AND block_time >= CAST('2023-07-06' AS date) {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + AND {{ incremental_predicate('block_time') }} {% endif %} UNION ALL SELECT @@ -56,5 +55,5 @@ WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) AND block_time >= CAST('2023-07-06' AS date) {% if is_incremental() %} - AND block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day) + AND {{ incremental_predicate('block_time') }} {% endif %} \ No newline at end of file From b0445d4600e931840d1694c49910ffc28e8fbe76 Mon Sep 17 00:00:00 2001 From: AnonJon Date: Sat, 20 Apr 2024 16:25:37 +0100 Subject: [PATCH 5/7] add unique tests --- ...ink_arbitrum_ccip_tokens_transferred_logs.sql | 8 ++++++-- .../arbitrum/chainlink_arbitrum_schema.yml | 6 ++++++ ..._avalanche_c_ccip_tokens_transferred_logs.sql | 8 ++++++-- .../avalanche_c/chainlink_avalanche_c_schema.yml | 6 ++++++ ...ainlink_base_ccip_tokens_transferred_logs.sql | 8 ++++++-- models/chainlink/base/chainlink_base_schema.yml | 6 ++++++ ...hainlink_bnb_ccip_tokens_transferred_logs.sql | 16 ++++++++++------ models/chainlink/bnb/chainlink_bnb_schema.yml | 6 ++++++ models/chainlink/chainlink_schema.yml | 6 ++++++ ...ink_ethereum_ccip_tokens_transferred_logs.sql | 8 ++++++-- .../ethereum/chainlink_ethereum_schema.yml | 6 ++++++ ...ink_optimism_ccip_tokens_transferred_logs.sql | 7 +++++-- .../optimism/chainlink_optimism_schema.yml | 6 ++++++ ...link_polygon_ccip_tokens_transferred_logs.sql | 7 +++++-- .../polygon/chainlink_polygon_schema.yml | 6 ++++++ 15 files changed, 92 insertions(+), 18 deletions(-) diff --git a/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql b/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql index 8825030c5c3..1b2507db1f8 100644 --- a/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql @@ -1,12 +1,16 @@ {{ config( + schema='chainlink_arbitrum', alias='ccip_tokens_transferred_logs', materialized='incremental', file_format='delta', incremental_strategy='merge', + unique_key=['blockchain', 'tx_hash', 'tx_index'] ) }} +{% set project_start_date = '2023-07-06' %} + SELECT 'arbitrum' as blockchain, block_hash, @@ -27,7 +31,7 @@ FROM {{ source('arbitrum', 'logs') }} logs WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked - AND block_time >= CAST('2023-07-06' AS date) + AND block_time >= TIMESTAMP '{{project_start_date}}' {% if is_incremental() %} AND {{ incremental_predicate('block_time') }} {% endif %} @@ -52,7 +56,7 @@ FROM {{ source('arbitrum', 'logs') }} logs WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) - AND block_time >= CAST('2023-07-06' AS date) + 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 7b4bea54af0..9bcdb219dca 100644 --- a/models/chainlink/arbitrum/chainlink_arbitrum_schema.yml +++ b/models/chainlink/arbitrum/chainlink_arbitrum_schema.yml @@ -1178,6 +1178,12 @@ models: tags: ["chainlink", "ccip", "tokens", "transferred", "logs", "arbitrum"] description: > Chainlink CCIP Tokens Transferred Logs + tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - blockchain + - tx_hash + - tx_index columns: - *blockchain - *block_hash 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 index a1ff4da36e1..f202ad2a326 100644 --- 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 @@ -1,12 +1,16 @@ {{ config( + schema='chainlink_avalanche_c', alias='ccip_tokens_transferred_logs', materialized='incremental', file_format='delta', incremental_strategy='merge', + unique_key=['blockchain', 'tx_hash', 'tx_index'] ) }} +{% set project_start_date = '2023-07-06' %} + SELECT 'avalanche_c' as blockchain, block_hash, @@ -27,7 +31,7 @@ FROM {{ source('avalanche_c', 'logs') }} logs WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked - AND block_time >= CAST('2023-07-06' AS date) + AND block_time >= TIMESTAMP '{{project_start_date}}' {% if is_incremental() %} AND {{ incremental_predicate('block_time') }} {% endif %} @@ -52,7 +56,7 @@ FROM {{ source('avalanche_c', 'logs') }} logs WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) - AND block_time >= CAST('2023-07-06' AS date) + 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 6d368f01538..8062ae78c99 100644 --- a/models/chainlink/avalanche_c/chainlink_avalanche_c_schema.yml +++ b/models/chainlink/avalanche_c/chainlink_avalanche_c_schema.yml @@ -1411,6 +1411,12 @@ models: ["chainlink", "ccip", "tokens", "transferred", "logs", "avalanche_c"] description: > Chainlink CCIP Tokens Transferred Logs + tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - blockchain + - tx_hash + - tx_index columns: - *blockchain - *block_hash diff --git a/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql b/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql index 0638ce710ea..afcab0a6d7e 100644 --- a/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql @@ -1,12 +1,16 @@ {{ config( + schema='chainlink_base', alias='ccip_tokens_transferred_logs', materialized='incremental', file_format='delta', incremental_strategy='merge', + unique_key=['blockchain', 'tx_hash', 'tx_index'] ) }} +{% set project_start_date = '2023-07-06' %} + SELECT 'base' as blockchain, block_hash, @@ -27,7 +31,7 @@ FROM {{ source('base', 'logs') }} logs WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked - AND block_time >= CAST('2023-07-06' AS date) + AND block_time >= TIMESTAMP '{{project_start_date}}' {% if is_incremental() %} AND {{ incremental_predicate('block_time') }} {% endif %} @@ -52,7 +56,7 @@ FROM {{ source('base', 'logs') }} logs WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) - AND block_time >= CAST('2023-07-06' AS date) + 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 0977d2c0a5c..ba975275873 100644 --- a/models/chainlink/base/chainlink_base_schema.yml +++ b/models/chainlink/base/chainlink_base_schema.yml @@ -273,6 +273,12 @@ models: tags: ["chainlink", "ccip", "tokens", "transferred", "logs", "base"] description: > Chainlink CCIP Tokens Transferred Logs + tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - blockchain + - tx_hash + - tx_index columns: - *blockchain - *block_hash diff --git a/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql b/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql index 8825030c5c3..d480a3ec739 100644 --- a/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql @@ -1,14 +1,18 @@ {{ config( + schema='chainlink_bnb', alias='ccip_tokens_transferred_logs', materialized='incremental', file_format='delta', incremental_strategy='merge', + unique_key=['blockchain', 'tx_hash', 'tx_index'] ) }} +{% set project_start_date = '2023-07-06' %} + SELECT - 'arbitrum' as blockchain, + 'bnb' as blockchain, block_hash, contract_address, data, @@ -24,16 +28,16 @@ SELECT tx_from, bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM - {{ source('arbitrum', 'logs') }} logs + {{ source('bnb', 'logs') }} logs WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked - AND block_time >= CAST('2023-07-06' AS date) + AND block_time >= TIMESTAMP '{{project_start_date}}' {% if is_incremental() %} AND {{ incremental_predicate('block_time') }} {% endif %} UNION ALL SELECT - 'arbitrum' as blockchain, + 'bnb' as blockchain, block_hash, contract_address, data, @@ -49,10 +53,10 @@ SELECT tx_from, bytearray_to_uint256(bytearray_substring(data, 1, 32)) as total_tokens FROM - {{ source('arbitrum', 'logs') }} logs + {{ source('bnb', 'logs') }} logs WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) - AND block_time >= CAST('2023-07-06' AS date) + 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 60a2038d236..560402e8de6 100644 --- a/models/chainlink/bnb/chainlink_bnb_schema.yml +++ b/models/chainlink/bnb/chainlink_bnb_schema.yml @@ -1385,6 +1385,12 @@ models: tags: ["chainlink", "ccip", "tokens", "transferred", "logs", "bnb"] description: > Chainlink CCIP Tokens Transferred Logs + tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - blockchain + - tx_hash + - tx_index columns: - *blockchain - *block_hash diff --git a/models/chainlink/chainlink_schema.yml b/models/chainlink/chainlink_schema.yml index f7846a2148c..41700941e83 100644 --- a/models/chainlink/chainlink_schema.yml +++ b/models/chainlink/chainlink_schema.yml @@ -2333,6 +2333,12 @@ models: ] description: > Chainlink CCIP Tokens Transferred Logs + tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - blockchain + - tx_hash + - tx_index columns: - *blockchain - *block_hash diff --git a/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql b/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql index 8ea129f6e05..5532ca373b1 100644 --- a/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql @@ -1,12 +1,16 @@ {{ config( + schema='chainlink_ethereum', alias='ccip_tokens_transferred_logs', materialized='incremental', file_format='delta', incremental_strategy='merge', + unique_key=['blockchain', 'tx_hash', 'tx_index'] ) }} +{% set project_start_date = '2023-07-06' %} + SELECT 'ethereum' as blockchain, block_hash, @@ -27,7 +31,7 @@ FROM {{ source('ethereum', 'logs') }} logs WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked - AND block_time >= CAST('2023-07-06' AS date) + AND block_time >= TIMESTAMP '{{project_start_date}}' {% if is_incremental() %} AND {{ incremental_predicate('block_time') }} {% endif %} @@ -52,7 +56,7 @@ FROM {{ source('ethereum', 'logs') }} logs WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) - AND block_time >= CAST('2023-07-06' AS date) + 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 c7497c8415e..7a86beb07aa 100644 --- a/models/chainlink/ethereum/chainlink_ethereum_schema.yml +++ b/models/chainlink/ethereum/chainlink_ethereum_schema.yml @@ -1382,6 +1382,12 @@ models: tags: ["chainlink", "ccip", "tokens", "transferred", "logs", "ethereum"] description: > Chainlink CCIP Tokens Transferred Logs + tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - blockchain + - tx_hash + - tx_index columns: - *blockchain - *block_hash diff --git a/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql b/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql index a7fb777e6ab..57a13c7c3dc 100644 --- a/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql @@ -1,12 +1,15 @@ {{ config( + schema='chainlink_optimism', alias='ccip_tokens_transferred_logs', materialized='incremental', file_format='delta', incremental_strategy='merge', + unique_key=['blockchain', 'tx_hash', 'tx_index'] ) }} +{% set project_start_date = '2023-07-06' %} SELECT 'optimism' as blockchain, @@ -28,7 +31,7 @@ FROM {{ source('optimism', 'logs') }} logs WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked - AND block_time >= CAST('2023-07-06' AS date) + AND block_time >= TIMESTAMP '{{project_start_date}}' {% if is_incremental() %} AND {{ incremental_predicate('block_time') }} {% endif %} @@ -53,7 +56,7 @@ FROM {{ source('optimism', 'logs') }} logs WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) - AND block_time >= CAST('2023-07-06' AS date) + 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 52072a9ce36..0737027bb01 100644 --- a/models/chainlink/optimism/chainlink_optimism_schema.yml +++ b/models/chainlink/optimism/chainlink_optimism_schema.yml @@ -915,6 +915,12 @@ models: tags: ["chainlink", "ccip", "tokens", "locked", "logs", "optimism"] description: > Chainlink CCIP Tokens Transferred Logs + tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - blockchain + - tx_hash + - tx_index columns: - *blockchain - *block_hash diff --git a/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql b/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql index 208d339db89..038dfa6f768 100644 --- a/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql @@ -1,12 +1,15 @@ {{ config( + schema='chainlink_polygon', alias='ccip_tokens_transferred_logs', materialized='incremental', file_format='delta', incremental_strategy='merge', + unique_key=['blockchain', 'tx_hash', 'tx_index'] ) }} +{% set project_start_date = '2023-07-06' %} SELECT 'polygon' as blockchain, @@ -28,7 +31,7 @@ FROM {{ source('polygon', 'logs') }} logs WHERE topic0 = 0x9f1ec8c880f76798e7b793325d625e9b60e4082a553c98f42b6cda368dd60008 -- Locked - AND block_time >= CAST('2023-07-06' AS date) + AND block_time >= TIMESTAMP '{{project_start_date}}' {% if is_incremental() %} AND {{ incremental_predicate('block_time') }} {% endif %} @@ -53,7 +56,7 @@ FROM {{ source('polygon', 'logs') }} logs WHERE topic0 = 0x696de425f79f4a40bc6d2122ca50507f0efbeabbff86a84871b7196ab8ea8df7 -- Burned(address,uint256) - AND block_time >= CAST('2023-07-06' AS date) + 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 c2f80e71781..9329fd5aac5 100644 --- a/models/chainlink/polygon/chainlink_polygon_schema.yml +++ b/models/chainlink/polygon/chainlink_polygon_schema.yml @@ -1406,6 +1406,12 @@ models: tags: ["chainlink", "ccip", "tokens", "transferred", "logs", "polygon"] description: > Chainlink CCIP Tokens Transferred Logs + tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - blockchain + - tx_hash + - tx_index columns: - *blockchain - *block_hash From c2e4b62805ad9a8b65deddbe0da8266336af57eb Mon Sep 17 00:00:00 2001 From: AnonJon Date: Sat, 20 Apr 2024 16:53:02 +0100 Subject: [PATCH 6/7] tx_index to index --- models/chainlink/arbitrum/chainlink_arbitrum_schema.yml | 2 +- .../chainlink_avalanche_c_ccip_tokens_transferred_logs.sql | 2 +- models/chainlink/avalanche_c/chainlink_avalanche_c_schema.yml | 2 +- .../base/chainlink_base_ccip_tokens_transferred_logs.sql | 2 +- models/chainlink/base/chainlink_base_schema.yml | 2 +- .../bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql | 2 +- models/chainlink/bnb/chainlink_bnb_schema.yml | 2 +- models/chainlink/chainlink_schema.yml | 2 +- .../chainlink_ethereum_ccip_tokens_transferred_logs.sql | 2 +- models/chainlink/ethereum/chainlink_ethereum_schema.yml | 2 +- .../chainlink_optimism_ccip_tokens_transferred_logs.sql | 2 +- models/chainlink/optimism/chainlink_optimism_schema.yml | 2 +- .../polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql | 2 +- models/chainlink/polygon/chainlink_polygon_schema.yml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/models/chainlink/arbitrum/chainlink_arbitrum_schema.yml b/models/chainlink/arbitrum/chainlink_arbitrum_schema.yml index 9bcdb219dca..4c6e0f3f926 100644 --- a/models/chainlink/arbitrum/chainlink_arbitrum_schema.yml +++ b/models/chainlink/arbitrum/chainlink_arbitrum_schema.yml @@ -1183,7 +1183,7 @@ models: combination_of_columns: - blockchain - tx_hash - - tx_index + - index columns: - *blockchain - *block_hash 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 index f202ad2a326..bf4010d6417 100644 --- 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 @@ -5,7 +5,7 @@ materialized='incremental', file_format='delta', incremental_strategy='merge', - unique_key=['blockchain', 'tx_hash', 'tx_index'] + unique_key=['blockchain', 'tx_hash', 'index'] ) }} diff --git a/models/chainlink/avalanche_c/chainlink_avalanche_c_schema.yml b/models/chainlink/avalanche_c/chainlink_avalanche_c_schema.yml index 8062ae78c99..1a8e8453f98 100644 --- a/models/chainlink/avalanche_c/chainlink_avalanche_c_schema.yml +++ b/models/chainlink/avalanche_c/chainlink_avalanche_c_schema.yml @@ -1416,7 +1416,7 @@ models: combination_of_columns: - blockchain - tx_hash - - tx_index + - index columns: - *blockchain - *block_hash diff --git a/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql b/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql index afcab0a6d7e..e3ccaf7e238 100644 --- a/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/base/chainlink_base_ccip_tokens_transferred_logs.sql @@ -5,7 +5,7 @@ materialized='incremental', file_format='delta', incremental_strategy='merge', - unique_key=['blockchain', 'tx_hash', 'tx_index'] + unique_key=['blockchain', 'tx_hash', 'index'] ) }} diff --git a/models/chainlink/base/chainlink_base_schema.yml b/models/chainlink/base/chainlink_base_schema.yml index ba975275873..4edc8571bdc 100644 --- a/models/chainlink/base/chainlink_base_schema.yml +++ b/models/chainlink/base/chainlink_base_schema.yml @@ -278,7 +278,7 @@ models: combination_of_columns: - blockchain - tx_hash - - tx_index + - index columns: - *blockchain - *block_hash diff --git a/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql b/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql index d480a3ec739..10dcca600d8 100644 --- a/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/bnb/chainlink_bnb_ccip_tokens_transferred_logs.sql @@ -5,7 +5,7 @@ materialized='incremental', file_format='delta', incremental_strategy='merge', - unique_key=['blockchain', 'tx_hash', 'tx_index'] + unique_key=['blockchain', 'tx_hash', 'index'] ) }} diff --git a/models/chainlink/bnb/chainlink_bnb_schema.yml b/models/chainlink/bnb/chainlink_bnb_schema.yml index 560402e8de6..c8c8f6a7a18 100644 --- a/models/chainlink/bnb/chainlink_bnb_schema.yml +++ b/models/chainlink/bnb/chainlink_bnb_schema.yml @@ -1390,7 +1390,7 @@ models: combination_of_columns: - blockchain - tx_hash - - tx_index + - index columns: - *blockchain - *block_hash diff --git a/models/chainlink/chainlink_schema.yml b/models/chainlink/chainlink_schema.yml index 41700941e83..7d72f847e9d 100644 --- a/models/chainlink/chainlink_schema.yml +++ b/models/chainlink/chainlink_schema.yml @@ -2338,7 +2338,7 @@ models: combination_of_columns: - blockchain - tx_hash - - tx_index + - index columns: - *blockchain - *block_hash diff --git a/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql b/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql index 5532ca373b1..c338be21f5a 100644 --- a/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/ethereum/chainlink_ethereum_ccip_tokens_transferred_logs.sql @@ -5,7 +5,7 @@ materialized='incremental', file_format='delta', incremental_strategy='merge', - unique_key=['blockchain', 'tx_hash', 'tx_index'] + unique_key=['blockchain', 'tx_hash', 'index'] ) }} diff --git a/models/chainlink/ethereum/chainlink_ethereum_schema.yml b/models/chainlink/ethereum/chainlink_ethereum_schema.yml index 7a86beb07aa..a2a57605566 100644 --- a/models/chainlink/ethereum/chainlink_ethereum_schema.yml +++ b/models/chainlink/ethereum/chainlink_ethereum_schema.yml @@ -1387,7 +1387,7 @@ models: combination_of_columns: - blockchain - tx_hash - - tx_index + - index columns: - *blockchain - *block_hash diff --git a/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql b/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql index 57a13c7c3dc..5527d43f66e 100644 --- a/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/optimism/chainlink_optimism_ccip_tokens_transferred_logs.sql @@ -5,7 +5,7 @@ materialized='incremental', file_format='delta', incremental_strategy='merge', - unique_key=['blockchain', 'tx_hash', 'tx_index'] + unique_key=['blockchain', 'tx_hash', 'index'] ) }} diff --git a/models/chainlink/optimism/chainlink_optimism_schema.yml b/models/chainlink/optimism/chainlink_optimism_schema.yml index 0737027bb01..a0f43ab513a 100644 --- a/models/chainlink/optimism/chainlink_optimism_schema.yml +++ b/models/chainlink/optimism/chainlink_optimism_schema.yml @@ -920,7 +920,7 @@ models: combination_of_columns: - blockchain - tx_hash - - tx_index + - index columns: - *blockchain - *block_hash diff --git a/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql b/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql index 038dfa6f768..d3f62ff5600 100644 --- a/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/polygon/chainlink_polygon_ccip_tokens_transferred_logs.sql @@ -5,7 +5,7 @@ materialized='incremental', file_format='delta', incremental_strategy='merge', - unique_key=['blockchain', 'tx_hash', 'tx_index'] + unique_key=['blockchain', 'tx_hash', 'index'] ) }} diff --git a/models/chainlink/polygon/chainlink_polygon_schema.yml b/models/chainlink/polygon/chainlink_polygon_schema.yml index 9329fd5aac5..16c2e898440 100644 --- a/models/chainlink/polygon/chainlink_polygon_schema.yml +++ b/models/chainlink/polygon/chainlink_polygon_schema.yml @@ -1411,7 +1411,7 @@ models: combination_of_columns: - blockchain - tx_hash - - tx_index + - index columns: - *blockchain - *block_hash From 5c8d061ef3e77046d38d0f7b23421f93c5df88b1 Mon Sep 17 00:00:00 2001 From: AnonJon Date: Sat, 20 Apr 2024 17:06:34 +0100 Subject: [PATCH 7/7] tx_index to index --- .../chainlink_arbitrum_ccip_tokens_transferred_logs.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql b/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql index 1b2507db1f8..0ba0898558a 100644 --- a/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql +++ b/models/chainlink/arbitrum/chainlink_arbitrum_ccip_tokens_transferred_logs.sql @@ -5,7 +5,7 @@ materialized='incremental', file_format='delta', incremental_strategy='merge', - unique_key=['blockchain', 'tx_hash', 'tx_index'] + unique_key=['blockchain', 'tx_hash', 'index'] ) }}