From b49a8e0652c7a39942e431416b4d7144acdbfc3d Mon Sep 17 00:00:00 2001
From: livingrockrises <90545960+livingrockrises@users.noreply.github.com>
Date: Mon, 5 Feb 2024 02:26:13 +0400
Subject: [PATCH] update isContract checks

---
 contracts/common/Errors.sol                    | 5 +++++
 contracts/sponsorship/SponsorshipPaymaster.sol | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/contracts/common/Errors.sol b/contracts/common/Errors.sol
index d6735f0..a303f51 100644
--- a/contracts/common/Errors.sol
+++ b/contracts/common/Errors.sol
@@ -30,6 +30,11 @@ contract SponsorshipPaymasterErrors {
      */
     error FeeCollectorCannotBeContract();
 
+    /**
+     * @notice Throws when the fee collector address provided is a deployed contract
+     */
+    error VerifyingSignerCannotBeContract();
+
     /**
      * @notice Throws when the fee collector address provided is address(0)
      */
diff --git a/contracts/sponsorship/SponsorshipPaymaster.sol b/contracts/sponsorship/SponsorshipPaymaster.sol
index 29493f7..83ba35d 100644
--- a/contracts/sponsorship/SponsorshipPaymaster.sol
+++ b/contracts/sponsorship/SponsorshipPaymaster.sol
@@ -69,7 +69,6 @@ contract SponsorshipPaymaster is
      * @param paymasterId dapp identifier for which deposit is being made
      */
     function depositFor(address paymasterId) external payable nonReentrant {
-        if(paymasterId.isContract()) revert PaymasterIdCannotBeContract();
         if (paymasterId == address(0)) revert PaymasterIdCannotBeZero();
         if (msg.value == 0) revert DepositCanNotBeZero();
         paymasterIdBalances[paymasterId] += msg.value;
@@ -87,6 +86,7 @@ contract SponsorshipPaymaster is
     function setSigner(
         address _newVerifyingSigner
     ) external payable override onlyOwner {
+        if(_newVerifyingSigner.isContract()) revert VerifyingSignerCannotBeContract();
         if (_newVerifyingSigner == address(0))
             revert VerifyingSignerCannotBeZero();
         address oldSigner = verifyingSigner;
@@ -106,7 +106,6 @@ contract SponsorshipPaymaster is
     function setFeeCollector(
         address _newFeeCollector
     ) external payable onlyOwner {
-        if(_newFeeCollector.isContract()) revert FeeCollectorCannotBeContract();
         if (_newFeeCollector == address(0)) revert FeeCollectorCannotBeZero();
         address oldFeeCollector = feeCollector;
         assembly {