Merge branch 'master' into hcote-add-etherlink

magiclabs · Apr 4, 2024 · c263453 · c263453
2 parents 4c172d5 + 657709f
commit c263453
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# v4.12.0 (Mon Mar 11 2024)
+
+#### 🚀 Enhancement
+
+- Adds zkSync support
+
+#### Authors: 2
+
+- James ([@jamesrp13](https://github.com/jamesrp13))
+- pbillingsby ([@PBillingsby](https://github.com/PBillingsby))
+
 # v4.4.2 (Wed Sep 27 2023)
 
 #### 🚀 Enhancement

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "make-magic",
-  "version": "4.4.2",
+  "version": "4.12.0",
   "description": "A tool for quickly scaffolding an app with Magic authentication baked-in!",
   "repository": "magiclabs/create-magic-app",
   "license": "MIT",

diff --git a/scaffolds/nextjs-dedicated-wallet/template/src/utils/network.ts b/scaffolds/nextjs-dedicated-wallet/template/src/utils/network.ts
@@ -4,6 +4,8 @@ export enum Network {
   ETHEREUM_SEPOLIA = 'ethereum-sepolia',
   ETHEREUM = 'ethereum',
   ETHERLINK_TESTNET = 'etherlink-testnet',
+  ZKSYNC = 'zksync',
+  ZKSYNC_SEPOLIA = 'zksync-sepolia',
 }
 
 export const getNetworkUrl = () => {
@@ -18,6 +20,10 @@ export const getNetworkUrl = () => {
       return 'https://eth-mainnet.g.alchemy.com/v2/fYFybLQFR9Zr2GCRcgALmAktStFKr0i0';
     case Network.ETHERLINK_TESTNET:
       return 'https://node.ghostnet.etherlink.com';
+    case Network.ZKSYNC:
+      return 'https://mainnet.era.zksync.io';
+    case Network.ZKSYNC_SEPOLIA:
+      return 'https://sepolia.era.zksync.dev';
     default:
       throw new Error('Network not supported');
   }
@@ -31,6 +37,10 @@ export const getChainId = () => {
       return 80002;
     case Network.ETHEREUM_SEPOLIA:
       return 11155111;
+    case Network.ZKSYNC:
+      return 324;
+    case Network.ZKSYNC_SEPOLIA:
+      return 300;
     case Network.ETHEREUM:
       return 1;
     case Network.ETHERLINK_TESTNET:
@@ -45,6 +55,8 @@ export const getNetworkToken = () => {
       return 'MATIC';
     case Network.ETHEREUM:
     case Network.ETHEREUM_SEPOLIA:
+    case Network.ZKSYNC:
+    case Network.ZKSYNC_SEPOLIA:
       return 'ETH';
     case Network.ETHERLINK_TESTNET:
       return 'XTZ';
@@ -59,6 +71,8 @@ export const getFaucetUrl = () => {
       return 'https://sepoliafaucet.com/';
     case Network.ETHERLINK_TESTNET:
       return 'https://faucet.etherlink.com/';
+    case Network.ZKSYNC_SEPOLIA:
+      return 'https://faucet.quicknode.com/ethereum/sepolia';
   }
 };
 
@@ -74,6 +88,10 @@ export const getNetworkName = () => {
       return 'Ethereum (Mainnet)';
     case Network.ETHERLINK_TESTNET:
       return 'Etherlink (Testnet)';
+    case Network.ZKSYNC:
+      return 'zkSync (Mainnet)';
+    case Network.ZKSYNC_SEPOLIA:
+      return 'zkSync (Sepolia)';
   }
 };
 
@@ -89,5 +107,9 @@ export const getBlockExplorer = (address: string) => {
       return `https://sepolia.etherscan.io/address/${address}`;
     case Network.ETHERLINK_TESTNET:
       return `https://testnet-explorer.etherlink.com//address/${address}`;
+    case Network.ZKSYNC:
+      return `https://explorer.zksync.io/address/${address}`;
+    case Network.ZKSYNC_SEPOLIA:
+      return `https://sepolia.explorer.zksync.io/address/${address}`;
   }
 };
diff --git a/scaffolds/nextjs-universal-wallet/template/src/utils/networks.ts b/scaffolds/nextjs-universal-wallet/template/src/utils/networks.ts
@@ -4,6 +4,8 @@ export enum Network {
   ETHEREUM_SEPOLIA = 'ethereum-sepolia',
   ETHEREUM = 'ethereum',
   ETHERLINK_TESTNET = 'etherlink-testnet',
+  ZKSYNC = 'zksync',
+  ZKSYNC_SEPOLIA = 'zksync-sepolia',
 }
 
 export const getNetworkUrl = () => {
@@ -18,7 +20,10 @@ export const getNetworkUrl = () => {
       return 'https://eth-mainnet.g.alchemy.com/v2/3jKhhva6zBqwp_dnwPlF4d0rFZhu2pjD';
     case Network.ETHERLINK_TESTNET:
       return 'https://node.ghostnet.etherlink.com';
-
+    case Network.ZKSYNC:
+      return 'https://mainnet.era.zksync.io';
+    case Network.ZKSYNC_SEPOLIA:
+      return 'https://sepolia.era.zksync.dev';
     default:
       throw new Error('Network not supported');
   }
@@ -32,6 +37,10 @@ export const getChainId = () => {
       return 80002;
     case Network.ETHEREUM_SEPOLIA:
       return 11155111;
+    case Network.ZKSYNC:
+      return 324;
+    case Network.ZKSYNC_SEPOLIA:
+      return 300;
     case Network.ETHEREUM:
       return 1;
     case Network.ETHERLINK_TESTNET:
@@ -46,6 +55,8 @@ export const getNetworkToken = () => {
       return 'MATIC';
     case Network.ETHEREUM:
     case Network.ETHEREUM_SEPOLIA:
+    case Network.ZKSYNC:
+    case Network.ZKSYNC_SEPOLIA:
       return 'ETH';
     case Network.ETHERLINK_TESTNET:
       return 'XTZ';
@@ -60,6 +71,8 @@ export const getFaucetUrl = () => {
       return 'https://sepoliafaucet.com/';
     case Network.ETHERLINK_TESTNET:
       return 'https://faucet.etherlink.com/';
+    case Network.ZKSYNC_SEPOLIA:
+      return 'https://faucet.quicknode.com/ethereum/sepolia';
   }
 };
 
@@ -75,6 +88,10 @@ export const getNetworkName = () => {
       return 'Ethereum (Mainnet)';
     case Network.ETHERLINK_TESTNET:
       return 'Etherlink (Testnet)';
+    case Network.ZKSYNC:
+      return 'zkSync (Mainnet)';
+    case Network.ZKSYNC_SEPOLIA:
+      return 'zkSync (Sepolia)';
   }
 };
 
@@ -90,5 +107,9 @@ export const getBlockExplorer = (address: string) => {
       return `https://sepolia.etherscan.io/address/${address}`;
     case Network.ETHERLINK_TESTNET:
       return `https://testnet-explorer.etherlink.com//address/${address}`;
+    case Network.ZKSYNC:
+      return `https://explorer.zksync.io/address/${address}`;
+    case Network.ZKSYNC_SEPOLIA:
+      return `https://sepolia.explorer.zksync.io/address/${address}`;
   }
 };
diff --git a/scaffolds/prompts.ts b/scaffolds/prompts.ts
@@ -176,6 +176,8 @@ export namespace BlockchainNetworkPrompt {
         { name: 'etherlink-testnet', message: 'Etherlink (Testnet)' },
         { name: 'polygon', message: 'Polygon (Mainnet)' },
         { name: 'polygon-amoy', message: 'Polygon (Amoy Testnet)' },
+        { name: 'zksync', message: 'zkSync (Mainnet)' },
+        { name: 'zksync-sepolia', message: 'zkSync (Sepolia Testnet)' },
       ],
     }).run();