Fixes after testing on testnet

piprate · Nov 12, 2024 · 037213a · 037213a
1 parent bd4eb4f
commit 037213a
Show file tree

Hide file tree

Showing 5 changed files with 166 additions and 41 deletions.
diff --git a/contracts/DigitalArt.cdc b/contracts/DigitalArt.cdc
@@ -32,8 +32,6 @@ contract DigitalArt: NonFungibleToken {
     let CollectionPublicPath: PublicPath
     access(all)
     let AdminStoragePath: StoragePath
-    access(all)
-    let AdminPrivatePath: PrivatePath
 
     // The total number of DigitalArt NFTs that have been minted
     //
@@ -594,16 +592,23 @@ contract DigitalArt: NonFungibleToken {
     //
     init() {
         // Set our named paths
-        self.CollectionStoragePath = /storage/sequelDigitalArtCollection
-        self.CollectionPublicPath = /public/sequelDigitalArtCollection
+        self.CollectionStoragePath = /storage/sequelDigitalArtCollectionV2
+        self.CollectionPublicPath = /public/sequelDigitalArtCollectionV2
         self.AdminStoragePath = /storage/digitalArtAdmin
-        self.AdminPrivatePath = /private/digitalArtAdmin
 
         // Initialize the total supply
         self.totalSupply = 0
 
         self.masters = {}
 
+        // Create a Collection resource and save it to storage
+        let collection <- create Collection()
+        self.account.storage.save(<-collection, to: self.CollectionStoragePath)
+
+        // create a public capability for the collection
+        let collectionCap = self.account.capabilities.storage.issue<&DigitalArt.Collection>(self.CollectionStoragePath)
+        self.account.capabilities.publish(collectionCap, at: self.CollectionPublicPath)
+
         // Create a Admin resource and save it to storage
         let admin <- create Admin()
         self.account.storage.save(<-admin, to: self.AdminStoragePath)

diff --git a/flow.json b/flow.json
@@ -27,14 +27,14 @@
 			"source": "./contracts/DigitalArt.cdc",
 			"aliases": {
 				"mainnet": "3cb7ceeb625a600a",
-				"testnet": "745b085dafdd4fc0"
+				"testnet": "fdf325e9204fc94a"
 			}
 		},
 		"Evergreen": {
 			"source": "./contracts/Evergreen.cdc",
 			"aliases": {
 				"mainnet": "3cb7ceeb625a600a",
-				"testnet": "745b085dafdd4fc0"
+				"testnet": "fdf325e9204fc94a"
 			}
 		},
 		"ExampleToken": {
@@ -121,7 +121,7 @@
 			"source": "./contracts/SequelMarketplace.cdc",
 			"aliases": {
 				"mainnet": "3cb7ceeb625a600a",
-				"testnet": "745b085dafdd4fc0"
+				"testnet": "fdf325e9204fc94a"
 			}
 		},
 		"ViewResolver": {

diff --git a/flow.testnet.json b/flow.testnet.json
@@ -1,52 +1,100 @@
 {
   "contracts": {
-    "FungibleToken": {
-      "source": "./contracts/standard/FungibleToken.cdc",
+    "Art": {
+      "source": "./contracts/thirdparty/versus/Art.cdc",
+      "aliases": {
+        "mainnet": "d796ff17107bbff6",
+        "testnet": "99ca04281098b33d"
+      }
+    },
+    "Burner": {
+      "source": "./contracts/standard/Burner.cdc",
       "aliases": {
-        "testnet": "0x9a0766d93b6608b7",
-        "mainnet" :"0xf233dcee88fe0abe"
+        "mainnet": "f233dcee88fe0abe",
+        "testnet": "9a0766d93b6608b7"
+      }
+    },
+    "Content": {
+      "source": "./contracts/thirdparty/versus/Content.cdc",
+      "aliases": {
+        "mainnet": "d796ff17107bbff6",
+        "testnet": "99ca04281098b33d"
       }
     },
     "FlowToken": {
       "source": "./contracts/standard/FlowToken.cdc",
       "aliases": {
-        "testnet": "0x7e60df042a9c0868",
-        "mainnet" : "0x1654653399040a61"
+        "mainnet": "1654653399040a61",
+        "testnet": "7e60df042a9c0868"
       }
     },
-    "NonFungibleToken": {
-      "source": "./contracts/standard/NonFungibleToken.cdc",
+    "FungibleToken": {
+      "source": "./contracts/standard/FungibleToken.cdc",
       "aliases": {
-        "testnet": "0x631e88ae7f1d7c20",
-        "mainnet": "0x1d7e57aa55817448"
+        "mainnet": "f233dcee88fe0abe",
+        "testnet": "9a0766d93b6608b7"
       }
     },
-    "NFTStorefront": {
-      "source": "./contracts/standard/NFTStorefront.cdc",
+    "FungibleTokenMetadataViews": {
+      "source": "./contracts/standard/FungibleTokenMetadataViews.cdc",
+      "aliases": {
+        "mainnet": "f233dcee88fe0abe",
+        "testnet": "9a0766d93b6608b7"
+      }
+    },
+    "FungibleTokenSwitchboard": {
+      "source": "./contracts/standard/FungibleTokenSwitchboard.cdc",
       "aliases": {
-        "testnet": "0x94b06cfca1d8a476",
-        "mainnet": "0x4eb8a10cb9f87357"
+        "mainnet": "f233dcee88fe0abe",
+        "testnet": "9a0766d93b6608b7"
       }
     },
     "MetadataViews": {
       "source": "./contracts/standard/MetadataViews.cdc",
       "aliases": {
-        "testnet": "0x631e88ae7f1d7c20",
-        "mainnet": "0x1d7e57aa55817448"
+        "mainnet": "1d7e57aa55817448",
+        "testnet": "631e88ae7f1d7c20"
       }
     },
-    "FungibleTokenSwitchboard": {
-      "source": "./contracts/standard/FungibleTokenSwitchboard.cdc",
+    "NFTCatalog": {
+      "source": "./contracts/thirdparty/nft_catalog/NFTCatalog.cdc",
+      "aliases": {
+        "mainnet": "49a7cda3a1eecc29",
+        "testnet": "324c34e1c517e4db"
+      }
+    },
+    "NFTRetrieval": {
+      "source": "./contracts/thirdparty/nft_catalog/NFTRetrieval.cdc",
+      "aliases": {
+        "mainnet": "49a7cda3a1eecc29",
+        "testnet": "324c34e1c517e4db"
+      }
+    },
+    "NFTStorefront": {
+      "source": "./contracts/standard/NFTStorefront.cdc",
+      "aliases": {
+        "mainnet": "4eb8a10cb9f87357",
+        "testnet": "94b06cfca1d8a476"
+      }
+    },
+    "NonFungibleToken": {
+      "source": "./contracts/standard/NonFungibleToken.cdc",
+      "aliases": {
+        "mainnet": "1d7e57aa55817448",
+        "testnet": "631e88ae7f1d7c20"
+      }
+    },
+    "ViewResolver": {
+      "source": "./contracts/standard/ViewResolver.cdc",
       "aliases": {
-        "testnet": "0x745b085dafdd4fc0",
-        "mainnet": "0x3cb7ceeb625a600a"
+        "mainnet": "1d7e57aa55817448",
+        "testnet": "631e88ae7f1d7c20"
       }
     },
-    "FUSD": {
-      "source": "./contracts/standard/FUSD.cdc",
+    "USDCFlow": {
       "aliases": {
-        "testnet": "0xe223d8a629e49c68",
-        "mainnet": "0x3c5959b568896393"
+        "mainnet": "f1ab99c82dee3526",
+        "testnet": "64adf39cbc354fcb"
       }
     },
     "Evergreen": "./contracts/Evergreen.cdc",
@@ -59,11 +107,11 @@
   },
   "accounts": {
     "testnet-sequel-admin": {
-      "address": "0x745b085dafdd4fc0",
+      "address": "fdf325e9204fc94a",
       "key": "${TESTNET_SEQUEL_ADMIN}"
     },
     "testnet-sequel-platform" : {
-      "address": "0x28e872069e9ca2b4",
+      "address": "28cfd058c66054a5",
       "key": "${TESTNET_SEQUEL_PLATFORM}"
     }
   },
@@ -72,8 +120,7 @@
       "testnet-sequel-admin": [
         "Evergreen",
         "DigitalArt",
-        "SequelMarketplace",
-        "FungibleTokenSwitchboard"
+        "SequelMarketplace"
       ]
     }
   }