feat: Solana support for NFTs owned by an account component

nftport · Aug 2, 2022 · 7f979aa · 7f979aa
1 parent b8700f2
commit 7f979aa
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 14 deletions.
diff --git a/Runtime/Internal/FormMaker.cs b/Runtime/Internal/FormMaker.cs
@@ -23,7 +23,7 @@ public static Params Formeet(string filePath)
 
             List<IMultipartFormSection> form= new List<IMultipartFormSection>
             {
-                new MultipartFormFileSection("file", File.ReadAllBytes(filePath), Path.GetFileName(filePath), filetype)
+                new MultipartFormFileSection("file", System.IO.File.ReadAllBytes(filePath), Path.GetFileName(filePath), filetype)
             };
             // generate a boundary then convert the form to byte[]
             byte[] boundary = UnityWebRequest.GenerateBoundary();

diff --git a/Runtime/Internal/models/NFTs_model.cs b/Runtime/Internal/models/NFTs_model.cs
@@ -63,6 +63,32 @@ public class Metadata
         public string animation_url;
         public string dna;
         public string id;
+        public Properties properties;
+        public int seller_fee_basis_points;
+        public string symbol;
+        public Collection collection;
+    }
+
+    [Serializable]
+    public class Collection
+    {
+        public string family;
+        public string name;
+    }
+
+    [Serializable]
+    public class Properties
+    {
+        public string category;
+        public List<Creator> creators;
+        public List<Files> files;
+    }
+
+    [Serializable]
+    public class Files
+    {
+        public string type;
+        public string uri;
     }
 
     [Serializable]
@@ -81,6 +107,8 @@ public class Nft
         public Metadata metadata = new Metadata();
         public string description;
         public string creator_address;
+        public string mint_address;
+        public string collection_id;
         public string file_url;
         public string cached_file_url;
         public string animation_url;

diff --git a/Runtime/Internal/models/Txn_model.cs b/Runtime/Internal/models/Txn_model.cs
@@ -64,6 +64,9 @@ public class Creator
     {
         public string account_address ;
         public string creator_share ;
+        public string address;
+        public object share;
+        public bool verified;
     }
 
     [Serializable]

diff --git a/Runtime/Mint_File.cs b/Runtime/Mint_File.cs
@@ -193,7 +193,7 @@ public void Stop(bool destroy)
 
         void FileLocate(string path)
         {
-            if (!File.Exists(path))
+            if (!System.IO.File.Exists(path))
             {
                 if (OnErrorAction != null)
                     OnErrorAction("(~_^) ERROR! Can't locate the file to upload: " + path);

diff --git a/Runtime/NFTs_OwnedByAnAccount.cs b/Runtime/NFTs_OwnedByAnAccount.cs
@@ -25,7 +25,8 @@ public enum Chains
         {
             ethereum,
             polygon,
-            rinkeby
+            rinkeby,
+            solana
         }
 
         public enum Includes
@@ -46,7 +47,7 @@ public enum Includes
             [Header("Optional: Filter by and return NFTs only from the given contract address/collection")]
 
             [SerializeField]
-            [Tooltip("Leave blank if not using")]
+            [Tooltip("Filter from a collection, EVM only, Leave blank if not using")]
             string contract_address;
 
             [Header("Include optional data in the response.")]
@@ -204,16 +205,23 @@ public NFTs_model Run()
 
             string BuildUrl()
             {
-                WEB_URL = RequestUriInit + address + "?chain=" + chain.ToString().ToLower();
-                if (continuation != "")
+                if (chain == Chains.solana)
                 {
-                    WEB_URL = WEB_URL + "&continuation=" + continuation;
-                } 
-                WEB_URL = WEB_URL + "&include=" + include.ToString().ToLower();
+                    WEB_URL = "https://api.nftport.xyz/v0/solana/accounts/" + address + "?include=" + include;
+                }
+                else
+                {
+                    WEB_URL = RequestUriInit + address + "?chain=" + chain.ToString().ToLower();
+                    if (continuation != "")
+                    {
+                        WEB_URL = WEB_URL + "&continuation=" + continuation;
+                    } 
+                    WEB_URL = WEB_URL + "&include=" + include.ToString().ToLower();
 
-                if (contract_address != "")
-                    WEB_URL = WEB_URL + "&contract_address=" + contract_address;
-
+                    if (contract_address != "")
+                        WEB_URL = WEB_URL + "&contract_address=" + contract_address;
+                }
+
                 return WEB_URL;
             }
 
@@ -234,6 +242,7 @@ IEnumerator CallAPIProcess()
 
                     if (request.error != null)
                     {
+                        NFTs = null;
                         if(OnErrorAction!=null)
                             OnErrorAction($"Null data. Response code: {request.responseCode}. Result {jsonResult}");
                         if(debugErrorLog)

diff --git a/Runtime/Storage_UploadFile.cs b/Runtime/Storage_UploadFile.cs
@@ -153,7 +153,7 @@ string BuildUrl()
 
         void FileLocate(string path)
         {
-            if (!File.Exists(path))
+            if (!System.IO.File.Exists(path))
             {
                 if (OnErrorAction != null)
                     OnErrorAction("(~_^) ERROR! Can't locate the file to upload: " + path);

diff --git a/Runtime/Storage_UploadMetadata.cs b/Runtime/Storage_UploadMetadata.cs
@@ -188,7 +188,7 @@ public void SaveFile(string saveToPath, string fileName)
 #if UNITY_EDITOR
                 AssetDatabase.Refresh();
 #endif
-            if(File.Exists(saveToPath+fileName)){
+            if(System.IO.File.Exists(saveToPath+fileName)){
                 Debug.Log($"File Saved to: " + saveToPath + fileName);
             }
             else