Fix/new marketplace types (#297)

* Fix a bug with EnumConverter; when encountering unknown values, it was throwing exceptions. This was dangerous for when new service providers (for example) are added and the backend starts returning those as options.

* Updated some payloads, enums, and response structs based on updated ridl definitions

Author: BellringerQuinn

Packages/Sequence-Unity/Sequence/SequenceSDK/Marketplace/DataTypes/CollectiblesFilter.cs

@@ -16,8 +16,10 @@ public class CollectiblesFilter
         public string[] notInAccounts = null; // Filter out any collectibles owned by the specified addresses
         public string[] ordersCreatedBy = null; // Filter for orders created by the specified addresses
         public string[] ordersNotCreatedBy = null; // Filter out any orders created by the specified addresses
+        public string[] inCurrencyAddresses = null; // Filter for collectibles priced with the specified currency addresses
+        public string[] notInCurrencyAddresses = null; // Filter out any collectibles priced with the specified currency addresses
 
-        public CollectiblesFilter(bool includeEmpty, string searchText = "", PropertyFilter[] properties = null, MarketplaceKind[] marketplaces = null, string[] inAccounts = null, string[] notInAccounts = null, string[] ordersCreatedBy = null, string[] ordersNotCreatedBy = null)
+        public CollectiblesFilter(bool includeEmpty, string searchText = "", PropertyFilter[] properties = null, MarketplaceKind[] marketplaces = null, string[] inAccounts = null, string[] notInAccounts = null, string[] ordersCreatedBy = null, string[] ordersNotCreatedBy = null, string[] inCurrencyAddresses = null, string[] notInCurrencyAddresses = null)
         {
             this.includeEmpty = includeEmpty;
             this.searchText = searchText;
@@ -27,11 +29,13 @@ public CollectiblesFilter(bool includeEmpty, string searchText = "", PropertyFil
             this.notInAccounts = notInAccounts;
             this.ordersCreatedBy = ordersCreatedBy;
             this.ordersNotCreatedBy = ordersNotCreatedBy;
+            this.inCurrencyAddresses = inCurrencyAddresses;
+            this.notInCurrencyAddresses = notInCurrencyAddresses;
         }
 
         [Preserve]
         [JsonConstructor]
-        public CollectiblesFilter(bool includeEmpty, string searchText, PropertyFilter[] properties, string[] marketplaces, string[] inAccounts, string[] notInAccounts, string[] ordersCreatedBy, string[] ordersNotCreatedBy)
+        public CollectiblesFilter(bool includeEmpty, string searchText, PropertyFilter[] properties, string[] marketplaces, string[] inAccounts, string[] notInAccounts, string[] ordersCreatedBy, string[] ordersNotCreatedBy, string[] inCurrencyAddresses = null, string[] notInCurrencyAddresses = null)
         {
             this.includeEmpty = includeEmpty;
             this.searchText = searchText;
@@ -41,6 +45,8 @@ public CollectiblesFilter(bool includeEmpty, string searchText, PropertyFilter[]
             this.notInAccounts = notInAccounts;
             this.ordersCreatedBy = ordersCreatedBy;
             this.ordersNotCreatedBy = ordersNotCreatedBy;
+            this.inCurrencyAddresses = inCurrencyAddresses;
+            this.notInCurrencyAddresses = notInCurrencyAddresses;
         }
 
         private string[] MarketplacesToStringArray(MarketplaceKind[] marketplaces)

Packages/Sequence-Unity/Sequence/SequenceSDK/Marketplace/DataTypes/Currency.cs

@@ -11,6 +11,7 @@ public class Currency
         public ulong id;
         public Chain chain;
         public string contractAddress;
+        public CurrencyStatus status;
         public string name;
         public string symbol;
         public ulong decimals;
@@ -22,7 +23,7 @@ public class Currency
         public string deletedAt;
 
         public const string NativeCurrencyAddress = "0x0000000000000000000000000000000000000000";
-
+        
         public Currency(ulong id, Chain chain, string contractAddress, string name, string symbol, ulong decimals, string imageUrl, double exchangeRate, bool defaultChainCurrency, string createdAt, string updatedAt, string deletedAt = "")
         {
             this.id = id;
@@ -43,13 +44,35 @@ public Currency(ulong id, Chain chain, string contractAddress, string name, stri
             }
         }
 
+        public Currency(ulong id, Chain chain, string contractAddress, CurrencyStatus status, string name, string symbol, ulong decimals, string imageUrl, double exchangeRate, bool defaultChainCurrency, string createdAt, string updatedAt, string deletedAt = "")
+        {
+            this.id = id;
+            this.chain = chain;
+            this.contractAddress = contractAddress;
+            this.status = status;
+            this.name = name;
+            this.symbol = symbol;
+            this.decimals = decimals;
+            this.imageUrl = imageUrl;
+            this.exchangeRate = exchangeRate;
+            this.defaultChainCurrency = defaultChainCurrency;
+            this.createdAt = createdAt;
+            this.updatedAt = updatedAt;
+            this.deletedAt = deletedAt;
+            if (this.contractAddress == null)
+            {
+                this.contractAddress = NativeCurrencyAddress;
+            }
+        }
+
         [Preserve]
         [JsonConstructor]
-        public Currency(ulong id, BigInteger chainId, string contractAddress, string name, string symbol, ulong decimals, string imageUrl, double exchangeRate, bool defaultChainCurrency, string createdAt, string updatedAt, string deletedAt = "")
+        public Currency(ulong id, BigInteger chainId, string contractAddress, CurrencyStatus status, string name, string symbol, ulong decimals, string imageUrl, double exchangeRate, bool defaultChainCurrency, string createdAt, string updatedAt, string deletedAt = "")
         {
             this.id = id;
             this.chain = ChainDictionaries.ChainById[chainId.ToString()];
             this.contractAddress = contractAddress;
+            this.status = status;
             this.name = name;
             this.symbol = symbol;
             this.decimals = decimals;
@@ -98,5 +121,10 @@ public static Currency GetNativeCurrency(this Currency[] currencies)
         {
             return currencies.GetCurrencyByContractAddress(Currency.NativeCurrencyAddress);
         }
+
+        public static bool IsActive(this Currency currency)
+        {
+            return currency.status == CurrencyStatus.active;
+        }
     }
 }

Packages/Sequence-Unity/Sequence/SequenceSDK/Marketplace/DataTypes/CurrencyStatus.cs

@@ -0,0 +1,15 @@
+using Newtonsoft.Json;
+using Sequence.Utils;
+
+namespace Sequence.Marketplace
+{
+    [JsonConverter(typeof(EnumConverter<CurrencyStatus>))]
+    public enum CurrencyStatus
+    {
+        unknown,
+        created,
+        syncing_metadata,
+        active,
+        failed,
+    }
+}

Packages/Sequence-Unity/Sequence/SequenceSDK/Marketplace/DataTypes/CurrencyStatus.cs.meta

@@ -7,12 +7,14 @@ public class OrderData
     {
         public string orderId;
         public string quantity;
+        public string tokenId;
 
         [Preserve]
-        public OrderData(string orderId, string quantity)
+        public OrderData(string orderId, string quantity, string tokenId = null)
         {
             this.orderId = orderId;
             this.quantity = quantity;
+            this.tokenId = tokenId;
         }
     }
 }

Packages/Sequence-Unity/Sequence/SequenceSDK/Marketplace/DataTypes/OrderData.cs

@@ -14,5 +14,6 @@ public enum OrderStatus
         expired,
         cancelled,
         filled,
+        decimals_missing,
     }
 }

