reveal and open from collection

dapperlabs · Jun 12, 2024 · 4bf9ff8 · 4bf9ff8
1 parent e87e024
commit 4bf9ff8
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 11 deletions.
diff --git a/pds/contracts/IPackNFT.cdc b/pds/contracts/IPackNFT.cdc
@@ -99,13 +99,19 @@ access(all) contract interface IPackNFT{
     access(all) resource interface NFT: NonFungibleToken.NFT, IPackNFTToken, IPackNFTOwnerOperator {
         access(all) let id: UInt64
         access(all) let issuer: Address
-        access(NonFungibleToken.Update) fun reveal(openRequest: Bool)
-        access(NonFungibleToken.Update) fun open()
+        access(contract) fun reveal(openRequest: Bool)
+        access(contract) fun open()
+    }
+
+    /// Resource interface for PackNFT Collection
+    ///
+    access(all) resource interface IPackNFTCollectionPublic {
+        access(NonFungibleToken.Update) fun reveal(id: UInt64, openRequest: Bool)
+        access(NonFungibleToken.Update) fun open(id: UInt64)
     }
 
     // Included for backwards compatibility
     access(all) resource interface IPackNFTOwnerOperator{}
-    access(all) resource interface IPackNFTCollectionPublic {}
 
     /// Emit a RevealRequest event to signal a Sealed Pack NFT should be revealed
     ///

diff --git a/pds/contracts/PackNFT.cdc b/pds/contracts/PackNFT.cdc
@@ -155,13 +155,13 @@ access(all) contract PackNFT: NonFungibleToken, IPackNFT {
 
         /// Reveal a Sealed Pack resource.
         ///
-        access(NonFungibleToken.Update) fun reveal(openRequest: Bool) {
+        access(contract) fun reveal(openRequest: Bool) {
             PackNFT.revealRequest(id: self.id, openRequest: openRequest)
         }
 
         /// Open a Revealed Pack resource.
         ///
-        access(NonFungibleToken.Update) fun open() {
+        access(contract) fun open() {
             PackNFT.openRequest(id: self.id)
         }
 
@@ -241,6 +241,20 @@ access(all) contract PackNFT: NonFungibleToken, IPackNFT {
             destroy oldToken
         }
 
+        /// Reveal a Sealed Pack resource.
+        ///
+        access(NonFungibleToken.Update) fun reveal(id: UInt64, openRequest: Bool) {
+            let packRef = self.borrowNFT(id) as! &NFT
+            packRef.reveal(openRequest: openRequest)
+        }
+
+        /// Open a Revealed Pack resource.
+        ///
+        access(NonFungibleToken.Update) fun open(id: UInt64) {
+            let packRef = self.borrowNFT(id) as! &NFT
+            packRef.open()
+        }
+
         /// Return an array of the IDs that are in the collection.
         ///
         access(all) view fun getIDs(): [UInt64] {