diff --git a/daily_spellbook/dbt_project.yml b/daily_spellbook/dbt_project.yml index 77f25cd989f..a9e98710080 100644 --- a/daily_spellbook/dbt_project.yml +++ b/daily_spellbook/dbt_project.yml @@ -22,6 +22,7 @@ vars: # You don't need to change these! model-paths: ["models", "../sources"] analysis-paths: ["analyses"] +# ../tests/* should be added to a separate shared folder test-paths: ["tests"] seed-paths: ["seeds"] macro-paths: ["../macros"] @@ -43,9 +44,9 @@ tests: # For configuring individual seeds (e.g. overriding column types) we recommend a yml file nested in the same folder as the seed # example: seeds/cryptopunks/schema.yml # TODO: uncomment when seeds are added -# seeds: -# daily_spellbook: -# +schema: test_data +seeds: + daily_spellbook: + +schema: test_data # defining search order of macro invokation dispatch: diff --git a/models/account_abstraction/erc4337/account_abstraction_erc4337_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/account_abstraction_erc4337_account_deployed.sql similarity index 100% rename from models/account_abstraction/erc4337/account_abstraction_erc4337_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/account_abstraction_erc4337_account_deployed.sql diff --git a/models/account_abstraction/erc4337/account_abstraction_erc4337_schema.yml b/daily_spellbook/models/account_abstraction/erc4337/account_abstraction_erc4337_schema.yml similarity index 100% rename from models/account_abstraction/erc4337/account_abstraction_erc4337_schema.yml rename to daily_spellbook/models/account_abstraction/erc4337/account_abstraction_erc4337_schema.yml diff --git a/models/account_abstraction/erc4337/account_abstraction_erc4337_userops.sql b/daily_spellbook/models/account_abstraction/erc4337/account_abstraction_erc4337_userops.sql similarity index 100% rename from models/account_abstraction/erc4337/account_abstraction_erc4337_userops.sql rename to daily_spellbook/models/account_abstraction/erc4337/account_abstraction_erc4337_userops.sql diff --git a/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_account_deployed.sql similarity index 90% rename from models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_account_deployed.sql index 7b9179f5438..db3d42b5973 100644 --- a/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_account_deployed.sql @@ -1,6 +1,6 @@ {{ config( alias = 'account_deployed', - + schema = 'account_abstraction_erc4337_arbitrum', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', @@ -18,7 +18,7 @@ , ref('account_abstraction_erc4337_arbitrum_v0_6_account_deployed') ] %} -SELECT +SELECT blockchain , version , block_time @@ -31,7 +31,7 @@ SELECT , factory FROM ( {% for erc4337_model in erc4337_base_models %} - SELECT + SELECT blockchain , version , block_time @@ -43,9 +43,9 @@ FROM ( , paymaster , factory FROM {{ erc4337_model }} - + {% if is_incremental() %} - WHERE block_time >= date_trunc('day', now() - interval '7' day) + WHERE {{ incremental_predicate('block_time') }} {% endif %} {% if not loop.last %} diff --git a/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_schema.yml b/daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_schema.yml similarity index 100% rename from models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_schema.yml rename to daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_schema.yml diff --git a/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_userops.sql b/daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_userops.sql similarity index 90% rename from models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_userops.sql rename to daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_userops.sql index 26089c2eaba..d4d5961f59f 100644 --- a/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_userops.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_userops.sql @@ -1,6 +1,6 @@ {{ config( alias = 'userops', - + schema = 'account_abstraction_erc4337_arbitrum', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', @@ -27,7 +27,7 @@ with userop as( SELECT * FROM ( {% for erc4337_model in erc4337_models %} - SELECT + SELECT blockchain , version , block_month @@ -42,16 +42,16 @@ with userop as( , beneficiary FROM {{ erc4337_model }} {% if is_incremental() %} - WHERE block_time >= date_trunc('day', now() - interval '7' day) + WHERE {{ incremental_predicate('block_time') }} {% endif %} {% if not loop.last %} UNION ALL {% endif %} - {% endfor %} + {% endfor %} ) ) , txs as ( - select + select hash as tx_hash , tx."from" as tx_from , tx.to as tx_to @@ -63,11 +63,11 @@ with userop as( ) and block_time > date '{{deployed_date}}' {% if is_incremental() %} - and block_time >= date_trunc('day', now() - interval '7' day) + and {{ incremental_predicate('block_time') }} {% endif %} ) , price as ( - select symbol, decimals, minute, price + select symbol, decimals, minute, price from {{source('prices','usd')}} where minute > date '{{deployed_date}}' and contract_address={{wrapped_gas_address}} @@ -76,7 +76,7 @@ with userop as( and minute >= date_trunc('day', now() - interval '7' day) {% endif %} ) -select +select userop.blockchain , userop.version , userop.block_month @@ -95,6 +95,6 @@ select , txs.tx_fee , txs.tx_fee * price.price as tx_fee_usd , userop.beneficiary -from userop +from userop left join txs on userop.tx_hash = txs.tx_hash left join price on date_trunc('minute', userop.block_time) = price.minute \ No newline at end of file diff --git a/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_5_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_5_account_deployed.sql similarity index 89% rename from models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_5_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_5_account_deployed.sql index be330837a89..ed1fd5aee55 100644 --- a/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_5_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_5_account_deployed.sql @@ -1,7 +1,8 @@ {{ config ( alias = 'v0_5_account_deployed', - + schema = 'account_abstraction_erc4337_arbitrum', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_5_userops_basics.sql b/daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_5_userops_basics.sql similarity index 93% rename from models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_5_userops_basics.sql rename to daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_5_userops_basics.sql index 832cafc92c8..76e34250a4a 100644 --- a/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_5_userops_basics.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_5_userops_basics.sql @@ -1,7 +1,8 @@ {{ config ( alias = 'v0_5_userops_basics', - + schema = 'account_abstraction_erc4337_arbitrum', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_6_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_6_account_deployed.sql similarity index 89% rename from models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_6_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_6_account_deployed.sql index acbbe736b20..f18d129376f 100644 --- a/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_6_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_6_account_deployed.sql @@ -1,7 +1,8 @@ {{ config ( alias = 'v0_6_account_deployed', - + schema = 'account_abstraction_erc4337_arbitrum', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_6_userops_basics.sql b/daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_6_userops_basics.sql similarity index 93% rename from models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_6_userops_basics.sql rename to daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_6_userops_basics.sql index a85c7dfac92..1fe9f3d8969 100644 --- a/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_6_userops_basics.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/arbitrum/account_abstraction_erc4337_arbitrum_v0_6_userops_basics.sql @@ -1,7 +1,7 @@ {{ config ( alias = 'v0_6_userops_basics', - + schema = 'account_abstraction_erc4337_arbitrum', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_account_deployed.sql similarity index 90% rename from models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_account_deployed.sql index cade6d83677..7ce08ff1d34 100644 --- a/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_account_deployed.sql @@ -1,6 +1,7 @@ {{ config( alias = 'account_deployed', - + + schema = 'account_abstraction_erc4337_avalanche_c', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', @@ -18,7 +19,7 @@ , ref('account_abstraction_erc4337_avalanche_c_v0_6_account_deployed') ] %} -SELECT +SELECT blockchain , version , block_time @@ -31,7 +32,7 @@ SELECT , factory FROM ( {% for erc4337_model in erc4337_base_models %} - SELECT + SELECT blockchain , version , block_time @@ -43,9 +44,9 @@ FROM ( , paymaster , factory FROM {{ erc4337_model }} - + {% if is_incremental() %} - WHERE block_time >= date_trunc('day', now() - interval '7' day) + WHERE {{ incremental_predicate('block_time') }} {% endif %} {% if not loop.last %} diff --git a/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_schema.yml b/daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_schema.yml similarity index 100% rename from models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_schema.yml rename to daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_schema.yml diff --git a/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_userops.sql b/daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_userops.sql similarity index 94% rename from models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_userops.sql rename to daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_userops.sql index 3b384a57bb1..f7beecf4be2 100644 --- a/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_userops.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_userops.sql @@ -1,6 +1,7 @@ {{ config( alias = 'userops', - + schema = 'account_abstraction_erc4337_avalanche_c', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_5_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_5_account_deployed.sql similarity index 89% rename from models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_5_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_5_account_deployed.sql index e66f6888d63..19ea0e92f56 100644 --- a/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_5_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_5_account_deployed.sql @@ -1,7 +1,8 @@ {{ config ( alias = 'v0_5_account_deployed', - + schema = 'account_abstraction_erc4337_avalanche_c', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_5_userops_basics.sql b/daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_5_userops_basics.sql similarity index 93% rename from models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_5_userops_basics.sql rename to daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_5_userops_basics.sql index cc5e2023afc..ae104dcc1d8 100644 --- a/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_5_userops_basics.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_5_userops_basics.sql @@ -1,6 +1,7 @@ {{ config( alias = 'v0_5_userops_basics', - + schema = 'account_abstraction_erc4337_avalanche_c', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_6_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_6_account_deployed.sql similarity index 89% rename from models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_6_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_6_account_deployed.sql index a1667e50bd2..aac4f9fb03b 100644 --- a/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_6_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_6_account_deployed.sql @@ -1,7 +1,8 @@ {{ config ( alias = 'v0_6_account_deployed', - + schema = 'account_abstraction_erc4337_avalanche_c', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_6_userops_basics.sql b/daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_6_userops_basics.sql similarity index 93% rename from models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_6_userops_basics.sql rename to daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_6_userops_basics.sql index e5026f34320..857787a7522 100644 --- a/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_6_userops_basics.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/avalanche_c/account_abstraction_erc4337_avalanche_c_v0_6_userops_basics.sql @@ -1,6 +1,7 @@ {{ config( alias = 'v0_6_userops_basics', - + schema = 'account_abstraction_erc4337_avalanche_c', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_account_deployed.sql similarity index 91% rename from models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_account_deployed.sql index 543ba2bd8f8..248cbde03e0 100644 --- a/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_account_deployed.sql @@ -1,6 +1,6 @@ {{ config( alias = 'account_deployed', - + schema = 'account_abstraction_erc4337_base', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', @@ -18,7 +18,7 @@ , ref('account_abstraction_erc4337_base_v0_7_account_deployed') ] %} -SELECT +SELECT blockchain , version , block_time @@ -31,7 +31,7 @@ SELECT , factory FROM ( {% for erc4337_model in erc4337_base_models %} - SELECT + SELECT blockchain , version , block_time @@ -43,9 +43,9 @@ FROM ( , paymaster , factory FROM {{ erc4337_model }} - + {% if is_incremental() %} - WHERE block_time >= date_trunc('day', now() - interval '7' day) + WHERE {{ incremental_predicate('block_time') }} {% endif %} {% if not loop.last %} diff --git a/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_schema.yml b/daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_schema.yml similarity index 100% rename from models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_schema.yml rename to daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_schema.yml diff --git a/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_userops.sql b/daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_userops.sql similarity index 88% rename from models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_userops.sql rename to daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_userops.sql index c946b599f95..1cc0f6faa98 100644 --- a/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_userops.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_userops.sql @@ -1,6 +1,6 @@ {{ config( alias = 'userops', - + schema = 'account_abstraction_erc4337_base', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', @@ -16,7 +16,7 @@ {% set chain = 'base' %} {% set gas_symbol = 'ETH' %} --currently, base chain price data is not integrated in Dune, use optimism instead -{% set wrapped_gas_address = '0x4200000000000000000000000000000000000006' %} +{% set wrapped_gas_address = '0x4200000000000000000000000000000000000006' %} {% set deployed_date = '2023-02-15' %} {% set erc4337_models = [ @@ -28,7 +28,7 @@ with userop as( SELECT * FROM ( {% for erc4337_model in erc4337_models %} - SELECT + SELECT blockchain , version , block_month @@ -43,41 +43,41 @@ with userop as( , beneficiary FROM {{ erc4337_model }} {% if is_incremental() %} - WHERE block_time >= date_trunc('day', now() - interval '7' day) + WHERE {{ incremental_predicate('block_time') }} {% endif %} {% if not loop.last %} UNION ALL {% endif %} - {% endfor %} + {% endfor %} ) ) , txs as ( - select + select hash as tx_hash , tx."from" as tx_from , tx.to as tx_to , '{{gas_symbol}}' as gas_symbol - , ((cast(gas_used as double) * gas_price)+l1_fee) / 1e18 as tx_fee + , ((cast(gas_used as double) * gas_price)+l1_fee) / 1e18 as tx_fee from {{ source('base', 'transactions') }} tx where hash in ( select tx_hash from userop ) and block_time > date '{{deployed_date}}' {% if is_incremental() %} - and block_time >= date_trunc('day', now() - interval '7' day) + and {{ incremental_predicate('block_time') }} {% endif %} ) , price as ( - select symbol, decimals, minute, price + select symbol, decimals, minute, price from {{source('prices','usd')}} - where minute > date '{{deployed_date}}' + where minute > date '{{deployed_date}}' and contract_address={{wrapped_gas_address}} and blockchain='optimism' {% if is_incremental() %} and minute >= date_trunc('day', now() - interval '7' day) {% endif %} ) -select +select userop.blockchain , userop.version , userop.block_month @@ -96,6 +96,6 @@ select , txs.tx_fee , txs.tx_fee * price.price as tx_fee_usd , userop.beneficiary -from userop +from userop left join txs on userop.tx_hash = txs.tx_hash left join price on date_trunc('minute', userop.block_time) = price.minute \ No newline at end of file diff --git a/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_6_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_6_account_deployed.sql similarity index 90% rename from models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_6_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_6_account_deployed.sql index 9e347739ad1..031a32b36d6 100644 --- a/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_6_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_6_account_deployed.sql @@ -1,7 +1,7 @@ {{ config ( alias = 'v0_6_account_deployed', - + schema = 'account_abstraction_erc4337_base', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_6_userops_basics.sql b/daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_6_userops_basics.sql similarity index 93% rename from models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_6_userops_basics.sql rename to daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_6_userops_basics.sql index a33fd942204..b0f0a76cf57 100644 --- a/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_6_userops_basics.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_6_userops_basics.sql @@ -1,7 +1,8 @@ {{ config ( alias = 'v0_6_userops_basics', - + schema = 'account_abstraction_erc4337_base', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_7_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_7_account_deployed.sql similarity index 90% rename from models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_7_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_7_account_deployed.sql index 8cf81a17f75..b0e591d19dc 100644 --- a/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_7_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_7_account_deployed.sql @@ -1,7 +1,8 @@ {{ config ( alias = 'v0_7_account_deployed', - + schema = 'account_abstraction_erc4337_base', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_7_userops_basics.sql b/daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_7_userops_basics.sql similarity index 93% rename from models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_7_userops_basics.sql rename to daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_7_userops_basics.sql index 116db3b5b8c..0cc3fd58bf0 100644 --- a/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_7_userops_basics.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/base/account_abstraction_erc4337_base_v0_7_userops_basics.sql @@ -1,7 +1,8 @@ {{ config ( alias = 'v0_7_userops_basics', - + schema = 'account_abstraction_erc4337_base', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_account_deployed.sql similarity index 90% rename from models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_account_deployed.sql index b348571e66a..62d97d59325 100644 --- a/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_account_deployed.sql @@ -1,6 +1,6 @@ {{ config( alias = 'account_deployed', - + schema = 'account_abstraction_erc4337_bnb', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', @@ -17,7 +17,7 @@ ref('account_abstraction_erc4337_bnb_v0_6_account_deployed') ] %} -SELECT +SELECT blockchain , version , block_time @@ -30,7 +30,7 @@ SELECT , factory FROM ( {% for erc4337_model in erc4337_bnb_models %} - SELECT + SELECT blockchain , version , block_time @@ -42,9 +42,9 @@ FROM ( , paymaster , factory FROM {{ erc4337_model }} - + {% if is_incremental() %} - WHERE block_time >= date_trunc('day', now() - interval '7' day) + WHERE {{ incremental_predicate('block_time') }} {% endif %} {% if not loop.last %} diff --git a/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_schema.yml b/daily_spellbook/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_schema.yml similarity index 100% rename from models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_schema.yml rename to daily_spellbook/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_schema.yml diff --git a/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_userops.sql b/daily_spellbook/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_userops.sql similarity index 95% rename from models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_userops.sql rename to daily_spellbook/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_userops.sql index 6c1d801961a..31828b78099 100644 --- a/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_userops.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_userops.sql @@ -1,6 +1,7 @@ {{ config( alias = 'userops', - + schema = 'account_abstraction_erc4337_bnb', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_v0_6_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_v0_6_account_deployed.sql similarity index 90% rename from models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_v0_6_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_v0_6_account_deployed.sql index 1316a2e7d5b..ad03985a89b 100644 --- a/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_v0_6_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_v0_6_account_deployed.sql @@ -1,7 +1,7 @@ {{ config ( alias = 'v0_6_account_deployed', - + schema = 'account_abstraction_erc4337_bnb', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_v0_6_userops_basics.sql b/daily_spellbook/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_v0_6_userops_basics.sql similarity index 91% rename from models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_v0_6_userops_basics.sql rename to daily_spellbook/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_v0_6_userops_basics.sql index b414f2dc5cd..3825f78a58a 100644 --- a/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_v0_6_userops_basics.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/bnb/account_abstraction_erc4337_bnb_v0_6_userops_basics.sql @@ -1,7 +1,8 @@ {{ config ( alias = 'v0_6_userops_basics', - + schema = 'account_abstraction_erc4337_bnb', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_account_deployed.sql similarity index 100% rename from models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_account_deployed.sql diff --git a/models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_schema.yml b/daily_spellbook/models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_schema.yml similarity index 100% rename from models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_schema.yml rename to daily_spellbook/models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_schema.yml diff --git a/models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_userops.sql b/daily_spellbook/models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_userops.sql similarity index 100% rename from models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_userops.sql rename to daily_spellbook/models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_userops.sql diff --git a/models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_v0_6_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_v0_6_account_deployed.sql similarity index 100% rename from models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_v0_6_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_v0_6_account_deployed.sql diff --git a/models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_v0_6_userops_basics.sql b/daily_spellbook/models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_v0_6_userops_basics.sql similarity index 100% rename from models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_v0_6_userops_basics.sql rename to daily_spellbook/models/account_abstraction/erc4337/celo/account_abstraction_erc4337_celo_v0_6_userops_basics.sql diff --git a/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_account_deployed.sql similarity index 90% rename from models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_account_deployed.sql index 2ec762a363d..761b357b3eb 100644 --- a/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_account_deployed.sql @@ -1,6 +1,7 @@ {{ config( alias = 'account_deployed', - + schema = 'account_abstraction_erc4337_ethereum', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', @@ -18,7 +19,7 @@ , ref('account_abstraction_erc4337_ethereum_v0_6_account_deployed') ] %} -SELECT +SELECT blockchain , version , block_time @@ -31,7 +32,7 @@ SELECT , factory FROM ( {% for erc4337_model in erc4337_base_models %} - SELECT + SELECT blockchain , version , block_time @@ -43,9 +44,9 @@ FROM ( , paymaster , factory FROM {{ erc4337_model }} - + {% if is_incremental() %} - WHERE block_time >= date_trunc('day', now() - interval '7' day) + WHERE {{ incremental_predicate('block_time') }} {% endif %} {% if not loop.last %} diff --git a/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_schema.yml b/daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_schema.yml similarity index 100% rename from models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_schema.yml rename to daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_schema.yml diff --git a/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_userops.sql b/daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_userops.sql similarity index 95% rename from models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_userops.sql rename to daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_userops.sql index 0224493ec37..0e26e53a128 100644 --- a/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_userops.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_userops.sql @@ -1,6 +1,7 @@ {{ config( alias = 'userops', - + schema = 'account_abstraction_erc4337_ethereum', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_5_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_5_account_deployed.sql similarity index 89% rename from models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_5_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_5_account_deployed.sql index b1980c77738..c38d7829055 100644 --- a/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_5_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_5_account_deployed.sql @@ -1,7 +1,8 @@ {{ config ( alias = 'v0_5_account_deployed', - + schema = 'account_abstraction_erc4337_ethereum', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_5_userops_basics.sql b/daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_5_userops_basics.sql similarity index 93% rename from models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_5_userops_basics.sql rename to daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_5_userops_basics.sql index b63f3ff0e24..255bcc55768 100644 --- a/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_5_userops_basics.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_5_userops_basics.sql @@ -1,7 +1,8 @@ {{ config ( alias = 'v0_5_userops_basics', - + schema = 'account_abstraction_erc4337_ethereum', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_6_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_6_account_deployed.sql similarity index 89% rename from models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_6_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_6_account_deployed.sql index ec243e59fbf..ac5e08e051a 100644 --- a/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_6_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_6_account_deployed.sql @@ -1,7 +1,7 @@ {{ config ( alias = 'v0_6_account_deployed', - + schema = 'account_abstraction_erc4337_ethereum', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_6_userops_basics.sql b/daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_6_userops_basics.sql similarity index 93% rename from models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_6_userops_basics.sql rename to daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_6_userops_basics.sql index 194aec10504..5fcb66372c8 100644 --- a/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_6_userops_basics.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/ethereum/account_abstraction_erc4337_ethereum_v0_6_userops_basics.sql @@ -1,7 +1,7 @@ {{ config ( alias = 'v0_6_userops_basics', - + schema = 'account_abstraction_erc4337_ethereum', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_account_deployed.sql similarity index 90% rename from models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_account_deployed.sql index 822b9f9fdb3..97780e361f3 100644 --- a/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_account_deployed.sql @@ -1,6 +1,6 @@ {{ config( alias = 'account_deployed', - + schema = 'account_abstraction_erc4337_gnosis', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', @@ -18,7 +18,7 @@ , ref('account_abstraction_erc4337_gnosis_v0_6_account_deployed') ] %} -SELECT +SELECT blockchain , version , block_time @@ -31,7 +31,7 @@ SELECT , factory FROM ( {% for erc4337_model in erc4337_base_models %} - SELECT + SELECT blockchain , version , block_time @@ -43,9 +43,9 @@ FROM ( , paymaster , factory FROM {{ erc4337_model }} - + {% if is_incremental() %} - WHERE block_time >= date_trunc('day', now() - interval '7' day) + WHERE {{ incremental_predicate('block_time') }} {% endif %} {% if not loop.last %} diff --git a/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_schema.yml b/daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_schema.yml similarity index 100% rename from models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_schema.yml rename to daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_schema.yml diff --git a/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_userops.sql b/daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_userops.sql similarity index 95% rename from models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_userops.sql rename to daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_userops.sql index 633e37fc492..1a57a50f95f 100644 --- a/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_userops.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_userops.sql @@ -1,6 +1,6 @@ {{ config( alias = 'userops', - + schema = 'account_abstraction_erc4337_gnosis', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_5_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_5_account_deployed.sql similarity index 90% rename from models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_5_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_5_account_deployed.sql index 909484cff7a..d7f7c350758 100644 --- a/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_5_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_5_account_deployed.sql @@ -1,7 +1,7 @@ {{ config ( alias = 'v0_5_account_deployed', - + schema = 'account_abstraction_erc4337_gnosis', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_5_userops_basics.sql b/daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_5_userops_basics.sql similarity index 93% rename from models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_5_userops_basics.sql rename to daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_5_userops_basics.sql index 69c5d4415ab..aca41a76695 100644 --- a/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_5_userops_basics.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_5_userops_basics.sql @@ -1,7 +1,7 @@ {{ config ( alias = 'v0_5_userops_basics', - + schema = 'account_abstraction_erc4337_gnosis', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_6_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_6_account_deployed.sql similarity index 90% rename from models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_6_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_6_account_deployed.sql index b96d836cf34..106d4514578 100644 --- a/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_6_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_6_account_deployed.sql @@ -1,7 +1,7 @@ {{ config ( alias = 'v0_6_account_deployed', - + schema = 'account_abstraction_erc4337_gnosis', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_6_userops_basics.sql b/daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_6_userops_basics.sql similarity index 93% rename from models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_6_userops_basics.sql rename to daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_6_userops_basics.sql index 58f234b4b8a..9d790955ee7 100644 --- a/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_6_userops_basics.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/gnosis/account_abstraction_erc4337_gnosis_v0_6_userops_basics.sql @@ -1,7 +1,7 @@ {{ config ( alias = 'v0_6_userops_basics', - + schema = 'account_abstraction_erc4337_gnosis', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_account_deployed.sql similarity index 90% rename from models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_account_deployed.sql index 02bf025e959..3d957fa5123 100644 --- a/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_account_deployed.sql @@ -1,6 +1,6 @@ {{ config( alias = 'account_deployed', - + schema = 'account_abstraction_erc4337_optimism', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', @@ -18,7 +18,7 @@ , ref('account_abstraction_erc4337_optimism_v0_6_account_deployed') ] %} -SELECT +SELECT blockchain , version , block_time @@ -31,7 +31,7 @@ SELECT , factory FROM ( {% for erc4337_model in erc4337_base_models %} - SELECT + SELECT blockchain , version , block_time @@ -43,9 +43,9 @@ FROM ( , paymaster , factory FROM {{ erc4337_model }} - + {% if is_incremental() %} - WHERE block_time >= date_trunc('day', now() - interval '7' day) + WHERE {{ incremental_predicate('block_time') }} {% endif %} {% if not loop.last %} diff --git a/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_schema.yml b/daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_schema.yml similarity index 100% rename from models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_schema.yml rename to daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_schema.yml diff --git a/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_userops.sql b/daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_userops.sql similarity index 88% rename from models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_userops.sql rename to daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_userops.sql index 47823efe4cc..5ca7540536a 100644 --- a/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_userops.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_userops.sql @@ -1,6 +1,6 @@ {{ config( alias = 'userops', - + schema = 'account_abstraction_erc4337_optimism', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', @@ -28,7 +28,7 @@ with userop as( SELECT * FROM ( {% for erc4337_model in erc4337_models %} - SELECT + SELECT blockchain , version , block_month @@ -43,41 +43,41 @@ with userop as( , beneficiary FROM {{ erc4337_model }} {% if is_incremental() %} - WHERE block_time >= date_trunc('day', now() - interval '7' day) + WHERE {{ incremental_predicate('block_time') }} {% endif %} {% if not loop.last %} UNION ALL {% endif %} - {% endfor %} + {% endfor %} ) ) , txs as ( - select + select hash as tx_hash , tx."from" as tx_from , tx.to as tx_to , '{{gas_symbol}}' as gas_symbol - , ((cast(gas_used as double) * gas_price)+l1_fee) / 1e18 as tx_fee + , ((cast(gas_used as double) * gas_price)+l1_fee) / 1e18 as tx_fee from {{ source('optimism', 'transactions') }} tx where hash in ( select tx_hash from userop ) and block_time > date '{{deployed_date}}' {% if is_incremental() %} - and block_time >= date_trunc('day', now() - interval '7' day) + and {{ incremental_predicate('block_time') }} {% endif %} ) , price as ( - select symbol, decimals, minute, price + select symbol, decimals, minute, price from {{source('prices','usd')}} - where minute > date '{{deployed_date}}' + where minute > date '{{deployed_date}}' and contract_address={{wrapped_gas_address}} and blockchain='{{chain}}' {% if is_incremental() %} and minute >= date_trunc('day', now() - interval '7' day) {% endif %} ) -select +select userop.blockchain , userop.version , userop.block_month @@ -96,6 +96,6 @@ select , txs.tx_fee , txs.tx_fee * price.price as tx_fee_usd , userop.beneficiary -from userop +from userop left join txs on userop.tx_hash = txs.tx_hash left join price on date_trunc('minute', userop.block_time) = price.minute \ No newline at end of file diff --git a/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_5_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_5_account_deployed.sql similarity index 89% rename from models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_5_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_5_account_deployed.sql index f08bb65d8da..53a86990a30 100644 --- a/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_5_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_5_account_deployed.sql @@ -1,7 +1,7 @@ {{ config ( alias = 'v0_5_account_deployed', - + schema = 'account_abstraction_erc4337_optimism', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_5_userops_basics.sql b/daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_5_userops_basics.sql similarity index 93% rename from models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_5_userops_basics.sql rename to daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_5_userops_basics.sql index d9d02108047..a28efd7d2de 100644 --- a/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_5_userops_basics.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_5_userops_basics.sql @@ -1,7 +1,8 @@ {{ config ( alias = 'v0_5_userops_basics', - + schema = 'account_abstraction_erc4337_optimism', + partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_6_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_6_account_deployed.sql similarity index 89% rename from models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_6_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_6_account_deployed.sql index 50bd9d6e3be..eea036ffe1b 100644 --- a/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_6_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_6_account_deployed.sql @@ -1,7 +1,7 @@ {{ config ( alias = 'v0_6_account_deployed', - + schema = 'account_abstraction_erc4337_optimism', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_6_userops_basics.sql b/daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_6_userops_basics.sql similarity index 93% rename from models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_6_userops_basics.sql rename to daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_6_userops_basics.sql index 70744abf2b1..7887702e77d 100644 --- a/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_6_userops_basics.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/optimism/account_abstraction_erc4337_optimism_v0_6_userops_basics.sql @@ -1,7 +1,7 @@ {{ config ( alias = 'v0_6_userops_basics', - + schema = 'account_abstraction_erc4337_optimism', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_account_deployed.sql similarity index 90% rename from models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_account_deployed.sql index 2457be1a304..64c3c071449 100644 --- a/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_account_deployed.sql @@ -1,6 +1,6 @@ {{ config( alias = 'account_deployed', - + schema = 'account_abstraction_erc4337_polygon', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', @@ -18,7 +18,7 @@ , ref('account_abstraction_erc4337_polygon_v0_6_account_deployed') ] %} -SELECT +SELECT blockchain , version , block_time @@ -31,7 +31,7 @@ SELECT , factory FROM ( {% for erc4337_model in erc4337_base_models %} - SELECT + SELECT blockchain , version , block_time @@ -43,9 +43,9 @@ FROM ( , paymaster , factory FROM {{ erc4337_model }} - + {% if is_incremental() %} - WHERE block_time >= date_trunc('day', now() - interval '7' day) + WHERE {{ incremental_predicate('block_time') }} {% endif %} {% if not loop.last %} diff --git a/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_schema.yml b/daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_schema.yml similarity index 100% rename from models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_schema.yml rename to daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_schema.yml diff --git a/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_userops.sql b/daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_userops.sql similarity index 95% rename from models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_userops.sql rename to daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_userops.sql index 76fdb7c9fad..7988600e96f 100644 --- a/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_userops.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_userops.sql @@ -1,6 +1,6 @@ {{ config( alias = 'userops', - + schema = 'account_abstraction_erc4337_polygon', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_5_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_5_account_deployed.sql similarity index 89% rename from models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_5_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_5_account_deployed.sql index aa064be6c89..f298163149a 100644 --- a/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_5_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_5_account_deployed.sql @@ -1,7 +1,7 @@ {{ config ( alias = 'v0_5_account_deployed', - + schema = 'account_abstraction_erc4337_polygon', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_5_userops_basics.sql b/daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_5_userops_basics.sql similarity index 93% rename from models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_5_userops_basics.sql rename to daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_5_userops_basics.sql index cec61959134..842dd809619 100644 --- a/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_5_userops_basics.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_5_userops_basics.sql @@ -1,7 +1,7 @@ {{ config ( alias = 'v0_5_userops_basics', - + schema = 'account_abstraction_erc4337_polygon', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_6_account_deployed.sql b/daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_6_account_deployed.sql similarity index 89% rename from models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_6_account_deployed.sql rename to daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_6_account_deployed.sql index 9a7a1a88cd5..5691cf1a1d3 100644 --- a/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_6_account_deployed.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_6_account_deployed.sql @@ -1,7 +1,7 @@ {{ config ( alias = 'v0_6_account_deployed', - + schema = 'account_abstraction_erc4337_polygon', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_6_userops_basics.sql b/daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_6_userops_basics.sql similarity index 93% rename from models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_6_userops_basics.sql rename to daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_6_userops_basics.sql index 461a1e69f74..8bb7e1e78a6 100644 --- a/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_6_userops_basics.sql +++ b/daily_spellbook/models/account_abstraction/erc4337/polygon/account_abstraction_erc4337_polygon_v0_6_userops_basics.sql @@ -1,7 +1,7 @@ {{ config ( alias = 'v0_6_userops_basics', - + schema = 'account_abstraction_erc4337_polygon', partition_by = ['block_month'], materialized = 'incremental', file_format = 'delta', diff --git a/seeds/account_abstraction/erc4337/_schema.yml b/daily_spellbook/seeds/erc4337/_schema.yml similarity index 100% rename from seeds/account_abstraction/erc4337/_schema.yml rename to daily_spellbook/seeds/erc4337/_schema.yml diff --git a/seeds/account_abstraction/erc4337/account_abstraction_erc4337_account_deployed_seed.csv b/daily_spellbook/seeds/erc4337/account_abstraction_erc4337_account_deployed_seed.csv similarity index 100% rename from seeds/account_abstraction/erc4337/account_abstraction_erc4337_account_deployed_seed.csv rename to daily_spellbook/seeds/erc4337/account_abstraction_erc4337_account_deployed_seed.csv diff --git a/seeds/account_abstraction/erc4337/account_abstraction_erc4337_userops_seed.csv b/daily_spellbook/seeds/erc4337/account_abstraction_erc4337_userops_seed.csv similarity index 100% rename from seeds/account_abstraction/erc4337/account_abstraction_erc4337_userops_seed.csv rename to daily_spellbook/seeds/erc4337/account_abstraction_erc4337_userops_seed.csv diff --git a/daily_spellbook/tests/generic/check_seed.sql b/daily_spellbook/tests/generic/check_seed.sql new file mode 100644 index 00000000000..b1af4ffb53e --- /dev/null +++ b/daily_spellbook/tests/generic/check_seed.sql @@ -0,0 +1,20 @@ +-- this tests checks a model for every row in a seed file. +-- you need to specify the matching columns and the columns to check for equality. +-- filter: dictionary filter of column:value that is applied to the seed file +-- actual implementation in macros/test-helpers/check_seed.sql +{% test check_seed(model, seed_file, match_columns=[], check_columns=[], filter=None) %} + {# + --jinja comment + -- potential dynamic approach, but requires db access -- ci setup to allow in future? + -- {%- set unique_columns = config.get('unique_key') -%} + -- {%- set seed_check_columns = dbt_utils.get_filtered_columns_in_relation(from=seed_file, except=unique_columns) -%} + -- {%- set seed_matching_columns = dbt_utils.get_filtered_columns_in_relation(from=seed_file, except=seed_check_columns) -%} + --jinja comment + #} + {{ config(severity = 'error') }} + {%- set seed_check_columns = check_columns -%} + {%- set seed_matching_columns = match_columns -%} + {%- set seed = seed_file -%} + {{ check_seed_macro(model,seed,seed_matching_columns,seed_check_columns,filter) }} + +{% endtest %} diff --git a/daily_spellbook/tests/generic/compare_column_values_to_seed_values.sql b/daily_spellbook/tests/generic/compare_column_values_to_seed_values.sql new file mode 100644 index 00000000000..1073925bf62 --- /dev/null +++ b/daily_spellbook/tests/generic/compare_column_values_to_seed_values.sql @@ -0,0 +1,22 @@ +{% test compare_column_values_to_seed_values(model, column_name, seed_file_location) %} + + with unit_test as + ( + select + seed.test_description, + case + when m.{{ column_name }} = seed.{{ column_name }} + then True + else False + end as generic_column_test + from {{ model }} m + join {{ seed_file_location }} seed + on m.tx_hash = seed.tx_hash + and m.block_number = seed.block_number + ) + + select test_description + from unit_test + where generic_column_test = False + +{% endtest %} diff --git a/daily_spellbook/tests/generic/equal_rowcount_with_sources.sql b/daily_spellbook/tests/generic/equal_rowcount_with_sources.sql new file mode 100644 index 00000000000..71be9489536 --- /dev/null +++ b/daily_spellbook/tests/generic/equal_rowcount_with_sources.sql @@ -0,0 +1,27 @@ +{% test equal_rowcount_with_sources(model, evt_sources=[]) %} + + WITH + model_count as ( + select count(*) as count_a from {{ model }} + ) + ,sources_count as ( + select sum(count_b) as count_b + from ( + {% for source in evt_sources %} + select count(*) as count_b + from {{ source }} + where evt_block_time <= (select max(block_time) from {{ model }}) + {% if not loop.last %} UNION ALL {% endif %} + {% endfor %} + ) b + ) + + ,unit_test as ( + select count_a, count_b, abs(count_a - count_b) as diff_count + from model_count + full outer join sources_count + on 1=1 + ) + + select * from unit_test where diff_count > 0 +{% endtest %} diff --git a/daily_spellbook/tests/generic/is_unique_filtered.sql b/daily_spellbook/tests/generic/is_unique_filtered.sql new file mode 100644 index 00000000000..da19556226c --- /dev/null +++ b/daily_spellbook/tests/generic/is_unique_filtered.sql @@ -0,0 +1,13 @@ +{% test is_unique_filtered(model, column_name) %} + +select + {{ column_name }} as unique_field, + count(*) as n_records + +from {{ model }} +where {{ column_name }} is not null + and block_date >= NOW() - interval '2' day +group by {{ column_name }} +having count(*) > 1 + +{% endtest %} diff --git a/dbt_project.yml b/dbt_project.yml index b633c2b4cf9..f3f757469cf 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -1047,26 +1047,6 @@ models: quests: +schema: quests - account_abstraction: - erc4337: - +schema: account_abstraction_erc4337 - ethereum: - +schema: account_abstraction_erc4337_ethereum - avalanche_c: - +schema: account_abstraction_erc4337_avalanche_c - arbitrum: - +schema: account_abstraction_erc4337_arbitrum - optimism: - +schema: account_abstraction_erc4337_optimism - polygon: - +schema: account_abstraction_erc4337_polygon - gnosis: - +schema: account_abstraction_erc4337_gnosis - base: - +schema: account_abstraction_erc4337_base - bnb: - +schema: account_abstraction_erc4337_bnb - zora: +schema: zora optimism: diff --git a/macros/models/_sector/erc4337/erc4337_account_deployed.sql b/macros/models/_sector/erc4337/erc4337_account_deployed.sql index c76be5d9209..57990d340db 100644 --- a/macros/models/_sector/erc4337/erc4337_account_deployed.sql +++ b/macros/models/_sector/erc4337/erc4337_account_deployed.sql @@ -5,7 +5,7 @@ ) %} - select + select '{{blockchain}}' as blockchain , '{{version}}' as version , evt_block_time as block_time @@ -18,7 +18,7 @@ , factory from {{account_deployed_evt_model}} {% if is_incremental() %} - WHERE evt_block_time >= date_trunc('day', now() - interval '7' day) + WHERE {{ incremental_predicate('evt_block_time') }} {% endif %} {% endmacro %} \ No newline at end of file diff --git a/macros/models/_sector/erc4337/erc4337_userops_basics.sql b/macros/models/_sector/erc4337/erc4337_userops_basics.sql index 9f00f9876a1..46b47d28105 100644 --- a/macros/models/_sector/erc4337/erc4337_userops_basics.sql +++ b/macros/models/_sector/erc4337/erc4337_userops_basics.sql @@ -21,7 +21,7 @@ with userop as ( , actualGasCost/1e18 as op_fee from {{ userops_evt_model }} {% if is_incremental() %} - WHERE evt_block_time >= date_trunc('day', now() - interval '7' day) + WHERE {{ incremental_predicate('evt_block_time') }} {% endif %} ) , handleops as ( @@ -30,7 +30,7 @@ with userop as ( from {{ handleops_call_model }} where call_success = true {% if is_incremental() %} - and call_block_time >= date_trunc('day', now() - interval '7' day) + and {{ incremental_predicate('call_block_time') }} {% endif %} ) diff --git a/macros/models/_sector/erc4337/erc4337_userops_enrichments.sql b/macros/models/_sector/erc4337/erc4337_userops_enrichments.sql index 1ee0cf5b373..19f34d07033 100644 --- a/macros/models/_sector/erc4337/erc4337_userops_enrichments.sql +++ b/macros/models/_sector/erc4337/erc4337_userops_enrichments.sql @@ -38,7 +38,7 @@ WITH userops_base_union AS ( , beneficiary FROM {{ erc4337_model }} {% if is_incremental() %} - WHERE block_time >= date_trunc('day', now() - interval '7' day) + WHERE {{ incremental_predicate('block_time') }} {% endif %} {% if not loop.last %} UNION ALL @@ -60,7 +60,7 @@ WITH userops_base_union AS ( ) and block_time > date '{{deployed_date}}' {% if is_incremental() %} - and block_time >= date_trunc('day', now() - interval '7' day) + and {{ incremental_predicate('block_time') }} {% endif %} ) , price as (