post rebase fixes for 5.2 downgrade

0xsequence · Oct 31, 2024 · e4b44f3 · e4b44f3
1 parent 293b0db
commit e4b44f3
Show file tree

Hide file tree

Showing 29 changed files with 6 additions and 1,382 deletions.
diff --git a/...ins/SequencePlugin/Source/SequencePlugin/Public/Indexer/Structs/SeqGetTokenSuppliesArgs.h b/...ins/SequencePlugin/Source/SequencePlugin/Public/Indexer/Structs/SeqGetTokenSuppliesArgs.h
@@ -14,7 +14,6 @@ struct SEQUENCEPLUGIN_API FSeqGetTokenSuppliesArgs
         FString contractAddress = "";
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Default")
         bool includeMetaData = false;
-    UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Default")
         TOptional<FSeqPage> page;
 
     bool customGetter = true;

diff --git a/...equencePlugin/Source/SequencePlugin/Public/Indexer/Structs/SeqGetTransactionHistoryArgs.h b/...equencePlugin/Source/SequencePlugin/Public/Indexer/Structs/SeqGetTransactionHistoryArgs.h
@@ -14,7 +14,7 @@ struct SEQUENCEPLUGIN_API FSeqGetTransactionHistoryArgs
 public:
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Default")
         FSeqTransactionHistoryFilter filter;
-    UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Default")
+
         TOptional<FSeqPage> page;
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Default")
         bool includeMetaData = false;

diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Public/Marketplace/Marketplace_Enums.h b/Plugins/SequencePlugin/Source/SequencePlugin/Public/Marketplace/Marketplace_Enums.h
@@ -135,7 +135,7 @@ class UMarketplaceEnumsExtensions : public UObject
         TArray<FString> StringArray;
         for (const TEnumAsByte<EMarketplaceKind>& Kind : MarketplaceKinds)
         {
-            StringArray.Add(UMarketplaceEnumsExtensions::AsString(Kind));
+            StringArray.Add(NewObject<UMarketplaceEnumsExtensions>()->AsString(Kind));
         }
         return StringArray;
     }
@@ -147,7 +147,7 @@ class UMarketplaceEnumsExtensions : public UObject
         TArray<FString> StringArray;
         for (const TEnumAsByte<EMarketplacePropertyType>& Type : PropertyTypes)
         {
-            StringArray.Add(UMarketplaceEnumsExtensions::AsString(Type));
+            StringArray.Add(NewObject<UMarketplaceEnumsExtensions>()->AsString(Type));
         }
         return StringArray;
     }

diff --git a/...s/SequencePlugin/Source/SequencePlugin/Public/Marketplace/Structs/SeqCollectiblesFilter.h b/...s/SequencePlugin/Source/SequencePlugin/Public/Marketplace/Structs/SeqCollectiblesFilter.h
@@ -84,7 +84,7 @@ struct SEQUENCEPLUGIN_API FSeqCollectiblesFilter
                 for (int32 i = 0; i < MarketplaceKinds.Num(); i++)
                 {
                     ret.Append("\"");
-                    ret.Append(UMarketplaceEnumsExtensions::AsString(MarketplaceKinds[i]));
+                    ret.Append(NewObject<UMarketplaceEnumsExtensions>()->AsString(MarketplaceKinds[i]));
                     ret.Append("\"");
 
                     if (i < MarketplaceKinds.Num() - 1)
@@ -143,7 +143,7 @@ struct SEQUENCEPLUGIN_API FSeqCollectiblesFilter
             ret->SetArrayField("properties", propertiesJsonArray);
         }
 
-        ret->SetArrayField("marketplaces", USequenceSupport::StringListToJsonArray(UMarketplaceEnumsExtensions::EnumArrayToStringList<EMarketplaceKind>(MarketplaceKinds)));
+        ret->SetArrayField("marketplaces", USequenceSupport::StringListToJsonArray(NewObject<UMarketplaceEnumsExtensions>()->EnumArrayToStringList<EMarketplaceKind>(MarketplaceKinds)));
 
         if (InAccounts.Num() > 0)
         {

diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Public/Marketplace/Structs/SeqPropertyFilter.h b/Plugins/SequencePlugin/Source/SequencePlugin/Public/Marketplace/Structs/SeqPropertyFilter.h
@@ -64,7 +64,7 @@ struct SEQUENCEPLUGIN_API FSeqPropertyFilter
 
         if (Type != EMarketplacePropertyType()) // Assuming you have an Unknown enum value
         {
-            Args.Append("\"type\":" + UMarketplaceEnumsExtensions::AsString(Type) + ",");
+            Args.Append("\"type\":" + NewObject<UMarketplaceEnumsExtensions>()->AsString(Type) + ",");
         }
 
         Args.Append("\"min\":" + FString::Printf(TEXT("%lld"), Min) + ",");

diff --git a/Plugins/SequenceTests/Resources/Icon128.png b/Plugins/SequenceTests/Resources/Icon128.png
diff --git a/Plugins/SequenceTests/SequenceTests.uplugin b/Plugins/SequenceTests/SequenceTests.uplugin
diff --git a/...equenceTests/Source/SequenceTests/Private/IndexerEndToEndTests/Helpers/BatchTestBuilder.h b/...equenceTests/Source/SequenceTests/Private/IndexerEndToEndTests/Helpers/BatchTestBuilder.h
diff --git a/...ts/Source/SequenceTests/Private/IndexerEndToEndTests/Helpers/IndexerEndToEndTestsCommon.h b/...ts/Source/SequenceTests/Private/IndexerEndToEndTests/Helpers/IndexerEndToEndTestsCommon.h
diff --git a/...sts/Source/SequenceTests/Private/IndexerEndToEndTests/Helpers/IndexerRequestsTestData.cpp b/...sts/Source/SequenceTests/Private/IndexerEndToEndTests/Helpers/IndexerRequestsTestData.cpp
diff --git a/...Tests/Source/SequenceTests/Private/IndexerEndToEndTests/Helpers/IndexerRequestsTestData.h b/...Tests/Source/SequenceTests/Private/IndexerEndToEndTests/Helpers/IndexerRequestsTestData.h
diff --git a/...nceTests/Source/SequenceTests/Private/IndexerEndToEndTests/IndexerGetEtherBalanceTest.cpp b/...nceTests/Source/SequenceTests/Private/IndexerEndToEndTests/IndexerGetEtherBalanceTest.cpp