chore: update test suite

contracts/deploy/allowListPaymaster.ts

@@ -2,6 +2,7 @@ import { Provider, Wallet } from "zksync-web3";
 import * as ethers from "ethers";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { Deployer } from "@matterlabs/hardhat-zksync-deploy";
+import { HttpNetworkUserConfig } from "hardhat/types";
 
 // load env file
 import dotenv from "dotenv";
@@ -16,7 +17,9 @@ if (!PRIVATE_KEY)
 
 export default async function (hre: HardhatRuntimeEnvironment) {
   console.log(`Running deploy script for the AllowlistPaymaster contract...`);
-  const provider = new Provider("https://sepolia.era.zksync.dev");
+  // Currently targeting the Sepolia zkSync testnet
+  const network = hre.userConfig.networks?.zkSyncTestnet;
+  const provider = new Provider((network as HttpNetworkUserConfig).url);
 
   // The wallet that will deploy the token and the paymaster
   // It is assumed that this wallet already has sufficient funds on zkSync

contracts/deploy/erc20.ts

@@ -1,5 +1,4 @@
 import * as ethers from "ethers";
-
 import { Deployer } from "@matterlabs/hardhat-zksync-deploy";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { Wallet } from "zksync-web3";

contracts/deploy/erc20fixedPaymaster.ts

@@ -1,9 +1,11 @@
 import * as ethers from "ethers";
-
 import { Provider, Wallet } from "zksync-web3";
-
 import { Deployer } from "@matterlabs/hardhat-zksync-deploy";
-import { HardhatRuntimeEnvironment } from "hardhat/types";
+import {
+  HardhatRuntimeEnvironment,
+  HttpNetworkUserConfig,
+} from "hardhat/types";
+
 // load env file
 import dotenv from "dotenv";
 
@@ -22,7 +24,9 @@ if (!TOKEN_ADDRESS)
 
 export default async function (hre: HardhatRuntimeEnvironment) {
   console.log(`Running deploy script for the ERC20fixedPaymaster contract...`);
-  const provider = new Provider("https://sepolia.era.zksync.dev/");
+  // Currently targeting the Sepolia zkSync testnet
+  const network = hre.userConfig.networks?.zkSyncTestnet;
+  const provider = new Provider((network as HttpNetworkUserConfig).url);
   // The wallet that will deploy the token and the paymaster
   // It is assumed that this wallet already has sufficient funds on zkSync
   const wallet = new Wallet(PRIVATE_KEY);

contracts/deploy/erc721.ts

@@ -1,5 +1,4 @@
-import { Provider, Wallet } from "zksync-web3";
-
+import { Wallet } from "zksync-web3";
 import { Deployer } from "@matterlabs/hardhat-zksync-deploy";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 // load env file
@@ -20,7 +19,6 @@ if (!RECIPIENT_ADDRESS)
 
 export default async function (hre: HardhatRuntimeEnvironment) {
   console.log(`Running deploy script for the MyNFT contract...`);
-  const provider = new Provider("https://sepolia.era.zksync.dev/");
 
   // The wallet that will deploy the token and the paymaster
   // It is assumed that this wallet already has sufficient funds on zkSync

contracts/deploy/erc721gatedPaymaster.ts

@@ -1,9 +1,10 @@
 import * as ethers from "ethers";
-
 import { Provider, Wallet } from "zksync-web3";
-
 import { Deployer } from "@matterlabs/hardhat-zksync-deploy";
-import { HardhatRuntimeEnvironment } from "hardhat/types";
+import {
+  HardhatRuntimeEnvironment,
+  HttpNetworkUserConfig,
+} from "hardhat/types";
 // load env file
 import dotenv from "dotenv";
 
@@ -22,7 +23,9 @@ if (!NFT_COLLECTION_ADDRESS)
 
 export default async function (hre: HardhatRuntimeEnvironment) {
   console.log(`Running deploy script for the ERC721gatedPaymaster contract...`);
-  const provider = new Provider("https://sepolia.era.zksync.dev/");
+  // Currently targeting the Sepolia zkSync testnet
+  const network = hre.userConfig.networks?.zkSyncTestnet;
+  const provider = new Provider((network as HttpNetworkUserConfig).url);
 
   // The wallet that will deploy the token and the paymaster
   // It is assumed that this wallet already has sufficient funds on zkSync

contracts/deploy/gaslessPaymaster.ts

@@ -1,9 +1,10 @@
 import * as ethers from "ethers";
-
 import { Provider, Wallet } from "zksync-web3";
-
 import { Deployer } from "@matterlabs/hardhat-zksync-deploy";
-import { HardhatRuntimeEnvironment } from "hardhat/types";
+import {
+  HardhatRuntimeEnvironment,
+  HttpNetworkUserConfig,
+} from "hardhat/types";
 // load env file
 import dotenv from "dotenv";
 
@@ -17,8 +18,9 @@ if (!PRIVATE_KEY)
 
 export default async function (hre: HardhatRuntimeEnvironment) {
   console.log(`Running deploy script for the GaslessPaymaster contract...`);
-  const provider = new Provider("https://sepolia.era.zksync.dev/");
-
+  // Currently targeting the Sepolia zkSync testnet
+  const network = hre.userConfig.networks?.zkSyncTestnet;
+  const provider = new Provider((network as HttpNetworkUserConfig).url);
   // The wallet that will deploy the token and the paymaster
   // It is assumed that this wallet already has sufficient funds on zkSync
   const wallet = new Wallet(PRIVATE_KEY);

contracts/deploy/greeter.ts

@@ -1,4 +1,4 @@
-import { Wallet, utils } from "zksync-web3";
+import { Wallet } from "zksync-web3";
 import * as ethers from "ethers";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { Deployer } from "@matterlabs/hardhat-zksync-deploy";

contracts/deploy/timeBasedPaymaster.ts

@@ -1,9 +1,10 @@
 import * as ethers from "ethers";
-
 import { Provider, Wallet } from "zksync-web3";
-
 import { Deployer } from "@matterlabs/hardhat-zksync-deploy";
-import { HardhatRuntimeEnvironment } from "hardhat/types";
+import {
+  HardhatRuntimeEnvironment,
+  HttpNetworkUserConfig,
+} from "hardhat/types";
 // load env file
 import dotenv from "dotenv";
 
@@ -17,7 +18,9 @@ if (!PRIVATE_KEY)
 
 export default async function (hre: HardhatRuntimeEnvironment) {
   console.log(`Running deploy script for the TimeBasedPaymaster contract...`);
-  const provider = new Provider("https://sepolia.era.zksync.dev/");
+  // Currently targeting the Sepolia zkSync testnet
+  const network = hre.userConfig.networks?.zkSyncTestnet;
+  const provider = new Provider((network as HttpNetworkUserConfig).url);
 
   const wallet = new Wallet(PRIVATE_KEY);
   const deployer = new Deployer(hre, wallet);

contracts/hardhat.config.ts

@@ -5,37 +5,6 @@ import "@nomiclabs/hardhat-etherscan";
 
 import { HardhatUserConfig } from "hardhat/config";
 
-const getNetworkConfig = () => {
-  const env = process.env.DEPLOY_ENV || "local";
-  switch (env) {
-    case "local":
-      return {
-        url: "http://localhost:3050",
-        ethNetwork: "http://localhost:8545",
-        zksync: true,
-      };
-    case "ci":
-      return {
-        url: "http://127.0.0.1:8011",
-        ethNetwork: "sepolia",
-        zksync: true,
-      };
-    case "testnet":
-      return {
-        url: "https://sepolia.era.zksync.dev",
-        ethNetwork: "sepolia",
-        zksync: true,
-        // Verification endpoint for Sepolia
-        verifyURL:
-          "https://explorer.sepolia.era.zksync.dev/contract_verification",
-      };
-    default:
-      throw new Error(`Unsupported DEPLOY_ENV: ${env}`);
-  }
-};
-
-const networkConfig = getNetworkConfig();
-
 const config: HardhatUserConfig = {
   zksolc: {
     version: "latest",
@@ -46,7 +15,24 @@ const config: HardhatUserConfig = {
     hardhat: {
       zksync: false,
     },
-    zkSyncTestnet: networkConfig,
+    zkSyncInMemory: {
+      url: "http://127.0.0.1:8011",
+      ethNetwork: "sepolia",
+      zksync: true,
+    },
+    zkSyncLocal: {
+      url: "http://localhost:3050",
+      ethNetwork: "http://localhost:8545",
+      zksync: true,
+    },
+    zkSyncTestnet: {
+      url: "https://sepolia.era.zksync.dev",
+      ethNetwork: "sepolia",
+      zksync: true,
+      // Verification endpoint for Sepolia
+      verifyURL:
+        "https://explorer.sepolia.era.zksync.dev/contract_verification",
+    },
   },
   solidity: {
     version: "0.8.17",

contracts/package.json

@@ -25,8 +25,8 @@
     "zksync-web3": "^0.14.3"
   },
   "scripts": {
-    "test": "NODE_ENV=local hardhat test --network zkSyncTestnet",
-    "ci:tests": "DEPLOY_ENV=ci hardhat test --network zkSyncTestnet --show-stack-traces",
+    "test": "hardhat test --network zkSyncInMemory",
+    "ci:tests": "hardhat test --network zkSyncInMemory --show-stack-traces",
     "deploy": "hardhat deploy-zksync",
     "greeter": "hardhat deploy-zksync --script greeter.ts",
     "gasless": "hardhat deploy-zksync --script gaslessPaymaster.ts",

contracts/test/allowlist.test.ts

@@ -26,7 +26,7 @@ describe("AllowlistPaymaster", function () {
   let greeter: Contract;
 
   before(async function () {
-    const deployUrl = hardhatConfig.networks.zkSyncTestnet.url;
+    const deployUrl = hardhatConfig.networks.zkSyncInMemory.url;
     // setup deployer
     [provider, wallet, deployer] = setupDeployer(deployUrl, PRIVATE_KEY);
     // setup new wallet

contracts/test/erc20fixed.test.ts

@@ -26,7 +26,7 @@ describe("ERC20fixedPaymaster", function () {
   let token: Contract;
 
   before(async function () {
-    const deployUrl = hardhatConfig.networks.zkSyncTestnet.url;
+    const deployUrl = hardhatConfig.networks.zkSyncInMemory.url;
     // setup deployer
     [provider, wallet, deployer] = setupDeployer(deployUrl, PRIVATE_KEY);
     // setup new wallet

contracts/test/erc721gated.test.ts

@@ -27,7 +27,7 @@ describe("ERC721gatedPaymaster", function () {
   let erc721: Contract;
 
   before(async function () {
-    const deployUrl = hardhatConfig.networks.zkSyncTestnet.url;
+    const deployUrl = hardhatConfig.networks.zkSyncInMemory.url;
     // setup deployer
     [provider, wallet, deployer] = setupDeployer(deployUrl, PRIVATE_KEY);
     // setup new wallet

contracts/test/gasless.test.ts

@@ -26,7 +26,7 @@ describe("GaslessPaymaster", function () {
   let greeter: Contract;
 
   before(async function () {
-    const deployUrl = hardhatConfig.networks.zkSyncTestnet.url;
+    const deployUrl = hardhatConfig.networks.zkSyncInMemory.url;
     // setup deployer
     [provider, wallet, deployer] = setupDeployer(deployUrl, PRIVATE_KEY);
     // setup new wallet

contracts/test/timeBased.test.ts

@@ -22,7 +22,7 @@ describe("TimeBasedPaymaster", function () {
   let greeter: Contract;
 
   before(async function () {
-    const deployUrl = hardhatConfig.networks.zkSyncTestnet.url;
+    const deployUrl = hardhatConfig.networks.zkSyncInMemory.url;
     [provider, wallet, deployer] = setupDeployer(deployUrl, PRIVATE_KEY);
     userWallet = Wallet.createRandom();
     console.log(`User wallet's address: ${userWallet.address}`);
@@ -55,6 +55,21 @@ describe("TimeBasedPaymaster", function () {
     await setGreetingTx.wait();
   }
 
+  it("should fail due to Paymaster validation error outside the time window", async function () {
+    // Arrange
+    let errorOccurred = false;
+
+    // Act
+    try {
+      await executeGreetingTransaction(wallet);
+    } catch (error) {
+      errorOccurred = true;
+      expect(error.message).to.include("Paymaster validation error");
+    }
+    // Assert
+    expect(errorOccurred).to.be.true;
+  });
+
   it("should cost the user no gas during the time window", async function () {
     // Arrange
     const currentDate = new Date();
@@ -75,20 +90,4 @@ describe("TimeBasedPaymaster", function () {
     expect(newBalance.toString()).to.equal(initialBalance.toString());
     expect(await greeter.greet()).to.equal("Hola, mundo!");
   });
-
-  it("should fail due to Paymaster validation error outside the time window", async function () {
-    // Arrange
-    let errorOccurred = false;
-
-    // Act
-    try {
-      await executeGreetingTransaction(wallet);
-    } catch (error) {
-      errorOccurred = true;
-      expect(error.message).to.include("Paymaster validation error");
-    }
-
-    // Assert
-    expect(errorOccurred).to.be.true;
-  });
 });