From cb7f33519b43c200dce7a241ccb264c647682042 Mon Sep 17 00:00:00 2001
From: drethereum <trevor.wenokur@gmail.com>
Date: Tue, 28 Jan 2025 15:01:59 -0700
Subject: [PATCH] misc updates

---
 models/doc_descriptions/fsc_evm/evm_deprecations.md    |  6 ++++++
 models/gold/core/core__ez_token_transfers.sql          |  2 +-
 models/gold/core/core__fact_token_transfers.yml        |  2 +-
 .../silver_bridge__axelar_contractcallwithtoken.sql    | 10 +++++++---
 .../hyperlane/silver_bridge__hyperlane_bridge.sql      |  2 +-
 .../orbiter/silver_bridge__orbiter_bridgerequest.sql   |  4 ++--
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/models/doc_descriptions/fsc_evm/evm_deprecations.md b/models/doc_descriptions/fsc_evm/evm_deprecations.md
index e87d483..5707349 100644
--- a/models/doc_descriptions/fsc_evm/evm_deprecations.md
+++ b/models/doc_descriptions/fsc_evm/evm_deprecations.md
@@ -83,6 +83,12 @@ This table is being deprecated for standardization purposes. Please update your
 
 {% enddocs %}
 
+{% docs evm_table_deprecation_notice_fact_token_transfers %}
+
+This table is being deprecated for standardization purposes. Please update your queries to use `ez_token_transfers` instead by February 3, 2025.
+
+{% enddocs %}
+
 {% docs evm_column_deprecation_notice_l1_state_root_tx_hash %}
 
 This column is being deprecated for standardization purposes. Please remove from your queries by February 3, 2025.
diff --git a/models/gold/core/core__ez_token_transfers.sql b/models/gold/core/core__ez_token_transfers.sql
index be64be1..1880cc1 100644
--- a/models/gold/core/core__ez_token_transfers.sql
+++ b/models/gold/core/core__ez_token_transfers.sql
@@ -28,4 +28,4 @@ SELECT
     inserted_timestamp,
     modified_timestamp
 FROM
-    {{ ref('silver__transfers') }}
+    {{ ref('silver__transfers') }}
\ No newline at end of file
diff --git a/models/gold/core/core__fact_token_transfers.yml b/models/gold/core/core__fact_token_transfers.yml
index d660434..3142822 100644
--- a/models/gold/core/core__fact_token_transfers.yml
+++ b/models/gold/core/core__fact_token_transfers.yml
@@ -1,7 +1,7 @@
 version: 2
 models:
   - name: core__fact_token_transfers
-    description: '{{ doc("evm_fact_token_transfers_table_doc") }}'
+    description: '{{ doc("evm_table_deprecation_notice_fact_token_transfers") }}'
       
     columns:
       - name: BLOCK_NUMBER
diff --git a/models/silver/defi/bridge/axelar/silver_bridge__axelar_contractcallwithtoken.sql b/models/silver/defi/bridge/axelar/silver_bridge__axelar_contractcallwithtoken.sql
index 446960e..4975910 100644
--- a/models/silver/defi/bridge/axelar/silver_bridge__axelar_contractcallwithtoken.sql
+++ b/models/silver/defi/bridge/axelar/silver_bridge__axelar_contractcallwithtoken.sql
@@ -119,10 +119,14 @@ transfers AS (
         tx_hash,
         event_index,
         contract_address AS token_address,
-        _log_id,
-        _inserted_timestamp
+        CONCAT(
+            tx_hash :: STRING,
+            '-',
+            event_index :: STRING
+        ) AS _log_id,
+        modified_timestamp AS _inserted_timestamp
     FROM
-        {{ ref('silver__transfers') }}
+        {{ ref('core__ez_token_transfers') }}
     WHERE
         from_address = '0x492751ec3c57141deb205ec2da8bfcb410738630'
         AND to_address IN (
diff --git a/models/silver/defi/bridge/hyperlane/silver_bridge__hyperlane_bridge.sql b/models/silver/defi/bridge/hyperlane/silver_bridge__hyperlane_bridge.sql
index a04905d..994be2f 100644
--- a/models/silver/defi/bridge/hyperlane/silver_bridge__hyperlane_bridge.sql
+++ b/models/silver/defi/bridge/hyperlane/silver_bridge__hyperlane_bridge.sql
@@ -153,7 +153,7 @@ token_transfer AS (
         tx_hash,
         contract_address AS token_address
     FROM
-        {{ ref('silver__transfers') }}
+        {{ ref('core__ez_token_transfers') }}
     WHERE
         tx_hash IN (
             SELECT
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 9e6fad1..65b0a0a 100644
--- a/models/silver/defi/bridge/orbiter/silver_bridge__orbiter_bridgerequest.sql
+++ b/models/silver/defi/bridge/orbiter/silver_bridge__orbiter_bridgerequest.sql
@@ -27,10 +27,10 @@ WITH bridge_native AS (
         origin_from_address AS recipient,
         et.to_address AS bridge_address,
         trace_index,
-        native_transfers_id,
+        ez_native_transfers_id AS native_transfers_id,
         et.modified_timestamp
     FROM
-        {{ ref('silver__native_transfers') }}
+        {{ ref('core__ez_native_transfers') }}
         et
         INNER JOIN {{ ref('core__fact_transactions') }}
         tx