fix: address validation (#28)

contracts/nft/tasks/connectedSetUniversal.ts

@@ -3,13 +3,18 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { EVMUniversalNFT } from "@/typechain-types";
 
 const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
+  const { isAddress } = hre.ethers.utils;
   const [signer] = await hre.ethers.getSigners();
   if (!signer) {
     throw new Error(
       `Wallet not found. Please, run "npx hardhat account --save" or set PRIVATE_KEY env variable (for example, in a .env file)`
     );
   }
 
+  if (!isAddress(args.contract) || !isAddress(args.universal)) {
+    throw new Error("Invalid Ethereum address provided.");
+  }
+
   const contract: EVMUniversalNFT = await hre.ethers.getContractAt(
     "EVMUniversalNFT",
     args.contract

contracts/nft/tasks/deploy.ts

@@ -2,6 +2,7 @@ import { task, types } from "hardhat/config";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 
 const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
+  const { isAddress } = hre.ethers.utils;
   const network = hre.network.name;
 
   const [signer] = await hre.ethers.getSigners();
@@ -11,6 +12,13 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
     );
   }
 
+  if (
+    !isAddress(args.gateway) ||
+    (args.uniswapRouter && !isAddress(args.uniswapRouter))
+  ) {
+    throw new Error("Invalid Ethereum address provided.");
+  }
+
   const factory: any = await hre.ethers.getContractFactory(args.name);
 
   const contract = await hre.upgrades.deployProxy(factory, [

contracts/nft/tasks/mint.ts

@@ -3,13 +3,19 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
 import isURL from "validator/lib/isURL";
 
 const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
+  const { isAddress } = hre.ethers.utils;
+
   const [signer] = await hre.ethers.getSigners();
   if (signer === undefined) {
     throw new Error(
       `Wallet not found. Please, run "npx hardhat account --save" or set PRIVATE_KEY env variable (for example, in a .env file)`
     );
   }
 
+  if (!isAddress(args.contract)) {
+    throw new Error("Invalid Ethereum address provided.");
+  }
+
   const supportedProtocols = ["https", "ipfs"];
 
   const isValidTokenUri = isURL(args.tokenUri, {

contracts/nft/tasks/transfer.ts

@@ -4,6 +4,13 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
 const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
   const { ethers } = hre;
   const [signer] = await ethers.getSigners();
+
+  const { isAddress } = hre.ethers.utils;
+
+  if (!isAddress(args.to) || !isAddress(args.revertAddress)) {
+    throw new Error("Invalid Ethereum address provided.");
+  }
+
   const nftContract = await ethers.getContractAt("IERC721", args.from);
   const approveTx = await nftContract
     .connect(signer)

contracts/nft/tasks/universalSetConnected.ts

@@ -3,13 +3,22 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { ZetaChainUniversalNFT } from "@/typechain-types";
 
 const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
+  const { isAddress } = hre.ethers.utils;
   const [signer] = await hre.ethers.getSigners();
   if (!signer) {
     throw new Error(
       `Wallet not found. Please, run "npx hardhat account --save" or set PRIVATE_KEY env variable (for example, in a .env file)`
     );
   }
 
+  if (
+    !isAddress(args.contract) ||
+    !isAddress(args.zrc20) ||
+    !isAddress(args.connected)
+  ) {
+    throw new Error("Invalid Ethereum address provided.");
+  }
+
   const contract: ZetaChainUniversalNFT = await hre.ethers.getContractAt(
     "ZetaChainUniversalNFT",
     args.contract

contracts/token/tasks/connectedSetUniversal.ts

@@ -3,13 +3,19 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { EVMUniversalToken } from "../typechain-types";
 
 const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
+  const { isAddress } = hre.ethers.utils;
+
   const [signer] = await hre.ethers.getSigners();
   if (!signer) {
     throw new Error(
       `Wallet not found. Please, run "npx hardhat account --save" or set PRIVATE_KEY env variable (for example, in a .env file)`
     );
   }
 
+  if (!isAddress(args.contract) || !isAddress(args.universal)) {
+    throw new Error("Invalid Ethereum address provided.");
+  }
+
   const contract: EVMUniversalToken = await hre.ethers.getContractAt(
     "EVMUniversalToken",
     args.contract

contracts/token/tasks/deploy.ts

@@ -2,6 +2,8 @@ import { task, types } from "hardhat/config";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 
 const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
+  const { isAddress } = hre.ethers.utils;
+
   const network = hre.network.name;
 
   const [signer] = await hre.ethers.getSigners();
@@ -11,6 +13,13 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
     );
   }
 
+  if (
+    !isAddress(args.gateway) ||
+    (args.uniswapRouter && !isAddress(args.uniswapRouter))
+  ) {
+    throw new Error("Invalid Ethereum address provided.");
+  }
+
   const factory: any = await hre.ethers.getContractFactory(args.name);
 
   const contract = await hre.upgrades.deployProxy(factory, [

contracts/token/tasks/mint.ts

@@ -2,13 +2,19 @@ import { task } from "hardhat/config";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 
 const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
+  const { isAddress } = hre.ethers.utils;
+
   const [signer] = await hre.ethers.getSigners();
   if (signer === undefined) {
     throw new Error(
       `Wallet not found. Please, run "npx hardhat account --save" or set PRIVATE_KEY env variable (for example, in a .env file)`
     );
   }
 
+  if (!isAddress(args.contract)) {
+    throw new Error("Invalid Ethereum address provided.");
+  }
+
   const contract: any = await hre.ethers.getContractAt(
     args.name,
     args.contract

contracts/token/tasks/transfer.ts

@@ -5,6 +5,12 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
   const { ethers } = hre;
   const [signer] = await ethers.getSigners();
 
+  const { isAddress } = hre.ethers.utils;
+
+  if (!isAddress(args.to) || !isAddress(args.revertAddress)) {
+    throw new Error("Invalid Ethereum address provided.");
+  }
+
   const txOptions = {
     gasPrice: args.txOptionsGasPrice,
     gasLimit: args.txOptionsGasLimit,

contracts/token/tasks/universalSetConnected.ts

@@ -3,13 +3,23 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { ZetaChainUniversalToken } from "../typechain-types";
 
 const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
+  const { isAddress } = hre.ethers.utils;
+
   const [signer] = await hre.ethers.getSigners();
   if (!signer) {
     throw new Error(
       `Wallet not found. Please, run "npx hardhat account --save" or set PRIVATE_KEY env variable (for example, in a .env file)`
     );
   }
 
+  if (
+    !isAddress(args.contract) ||
+    !isAddress(args.zrc20) ||
+    !isAddress(args.connected)
+  ) {
+    throw new Error("Invalid Ethereum address provided.");
+  }
+
   const contract: ZetaChainUniversalToken = await hre.ethers.getContractAt(
     "ZetaChainUniversalToken",
     args.contract