From bd9935bdad231577559b0a7b789848cbfc454fa2 Mon Sep 17 00:00:00 2001
From: Gianbelinche <39842759+gianbelinche@users.noreply.github.com>
Date: Wed, 28 Aug 2024 16:06:18 -0300
Subject: [PATCH] Add check for initial deployment nonce

---
 system-contracts/contracts/ContractDeployer.sol | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system-contracts/contracts/ContractDeployer.sol b/system-contracts/contracts/ContractDeployer.sol
index b58a2202c..140166ce9 100644
--- a/system-contracts/contracts/ContractDeployer.sol
+++ b/system-contracts/contracts/ContractDeployer.sol
@@ -196,7 +196,7 @@ contract ContractDeployer is IContractDeployer, ISystemContract {
         // Subtract 1 for EOA since the nonce has already been incremented for this transaction
 
         uint256 deploymentNonce = NONCE_HOLDER_SYSTEM_CONTRACT.getDeploymentNonce(msg.sender);
-        if (deploymentNonce == 0) {
+        if ((msg.sender != tx.origin) && deploymentNonce == 0) {
             NONCE_HOLDER_SYSTEM_CONTRACT.incrementDeploymentNonce(msg.sender);
         }