diff --git a/models/gold/core/core__ez_decoded_event_logs.sql b/models/gold/core/core__ez_decoded_event_logs.sql index 2c20851..fed8fee 100644 --- a/models/gold/core/core__ez_decoded_event_logs.sql +++ b/models/gold/core/core__ez_decoded_event_logs.sql @@ -8,7 +8,7 @@ SELECT block_number, block_timestamp, tx_hash, - {# tx_position, --new column, requires FR on silver.decoded_logs #} + {# tx_position, --new column, requires FR on silver.decoded_logs (FR during migration to fsc-evm v4) #} event_index, contract_address, topics, diff --git a/models/gold/core/core__fact_event_logs.sql b/models/gold/core/core__fact_event_logs.sql index 3435bb7..0869cab 100644 --- a/models/gold/core/core__fact_event_logs.sql +++ b/models/gold/core/core__fact_event_logs.sql @@ -8,7 +8,7 @@ SELECT block_number, block_timestamp, tx_hash, - {# tx_position, --new column, requires FR on silver.logs #} + {# tx_position, --new column, requires FR on silver.logs (during migration to fsc-evm v4) #} event_index, contract_address, topics, diff --git a/models/silver/defi/bridge/orbiter/silver_bridge__orbiter_bridgerequest.sql b/models/silver/defi/bridge/orbiter/silver_bridge__orbiter_bridgerequest.sql index 6029954..9e6fad1 100644 --- a/models/silver/defi/bridge/orbiter/silver_bridge__orbiter_bridgerequest.sql +++ b/models/silver/defi/bridge/orbiter/silver_bridge__orbiter_bridgerequest.sql @@ -32,7 +32,7 @@ WITH bridge_native AS ( FROM {{ ref('silver__native_transfers') }} et - INNER JOIN {{ ref('silver__transactions') }} + INNER JOIN {{ ref('core__fact_transactions') }} tx ON et.block_number = tx.block_number AND et.tx_hash = tx.tx_hash diff --git a/models/silver/defi/lending/init/silver__init_asset_details.sql b/models/silver/defi/lending/init/silver__init_asset_details.sql index 9f177c1..347380d 100644 --- a/models/silver/defi/lending/init/silver__init_asset_details.sql +++ b/models/silver/defi/lending/init/silver__init_asset_details.sql @@ -53,7 +53,11 @@ underlying AS ( FROM {{ ref('core__fact_traces') }} WHERE - identifier = 'CALL_0_1' + CONCAT( + TYPE, + '_', + trace_address + ) = 'CALL_0_1' AND LEFT( input, 10 @@ -77,7 +81,11 @@ unwrapped AS ( FROM {{ ref('core__fact_traces') }} WHERE - identifier = 'CALL_0_0' + CONCAT( + TYPE, + '_', + trace_address + ) = 'CALL_0_0' AND LEFT( input, 10 diff --git a/models/silver/defi/lending/juice/silver__juice_asset_details.sql b/models/silver/defi/lending/juice/silver__juice_asset_details.sql index 4a926ff..0cfafa1 100644 --- a/models/silver/defi/lending/juice/silver__juice_asset_details.sql +++ b/models/silver/defi/lending/juice/silver__juice_asset_details.sql @@ -127,9 +127,12 @@ trace_pull AS ( input, output, TYPE, - identifier, + CONCAT( + TYPE, + '_', + trace_address + ) AS identifier, DATA, - tx_status, sub_traces, CASE WHEN trace_status = 'SUCCESS' THEN TRUE diff --git a/models/silver/defi/lending/juice/silver__juice_withdraws.sql b/models/silver/defi/lending/juice/silver__juice_withdraws.sql index 1180831..4ed14ad 100644 --- a/models/silver/defi/lending/juice/silver__juice_withdraws.sql +++ b/models/silver/defi/lending/juice/silver__juice_withdraws.sql @@ -37,7 +37,6 @@ withdraw_logs AS ( contract_address, DATA, topics, - tx_status, modified_timestamp, CASE WHEN tx_status = 'SUCCESS' THEN TRUE