From 42d48b925f2001baa5613ad826668d1a5628693d Mon Sep 17 00:00:00 2001
From: tarikceric <46071768+tarikceric@users.noreply.github.com>
Date: Fri, 8 Dec 2023 10:25:18 -0800
Subject: [PATCH] get missing mints (#422)

---
 data/testing__nft_mints.csv                        |  4 +++-
 .../silver/nfts/silver__nft_mint_price_generic.sql | 14 ++++++++++++--
 models/silver/nfts/silver__nft_mints.yml           |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/data/testing__nft_mints.csv b/data/testing__nft_mints.csv
index 749e4aa3..e744a109 100644
--- a/data/testing__nft_mints.csv
+++ b/data/testing__nft_mints.csv
@@ -33,4 +33,6 @@ AXJFRmLT11RnuFEgYC35F9tktdL77xX8y1b4HEbXPJkf,2jPtkhNbYP55Brb9bBPVwaRPFnMZHsu2YEe
 3SQcD75fEJsDPgGCPsqpbD4N2XyDHCCcLDB26UiUU6wa,86teyjAD1WjMTmw68wHu6LTWd6nvNcYkHRAQoqqJsdyA,So11111111111111111111111111111111111111111,0.020942641
 3SQcD75fEJsDPgGCPsqpbD4N2XyDHCCcLDB26UiUU6wa,86teyjAD1WjMTmw68wHu6LTWd6nvNcYkHRAQoqqJsdyA,GENEtH5amGSi8kHAtQoezp1XEXwZJ8vcuePYnXdKrMYz,5
 SnFYS4FwpRyUziz9fQ68v5A2aGKqRDaNAv5AVaMPQja,9xmSt5gqCJ1yfcFJicrdkzTi6ujcQixDN8hXTZqs4kDH,So11111111111111111111111111111111111111111,0.011456161
-5f7x2JEiJ2jq1xwVTf4fMs8b5ecBt6s5HgAkajuiK5yh,J9UMwZgP1r7HNyCWrdvd54HThWhA42z4VbCd9yz48GFq,So11111111111111111111111111111111111111111,0.011456161
\ No newline at end of file
+5f7x2JEiJ2jq1xwVTf4fMs8b5ecBt6s5HgAkajuiK5yh,J9UMwZgP1r7HNyCWrdvd54HThWhA42z4VbCd9yz48GFq,So11111111111111111111111111111111111111111,0.011456161
+ATshnVFBvgNhPtBLphmuhcAKYAVe5ytmeKeefwBxtYnq,FHbK7buPL8ZSCLDXxD7NLs13J9gaz8GfizhmUWivpru7,So11111111111111111111111111111111111111111,0.01993192
+4JpwpBsSo2rdhCHsNKEz23uwT9gtoqH2KjLi68S6MMmm,8PEmBfgeRG5LcLUNxasPiPyD9Lsx912kmJ8ph66f4gtU,So11111111111111111111111111111111111111111,0.07268828
\ No newline at end of file
diff --git a/models/silver/nfts/silver__nft_mint_price_generic.sql b/models/silver/nfts/silver__nft_mint_price_generic.sql
index 71a2c8f9..5557e0f1 100644
--- a/models/silver/nfts/silver__nft_mint_price_generic.sql
+++ b/models/silver/nfts/silver__nft_mint_price_generic.sql
@@ -112,8 +112,9 @@ metaplex_events AS (
         e.inner_instruction,
         _inserted_timestamp
     FROM
-        base_events e,
-        TABLE(FLATTEN(inner_instruction :instructions)) i
+        base_events e
+        -- ,
+        -- TABLE(FLATTEN(inner_instruction :instructions)) i -- does this even do anything?
     WHERE
         program_id = 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'
         AND succeeded
@@ -126,6 +127,10 @@ metaplex_events AS (
             OR (ARRAY_SIZE(accounts) = 9
             AND accounts [7] = '11111111111111111111111111111111'
             AND accounts [8] = 'SysvarRent111111111111111111111111111111111')
+            OR (ARRAY_SIZE(accounts) = 9
+            AND accounts [6] = '11111111111111111111111111111111'
+            AND accounts [7] = 'Sysvar1nstructions1111111111111111111111111'
+            AND accounts [8] = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA')
             OR (ARRAY_SIZE(accounts) = 14
             AND accounts [11] = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'
             AND accounts [12] = '11111111111111111111111111111111'
@@ -162,6 +167,10 @@ metaplex_events AS (
             OR (ARRAY_SIZE(accounts) = 9
             AND accounts [7] = '11111111111111111111111111111111'
             AND accounts [8] = 'SysvarRent111111111111111111111111111111111')
+            OR (ARRAY_SIZE(accounts) = 9
+            AND accounts [6] = '11111111111111111111111111111111'
+            AND accounts [7] = 'Sysvar1nstructions1111111111111111111111111'
+            AND accounts [8] = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA')
             OR (ARRAY_SIZE(accounts) = 14
             AND accounts [11] = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'
             AND accounts [12] = '11111111111111111111111111111111'
@@ -183,6 +192,7 @@ mint_price_events AS (
         i.value:parsed:info:source::string as temp_source,
         CASE
             WHEN num_accounts in (14,17) THEN me.accounts [3] :: STRING
+            WHEN num_accounts = 9 and accounts[7] = 'Sysvar1nstructions1111111111111111111111111' THEN me.accounts [2] :: STRING
             ELSE me.accounts [1] :: STRING
         END AS mint,
         CASE
diff --git a/models/silver/nfts/silver__nft_mints.yml b/models/silver/nfts/silver__nft_mints.yml
index fd766ac1..ae35aa34 100644
--- a/models/silver/nfts/silver__nft_mints.yml
+++ b/models/silver/nfts/silver__nft_mints.yml
@@ -26,7 +26,7 @@ models:
             'Ar9mEJ7qJ1uAgkWduKGo3UYVbPMdKrmWxs5z2wgZgbgN','4CLQnbNKynn6qXF1S4woTxbiuPYREoEYbkXtvoYyzvxQ','5huRn5xdFZVi8TY2WEYyqimMiBJQPP1uQQcoFqNZb2oG',
             '5AbpcVMnyxgK1UfZRrYDD5iiFWWBXUVnAqLifa9n7Bm8','5Awi9epmw6EYXzLnzkSu7qJKiZ4HnnDsJ3ix9Wxrt6DC', 'AXJFRmLT11RnuFEgYC35F9tktdL77xX8y1b4HEbXPJkf',
             '7onpWcfER4oz1KLPJMB6mRCXx9EXvDAWsoy4ZnVCkWun','3SQcD75fEJsDPgGCPsqpbD4N2XyDHCCcLDB26UiUU6wa', 'SnFYS4FwpRyUziz9fQ68v5A2aGKqRDaNAv5AVaMPQja',
-            '5f7x2JEiJ2jq1xwVTf4fMs8b5ecBt6s5HgAkajuiK5yh')"
+            '5f7x2JEiJ2jq1xwVTf4fMs8b5ecBt6s5HgAkajuiK5yh','ATshnVFBvgNhPtBLphmuhcAKYAVe5ytmeKeefwBxtYnq', '4JpwpBsSo2rdhCHsNKEz23uwT9gtoqH2KjLi68S6MMmm')"
     columns:
       - name: BLOCK_TIMESTAMP
         description: "{{ doc('block_timestamp') }}"