From 4ae84eda4fa6b75ea5fd8396456c394ea6f4f799 Mon Sep 17 00:00:00 2001
From: desmond-hui <97470747+desmond-hui@users.noreply.github.com>
Date: Tue, 16 Jul 2024 08:50:49 -0700
Subject: [PATCH] add metadata to decode log requests (#607)

---
 .../helpers/decoded_logs_backfill_helpers.sql | 37 ++++++++++++-------
 .../streamline__decode_logs_realtime.sql      | 35 +++++++++++-------
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/macros/helpers/decoded_logs_backfill_helpers.sql b/macros/helpers/decoded_logs_backfill_helpers.sql
index 3ecf697c..7b478433 100644
--- a/macros/helpers/decoded_logs_backfill_helpers.sql
+++ b/macros/helpers/decoded_logs_backfill_helpers.sql
@@ -59,6 +59,8 @@
                     i.value AS instruction,
                     e.block_id,
                     e.block_timestamp,
+                    e.signers,
+                    e.succeeded,
                     {{ dbt_utils.generate_surrogate_key(['e.block_id','e.tx_id','e.index','inner_index','log_index','inner_program_id']) }} as id
                 FROM
                     {{ ref('silver__events') }} e
@@ -72,21 +74,26 @@
                     AND array_size(i.value:accounts::array) = 1
                 UNION ALL
                 SELECT 
-                    program_id,
-                    tx_id,
-                    index,
-                    inner_index,
-                    log_index,
-                    object_construct('accounts',[],'data',data,'programId',program_id) as instruction,
-                    block_id,
-                    block_timestamp,
-                    {{ dbt_utils.generate_surrogate_key(['block_id','tx_id','index','inner_index','log_index','program_id']) }} as id
+                    l.program_id,
+                    l.tx_id,
+                    l.index,
+                    l.inner_index,
+                    l.log_index,
+                    object_construct('accounts',[],'data',l.data,'programId',l.program_id) as instruction,
+                    l.block_id,
+                    l.block_timestamp,
+                    t.signers,
+                    t.succeeded,
+                    {{ dbt_utils.generate_surrogate_key(['l.block_id','l.tx_id','l.index','l.inner_index','l.log_index','l.program_id']) }} as id
                 FROM
-                    {{ ref('silver__transaction_logs_program_data') }} 
+                    {{ ref('silver__transaction_logs_program_data') }} l
+                JOIN
+                    {{ ref('silver__transactions') }} t
+                    USING(block_timestamp, tx_id)
                 WHERE 
-                    block_id between {{ start_block }} and {{ end_block }}
-                    AND program_id = '{{ program_id }}'
-                    AND succeeded
+                    l.block_id between {{ start_block }} and {{ end_block }}
+                    AND l.program_id = '{{ program_id }}'
+                    AND l.succeeded
             )
             SELECT 
                 e.inner_program_id as program_id,
@@ -96,7 +103,9 @@
                 e.log_index,
                 e.instruction,
                 e.block_id,
-                e.block_timestamp
+                e.block_timestamp,
+                e.signers,
+                e.succeeded,
             FROM
                 event_subset e
             LEFT OUTER JOIN
diff --git a/models/streamline/decode_logs/streamline__decode_logs_realtime.sql b/models/streamline/decode_logs/streamline__decode_logs_realtime.sql
index 8cabd408..d84b45b8 100644
--- a/models/streamline/decode_logs/streamline__decode_logs_realtime.sql
+++ b/models/streamline/decode_logs/streamline__decode_logs_realtime.sql
@@ -38,6 +38,8 @@ event_subset AS (
         i.value AS instruction,
         e.block_id,
         e.block_timestamp,
+        e.signers,
+        e.succeeded,
         {{ dbt_utils.generate_surrogate_key(['e.block_id','e.tx_id','e.index','inner_index','log_index','inner_program_id']) }} as id
     FROM
         {{ ref('silver__events') }} e
@@ -54,20 +56,25 @@ event_subset AS (
         AND array_size(i.value:accounts::array) = 1
     UNION ALL
     SELECT 
-        program_id,
-        tx_id,
-        index,
-        inner_index,
-        log_index,
-        object_construct('accounts',[],'data',data,'programId',program_id) as instruction,
-        block_id,
-        block_timestamp,
-        {{ dbt_utils.generate_surrogate_key(['block_id','tx_id','index','inner_index','log_index','program_id']) }} as id
+        l.program_id,
+        l.tx_id,
+        l.index,
+        l.inner_index,
+        l.log_index,
+        object_construct('accounts',[],'data',l.data,'programId',l.program_id) as instruction,
+        l.block_id,
+        l.block_timestamp,
+        t.signers,
+        t.succeeded,
+        {{ dbt_utils.generate_surrogate_key(['l.block_id','l.tx_id','l.index','l.inner_index','l.log_index','l.program_id']) }} as id
     FROM
-        {{ ref('silver__transaction_logs_program_data') }} 
+        {{ ref('silver__transaction_logs_program_data') }} l
+    JOIN
+        {{ ref('silver__transactions') }} t
+        USING(block_timestamp, tx_id)
     WHERE 
-        block_timestamp >= CURRENT_DATE - 2
-        AND program_id = 'TSWAPaqyCSx2KABk68Shruf4rp7CxcNi8hAsbdwmHbN'
+        l.block_timestamp >= CURRENT_DATE - 2
+        AND l.program_id = 'TSWAPaqyCSx2KABk68Shruf4rp7CxcNi8hAsbdwmHbN'
 ),
 completed_subset AS (
     SELECT
@@ -92,7 +99,9 @@ SELECT
     e.log_index,
     e.instruction,
     e.block_id,
-    e.block_timestamp
+    e.block_timestamp,
+    e.signers,
+    e.succeeded
 FROM
     event_subset e
 LEFT OUTER JOIN