@flowtyio/flow-contracts 0.1.2 → 0.1.4

package/contracts/flowty-drops/ContractManager.cdc

@@ -6,8 +6,13 @@ access(all) contract ContractManager {
     access(all) let StoragePath: StoragePath
     access(all) let PublicPath: PublicPath
 
+    access(all) let OwnerStoragePath: StoragePath
+    access(all) let OwnerPublicPath: PublicPath
+
     access(all) entitlement Manage
 
+    access(all) event ManagerSaved(uuid: UInt64, contractAddress: Address, ownerAddress: Address)
+
     access(all) resource Manager {
         access(self) let acct: Capability<auth(Storage, Contracts, Keys, Inbox, Capabilities) &Account>
         access(self) let routerCap: Capability<auth(FungibleTokenRouter.Owner) &FungibleTokenRouter.Router>
@@ -36,6 +41,26 @@ access(all) contract ContractManager {
             return getAccount(self.acct.address)
         }
 
+        // Should be called after saving a ContractManager resource to signal that a new address stores (and therefore "owns")
+        // this manager resource's acct capability. Without this, it is not possible to track the original creator of a contract
+        // when using the ContractManager
+        access(Manage) fun onSave() {
+            let acct = self.acct.borrow()!
+
+            acct.storage.load<Address>(from: ContractManager.OwnerStoragePath)
+            acct.storage.save(self.owner!.address, to: ContractManager.OwnerStoragePath)
+
+            if !acct.capabilities.get<&Address>(ContractManager.OwnerPublicPath).check() {
+                acct.capabilities.unpublish(ContractManager.OwnerPublicPath)
+                acct.capabilities.publish(
+                    acct.capabilities.storage.issue<&Address>(ContractManager.OwnerStoragePath),
+                    at: ContractManager.OwnerPublicPath
+                )
+            }
+
+            emit ManagerSaved(uuid: self.uuid, contractAddress: self.acct.address, ownerAddress: self.owner!.address)
+        }
+
         init(tokens: @FlowToken.Vault, defaultRouterAddress: Address) {
             pre {
                 tokens.balance >= 0.001: "minimum balance of 0.001 required for initialization"
@@ -69,5 +94,9 @@ access(all) contract ContractManager {
         let identifier = "ContractManager_".concat(self.account.address.toString())
         self.StoragePath = StoragePath(identifier: identifier)!
         self.PublicPath = PublicPath(identifier: identifier)!
+
+        let ownerIdentifier = "ContractManager_Owner_".concat(self.account.address.toString())
+        self.OwnerStoragePath = StoragePath(identifier: ownerIdentifier)!
+        self.OwnerPublicPath = PublicPath(identifier: ownerIdentifier)!
     }
 }

package/contracts/flowty-drops/DropTypes.cdc

@@ -2,6 +2,7 @@ import "FlowtyDrops"
 import "MetadataViews"
 import "ViewResolver"
 import "AddressUtils"
+import "ContractManager"
 
 access(all) contract DropTypes {
     access(all) struct Display {
@@ -34,6 +35,7 @@ access(all) contract DropTypes {
         access(all) let minterCount: Int
         access(all) let commissionRate: UFix64
         access(all) let nftType: String
+        access(all) let creator: Address?
 
         access(all) let address: Address?
         access(all) let mintedByAddress: Int?
@@ -55,10 +57,12 @@ access(all) contract DropTypes {
             nftType: Type,
             address: Address?,
             phases: [PhaseSummary],
-            royaltyRate: UFix64
+            royaltyRate: UFix64,
+            creator: Address?
         ) {
             self.id = id
             self.display = Display(display)
+            self.creator = creator
             
             self.medias = []
             for m in medias?.items ?? [] {
@@ -169,6 +173,8 @@ access(all) contract DropTypes {
         let contractAddress = AddressUtils.parseAddress(nftType)!
         let contractName = segments[2]
 
+        let creator = self.getCreatorAddress(contractAddress)
+
         let resolver = getAccount(contractAddress).contracts.borrow<&{ViewResolver}>(name: contractName)
         if resolver == nil {
             return nil
@@ -224,7 +230,8 @@ access(all) contract DropTypes {
             nftType: CompositeType(dropDetails.nftType)!,
             address: minter,
             phases: phaseSummaries,
-            royaltyRate: royaltyRate
+            royaltyRate: royaltyRate,
+            creator: creator
         )
 
         return dropSummary
@@ -235,6 +242,8 @@ access(all) contract DropTypes {
         let segments = nftTypeIdentifier.split(separator: ".")
         let contractAddress = AddressUtils.parseAddress(nftType)!
         let contractName = segments[2]
+
+        let creator = self.getCreatorAddress(contractAddress)
         
         let resolver = getAccount(contractAddress).contracts.borrow<&{ViewResolver}>(name: contractName)
         if resolver == nil {
@@ -297,10 +306,37 @@ access(all) contract DropTypes {
                 nftType: CompositeType(dropDetails.nftType)!,
                 address: minter,
                 phases: phaseSummaries,
-                royaltyRate: royaltyRate
+                royaltyRate: royaltyRate,
+                creator: creator
             ))
         }
 
         return summaries
     }
+
+    access(all) fun getCreatorAddress(_ contractAddress: Address): Address? {
+        // We look for a two-way relationship between creator and collection. A contract can expose an address at ContractManager.OwnerPublicPath
+        // specifying the owning account. If found, we will check that same account for a &ContractManager.Manager resource at ContractManager.PublicPath,
+        // which, when borrowed, can return its underlying account address using &Manager.getAccount().
+        //
+        // If the addresses match, we consider this account to be the creator of a drop
+        let tmp = getAccount(contractAddress).capabilities.borrow<&Address>(ContractManager.OwnerPublicPath)
+        if tmp == nil {
+            return nil
+        }
+
+        let creator = *(tmp!)
+        let manager = getAccount(creator).capabilities.borrow<&ContractManager.Manager>(ContractManager.PublicPath)
+        if manager == nil {
+            return nil
+        }
+
+        let contractManagerAccount = manager!.getAccount()
+
+        if contractManagerAccount.address != contractAddress {
+            return nil
+        }
+ 
+        return creator
+    }
 }

package/flow.json

@@ -359,7 +359,7 @@
       "source": "./contracts/flowty-drops/ContractManager.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x772a10c786851a1b",
+        "testnet": "0x155bce6ac93f3e00",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },
@@ -367,7 +367,7 @@
       "source": "./contracts/flowty-drops/initializers/ContractInitializer.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x772a10c786851a1b",
+        "testnet": "0x155bce6ac93f3e00",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },
@@ -375,7 +375,7 @@
       "source": "./contracts/flowty-drops/initializers/ContractBorrower.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x772a10c786851a1b",
+        "testnet": "0x155bce6ac93f3e00",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },
@@ -383,7 +383,7 @@
       "source": "./contracts/flowty-drops/initializers/OpenEditionInitializer.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x772a10c786851a1b",
+        "testnet": "0x155bce6ac93f3e00",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },
@@ -391,7 +391,7 @@
       "source": "./contracts/flowty-drops/nft/BaseCollection.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x772a10c786851a1b",
+        "testnet": "0x155bce6ac93f3e00",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },
@@ -399,7 +399,7 @@
       "source": "./contracts/flowty-drops/nft/ContractFactoryTemplate.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x772a10c786851a1b",
+        "testnet": "0x155bce6ac93f3e00",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },
@@ -407,7 +407,7 @@
       "source": "./contracts/flowty-drops/nft/ContractFactory.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x772a10c786851a1b",
+        "testnet": "0x155bce6ac93f3e00",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },
@@ -415,7 +415,7 @@
       "source": "./contracts/flowty-drops/nft/OpenEditionTemplate.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x772a10c786851a1b",
+        "testnet": "0x155bce6ac93f3e00",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },
@@ -423,7 +423,7 @@
       "source": "./contracts/flowty-drops/nft/UniversalCollection.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x772a10c786851a1b",
