More deploy targets

hardhat.config.ts

@@ -26,6 +26,31 @@ const config: HardhatUserConfig = {
       accounts:
         process.env.DEPLOY_KEY !== undefined ? [process.env.DEPLOY_KEY] : [],
     },
+    goerli: {
+      url: "https://goerli.blockpi.network/v1/rpc/public",
+      accounts:
+        process.env.DEPLOY_KEY !== undefined ? [process.env.DEPLOY_KEY] : [],
+    },
+    sepolia: {
+      url: "https://eth-sepolia.public.blastapi.io",
+      accounts:
+        process.env.DEPLOY_KEY !== undefined ? [process.env.DEPLOY_KEY] : [],
+    },
+    mantle: {
+      url: "https://rpc.testnet.mantle.xyz",
+      accounts:
+        process.env.DEPLOY_KEY !== undefined ? [process.env.DEPLOY_KEY] : [],
+    },
+    optimism: {
+      url: "https://optimism-goerli.public.blastapi.io",
+      accounts:
+        process.env.DEPLOY_KEY !== undefined ? [process.env.DEPLOY_KEY] : [],
+    },
+    filecoin: {
+      url: "https://api.calibration.node.glif.io/rpc/v1",
+      accounts:
+        process.env.DEPLOY_KEY !== undefined ? [process.env.DEPLOY_KEY] : [],
+    },
     // Used for testing
     hardhat: {
       chainId:

scripts/deploy.ts

@@ -10,7 +10,9 @@ const deployFunc = async function (): Promise<void> {
     hardhatFundedAccount.address,
   );
   console.log(
-    `Deployer (${hardhatFundedAccount.address}) starting balance ${startingBalance}`,
+    `Deployer (${
+      hardhatFundedAccount.address
+    }) starting balance ${ethers.formatEther(startingBalance)} ETH`,
   );
   console.log("Starting deployment...");
 
@@ -20,38 +22,42 @@ const deployFunc = async function (): Promise<void> {
 
   const entryPointDeployer = await ethers.getContractFactory("EntryPoint");
   const entrypoint = await entryPointDeployer.deploy();
-  await entrypoint.waitForDeployment();
 
   const walletDeployer = await ethers.getContractFactory("SCBridgeWallet");
-  console.log("EntryPoint deployed to:", await entrypoint.getAddress());
+  console.log("EntryPoint deploying to:", await entrypoint.getAddress());
 
   const aliceWallet = await walletDeployer.deploy(
     aliceAddress,
     ireneAddress,
     await entrypoint.getAddress(),
   );
-  await aliceWallet.waitForDeployment();
   console.log(
     `Alice (${aliceAddress?.slice(
       0,
       12,
-    )}) SCBridgeWallet deployed to: ${await aliceWallet.getAddress()}`,
+    )}) SCBridgeWallet deploying to: ${await aliceWallet.getAddress()}`,
   );
 
   const bobWallet = await walletDeployer.deploy(
     bobAddress,
     ireneAddress,
     await entrypoint.getAddress(),
   );
-  await bobWallet.waitForDeployment();
 
   console.log(
     `Bob (${bobAddress?.slice(
       0,
       12,
-    )}) SCBridgeWallet deployed to: ${await bobWallet.getAddress()}`,
+    )}) SCBridgeWallet deploying to: ${await bobWallet.getAddress()}`,
   );
 
+  await Promise.all([
+    bobWallet.waitForDeployment(),
+    aliceWallet.waitForDeployment(),
+    entrypoint.waitForDeployment(),
+  ]);
+
+  console.log("All contracts deployed");
   const initialFunding = BigInt(process.env.VITE_SCW_DEPOSIT ?? "");
   await fund(
     [

src/ChainLogo.tsx

@@ -1,6 +1,9 @@
 import React from "react";
 import ScrollLogo from "./assets/scroll-logo.svg";
 import PolygonLogo from "./assets/polygon-logo.svg";
+import MantleLogo from "./assets/mantle-logo.svg";
+import FilecoinLogo from "./assets/filecoin-logo.svg";
+
 import { type ChainName } from "./chains";
 
 export const ChainLogo: React.FunctionComponent<{
@@ -14,5 +17,9 @@ export const ChainLogo: React.FunctionComponent<{
       return <img src={PolygonLogo} height={40} />;
     case "scroll":
       return <img src={ScrollLogo} height={40} />;
+    case "filecoin":
+      return <img src={FilecoinLogo} height={40} />;
+    case "mantle":
+      return <img src={MantleLogo} height={40} />;
   }
 };

src/chains.ts

@@ -2,7 +2,12 @@ export type ChainName =
   | "Hardhat A"
   | "Hardhat B"
   | "Polygon zkEVM Testnet"
-  | "scroll";
+  | "scroll"
+  | "goerli"
+  | "sepolia"
+  | "mantle"
+  | "optimism"
+  | "filecoin";
 
 export interface ChainData {
   /**
@@ -67,4 +72,44 @@ export const chains: ChainData[] = [
     explorer: "https://sepolia.scrollscan.com/address/",
     exchangeRate: 1,
   },
+  {
+    chainID: 5n,
+    symbol: "ETH",
+    name: "goerli",
+    explorer: "https://goerli.etherscan.io",
+    exchangeRate: 1,
+    url: "https://goerli.blockpi.network/v1/rpc/public",
+  },
+  {
+    chainID: 11155111n,
+    symbol: "ETH",
+    name: "sepolia",
+    explorer: "https://sepolia.etherscan.io",
+    exchangeRate: 1,
+    url: "https://eth-sepolia.public.blastapi.io",
+  },
+  {
+    chainID: 5001n,
+    symbol: "MNT",
+    name: "mantle",
+    explorer: "https://explorer.testnet.mantle.xyz",
+    exchangeRate: 1,
+    url: "https://rpc.testnet.mantle.xyz",
+  },
+  {
+    chainID: 420n,
+    symbol: "ETH",
+    name: "optimism",
+    url: "https://optimism-goerli.public.blastapi.io",
+    explorer: "https://goerli-optimism.etherscan.io",
+    exchangeRate: 1,
+  },
+  {
+    chainID: 314159n,
+    symbol: "TFIL",
+    name: "filecoin",
+    url: "https://filecoin-calibration.chainup.net/rpc/v1",
+    explorer: "https://calibration.filfox.info/en",
+    exchangeRate: 1,
+  },
 ];