Merge pull request #160 from onflow/nialexsan/update-cadence

Nialexsan/update cadence

Author: nialexsan

.github/workflows/test.yml

@@ -10,20 +10,21 @@ jobs:
             EXAMPLENFT_TESTNET_HOLDER_ACCOUNT_PRIVATE_KEY: ${{ secrets.EXAMPLENFT_TESTNET_HOLDER_ACCOUNT_PRIVATE_KEY }}
         runs-on: ubuntu-latest
         steps:
+            - name: Checkout Repo
+              uses: actions/checkout@v4
             - name: Install Node
-              uses: actions/setup-node@v1
+              uses: actions/setup-node@v4
               with:
-                  node-version: 16
+                node-version: 18
 
               # This should be switched to the regular CLI once the stable-cadence branch is merged
             - name: Install Cadence 1.0 Flow CLI
               run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)"
 
             - name: Update PATH
               run: echo "/root/.local/bin" >> $GITHUB_PATH
-
-            - name: Checkout Repo
-              uses: actions/checkout@v2
+            
+            - run: echo $(flow version)
 
             - name: Install Dependencies
               run: npm install
@@ -35,6 +36,6 @@ jobs:
               if: always()
               run: npm test
 
-            - name: Run E2E Cypress Tests
-              if: always()
-              run: npm run e2e
+            # - name: Run E2E Cypress Tests
+            #   if: always()
+            #   run: npm run e2e

ui/apps/nft-portal/src/flow/c2j.json