+        "testnet": "0x155bce6ac93f3e00",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },
@@ -431,7 +431,7 @@
       "source": "./contracts/flowty-drops/nft/BaseNFT.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x772a10c786851a1b",
+        "testnet": "0x155bce6ac93f3e00",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },
@@ -439,7 +439,7 @@
       "source": "./contracts/flowty-drops/nft/NFTMetadata.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x772a10c786851a1b",
+        "testnet": "0x155bce6ac93f3e00",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },
@@ -447,7 +447,7 @@
       "source": "./contracts/flowty-drops/FlowtyDrops.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x772a10c786851a1b",
+        "testnet": "0x155bce6ac93f3e00",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },
@@ -455,7 +455,7 @@
       "source": "./contracts/flowty-drops/DropFactory.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x772a10c786851a1b",
+        "testnet": "0x155bce6ac93f3e00",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },
@@ -463,7 +463,7 @@
       "source": "./contracts/flowty-drops/FlowtyActiveCheckers.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x772a10c786851a1b",
+        "testnet": "0x155bce6ac93f3e00",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },
@@ -471,7 +471,7 @@
       "source": "./contracts/flowty-drops/FlowtyPricers.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x772a10c786851a1b",
+        "testnet": "0x155bce6ac93f3e00",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },
@@ -479,7 +479,7 @@
       "source": "./contracts/flowty-drops/FlowtyAddressVerifiers.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x772a10c786851a1b",
+        "testnet": "0x155bce6ac93f3e00",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },
@@ -487,7 +487,7 @@
       "source": "./contracts/flowty-drops/DropTypes.cdc",
       "aliases": {
         "testing": "0x0000000000000006",
-        "testnet": "0x934da91a977f1ac4",
+        "testnet": "0x53ff16309e318ae2",
         "emulator": "0xf8d6e0586b0a20c7"
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flowtyio/flow-contracts",
-    "version": "0.1.2",
+    "version": "0.1.4",
     "main": "index.json",
     "description": "An NPM package for common flow contracts",
     "author": "flowtyio",