From 72ed4ca67a99bba17852fb6a7dea558980260757 Mon Sep 17 00:00:00 2001
From: Hadrien Croubois <hadrien.croubois@gmail.com>
Date: Fri, 5 May 2023 21:31:23 +0200
Subject: [PATCH] Ensure AccessControlDefaultAdminRules's initialDefaultAdmin
 is non-zero (#4220)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Ernesto García <ernestognw@gmail.com>
---
 contracts/access/AccessControlDefaultAdminRules.sol | 1 +
 test/access/AccessControlDefaultAdminRules.test.js  | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/contracts/access/AccessControlDefaultAdminRules.sol b/contracts/access/AccessControlDefaultAdminRules.sol
index 0c640fb99..6cdda81a1 100644
--- a/contracts/access/AccessControlDefaultAdminRules.sol
+++ b/contracts/access/AccessControlDefaultAdminRules.sol
@@ -53,6 +53,7 @@ abstract contract AccessControlDefaultAdminRules is IAccessControlDefaultAdminRu
      * @dev Sets the initial values for {defaultAdminDelay} and {defaultAdmin} address.
      */
     constructor(uint48 initialDelay, address initialDefaultAdmin) {
+        require(initialDefaultAdmin != address(0), "AccessControl: 0 default admin");
         _currentDelay = initialDelay;
         _grantRole(DEFAULT_ADMIN_ROLE, initialDefaultAdmin);
     }
diff --git a/test/access/AccessControlDefaultAdminRules.test.js b/test/access/AccessControlDefaultAdminRules.test.js
index 4e3167a46..be112481e 100644
--- a/test/access/AccessControlDefaultAdminRules.test.js
+++ b/test/access/AccessControlDefaultAdminRules.test.js
@@ -1,4 +1,4 @@
-const { time } = require('@openzeppelin/test-helpers');
+const { time, constants, expectRevert } = require('@openzeppelin/test-helpers');
 const {
   shouldBehaveLikeAccessControl,
   shouldBehaveLikeAccessControlDefaultAdminRules,
@@ -13,6 +13,13 @@ contract('AccessControlDefaultAdminRules', function (accounts) {
     this.accessControl = await AccessControlDefaultAdminRules.new(delay, accounts[0], { from: accounts[0] });
   });
 
+  it('initial admin not zero', async function () {
+    await expectRevert(
+      AccessControlDefaultAdminRules.new(delay, constants.ZERO_ADDRESS),
+      'AccessControl: 0 default admin',
+    );
+  });
+
   shouldBehaveLikeAccessControl('AccessControl', ...accounts);
   shouldBehaveLikeAccessControlDefaultAdminRules('AccessControl', delay, ...accounts);
 });