@@ -1 +1,28 @@
-{"transactions":{"link_views_collections":"import MetadataViews from 0xMetadataViews\n\ntransaction(collectionPublicPath: String, collectionStoragePath: String) {\n    prepare(acct: AuthAccount) {\n        pre {\n            acct.borrow<&AnyResource>(from: StoragePath(identifier: collectionStoragePath)!) != nil: \"No Collection On Provided Storage Path.\"\n        }\n        let publicPath = PublicPath(identifier: collectionPublicPath)!\n        let storagePath = StoragePath(identifier: collectionStoragePath)!\n        if acct.getCapability<&AnyResource{MetadataViews.ResolverCollection}>(publicPath).borrow() == nil {\n            acct.link<&AnyResource{MetadataViews.ResolverCollection}>(publicPath, target: storagePath)\n        }\n    }\n\n    execute {\n    }\n}"},"scripts":{"check_for_links":"import MetadataViews from 0xMetadataViews\n\n/*\n    Script to check for the implementation of all recommended MetadataViews.\n */\npub fun main(ownerAddress: Address, collectionPublicPath: String): {String: Bool} {\n    let owner = getAccount(ownerAddress)\n    return { \n        \"MetadataViews\": owner.getCapability<&AnyResource{MetadataViews.ResolverCollection}>(PublicPath(identifier: collectionPublicPath)!).check(),\n        \"AnyResource\": owner.getCapability<&AnyResource>(PublicPath(identifier: collectionPublicPath)!).check()\n    }\n}","check_for_recommended_v1_views":"import MetadataViews from 0xMetadataViews\nimport NFTRetrieval from 0xNFTRetrieval\n\n/*\n    Script to check for the implementation of all recommended MetadataViews.\n */\npub fun main(ownerAddress: Address, collectionPublicPath: PublicPath): {String: Bool} {\n    let owner = getAccount(ownerAddress)\n    let collectionCap = owner.getCapability<&AnyResource{MetadataViews.ResolverCollection}>(collectionPublicPath)\n    assert(collectionCap.check(), message: \"MetadataViews Collection is not set up properly, ensure the Capability was created/linked correctly.\")\n    let collection = collectionCap.borrow()!\n    assert(collection.getIDs().length > 0, message: \"No NFTs exist in this collection, ensure the provided account has at least 1 NFTs.\")\n    let testNftId = collection.getIDs()[0]\n    let nftResolver = collection.borrowViewResolver(id: testNftId)\n    let views: {String: Bool} = {}\n    // Initialize map to all falses for recommended views.\n    for view in NFTRetrieval.getRecommendedViewsTypes(version: \"v1\") {\n        views.insert(key: view.identifier, false)\n    }\n    // Set to true if supported.\n    for view in nftResolver.getViews() {\n        if views.containsKey(view.identifier) {\n            views.insert(key: view.identifier, true)\n        }\n    }\n    return views\n}","get_current_views":"import MetadataViews from 0xMetadataViews\n\n/*\n    Script to check all currently implemented MetadataViews.\n    In addition, it will ensure if the Public Collection is setup and linked correctly for consumption.\n    Returns all View Types.\n */\npub fun main(ownerAddress: Address, collectionPublicPath: PublicPath): [Type] {\n    let owner = getAccount(ownerAddress)\n    let collectionCap = owner.getCapability<&AnyResource{MetadataViews.ResolverCollection}>(collectionPublicPath)\n    assert(collectionCap.check(), message: \"MetadataViews Collection is not set up properly, ensure the Capability was created/linked correctly.\")\n    let collection = collectionCap.borrow()!\n    assert(collection.getIDs().length > 0, message: \"No NFTs exist in this collection, ensure the provided account has at least 1 NFTs.\")\n    let testNftId = collection.getIDs()[0]\n    let nftResolver = collection.borrowViewResolver(id: testNftId)\n    return nftResolver.getViews()\n}","get_recommended_v1_views":"import MetadataViews from 0xMetadataViews\nimport NFTRetrieval from 0xNFTRetrieval\n\n/*\n    Script to get all currently recommended MetadataViews.\n */\npub fun main(): [Type] {\n    return NFTRetrieval.getRecommendedViewsTypes(version: \"v1\")\n}"},"vars":{"emulator":{"0xMetadataViews":null,"0xNFTCatalog":null,"0xNFTRetrieval":null},"testnet":{"0xMetadataViews":"0x631e88ae7f1d7c20","0xNFTCatalog":"0x324c34e1c517e4db","0xNFTRetrieval":"0x324c34e1c517e4db"},"mainnet":{"0xMetadataViews":"0x1d7e57aa55817448","0xNFTCatalog":"0x49a7cda3a1eecc29","0xNFTRetrieval":"0x49a7cda3a1eecc29"}}}
+{
+  "transactions": {
+    "link_views_collections": "import MetadataViews from 0xMetadataViews\n\ntransaction(collectionPublicPath: String, collectionStoragePath: String) {\n    prepare(acct: AuthAccount) {\n        pre {\n            acct.borrow<&AnyResource>(from: StoragePath(identifier: collectionStoragePath)!) != nil: \"No Collection On Provided Storage Path.\"\n        }\n        let publicPath = PublicPath(identifier: collectionPublicPath)!\n        let storagePath = StoragePath(identifier: collectionStoragePath)!\n        if acct.getCapability<&AnyResource{MetadataViews.ResolverCollection}>(publicPath).borrow() == nil {\n            acct.link<&AnyResource{MetadataViews.ResolverCollection}>(publicPath, target: storagePath)\n        }\n    }\n\n    execute {\n    }\n}"
+  },
+  "scripts": {
+    "check_for_links": "import MetadataViews from 0xMetadataViews\n\n/*\n    Script to check for the implementation of all recommended MetadataViews.\n */\naccess(all) fun main(ownerAddress: Address, collectionPublicPath: String): {String: Bool} {\n    let owner = getAccount(ownerAddress)\n    return { \n        \"MetadataViews\": owner.getCapability<&AnyResource{MetadataViews.ResolverCollection}>(PublicPath(identifier: collectionPublicPath)!).check(),\n        \"AnyResource\": owner.getCapability<&AnyResource>(PublicPath(identifier: collectionPublicPath)!).check()\n    }\n}",
+    "check_for_recommended_v1_views": "import MetadataViews from 0xMetadataViews\nimport NFTRetrieval from 0xNFTRetrieval\n\n/*\n    Script to check for the implementation of all recommended MetadataViews.\n */\naccess(all) fun main(ownerAddress: Address, collectionPublicPath: PublicPath): {String: Bool} {\n    let owner = getAccount(ownerAddress)\n    let collectionCap = owner.getCapability<&AnyResource{MetadataViews.ResolverCollection}>(collectionPublicPath)\n    assert(collectionCap.check(), message: \"MetadataViews Collection is not set up properly, ensure the Capability was created/linked correctly.\")\n    let collection = collectionCap.borrow()!\n    assert(collection.getIDs().length > 0, message: \"No NFTs exist in this collection, ensure the provided account has at least 1 NFTs.\")\n    let testNftId = collection.getIDs()[0]\n    let nftResolver = collection.borrowViewResolver(id: testNftId)\n    let views: {String: Bool} = {}\n    // Initialize map to all falses for recommended views.\n    for view in NFTRetrieval.getRecommendedViewsTypes(version: \"v1\") {\n        views.insert(key: view.identifier, false)\n    }\n    // Set to true if supported.\n    for view in nftResolver.getViews() {\n        if views.containsKey(view.identifier) {\n            views.insert(key: view.identifier, true)\n        }\n    }\n    return views\n}",
+    "get_current_views": "import MetadataViews from 0xMetadataViews\n\n/*\n    Script to check all currently implemented MetadataViews.\n    In addition, it will ensure if the Public Collection is setup and linked correctly for consumption.\n    Returns all View Types.\n */\naccess(all) fun main(ownerAddress: Address, collectionPublicPath: PublicPath): [Type] {\n    let owner = getAccount(ownerAddress)\n    let collectionCap = owner.getCapability<&AnyResource{MetadataViews.ResolverCollection}>(collectionPublicPath)\n    assert(collectionCap.check(), message: \"MetadataViews Collection is not set up properly, ensure the Capability was created/linked correctly.\")\n    let collection = collectionCap.borrow()!\n    assert(collection.getIDs().length > 0, message: \"No NFTs exist in this collection, ensure the provided account has at least 1 NFTs.\")\n    let testNftId = collection.getIDs()[0]\n    let nftResolver = collection.borrowViewResolver(id: testNftId)\n    return nftResolver.getViews()\n}",
+    "get_recommended_v1_views": "import MetadataViews from 0xMetadataViews\nimport NFTRetrieval from 0xNFTRetrieval\n\n/*\n    Script to get all currently recommended MetadataViews.\n */\naccess(all) fun main(): [Type] {\n    return NFTRetrieval.getRecommendedViewsTypes(version: \"v1\")\n}"
+  },
+  "vars": {
+    "emulator": {
+      "0xMetadataViews": null,
+      "0xNFTCatalog": null,
+      "0xNFTRetrieval": null
+    },
+    "testnet": {
+      "0xMetadataViews": "0x631e88ae7f1d7c20",
+      "0xNFTCatalog": "0x324c34e1c517e4db",
+      "0xNFTRetrieval": "0x324c34e1c517e4db"
+    },
+    "mainnet": {
+      "0xMetadataViews": "0x1d7e57aa55817448",
+      "0xNFTCatalog": "0x49a7cda3a1eecc29",
+      "0xNFTRetrieval": "0x49a7cda3a1eecc29"
+    }
+  }
+}

