Merge pull request #255 from tqtezos/v0.4.1

v0.4.1
tqtezos · Mar 16, 2021 · eb8b15e · eb8b15e
2 parents c5cdc2c + 3e6a384
commit eb8b15e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/config/mainnet.json b/config/mainnet.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "https://mainnet-tezos.giganode.io",
+  "rpc": "https://rpc.tzbeta.net",
   "network": "mainnet",
   "bcd": {
     "api": "https://api.better-call.dev",

diff --git a/config/testnet.json b/config/testnet.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "https://edonet-tezos.giganode.io",
+  "rpc": "https://rpctest.tzbeta.net",
   "network": "edonet",
   "bcd": {
     "api": "https://api.better-call.dev",

diff --git a/src/lib/nfts/queries.ts b/src/lib/nfts/queries.ts
@@ -59,7 +59,10 @@ export async function getContractNfts(
 
   // get tokens listed for sale
   const fixedPriceStorage = await system.betterCallDev.getContractStorage(system.config.contracts.marketplace.fixedPrice.tez);
-  const fixedPriceSales = await system.betterCallDev.getBigMapKeys(fixedPriceStorage.value);
+  const fixedPriceBigMapId = select(fixedPriceStorage, {
+    type: 'big_map'
+  })?.value;
+  const fixedPriceSales = await system.betterCallDev.getBigMapKeys(fixedPriceBigMapId);
 
   return Promise.all(
     tokens.map(
@@ -70,7 +73,10 @@ export async function getContractNfts(
           return { ...acc, [next.name]: fromHexString(next.value) };
         }, {});
 
-        if (ipfsUriToCid(metadata[''])) {
+        if (ipfsUriToCid(metadata['""'])) {
+          const resolvedMetadata = await system.resolveMetadata(metadata['""']);
+          metadata = { ...metadata, ...resolvedMetadata.metadata };
+        } else if (ipfsUriToCid(metadata[''])) {
           const resolvedMetadata = await system.resolveMetadata(metadata['']);
           metadata = { ...metadata, ...resolvedMetadata.metadata };
         }