final cleanup

models/gold/core/core__fact_transactions.sql

@@ -16,7 +16,7 @@ SELECT
     tx_code,
     msgs,
     COALESCE (
-        transactions_id,
+        transactions_final_id,
         {{ dbt_utils.generate_surrogate_key(
             ['tx_id']
         ) }}

models/gold/defi/defi__fact_lp_actions.sql

@@ -142,7 +142,7 @@ SELECT
     lp_token_address,
     A._inserted_timestamp,
     COALESCE (
-        lp_actions_levanna_id,
+        lp_actions_levana_id,
         {{ dbt_utils.generate_surrogate_key(
             ['tx_id','msg_index']
         ) }}

models/gold/gov/gov__fact_governance_votes.sql

@@ -17,7 +17,7 @@ SELECT
     COALESCE (
         governance_votes_id,
         {{ dbt_utils.generate_surrogate_key(
-            ['_unique_id']
+            ['_unique_key']
         ) }}
     ) AS fact_governance_votes_id,
     COALESCE(

models/gold/gov/gov__fact_staking.sql

@@ -20,7 +20,7 @@ SELECT
     COALESCE (
         staking_id,
         {{ dbt_utils.generate_surrogate_key(
-            ['_unique_id']
+            ['_unique_key']
         ) }}
     ) AS fact_staking_id,
     COALESCE(

models/gold/gov/gov__fact_staking_rewards.sql

@@ -19,7 +19,7 @@ SELECT
     COALESCE (
         staking_rewards_id,
         {{ dbt_utils.generate_surrogate_key(
-            ['_unique_id']
+            ['_unique_key']
         ) }}
     ) AS fact_staking_rewards_id,
     COALESCE(

models/silver/core/silver__msgs.sql

@@ -5,10 +5,9 @@
   incremental_strategy = 'merge',
   merge_exclude_columns = ["inserted_timestamp"],
   cluster_by = ['block_timestamp::DATE','_inserted_timestamp::DATE'],
-  post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(msg_type, msg:attributes);",
   tags = ['core']
 ) }}
-
+{# post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(msg_type, msg:attributes);", #}
 WITH b AS (
 
   SELECT
@@ -147,7 +146,7 @@ SELECT
   msg_type,
   msg,
   {{ dbt_utils.generate_surrogate_key(
-    ['tx_id','msg_index']
+    ['a.tx_id','a.msg_index']
   ) }} AS msgs_id,
   SYSDATE() AS inserted_timestamp,
   SYSDATE() AS modified_timestamp,

models/silver/core/silver__transactions_final.sql

@@ -78,7 +78,7 @@ SELECT
     ) }} AS transactions_final_id,
     SYSDATE() AS inserted_timestamp,
     SYSDATE() AS modified_timestamp,
-    A._inserted_timestamp,
+    t._inserted_timestamp,
     '{{ invocation_id }}' AS _invocation_id
 FROM
     {{ ref('silver__transactions') }}

models/silver/defi/lp/silver__lp_actions_astroport.sql

@@ -186,7 +186,7 @@ SELECT
     b.contract_address AS lp_token_address,
     {{ dbt_utils.generate_surrogate_key(
         ['a.tx_id','a.msg_index']
-    ) }} AS dex_lp_actions_astroport_id,
+    ) }} AS lp_actions_astroport_id,
     SYSDATE() AS inserted_timestamp,
     SYSDATE() AS modified_timestamp,
     A._inserted_timestamp,

models/silver/defi/lp/silver__lp_actions_fuzio.sql

@@ -159,7 +159,7 @@ SELECT
     d.lp_token_address,
     {{ dbt_utils.generate_surrogate_key(
         ['a.tx_id','a.msg_index']
-    ) }} AS dex_lp_actions_fuzio_id,
+    ) }} AS lp_actions_fuzio_id,
     SYSDATE() AS inserted_timestamp,
     SYSDATE() AS modified_timestamp,
     A._inserted_timestamp,

models/silver/defi/lp/silver__lp_actions_levana.sql

@@ -136,7 +136,7 @@ SELECT
     NULL AS lp_token_address,
     {{ dbt_utils.generate_surrogate_key(
         ['a.tx_id','a.msg_index']
-    ) }} AS dex_lp_actions_levanna_id,
+    ) }} AS lp_actions_levana_id,
     SYSDATE() AS inserted_timestamp,
     SYSDATE() AS modified_timestamp,
     A._inserted_timestamp,

models/silver/defi/lp/silver__lp_actions_seaswap.sql

@@ -146,7 +146,7 @@ SELECT
     C.lp_token_address,
     {{ dbt_utils.generate_surrogate_key(
         ['a.tx_id','a.msg_index']
-    ) }} AS dex_lp_actions_seaswap_id,
+    ) }} AS lp_actions_seaswap_id,
     SYSDATE() AS inserted_timestamp,
     SYSDATE() AS modified_timestamp,
     A._inserted_timestamp,

models/silver/gov/silver__governance_proposal_deposits.sql

@@ -114,7 +114,7 @@ SELECT
     v.amount :: FLOAT AS amount,
     v.currency,
     {{ dbt_utils.generate_surrogate_key(
-        ['tx_id']
+        ['v.tx_id']
     ) }} AS governance_proposal_deposits_id,
     SYSDATE() AS inserted_timestamp,
     SYSDATE() AS modified_timestamp,

models/silver/gov/silver__governance_submit_proposal.sql

@@ -115,7 +115,7 @@ COALESCE(
 ) :: STRING AS proposal_description,
 #}
 {{ dbt_utils.generate_surrogate_key(
-    ['tx_id']
+    ['p.tx_id']
 ) }} AS governance_submit_proposal_id,
 SYSDATE() AS inserted_timestamp,
 SYSDATE() AS modified_timestamp,

models/silver/gov/silver__staking_rewards.sql

@@ -229,6 +229,5 @@ SELECT
     SYSDATE() AS modified_timestamp,
     A._inserted_timestamp,
     '{{ invocation_id }}' AS _invocation_id
-FROM
 FROM
     prefinal A