fix nft address casing

Author: joaquim-verges

packages/thirdweb/src/extensions/erc721/read/getNFT.test.ts

@@ -58,7 +58,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721.getNFT", () => {
       includeOwner: true,
     });
     expect(nft.metadata.name).toBe("Doodle #1");
-    expect(nft.owner).toBe("0xbe9936fcfc50666f5425fde4a9decc59cef73b24");
+    expect(nft.owner).toBe("0xbE9936FCFC50666f5425FDE4A9decC59cEF73b24");
     expect(nft).toMatchInlineSnapshot(`
       {
         "chainId": 1,
@@ -90,12 +90,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721.getNFT", () => {
           "image": "ipfs://QmTDxnzcvj2p3xBrKcGv1wxoyhAn2yzCQnZZ9LmFjReuH9",
           "image_url": "ipfs://QmTDxnzcvj2p3xBrKcGv1wxoyhAn2yzCQnZZ9LmFjReuH9",
           "name": "Doodle #1",
-          "owner_addresses": [
-            "0xbe9936fcfc50666f5425fde4a9decc59cef73b24",
-          ],
           "uri": "ipfs://QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/1",
         },
-        "owner": "0xbe9936fcfc50666f5425fde4a9decc59cef73b24",
+        "owner": "0xbE9936FCFC50666f5425FDE4A9decC59cEF73b24",
         "tokenAddress": "0x8a90cab2b38dba80c64b7734e58ee1db38b8992e",
         "tokenURI": "ipfs://QmPMc4tcBsMqLRuCQtPmPe84bpSjrC3Ky7t3JWuHXYB4aS/1",
         "type": "ERC721",

packages/thirdweb/src/extensions/erc721/read/getOwnedNFTs.test.ts

@@ -13,6 +13,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721.getOwnedNFTs", () => {
       owner,
     });
     expect(nfts.length).greaterThan(0);
+    for (const item of nfts) {
+      expect(item.owner).toBe(owner);
+    }
   });
 
   it("should detect ownership functions using indexer", async () => {

packages/thirdweb/src/insight/get-nfts.ts

@@ -11,6 +11,7 @@ import type { NFT } from "../utils/nft/parseNft.js";
 
 import { getCachedChain } from "../chains/utils.js";
 import { getContract } from "../contract/contract.js";
+import { getAddress } from "../utils/address.js";
 type OwnedNFT = GetV1NftsResponse["data"][number];
 type ContractNFT = GetV1NftsByContractAddressResponse["data"][number];
 
@@ -268,21 +269,25 @@ async function transformNFTModel(
         token_type,
         ...rest
       } = nft;
+
+      let metadataToUse = rest;
+      let owners: string[] | undefined = ownerAddress
+        ? [getAddress(ownerAddress)]
+        : undefined;
+
+      if ("owner_addresses" in rest) {
+        const { owner_addresses, ...restWithoutOwnerAddresses } = rest;
+        metadataToUse = restWithoutOwnerAddresses;
+        owners = owners ?? owner_addresses?.map((o) => getAddress(o));
+      }
+
       const metadata = replaceIPFSGatewayRecursively({
         uri: nft.metadata_url ?? "",
         image: nft.image_url,
         attributes: nft.extra_metadata?.attributes ?? undefined,
-        ...rest,
+        ...metadataToUse,
       });
 
-      // replace the ipfs gateway with the ipfs gateway from the client recusively for each key in the metadata object
-
-      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({
@@ -298,7 +303,7 @@ async function transformNFTModel(
           tokenId: BigInt(token_id),
           tokenUri: replaceIPFSGateway(metadata_url) ?? "",
           type: "ERC1155",
-          owner: owner_addresses?.[0],
+          owner: owners?.[0],
           tokenAddress: contract?.address ?? "",
           chainId: contract?.chain_id ?? 0,
           supply: supply,
@@ -307,7 +312,7 @@ async function transformNFTModel(
         parsedNft = parseNFT(metadata, {
           tokenId: BigInt(token_id),
           type: "ERC721",
-          owner: owner_addresses?.[0],
+          owner: owners?.[0],
           tokenUri: replaceIPFSGateway(metadata_url) ?? "",
           tokenAddress: contract?.address ?? "",
           chainId: contract?.chain_id ?? 0,

packages/thirdweb/src/wallets/smart/lib/paymaster.ts

@@ -65,19 +65,15 @@ export async function getPaymasterAndData(args: {
     headers,
     body: stringify(body),
   });
-  const res = await response.json();
 
   if (!response.ok) {
-    const error = res.error || response.statusText;
-    const code = res.code || "UNKNOWN";
+    const error = (await response.text()) || response.statusText;
 
-    throw new Error(
-      `Paymaster error: ${error}
-Status: ${response.status}
-Code: ${code}`,
-    );
+    throw new Error(`Paymaster error: ${response.status} - ${error}`);
   }
 
+  const res = await response.json();
+
   if (res.result) {
     // some paymasters return a string, some return an object with more data
     if (typeof res.result === "string") {