fix withdrawCap type

pds/contracts/IPackNFT.cdc

@@ -96,7 +96,7 @@ access(all) contract interface IPackNFT{
 
     /// Resource interface for NFT
     ///
-    access(all) resource interface NFT: NonFungibleToken.INFT, IPackNFTToken, IPackNFTOwnerOperator {
+    access(all) resource interface NFT: NonFungibleToken.NFT, IPackNFTToken, IPackNFTOwnerOperator {
         access(all) let id: UInt64
         access(all) let issuer: Address
         access(NonFungibleToken.Update | NonFungibleToken.Owner) fun reveal(openRequest: Bool)

pds/contracts/PDS.cdc

@@ -6,7 +6,7 @@ import IPackNFT from "IPackNFT"
 access(all) contract PDS{
     /// Entitlement that grants the ability to create a distribution.
     ///
-    access(all) entitlement DistCreation
+    access(all) entitlement CreateDist
 
     access(all) var version: String
     access(all) let PackIssuerStoragePath: StoragePath
@@ -105,7 +105,7 @@ access(all) contract PDS{
     access(all) resource SharedCapabilities {
         /// Capability to withdraw NFTs from the issuer.
         ///
-        access(self) let withdrawCap: Capability<auth(NonFungibleToken.Withdraw | NonFungibleToken.Owner) &{NonFungibleToken.Provider}>
+        access(self) let withdrawCap: Capability<auth(NonFungibleToken.Withdraw, NonFungibleToken.Owner) &{NonFungibleToken.Provider}>
 
         /// Capability to mint, reveal, and open Pack NFTs.
         ///
@@ -155,7 +155,7 @@ access(all) contract PDS{
         /// SharedCapabilities resource initializer.
         ///
         view init(
-            withdrawCap: Capability<auth(NonFungibleToken.Withdraw | NonFungibleToken.Owner) &{NonFungibleToken.Provider}>,
+            withdrawCap: Capability<auth(NonFungibleToken.Withdraw, NonFungibleToken.Owner) &{NonFungibleToken.Provider}>,
             operatorCap: Capability<auth(IPackNFT.Operatable) &{IPackNFT.IOperator}>
         ) {
             self.withdrawCap = withdrawCap
@@ -170,16 +170,16 @@ access(all) contract PDS{
     /// Resource that defines the issuer of a pack.
     ///
     access(all) resource PackIssuer: PackIssuerCapReciever {
-        access(self) var cap: Capability<auth(DistCreation) &DistributionCreator>?
+        access(self) var cap: Capability<&DistributionCreator>?
 
-        access(all) fun setDistCap(cap: Capability<auth(DistCreation) &DistributionCreator>) {
+        access(all) fun setDistCap(cap: Capability<&DistributionCreator>) {
             pre {
                 cap.borrow() != nil: "Invalid capability"
             }
             self.cap = cap
         }
 
-        access(DistCreation) fun createDist(sharedCap: @SharedCapabilities, title: String, metadata: {String: String}) {
+        access(CreateDist) fun createDist(sharedCap: @SharedCapabilities, title: String, metadata: {String: String}) {
             assert(title.length > 0, message: "Title must not be empty")
             let c = self.cap!.borrow()!
             c.createNewDist(sharedCap: <- sharedCap, title: title, metadata: metadata)
@@ -198,7 +198,7 @@ access(all) contract PDS{
     /// Resource that defines the creator of a distribution.
     ///
     access(all) resource DistributionCreator: IDistCreator {
-        access(DistCreation) fun createNewDist(sharedCap: @SharedCapabilities, title: String, metadata: {String: String}) {
+        access(all) fun createNewDist(sharedCap: @SharedCapabilities, title: String, metadata: {String: String}) {
             let currentId = PDS.nextDistId
             PDS.DistSharedCap[currentId] <-! sharedCap
             PDS.Distributions[currentId] = DistInfo(title: title, metadata: metadata)
@@ -308,7 +308,7 @@ access(all) contract PDS{
     /// Create a SharedCapabilities resource and return it to the caller.
     ///
     access(all) fun createSharedCapabilities(
-        withdrawCap: Capability<auth(NonFungibleToken.Withdraw | NonFungibleToken.Owner) &{NonFungibleToken.Provider}>,
+        withdrawCap: Capability<auth(NonFungibleToken.Withdraw, NonFungibleToken.Owner) &{NonFungibleToken.Provider}>,
         operatorCap: Capability<auth(IPackNFT.Operatable) &{IPackNFT.IOperator}>
     ): @SharedCapabilities {
         return <- create SharedCapabilities(

pds/transactions/pds/create_distribution.cdc

@@ -6,11 +6,11 @@ import NonFungibleToken from "NonFungibleToken"
 transaction(title: String, metadata: {String: String}) {
     prepare (issuer: auth(BorrowValue, Capabilities) &Account) {
 
-        let i = issuer.storage.borrow<auth(PDS.DistCreation) &PDS.PackIssuer>(from: PDS.PackIssuerStoragePath)
+        let i = issuer.storage.borrow<auth(PDS.CreateDist) &PDS.PackIssuer>(from: PDS.PackIssuerStoragePath)
             ?? panic ("issuer does not have PackIssuer resource")
 
         // issuer must have a PackNFT collection
-        let withdrawCap = issuer.capabilities.storage.issue<auth(NonFungibleToken.Withdraw) &{NonFungibleToken.Provider}>(StoragePath(identifier: "cadenceExampleNFTCollection")!);
+        let withdrawCap = issuer.capabilities.storage.issue<auth(NonFungibleToken.Withdraw, NonFungibleToken.Owner) &{NonFungibleToken.Provider}>(StoragePath(identifier: "cadenceExampleNFTCollection")!);
         let operatorCap = issuer.capabilities.storage.issue<auth(IPackNFT.Operatable) &{IPackNFT.IOperator}>({{.PackNFTName}}.OperatorStoragePath);
         assert(withdrawCap.check(), message:  "cannot borrow withdraw capability")
         assert(operatorCap.check(), message:  "cannot borrow operator capability")

pds/transactions/pds/set_pack_issuer_cap.cdc

@@ -2,7 +2,7 @@ import PDS from "PDS"
 
 transaction (issuer: Address) {
     prepare(pds: auth(Capabilities) &Account) {
-        let cap = pds.capabilities.storage.issue<auth(PDS.DistCreation) &PDS.DistributionCreator>(PDS.DistCreatorStoragePath)
+        let cap = pds.capabilities.storage.issue<auth(PDS.CreateDist) &PDS.DistributionCreator>(PDS.DistCreatorStoragePath)
         if !cap.check() {
             panic("cannot borrow such capability")
         }