From b084f7e2791a018d54e59506a3aab0e620eccf58 Mon Sep 17 00:00:00 2001
From: Eric Laurello <eric.laurello@flipsidecrypto.com>
Date: Thu, 30 May 2024 12:51:22 -0400
Subject: [PATCH] bronze

---
 models/bronze/bronze__transactions.sql      | 15 ++---
 models/silver/core/silver__transactions.sql | 62 ++++++++++++++++++++-
 2 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/models/bronze/bronze__transactions.sql b/models/bronze/bronze__transactions.sql
index 4ee8971..8bf5ccc 100644
--- a/models/bronze/bronze__transactions.sql
+++ b/models/bronze/bronze__transactions.sql
@@ -93,15 +93,16 @@ JOIN LATERAL FLATTEN(
     DATA :result :txs,
     outer => TRUE
 ) t
+WHERE
+    block_id > 20637874
 
 {% if is_incremental() %}
-WHERE
-    inserted_timestamp >= (
-        SELECT
-            MAX(_inserted_timestamp)
-        FROM
-            {{ this }}
-    )
+AND inserted_timestamp >= (
+    SELECT
+        MAX(_inserted_timestamp)
+    FROM
+        {{ this }}
+)
 {% endif %}
 
 qualify(ROW_NUMBER() over(PARTITION BY block_id_requested, tx_id
diff --git a/models/silver/core/silver__transactions.sql b/models/silver/core/silver__transactions.sql
index 4c3f9bd..7dcc2cf 100644
--- a/models/silver/core/silver__transactions.sql
+++ b/models/silver/core/silver__transactions.sql
@@ -6,8 +6,37 @@
     post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION",
 ) }}
 
-WITH base_transactions AS (
+WITH old_base_transactions AS (
 
+    SELECT
+        block_id,
+        t.value :hash :: STRING AS tx_id,
+        t.value :tx_result :codespace AS codespace,
+        t.value :tx_result :gas_used :: NUMBER AS gas_used,
+        t.value :tx_result :gas_wanted :: NUMBER AS gas_wanted,
+        CASE
+            WHEN t.value :tx_result :code :: NUMBER = 0 THEN TRUE
+            ELSE FALSE
+        END AS tx_succeeded,
+        t.value :tx_result :code :: NUMBER AS tx_code,
+        t.value :tx_result :events AS msgs,
+        t.value :tx_result :log :: STRING AS tx_log,
+        _inserted_timestamp
+    FROM
+        {{ ref('bronze__tx_search') }},
+        TABLE(FLATTEN(DATA :result :txs)) t
+
+{% if is_incremental() %}
+WHERE
+    _inserted_timestamp :: DATE >= (
+        SELECT
+            MAX(_inserted_timestamp) :: DATE - 2
+        FROM
+            {{ this }}
+    )
+{% endif %}
+),
+base_transactions AS (
     SELECT
         block_id,
         tx_id,
@@ -17,7 +46,7 @@ WITH base_transactions AS (
         tx_succeeded,
         tx_code,
         msgs,
-        tx_log,
+        tx_log :: STRING AS tx_log,
         TO_TIMESTAMP(
             _inserted_timestamp
         ) AS _inserted_timestamp
@@ -32,6 +61,35 @@ WHERE
         FROM
             {{ this }})
         {% endif %}
+    ),
+    combo AS (
+        SELECT
+            block_id,
+            tx_id,
+            codespace,
+            gas_used,
+            gas_wanted,
+            tx_succeeded,
+            tx_code,
+            msgs,
+            tx_log,
+            _inserted_timestamp
+        FROM
+            base_transactions
+        UNION ALL
+        SELECT
+            block_id,
+            tx_id,
+            codespace,
+            gas_used,
+            gas_wanted,
+            tx_succeeded,
+            tx_code,
+            msgs,
+            tx_log,
+            _inserted_timestamp
+        FROM
+            old_base_transactions
     )
 SELECT
     t.block_id,