fix: add chains on wagmi (sismo-core#204)

OPuserWasTaken · Jul 11, 2023 · 23f16d2 · 23f16d2
1 parent 8ceb987
commit 23f16d2
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 23 deletions.
diff --git a/src/app/api/zk-badge/image/[tokenId]/route.test.ts b/src/app/api/zk-badge/image/[tokenId]/route.test.ts
@@ -45,7 +45,7 @@ describe('GET /api/zk-badge/image/[tokenId]', () => {
 
     const params = { tokenId: "40000001" };
     const dummyImageBuffer = Buffer.from([0, 1, 2, 3, 4, 5]); 
-    const imagePath = path.join(process.cwd(), '/space-config/space/images/image.png'); 
+    const imagePath = path.join(process.cwd(), '/space-configs/images/image.png'); 
 
     (fs.readFileSync as jest.Mock).mockImplementation((path) => {
         if (path === imagePath) {

diff --git a/src/app/api/zk-badge/image/[tokenId]/route.ts b/src/app/api/zk-badge/image/[tokenId]/route.ts
@@ -18,7 +18,7 @@ export async function GET(req: Request, { params }: { params: { tokenId: string
 
     let readableStream;
     try {
-        const imagePath = path.join(process.cwd(), `/space-config/${badge.space.slug}/images/${badge.badgeMetadata.image}`);
+        const imagePath = path.join(process.cwd(), `/space-configs/images/${badge.badgeMetadata.image}`);
         const file = fs.readFileSync(imagePath);
         readableStream = new ReadableStream({
             start(controller) {

diff --git a/src/components/AppMain/Apps/ZkDropApp/components/Congratulations.tsx b/src/components/AppMain/Apps/ZkDropApp/components/Congratulations.tsx
@@ -1,8 +1,7 @@
 "use client";
 
 import useEthAccount from "@/src/hooks/useEthAccount";
-import { Network, getErc1155Explorer, getErc721Explorer } from "@/src/libs/contracts/networks";
-import { ZK_BADGE_ADDRESSES } from "@/src/libs/contracts/zk-badge";
+import { Network, getErc721Explorer } from "@/src/libs/contracts/networks";
 import { ZkDropAppType } from "@/src/services/spaces-service";
 import Button3D from "@/src/ui/Button3D";
 import { getMinimalEns, getMinimalIdentifier } from "@/src/utils/useMainMinified";

diff --git a/src/components/AppMain/Apps/ZkDropApp/index.tsx b/src/components/AppMain/Apps/ZkDropApp/index.tsx
@@ -215,7 +215,7 @@ export default function ZkDropApp({ app, groupSnapshotMetadataList }: Props): JS
       functionName: "claimWithSismoConnect",
       args: [responseBytes, destination],
       chainId: networkChainIds[chainApp],
-      enabled: Boolean(responseBytes) && Boolean(destination),
+      enabled: Boolean(responseBytes) && Boolean(destination) ,
   })
 
   const { data, write, isLoading: isLoadingWriteContract } = useContractWrite(config);  
@@ -233,7 +233,7 @@ export default function ZkDropApp({ app, groupSnapshotMetadataList }: Props): JS
       setMinting(false);
     },
     onError: () => {
-      setError("Error while minting your ZK Badge");
+      setError("Error while minting your ZK Drop");
     }
   })
 
@@ -323,7 +323,7 @@ export default function ZkDropApp({ app, groupSnapshotMetadataList }: Props): JS
                 });
                 window.open(explorer, "_blank");
               }}>
-                Badge Already minted <ArrowSquareOut style={{ marginTop: -8, marginLeft: 4 }} size={18}/>
+                Drop Already minted <ArrowSquareOut style={{ marginTop: -8, marginLeft: 4 }} size={18}/>
               </AlreadyRegistered>
               :
               <MintContainer>
@@ -334,7 +334,7 @@ export default function ZkDropApp({ app, groupSnapshotMetadataList }: Props): JS
                       secondary
                       loading={minting}
                     >
-                      {minting ? "Minting..." : "Mint Badge"}
+                      {minting ? "Minting..." : "Mint Drop"}
                     </Button3D>
                     :
                     <Button3D
@@ -352,7 +352,7 @@ export default function ZkDropApp({ app, groupSnapshotMetadataList }: Props): JS
                               </>
                               :
                               <>
-                                {isLoadingTransaction || isLoadingWriteContract ? "Minting..." : "Mint Badge"}
+                                {isLoadingTransaction || isLoadingWriteContract ? "Minting..." : `Mint ${app.nftMetadata.name}`}
                               </>
                           }
                         </>

diff --git a/src/components/AppProviders/index.tsx b/src/components/AppProviders/index.tsx
@@ -2,7 +2,7 @@
 
 import '@rainbow-me/rainbowkit/styles.css';
 import { createConfig, configureChains, mainnet } from 'wagmi'
-import {  gnosis, polygon, polygonMumbai, sepolia } from 'wagmi/chains'
+import {  arbitrum, arbitrumGoerli, gnosis, goerli, optimism, optimismGoerli, polygon, polygonMumbai, scrollTestnet, sepolia } from 'wagmi/chains'
 import { publicProvider } from 'wagmi/providers/public'
 import { WagmiConfig } from "wagmi";
 import { getDefaultWallets, RainbowKitProvider } from "@rainbow-me/rainbowkit";
@@ -13,7 +13,12 @@ const { chains, publicClient } = configureChains(
       polygonMumbai, 
       sepolia,
       polygon,
-      mainnet
+      mainnet,
+      goerli,
+      optimism,
+      optimismGoerli,
+      arbitrumGoerli,
+      arbitrum
     ],
     [
       publicProvider()

diff --git a/src/environments.ts b/src/environments.ts
@@ -25,9 +25,6 @@ type Environment = {
   zkBadgeAddresses: {
     [network in Network]: `0x${string}`
   },
-  zkDropAddresses: {
-    [network in Network]: `0x${string}`
-  },
   pinata: {
     jwtToken?: string
   }
@@ -56,7 +53,6 @@ const env: Environment = {
     zkBadge: process.env.SH_ZK_BADGE_RELAY_DEFENDER_API_KEYS && JSON.parse(process.env.SH_ZK_BADGE_RELAY_DEFENDER_API_KEYS),
   },
   zkBadgeAddresses: process.env.NEXT_PUBLIC_ZK_BADGE_ADDRESSES && JSON.parse(process.env.NEXT_PUBLIC_ZK_BADGE_ADDRESSES),
-  zkDropAddresses: process.env.NEXT_PUBLIC_ZK_DROP_ADDRESSES && JSON.parse(process.env.NEXT_PUBLIC_ZK_DROP_ADDRESSES),
   pinata: {
     jwtToken: process.env.PINATA_JWT_TOKEN
   }

diff --git a/src/libs/contracts/networks.ts b/src/libs/contracts/networks.ts
@@ -77,10 +77,12 @@ export const getErc721Explorer = ({ contractAddress, network, tokenId }: { contr
       case Network.Sepolia:
           return `https://testnets.opensea.io/assets/${network}/${contractAddress}${tokenId ? "/" + tokenId : ""}`;
       case Network.Mainnet:
-      case Network.Polygon:
       case Network.Optimism:
-      case Network.ArbitrumOne:
           return `https://opensea.io/assets/${network}/${contractAddress}${tokenId ? "/" + tokenId : ""}`;
+      case Network.ArbitrumOne:
+          return `https://opensea.io/assets/arbitrum/${contractAddress}${tokenId ? "/" + tokenId : ""}`;
+      case Network.Polygon:
+          return `https://opensea.io/assets/matic/${contractAddress}${tokenId ? "/" + tokenId : ""}`;
       case Network.Gnosis:
           if (tokenId)
             return `https://gnosisscan.io/nft/${contractAddress}/${tokenId}`

diff --git a/src/libs/contracts/zk-drop/constants.ts b/src/libs/contracts/zk-drop/constants.ts
@@ -1,7 +1,3 @@
-import env from "@/src/environments";
-import { Network } from "../networks";
-import zkBadge from "./abi.json";
+import zkDrop from "./abi.json";
 
-export const ZK_DROP_ADDRESSES: { [network in Network]?: `0x${string}` } = env.zkBadgeAddresses;
-
-export const ZK_DROP_ABI = zkBadge.abi;
+export const ZK_DROP_ABI = zkDrop.abi;