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 9392459..cd07b09 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 540dfe8..8510779 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 08b3c1e..0af777c 100644 --- a/models/gold/defi/defi__ez_dex_swaps.sql +++ b/models/gold/defi/defi__ez_dex_swaps.sql @@ -55,8 +55,11 @@ SELECT tx_to, event_index, platform, + protocol, 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 8d65185..6414a8f 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 ramses_v2 AS ( recipient AS tx_to, event_index, 'ramses-v2' AS platform, + 'ramses' AS protocol, 'v2' AS version, _log_id, _inserted_timestamp @@ -85,6 +86,7 @@ univ3 AS ( recipient AS tx_to, event_index, 'uniswap-v3' AS platform, + 'uniswap' AS protocol, 'v3' AS version, _log_id, _inserted_timestamp @@ -119,6 +121,7 @@ balancer AS ( tx_to, event_index, platform, + 'balancer' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -153,6 +156,7 @@ curve AS ( tx_to, event_index, platform, + 'curve' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -187,6 +191,7 @@ trader_joe_v1 AS ( tx_to, event_index, platform, + 'trader_joe' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -221,6 +226,7 @@ trader_joe_v2 AS ( tx_to, event_index, platform, + 'trader_joe' AS protocol, 'v2' AS version, _log_id, _inserted_timestamp @@ -255,6 +261,7 @@ trader_joe_v2_1 AS ( tx_to, event_index, platform, + 'trader_joe' AS protocol, version, _log_id, _inserted_timestamp @@ -289,6 +296,7 @@ woofi AS ( tx_to, event_index, platform, + 'woofi' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -323,6 +331,7 @@ hashflow AS ( tx_to, event_index, platform, + 'hashflow' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -357,6 +366,7 @@ hashflow_v3 AS ( tx_to, event_index, platform, + 'hashflow' AS protocol, 'v3' AS version, _log_id, _inserted_timestamp @@ -391,6 +401,7 @@ gmx AS ( tx_to, event_index, platform, + 'gmx' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -425,6 +436,7 @@ gmx_v2 AS ( tx_to, event_index, platform, + 'gmx' AS protocol, 'v2' AS version, _log_id, modified_timestamp as _inserted_timestamp @@ -459,6 +471,7 @@ kyberswap_v1_dynamic AS ( tx_to, event_index, platform, + 'kyberswap' AS protocol, 'v1-dynamic' AS version, _log_id, _inserted_timestamp @@ -493,6 +506,7 @@ kyberswap_v1_static AS ( tx_to, event_index, platform, + 'kyberswap' AS protocol, 'v1-static' AS version, _log_id, _inserted_timestamp @@ -527,6 +541,7 @@ kyberswap_v2_elastic AS ( tx_to, event_index, platform, + 'kyberswap' AS protocol, 'v2' AS version, _log_id, _inserted_timestamp @@ -561,6 +576,7 @@ fraxswap AS ( tx_to, event_index, platform, + 'fraxswap' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -595,6 +611,7 @@ pancakeswap_v3 AS ( tx_to, event_index, platform, + 'pancake_swap' AS protocol, 'v3' AS version, _log_id, modified_timestamp as _inserted_timestamp @@ -629,6 +646,7 @@ sushi AS ( tx_to, event_index, platform, + 'sushi' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -663,6 +681,7 @@ sushi_v3 AS ( tx_to, event_index, 'sushiswap-v3' as platform, + 'sushi' AS protocol, 'v3' AS version, _log_id, modified_timestamp as _inserted_timestamp @@ -697,6 +716,7 @@ univ2 AS ( tx_to, event_index, platform, + 'uniswap' AS protocol, 'v2' AS version, _log_id, _inserted_timestamp @@ -731,6 +751,7 @@ sparta AS ( tx_to, event_index, platform, + 'sparta' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -765,6 +786,7 @@ dexalot AS ( tx_to, event_index, platform, + 'dexalot' AS protocol, 'v1' AS version, _log_id, modified_timestamp as _inserted_timestamp @@ -799,6 +821,7 @@ dodo_v1 AS ( tx_to, event_index, platform, + 'dodo' AS protocol, 'v1' AS version, _log_id, _inserted_timestamp @@ -832,7 +855,8 @@ dodo_v2 AS ( sender, tx_to, event_index, - platform, + platform, + 'dodo' AS protocol, 'v2' AS version, _log_id, _inserted_timestamp @@ -866,7 +890,8 @@ camelot_v2 AS ( sender, tx_to, event_index, - platform, + platform, + 'camelot' AS protocol, 'v2' AS version, _log_id, _inserted_timestamp @@ -901,6 +926,7 @@ camelot_v3 AS ( tx_to, event_index, platform, + 'camelot' AS protocol, 'v3' AS version, _log_id, _inserted_timestamp @@ -935,6 +961,7 @@ maverick_v2 AS ( tx_to, event_index, platform, + 'maverick' AS protocol, 'v2' AS version, _log_id, modified_timestamp as _inserted_timestamp @@ -969,6 +996,7 @@ zyberswap_v2 AS ( tx_to, event_index, platform, + 'zyberswap' AS protocol, 'v2' AS version, _log_id, _inserted_timestamp @@ -1003,6 +1031,7 @@ zyberswap_v3 AS ( tx_to, event_index, platform, + 'zyberswap' AS protocol, 'v3' AS version, _log_id, _inserted_timestamp @@ -1176,6 +1205,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, @@ -1188,6 +1218,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, @@ -1229,6 +1260,7 @@ complete_dex_swaps AS ( tx_to, event_index, s.platform, + s.protocol, s.version, s._log_id, s._inserted_timestamp @@ -1273,6 +1305,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, @@ -1285,6 +1318,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, @@ -1326,6 +1360,7 @@ heal_model AS ( tx_to, event_index, t0.platform, + t0.protocol, t0.version, t0._log_id, t0._inserted_timestamp @@ -1551,12 +1586,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, @@ -1567,6 +1604,7 @@ SELECT tx_to, event_index, platform, + protocol, version, _log_id, _inserted_timestamp @@ -1594,9 +1632,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 2d61b4a..b378902 100644 --- a/models/sources.yml +++ b/models/sources.yml @@ -65,10 +65,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 \ 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 578ba1f..0e9ddb2 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 + revision: v4.2.0 \ No newline at end of file