From 36ff2314a1dd95d81f01fb57548bf406c311f060 Mon Sep 17 00:00:00 2001
From: Desmond Hui <desmond@flipsidecrypto.com>
Date: Thu, 28 Dec 2023 08:19:03 -0800
Subject: [PATCH] hotfix broken models part 1

---
 data/testing__nft_sales_magic_eden_v2.csv                 | 4 +++-
 models/silver/nfts/silver__nft_sales_magic_eden_v2.sql    | 4 ++--
 models/silver/nfts/silver__nft_sales_magic_eden_v2.yml    | 4 +++-
 models/silver/staking/silver__stake_pool_actions_lido.yml | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/data/testing__nft_sales_magic_eden_v2.csv b/data/testing__nft_sales_magic_eden_v2.csv
index 626d065c..b297cfb4 100644
--- a/data/testing__nft_sales_magic_eden_v2.csv
+++ b/data/testing__nft_sales_magic_eden_v2.csv
@@ -6,4 +6,6 @@ tx_id,purchaser,seller,mint,sales_amount
 3WsFjjoNNUH85N8qf3FkA5Qf8PVT2VT2BZJxjLLFq8qybh3TJqiz182aJz4mhydgcx1CoEpenRbZ28vrqMEWzPzn,FFQuurdVowmYqjgdUJTMQCttmAhwDjk9Ly2DG6emFUzD,3L1bQmeD9rFhoYrkVhpBoiL4SASBVQKK9rGLMR6igr4B,5Awi9epmw6EYXzLnzkSu7qJKiZ4HnnDsJ3ix9Wxrt6DC,16.47945
 2L6ki6khMddp56WYeNiKnS5ZVwtk63x3Y3RanP63kobANx51XbCFTyX97C2aoLQZMZ3P5kKSRZc1KxiB1DU2KuNs,erDDZCxYTaGYVBUnHqzBeWjzq9FPb1KpeXgcj4AoxLP,Dj7ZeNteq7vGxkp2UNaKR5VVYCVajSotBzqaDmt4SDUW,8kboRTUcztcZ8MdMMsyonKGXCDjmZ9NiC6DWcQjRaygd,0.62717
 3qp2hRooXJaatbBuNyfT271aNhmgvAa8iVqDkALxHTaaqS2BLXeZUB6eXWhJy3nDU4gMLwtP3UriqWRvUyeUfpmu,D39r6ZkSRLA4hq1ifdiJTjh96Zk8qev93ZMMCxiBgiPD,F8qXXv8FzzWjyXVQ4qdZXaonGFMyF6HbM7c6pYsNK9vi,8RTRoBxJ1uv6XKc5bnSLdTQrG26qCCZcPSzD2uArn77U,0.3189
