thirdweb 5.95.0-nightly-e7b01108037ebef07fba95f888be1905c8fab5df-20250417000348 → 5.95.0-nightly-4cf15a2475fce1c5b55d19f7cf51ab080e80e33f-20250418000341

package/src/extensions/erc721/read/getNFTs.test.ts

@@ -14,195 +14,195 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721.getNFTs", () => {
 
     expect(nfts.length).toBe(5);
     // TODO (insight): re-enable once insight fixes the client id caching issue
-    // expect(nfts).toMatchInlineSnapshot(`
-    //   [
-    //     {
-    //       "chainId": 1,
-    //       "id": 0n,
-    //       "metadata": {
-    //         "attributes": [
-    //           {
-    //             "trait_type": "face",
-    //             "value": "mustache",
-    //           },
-    //           {
-    //             "trait_type": "hair",
-    //             "value": "purple long",
-    //           },
-    //           {
-    //             "trait_type": "body",
-    //             "value": "blue and yellow jacket",
-    //           },
-    //           {
-    //             "trait_type": "background",
-    //             "value": "green",
-    //           },
-    //           {
-    //             "trait_type": "head",
-    //             "value": "tan",
-    //           },
-    //         ],
-    //         "description": "A community-driven collectibles project featuring art by Burnt Toast. Doodles come in a joyful range of colors, traits and sizes with a collection size of 10,000. Each Doodle allows its owner to vote for experiences and activations paid for by the Doodles Community Treasury. Burnt Toast is the working alias for Scott Martin, a Canadian–based illustrator, designer, animator and muralist.",
-    //         "image": "https://${clientId}.ipfscdn.io/ipfs/QmUEfFfwAh4wyB5UfHCVPUxis4j4Q4kJXtm5x5p3g1fVUn",
-    //         "image_url": "https://${clientId}.ipfscdn.io/ipfs/QmUEfFfwAh4wyB5UfHCVPUxis4j4Q4kJXtm5x5p3g1fVUn",
-    //         "name": "Doodle #0",
-    //         "uri": "https://${clientId}.ipfscdn.io/ipfs/QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/0",
-    //       },
-    //       "owner": null,
-    //       "tokenAddress": "0x8a90cab2b38dba80c64b7734e58ee1db38b8992e",
-    //       "tokenURI": "https://${clientId}.ipfscdn.io/ipfs/QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/0",
-    //       "type": "ERC721",
-    //     },
-    //     {
-    //       "chainId": 1,
-    //       "id": 1n,
-    //       "metadata": {
-    //         "attributes": [
-    //           {
-    //             "trait_type": "face",
-    //             "value": "holographic beard",
-    //           },
-    //           {
-    //             "trait_type": "hair",
-    //             "value": "white bucket cap",
-    //           },
-    //           {
-    //             "trait_type": "body",
-    //             "value": "purple sweater with satchel",
-    //           },
-    //           {
-    //             "trait_type": "background",
-    //             "value": "grey",
-    //           },
-    //           {
-    //             "trait_type": "head",
-    //             "value": "gradient 2",
-    //           },
-    //         ],
-    //         "description": "A community-driven collectibles project featuring art by Burnt Toast. Doodles come in a joyful range of colors, traits and sizes with a collection size of 10,000. Each Doodle allows its owner to vote for experiences and activations paid for by the Doodles Community Treasury. Burnt Toast is the working alias for Scott Martin, a Canadian–based illustrator, designer, animator and muralist.",
-    //         "image": "https://${clientId}.ipfscdn.io/ipfs/QmTDxnzcvj2p3xBrKcGv1wxoyhAn2yzCQnZZ9LmFjReuH9",
-    //         "image_url": "https://${clientId}.ipfscdn.io/ipfs/QmTDxnzcvj2p3xBrKcGv1wxoyhAn2yzCQnZZ9LmFjReuH9",
-    //         "name": "Doodle #1",
-    //         "uri": "https://${clientId}.ipfscdn.io/ipfs/QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/1",
-    //       },
-    //       "owner": null,
-    //       "tokenAddress": "0x8a90cab2b38dba80c64b7734e58ee1db38b8992e",
-    //       "tokenURI": "https://${clientId}.ipfscdn.io/ipfs/QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/1",
-    //       "type": "ERC721",
-    //     },
-    //     {
-    //       "chainId": 1,
-    //       "id": 2n,
-    //       "metadata": {
-    //         "attributes": [
-    //           {
-    //             "trait_type": "face",
-    //             "value": "designer glasses",
-    //           },
-    //           {
-    //             "trait_type": "hair",
-    //             "value": "poopie",
-    //           },
-    //           {
-    //             "trait_type": "body",
-    //             "value": "blue fleece",
-    //           },
-    //           {
-    //             "trait_type": "background",
-    //             "value": "yellow",
-    //           },
-    //           {
-    //             "trait_type": "head",
-    //             "value": "purple",
-    //           },
-    //         ],
-    //         "description": "A community-driven collectibles project featuring art by Burnt Toast. Doodles come in a joyful range of colors, traits and sizes with a collection size of 10,000. Each Doodle allows its owner to vote for experiences and activations paid for by the Doodles Community Treasury. Burnt Toast is the working alias for Scott Martin, a Canadian–based illustrator, designer, animator and muralist.",
-    //         "image": "https://${clientId}.ipfscdn.io/ipfs/QmbvZ2hbF3nEq5r3ijMEiSGssAmJvtyFwiejTAGHv74LR5",
-    //         "image_url": "https://${clientId}.ipfscdn.io/ipfs/QmbvZ2hbF3nEq5r3ijMEiSGssAmJvtyFwiejTAGHv74LR5",
-    //         "name": "Doodle #2",
-    //         "uri": "https://${clientId}.ipfscdn.io/ipfs/QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/2",
-    //       },
-    //       "owner": null,
-    //       "tokenAddress": "0x8a90cab2b38dba80c64b7734e58ee1db38b8992e",
-    //       "tokenURI": "https://${clientId}.ipfscdn.io/ipfs/QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/2",
-    //       "type": "ERC721",
-    //     },
-    //     {
-    //       "chainId": 1,
-    //       "id": 3n,
-    //       "metadata": {
-    //         "attributes": [
-    //           {
-    //             "trait_type": "face",
-    //             "value": "designer glasses",
-    //           },
-    //           {
-    //             "trait_type": "hair",
-    //             "value": "holographic mohawk",
-    //           },
-    //           {
-    //             "trait_type": "body",
-    //             "value": "pink fleece",
-    //           },
-    //           {
-    //             "trait_type": "background",
-    //             "value": "gradient 1",
-    //           },
-    //           {
-    //             "trait_type": "head",
-    //             "value": "pale",
-    //           },
-    //         ],
-    //         "description": "A community-driven collectibles project featuring art by Burnt Toast. Doodles come in a joyful range of colors, traits and sizes with a collection size of 10,000. Each Doodle allows its owner to vote for experiences and activations paid for by the Doodles Community Treasury. Burnt Toast is the working alias for Scott Martin, a Canadian–based illustrator, designer, animator and muralist.",
-    //         "image": "https://${clientId}.ipfscdn.io/ipfs/QmVpwaCqLut3wqwB5KSQr2fGnbLuJt5e3LhNvzvcisewZB",
-    //         "image_url": "https://${clientId}.ipfscdn.io/ipfs/QmVpwaCqLut3wqwB5KSQr2fGnbLuJt5e3LhNvzvcisewZB",
-    //         "name": "Doodle #3",
-    //         "uri": "https://${clientId}.ipfscdn.io/ipfs/QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/3",
-    //       },
-    //       "owner": null,
-    //       "tokenAddress": "0x8a90cab2b38dba80c64b7734e58ee1db38b8992e",
-    //       "tokenURI": "https://${clientId}.ipfscdn.io/ipfs/QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/3",
-    //       "type": "ERC721",
-    //     },
-    //     {
-    //       "chainId": 1,
-    //       "id": 4n,
-    //       "metadata": {
-    //         "attributes": [
-    //           {
-    //             "trait_type": "face",
-    //             "value": "happy",
-    //           },
-    //           {
-    //             "trait_type": "hair",
-    //             "value": "purple long",
-    //           },
-    //           {
-    //             "trait_type": "body",
-    //             "value": "spotted hoodie",
-    //           },
-    //           {
-    //             "trait_type": "background",
-    //             "value": "gradient 2",
-    //           },
-    //           {
-    //             "trait_type": "head",
-    //             "value": "purple",
-    //           },
-    //         ],
-    //         "description": "A community-driven collectibles project featuring art by Burnt Toast. Doodles come in a joyful range of colors, traits and sizes with a collection size of 10,000. Each Doodle allows its owner to vote for experiences and activations paid for by the Doodles Community Treasury. Burnt Toast is the working alias for Scott Martin, a Canadian–based illustrator, designer, animator and muralist.",
-    //         "image": "https://${clientId}.ipfscdn.io/ipfs/QmcyuFVLbfBmSeQ9ynu4dk67r97nB1abEekotuVuRGWedm",
-    //         "image_url": "https://${clientId}.ipfscdn.io/ipfs/QmcyuFVLbfBmSeQ9ynu4dk67r97nB1abEekotuVuRGWedm",
-    //         "name": "Doodle #4",
-    //         "uri": "https://${clientId}.ipfscdn.io/ipfs/QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/4",
-    //       },
-    //       "owner": null,
-    //       "tokenAddress": "0x8a90cab2b38dba80c64b7734e58ee1db38b8992e",
-    //       "tokenURI": "https://${clientId}.ipfscdn.io/ipfs/QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/4",
-    //       "type": "ERC721",
-    //     },
-    //   ]
-    // `);
+    expect(nfts).toMatchInlineSnapshot(`
+      [
+        {
+          "chainId": 1,
+          "id": 0n,
+          "metadata": {
+            "attributes": [
+              {
+                "trait_type": "face",
+                "value": "mustache",
+              },
+              {
+                "trait_type": "hair",
+                "value": "purple long",
+              },
+              {
+                "trait_type": "body",
+                "value": "blue and yellow jacket",
+              },
+              {
+                "trait_type": "background",
+                "value": "green",
+              },
+              {
+                "trait_type": "head",
+                "value": "tan",
+              },
+            ],
+            "description": "A community-driven collectibles project featuring art by Burnt Toast. Doodles come in a joyful range of colors, traits and sizes with a collection size of 10,000. Each Doodle allows its owner to vote for experiences and activations paid for by the Doodles Community Treasury. Burnt Toast is the working alias for Scott Martin, a Canadian–based illustrator, designer, animator and muralist.",
+            "image": "ipfs://QmUEfFfwAh4wyB5UfHCVPUxis4j4Q4kJXtm5x5p3g1fVUn",
+            "image_url": "ipfs://QmUEfFfwAh4wyB5UfHCVPUxis4j4Q4kJXtm5x5p3g1fVUn",
+            "name": "Doodle #0",
+            "uri": "ipfs://QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/0",
+          },
+          "owner": null,
+          "tokenAddress": "0x8a90cab2b38dba80c64b7734e58ee1db38b8992e",
+          "tokenURI": "ipfs://QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/0",
+          "type": "ERC721",
+        },
+        {
+          "chainId": 1,
+          "id": 1n,
+          "metadata": {
+            "attributes": [
+              {
+                "trait_type": "face",
+                "value": "holographic beard",
+              },
+              {
+                "trait_type": "hair",
+                "value": "white bucket cap",
+              },
+              {
+                "trait_type": "body",
+                "value": "purple sweater with satchel",
+              },
+              {
+                "trait_type": "background",
+                "value": "grey",
+              },
+              {
+                "trait_type": "head",
+                "value": "gradient 2",
+              },
+            ],
+            "description": "A community-driven collectibles project featuring art by Burnt Toast. Doodles come in a joyful range of colors, traits and sizes with a collection size of 10,000. Each Doodle allows its owner to vote for experiences and activations paid for by the Doodles Community Treasury. Burnt Toast is the working alias for Scott Martin, a Canadian–based illustrator, designer, animator and muralist.",
+            "image": "ipfs://QmTDxnzcvj2p3xBrKcGv1wxoyhAn2yzCQnZZ9LmFjReuH9",
+            "image_url": "ipfs://QmTDxnzcvj2p3xBrKcGv1wxoyhAn2yzCQnZZ9LmFjReuH9",
+            "name": "Doodle #1",
+            "uri": "ipfs://QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/1",
+          },
+          "owner": null,
+          "tokenAddress": "0x8a90cab2b38dba80c64b7734e58ee1db38b8992e",
+          "tokenURI": "ipfs://QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/1",
+          "type": "ERC721",
+        },
+        {
+          "chainId": 1,
+          "id": 2n,
+          "metadata": {
+            "attributes": [
+              {
+                "trait_type": "face",
+                "value": "designer glasses",
+              },
+              {
+                "trait_type": "hair",
+                "value": "poopie",
+              },
+              {
+                "trait_type": "body",
+                "value": "blue fleece",
+              },
+              {
+                "trait_type": "background",
+                "value": "yellow",
+              },
+              {
+                "trait_type": "head",
+                "value": "purple",
+              },
+            ],
+            "description": "A community-driven collectibles project featuring art by Burnt Toast. Doodles come in a joyful range of colors, traits and sizes with a collection size of 10,000. Each Doodle allows its owner to vote for experiences and activations paid for by the Doodles Community Treasury. Burnt Toast is the working alias for Scott Martin, a Canadian–based illustrator, designer, animator and muralist.",
+            "image": "ipfs://QmbvZ2hbF3nEq5r3ijMEiSGssAmJvtyFwiejTAGHv74LR5",
+            "image_url": "ipfs://QmbvZ2hbF3nEq5r3ijMEiSGssAmJvtyFwiejTAGHv74LR5",
+            "name": "Doodle #2",
+            "uri": "ipfs://QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/2",
+          },
+          "owner": null,
+          "tokenAddress": "0x8a90cab2b38dba80c64b7734e58ee1db38b8992e",
+          "tokenURI": "ipfs://QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/2",
+          "type": "ERC721",
+        },
+        {
+          "chainId": 1,
+          "id": 3n,
+          "metadata": {
+            "attributes": [
+              {
+                "trait_type": "face",
+                "value": "designer glasses",
+              },
+              {
+                "trait_type": "hair",
+                "value": "holographic mohawk",
+              },
+              {
+                "trait_type": "body",
+                "value": "pink fleece",
+              },
+              {
+                "trait_type": "background",
+                "value": "gradient 1",
+              },
+              {
+                "trait_type": "head",
+                "value": "pale",
+              },
+            ],
+            "description": "A community-driven collectibles project featuring art by Burnt Toast. Doodles come in a joyful range of colors, traits and sizes with a collection size of 10,000. Each Doodle allows its owner to vote for experiences and activations paid for by the Doodles Community Treasury. Burnt Toast is the working alias for Scott Martin, a Canadian–based illustrator, designer, animator and muralist.",
+            "image": "ipfs://QmVpwaCqLut3wqwB5KSQr2fGnbLuJt5e3LhNvzvcisewZB",
+            "image_url": "ipfs://QmVpwaCqLut3wqwB5KSQr2fGnbLuJt5e3LhNvzvcisewZB",
+            "name": "Doodle #3",
+            "uri": "ipfs://QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/3",
+          },
+          "owner": null,
+          "tokenAddress": "0x8a90cab2b38dba80c64b7734e58ee1db38b8992e",
+          "tokenURI": "ipfs://QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/3",
+          "type": "ERC721",
+        },
+        {
+          "chainId": 1,
+          "id": 4n,
+          "metadata": {
+            "attributes": [
+              {
+                "trait_type": "face",
+                "value": "happy",
+              },
+              {
+                "trait_type": "hair",
+                "value": "purple long",
+              },
+              {
+                "trait_type": "body",
+                "value": "spotted hoodie",
+              },
+              {
+                "trait_type": "background",
+                "value": "gradient 2",
+              },
+              {
+                "trait_type": "head",
+                "value": "purple",
+              },
+            ],
+            "description": "A community-driven collectibles project featuring art by Burnt Toast. Doodles come in a joyful range of colors, traits and sizes with a collection size of 10,000. Each Doodle allows its owner to vote for experiences and activations paid for by the Doodles Community Treasury. Burnt Toast is the working alias for Scott Martin, a Canadian–based illustrator, designer, animator and muralist.",
+            "image": "ipfs://QmcyuFVLbfBmSeQ9ynu4dk67r97nB1abEekotuVuRGWedm",
+            "image_url": "ipfs://QmcyuFVLbfBmSeQ9ynu4dk67r97nB1abEekotuVuRGWedm",
+            "name": "Doodle #4",
+            "uri": "ipfs://QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/4",
+          },
+          "owner": null,
+          "tokenAddress": "0x8a90cab2b38dba80c64b7734e58ee1db38b8992e",
+          "tokenURI": "ipfs://QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/4",
+          "type": "ERC721",
+        },
+      ]
+    `);
   });
 
   it("should throw error if totalSupply and nextTokenIdToMint are not supported", async () => {

package/src/insight/get-nfts.ts

@@ -9,6 +9,8 @@ import type { Chain } from "../chains/types.js";
 import type { ThirdwebClient } from "../client/client.js";
 import type { NFT } from "../utils/nft/parseNft.js";
 
+import { getCachedChain } from "../chains/utils.js";
+import { getContract } from "../contract/contract.js";
 type OwnedNFT = GetV1NftsResponse["data"][number];
 type ContractNFT = GetV1NftsByContractAddressResponse["data"][number];
 
@@ -76,6 +78,7 @@ export async function getOwnedNFTs(args: {
 
   const transformedNfts = await transformNFTModel(
     result.data?.data ?? [],
+    client,
     ownerAddress,
   );
   return transformedNfts.map((nft) => ({
@@ -156,7 +159,7 @@ export async function getContractNFTs(args: {
     );
   }
 
-  return transformNFTModel(result.data?.data ?? []);
+  return transformNFTModel(result.data?.data ?? [], client);
 }
 
 /**
@@ -233,64 +236,125 @@ export async function getNFT(args: {
     );
   }
 
-  const transformedNfts = await transformNFTModel(result.data?.data ?? []);
+  const transformedNfts = await transformNFTModel(
+    result.data?.data ?? [],
+    client,
+  );
   return transformedNfts?.[0];
 }
 
 async function transformNFTModel(
   nfts: (ContractNFT | OwnedNFT)[],
+  client: ThirdwebClient,
   ownerAddress?: string,
 ): Promise<(NFT & { quantityOwned?: bigint })[]> {
-  const { parseNFT } = await import("../utils/nft/parseNft.js");
+  const [{ parseNFT }, { totalSupply }] = await Promise.all([
+    import("../utils/nft/parseNft.js"),
+    import("../extensions/erc1155/__generated__/IERC1155/read/totalSupply.js"),
+  ]);
 
-  return nfts.map((nft) => {
-    let parsedNft: NFT;
-    const {
-      contract,
-      extra_metadata,
-      collection,
-      metadata_url,
-      chain_id,
-      token_id,
-      status,
-      balance,
-      token_type,
-      ...rest
-    } = nft;
-    const metadata = {
-      uri: nft.metadata_url ?? "",
-      image: nft.image_url,
-      attributes: nft.extra_metadata?.attributes ?? undefined,
-      ...rest,
-    };
+  return await Promise.all(
+    nfts.map(async (nft) => {
+      let parsedNft: NFT;
+      const {
+        contract,
+        extra_metadata,
+        collection,
+        metadata_url,
+        chain_id,
+        token_id,
+        status,
+        balance,
+        token_type,
+        ...rest
+      } = nft;
+      const metadata = replaceIPFSGatewayRecursively({
+        uri: nft.metadata_url ?? "",
+        image: nft.image_url,
+        attributes: nft.extra_metadata?.attributes ?? undefined,
+        ...rest,
+      });
 
-    const owner_addresses = ownerAddress
-      ? [ownerAddress]
-      : "owner_addresses" in nft
-        ? nft.owner_addresses
-        : undefined;
+      // replace the ipfs gateway with the ipfs gateway from the client recusively for each key in the metadata object
 
-    if (contract?.type === "erc1155") {
-      parsedNft = parseNFT(metadata, {
-        tokenId: BigInt(token_id),
-        tokenUri: metadata_url ?? "",
-        type: "ERC1155",
-        owner: owner_addresses?.[0],
-        tokenAddress: contract?.address ?? "",
-        chainId: contract?.chain_id ?? 0,
-        supply: balance ? BigInt(balance) : 0n, // TODO (insight): this is wrong, needs to be added in the API
-      });
+      const owner_addresses = ownerAddress
+        ? [ownerAddress]
+        : "owner_addresses" in nft
+          ? nft.owner_addresses
+          : undefined;
+
+      if (contract?.type === "erc1155") {
+        // TODO (insight): this needs to be added in the API
+        const supply = await totalSupply({
+          contract: getContract({
+            address: contract.address,
+            chain: getCachedChain(contract.chain_id),
+            client: client,
+          }),
+          id: BigInt(token_id),
+        });
+
+        parsedNft = parseNFT(metadata, {
+          tokenId: BigInt(token_id),
+          tokenUri: replaceIPFSGateway(metadata_url) ?? "",
+          type: "ERC1155",
+          owner: owner_addresses?.[0],
+          tokenAddress: contract?.address ?? "",
+          chainId: contract?.chain_id ?? 0,
+          supply: supply,
+        });
+      } else {
+        parsedNft = parseNFT(metadata, {
+          tokenId: BigInt(token_id),
+          type: "ERC721",
+          owner: owner_addresses?.[0],
+          tokenUri: replaceIPFSGateway(metadata_url) ?? "",
+          tokenAddress: contract?.address ?? "",
+          chainId: contract?.chain_id ?? 0,
+        });
+      }
+
+      return parsedNft;
+    }),
+  );
+}
+
+// biome-ignore lint/suspicious/noExplicitAny: this should be fixed in the API
+function replaceIPFSGatewayRecursively(obj: any) {
+  if (typeof obj !== "object" || obj === null) {
+    return obj;
+  }
+  for (const key in obj) {
+    if (typeof obj[key] === "string") {
+      obj[key] = replaceIPFSGateway(obj[key]);
     } else {
-      parsedNft = parseNFT(metadata, {
-        tokenId: BigInt(token_id),
-        type: "ERC721",
-        owner: owner_addresses?.[0],
-        tokenUri: metadata_url ?? "",
-        tokenAddress: contract?.address ?? "",
-        chainId: contract?.chain_id ?? 0,
-      });
+      replaceIPFSGatewayRecursively(obj[key]);
     }
+  }
+  return obj;
+}
 
-    return parsedNft;
-  });
+function replaceIPFSGateway(url?: string) {
+  if (!url || typeof url !== "string") {
+    return url;
+  }
+  try {
+    const parsedUrl = new URL(url);
+    if (parsedUrl.host.endsWith(".ipfscdn.io")) {
+      const paths = parsedUrl.pathname.split("/");
+      const index = paths.findIndex((path) => path === "ipfs");
+      if (index === -1) {
+        return url;
+      }
+      const ipfsHash = paths.slice(index + 1).join("/");
+      if (ipfsHash) {
+        return `ipfs://${ipfsHash}`;
+      }
+      return url;
+    }
+  } catch {
+    // If the URL is invalid, return it as is
+    return url;
+  }
+  return url;
 }

package/src/rpc/fetch-rpc.ts

@@ -78,16 +78,7 @@ export async function fetchRpc(
     );
   }
 
-  if (response.headers.get("Content-Type")?.startsWith("application/json")) {
-    return await response.json();
-  }
-  const text = await response.text();
-  try {
-    return JSON.parse(text);
-  } catch (err) {
-    console.error("Error parsing response", err, text);
-    throw err;
-  }
+  return await response.json();
 }
 
 type FetchSingleRpcOptions = {
@@ -121,14 +112,5 @@ export async function fetchSingleRpc(
       `RPC request failed with status ${response.status} - ${response.statusText}: ${error || "unknown error"}`,
     );
   }
-  if (response.headers.get("Content-Type")?.startsWith("application/json")) {
-    return await response.json();
-  }
-  const text = await response.text();
-  try {
-    return JSON.parse(text);
-  } catch (err) {
-    console.error("Error parsing response", err, text);
-    throw err;
-  }
+  return await response.json();
 }

package/src/rpc/rpc.ts

@@ -144,7 +144,11 @@ export function getRpcClient(
 
             // No response.
             if (!response) {
-              inflight.reject(new Error("No response"));
+              inflight.reject(
+                new Error(
+                  `No response for index ${index} - all responses: ${stringify(responses)}`,
+                ),
+              );
             }
             // Response is an error or error string.
             else if (response instanceof Error) {

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.95.0-nightly-e7b01108037ebef07fba95f888be1905c8fab5df-20250417000348";
+export const version = "5.95.0-nightly-4cf15a2475fce1c5b55d19f7cf51ab080e80e33f-20250418000341";