- Continued improving NFT API, fixing bugs etc.

- Added new PlacedOn property to IOASISGeoSpatialNFT interface in OASIS.API.Core.

- Changed OffChainProvider and OnChainProvider on IMintNFTTransactionRequest/MintNFTTransactionReques in tOASIS.API.Core to use EnumValue<ProviderType instead of ProviderType (is now wrapped in EnumValue) so makes it easier to work with and display enum names etc.

- Addded MintedOn property to IOASISNFT interface in OASIS.API.Core.

- Started fixing the GenerateKeyPair function in KeyManger in OASIS.API.Core to use the correct prefix depending on what blockchain/provider it is generating the public/private keys for. Needs finishing...

- Updated LinkProviderPublicKeyToAvatar function in OASIS.API.Core so it now also sets the WalletAddress to the public key. This will eventually calcualte and set the correct WalletAddress (derived from the public key).

- Added new PlacedOn property to OASISGeoSpatialNFT object  in OASIS.API.Core.

- Addded MintedOn property to OASISNFT interface in OASIS.API.Core.

- Updated MintNftAsync method in NFTManger to work with the now wrapped EnumValues. Also added additional error handling and reporting and fixed a bug.

- Updated MintNft method in NFTManger to work with the now wrapped EnumValues.

- Changed the providerType param to an optional one that defaults to ProviderType.Default in the functions LoadNftAsync, LoadNft, LoadAllNFTsForAvatarAsync, LoadAllNFTsForAvatar, LoadAllNFTsForMintAddressAsync, LoadAllNFTsForMintAddress, LoadAllGeoNFTsForAvatarAsync, LoadAllGeoNFTsForAvatar, LoadAllGeoNFTsForMintAddressAsync, LoadAllGeoNFTsForMintAddress, LoadAllNFTsAsync, LoadAllNFTs, LoadAllGeoNFTsAsyn &, LoadAllGeoNFTs in NFTManger in OASIS.API.ONODE.Core.

- Updated CreateOASISNFT function in NFTManger to set the new MintedOn property in OASIS.API.ONODE.Core.

- Updated CreateGeoSpatialNFT function in NFTManger to set the new MintedOn and PlacedOn properties in OASIS.API.ONODE.Core.

- Updated the CreateNFTMetaDataHolon function in NFTManger to set the new NFT.MintedOn metadata in OASIS.API.ONODE.Core as well as the Name property now works with the EnumValue property type wrap.

- Updated the CreateNFTMetaDataHolon function in NFTManger to set the new NFT.MintedOn metadata in OASIS.API.ONODE.Core.

- Added GEONFT.PlacedByAvatarId and GEONFT.PlacedOn metadata to CreateGeoSpatialNFTMetaDataHolon function in OASIS.API.ONODE.Core.

- Fixed a bug in DecodeNFTMetaData so the NFT metadata is now cast to a OASISNFT rather than IOASISNFT. Also fixed another bug where holon.MetaData was being used instead of holonRest.Result.MetaData. Finally fixed another bug where the metadata key being used was "OASISNFT" rather than "NFT.OASISNFT".

- Fixed a bug in DecodeGeoNFTMetaData so the NFT metadata is now cast to a OASISGeoSpatialNFT rather than IOASISGeoSpatialNFT. Also fixed another bug where holon.MetaData was being used instead of holonRest.Result.MetaData. Finally fixed another bug where the metadata key being used was "OASISGEONFT" rather than "GEONFT.OASISGEONFT".

- Updated MintNftAsync function in NFTController in OASIS.API.ONODE.WebApi to always set the MintedByAvatarId from the logged in avatar/user rather than allowing it to be passed in (improves security so people can not pretend to mint the NFT from another avatar).

- Started fixing the functions/endpoints in NFTController to comform to OASIS standards. WIP... So far LoadNftByIdAsync, LoadNftByHashAsync & LoadAllNFTsForAvatarAsync have been fixed by adding additonal overloads so ProviderType can be passed in or if none is passed in it will use the current defaullt provider so will now work the same as the Avatar and Data API's...

- Fided a bug in AttachAccountToContext function in JwtMiddleware in OASIS.API.ONODE.WebApi.

- Removed MintWalletAddress and MintedByAvatarId proeprties from MintNFTTransactionRequest in OASIS.API.ONODE.WebApi because these are now retreived from the logged in avatar/user.

Author: dellams

NextGenSoftware.OASIS.API.Core/Interfaces/NFT/GeoSpatialNFT/IOASISGeoSpatialNFT.cs

@@ -8,6 +8,7 @@ public interface IOASISGeoSpatialNFT : IOASISNFT
         Guid PlacedByAvatarId { get; set; }
         Guid OriginalOASISNFTId { get; set; }
         ProviderType OriginalOASISNFTProviderType { get; set; }
+        DateTime PlacedOn { get; set; }
         long Lat { get; set; }
         long Long { get; set; }
         bool AllowOtherPlayersToAlsoCollect { get; set; }

NextGenSoftware.OASIS.API.Core/Interfaces/NFT/IOASISNFT.cs

@@ -1,4 +1,5 @@
 using NextGenSoftware.OASIS.API.Core.Enums;
+using NextGenSoftware.OASIS.API.Core.Helpers;
 using System;
 using System.Collections.Generic;
 
@@ -8,6 +9,7 @@ public interface IOASISNFT
     {
         Guid Id { get; set; }
         Guid MintedByAvatarId { get; set; }
+        DateTime MintedOn { get; set; }
         string MintedByAddress { get; set; }
         string Hash { get; set; }
         string URL { get; set; }
@@ -22,7 +24,7 @@ public interface IOASISNFT
         string ThumbnailUrl { get; set; }
         public string Token { get; set; } //TODO: Should be dervied from the OnChainProvider so may not need this?
         Dictionary<string, object> MetaData { get; set; }
-        ProviderType OffChainProvider { get; set; }
-        ProviderType OnChainProvider { get; set; }
+        EnumValue<ProviderType> OffChainProvider { get; set; }
+        EnumValue<ProviderType> OnChainProvider { get; set; }
     }
 }

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

@@ -1,4 +1,5 @@
 using NextGenSoftware.OASIS.API.Core.Enums;
+using NextGenSoftware.OASIS.API.Core.Helpers;
 using System;
 using System.Collections.Generic;
 
@@ -21,7 +22,7 @@ public interface IMintNFTTransactionRequest
         public int NumberToMint { get; set; }
         public bool StoreNFTMetaDataOnChain { get; set; }
         public Dictionary<string, object> MetaData { get; set; }
-        public ProviderType OffChainProvider { get; set; }
-        public ProviderType OnChainProvider { get; set; }
+        public EnumValue<ProviderType> OffChainProvider { get; set; }
+        public EnumValue<ProviderType> OnChainProvider { get; set; }
     }
 }

NextGenSoftware.OASIS.API.Core/Interfaces/Providers/IOASISNFTProvider.cs

@@ -1,11 +1,7 @@
-
+using System.Threading.Tasks;
 using NextGenSoftware.OASIS.API.Core.Helpers;
