-Renamed NFTImageType to NFTOffChainMetaType in OASIS.API.Core.

- Fixed a bug in SaveDNA in OASISDNAManager in OASIS.API.Core.

- Upgraded NFTManager in OASIS.API.ONODE.Core to allow minting for both ERC721 and ERC1155 NFT standards at the same time.

- Updated GenerateNFTRequestAsync in STARCLI.Lib to now ask what NFTStandard they wish to mint for as well as where the meta data/image should be stored.

Author: dellams

NextGenSoftware.OASIS.API.Core/Enums/NFTImageType.cs

@@ -1,7 +1,7 @@
 
 namespace NextGenSoftware.OASIS.API.Core.Enums
 {
-    public enum NFTImageType
+    public enum NFTOffChainMetaType
     {
         OASIS,
         IPFS,

NextGenSoftware.OASIS.API.Core/Interfaces/NFT/Requests/IMintNFTTransactionRequest.cs

@@ -25,7 +25,7 @@ public interface IMintNFTTransactionRequest
         public EnumValue<ProviderType> OffChainProvider { get; set; }
         public EnumValue<ProviderType> OnChainProvider { get; set; }
         public NFTStandardType NFTStandardType { get; set; }
-        public NFTImageType NFTImageType { get; set; }
+        public NFTOffChainMetaType NFTOffChainMetaType { get; set; }
         //public bool SaveIPFSImageOnTheOASIS { get; set; }
         //public string JsonUrl { get; set; }
     }

NextGenSoftware.OASIS.API.Core/Objects/NFT/Requests/MintAndPlaceGeoSpatialNFTRequest.cs

@@ -28,6 +28,6 @@ public class MintAndPlaceGeoSpatialNFTRequest : PlaceGeoSpatialNFTRequestBase, I
         public EnumValue<ProviderType> OffChainProvider { get; set; }
         public EnumValue<ProviderType> OnChainProvider { get; set; }
         public NFTStandardType NFTStandardType { get; set; }
-        public NFTImageType NFTImageType { get; set; }
+        public NFTOffChainMetaType NFTOffChainMetaType { get; set; }
     }
 }

NextGenSoftware.OASIS.API.Core/Objects/NFT/Requests/MintNFTTransactionRequest.cs

@@ -26,6 +26,6 @@ public class MintNFTTransactionRequest : IMintNFTTransactionRequest
         public EnumValue<ProviderType> OffChainProvider { get; set; }
         public EnumValue<ProviderType> OnChainProvider { get; set; }
         public NFTStandardType NFTStandardType { get; set; }
-        public NFTImageType NFTImageType { get; set; }
+        public NFTOffChainMetaType NFTOffChainMetaType { get; set; }
     }
 }

NextGenSoftware.OASIS.API.DNA/OASISDNAManager.cs

@@ -102,7 +102,7 @@ public static OASISResult<bool> SaveDNA(string OASISDNAPath, OASISDNA OASISDNA)
                 if (string.IsNullOrEmpty(OASISDNAPath))
                     OASISErrorHandling.HandleError(ref result, $"{errorMessage}OASISDNAPath cannot be null.");
 
-                else if (File.Exists(OASISDNAPath))
+                else if (!File.Exists(OASISDNAPath))
                     OASISErrorHandling.HandleError(ref result, $"{errorMessage}The OASISDNAPath ({OASISDNAPath}) is not valid. Please make sure the OASISDNAPath is valid and that it points to the OASISDNA.json file.");
 
                 else

NextGenSoftware.OASIS.API.ONODE.Core/Managers/NFTManager.cs

@@ -2277,6 +2277,8 @@ private static async Task<IMintNFTTransactionRequest> GenerateNFTRequestAsync()
             string desc = CLIEngine.GetValidInput("What is the NFT's description?");
             string memotext = CLIEngine.GetValidInput("What is the NFT's memotext? (optional)");
             ProviderType offChainProvider = ProviderType.None;
+            NFTOffChainMetaType NFTOffchainMetaType = NFTOffChainMetaType.OASIS;
+            NFTStandardType NFTStandardType = NFTStandardType.Both;
             Dictionary<string, object> metaData = new Dictionary<string, object>();
 
             if (CLIEngine.GetConfirmation("Do you want to upload a local image on your device to represent the NFT or input a URI to an online image? (Press Y for local or N for online)"))
@@ -2316,10 +2318,19 @@ private static async Task<IMintNFTTransactionRequest> GenerateNFTRequestAsync()
 
             if (!storeMetaDataOnChain)
             {
-                object offChainProviderObj = CLIEngine.GetValidInputForEnum("What off-chain provider do you wish to store the metadata on? (NOTE: It will automatically auto-replicate to other providers across the OASIS through the auto-replication feature in the OASIS HyperDrive)", typeof(ProviderType));
-                offChainProvider = (ProviderType)offChainProviderObj;
+                object offChainMetaDataTypeObj = CLIEngine.GetValidInputForEnum("How do you wish to store the offchain meta data/image? IPFS, OASIS or Pinata? If you choose OASIS, it will automatically auto-replicate to other providers across the OASIS through the auto-replication feature in the OASIS HyperDrive. If you choose OASIS and then IPFSOASIS for the next question for the OASIS Provider it will store it on IPFS via The OASIS and then benefit from the OASIS HyperDrive feature to provide more reliable service and up-time etc. If you choose IPFS or Pinata for this question then it will store it directly on IPFS/Pinata without any additional benefits of The OASIS.", typeof(NFTOffChainMetaType));
+                NFTOffchainMetaType = (NFTOffChainMetaType)offChainMetaDataTypeObj;
+
+                if (NFTOffchainMetaType == NFTOffChainMetaType.OASIS)
+                {
+                    object offChainProviderObj = CLIEngine.GetValidInputForEnum("What OASIS off-chain provider do you wish to store the metadata on? (NOTE: It will automatically auto-replicate to other providers across the OASIS through the auto-replication feature in the OASIS HyperDrive)", typeof(ProviderType));
+                    offChainProvider = (ProviderType)offChainProviderObj;
+                }
             }
 
+            object nftStandardObj = CLIEngine.GetValidInputForEnum("What NFT ERC standard do you wish to support? ERC721, ERC1155 or both?", typeof(NFTStandardType));
+            NFTStandardType = (NFTStandardType)nftStandardObj;
+
             if (CLIEngine.GetConfirmation("Do you wish to add any metadata to this NFT?"))
             {
                 metaData = AddMetaDataToNFT(metaData);

NextGenSoftware.OASIS.STAR.CLI.Lib/STARCLI.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Drawing
+using System.Drawing;
 using System.Threading.Tasks;
 using System.Collections.Generic;
 using MongoDB.Driver;