-5eEkaFyoKGvuTRKbV6G8yKaJrsgqDMer1fXTR9tA4Ab3MTNuKkALKdT4Mdzs3K8sTbJmfB69UQuuDH54QREZhJHa,EvYizbP1oCJkzmJGRKk3Fh7qLaMCx7CCtt1Ffa5gcyzc,5VttzdRW1U2ekWa1T29dadFHMz2FqGn5oUp6y7kB8xLz,FxCh4J3mMhTp8avTQAxSyaQRjjcAeQ5Vvq4LUoabC8Tj,4.935
\ No newline at end of file
+5eEkaFyoKGvuTRKbV6G8yKaJrsgqDMer1fXTR9tA4Ab3MTNuKkALKdT4Mdzs3K8sTbJmfB69UQuuDH54QREZhJHa,EvYizbP1oCJkzmJGRKk3Fh7qLaMCx7CCtt1Ffa5gcyzc,5VttzdRW1U2ekWa1T29dadFHMz2FqGn5oUp6y7kB8xLz,FxCh4J3mMhTp8avTQAxSyaQRjjcAeQ5Vvq4LUoabC8Tj,4.935
+3kP1mPBGASKQFECHcMbDhTLWkNcW497idg9qGbJ2pvza8ppmDEBwd6qokPaqWsUkoTYTK3CuoAbJMQc3XEFrHURy,D1DupHBMEmR7RsXBWEcdCpQzgnARGx2rxnLjv2Qw6RtN,FNBb12zch5XdYXy2ahYHWopbmDat9HmQYdJTiuB9qXLF,DMTtWbb8RRweLjVApXkEQwazn86BsJdFwToNd3GKVT18,0.63559018
+2pefayEWXHTHuE2D8imy8JyR3smhwouh83jtX9meAPtyaNwzsSrBhiDT8pDRVUHptUiRGoX3sNWeKKjEWzfJh4Sh,G6AMMgAXMgDnSawEFGBfR2sQSEHaMcNwms3mLWUQgoyb,BzuoKChdyXv6x9YahCp4Ec94UUwVskRurnzDba9mVYoY,E7MEX6nQkBJG4bCdvLf4YaPsQT3CND1ayBfjwH4VT8ma,0.091225
\ No newline at end of file
diff --git a/models/silver/nfts/silver__nft_sales_magic_eden_v2.sql b/models/silver/nfts/silver__nft_sales_magic_eden_v2.sql
index 84b0bdac..799999e0 100644
--- a/models/silver/nfts/silver__nft_sales_magic_eden_v2.sql
+++ b/models/silver/nfts/silver__nft_sales_magic_eden_v2.sql
@@ -168,7 +168,7 @@ sellers AS (
     WHERE 
         i.value :program :: STRING = 'spl-token'
     AND i.value :programId :: STRING = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'
-    AND i.value :parsed :type :: STRING = 'transfer'
+    AND i.value :parsed :type :: STRING in ('transfer','closeAccount')
 
 {% if is_incremental() and env_var(
     'DBT_IS_BATCH_LOAD',
@@ -206,7 +206,7 @@ AND
     e.block_timestamp :: DATE BETWEEN '2022-01-08' -- no ME V2 contract before this date
     AND '2022-02-08'
 {% endif %}
-
+    qualify(row_number() over (partition by e.tx_id order by i.index desc)) = 1
 ),
 base AS (
     SELECT
diff --git a/models/silver/nfts/silver__nft_sales_magic_eden_v2.yml b/models/silver/nfts/silver__nft_sales_magic_eden_v2.yml
index 360a0999..d5e09bae 100644
--- a/models/silver/nfts/silver__nft_sales_magic_eden_v2.yml
+++ b/models/silver/nfts/silver__nft_sales_magic_eden_v2.yml
@@ -22,7 +22,9 @@ models:
             '3WsFjjoNNUH85N8qf3FkA5Qf8PVT2VT2BZJxjLLFq8qybh3TJqiz182aJz4mhydgcx1CoEpenRbZ28vrqMEWzPzn',
             '2L6ki6khMddp56WYeNiKnS5ZVwtk63x3Y3RanP63kobANx51XbCFTyX97C2aoLQZMZ3P5kKSRZc1KxiB1DU2KuNs',
             '3qp2hRooXJaatbBuNyfT271aNhmgvAa8iVqDkALxHTaaqS2BLXeZUB6eXWhJy3nDU4gMLwtP3UriqWRvUyeUfpmu',
-            '5eEkaFyoKGvuTRKbV6G8yKaJrsgqDMer1fXTR9tA4Ab3MTNuKkALKdT4Mdzs3K8sTbJmfB69UQuuDH54QREZhJHa')"
+            '5eEkaFyoKGvuTRKbV6G8yKaJrsgqDMer1fXTR9tA4Ab3MTNuKkALKdT4Mdzs3K8sTbJmfB69UQuuDH54QREZhJHa',
+            '3kP1mPBGASKQFECHcMbDhTLWkNcW497idg9qGbJ2pvza8ppmDEBwd6qokPaqWsUkoTYTK3CuoAbJMQc3XEFrHURy',
+            '2pefayEWXHTHuE2D8imy8JyR3smhwouh83jtX9meAPtyaNwzsSrBhiDT8pDRVUHptUiRGoX3sNWeKKjEWzfJh4Sh')"
     columns:
       - name: BLOCK_TIMESTAMP
         description: "{{ doc('block_timestamp') }}"
diff --git a/models/silver/staking/silver__stake_pool_actions_lido.yml b/models/silver/staking/silver__stake_pool_actions_lido.yml
index dbfd014a..93b0ac42 100644
--- a/models/silver/staking/silver__stake_pool_actions_lido.yml
+++ b/models/silver/staking/silver__stake_pool_actions_lido.yml
@@ -30,7 +30,7 @@ models:
           - not_null
           - dbt_expectations.expect_row_values_to_have_recent_data:
               datepart: day
-              interval: 2
+              interval: 30
       - name: BLOCK_ID
         description: "{{ doc('block_id') }}"
         tests: