fix issues causing nft borrowing and data resolution to not work

Flowtyio · Sep 9, 2024 · 84f5bad · 84f5bad
1 parent c872f67
commit 84f5bad
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/contracts/nft/BaseCollection.cdc b/contracts/nft/BaseCollection.cdc
@@ -23,7 +23,7 @@ access(all) contract interface BaseCollection: ViewResolver {
                 token.getType() == self.nftType: "unexpected nft type being deposited"
             }
 
-            destroy self.ownedNFTs.insert(key: token.uuid, <-token)
+            destroy self.ownedNFTs.insert(key: token.id, <-token)
         }
 
         access(all) view fun borrowNFT(_ id: UInt64): &{NonFungibleToken.NFT}? {

diff --git a/contracts/nft/BaseNFT.cdc b/contracts/nft/BaseNFT.cdc
@@ -42,7 +42,7 @@ access(all) contract interface BaseNFT: ViewResolver {
 
         access(all) fun resolveView(_ view: Type): AnyStruct? {
             if view == Type<MetadataViews.Serial>() {
-                return self.id
+                return MetadataViews.Serial(self.id)
             }
 
             let rt = self.getType()
@@ -75,7 +75,7 @@ access(all) contract interface BaseNFT: ViewResolver {
                         }
                     )
                 case Type<MetadataViews.NFTCollectionDisplay>():
-                    return md.collectionInfo.collectionDisplay
+                    return md.collectionInfo.getDisplay()
             }
 
             if let entry = md.borrowMetadata(id: self.metadataID) {

diff --git a/contracts/nft/UniversalCollection.cdc b/contracts/nft/UniversalCollection.cdc
@@ -14,6 +14,18 @@ access(all) contract UniversalCollection {
             return <- create Collection(nftType: self.nftType)
         }
 
+        access(all) fun deposit(token: @{NonFungibleToken.NFT}) {
+            pre {
+                token.getType() == self.nftType: "unexpected nft type being deposited"
+            }
+
+            destroy self.ownedNFTs.insert(key: token.id, <-token)
+        }
+
+        access(all) view fun borrowNFT(_ id: UInt64): &{NonFungibleToken.NFT}? {
+            return &self.ownedNFTs[id]
+        }
+
         init (nftType: Type) {
             self.ownedNFTs <- {}
             self.nftType = nftType