diff --git a/models/silver/curated/silver__logs_s3.sql b/models/silver/core/silver__logs_s3.sql similarity index 87% rename from models/silver/curated/silver__logs_s3.sql rename to models/silver/core/silver__logs_s3.sql index 4f545e1..7c81f28 100644 --- a/models/silver/curated/silver__logs_s3.sql +++ b/models/silver/core/silver__logs_s3.sql @@ -71,8 +71,21 @@ FINAL AS ( ) ) SELECT - *, - receipt_id AS receipt_object_id, -- maintain for a run but then need to copy values over and then drop + block_timestamp, + block_id, + tx_hash, + receipt_id AS receipt_object_id, -- maintain for cutover + receipt_id, + log_id, + log_index, + receiver_id, + predecessor_id, + signer_id, + clean_log, + is_standard, + gas_burnt, + receipt_succeeded, + _partition_by_block_number, {{ dbt_utils.generate_surrogate_key( ['log_id'] ) }} AS logs_id, diff --git a/models/silver/curated/silver__logs_s3.yml b/models/silver/core/silver__logs_s3.yml similarity index 96% rename from models/silver/curated/silver__logs_s3.yml rename to models/silver/core/silver__logs_s3.yml index d6d27ba..bf9fc63 100644 --- a/models/silver/curated/silver__logs_s3.yml +++ b/models/silver/core/silver__logs_s3.yml @@ -18,8 +18,8 @@ models: - not_null: where: _inserted_timestamp <= current_timestamp - interval '2 hours' - - name: RECEIPT_OBJECT_ID - description: "{{ doc('receipt_object_id')}}" + - name: RECEIPT_ID + description: "{{ doc('receipt_id')}}" tests: - not_null - dbt_expectations.expect_column_values_to_be_in_type_list: diff --git a/models/silver/curated/defi/bridge/silver__bridge_allbridge.sql b/models/silver/defi/bridge/silver__bridge_allbridge.sql similarity index 100% rename from models/silver/curated/defi/bridge/silver__bridge_allbridge.sql rename to models/silver/defi/bridge/silver__bridge_allbridge.sql diff --git a/models/silver/curated/defi/bridge/silver__bridge_allbridge.yml b/models/silver/defi/bridge/silver__bridge_allbridge.yml similarity index 100% rename from models/silver/curated/defi/bridge/silver__bridge_allbridge.yml rename to models/silver/defi/bridge/silver__bridge_allbridge.yml diff --git a/models/silver/curated/defi/bridge/silver__bridge_multichain.sql b/models/silver/defi/bridge/silver__bridge_multichain.sql similarity index 100% rename from models/silver/curated/defi/bridge/silver__bridge_multichain.sql rename to models/silver/defi/bridge/silver__bridge_multichain.sql diff --git a/models/silver/curated/defi/bridge/silver__bridge_multichain.yml b/models/silver/defi/bridge/silver__bridge_multichain.yml similarity index 100% rename from models/silver/curated/defi/bridge/silver__bridge_multichain.yml rename to models/silver/defi/bridge/silver__bridge_multichain.yml diff --git a/models/silver/curated/defi/bridge/silver__bridge_rainbow.sql b/models/silver/defi/bridge/silver__bridge_rainbow.sql similarity index 100% rename from models/silver/curated/defi/bridge/silver__bridge_rainbow.sql rename to models/silver/defi/bridge/silver__bridge_rainbow.sql diff --git a/models/silver/curated/defi/bridge/silver__bridge_rainbow.yml b/models/silver/defi/bridge/silver__bridge_rainbow.yml similarity index 100% rename from models/silver/curated/defi/bridge/silver__bridge_rainbow.yml rename to models/silver/defi/bridge/silver__bridge_rainbow.yml diff --git a/models/silver/curated/defi/bridge/silver__bridge_wormhole.sql b/models/silver/defi/bridge/silver__bridge_wormhole.sql similarity index 100% rename from models/silver/curated/defi/bridge/silver__bridge_wormhole.sql rename to models/silver/defi/bridge/silver__bridge_wormhole.sql diff --git a/models/silver/curated/defi/bridge/silver__bridge_wormhole.yml b/models/silver/defi/bridge/silver__bridge_wormhole.yml similarity index 100% rename from models/silver/curated/defi/bridge/silver__bridge_wormhole.yml rename to models/silver/defi/bridge/silver__bridge_wormhole.yml diff --git a/models/silver/curated/defi/lending/burrow/silver__burrow_borrows.sql b/models/silver/defi/lending/burrow/silver__burrow_borrows.sql similarity index 100% rename from models/silver/curated/defi/lending/burrow/silver__burrow_borrows.sql rename to models/silver/defi/lending/burrow/silver__burrow_borrows.sql diff --git a/models/silver/curated/defi/lending/burrow/silver__burrow_borrows.yml b/models/silver/defi/lending/burrow/silver__burrow_borrows.yml similarity index 100% rename from models/silver/curated/defi/lending/burrow/silver__burrow_borrows.yml rename to models/silver/defi/lending/burrow/silver__burrow_borrows.yml diff --git a/models/silver/curated/defi/lending/burrow/silver__burrow_collaterals.sql b/models/silver/defi/lending/burrow/silver__burrow_collaterals.sql similarity index 100% rename from models/silver/curated/defi/lending/burrow/silver__burrow_collaterals.sql rename to models/silver/defi/lending/burrow/silver__burrow_collaterals.sql diff --git a/models/silver/curated/defi/lending/burrow/silver__burrow_collaterals.yml b/models/silver/defi/lending/burrow/silver__burrow_collaterals.yml similarity index 100% rename from models/silver/curated/defi/lending/burrow/silver__burrow_collaterals.yml rename to models/silver/defi/lending/burrow/silver__burrow_collaterals.yml diff --git a/models/silver/curated/defi/lending/burrow/silver__burrow_deposits.sql b/models/silver/defi/lending/burrow/silver__burrow_deposits.sql similarity index 100% rename from models/silver/curated/defi/lending/burrow/silver__burrow_deposits.sql rename to models/silver/defi/lending/burrow/silver__burrow_deposits.sql diff --git a/models/silver/curated/defi/lending/burrow/silver__burrow_deposits.yml b/models/silver/defi/lending/burrow/silver__burrow_deposits.yml similarity index 100% rename from models/silver/curated/defi/lending/burrow/silver__burrow_deposits.yml rename to models/silver/defi/lending/burrow/silver__burrow_deposits.yml diff --git a/models/silver/curated/defi/lending/burrow/silver__burrow_repays.sql b/models/silver/defi/lending/burrow/silver__burrow_repays.sql similarity index 100% rename from models/silver/curated/defi/lending/burrow/silver__burrow_repays.sql rename to models/silver/defi/lending/burrow/silver__burrow_repays.sql diff --git a/models/silver/curated/defi/lending/burrow/silver__burrow_repays.yml b/models/silver/defi/lending/burrow/silver__burrow_repays.yml similarity index 100% rename from models/silver/curated/defi/lending/burrow/silver__burrow_repays.yml rename to models/silver/defi/lending/burrow/silver__burrow_repays.yml diff --git a/models/silver/curated/defi/lending/burrow/silver__burrow_withdraws.sql b/models/silver/defi/lending/burrow/silver__burrow_withdraws.sql similarity index 100% rename from models/silver/curated/defi/lending/burrow/silver__burrow_withdraws.sql rename to models/silver/defi/lending/burrow/silver__burrow_withdraws.sql diff --git a/models/silver/curated/defi/lending/burrow/silver__burrow_withdraws.yml b/models/silver/defi/lending/burrow/silver__burrow_withdraws.yml similarity index 100% rename from models/silver/curated/defi/lending/burrow/silver__burrow_withdraws.yml rename to models/silver/defi/lending/burrow/silver__burrow_withdraws.yml diff --git a/models/silver/curated/defi/lending/silver__burrow_lending.sql b/models/silver/defi/lending/silver__burrow_lending.sql similarity index 100% rename from models/silver/curated/defi/lending/silver__burrow_lending.sql rename to models/silver/defi/lending/silver__burrow_lending.sql diff --git a/models/silver/curated/defi/silver__dex_swaps_v2.sql b/models/silver/defi/silver__dex_swaps_v2.sql similarity index 100% rename from models/silver/curated/defi/silver__dex_swaps_v2.sql rename to models/silver/defi/silver__dex_swaps_v2.sql diff --git a/models/silver/curated/defi/silver__dex_swaps_v2.yml b/models/silver/defi/silver__dex_swaps_v2.yml similarity index 100% rename from models/silver/curated/defi/silver__dex_swaps_v2.yml rename to models/silver/defi/silver__dex_swaps_v2.yml diff --git a/models/silver/curated/nft/sales/silver__nft_complete_nft_sales.sql b/models/silver/nft/sales/silver__nft_complete_nft_sales.sql similarity index 100% rename from models/silver/curated/nft/sales/silver__nft_complete_nft_sales.sql rename to models/silver/nft/sales/silver__nft_complete_nft_sales.sql diff --git a/models/silver/curated/nft/sales/silver__nft_complete_nft_sales.yml b/models/silver/nft/sales/silver__nft_complete_nft_sales.yml similarity index 100% rename from models/silver/curated/nft/sales/silver__nft_complete_nft_sales.yml rename to models/silver/nft/sales/silver__nft_complete_nft_sales.yml diff --git a/models/silver/curated/nft/sales/silver__nft_mintbase_sales.sql b/models/silver/nft/sales/silver__nft_mintbase_sales.sql similarity index 100% rename from models/silver/curated/nft/sales/silver__nft_mintbase_sales.sql rename to models/silver/nft/sales/silver__nft_mintbase_sales.sql diff --git a/models/silver/curated/nft/sales/silver__nft_other_sales.sql b/models/silver/nft/sales/silver__nft_other_sales.sql similarity index 100% rename from models/silver/curated/nft/sales/silver__nft_other_sales.sql rename to models/silver/nft/sales/silver__nft_other_sales.sql diff --git a/models/silver/curated/nft/sales/silver__nft_paras_sales.sql b/models/silver/nft/sales/silver__nft_paras_sales.sql similarity index 100% rename from models/silver/curated/nft/sales/silver__nft_paras_sales.sql rename to models/silver/nft/sales/silver__nft_paras_sales.sql diff --git a/models/silver/curated/nft/silver__nft_transfers.sql b/models/silver/nft/silver__nft_transfers.sql similarity index 100% rename from models/silver/curated/nft/silver__nft_transfers.sql rename to models/silver/nft/silver__nft_transfers.sql diff --git a/models/silver/curated/nft/silver__nft_transfers.yml b/models/silver/nft/silver__nft_transfers.yml similarity index 100% rename from models/silver/curated/nft/silver__nft_transfers.yml rename to models/silver/nft/silver__nft_transfers.yml diff --git a/models/silver/curated/nft/silver__standard_nft_mint_s3.sql b/models/silver/nft/silver__standard_nft_mint_s3.sql similarity index 58% rename from models/silver/curated/nft/silver__standard_nft_mint_s3.sql rename to models/silver/nft/silver__standard_nft_mint_s3.sql index d947097..f0a1075 100644 --- a/models/silver/curated/nft/silver__standard_nft_mint_s3.sql +++ b/models/silver/nft/silver__standard_nft_mint_s3.sql @@ -8,24 +8,22 @@ post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash,tx_signer,tx_receiver,receipt_object_id,receiver_id,signer_id,owner_id,token_id);", tags = ['curated','scheduled_non_core'] ) }} -{# Note - multisource model #} --- TODO ez_actions refactor WITH logs AS ( SELECT log_id, - receipt_object_id, -- TODO rename to receipt_id + receipt_id, tx_hash, block_id, block_timestamp, + predecessor_id, receiver_id, signer_id, gas_burnt, clean_log, is_standard, - _partition_by_block_number, - _inserted_timestamp + _partition_by_block_number FROM {{ ref('silver__logs_s3') }} {% if var("MANUAL_FIX") %} @@ -41,42 +39,28 @@ WITH logs AS ( {% endif %} {% endif %} ), -tx AS ( - SELECT - tx_hash, - tx_signer, - tx_receiver, - tx_succeeded, - transaction_fee - FROM - {{ ref('silver__transactions_final') }} - {% if var("MANUAL_FIX") %} - WHERE {{ partition_load_manual('no_buffer') }} - {% else %} - {% if is_incremental() %} - WHERE modified_timestamp >= ( - SELECT - MAX(modified_timestamp) - FROM - {{ this }} - ) - {% endif %} - {% endif %} -), function_call AS ( SELECT - action_id, tx_hash, - TRY_PARSE_JSON(args) AS args_json, - method_name, - deposit + receipt_id, + action_data :method_name :: STRING AS method_name, + action_data :args :: STRING AS args_json, + action_data :deposit :: FLOAT AS deposit, + receipt_succeeded, + tx_succeeded, + tx_receiver, + tx_signer, + tx_fee, + action_index FROM - {{ ref("silver__actions_events_function_call_s3") }} + {{ ref("core__ez_actions") }} + WHERE + action_name = 'FunctionCall' {% if var("MANUAL_FIX") %} - WHERE {{ partition_load_manual('no_buffer') }} + AND {{ partition_load_manual('no_buffer') }} {% else %} - {% if is_incremental() %} - WHERE modified_timestamp >= ( + {% if is_incremental() %} + AND modified_timestamp >= ( SELECT MAX(modified_timestamp) FROM @@ -88,15 +72,11 @@ function_call AS ( standard_logs AS ( SELECT log_id AS logs_id, - concat_ws( - '-', - receipt_object_id, - '0' - ) AS action_id, + receipt_id, tx_hash, - receipt_object_id, block_id, block_timestamp, + predecessor_id, receiver_id, signer_id, gas_burnt, @@ -104,8 +84,7 @@ standard_logs AS ( COUNT(*) over ( PARTITION BY tx_hash ) AS log_counter, - _partition_by_block_number, - _inserted_timestamp + _partition_by_block_number FROM logs WHERE @@ -117,25 +96,32 @@ nft_events AS ( function_call.method_name, function_call.deposit, function_call.args_json, - clean_log :data AS DATA, - clean_log :event AS event, - clean_log :standard AS STANDARD, - clean_log :version AS version + clean_log :data :: VARIANT AS DATA, + clean_log :event :: VARIANT AS event, + clean_log :standard :: STRING AS STANDARD, + clean_log :version :: STRING AS version, + function_call.receipt_succeeded, + function_call.tx_succeeded, + function_call.tx_receiver, + function_call.tx_signer, + function_call.tx_fee, + function_call.action_index FROM standard_logs INNER JOIN function_call - ON standard_logs.action_id = function_call.action_id + ON standard_logs.receipt_id = function_call.receipt_id + AND function_call.action_index = 0 WHERE STANDARD = 'nep171' -- nep171 nft STANDARD, version nep245 IS multitoken STANDARD, nep141 IS fungible token STANDARD AND event = 'nft_mint' ), raw_mint_events AS ( SELECT - action_id, tx_hash, - receipt_object_id, + receipt_id, block_id, block_timestamp, + predecessor_id, receiver_id, signer_id, gas_burnt, @@ -153,7 +139,11 @@ raw_mint_events AS ( ) AS memo, log_counter, _partition_by_block_number, - _inserted_timestamp + receipt_succeeded, + tx_succeeded, + tx_receiver, + tx_signer, + tx_fee FROM nft_events, LATERAL FLATTEN( @@ -162,11 +152,11 @@ raw_mint_events AS ( ), mint_events AS ( SELECT - action_id, tx_hash, - receipt_object_id, + receipt_id, block_id, block_timestamp, + predecessor_id, receiver_id, signer_id, args_json, @@ -184,7 +174,7 @@ mint_events AS ( VALUE :: STRING AS token_id, concat_ws( '-', - action_id, + receipt_id || '-' || '0', COALESCE( batch_index, '0' @@ -200,68 +190,48 @@ mint_events AS ( ) AS mint_action_id, log_counter, _partition_by_block_number, - _inserted_timestamp + receipt_succeeded, + tx_succeeded, + tx_receiver, + tx_signer, + tx_fee FROM raw_mint_events, LATERAL FLATTEN( input => tokens ) -), -mint_tx AS ( - SELECT - tx_hash, - tx_signer, - tx_receiver, - tx_succeeded, - transaction_fee - FROM - tx - WHERE - tx_hash IN ( - SELECT - DISTINCT tx_hash - FROM - mint_events - ) -), -FINAL AS ( - SELECT - mint_events.action_id, - mint_events.mint_action_id, - mint_events.tx_hash, - mint_events.block_id, - mint_events.block_timestamp, - mint_events.method_name, - mint_events.args_json AS args, - mint_events.deposit, - mint_tx.tx_signer AS tx_signer, - mint_tx.tx_receiver AS tx_receiver, - mint_tx.tx_succeeded AS tx_succeeded, - mint_events.receipt_object_id, - mint_events.receiver_id, - mint_events.signer_id, - mint_events.owner_id, - mint_events.token_id, - mint_events.memo, - mint_events.owner_per_tx, - mint_events.mint_per_tx, - mint_events.gas_burnt, - -- gas burnt during receipt processing - mint_tx.transaction_fee, - -- gas burnt during entire transaction processing - mint_events.log_counter, - ( - mint_events.deposit / mint_events.log_counter - ) :: FLOAT AS implied_price, - mint_events._partition_by_block_number, - mint_events._inserted_timestamp - FROM - mint_events - INNER JOIN mint_tx - ON mint_events.tx_hash = mint_tx.tx_hash ) SELECT - *, + tx_hash, + receipt_id AS receipt_object_id, -- for cutover + receipt_id, + block_id, + block_timestamp, + tx_receiver, + tx_signer, + predecessor_id, + receiver_id, + signer_id, + TRY_PARSE_JSON(args_json) AS args, + method_name, + deposit, + owner_per_tx, + gas_burnt, + batch_index, + owner_id, + memo, + token_index, + mint_per_tx, + token_id, + mint_action_id, + log_counter, + ( + deposit / log_counter + ) :: FLOAT AS implied_price, + tx_fee AS transaction_fee, + tx_succeeded, + receipt_succeeded, + _partition_by_block_number, {{ dbt_utils.generate_surrogate_key( ['mint_action_id'] ) }} AS standard_nft_mint_id, @@ -269,4 +239,4 @@ SELECT SYSDATE() AS modified_timestamp, '{{ invocation_id }}' AS _invocation_id FROM - FINAL + mint_events diff --git a/models/silver/curated/nft/silver__standard_nft_mint_s3.yml b/models/silver/nft/silver__standard_nft_mint_s3.yml similarity index 63% rename from models/silver/curated/nft/silver__standard_nft_mint_s3.yml rename to models/silver/nft/silver__standard_nft_mint_s3.yml index bba0813..8888f8b 100644 --- a/models/silver/curated/nft/silver__standard_nft_mint_s3.yml +++ b/models/silver/nft/silver__standard_nft_mint_s3.yml @@ -6,67 +6,29 @@ models: This table records all the NFT Mints per the NEP171 standard, across various methods. columns: - - name: ACTION_ID - description: "{{ doc('action_id') }}" - tests: - - not_null: - where: _inserted_timestamp <= current_timestamp - interval '1 hour' - - - name: MINT_ACTION_ID - description: "{{ doc('mint_action_id') }}" - tests: - - unique: - where: receiver_id != 'realbirds.near' - - not_null: - where: _inserted_timestamp <= current_timestamp - interval '1 hour' - - name: TX_HASH description: "{{ doc('tx_hash') }}" - tests: - - not_null: - where: _inserted_timestamp <= current_timestamp - interval '1 hour' + + - name: RECEIPT_OBJECT_ID + description: "{{ doc('receipt_object_id') }}" + + - name: RECEIPT_ID + description: "{{ doc('receipt_object_id') }}" - name: BLOCK_ID description: "{{ doc('block_id')}}" - name: BLOCK_TIMESTAMP description: "{{ doc('block_timestamp')}}" - tests: - - not_null: - where: _inserted_timestamp <= current_timestamp - interval '1 hour' - - name: METHOD_NAME - description: "{{ doc('method_name') }}" - tests: - - not_null: - where: _inserted_timestamp <= current_timestamp - interval '1 hour' - - - name: ARGS - description: "{{ doc('args') }}" - - - name: DEPOSIT - description: "{{ doc('deposit') }}" + - name: TX_RECEIVER + description: "{{ doc('tx_receiver') }}" - name: TX_SIGNER description: "{{ doc('tx_signer') }}" - - name: TX_RECEIVER - description: "{{ doc('tx_receiver') }}" - tests: - - not_null: - where: _inserted_timestamp <= current_timestamp - interval '1 hour' - - - name: TX_SUCCEEDED - description: "{{ doc('tx_succeeded') }}" - - - name: TX_STATUS - description: "{{ doc('tx_status') }}" - tests: - - not_null: - where: _inserted_timestamp <= current_timestamp - interval '1 hour' - - - name: RECEIPT_OBJECT_ID - description: "{{ doc('receipt_object_id') }}" + - name: PREDECESSOR_ID + description: "{{ doc('predecessor_id') }}" - name: RECEIVER_ID description: "{{ doc('receiver_id')}}" @@ -74,41 +36,60 @@ models: - name: SIGNER_ID description: "{{ doc('signer_id')}}" + - name: ARGS + description: "{{ doc('args') }}" + + - name: METHOD_NAME + description: "{{ doc('method_name') }}" + + - name: DEPOSIT + description: "{{ doc('deposit') }}" + - name: OWNER_PER_TX description: "{{ doc('owner_per_tx') }}" + - name: GAS_BURNT + description: "{{ doc('gas_burnt') }}" + + - name: BATCH_INDEX + description: "{{ doc('batch_index') }}" + - name: OWNER_ID description: "{{ doc('owner_id') }}" - name: MEMO description: "{{ doc('memo') }}" + - name: TOKEN_INDEX + description: "{{ doc('token_index') }}" + - name: MINT_PER_TX description: "{{ doc('mint_per_tx') }}" - name: TOKEN_ID description: "{{ doc('nft_token_id') }}" - - name: GAS_BURNT - description: "{{ doc('gas_burnt') }}" + - name: MINT_ACTION_ID + description: "{{ doc('mint_action_id') }}" + + - name: LOG_COUNTER + description: "{{ doc('log_counter') }}" - name: IMPLIED_PRICE description: "{{ doc('implied_price') }}" - name: TRANSACTION_FEE description: "{{ doc('transaction_fee') }}" - tests: - - not_null: - where: _inserted_timestamp <= current_timestamp - interval '1 hour' + + - name: TX_SUCCEEDED + description: "{{ doc('tx_succeeded') }}" + + - name: RECEIPT_SUCCEEDED + description: "{{ doc('receipt_succeeded') }}" - name: _PARTITION_BY_BLOCK_NUMBER description: "{{ doc('_partition_by_block_number') }}" - - name: _INSERTED_TIMESTAMP - description: "{{ doc('_inserted_timestamp')}}" - - - - name: STANDARD_NFT_MINT_ID description: "{{doc('id')}}" diff --git a/models/silver/curated/token_transfers/native/silver__token_transfer_deposit.sql b/models/silver/transfers/native/silver__token_transfer_deposit.sql similarity index 100% rename from models/silver/curated/token_transfers/native/silver__token_transfer_deposit.sql rename to models/silver/transfers/native/silver__token_transfer_deposit.sql diff --git a/models/silver/curated/token_transfers/native/silver__token_transfer_deposit.yml b/models/silver/transfers/native/silver__token_transfer_deposit.yml similarity index 100% rename from models/silver/curated/token_transfers/native/silver__token_transfer_deposit.yml rename to models/silver/transfers/native/silver__token_transfer_deposit.yml diff --git a/models/silver/curated/token_transfers/native/silver__token_transfer_native.sql b/models/silver/transfers/native/silver__token_transfer_native.sql similarity index 100% rename from models/silver/curated/token_transfers/native/silver__token_transfer_native.sql rename to models/silver/transfers/native/silver__token_transfer_native.sql diff --git a/models/silver/curated/token_transfers/native/silver__token_transfer_native.yml b/models/silver/transfers/native/silver__token_transfer_native.yml similarity index 100% rename from models/silver/curated/token_transfers/native/silver__token_transfer_native.yml rename to models/silver/transfers/native/silver__token_transfer_native.yml diff --git a/models/silver/curated/token_transfers/non_native/silver__token_transfer_base.sql b/models/silver/transfers/non_native/silver__token_transfer_base.sql similarity index 100% rename from models/silver/curated/token_transfers/non_native/silver__token_transfer_base.sql rename to models/silver/transfers/non_native/silver__token_transfer_base.sql diff --git a/models/silver/curated/token_transfers/non_native/silver__token_transfer_ft_transfers_event.sql b/models/silver/transfers/non_native/silver__token_transfer_ft_transfers_event.sql similarity index 100% rename from models/silver/curated/token_transfers/non_native/silver__token_transfer_ft_transfers_event.sql rename to models/silver/transfers/non_native/silver__token_transfer_ft_transfers_event.sql diff --git a/models/silver/curated/token_transfers/non_native/silver__token_transfer_ft_transfers_event.yml b/models/silver/transfers/non_native/silver__token_transfer_ft_transfers_event.yml similarity index 100% rename from models/silver/curated/token_transfers/non_native/silver__token_transfer_ft_transfers_event.yml rename to models/silver/transfers/non_native/silver__token_transfer_ft_transfers_event.yml diff --git a/models/silver/curated/token_transfers/non_native/silver__token_transfer_ft_transfers_method.sql b/models/silver/transfers/non_native/silver__token_transfer_ft_transfers_method.sql similarity index 100% rename from models/silver/curated/token_transfers/non_native/silver__token_transfer_ft_transfers_method.sql rename to models/silver/transfers/non_native/silver__token_transfer_ft_transfers_method.sql diff --git a/models/silver/curated/token_transfers/non_native/silver__token_transfer_ft_transfers_method.yml b/models/silver/transfers/non_native/silver__token_transfer_ft_transfers_method.yml similarity index 100% rename from models/silver/curated/token_transfers/non_native/silver__token_transfer_ft_transfers_method.yml rename to models/silver/transfers/non_native/silver__token_transfer_ft_transfers_method.yml diff --git a/models/silver/curated/token_transfers/non_native/silver__token_transfer_liquidity.sql b/models/silver/transfers/non_native/silver__token_transfer_liquidity.sql similarity index 100% rename from models/silver/curated/token_transfers/non_native/silver__token_transfer_liquidity.sql rename to models/silver/transfers/non_native/silver__token_transfer_liquidity.sql diff --git a/models/silver/curated/token_transfers/non_native/silver__token_transfer_mints.sql b/models/silver/transfers/non_native/silver__token_transfer_mints.sql similarity index 100% rename from models/silver/curated/token_transfers/non_native/silver__token_transfer_mints.sql rename to models/silver/transfers/non_native/silver__token_transfer_mints.sql diff --git a/models/silver/curated/token_transfers/non_native/silver__token_transfer_mints.yml b/models/silver/transfers/non_native/silver__token_transfer_mints.yml similarity index 100% rename from models/silver/curated/token_transfers/non_native/silver__token_transfer_mints.yml rename to models/silver/transfers/non_native/silver__token_transfer_mints.yml diff --git a/models/silver/curated/token_transfers/non_native/silver__token_transfer_orders.sql b/models/silver/transfers/non_native/silver__token_transfer_orders.sql similarity index 100% rename from models/silver/curated/token_transfers/non_native/silver__token_transfer_orders.sql rename to models/silver/transfers/non_native/silver__token_transfer_orders.sql diff --git a/models/silver/curated/token_transfers/silver__token_transfers_complete.sql b/models/silver/transfers/silver__token_transfers_complete.sql similarity index 100% rename from models/silver/curated/token_transfers/silver__token_transfers_complete.sql rename to models/silver/transfers/silver__token_transfers_complete.sql diff --git a/models/silver/curated/token_transfers/silver__token_transfers_complete.yml b/models/silver/transfers/silver__token_transfers_complete.yml similarity index 100% rename from models/silver/curated/token_transfers/silver__token_transfers_complete.yml rename to models/silver/transfers/silver__token_transfers_complete.yml