add zero address checking

contracts/cross-chain/CrossChainProofValidator.sol

@@ -13,6 +13,8 @@ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 contract CrossChainProofValidator is Ownable, EIP712, ICrossChainProofValidator {
     using ECDSA for bytes32;
 
+    error OracleSigningAddressShouldNotBeZero();
+
     bytes32 public constant TYPE_HASH =
         keccak256(
             "EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)"
@@ -35,11 +37,18 @@ contract CrossChainProofValidator is Ownable, EIP712, ICrossChainProofValidator
 
     address private _oracleSigningAddress;
 
+    function _checkOracleSigningAddress(address oracleSigningAddress) internal pure {
+        if (oracleSigningAddress == address(0)) {
+            revert OracleSigningAddressShouldNotBeZero();
+        }
+    }
+
     constructor(
         string memory domainName,
         string memory signatureVersion,
         address oracleSigningAddress
     ) EIP712(domainName, signatureVersion) Ownable(msg.sender) {
+        _checkOracleSigningAddress(oracleSigningAddress);
         bytes32 hashedName = keccak256(bytes(domainName));
         bytes32 hashedVersion = keccak256(bytes(signatureVersion));
         uint256 chainId = 0;
@@ -63,6 +72,7 @@ contract CrossChainProofValidator is Ownable, EIP712, ICrossChainProofValidator
      * @param oracleSigningAddress The new oracle signing address
      **/
     function setOracleSigningAddress(address oracleSigningAddress) public onlyOwner {
+        _checkOracleSigningAddress(oracleSigningAddress);
         _oracleSigningAddress = oracleSigningAddress;
     }
 

contracts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@iden3/contracts",
   "description": "Smart Contract library for Solidity",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "files": [
     "**/*.sol",
     "/build/contracts/*.json",

test/cross-chain/cross-chain-proof-validator.test.ts

@@ -1,3 +1,4 @@
+import { Logger } from "../../helpers/helperUtils";
 import {
   GlobalStateMessage,
   IdentityStateMessage,
@@ -6,7 +7,7 @@ import {
 } from "../utils/packData";
 import { expect } from "chai";
 import { DeployHelper } from "../../helpers/DeployHelper";
-import { Contract } from "ethers";
+import { Contract, ZeroAddress } from "ethers";
 import { ethers } from "hardhat";
 import { loadFixture } from "@nomicfoundation/hardhat-toolbox/network-helpers";
 
@@ -180,3 +181,50 @@ describe("State Cross Chain", function () {
     );
   });
 });
+
+describe("Oracle Signing Address Validation", function () {
+  let CrossChainProofValidatorFactory;
+  let crossChainProofValidator;
+  let otherAccount;
+  const oracleSigningAddress = "0x1234567890123456789012345678901234567890";
+  const contractName = "CrossChainProofValidator";
+
+  before(async function () {
+    [otherAccount] = await ethers.getSigners();
+    CrossChainProofValidatorFactory = await ethers.getContractFactory(contractName);
+  });
+
+  it("should revert when deploying with zero oracle signing address", async function () {
+    await expect(
+      CrossChainProofValidatorFactory.deploy("StateInfo", "1", ZeroAddress),
+    ).to.be.revertedWithCustomError(
+      CrossChainProofValidatorFactory,
+      "OracleSigningAddressShouldNotBeZero",
+    );
+  });
+
+  it("should deploy with correct parameters", async function () {
+    crossChainProofValidator = await CrossChainProofValidatorFactory.deploy(
+      "StateInfo",
+      "1",
+      oracleSigningAddress,
+    );
+    await crossChainProofValidator.waitForDeployment();
+    Logger.success(`${contractName} deployed to: ${await crossChainProofValidator.getAddress()}`);
+    expect(await crossChainProofValidator.getOracleSigningAddress()).to.equal(oracleSigningAddress);
+  });
+
+  it("should set a new oracle signing address", async function () {
+    await crossChainProofValidator.setOracleSigningAddress(otherAccount.address);
+    expect(await crossChainProofValidator.getOracleSigningAddress()).to.equal(otherAccount.address);
+  });
+
+  it("should revert when setting oracle signing address to zero", async function () {
+    await expect(
+      crossChainProofValidator.setOracleSigningAddress(ZeroAddress),
+    ).to.be.revertedWithCustomError(
+      crossChainProofValidator,
+      "OracleSigningAddressShouldNotBeZero",
+    );
+  });
+});