[storage, chains, react-core] - fail fast when making HEAD request to gateway during upload & more (#843)

jnsdls · web-flow · commit 839fce1f6f27 · 2023-03-30T21:10:44.000Z
diff --git a/.changeset/chilled-apples-complain.md b/.changeset/chilled-apples-complain.md
@@ -1,5 +1,5 @@
 ---
-"@thirdweb-dev/react-core": minor
+"@thirdweb-dev/react-core": patch
 ---
 
 Usage of the `useContractRead` and `useContractWrite` hooks has changed:
diff --git a/.changeset/loud-students-bake.md b/.changeset/loud-students-bake.md
@@ -1,5 +1,5 @@
 ---
-"@thirdweb-dev/sdk": minor
+"@thirdweb-dev/sdk": patch
 ---
 
 The signature of all `contract.call` methods has been updated to the following structure:
diff --git a/.changeset/plenty-flies-itch.md b/.changeset/plenty-flies-itch.md
@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/chains": patch
+---
+
+update chains
diff --git a/.changeset/quiet-squids-type.md b/.changeset/quiet-squids-type.md
@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/react-core": patch
+---
+
+fix solana program query key resolution
diff --git a/.changeset/smart-tomatoes-push.md b/.changeset/smart-tomatoes-push.md
@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/storage": patch
+---
+
+uploads to IPFS should start significantly faster due to a change in the re-upload detection
diff --git a/packages/chains/chains/8080.ts b/packages/chains/chains/8080.ts
@@ -27,7 +27,7 @@ export default {
     {
       "name": "Shardeum Scan",
       "url": "https://explorer-liberty10.shardeum.org",
-      "standard": "none"
+      "standard": "EIP3091"
     }
   ],
   "redFlags": [
diff --git a/packages/chains/chains/8081.ts b/packages/chains/chains/8081.ts
@@ -27,7 +27,7 @@ export default {
     {
       "name": "Shardeum Scan",
       "url": "https://explorer-liberty20.shardeum.org",
-      "standard": "none"
+      "standard": "EIP3091"
     }
   ],
   "redFlags": [
diff --git a/packages/chains/chains/8082.ts b/packages/chains/chains/8082.ts
@@ -27,7 +27,7 @@ export default {
     {
       "name": "Shardeum Scan",
       "url": "https://explorer-sphinx.shardeum.org",
-      "standard": "none"
+      "standard": "EIP3091"
     }
   ],
   "redFlags": [
diff --git a/packages/react-core/src/solana/hooks/program/useProgram.ts b/packages/react-core/src/solana/hooks/program/useProgram.ts
@@ -39,13 +39,14 @@ export function programQuery<TProgramType extends ProgramType>(
   return {
     queryKey: neverPersist(
       createSOLQueryKeyWithNetwork(
-        ["program-instance", address] as const,
+        ["program-instance", { address, type }] as const,
         network || null,
       ),
     ),
     queryFn: (async () => {
       requiredParamInvariant(sdk, "sdk is required");
       requiredParamInvariant(address, "Address is required");
+
       // if the type is not passed in explicitly then we'll try to resolve it
       if (!type) {
         // why do we call `fetchQuery` here instead of calling the sdk directly?
diff --git a/packages/sdk/src/solana/classes/registry.ts b/packages/sdk/src/solana/classes/registry.ts
@@ -40,6 +40,7 @@ export class Registry {
       const candyMachine = await this.metaplex
         .candyMachinesV2()
         .findByAddress({ address: new PublicKey(address) });
+
       if (candyMachine) {
         return "nft-drop";
       }
diff --git a/packages/storage/src/common/cid.ts b/packages/storage/src/common/cid.ts
@@ -69,6 +69,10 @@ export async function getCID(
 export async function isUploaded(cid: string) {
   const res = await fetch(`${DEFAULT_GATEWAY_URLS["ipfs://"][0]}${cid}`, {
     method: "HEAD",
+    headers: {
+      // tell the gateway to skip fetching from origin in order to fail fast on 404s and just re-upload in those cases
+      "x-skip-origin": "true",
+    },
   });
   return res.ok;
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@thirdweb-dev/chains": patch
 +---
++
 +update chains
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ export default {`
`27`	`27`	`{`
`28`	`28`	`"name": "Shardeum Scan",`
`29`	`29`	`"url": "https://explorer-liberty10.shardeum.org",`
`30`		`- "standard": "none"`
	`30`	`+ "standard": "EIP3091"`
`31`	`31`	`}`
`32`	`32`	`],`
`33`	`33`	`"redFlags": [`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ export class Registry {`
`40`	`40`	`const candyMachine = await this.metaplex`
`41`	`41`	`.candyMachinesV2()`
`42`	`42`	`.findByAddress({ address: new PublicKey(address) });`
	`43`	`+`
`43`	`44`	`if (candyMachine) {`
`44`	`45`	`return "nft-drop";`
`45`	`46`	`}`