force ipfs on mainnets

Kredeum · May 6, 2024 · e9cd36c · e9cd36c
1 parent 3e5b1b9
commit e9cd36c
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 17 deletions.
diff --git a/common/src/nft/nft-uri.ts b/common/src/nft/nft-uri.ts
@@ -7,7 +7,7 @@ import { ipfsConfigValid, ipfsPin, ipfsTokenUri } from "../storage/ipfs";
 ///////////////////////////////////////////////////////////////////////////////////
 // GET  image uri
 const nftPin = async (chainId: number, media: string): Promise<string> => {
-  if (ipfsConfigValid()) return ipfsPin(media);
+  if (ipfsConfigValid(chainId)) return ipfsPin(media);
   if (swarmConfigValid(chainId)) return swarmPin(media);
   return "";
 };
@@ -26,7 +26,7 @@ const nftTokenUri = async (
   pdfUri = ""
 ): Promise<string> => {
   let nftTokenUriFunc;
-  if (ipfsConfigValid()) nftTokenUriFunc = ipfsTokenUri;
+  if (ipfsConfigValid(chainId)) nftTokenUriFunc = ipfsTokenUri;
   if (swarmConfigValid(chainId)) nftTokenUriFunc = swarmTokenUri;
 
   return nftTokenUriFunc

diff --git a/common/src/storage/ipfs.ts b/common/src/storage/ipfs.ts
@@ -84,7 +84,7 @@ const ipfsGatewayLink = (ipfs: string): string => urlToLink(ipfsGatewayUrl(ipfs)
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // TEST if ipfs config or params are valid
-const ipfsConfigValid = (): boolean => storageDefault() == "ipfs" && ipfsParamsValid();
+const ipfsConfigValid = (chainId: number): boolean => storageDefault(chainId) == "ipfs" && ipfsParamsValid();
 const ipfsParamsValid = (): boolean => storageParamsValid(storageParamsGet("ipfs"));
 
 // GET ipfs gateway

diff --git a/common/src/storage/storage.ts b/common/src/storage/storage.ts
@@ -7,6 +7,7 @@ import { ipfsGateway, ipfsGatewayUrl, ipfsLinkToUrlHttp, ipfsGetLink } from "./i
 import { swarmGateway, swarmGatewayUrl, swarmLinkToUrlHttp, swarmGetLink } from "./swarm";
 import config from "@kredeum/config/dist/config.json";
 import { localConfigNamespace, localStorageGet, localStorageSet } from "../common/local";
+import { networks } from "../common/networks";
 
 // IN MEMORY Storage Config
 let _storageConfig: StorageConfigType;
@@ -43,7 +44,8 @@ const storageConfigGet = (): StorageConfigType => {
 };
 
 // GET storage default
-const storageDefault = (): string => storageConfigGet().default;
+// only IPFS on Mainnets
+const storageDefault = (chainId: number): string => (networks.isMainnet(chainId) ? "ipfs" : storageConfigGet().default);
 
 // GET storage params
 const storageParamsGet = (type: StorageType): StorageParamsType | undefined => {

diff --git a/common/src/storage/swarm.ts b/common/src/storage/swarm.ts
@@ -65,7 +65,7 @@ const swarmGateway = (): string => storageParamsGet("swarm")?.gateway.replace(/\
 const SWARM_ZERO_APIKEY = "0000000000000000000000000000000000000000000000000000000000000000";
 
 // TEST if swarm config or params are valid
-const swarmConfigValid = (chainId: number): boolean => storageDefault() == "swarm" && swarmParamsValid(chainId);
+const swarmConfigValid = (chainId: number): boolean => storageDefault(chainId) == "swarm" && swarmParamsValid(chainId);
 const swarmParamsValid = (chainId: number): boolean => {
   const swarmParams = storageParamsGet("swarm");
 

diff --git a/svelte/src/components/Global/Navigation.svelte b/svelte/src/components/Global/Navigation.svelte
@@ -38,6 +38,17 @@
 
   <nav>
     <ul>
+      {#if !onProd}
+        <li class="active">
+          <p>
+            <a href={config.base}>
+              <i class="fas fa-columns" /><br />
+              stable<br />
+              version
+            </a>
+          </p>
+        </li>
+      {/if}
       {#if back}
         <li class="active">
           <a href={back}>
@@ -55,23 +66,16 @@
             </a>
           </p>
         </li>
+
         <!-- experimental   -->
         {#if !onProd}
           <!-- only on testnets -->
-          <!-- {#if !onMainNet}
+          {#if !onMainNet}
             <li class="active">
               <ConfigModal />
             </li>
-          {/if} -->
-          <li class="active">
-            <p>
-              <a href={config.base}>
-                <i class="fas fa-columns" /><br />
-                stable<br />
-                version
-              </a>
-            </p>
-          </li>
+          {/if}
+
           <li class="active">
             <a href="/stats">
               <i class="fas fa-database"></i><br />

diff --git a/svelte/src/helpers/configHelper.ts b/svelte/src/helpers/configHelper.ts
@@ -20,7 +20,7 @@ const configTexts: ConfigTexts = {
   storage: {
     description: "Select your Decentralized Storage",
     ipfs: "Use IPFS Storage to Mint your NFTs",
-    swarm: "Use Swarm Storage to Mint your NFTs"
+    swarm: "Use Swarm Storage to Mint your NFTs (experimental, only on testnets)"
   }
 };