Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add operate entitlement #57

Merged
merged 1 commit into from
Jun 18, 2024
Merged

Add operate entitlement #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions pds/contracts/PDS.cdc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import IPackNFT from "IPackNFT"
/// The Pack Distribution Service (PDS) contract is responsible for creating and managing distributions of packs.
///
access(all) contract PDS{
/// Entitlement that grants the ability to create a distribution.
/// Entitlement that grants the ability to operate PDS functionalities.
///
access(all) entitlement CreateDist
access(all) entitlement Operate

access(all) var version: String
access(all) let PackIssuerStoragePath: StoragePath
Expand Down Expand Up @@ -49,7 +49,7 @@ access(all) contract PDS{
access(all) let metadata: {String: String}
access(all) var state: PDS.DistState

access(all) fun setState(newState: PDS.DistState) {
access(contract) fun setState(newState: PDS.DistState) {
self.state = newState
}

Expand Down Expand Up @@ -113,14 +113,14 @@ access(all) contract PDS{

/// Withdraw an NFT from the issuer.
///
access(all) fun withdrawFromIssuer(withdrawID: UInt64): @{NonFungibleToken.NFT} {
access(contract) fun withdrawFromIssuer(withdrawID: UInt64): @{NonFungibleToken.NFT} {
let c = self.withdrawCap.borrow() ?? panic("no such cap")
return <- c.withdraw(withdrawID: withdrawID)
}

/// Mint Pack NFTs.
///
access(all) fun mintPackNFT(distId: UInt64, commitHashes: [String], issuer: Address, recvCap: &{NonFungibleToken.CollectionPublic}) {
access(contract) fun mintPackNFT(distId: UInt64, commitHashes: [String], issuer: Address, recvCap: &{NonFungibleToken.CollectionPublic}) {
var i = 0
let c = self.operatorCap.borrow() ?? panic("no such cap")
while i < commitHashes.length{
Expand All @@ -133,14 +133,14 @@ access(all) contract PDS{

/// Reveal Pack NFTs.
///
access(all) fun revealPackNFT(packId: UInt64, nfts: [{IPackNFT.Collectible}], salt: String) {
access(contract) fun revealPackNFT(packId: UInt64, nfts: [{IPackNFT.Collectible}], salt: String) {
let c = self.operatorCap.borrow() ?? panic("no such cap")
c.reveal(id: packId, nfts: nfts, salt: salt)
}

/// Open Pack NFTs.
///
access(all) fun openPackNFT(packId: UInt64, nfts: [{IPackNFT.Collectible}], recvCap: &{NonFungibleToken.CollectionPublic}, collectionStoragePath: StoragePath) {
access(contract) fun openPackNFT(packId: UInt64, nfts: [{IPackNFT.Collectible}], recvCap: &{NonFungibleToken.CollectionPublic}, collectionStoragePath: StoragePath) {
let c = self.operatorCap.borrow() ?? panic("no such cap")
let toReleaseNFTs: [UInt64] = []
var i = 0
Expand Down Expand Up @@ -170,16 +170,18 @@ access(all) contract PDS{
/// Resource that defines the issuer of a pack.
///
access(all) resource PackIssuer: PackIssuerCapReciever {
access(self) var cap: Capability<&DistributionCreator>?
access(self) var cap: Capability<auth(Operate) &DistributionCreator>?

access(all) fun setDistCap(cap: Capability<&DistributionCreator>) {
/// Set the capability to create a distribution; the function is publicly accessible but requires an authorized DistributionCreator capability argument.
///
access(all) fun setDistCap(cap: Capability<auth(Operate) &DistributionCreator>) {
pre {
cap.check(): "Invalid capability"
}
self.cap = cap
}

access(CreateDist) fun createDist(sharedCap: @SharedCapabilities, title: String, metadata: {String: String}) {
access(Operate) 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)
Expand All @@ -198,7 +200,7 @@ access(all) contract PDS{
/// Resource that defines the creator of a distribution.
///
access(all) resource DistributionCreator: IDistCreator {
access(all) fun createNewDist(sharedCap: @SharedCapabilities, title: String, metadata: {String: String}) {
access(Operate) 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)
Expand All @@ -210,14 +212,14 @@ access(all) contract PDS{
/// Resource that defines the manager of a distribution.
///
access(all) resource DistributionManager {
access(all) fun updateDistState(distId: UInt64, state: PDS.DistState) {
access(Operate) fun updateDistState(distId: UInt64, state: PDS.DistState) {
let d = PDS.Distributions.remove(key: distId) ?? panic ("No such distribution")
d.setState(newState: state)
PDS.Distributions.insert(key: distId, d)
emit DistributionStateUpdated(DistId: distId, state: state.rawValue)
}

access(all) fun withdraw(distId: UInt64, nftIDs: [UInt64], escrowCollectionPublic: PublicPath) {
access(Operate) fun withdraw(distId: UInt64, nftIDs: [UInt64], escrowCollectionPublic: PublicPath) {
assert(PDS.DistSharedCap.containsKey(distId), message: "No such distribution")
let d <- PDS.DistSharedCap.remove(key: distId)!
let pdsCollection = PDS.getManagerCollectionCap(escrowCollectionPublic: escrowCollectionPublic).borrow()!
Expand All @@ -230,14 +232,14 @@ access(all) contract PDS{
PDS.DistSharedCap[distId] <-! d
}

access(all) fun mintPackNFT(distId: UInt64, commitHashes: [String], issuer: Address, recvCap: &{NonFungibleToken.CollectionPublic}) {
access(Operate) fun mintPackNFT(distId: UInt64, commitHashes: [String], issuer: Address, recvCap: &{NonFungibleToken.CollectionPublic}) {
assert(PDS.DistSharedCap.containsKey(distId), message: "No such distribution")
let d <- PDS.DistSharedCap.remove(key: distId)!
d.mintPackNFT(distId: distId, commitHashes: commitHashes, issuer: issuer, recvCap: recvCap)
PDS.DistSharedCap[distId] <-! d
}

access(all) fun revealPackNFT(distId: UInt64, packId: UInt64, nftContractAddrs: [Address], nftContractNames: [String], nftIds: [UInt64], salt: String) {
access(Operate) fun revealPackNFT(distId: UInt64, packId: UInt64, nftContractAddrs: [Address], nftContractNames: [String], nftIds: [UInt64], salt: String) {
assert(PDS.DistSharedCap.containsKey(distId), message: "No such distribution")
assert(
nftContractAddrs.length == nftContractNames.length &&
Expand All @@ -256,7 +258,7 @@ access(all) contract PDS{
PDS.DistSharedCap[distId] <-! d
}

access(all) fun openPackNFT(
access(Operate) fun openPackNFT(
distId: UInt64,
packId: UInt64,
nftContractAddrs: [Address],
Expand Down
4 changes: 2 additions & 2 deletions pds/contracts/imports/ExampleNFT.cdc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ access(all) contract ExampleNFT: NonFungibleToken {
access(all) resource Collection: NonFungibleToken.Collection {
/// dictionary of NFT conforming tokens
/// NFT is a resource type with an `UInt64` ID field
access(contract) var ownedNFTs: @{UInt64: ExampleNFT.NFT}
access(all) var ownedNFTs: @{UInt64: {NonFungibleToken.NFT}}

access(all) var storagePath: StoragePath
access(all) var publicPath: PublicPath
Expand Down Expand Up @@ -191,7 +191,7 @@ access(all) contract ExampleNFT: NonFungibleToken {

/// Borrow the view resolver for the specified NFT ID
access(all) view fun borrowViewResolver(id: UInt64): &{ViewResolver.Resolver}? {
if let nft = &self.ownedNFTs[id] as &ExampleNFT.NFT? {
if let nft = &self.ownedNFTs[id] as &{NonFungibleToken.NFT}? {
return nft as &{ViewResolver.Resolver}
}
return nil
Expand Down
2 changes: 1 addition & 1 deletion pds/lib/go/contracts/internal/assets/assets.go
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading