From 9057b192fdbcecb6cd6da4d5f4e453e6dc0fa665 Mon Sep 17 00:00:00 2001 From: Austin <93135983+austinFlipside@users.noreply.github.com> Date: Tue, 24 Jun 2025 15:27:36 -0400 Subject: [PATCH] updates (#213) * updates * sushi * v4.3 --- .github/workflows/dbt_alter_all_gha_tasks.yml | 2 +- .github/workflows/dbt_alter_gha_tasks.yml | 2 +- .github/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 +- .github/workflows/dbt_run_scheduled_curated.yml | 2 +- .github/workflows/dbt_run_scheduled_decoder.yml | 2 +- .github/workflows/dbt_run_scheduled_main.yml | 2 +- .github/workflows/dbt_run_scheduled_scores.yml | 2 +- .../workflows/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 ++++++-- .../defi/dex/silver_dex__complete_dex_swaps.sql | 17 +++++++++++++++++ packages.yml | 2 +- 23 files changed, 44 insertions(+), 23 deletions(-) diff --git a/.github/workflows/dbt_alter_all_gha_tasks.yml b/.github/workflows/dbt_alter_all_gha_tasks.yml index 2ebf653..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@prod/v4.x + 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 768ef17..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@prod/v4.x + 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 0a23048..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@prod/v4.x + 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 c0da1c8..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@prod/v4.x + 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 6b1fbd3..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@prod/v4.x + 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 99b1e55..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@prod/v4.x + 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 60e31a6..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@prod/v4.x + 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 dbc507a..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@prod/v4.x + 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 8025bef..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@prod/v4.x + 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 4784bd1..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@prod/v4.x + 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 b278619..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@prod/v4.x + 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 16131c6..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@prod/v4.x + 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 14e58eb..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@prod/v4.x + 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 dedd08a..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@prod/v4.x + 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 2de19ae..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@prod/v4.x + 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 6f4ce95..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@prod/v4.x + 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 870bcb7..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@prod/v4.x + 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 4dd4c57..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@prod/v4.x + 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 6d30469..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@prod/v4.x + 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 e65d85c..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@prod/v4.x + 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 50ad000..eedec43 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 <> '0xe91d153e0b41518a2ce8dd3d7944fa863463a97d' + WHEN token_in <> '0xe91d153e0b41518a2ce8dd3d7944fa863463a97d' 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 <> '0xe91d153e0b41518a2ce8dd3d7944fa863463a97d' + WHEN token_out <> '0xe91d153e0b41518a2ce8dd3d7944fa863463a97d' 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, COALESCE ( 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 47a28a1..f9c8793 100644 --- a/models/silver/defi/dex/silver_dex__complete_dex_swaps.sql +++ b/models/silver/defi/dex/silver_dex__complete_dex_swaps.sql @@ -27,6 +27,7 @@ WITH sushi AS ( tx_to, event_index, platform, + 'sushiswap' as protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -61,6 +62,7 @@ curve AS ( tx_to, event_index, platform, + 'curve' as protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -95,6 +97,7 @@ balancer AS ( tx_to, event_index, platform, + 'balancer' as protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -129,6 +132,7 @@ honeyswap AS ( tx_to, event_index, platform, + 'honeyswap' as protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -163,6 +167,7 @@ swapr AS ( tx_to, event_index, platform, + 'swapr' as protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -216,6 +221,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, @@ -228,6 +234,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, @@ -269,6 +276,7 @@ complete_dex_swaps AS ( tx_to, event_index, s.platform, + s.protocol, s.version, s._log_id, s._inserted_timestamp @@ -313,6 +321,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, @@ -325,6 +334,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, @@ -366,6 +376,7 @@ heal_model AS ( tx_to, event_index, t0.platform, + t0.protocol, t0.version, t0._log_id, t0._inserted_timestamp @@ -591,12 +602,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, @@ -607,6 +620,7 @@ SELECT tx_to, event_index, platform, + protocol, version, _log_id, _inserted_timestamp @@ -634,9 +648,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/packages.yml b/packages.yml index e1b7608..cb34980 100644 --- a/packages.yml +++ b/packages.yml @@ -1,3 +1,3 @@ packages: - git: https://github.com/FlipsideCrypto/fsc-evm.git - revision: prod/v4.x \ No newline at end of file + revision: v4.3.0 \ No newline at end of file