ui/apps/nft-portal/src/flow/catalog_c2j.json

@@ -52,17 +52,18 @@ export async function retrieveContractInformation(
       cadence: `
         import NonFungibleToken from ${fcl.withPrefix(nftStandardAddress)}
         import MetadataViews from ${fcl.withPrefix(nftStandardAddress)}
+        import ViewResolver from ${fcl.withPrefix(nftStandardAddress)}
         import ${name} from ${fcl.withPrefix(address)}
 
-        pub fun main(): {String: AnyStruct} {
+        access(all) fun main(): {String: AnyStruct} {
           var isNFTContract = false
           var collectionConformsToMetadata = false
           var nftConformsToMetadata = false
 
-          isNFTContract = Type<${name}>().isSubtype(of: Type<NonFungibleToken>())
+          isNFTContract = Type<${name}>().isSubtype(of: Type<{NonFungibleToken}>())
           if (isNFTContract == true) {
-            collectionConformsToMetadata = Type<&${name}.Collection>().isSubtype(of: Type<&{MetadataViews.ResolverCollection}>())
-            nftConformsToMetadata = Type<&${name}.NFT>().isSubtype(of: Type<&{MetadataViews.Resolver}>())
+            collectionConformsToMetadata = Type<&${name}.Collection>().isSubtype(of: Type<&{ViewResolver.ResolverCollection}>())
+            nftConformsToMetadata = Type<&${name}.NFT>().isSubtype(of: Type<&{ViewResolver.Resolver}>())
           }
 
           return {