fix: resolve conflict

iotaledger · Jul 17, 2024 · a9188c4 · a9188c4
1 parent 12a1467
commit a9188c4
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/packages/vm/core/evm/iscmagic/ISCSandbox.sol b/packages/vm/core/evm/iscmagic/ISCSandbox.sol
@@ -180,13 +180,18 @@ interface ISCSandbox {
      * @dev Retrieves the details of an IRC27 NFT based on its ID.
      * @param id The ID of the IRC27 NFT.
      * @return The IRC27NFT data of the specified NFT.
+     *
+     * Note: the metadata.uri field is encoded as a data URL with:
+     * base64(jsonEncode({
+     *   "name": NFT.name,
+     *   "description": NFT.description,
+     *   "image": NFT.URI
+     * }))
+     *
+     * Note: metadata does not include attributes, use `getIRC27TokenURI` to get those attributes off-chain in JSON form.
      */
-    // Note: the metadata.uri field is encoded as a data URL with:
-    // base64(jsonEncode({
-    //   "name": NFT.name,
-    //   "description": NFT.description,
-    //   "image": NFT.URI
-    // }))
+    function getIRC27NFTData(NFTID id) external view returns (IRC27NFT memory);
+
     function getIRC27NFTData(NFTID id) external view returns (IRC27NFT memory);
 
     /**