Packages/Sequence-Unity/Sequence/SequenceSDK/Marketplace/DataTypes/OrderStatus.cs

@@ -1,3 +1,4 @@
+using System;
 using Newtonsoft.Json;
 using Sequence.Utils;
 
@@ -7,6 +8,8 @@ namespace Sequence.Marketplace
     public enum TransactionSwapProvider
     {
         unknown,
-        zerox
+        [Obsolete("zerox is no longer supported")]
+        zerox,
+        lifi
     }
 }

Packages/Sequence-Unity/Sequence/SequenceSDK/Marketplace/DataTypes/TransactionSwapProvider.cs

@@ -1,6 +1,7 @@
 using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using UnityEngine;
 
 namespace Sequence.Utils
 {
@@ -36,16 +37,27 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                 var enumValues = new T[array.Count];
                 for (int i = 0; i < array.Count; i++)
                 {
-                    enumValues[i] = Enum.Parse<T>(array[i].ToString());
+                    enumValues[i] = ParseEnum<T>(array[i].ToString());
                 }
                 return enumValues;
             }
             else
             {
                 var enumString = JToken.Load(reader).ToString();
-                return Enum.Parse<T>(enumString);
+                return ParseEnum<T>(enumString);
             }
         }
+    
+        private T ParseEnum<T>(string enumString) where T : struct
+        {
+            if (!Enum.TryParse<T>(enumString, ignoreCase: true, out var parsed))
+            {
+                Debug.LogWarning($"Unknown enum value '{enumString}' for type {typeof(T).Name}. Returning default.");
+                return default(T);
+            }
+
+            return parsed;
+        }
     }
 
 }