-using NextGenSoftware.OASIS.API.Core.Interfaces.NFT.GeoSpatialNFT;
 using NextGenSoftware.OASIS.API.Core.Interfaces.NFT.Request;
 using NextGenSoftware.OASIS.API.Core.Interfaces.NFT.Response;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace NextGenSoftware.OASIS.API.Core.Interfaces
 {

NextGenSoftware.OASIS.API.Core/Managers/KeyManager.cs

@@ -81,9 +81,23 @@ public KeyManager(IOASISStorageProvider OASISStorageProvider, OASISDNA OASISDNA
         //TODO: Implement later (Cache Disabled).
         //public bool IsCacheEnabled { get; set; } = true;
 
-        public OASISResult<KeyPair> GenerateKeyPair(ProviderType provider)
+        public OASISResult<KeyPair> GenerateKeyPair(ProviderType providerType)
         {
-            return GenerateKeyPair(Enum.GetName(typeof(ProviderType), provider));
+            string prefix = "";
+
+            //TODO: Need to look up and add all prefixes here!
+            switch (providerType)
+            {
+                case ProviderType.EthereumOASIS:
+                    prefix = "1";
+                    break;
+
+                case ProviderType.SolanaOASIS: 
+                    prefix = "2"; 
+                    break;
+            }
+
+            return GenerateKeyPair(prefix);
         }
 
         public OASISResult<KeyPair> GenerateKeyPair(string prefix)
@@ -279,13 +293,14 @@ public OASISResult<Guid> LinkProviderPublicKeyToAvatar(Guid walletId, IAvatar av
                 {
                     if (walletId == Guid.Empty)
                     {
-                        ProviderWallet newWallet = new ProviderWallet() 
-                        { 
+                        ProviderWallet newWallet = new ProviderWallet()
+                        {
                             WalletId = Guid.NewGuid(),
                             AvatarId = avatar.Id,
                             CreatedByAvatarId = avatar.Id,
                             CreatedDate = DateTime.Now,
-                            PublicKey = providerKey
+                            PublicKey = providerKey,
+                            WalletAddress = providerKey //TODO: Need to calucalte the walletAddress from the PublicKey!
                         };
 
                         result.Result = newWallet.WalletId;
@@ -303,6 +318,7 @@ public OASISResult<Guid> LinkProviderPublicKeyToAvatar(Guid walletId, IAvatar av
 
                         if (wallet != null)
                         {
+                            wallet.WalletAddress = providerKey; //TODO: Need to calucalte the walletAddress from the PublicKey!
                             wallet.PublicKey = providerKey;
                             wallet.ModifiedByAvatarId = avatar.Id;
                             wallet.ModifiedDate = DateTime.Now;

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

@@ -2,6 +2,7 @@
 using NextGenSoftware.OASIS.API.Core.Enums;
 using System.Collections.Generic;
 using NextGenSoftware.OASIS.API.Core.Interfaces.NFT.Request;
+using NextGenSoftware.OASIS.API.Core.Helpers;
 
 namespace NextGenSoftware.OASIS.API.Core.Objects.NFT.Request
 {
@@ -22,7 +23,7 @@ public class MintNFTTransactionRequest : IMintNFTTransactionRequest
         public int NumberToMint { get; set; }
         public bool StoreNFTMetaDataOnChain { get; set; }
         public Dictionary<string, object> MetaData { get; set; }
-        public ProviderType OffChainProvider { get; set; }
-        public ProviderType OnChainProvider { get; set; }
+        public EnumValue<ProviderType> OffChainProvider { get; set; }
+        public EnumValue<ProviderType> OnChainProvider { get; set; }
     }
 }

NextGenSoftware.OASIS.API.Core/Objects/OASISGeoSpatialNFT.cs

@@ -9,6 +9,7 @@ public class OASISGeoSpatialNFT : OASISNFT, IOASISGeoSpatialNFT
         public Guid PlacedByAvatarId { get; set; }
         public Guid OriginalOASISNFTId { get; set; }
         public ProviderType OriginalOASISNFTProviderType { get; set; }
+        public DateTime PlacedOn { get; set; }
         public long Lat { get; set; }
         public long Long { get; set; }
 

NextGenSoftware.OASIS.API.Core/Objects/OASISNFT.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using NextGenSoftware.OASIS.API.Core.Enums;
+using NextGenSoftware.OASIS.API.Core.Helpers;
 using NextGenSoftware.OASIS.API.Core.Interfaces.NFT;
 
 namespace NextGenSoftware.OASIS.API.Core.Objects
@@ -9,6 +10,7 @@ public class OASISNFT : IOASISNFT
     {
         public Guid Id { get; set; }
         public Guid MintedByAvatarId { get; set; }
+        public DateTime MintedOn { get; set; }
 
         public string Title { get; set; }
         public string Description { get; set; }
@@ -32,11 +34,11 @@ public class OASISNFT : IOASISNFT
         /// <summary>
         /// The Blockchain to store the token on.
         /// </summary>
-        public ProviderType OnChainProvider { get; set; } = ProviderType.EthereumOASIS;
+        public EnumValue<ProviderType> OnChainProvider { get; set; } 
 
         /// <summary>
         /// Where the meta data is stored for the NFT (JSON Meta file and associated media etc) - For example HoloOASIS or IPFSOASIS etc.
         /// </summary>
-        public ProviderType OffChainProvider { get; set; } = ProviderType.HoloOASIS;
+        public EnumValue<ProviderType> OffChainProvider { get; set; } 
     }
 }