fix: update ownable with guardian (#65)

bgd-labs · Jan 30, 2025 · 275365e · 275365e
1 parent 1422f3e
commit 275365e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/src/contracts/access-control/OwnableWithGuardian.sol b/src/contracts/access-control/OwnableWithGuardian.sol
@@ -7,8 +7,8 @@ import {IWithGuardian} from './interfaces/IWithGuardian.sol';
 abstract contract OwnableWithGuardian is Ownable, IWithGuardian {
   address private _guardian;
 
-  constructor(address initialOwner) Ownable(initialOwner) {
-    _updateGuardian(_msgSender());
+  constructor(address initialOwner, address initialGuardian) Ownable(initialOwner) {
+    _updateGuardian(initialGuardian);
   }
 
   modifier onlyGuardian() {

diff --git a/src/contracts/access-control/UpgradeableOwnableWithGuardian.sol b/src/contracts/access-control/UpgradeableOwnableWithGuardian.sol
@@ -25,9 +25,21 @@ abstract contract UpgradeableOwnableWithGuardian is OwnableUpgradeable, IWithGua
   }
 
   /**
-   * @dev Initializes the contract setting the address provided by the deployer as the initial owner.
+   * @dev Initializes the contract setting the address provided by the deployer as the initial owner & guardian.
+   * @param initialOwner The address of the initial owner
+   * @param initialGuardian The address of the initial guardian
    */
-  function __Ownable_With_Guardian_init(address initialGuardian) internal onlyInitializing {
+  function __Ownable_With_Guardian_init(
+    address initialOwner,
+    address initialGuardian
+  ) internal onlyInitializing {
+    __Ownable_init_unchained(initialOwner);
+    __Ownable_With_Guardian_init_unchained(initialGuardian);
+  }
+
+  function __Ownable_With_Guardian_init_unchained(
+    address initialGuardian
+  ) internal onlyInitializing {
     _updateGuardian(initialGuardian);
   }
 

diff --git a/test/OwnableWithGuardian.t.sol b/test/OwnableWithGuardian.t.sol
@@ -5,7 +5,7 @@ import 'forge-std/Test.sol';
 import {OwnableWithGuardian, IWithGuardian} from '../src/contracts/access-control/OwnableWithGuardian.sol';
 
 contract ImplOwnableWithGuardian is OwnableWithGuardian {
-  constructor(address initialOwner) OwnableWithGuardian(initialOwner) {}
+  constructor(address initialOwner, address guardian) OwnableWithGuardian(initialOwner, guardian) {}
 
   function mock_onlyGuardian() external onlyGuardian {}
 
@@ -19,7 +19,7 @@ contract TestOfOwnableWithGuardian is Test {
   address guardian = makeAddr('guardian');
 
   function setUp() public {
-    withGuardian = new ImplOwnableWithGuardian(address(this));
+    withGuardian = new ImplOwnableWithGuardian(address(this), address(this));
     assertEq(withGuardian.owner(), address(this));
     assertEq(withGuardian.guardian(), address(this));
     withGuardian.transferOwnership(owner);

diff --git a/test/UpgradeableOwnableWithGuardian.t.sol b/test/UpgradeableOwnableWithGuardian.t.sol
@@ -6,8 +6,7 @@ import {UpgradeableOwnableWithGuardian, IWithGuardian} from '../src/contracts/ac
 
 contract ImplOwnableWithGuardian is UpgradeableOwnableWithGuardian {
   function initialize(address owner, address guardian) public initializer {
-    __Ownable_init(owner);
-    __Ownable_With_Guardian_init(guardian);
+    __Ownable_With_Guardian_init(owner, guardian);
   }
 
   function mock_onlyGuardian() external onlyGuardian {}
+2 −0		foundry.toml
+24 −0		src/StdChains.sol
+3 −3		test/StdChains.t.sol