From 64f4d27237a1b0effc80ce42cf75aa5a12e99221 Mon Sep 17 00:00:00 2001 From: Austin <93135983+austinFlipside@users.noreply.github.com> Date: Tue, 24 Jun 2025 18:36:15 -0400 Subject: [PATCH] v4.2.0 (#456) * v4.2.0 * 4.3 --- .github/workflows/dbt_alter_all_gha_tasks.yml | 2 +- .github/workflows/dbt_alter_gha_tasks.yml | 2 +- .../workflows/dbt_deploy_new_workflows.yml | 2 +- .github/workflows/dbt_docs_update.yml | 2 +- .github/workflows/dbt_integration_test.yml | 2 +- .github/workflows/dbt_run_adhoc.yml | 2 +- .github/workflows/dbt_run_dev_refresh.yml | 2 +- .../workflows/dbt_run_full_observability.yml | 2 +- .github/workflows/dbt_run_heal_models.yml | 2 +- .github/workflows/dbt_run_scheduled_abis.yml | 2 +- .../workflows/dbt_run_scheduled_curated.yml | 2 +- .../workflows/dbt_run_scheduled_decoder.yml | 2 +- .github/workflows/dbt_run_scheduled_main.yml | 2 +- .../workflows/dbt_run_scheduled_scores.yml | 2 +- .../dbt_run_streamline_chainhead.yml | 2 +- .../dbt_run_streamline_decoder_history.yml | 2 +- .../workflows/dbt_run_streamline_history.yml | 2 +- .github/workflows/dbt_test_daily.yml | 2 +- .github/workflows/dbt_test_intraday.yml | 2 +- .github/workflows/dbt_test_monthly.yml | 2 +- models/gold/defi/defi__ez_dex_swaps.sql | 8 +++-- .../dex/silver_dex__complete_dex_swaps.sql | 32 +++++++++++++++++-- models/sources.yml | 9 +----- packages.yml | 2 +- 24 files changed, 58 insertions(+), 33 deletions(-) diff --git a/.github/workflows/dbt_alter_all_gha_tasks.yml b/.github/workflows/dbt_alter_all_gha_tasks.yml index 086327d..29930c5 100644 --- a/.github/workflows/dbt_alter_all_gha_tasks.yml +++ b/.github/workflows/dbt_alter_all_gha_tasks.yml @@ -20,7 +20,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template_alter_all_gha_tasks.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template_alter_all_gha_tasks.yml@main with: task_action: ${{ inputs.task_action }} target: prod diff --git a/.github/workflows/dbt_alter_gha_tasks.yml b/.github/workflows/dbt_alter_gha_tasks.yml index be92ee5..731486b 100644 --- a/.github/workflows/dbt_alter_gha_tasks.yml +++ b/.github/workflows/dbt_alter_gha_tasks.yml @@ -24,7 +24,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template_alter_gha_tasks.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template_alter_gha_tasks.yml@main with: workflow_name: ${{ inputs.workflow_name }} task_action: ${{ inputs.task_action }} diff --git a/.github/workflows/dbt_deploy_new_workflows.yml b/.github/workflows/dbt_deploy_new_workflows.yml index a9a877d..3975f8b 100644 --- a/.github/workflows/dbt_deploy_new_workflows.yml +++ b/.github/workflows/dbt_deploy_new_workflows.yml @@ -11,7 +11,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@main with: command_name: Deploy New Github Actions command: | diff --git a/.github/workflows/dbt_docs_update.yml b/.github/workflows/dbt_docs_update.yml index 10ec0ba..b9d7113 100644 --- a/.github/workflows/dbt_docs_update.yml +++ b/.github/workflows/dbt_docs_update.yml @@ -10,5 +10,5 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template_docs_update.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template_docs_update.yml@main secrets: inherit \ No newline at end of file diff --git a/.github/workflows/dbt_integration_test.yml b/.github/workflows/dbt_integration_test.yml index e625bc6..f7ac44b 100644 --- a/.github/workflows/dbt_integration_test.yml +++ b/.github/workflows/dbt_integration_test.yml @@ -14,7 +14,7 @@ concurrency: ${{ github.workflow }} jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template_integration_test.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template_integration_test.yml@main with: target: ${{ inputs.environment }} command: | diff --git a/.github/workflows/dbt_run_adhoc.yml b/.github/workflows/dbt_run_adhoc.yml index 30a3481..10c1928 100644 --- a/.github/workflows/dbt_run_adhoc.yml +++ b/.github/workflows/dbt_run_adhoc.yml @@ -34,7 +34,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@main with: warehouse: ${{ inputs.warehouse }} target: ${{ inputs.target }} diff --git a/.github/workflows/dbt_run_dev_refresh.yml b/.github/workflows/dbt_run_dev_refresh.yml index 938995c..47c1a78 100644 --- a/.github/workflows/dbt_run_dev_refresh.yml +++ b/.github/workflows/dbt_run_dev_refresh.yml @@ -11,5 +11,5 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template_dev_refresh.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template_dev_refresh.yml@main secrets: inherit \ No newline at end of file diff --git a/.github/workflows/dbt_run_full_observability.yml b/.github/workflows/dbt_run_full_observability.yml index ebfc154..f6656cb 100644 --- a/.github/workflows/dbt_run_full_observability.yml +++ b/.github/workflows/dbt_run_full_observability.yml @@ -11,7 +11,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@main with: warehouse: DBT_EMERGENCY command_name: Run Observability Models diff --git a/.github/workflows/dbt_run_heal_models.yml b/.github/workflows/dbt_run_heal_models.yml index dfbe8bb..07d1ba8 100644 --- a/.github/workflows/dbt_run_heal_models.yml +++ b/.github/workflows/dbt_run_heal_models.yml @@ -11,7 +11,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@main with: command_name: Run Heal Models command: | diff --git a/.github/workflows/dbt_run_scheduled_abis.yml b/.github/workflows/dbt_run_scheduled_abis.yml index 2eb8581..0ede637 100644 --- a/.github/workflows/dbt_run_scheduled_abis.yml +++ b/.github/workflows/dbt_run_scheduled_abis.yml @@ -11,7 +11,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@main with: command_name: Run ABI Models command: | diff --git a/.github/workflows/dbt_run_scheduled_curated.yml b/.github/workflows/dbt_run_scheduled_curated.yml index 61d9d16..a1fe3e9 100644 --- a/.github/workflows/dbt_run_scheduled_curated.yml +++ b/.github/workflows/dbt_run_scheduled_curated.yml @@ -11,7 +11,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@main with: command_name: Run Curated Models command: | diff --git a/.github/workflows/dbt_run_scheduled_decoder.yml b/.github/workflows/dbt_run_scheduled_decoder.yml index a0b7a2b..7be07c3 100644 --- a/.github/workflows/dbt_run_scheduled_decoder.yml +++ b/.github/workflows/dbt_run_scheduled_decoder.yml @@ -11,7 +11,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@main with: command_name: Run Decoder Models command: | diff --git a/.github/workflows/dbt_run_scheduled_main.yml b/.github/workflows/dbt_run_scheduled_main.yml index cd64032..129cf27 100644 --- a/.github/workflows/dbt_run_scheduled_main.yml +++ b/.github/workflows/dbt_run_scheduled_main.yml @@ -11,7 +11,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@main with: command_name: Run Main Models command: | diff --git a/.github/workflows/dbt_run_scheduled_scores.yml b/.github/workflows/dbt_run_scheduled_scores.yml index 5c2f0f9..0113d37 100644 --- a/.github/workflows/dbt_run_scheduled_scores.yml +++ b/.github/workflows/dbt_run_scheduled_scores.yml @@ -12,7 +12,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@main with: command_name: Run Scores Models command: | diff --git a/.github/workflows/dbt_run_streamline_chainhead.yml b/.github/workflows/dbt_run_streamline_chainhead.yml index efa0176..f1dc6cb 100644 --- a/.github/workflows/dbt_run_streamline_chainhead.yml +++ b/.github/workflows/dbt_run_streamline_chainhead.yml @@ -11,7 +11,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@main with: command_name: Run Chainhead Models command: | diff --git a/.github/workflows/dbt_run_streamline_decoder_history.yml b/.github/workflows/dbt_run_streamline_decoder_history.yml index b736c9c..b98c26c 100644 --- a/.github/workflows/dbt_run_streamline_decoder_history.yml +++ b/.github/workflows/dbt_run_streamline_decoder_history.yml @@ -11,7 +11,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@main with: command_name: Run Decoder Complete command: | diff --git a/.github/workflows/dbt_run_streamline_history.yml b/.github/workflows/dbt_run_streamline_history.yml index 08dfbc6..0587ad7 100644 --- a/.github/workflows/dbt_run_streamline_history.yml +++ b/.github/workflows/dbt_run_streamline_history.yml @@ -11,7 +11,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@main with: command_name: Run History Models command: | diff --git a/.github/workflows/dbt_test_daily.yml b/.github/workflows/dbt_test_daily.yml index eaa9635..b2ebefa 100644 --- a/.github/workflows/dbt_test_daily.yml +++ b/.github/workflows/dbt_test_daily.yml @@ -11,7 +11,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@main with: target: test command_name: Build Daily Testing Views diff --git a/.github/workflows/dbt_test_intraday.yml b/.github/workflows/dbt_test_intraday.yml index 4823fcd..107ee97 100644 --- a/.github/workflows/dbt_test_intraday.yml +++ b/.github/workflows/dbt_test_intraday.yml @@ -11,7 +11,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@main with: target: test command_name: Run Observability & Recent Tests diff --git a/.github/workflows/dbt_test_monthly.yml b/.github/workflows/dbt_test_monthly.yml index cf47c45..7421bff 100644 --- a/.github/workflows/dbt_test_monthly.yml +++ b/.github/workflows/dbt_test_monthly.yml @@ -11,7 +11,7 @@ concurrency: jobs: called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@pre-release/v4-beta + uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@main with: warehouse: DBT_EMERGENCY command_name: Build Full Testing Views diff --git a/models/gold/defi/defi__ez_dex_swaps.sql b/models/gold/defi/defi__ez_dex_swaps.sql index 52969e3..28b689f 100644 --- a/models/gold/defi/defi__ez_dex_swaps.sql +++ b/models/gold/defi/defi__ez_dex_swaps.sql @@ -27,7 +27,7 @@ SELECT amount_in, ROUND( CASE - WHEN token_in <> '0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270' + WHEN token_in <> '0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270' or not token_in_is_verified AND ( amount_out_usd IS NULL OR ABS((amount_in_usd - amount_out_usd) / NULLIF(amount_out_usd, 0)) > 0.75 @@ -41,7 +41,7 @@ SELECT amount_out, ROUND( CASE - WHEN token_out <> '0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270' + WHEN token_out <> '0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270' or not token_out_is_verified AND ( amount_in_usd IS NULL OR ABS((amount_out_usd - amount_in_usd) / NULLIF(amount_in_usd, 0)) > 0.75 @@ -55,8 +55,12 @@ SELECT tx_to, event_index, platform, + protocol, + version as protocol_version, token_in, + token_in_is_verified, token_out, + token_out_is_verified, symbol_in, symbol_out, _log_id, diff --git a/models/silver/defi/dex/silver_dex__complete_dex_swaps.sql b/models/silver/defi/dex/silver_dex__complete_dex_swaps.sql index 27ffa9f..5989417 100644 --- a/models/silver/defi/dex/silver_dex__complete_dex_swaps.sql +++ b/models/silver/defi/dex/silver_dex__complete_dex_swaps.sql @@ -39,6 +39,7 @@ WITH univ3 AS ( recipient AS tx_to, event_index, 'uniswap-v3' AS platform, + 'uniswap' AS protocol, 'v3' AS version, _log_id, _inserted_timestamp @@ -73,6 +74,7 @@ univ2 AS ( tx_to, event_index, platform, + 'uniswap' AS protocol, 'v2' AS version, _log_id, _inserted_timestamp @@ -107,6 +109,7 @@ woofi AS ( tx_to, event_index, platform, + 'woofi' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -141,6 +144,7 @@ kyberswap_v1_dynamic AS ( tx_to, event_index, platform, + 'kyberswap' AS protocol, 'v1-dynamic' AS version, _log_id, _inserted_timestamp @@ -175,6 +179,7 @@ kyberswap_v1_static AS ( tx_to, event_index, platform, + 'kyberswap' AS protocol, 'v1-static' AS version, _log_id, _inserted_timestamp @@ -209,6 +214,7 @@ kyberswap_v2_elastic AS ( tx_to, event_index, platform, + 'kyberswap' AS protocol, 'v2' AS version, _log_id, _inserted_timestamp @@ -242,7 +248,8 @@ fraxswap AS ( sender, tx_to, event_index, - platform, + platform, + 'fraxswap' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -276,7 +283,8 @@ sushi AS ( sender, tx_to, event_index, - platform, + platform, + 'sushiswap' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -311,6 +319,7 @@ hashflow AS ( tx_to, event_index, platform, + 'hashflow' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -345,6 +354,7 @@ hashflow_v3 AS ( tx_to, event_index, platform, + 'hashflow' AS protocol, 'v3' AS version, _log_id, _inserted_timestamp @@ -379,6 +389,7 @@ curve AS ( tx_to, event_index, platform, + 'curve' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -413,6 +424,7 @@ balancer AS ( tx_to, event_index, platform, + 'balancer' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -459,6 +471,7 @@ quickswap_v3 AS ( recipient AS tx_to, event_index, 'quickswap-v3' AS platform, + 'quickswap' AS protocol, 'v3' AS version, _log_id, _inserted_timestamp @@ -493,6 +506,7 @@ quickswap_v2 AS ( tx_to, event_index, platform, + 'quickswap' AS protocol, 'v2' AS version, _log_id, _inserted_timestamp @@ -527,6 +541,7 @@ dodo_v1 AS ( tx_to, event_index, platform, + 'dodo' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -561,6 +576,7 @@ dodo_v2 AS ( tx_to, event_index, platform, + 'dodo' AS protocol, 'v2' AS version, _log_id, _inserted_timestamp @@ -669,6 +685,7 @@ complete_dex_swaps AS ( s.contract_address, event_name, token_in, + p1.is_verified AS token_in_is_verified, c1.token_decimals AS decimals_in, c1.token_symbol AS symbol_in, amount_in_unadj, @@ -681,6 +698,7 @@ complete_dex_swaps AS ( ELSE NULL END AS amount_in_usd, token_out, + p2.is_verified AS token_out_is_verified, c2.token_decimals AS decimals_out, c2.token_symbol AS symbol_out, amount_out_unadj, @@ -722,6 +740,7 @@ complete_dex_swaps AS ( tx_to, event_index, s.platform, + s.protocol, s.version, s._log_id, s._inserted_timestamp @@ -766,6 +785,7 @@ heal_model AS ( t0.contract_address, event_name, token_in, + p1.is_verified AS token_in_is_verified, c1.token_decimals AS decimals_in, c1.token_symbol AS symbol_in, amount_in_unadj, @@ -778,6 +798,7 @@ heal_model AS ( ELSE NULL END AS amount_in_usd_heal, token_out, + p2.is_verified AS token_out_is_verified, c2.token_decimals AS decimals_out, c2.token_symbol AS symbol_out, amount_out_unadj, @@ -819,6 +840,7 @@ heal_model AS ( tx_to, event_index, t0.platform, + t0.protocol, t0.version, t0._log_id, t0._inserted_timestamp @@ -1044,12 +1066,14 @@ SELECT contract_address, event_name, token_in, + token_in_is_verified, decimals_in, symbol_in, amount_in_unadj, amount_in_heal AS amount_in, amount_in_usd_heal AS amount_in_usd, token_out, + token_out_is_verified, decimals_out, symbol_out, amount_out_unadj, @@ -1060,6 +1084,7 @@ SELECT tx_to, event_index, platform, + protocol, version, _log_id, _inserted_timestamp @@ -1087,9 +1112,12 @@ SELECT tx_to, event_index, platform, + protocol, version, token_in, + token_in_is_verified, token_out, + token_out_is_verified, symbol_in, symbol_out, decimals_in, diff --git a/models/sources.yml b/models/sources.yml index 2d0dfec..ccf455c 100644 --- a/models/sources.yml +++ b/models/sources.yml @@ -70,11 +70,4 @@ sources: schema: admin tables: - name: _master_keys - - name: rpc_node_logs - - name: logs_temp - database: "{{ target.database }}" - schema: silver - tables: - - name: logs - - name: decoded_logs - - name: confirmed_blocks \ No newline at end of file + - name: rpc_node_logs \ No newline at end of file diff --git a/packages.yml b/packages.yml index 0c44d2d..cb34980 100644 --- a/packages.yml +++ b/packages.yml @@ -1,3 +1,3 @@ packages: - git: https://github.com/FlipsideCrypto/fsc-evm.git - revision: v4.0.0-beta.104 \ No newline at end of file + revision: v4.3.0 \ No newline at end of file