@flowtyio/flow-contracts 0.1.0-beta.9 → 0.1.1

package/contracts/dapper/TopShot.cdc

@@ -47,62 +47,63 @@ import "FungibleToken"
 import "NonFungibleToken"
 import "MetadataViews"
 import "TopShotLocking"
+import "ViewResolver"
 
-pub contract TopShot: NonFungibleToken {
+access(all) contract TopShot: NonFungibleToken {
     // -----------------------------------------------------------------------
     // TopShot deployment variables
     // -----------------------------------------------------------------------
 
     // The network the contract is deployed on
-    pub fun Network() : String { return "emulator" }
+    access(all) view fun Network() : String { return "emulator" }
 
     // The address to which royalties should be deposited
-    pub fun RoyaltyAddress() : Address { return TopShot.account.address }
+    access(all) view fun RoyaltyAddress() : Address { return TopShot.account.address }
 
     // The path to the Subedition Admin resource belonging to the Account
     // which the contract is deployed on
-    pub fun SubeditionAdminStoragePath() : StoragePath { return /storage/TopShotSubeditionAdmin}
+    access(all) view fun SubeditionAdminStoragePath() : StoragePath { return /storage/TopShotSubeditionAdmin}
 
     // -----------------------------------------------------------------------
     // TopShot contract Events
     // -----------------------------------------------------------------------
 
     // Emitted when the TopShot contract is created
-    pub event ContractInitialized()
+    access(all) event ContractInitialized()
 
     // Emitted when a new Play struct is created
-    pub event PlayCreated(id: UInt32, metadata: {String:String})
+    access(all) event PlayCreated(id: UInt32, metadata: {String:String})
     // Emitted when a new series has been triggered by an admin
-    pub event NewSeriesStarted(newCurrentSeries: UInt32)
+    access(all) event NewSeriesStarted(newCurrentSeries: UInt32)
 
     // Events for Set-Related actions
     //
     // Emitted when a new Set is created
-    pub event SetCreated(setID: UInt32, series: UInt32)
+    access(all) event SetCreated(setID: UInt32, series: UInt32)
     // Emitted when a new Play is added to a Set
-    pub event PlayAddedToSet(setID: UInt32, playID: UInt32)
+    access(all) event PlayAddedToSet(setID: UInt32, playID: UInt32)
     // Emitted when a Play is retired from a Set and cannot be used to mint
-    pub event PlayRetiredFromSet(setID: UInt32, playID: UInt32, numMoments: UInt32)
+    access(all) event PlayRetiredFromSet(setID: UInt32, playID: UInt32, numMoments: UInt32)
     // Emitted when a Set is locked, meaning Plays cannot be added
-    pub event SetLocked(setID: UInt32)
+    access(all) event SetLocked(setID: UInt32)
     // Emitted when a Moment is minted from a Set
-    pub event MomentMinted(momentID: UInt64, playID: UInt32, setID: UInt32, serialNumber: UInt32, subeditionID: UInt32)
+    access(all) event MomentMinted(momentID: UInt64, playID: UInt32, setID: UInt32, serialNumber: UInt32, subeditionID: UInt32)
 
     // Events for Collection-related actions
     //
     // Emitted when a moment is withdrawn from a Collection
-    pub event Withdraw(id: UInt64, from: Address?)
+    access(all) event Withdraw(id: UInt64, from: Address?)
     // Emitted when a moment is deposited into a Collection
-    pub event Deposit(id: UInt64, to: Address?)
+    access(all) event Deposit(id: UInt64, to: Address?)
 
     // Emitted when a Moment is destroyed
-    pub event MomentDestroyed(id: UInt64)
+    access(all) event MomentDestroyed(id: UInt64)
 
     // Emitted when a Subedition is created
-    pub event SubeditionCreated(subeditionID: UInt32, name: String, metadata: {String:String})
+    access(all) event SubeditionCreated(subeditionID: UInt32, name: String, metadata: {String:String})
 
     // Emitted when a Subedition is linked to the specific Moment
-    pub event SubeditionAddedToMoment(momentID: UInt64, subeditionID: UInt32, setID: UInt32, playID: UInt32)
+    access(all) event SubeditionAddedToMoment(momentID: UInt64, subeditionID: UInt32, setID: UInt32, playID: UInt32)
 
     // -----------------------------------------------------------------------
     // TopShot contract-level fields.
@@ -112,7 +113,7 @@ pub contract TopShot: NonFungibleToken {
     // Series that this Set belongs to.
     // Series is a concept that indicates a group of Sets through time.
     // Many Sets can exist at a time, but only one series.
-    pub var currentSeries: UInt32
+    access(all) var currentSeries: UInt32
 
     // Variable size dictionary of Play structs
     access(self) var playDatas: {UInt32: Play}
@@ -126,17 +127,17 @@ pub contract TopShot: NonFungibleToken {
     // The ID that is used to create Plays. 
     // Every time a Play is created, playID is assigned 
     // to the new Play's ID and then is incremented by 1.
-    pub var nextPlayID: UInt32
+    access(all) var nextPlayID: UInt32
 
     // The ID that is used to create Sets. Every time a Set is created
     // setID is assigned to the new set's ID and then is incremented by 1.
-    pub var nextSetID: UInt32
+    access(all) var nextSetID: UInt32
 
     // The total number of Top shot Moment NFTs that have been created
     // Because NFTs can be destroyed, it doesn't necessarily mean that this
     // reflects the total number of NFTs in existence, just the number that
     // have been minted to date. Also used as global moment IDs for minting.
-    pub var totalSupply: UInt64
+    access(all) var totalSupply: UInt64
 
     // -----------------------------------------------------------------------
     // TopShot contract-level Composite Type definitions
@@ -156,16 +157,16 @@ pub contract TopShot: NonFungibleToken {
     // its metadata. The plays are publicly accessible, so anyone can
     // read the metadata associated with a specific play ID
     //
-    pub struct Play {
+    access(all) struct Play {
 
         // The unique ID for the Play
-        pub let playID: UInt32
+        access(all) let playID: UInt32
 
         // Stores all the metadata about the play as a string mapping
         // This is not the long term way NFT metadata will be stored. It's a temporary
         // construct while we figure out a better way to do metadata.
         //
-        pub let metadata: {String: String}
+        access(all) let metadata: {String: String}
 
         init(metadata: {String: String}) {
             pre {
@@ -196,19 +197,19 @@ pub contract TopShot: NonFungibleToken {
     // at the end of the contract. Only the admin has the ability 
     // to modify any data in the private Set resource.
     //
-    pub struct SetData {
+    access(all) struct SetData {
 
         // Unique ID for the Set
-        pub let setID: UInt32
+        access(all) let setID: UInt32
 
         // Name of the Set
         // ex. "Times when the Toronto Raptors choked in the playoffs"
-        pub let name: String
+        access(all) let name: String
 
         // Series that this Set belongs to.
         // Series is a concept that indicates a group of Sets through time.
         // Many Sets can exist at a time, but only one series.
-        pub let series: UInt32
+        access(all) let series: UInt32
 
         init(name: String) {
             pre {
@@ -239,10 +240,10 @@ pub contract TopShot: NonFungibleToken {
     //
     // If retireAll() and lock() are called back-to-back, 
     // the Set is closed off forever and nothing more can be done with it.
-    pub resource Set {
+    access(all) resource Set {
 
         // Unique ID for the set
-        pub let setID: UInt32
+        access(all) let setID: UInt32
 
         // Array of plays that are a part of this set.
         // When a play is added to the set, its ID gets appended here.
@@ -263,7 +264,7 @@ pub contract TopShot: NonFungibleToken {
         // If a Set is locked, Plays cannot be added, but
         // Moments can still be minted from Plays
         // that exist in the Set.
-        pub var locked: Bool
+        access(all) var locked: Bool
 
         // Mapping of Play IDs that indicates the number of Moments 
         // that have been minted for specific Plays in this Set.
@@ -291,7 +292,7 @@ pub contract TopShot: NonFungibleToken {
         // The Set needs to be not locked
         // The Play can't have already been added to the Set
         //
-        pub fun addPlay(playID: UInt32) {
+        access(all) fun addPlay(playID: UInt32) {
             pre {
                 TopShot.playDatas[playID] != nil: "Cannot add the Play to Set: Play doesn't exist."
                 !self.locked: "Cannot add the play to the Set after the set has been locked."
@@ -315,7 +316,7 @@ pub contract TopShot: NonFungibleToken {
         // Parameters: playIDs: The IDs of the Plays that are being added
         //                      as an array
         //
-        pub fun addPlays(playIDs: [UInt32]) {
+        access(all) fun addPlays(playIDs: [UInt32]) {
             for play in playIDs {
                 self.addPlay(playID: play)
             }
@@ -328,7 +329,7 @@ pub contract TopShot: NonFungibleToken {
         // Pre-Conditions:
         // The Play is part of the Set and not retired (available for minting).
         // 
-        pub fun retirePlay(playID: UInt32) {
+        access(all) fun retirePlay(playID: UInt32) {
             pre {
                 self.retired[playID] != nil: "Cannot retire the Play: Play doesn't exist in this set!"
             }
@@ -343,7 +344,7 @@ pub contract TopShot: NonFungibleToken {
         // retireAll retires all the plays in the Set
         // Afterwards, none of the retired Plays will be able to mint new Moments
         //
-        pub fun retireAll() {
+        access(all) fun retireAll() {
             for play in self.plays {
                 self.retirePlay(playID: play)
             }
@@ -353,7 +354,7 @@ pub contract TopShot: NonFungibleToken {
         //
         // Pre-Conditions:
         // The Set should not be locked
-        pub fun lock() {
+        access(all) fun lock() {
             if !self.locked {
                 self.locked = true
                 emit SetLocked(setID: self.setID)
@@ -369,7 +370,7 @@ pub contract TopShot: NonFungibleToken {
         //
         // Returns: The NFT that was minted
         // 
-        pub fun mintMoment(playID: UInt32): @NFT {
+        access(all) fun mintMoment(playID: UInt32): @NFT {
             pre {
                 self.retired[playID] != nil: "Cannot mint the moment: This play doesn't exist."
                 !self.retired[playID]!: "Cannot mint the moment from this play: This play has been retired."
@@ -399,7 +400,7 @@ pub contract TopShot: NonFungibleToken {
         //
         // Returns: Collection object that contains all the Moments that were minted
         //
-        pub fun batchMintMoment(playID: UInt32, quantity: UInt64): @Collection {
+        access(all) fun batchMintMoment(playID: UInt32, quantity: UInt64): @Collection {
             let newCollection <- create Collection()
 
             var i: UInt64 = 0
@@ -421,7 +422,7 @@ pub contract TopShot: NonFungibleToken {
         //
         // Returns: The NFT that was minted
         //
-        pub fun mintMomentWithSubedition(playID: UInt32, subeditionID: UInt32): @NFT {
+        access(all) fun mintMomentWithSubedition(playID: UInt32, subeditionID: UInt32): @NFT {
             pre {
                 self.retired[playID] != nil: "Cannot mint the moment: This play doesn't exist."
                 !self.retired[playID]!: "Cannot mint the moment from this play: This play has been retired."
@@ -429,7 +430,7 @@ pub contract TopShot: NonFungibleToken {
 
             // Gets the number of Moments that have been minted for this subedition
             // to use as this Moment's serial number
-            let subeditionRef = TopShot.account.borrow<&SubeditionAdmin>(from: TopShot.SubeditionAdminStoragePath())
+            let subeditionRef = TopShot.account.storage.borrow<&SubeditionAdmin>(from: TopShot.SubeditionAdminStoragePath())
             ?? panic("No subedition admin resource in storage")
 
             let numInSubedition = subeditionRef.getNumberMintedPerSubedition(setID: self.setID,
@@ -463,7 +464,7 @@ pub contract TopShot: NonFungibleToken {
         //
         // Returns: Collection object that contains all the Moments that were minted
         //
-         pub fun batchMintMomentWithSubedition(playID: UInt32, quantity: UInt64, subeditionID: UInt32): @Collection {
+         access(all) fun batchMintMomentWithSubedition(playID: UInt32, quantity: UInt64, subeditionID: UInt32): @Collection {
             let newCollection <- create Collection()
 
             var i: UInt64 = 0
@@ -476,15 +477,15 @@ pub contract TopShot: NonFungibleToken {
             return <-newCollection
         }
 
-        pub fun getPlays(): [UInt32] {
+        access(all) view fun getPlays(): [UInt32] {
             return self.plays
         }
 
-        pub fun getRetired(): {UInt32: Bool} {
+        access(all) view fun getRetired(): {UInt32: Bool} {
             return self.retired
         }
 
-        pub fun getNumMintedPerPlay(): {UInt32: UInt32} {
+        access(all) view fun getNumMintedPerPlay(): {UInt32: UInt32} {
             return self.numberMintedPerPlay
         }
     }
@@ -494,13 +495,13 @@ pub contract TopShot: NonFungibleToken {
     // with the desired set ID
     // let setData = TopShot.QuerySetData(setID: 12)
     //
-    pub struct QuerySetData {
-        pub let setID: UInt32
-        pub let name: String
-        pub let series: UInt32
+    access(all) struct QuerySetData {
+        access(all) let setID: UInt32
+        access(all) let name: String
+        access(all) let series: UInt32
         access(self) var plays: [UInt32]
         access(self) var retired: {UInt32: Bool}
-        pub var locked: Bool
+        access(all) var locked: Bool
         access(self) var numberMintedPerPlay: {UInt32: UInt32}
 
         init(setID: UInt32) {
@@ -514,36 +515,36 @@ pub contract TopShot: NonFungibleToken {
             self.setID = setID
             self.name = setData.name
             self.series = setData.series
-            self.plays = set.plays
-            self.retired = set.retired
+            self.plays = set.getPlays()
+            self.retired = set.getRetired()
             self.locked = set.locked
-            self.numberMintedPerPlay = set.numberMintedPerPlay
+            self.numberMintedPerPlay = set.getNumMintedPerPlay()
         }
 
-        pub fun getPlays(): [UInt32] {
+        access(all) view fun getPlays(): [UInt32] {
             return self.plays
         }
 
-        pub fun getRetired(): {UInt32: Bool} {
+        access(all) view fun getRetired(): {UInt32: Bool} {
             return self.retired
         }
 
-        pub fun getNumberMintedPerPlay(): {UInt32: UInt32} {
+        access(all) view fun getNumberMintedPerPlay(): {UInt32: UInt32} {
             return self.numberMintedPerPlay
         }
     }
 
-    pub struct MomentData {
+    access(all) struct MomentData {
 
         // The ID of the Set that the Moment comes from
-        pub let setID: UInt32
+        access(all) let setID: UInt32
 
         // The ID of the Play that the Moment references
-        pub let playID: UInt32
+        access(all) let playID: UInt32
 
         // The place in the edition that this Moment was minted
         // Otherwise know as the serial number
-        pub let serialNumber: UInt32
+        access(all) let serialNumber: UInt32
 
         init(setID: UInt32, playID: UInt32, serialNumber: UInt32) {
             self.setID = setID
@@ -556,38 +557,38 @@ pub contract TopShot: NonFungibleToken {
     // This is an implementation of a custom metadata view for Top Shot.
     // This view contains the play metadata.
     //
-    pub struct TopShotMomentMetadataView {
-
-        pub let fullName: String?
-        pub let firstName: String?
-        pub let lastName: String?
-        pub let birthdate: String?
-        pub let birthplace: String?
-        pub let jerseyNumber: String?
-        pub let draftTeam: String?
-        pub let draftYear: String?
-        pub let draftSelection: String?
-        pub let draftRound: String?
-        pub let teamAtMomentNBAID: String?
-        pub let teamAtMoment: String?
-        pub let primaryPosition: String?
-        pub let height: String?
-        pub let weight: String?
-        pub let totalYearsExperience: String?
-        pub let nbaSeason: String?
-        pub let dateOfMoment: String?
-        pub let playCategory: String?
-        pub let playType: String?
-        pub let homeTeamName: String?
-        pub let awayTeamName: String?
-        pub let homeTeamScore: String?
-        pub let awayTeamScore: String?
-        pub let seriesNumber: UInt32?
-        pub let setName: String?
-        pub let serialNumber: UInt32
-        pub let playID: UInt32
-        pub let setID: UInt32
-        pub let numMomentsInEdition: UInt32?
+    access(all) struct TopShotMomentMetadataView {
+
+        access(all) let fullName: String?
+        access(all) let firstName: String?
+        access(all) let lastName: String?
+        access(all) let birthdate: String?
+        access(all) let birthplace: String?
+        access(all) let jerseyNumber: String?
+        access(all) let draftTeam: String?
+        access(all) let draftYear: String?
+        access(all) let draftSelection: String?
+        access(all) let draftRound: String?
+        access(all) let teamAtMomentNBAID: String?
+        access(all) let teamAtMoment: String?
+        access(all) let primaryPosition: String?
+        access(all) let height: String?
+        access(all) let weight: String?
+        access(all) let totalYearsExperience: String?
+        access(all) let nbaSeason: String?
+        access(all) let dateOfMoment: String?
+        access(all) let playCategory: String?
+        access(all) let playType: String?
+        access(all) let homeTeamName: String?
+        access(all) let awayTeamName: String?
+        access(all) let homeTeamScore: String?
+        access(all) let awayTeamScore: String?
+        access(all) let seriesNumber: UInt32?
+        access(all) let setName: String?
+        access(all) let serialNumber: UInt32
+        access(all) let playID: UInt32
+        access(all) let setID: UInt32
+        access(all) let numMomentsInEdition: UInt32?
 
         init(
             fullName: String?,
@@ -656,13 +657,13 @@ pub contract TopShot: NonFungibleToken {
 
     // The resource that represents the Moment NFTs
     //
-    pub resource NFT: NonFungibleToken.INFT, MetadataViews.Resolver {
+    access(all) resource NFT: NonFungibleToken.NFT {
 
         // Global unique moment ID
-        pub let id: UInt64
+        access(all) let id: UInt64
         
         // Struct of Moment metadata
-        pub let data: MomentData
+        access(all) let data: MomentData
 
         init(serialNumber: UInt32, playID: UInt32, setID: UInt32, subeditionID: UInt32) {
             // Increment the global Moment IDs
@@ -681,12 +682,15 @@ pub contract TopShot: NonFungibleToken {
         }
 
         // If the Moment is destroyed, emit an event to indicate 
-        // to outside ovbservers that it has been destroyed
-        destroy() {
-            emit MomentDestroyed(id: self.id)
-        }
-
-        pub fun name(): String {
+        // to outside observers that it has been destroyed
+        access(all) event ResourceDestroyed(
+            id: UInt64 = self.id,
+            serialNumber: UInt32 =  self.data.serialNumber,
+            playID: UInt32 =  self.data.playID,
+            setID: UInt32 = self.data.setID
+        )
+
+        access(all) view fun name(): String {
             let fullName: String = TopShot.getPlayMetaDataByField(playID: self.data.playID, field: "FullName") ?? ""
             let playType: String = TopShot.getPlayMetaDataByField(playID: self.data.playID, field: "PlayType") ?? ""
             return fullName
@@ -708,14 +712,14 @@ pub contract TopShot: NonFungibleToken {
 
         /// The description of the Moment. If Tagline property of the play is empty, compose it using the buildDescString function
         /// If the Tagline property is not empty, use that as the description
-        pub fun description(): String {
+        access(all) fun description(): String {
             let playDesc: String = TopShot.getPlayMetaDataByField(playID: self.data.playID, field: "Tagline") ?? ""
             
             return playDesc.length > 0 ? playDesc : self.buildDescString()
         }
 
         // All supported metadata views for the Moment including the Core NFT Views
-        pub fun getViews(): [Type] {
+        access(all) view fun getViews(): [Type] {
             return [
                 Type<MetadataViews.Display>(),
                 Type<TopShotMomentMetadataView>(),
@@ -732,7 +736,7 @@ pub contract TopShot: NonFungibleToken {
 
        
 
-        pub fun resolveView(_ view: Type): AnyStruct? {
+        access(all) fun resolveView(_ view: Type): AnyStruct? {
             switch view {
                 case Type<MetadataViews.Display>():
                     return MetadataViews.Display(
@@ -787,56 +791,13 @@ pub contract TopShot: NonFungibleToken {
                         UInt64(self.data.serialNumber)
                     )
                 case Type<MetadataViews.Royalties>():
-                    let royaltyReceiver: Capability<&{FungibleToken.Receiver}> =
-                        getAccount(TopShot.RoyaltyAddress()).getCapability<&AnyResource{FungibleToken.Receiver}>(MetadataViews.getRoyaltyReceiverPublicPath())
-                    return MetadataViews.Royalties(
-                        royalties: [
-                            MetadataViews.Royalty(
-                                receiver: royaltyReceiver,
-                                cut: 0.05,
-                                description: "NBATopShot marketplace royalty"
-                            )
-                        ]
-                    )
+                    return TopShot.resolveContractView(resourceType: nil, viewType: Type<MetadataViews.Royalties>())
                 case Type<MetadataViews.ExternalURL>():
                     return MetadataViews.ExternalURL(self.getMomentURL())
                 case Type<MetadataViews.NFTCollectionData>():
-                    return MetadataViews.NFTCollectionData(
-                        storagePath: /storage/MomentCollection,
-                        publicPath: /public/MomentCollection,
-                        providerPath: /private/MomentCollection,
-                        publicCollection: Type<&TopShot.Collection{TopShot.MomentCollectionPublic}>(),
-                        publicLinkedType: Type<&TopShot.Collection{TopShot.MomentCollectionPublic,NonFungibleToken.Receiver,NonFungibleToken.CollectionPublic,MetadataViews.ResolverCollection}>(),
-                        providerLinkedType: Type<&TopShot.Collection{NonFungibleToken.Provider,TopShot.MomentCollectionPublic,NonFungibleToken.Receiver,NonFungibleToken.CollectionPublic,MetadataViews.ResolverCollection}>(),
-                        createEmptyCollectionFunction: (fun (): @NonFungibleToken.Collection {
-                            return <-TopShot.createEmptyCollection()
-                        })
-                    )
+                    return TopShot.resolveContractView(resourceType: nil, viewType: Type<MetadataViews.NFTCollectionData>())
                 case Type<MetadataViews.NFTCollectionDisplay>():
-                    let bannerImage = MetadataViews.Media(
-                        file: MetadataViews.HTTPFile(
-                            url: "https://nbatopshot.com/static/img/top-shot-logo-horizontal-white.svg"
-                        ),
-                        mediaType: "image/svg+xml"
-                    )
-                    let squareImage = MetadataViews.Media(
-                        file: MetadataViews.HTTPFile(
-                            url: "https://nbatopshot.com/static/img/og/og.png"
-                        ),
-                        mediaType: "image/png"
-                    )
-                    return MetadataViews.NFTCollectionDisplay(
-                        name: "NBA-Top-Shot",
-                        description: "NBA Top Shot is your chance to own, sell, and trade official digital collectibles of the NBA and WNBA's greatest plays and players",
-                        externalURL: MetadataViews.ExternalURL("https://nbatopshot.com"),
-                        squareImage: squareImage,
-                        bannerImage: bannerImage,
-                        socials: {
-                            "twitter": MetadataViews.ExternalURL("https://twitter.com/nbatopshot"),
-                            "discord": MetadataViews.ExternalURL("https://discord.com/invite/nbatopshot"),
-                            "instagram": MetadataViews.ExternalURL("https://www.instagram.com/nbatopshot")
-                        }
-                    )
+                     return TopShot.resolveContractView(resourceType: nil, viewType: Type<MetadataViews.NFTCollectionDisplay>())
                 case Type<MetadataViews.Traits>():
                     // sports radar team id
                     let excludedNames: [String] = ["TeamAtMomentNBAID"]
@@ -844,14 +805,15 @@ pub contract TopShot: NonFungibleToken {
                     let traitDictionary: {String: AnyStruct} = {
                         "SeriesNumber": TopShot.getSetSeries(setID: self.data.setID),
                         "SetName": TopShot.getSetName(setID: self.data.setID),
-                        "SerialNumber": self.data.serialNumber
+                        "SerialNumber": self.data.serialNumber,
+                        "Locked": TopShotLocking.isLocked(nftRef: &self as &{NonFungibleToken.NFT})
                     }
                     // add play specific data
                     let fullDictionary = self.mapPlayData(dict: traitDictionary)
                     return MetadataViews.dictToTraits(dict: fullDictionary, excludedNames: excludedNames)
                 case Type<MetadataViews.Medias>():
                     return MetadataViews.Medias(
-                        items: [
+                        [
                             MetadataViews.Media(
                                 file: MetadataViews.HTTPFile(
                                     url: self.mediumimage()
@@ -875,7 +837,7 @@ pub contract TopShot: NonFungibleToken {
 
         // mapPlayData helps build our trait map from play metadata
         // Returns: The trait map with all non-empty fields from play data added
-        pub fun mapPlayData(dict: {String: AnyStruct}) : {String: AnyStruct} {      
+        access(all) fun mapPlayData(dict: {String: AnyStruct}) : {String: AnyStruct} {
             let playMetadata = TopShot.getPlayMetaData(playID: self.data.playID) ?? {}
             for name in playMetadata.keys {
                 let value = playMetadata[name] ?? ""
@@ -888,53 +850,58 @@ pub contract TopShot: NonFungibleToken {
 
         // getMomentURL 
         // Returns: The computed external url of the moment
-        pub fun getMomentURL(): String {
+        access(all) view fun getMomentURL(): String {
             return "https://nbatopshot.com/moment/".concat(self.id.toString())
         }
         // getEditionName Moment's edition name is a combination of the Moment's setName and playID
         // `setName: #playID`
-        pub fun getEditionName() : String {
+        access(all) view fun getEditionName() : String {
             let setName: String = TopShot.getSetName(setID: self.data.setID) ?? ""
             let editionName = setName.concat(": #").concat(self.data.playID.toString())
             return editionName
         }
 
-        pub fun assetPath(): String {
+        access(all) view fun assetPath(): String {
             return "https://assets.nbatopshot.com/media/".concat(self.id.toString())
         }
 
         // returns a url to display an medium sized image
-        pub fun mediumimage(): String {
+        access(all) fun mediumimage(): String {
             let url = self.assetPath().concat("?width=512")
             return self.appendOptionalParams(url: url, firstDelim: "&")
         }
 
         // a url to display a thumbnail associated with the moment
-        pub fun thumbnail(): String {
+        access(all) fun thumbnail(): String {
             let url = self.assetPath().concat("?width=256")
             return self.appendOptionalParams(url: url, firstDelim: "&")
         }
 
         // a url to display a video associated with the moment
-        pub fun video(): String {
+        access(all) fun video(): String {
             let url = self.assetPath().concat("/video")
             return self.appendOptionalParams(url: url, firstDelim: "?")
         }
 
         // appends and optional network param needed to resolve the media
-        pub fun appendOptionalParams(url: String, firstDelim: String): String {
+        access(all) fun appendOptionalParams(url: String, firstDelim: String): String {
             if (TopShot.Network() == "testnet") {
                 return url.concat(firstDelim).concat("testnet")
             }
             return url
         }
+
+        // Create an empty Collection for Pinnacle NFTs and return it to the caller
+        access(all) fun createEmptyCollection(): @{NonFungibleToken.Collection} {
+            return <- TopShot.createEmptyCollection(nftType: Type<@TopShot.NFT>())
+        }
     }
 
     // Admin is a special authorization resource that 
     // allows the owner to perform important functions to modify the 
     // various aspects of the Plays, Sets, and Moments
     //
-    pub resource Admin {
+    access(all) resource Admin {
 
         // createPlay creates a new Play struct 
         // and stores it in the Plays dictionary in the TopShot smart contract
@@ -945,7 +912,7 @@ pub contract TopShot: NonFungibleToken {
         //
         // Returns: the ID of the new Play object
         //
-        pub fun createPlay(metadata: {String: String}): UInt32 {
+        access(all) fun createPlay(metadata: {String: String}): UInt32 {
             // Create the new Play
             var newPlay = Play(metadata: metadata)
             let newID = newPlay.playID
@@ -965,7 +932,7 @@ pub contract TopShot: NonFungibleToken {
         /// Parameters: playID: The ID of the play to update
         ///             tagline: A string to be used as the tagline for the play
         /// Returns: The ID of the play
-        pub fun updatePlayTagline(playID: UInt32, tagline: String): UInt32 {
+        access(all) fun updatePlayTagline(playID: UInt32, tagline: String): UInt32 {
             let tmpPlay = TopShot.playDatas[playID] ?? panic("playID does not exist")
             tmpPlay.updateTagline(tagline: tagline)
             return playID
@@ -977,7 +944,7 @@ pub contract TopShot: NonFungibleToken {
         // Parameters: name: The name of the Set
         //
         // Returns: The ID of the created set
-        pub fun createSet(name: String): UInt32 {
+        access(all) fun createSet(name: String): UInt32 {
 
             // Create the new Set
             var newSet <- create Set(name: name)
@@ -1004,7 +971,7 @@ pub contract TopShot: NonFungibleToken {
         // Returns: A reference to the Set with all of the fields
         // and methods exposed
         //
-        pub fun borrowSet(setID: UInt32): &Set {
+         access(all) view fun borrowSet(setID: UInt32): &Set {
             pre {
                 TopShot.sets[setID] != nil: "Cannot borrow Set: The Set doesn't exist"
             }
@@ -1020,7 +987,7 @@ pub contract TopShot: NonFungibleToken {
         //
         // Returns: The new series number
         //
-        pub fun startNewSeries(): UInt32 {
+        access(all) fun startNewSeries(): UInt32 {
             // End the current series and start a new one
             // by incrementing the TopShot series number
             TopShot.currentSeries = TopShot.currentSeries + UInt32(1)
@@ -1032,8 +999,8 @@ pub contract TopShot: NonFungibleToken {
 
         // createSubeditionResource creates new SubeditionMap resource that
         // will be used to mint Moments with Subeditions
-        pub fun createSubeditionAdminResource() {
-            TopShot.account.save<@SubeditionAdmin>(<- create SubeditionAdmin(), to: TopShot.SubeditionAdminStoragePath())
+        access(all) fun createSubeditionAdminResource() {
+            TopShot.account.storage.save<@SubeditionAdmin>(<- create SubeditionAdmin(), to: TopShot.SubeditionAdminStoragePath())
         }
 
         // setMomentsSubedition saves which Subedition the Moment belongs to
@@ -1043,8 +1010,8 @@ pub contract TopShot: NonFungibleToken {
         //             setID: The ID of the Set that the Moment references
         //             playID: The ID of the Play that the Moment references
         //
-        pub fun setMomentsSubedition(nftID: UInt64, subeditionID: UInt32, setID: UInt32, playID: UInt32) {
-            let subeditionAdmin = TopShot.account.borrow<&SubeditionAdmin>(from: TopShot.SubeditionAdminStoragePath())
+        access(all) fun setMomentsSubedition(nftID: UInt64, subeditionID: UInt32, setID: UInt32, playID: UInt32) {
+            let subeditionAdmin = TopShot.account.storage.borrow<&SubeditionAdmin>(from: TopShot.SubeditionAdminStoragePath())
                 ?? panic("No subedition admin resource in storage")
 
             subeditionAdmin.setMomentsSubedition(nftID: nftID, subeditionID: subeditionID, setID: setID, playID: playID)
@@ -1058,8 +1025,8 @@ pub contract TopShot: NonFungibleToken {
         //
         // Returns: the ID of the new Subedition object
         //
-        pub fun createSubedition(name:String, metadata:{String:String}): UInt32 {
-            let subeditionAdmin = TopShot.account.borrow<&SubeditionAdmin>(from: TopShot.SubeditionAdminStoragePath())
+        access(all) fun createSubedition(name:String, metadata:{String:String}): UInt32 {
+            let subeditionAdmin = TopShot.account.storage.borrow<&SubeditionAdmin>(from: TopShot.SubeditionAdminStoragePath())
                 ?? panic("No subedition admin resource in storage")
 
             return subeditionAdmin.createSubedition(name:name, metadata:metadata)
@@ -1067,7 +1034,7 @@ pub contract TopShot: NonFungibleToken {
 
         // createNewAdmin creates a new Admin resource
         //
-        pub fun createNewAdmin(): @Admin {
+        access(all) fun createNewAdmin(): @Admin {
             return <-create Admin()
         }
     }
@@ -1075,12 +1042,9 @@ pub contract TopShot: NonFungibleToken {
     // This is the interface that users can cast their Moment Collection as
     // to allow others to deposit Moments into their Collection. It also allows for reading
     // the IDs of Moments in the Collection.
-    pub resource interface MomentCollectionPublic {
-        pub fun deposit(token: @NonFungibleToken.NFT)
-        pub fun batchDeposit(tokens: @NonFungibleToken.Collection)
-        pub fun getIDs(): [UInt64]
-        pub fun borrowNFT(id: UInt64): &NonFungibleToken.NFT
-        pub fun borrowMoment(id: UInt64): &TopShot.NFT? {
+    access(all) resource interface MomentCollectionPublic : NonFungibleToken.CollectionPublic {
+        access(all) fun batchDeposit(tokens: @{NonFungibleToken.Collection})
+        access(all) fun borrowMoment(id: UInt64): &TopShot.NFT? {
             // If the result isn't nil, the id of the returned reference
             // should be the same as the argument to the function
             post {
@@ -1093,35 +1057,62 @@ pub contract TopShot: NonFungibleToken {
     // Collection is a resource that every user who owns NFTs 
     // will store in their account to manage their NFTS
     //
-    pub resource Collection: MomentCollectionPublic, NonFungibleToken.Provider, NonFungibleToken.Receiver, NonFungibleToken.CollectionPublic, MetadataViews.ResolverCollection { 
+    access(all) resource Collection: MomentCollectionPublic, NonFungibleToken.Collection {
         // Dictionary of Moment conforming tokens
         // NFT is a resource type with a UInt64 ID field
-        pub var ownedNFTs: @{UInt64: NonFungibleToken.NFT}
+        access(all) var ownedNFTs: @{UInt64: {NonFungibleToken.NFT}}
 
         init() {
             self.ownedNFTs <- {}
         }
 
+        // Return a list of NFT types that this receiver accepts
+        access(all) view fun getSupportedNFTTypes(): {Type: Bool} {
+            let supportedTypes: {Type: Bool} = {}
+            supportedTypes[Type<@TopShot.NFT>()] = true
+            return supportedTypes
+        }
+
+        // Return whether or not the given type is accepted by the collection
+        // A collection that can accept any type should just return true by default
+        access(all) view fun isSupportedNFTType(type: Type): Bool {
+            if type == Type<@TopShot.NFT>() {
+                return true
+            }
+            return false
+        }
+
+        // Return the amount of NFTs stored in the collection
+        access(all) view fun getLength(): Int {
+            return self.ownedNFTs.keys.length
+        }
+
+        // Create an empty Collection for TopShot NFTs and return it to the caller
+        access(all) fun createEmptyCollection(): @{NonFungibleToken.Collection} {
+            return <- TopShot.createEmptyCollection(nftType: Type<@TopShot.NFT>())
+        }
+
         // withdraw removes an Moment from the Collection and moves it to the caller
         //
         // Parameters: withdrawID: The ID of the NFT 
         // that is to be removed from the Collection
         //
         // returns: @NonFungibleToken.NFT the token that was withdrawn
-        pub fun withdraw(withdrawID: UInt64): @NonFungibleToken.NFT {
+        access(NonFungibleToken.Withdraw) fun withdraw(withdrawID: UInt64): @{NonFungibleToken.NFT} {
 
             // Borrow nft and check if locked
-            let nft = self.borrowNFT(id: withdrawID)
+            let nft = self.borrowNFT(withdrawID)
+                ?? panic("Cannot borrow: empty reference")
             if TopShotLocking.isLocked(nftRef: nft) {
                 panic("Cannot withdraw: Moment is locked")
             }
 
             // Remove the nft from the Collection
-            let token <- self.ownedNFTs.remove(key: withdrawID) 
+            let token <- self.ownedNFTs.remove(key: withdrawID)
                 ?? panic("Cannot withdraw: Moment does not exist in the collection")
 
             emit Withdraw(id: token.id, from: self.owner?.address)
-            
+
             // Return the withdrawn token
             return <-token
         }
@@ -1133,7 +1124,7 @@ pub contract TopShot: NonFungibleToken {
         // Returns: @NonFungibleToken.Collection: A collection that contains
         //                                        the withdrawn moments
         //
-        pub fun batchWithdraw(ids: [UInt64]): @NonFungibleToken.Collection {
+        access(NonFungibleToken.Withdraw) fun batchWithdraw(ids: [UInt64]): @{NonFungibleToken.Collection} {
             // Create a new empty Collection
             var batchCollection <- create Collection()
             
@@ -1150,7 +1141,7 @@ pub contract TopShot: NonFungibleToken {
         //
         // Paramters: token: the NFT to be deposited in the collection
         //
-        pub fun deposit(token: @NonFungibleToken.NFT) {
+        access(all) fun deposit(token: @{NonFungibleToken.NFT}) {
             
             // Cast the deposited token as a TopShot NFT to make sure
             // it is the correct type
@@ -1174,7 +1165,7 @@ pub contract TopShot: NonFungibleToken {
 
         // batchDeposit takes a Collection object as an argument
         // and deposits each contained NFT into this Collection
-        pub fun batchDeposit(tokens: @NonFungibleToken.Collection) {
+        access(all) fun batchDeposit(tokens: @{NonFungibleToken.Collection}) {
 
             // Get an array of the IDs to be deposited
             let keys = tokens.getIDs()
@@ -1190,7 +1181,7 @@ pub contract TopShot: NonFungibleToken {
 
         // lock takes a token id and a duration in seconds and locks
         // the moment for that duration
-        pub fun lock(id: UInt64, duration: UFix64) {
+        access(NonFungibleToken.Update) fun lock(id: UInt64, duration: UFix64) {
             // Remove the nft from the Collection
             let token <- self.ownedNFTs.remove(key: id) 
                 ?? panic("Cannot lock: Moment does not exist in the collection")
@@ -1204,7 +1195,7 @@ pub contract TopShot: NonFungibleToken {
 
         // batchLock takes an array of token ids and a duration in seconds
         // it iterates through the ids and locks each for the specified duration
-        pub fun batchLock(ids: [UInt64], duration: UFix64) {
+        access(NonFungibleToken.Update) fun batchLock(ids: [UInt64], duration: UFix64) {
             // Iterate through the ids and lock them
             for id in ids {
                 self.lock(id: id, duration: duration)
@@ -1213,7 +1204,7 @@ pub contract TopShot: NonFungibleToken {
 
         // unlock takes a token id and attempts to unlock it
         // TopShotLocking.unlockNFT contains business logic around unlock eligibility
-        pub fun unlock(id: UInt64) {
+        access(NonFungibleToken.Update) fun unlock(id: UInt64) {
             // Remove the nft from the Collection
             let token <- self.ownedNFTs.remove(key: id) 
                 ?? panic("Cannot lock: Moment does not exist in the collection")
@@ -1227,15 +1218,40 @@ pub contract TopShot: NonFungibleToken {
 
         // batchUnlock takes an array of token ids
         // it iterates through the ids and unlocks each if they are eligible
-        pub fun batchUnlock(ids: [UInt64]) {
+        access(NonFungibleToken.Update) fun batchUnlock(ids: [UInt64]) {
             // Iterate through the ids and unlocks them
             for id in ids {
                 self.unlock(id: id)
             }
         }
 
+        // destroyMoments destroys moments in this collection
+        // unlocks the moments if they are locked
+        //
+        // Parameters: ids: An array of NFT IDs
+        // to be destroyed from the Collection
+        access(NonFungibleToken.Update) fun destroyMoments(ids: [UInt64]) {
+            let topShotLockingAdmin = TopShot.account.storage.borrow<&TopShotLocking.Admin>(from: TopShotLocking.AdminStoragePath())
+                ?? panic("No TopShotLocking admin resource in storage")
+
+            for id in ids {
+                // Remove the nft from the Collection
+                let token <- self.ownedNFTs.remove(key: id)
+                    ?? panic("Cannot destroy: Moment does not exist in collection: ".concat(id.toString()))
+
+                // Emit a withdraw event here so that platforms do not have to understand TopShot-specific events to see ownership change
+                // A withdraw without a corresponding deposit means the NFT in question has no owner address
+                emit Withdraw(id: id, from: self.owner?.address)
+
+                // does nothing if the moment is not locked
+                topShotLockingAdmin.unlockByID(id: id)
+
+                destroy token
+            }
+        }
+
         // getIDs returns an array of the IDs that are in the Collection
-        pub fun getIDs(): [UInt64] {
+        access(all) view fun getIDs(): [UInt64] {
             return self.ownedNFTs.keys
         }
 
@@ -1250,21 +1266,8 @@ pub contract TopShot: NonFungibleToken {
         // not any topshot specific data. Please use borrowMoment to 
         // read Moment data.
         //
-        pub fun borrowNFT(id: UInt64): &NonFungibleToken.NFT {
-            return (&self.ownedNFTs[id] as &NonFungibleToken.NFT?)!
-        }
-
-        // Safe way to borrow a reference to an NFT that does not panic
-        // Also now part of the NonFungibleToken.PublicCollection interface
-        //
-        // Parameters: id: The ID of the NFT to get the reference for
-        //
-        // Returns: An optional reference to the desired NFT, will be nil if the passed ID does not exist
-        pub fun borrowNFTSafe(id: UInt64): &NonFungibleToken.NFT? {
-            if let nftRef = &self.ownedNFTs[id] as &NonFungibleToken.NFT? {
-                return nftRef
-            }
-            return nil
+        access(all) view fun borrowNFT(_ id: UInt64): &{NonFungibleToken.NFT}? {
+            return &self.ownedNFTs[id]
         }
 
         // borrowMoment returns a borrowed reference to a Moment
@@ -1277,29 +1280,17 @@ pub contract TopShot: NonFungibleToken {
         // Parameters: id: The ID of the NFT to get the reference for
         //
         // Returns: A reference to the NFT
-        pub fun borrowMoment(id: UInt64): &TopShot.NFT? {
-            if self.ownedNFTs[id] != nil {
-                let ref = (&self.ownedNFTs[id] as auth &NonFungibleToken.NFT?)!
-                return ref as! &TopShot.NFT
-            } else {
-                return nil
-            }
+        access(all) view fun borrowMoment(id: UInt64): &TopShot.NFT? {
+            return self.borrowNFT(id) as! &TopShot.NFT?
         }
 
-        pub fun borrowViewResolver(id: UInt64): &AnyResource{MetadataViews.Resolver} {
-            let nft = (&self.ownedNFTs[id] as auth &NonFungibleToken.NFT?)! 
-            let topShotNFT = nft as! &TopShot.NFT
-            return topShotNFT as &AnyResource{MetadataViews.Resolver}
+        access(all) view fun borrowViewResolver(id: UInt64): &{ViewResolver.Resolver}? {
+            if let nft = &self.ownedNFTs[id] as &{NonFungibleToken.NFT}? {
+                return nft as &{ViewResolver.Resolver}
+            }
+            return nil
         }
 
-        // If a transaction destroys the Collection object,
-        // All the NFTs contained within are also destroyed!
-        // Much like when Damian Lillard destroys the hopes and
-        // dreams of the entire city of Houston.
-        //
-        destroy() {
-            destroy self.ownedNFTs
-        }
     }
 
     // -----------------------------------------------------------------------
@@ -1311,14 +1302,17 @@ pub contract TopShot: NonFungibleToken {
     // Once they have a Collection in their storage, they are able to receive
     // Moments in transactions.
     //
-    pub fun createEmptyCollection(): @NonFungibleToken.Collection {
+    access(all) fun createEmptyCollection(nftType: Type): @{NonFungibleToken.Collection} {
+        if nftType != Type<@TopShot.NFT>() {
+            panic("NFT type is not supported")
+        }
         return <-create TopShot.Collection()
     }
 
     // getAllPlays returns all the plays in topshot
     //
     // Returns: An array of all the plays that have been created
-    pub fun getAllPlays(): [TopShot.Play] {
+    access(all) view fun getAllPlays(): [TopShot.Play] {
         return TopShot.playDatas.values
     }
 
@@ -1327,7 +1321,7 @@ pub contract TopShot: NonFungibleToken {
     // Parameters: playID: The id of the Play that is being searched
     //
     // Returns: The metadata as a String to String mapping optional
-    pub fun getPlayMetaData(playID: UInt32): {String: String}? {
+    access(all) view fun getPlayMetaData(playID: UInt32): {String: String}? {
         return self.playDatas[playID]?.metadata
     }
 
@@ -1340,7 +1334,7 @@ pub contract TopShot: NonFungibleToken {
     //             field: The field to search for
     //
     // Returns: The metadata field as a String Optional
-    pub fun getPlayMetaDataByField(playID: UInt32, field: String): String? {
+    access(all) view fun getPlayMetaDataByField(playID: UInt32, field: String): String? {
         // Don't force a revert if the playID or field is invalid
         if let play = TopShot.playDatas[playID] {
             return play.metadata[field]
@@ -1355,7 +1349,7 @@ pub contract TopShot: NonFungibleToken {
     // Parameters: setID: The id of the Set that is being searched
     //
     // Returns: The QuerySetData struct that has all the important information about the set
-    pub fun getSetData(setID: UInt32): QuerySetData? {
+     access(all) fun getSetData(setID: UInt32): QuerySetData? {
         if TopShot.sets[setID] == nil {
             return nil
         } else {
@@ -1369,7 +1363,7 @@ pub contract TopShot: NonFungibleToken {
     // Parameters: setID: The id of the Set that is being searched
     //
     // Returns: The name of the Set
-    pub fun getSetName(setID: UInt32): String? {
+    access(all) view fun getSetName(setID: UInt32): String? {
         // Don't force a revert if the setID is invalid
         return TopShot.setDatas[setID]?.name
     }
@@ -1380,7 +1374,7 @@ pub contract TopShot: NonFungibleToken {
     // Parameters: setID: The id of the Set that is being searched
     //
     // Returns: The series that the Set belongs to
-    pub fun getSetSeries(setID: UInt32): UInt32? {
+    access(all) view fun getSetSeries(setID: UInt32): UInt32? {
         // Don't force a revert if the setID is invalid
         return TopShot.setDatas[setID]?.series
     }
@@ -1391,7 +1385,7 @@ pub contract TopShot: NonFungibleToken {
     // Parameters: setName: The name of the Set that is being searched
     //
     // Returns: An array of the IDs of the Set if it exists, or nil if doesn't
-    pub fun getSetIDsByName(setName: String): [UInt32]? {
+    access(all) fun getSetIDsByName(setName: String): [UInt32]? {
         var setIDs: [UInt32] = []
 
         // Iterate through all the setDatas and search for the name
@@ -1416,7 +1410,7 @@ pub contract TopShot: NonFungibleToken {
     // Parameters: setID: The id of the Set that is being searched
     //
     // Returns: An array of Play IDs
-    pub fun getPlaysInSet(setID: UInt32): [UInt32]? {
+    access(all) view fun getPlaysInSet(setID: UInt32): [UInt32]? {
         // Don't force a revert if the setID is invalid
         return TopShot.sets[setID]?.plays
     }
@@ -1430,7 +1424,7 @@ pub contract TopShot: NonFungibleToken {
     //             playID: The id of the Play that is being searched
     //
     // Returns: Boolean indicating if the edition is retired or not
-    pub fun isEditionRetired(setID: UInt32, playID: UInt32): Bool? {
+    access(all) fun isEditionRetired(setID: UInt32, playID: UInt32): Bool? {
 
         if let setdata = self.getSetData(setID: setID) {
 
@@ -1454,7 +1448,7 @@ pub contract TopShot: NonFungibleToken {
     // Parameters: setID: The id of the Set that is being searched
     //
     // Returns: Boolean indicating if the Set is locked or not
-    pub fun isSetLocked(setID: UInt32): Bool? {
+    access(all) view fun isSetLocked(setID: UInt32): Bool? {
         // Don't force a revert if the setID is invalid
         return TopShot.sets[setID]?.locked
     }
@@ -1467,7 +1461,7 @@ pub contract TopShot: NonFungibleToken {
     //
     // Returns: The total number of Moments 
     //          that have been minted from an edition
-    pub fun getNumMomentsInEdition(setID: UInt32, playID: UInt32): UInt32? {
+    access(all) fun getNumMomentsInEdition(setID: UInt32, playID: UInt32): UInt32? {
         if let setdata = self.getSetData(setID: setID) {
 
             // Read the numMintedPerPlay
@@ -1486,8 +1480,8 @@ pub contract TopShot: NonFungibleToken {
     //
     // returns: UInt32? Subedition's ID if exists
     //
-    pub fun getMomentsSubedition(nftID: UInt64):UInt32? {
-        let subeditionAdmin = self.account.borrow<&SubeditionAdmin>(from: TopShot.SubeditionAdminStoragePath())
+    access(all) view fun getMomentsSubedition(nftID: UInt64):UInt32? {
+        let subeditionAdmin = self.account.storage.borrow<&SubeditionAdmin>(from: TopShot.SubeditionAdminStoragePath())
             ?? panic("No subedition admin resource in storage")
 
         return subeditionAdmin.getMomentsSubedition(nftID: nftID)
@@ -1496,8 +1490,8 @@ pub contract TopShot: NonFungibleToken {
     // getAllSubeditions returns all the subeditions in topshot subeditionAdmin resource
     //
     // Returns: An array of all the subeditions that have been created
-    pub fun getAllSubeditions():[TopShot.Subedition] {
-        let subeditionAdmin = self.account.borrow<&SubeditionAdmin>(from: TopShot.SubeditionAdminStoragePath())
+    access(all) view fun getAllSubeditions(): &[TopShot.Subedition] {
+        let subeditionAdmin = self.account.storage.borrow<&SubeditionAdmin>(from: TopShot.SubeditionAdminStoragePath())
             ?? panic("No subedition admin resource in storage")
         return subeditionAdmin.subeditionDatas.values
     }
@@ -1507,8 +1501,8 @@ pub contract TopShot: NonFungibleToken {
     // Parameters: subeditionID: The id of the Subedition that is being searched
     //
     // Returns: The Subedition struct
-    pub fun getSubeditionByID(subeditionID: UInt32):TopShot.Subedition {
-        let subeditionAdmin = self.account.borrow<&SubeditionAdmin>(from: TopShot.SubeditionAdminStoragePath())
+    access(all) view fun getSubeditionByID(subeditionID: UInt32): &TopShot.Subedition {
+        let subeditionAdmin = self.account.storage.borrow<&SubeditionAdmin>(from: TopShot.SubeditionAdminStoragePath())
             ?? panic("No subedition admin resource in storage")
         return subeditionAdmin.subeditionDatas[subeditionID]!
     }
@@ -1518,19 +1512,19 @@ pub contract TopShot: NonFungibleToken {
     //
     // Returns: UInt32
     // the next number in nextSubeditionID from the SubeditionAdmin resource
-    pub fun getNextSubeditionID():UInt32 {
-        let subeditionAdmin = self.account.borrow<&SubeditionAdmin>(from: TopShot.SubeditionAdminStoragePath())
+    access(all) view fun getNextSubeditionID():UInt32 {
+        let subeditionAdmin = self.account.storage.borrow<&SubeditionAdmin>(from: TopShot.SubeditionAdminStoragePath())
             ?? panic("No subedition admin resource in storage")
         return subeditionAdmin.nextSubeditionID
     }
     // SubeditionAdmin is a resource that allows Set to mint Moments with Subeditions
     //
-    pub struct Subedition {
-        pub let subeditionID: UInt32
+    access(all) struct Subedition {
+        access(all) let subeditionID: UInt32
 
-        pub let name: String
+        access(all) let name: String
 
-        pub let metadata: {String: String}
+        access(all) let metadata: {String: String}
 
         init(subeditionID: UInt32, name: String, metadata: {String: String}) {
             pre {
@@ -1542,7 +1536,7 @@ pub contract TopShot: NonFungibleToken {
         }
     }
 
-    pub resource SubeditionAdmin {
+    access(all) resource SubeditionAdmin {
 
         // Map of number of already minted Moments using Subedition.
         // When a new Moment with Subedition is minted, 1 is added to the
@@ -1570,7 +1564,7 @@ pub contract TopShot: NonFungibleToken {
         //
         // Returns: the ID of the new Subedition object
         //
-        pub fun createSubedition(name:String, metadata:{String:String}): UInt32 {
+        access(all) fun createSubedition(name:String, metadata:{String:String}): UInt32 {
 
             let newID = self.nextSubeditionID
 
@@ -1591,7 +1585,7 @@ pub contract TopShot: NonFungibleToken {
         //
         // returns: UInt32? Subedition's ID if exists
         //
-        pub fun getMomentsSubedition(nftID: UInt64):UInt32? {
+        access(all) view fun getMomentsSubedition(nftID: UInt64):UInt32? {
            return self.momentsSubedition[nftID]
         }
 
@@ -1605,7 +1599,7 @@ pub contract TopShot: NonFungibleToken {
         //
         // returns: UInt32 Number of Moments, already minted for this Subedition
         //
-        pub fun getNumberMintedPerSubedition(setID: UInt32, playID: UInt32, subeditionID: UInt32): UInt32 {
+        access(all) fun getNumberMintedPerSubedition(setID: UInt32, playID: UInt32, subeditionID: UInt32): UInt32 {
            let setPlaySubedition = setID.toString().concat(playID.toString()).concat(subeditionID.toString())
            if !self.numberMintedPerSubedition.containsKey(setPlaySubedition) {
                 self.numberMintedPerSubedition.insert(key: setPlaySubedition,UInt32(0))
@@ -1622,7 +1616,7 @@ pub contract TopShot: NonFungibleToken {
         //             subeditionID: The ID of the Subedition using which moment will be minted
         //
         //
-        pub fun addToNumberMintedPerSubedition(setID: UInt32, playID: UInt32, subeditionID: UInt32) {
+        access(all) fun addToNumberMintedPerSubedition(setID: UInt32, playID: UInt32, subeditionID: UInt32) {
            let setPlaySubedition = setID.toString().concat(playID.toString()).concat(subeditionID.toString())
 
            if !self.numberMintedPerSubedition.containsKey(setPlaySubedition) {
@@ -1639,7 +1633,7 @@ pub contract TopShot: NonFungibleToken {
         //             setID: The ID of the Set that the Moment references
         //             playID: The ID of the Play that the Moment references
         //
-        pub fun setMomentsSubedition(nftID: UInt64, subeditionID: UInt32, setID: UInt32, playID: UInt32){
+        access(all) fun setMomentsSubedition(nftID: UInt64, subeditionID: UInt32, setID: UInt32, playID: UInt32){
             pre {
                 !self.momentsSubedition.containsKey(nftID) : "Subedition for this moment already exists!"
             }
@@ -1657,6 +1651,74 @@ pub contract TopShot: NonFungibleToken {
         }
     }
 
+    //------------------------------------------------------------
+    // Contract MetadataViews
+    //------------------------------------------------------------
+
+    /// Return the metadata view types available for this contract
+    ///
+    access(all) view fun getContractViews(resourceType: Type?): [Type] {
+        return [Type<MetadataViews.NFTCollectionData>(), Type<MetadataViews.NFTCollectionDisplay>(), Type<MetadataViews.Royalties>()]
+    }
+
+    /// Resolve this contract's metadata views
+    ///
+    access(all) view fun resolveContractView(resourceType: Type?, viewType: Type): AnyStruct? {
+        post {
+            result == nil || result!.getType() == viewType: "The returned view must be of the given type or nil"
+        }
+        switch viewType {
+            case Type<MetadataViews.NFTCollectionData>():
+                return MetadataViews.NFTCollectionData(
+                    storagePath: /storage/MomentCollection,
+                    publicPath: /public/MomentCollection,
+                    publicCollection: Type<&TopShot.Collection>(),
+                    publicLinkedType: Type<&TopShot.Collection>(),
+                    createEmptyCollectionFunction: (fun (): @{NonFungibleToken.Collection} {
+                        return <-TopShot.createEmptyCollection(nftType: Type<@TopShot.NFT>())
+                    })
+                )
+            case Type<MetadataViews.NFTCollectionDisplay>():
+                let bannerImage = MetadataViews.Media(
+                    file: MetadataViews.HTTPFile(
+                        url: "https://nbatopshot.com/static/img/top-shot-logo-horizontal-white.svg"
+                    ),
+                    mediaType: "image/svg+xml"
+                )
+                let squareImage = MetadataViews.Media(
+                    file: MetadataViews.HTTPFile(
+                        url: "https://nbatopshot.com/static/img/og/og.png"
+                    ),
+                    mediaType: "image/png"
+                )
+                return MetadataViews.NFTCollectionDisplay(
+                    name: "NBA-Top-Shot",
+                    description: "NBA Top Shot is your chance to own, sell, and trade official digital collectibles of the NBA and WNBA's greatest plays and players",
+                    externalURL: MetadataViews.ExternalURL("https://nbatopshot.com"),
+                    squareImage: squareImage,
+                    bannerImage: bannerImage,
+                    socials: {
+                        "twitter": MetadataViews.ExternalURL("https://twitter.com/nbatopshot"),
+                        "discord": MetadataViews.ExternalURL("https://discord.com/invite/nbatopshot"),
+                        "instagram": MetadataViews.ExternalURL("https://www.instagram.com/nbatopshot")
+                    }
+                )
+                case Type<MetadataViews.Royalties>():
+                    let royaltyReceiver: Capability<&{FungibleToken.Receiver}> =
+                        getAccount(TopShot.RoyaltyAddress()).capabilities.get<&{FungibleToken.Receiver}>(MetadataViews.getRoyaltyReceiverPublicPath())!
+                    return MetadataViews.Royalties(
+                        [
+                            MetadataViews.Royalty(
+                                receiver: royaltyReceiver,
+                                cut: 0.05,
+                                description: "NBATopShot marketplace royalty"
+                            )
+                        ]
+                    )
+        }
+        return nil
+    }
+
 
     // -----------------------------------------------------------------------
     // TopShot initialization function
@@ -1673,13 +1735,15 @@ pub contract TopShot: NonFungibleToken {
         self.totalSupply = 0
 
         // Put a new Collection in storage
-        self.account.save<@Collection>(<- create Collection(), to: /storage/MomentCollection)
+        self.account.storage.save<@Collection>(<- create Collection(), to: /storage/MomentCollection)
 
         // Create a public capability for the Collection
-        self.account.link<&{MomentCollectionPublic}>(/public/MomentCollection, target: /storage/MomentCollection)
+        let cap = self.account.capabilities.storage.issue<&TopShot.Collection>(/storage/MomentCollection)
+        self.account.capabilities.publish(cap, at: /public/MomentCollection)
+        //self.account.link<&{MomentCollectionPublic}>(/public/MomentCollection, target: /storage/MomentCollection)
 
         // Put the Minter in storage
-        self.account.save<@Admin>(<- create Admin(), to: /storage/TopShotAdmin)
+        self.account.storage.save<@Admin>(<- create Admin(), to: /storage/TopShotAdmin)
 
         emit ContractInitialized()
     }