Merge pull request #161 from onflow/nialexsan/use-cdc

use scripts directly

Author: nialexsan

.gitignore

@@ -33,3 +33,5 @@ lerna-debug.log*
 # emulator datastore
 flowdb
 coverage.json
+
+keys

build.cjs

@@ -84,9 +84,9 @@ export const sendAdminProxyCapability = async (ownerAccount) => {
     return sendTransaction({ name, args, signers });
 }
 
-export const proposeNFTToCatalog = async (account, collectionIdentifier, contractName, contractAddress, nftTypeIdentifier, storagePathIdentifier, publicPathIdentifier, privatePathIdentifier, publicLinkedTypeIdentifier, publicLinkedTypeRestrictions, privateLinkedTypeIdentifier, privateLinkedTypeRestrictions, collectionName, collectionDescription, externalURL, squareURL, squareMediaType, bannerURL, bannerMediaType, socials, message) => {
+export const proposeNFTToCatalog = async (account, collectionIdentifier, contractName, contractAddress, nftTypeIdentifier, storagePathIdentifier, publicPathIdentifier, publicLinkedTypeIdentifier, publicLinkedTypeRestrictions, collectionName, collectionDescription, externalURL, squareURL, squareMediaType, bannerURL, bannerMediaType, socials, message) => {
     const name = 'propose_nft_to_catalog';
-    const args = [collectionIdentifier, contractName, contractAddress, nftTypeIdentifier, storagePathIdentifier, publicPathIdentifier, privatePathIdentifier, publicLinkedTypeIdentifier, publicLinkedTypeRestrictions, privateLinkedTypeIdentifier, privateLinkedTypeRestrictions, collectionName, collectionDescription, externalURL, squareURL, squareMediaType, bannerURL, bannerMediaType, socials, message];
+    const args = [collectionIdentifier, contractName, contractAddress, nftTypeIdentifier, storagePathIdentifier, publicPathIdentifier, publicLinkedTypeIdentifier, publicLinkedTypeRestrictions, collectionName, collectionDescription, externalURL, squareURL, squareMediaType, bannerURL, bannerMediaType, socials, message];
     const signers = [account];
 
     return sendTransaction({ name, args, signers });

cadence/__test__/src/nftcatalog.js

@@ -804,11 +804,8 @@ const proposeNFTToCatalogWithData = async (
       nftTypeIdentifier,
       struct.NFTCollectionData.storagePath.identifier,
       struct.NFTCollectionData.publicPath.identifier,
-      struct.NFTCollectionData.privatePath.identifier,
       struct.NFTCollectionData.publicLinkedType.type.type.typeID,
       buildRestrictions(struct.NFTCollectionData.publicLinkedType.type),
-      struct.NFTCollectionData.privateLinkedType.type.type.typeID,
-      buildRestrictions(struct.NFTCollectionData.privateLinkedType.type),
       struct.NFTCollectionDisplay.collectionName,
       struct.NFTCollectionDisplay.collectionDescription,
       struct.ExternalURL.externalURL,

cadence/__test__/test/nftcatalog.test.js

@@ -0,0 +1,12 @@
+import "MetadataViews"
+
+/*
+    Script to check for the implementation of all recommended MetadataViews.
+ */
+access(all) fun main(ownerAddress: Address, collectionPublicPath: String): {String: Bool} {
+    let owner = getAccount(ownerAddress)
+    return { 
+        "MetadataViews": owner.getCapability<&AnyResource{MetadataViews.ResolverCollection}>(PublicPath(identifier: collectionPublicPath)!).check(),
+        "AnyResource": owner.getCapability<&AnyResource>(PublicPath(identifier: collectionPublicPath)!).check()
+    }
+}

cadence/scripts/check_for_links.cdc

@@ -0,0 +1,8 @@
+import "TransactionGeneration" 
+access(all) fun main(tx: String, collectionIdentifier: String, vaultIdentifier: String, merchantAddress: String) : String {
+    return TransactionGeneration.getTx(tx: tx, params: {
+        "collectionIdentifier": collectionIdentifier,
+        "vaultIdentifier": vaultIdentifier,
+        "merchantAddress": merchantAddress
+    })!
+}

cadence/scripts/gen_tx.cdc

@@ -27,9 +27,7 @@ access(all) struct NFT {
     access(all) let externalURL: String
     access(all) let storagePath: StoragePath
     access(all) let publicPath: PublicPath
-    access(all) let privatePath: PrivatePath
     access(all) let publicLinkedType: Type
-    access(all) let privateLinkedType: Type
     access(all) let collectionName: String
     access(all) let collectionDescription: String
     access(all) let collectionSquareImage: String
@@ -46,9 +44,7 @@ access(all) struct NFT {
         externalURL: String,
         storagePath: StoragePath,
         publicPath: PublicPath,
-        privatePath: PrivatePath,
         publicLinkedType: Type,
-        privateLinkedType: Type,
         collectionName: String,
         collectionDescription: String,
         collectionSquareImage: String,
@@ -64,9 +60,7 @@ access(all) struct NFT {
         self.externalURL = externalURL
         self.storagePath = storagePath
         self.publicPath = publicPath
-        self.privatePath = privatePath
         self.publicLinkedType = publicLinkedType
-        self.privateLinkedType = privateLinkedType
         self.collectionName = collectionName
         self.collectionDescription = collectionDescription
         self.collectionSquareImage = collectionSquareImage

cadence/scripts/get_nft_and_views_in_account.cdc

@@ -31,22 +31,16 @@ access(all)  struct ExternalURLView {
 access(all)  struct NFTCollectionDataView {
     access(all)  let storagePath : StoragePath
     access(all)  let publicPath : PublicPath
-    access(all)  let privatePath: PrivatePath
     access(all)  let publicLinkedType: Type
-    access(all)  let privateLinkedType: Type
 
     init (
         storagePath : StoragePath,
         publicPath : PublicPath,
-        privatePath : PrivatePath,
         publicLinkedType : Type,
-        privateLinkedType : Type,
     ) {
         self.storagePath = storagePath
         self.publicPath = publicPath
-        self.privatePath = privatePath
         self.publicLinkedType = publicLinkedType
-        self.privateLinkedType = privateLinkedType
     }
 }
 

cadence/scripts/get_nft_in_account_from_path.cdc

@@ -27,9 +27,7 @@ access(all) struct NFT {
         externalURL: String,
         storagePath: StoragePath,
         publicPath: PublicPath,
-        privatePath: PrivatePath,
         publicLinkedType: Type,
-        privateLinkedType: Type,
         collectionName: String,
         collectionDescription: String,
         collectionSquareImage: String,
@@ -44,9 +42,7 @@ access(all) struct NFT {
         self.externalURL = externalURL
         self.storagePath = storagePath
         self.publicPath = publicPath
-        self.privatePath = privatePath
         self.publicLinkedType = publicLinkedType
-        self.privateLinkedType = privateLinkedType
         self.collectionName = collectionName
         self.collectionDescription = collectionDescription
         self.collectionSquareImage = collectionSquareImage

cadence/scripts/get_nfts_in_account.cdc

@@ -0,0 +1,4 @@
+import "TransactionGeneration"
+access(all) fun main() : [String] {
+    return TransactionGeneration.getSupportedScripts()
+}