Skip to content

Commit 56bb9c2

Browse files
authored
chore(multi-treasury): merge from release/v0.3.5 (#241)
2 parents b95e559 + 4b70374 commit 56bb9c2

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

src/RONRegistrarController.sol

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ contract RONRegistrarController is
9292
_setPriceOracle(priceOracle);
9393
_setMinRegistrationDuration(minRegistrationDuration);
9494
_setCommitmentAge(minCommitmentAge, maxCommitmentAge);
95+
_setTreasury(treasury);
9596

96-
_treasury = treasury;
9797
_rnsUnified = rnsUnified;
9898
_nameChecker = nameChecker;
9999
_reverseRegistrar = reverseRegistrar;
@@ -281,7 +281,7 @@ contract RONRegistrarController is
281281
* @inheritdoc IRONRegistrarController
282282
*/
283283
function setTreasury(address payable addr) external onlyRole(DEFAULT_ADMIN_ROLE) {
284-
_treasury = addr;
284+
_setTreasury(addr);
285285
}
286286

287287
/**
@@ -452,6 +452,19 @@ contract RONRegistrarController is
452452
emit DomainPriceUpdated(_msgSender(), priceOracle);
453453
}
454454

455+
/**
456+
* @dev Helper method to update treasury address.
457+
*
458+
* Emits an event {TreasuryUpdated}.
459+
*/
460+
function _setTreasury(address payable addr) internal {
461+
if (addr == address(0x0)) revert NullAddress();
462+
463+
_treasury = addr;
464+
465+
emit TreasuryUpdated(addr);
466+
}
467+
455468
/**
456469
* @dev Helper method to check if a domain name is available for register.
457470
*/

src/interfaces/IRONRegistrarController.sol

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ interface IRONRegistrarController {
3838
error ErrInvalidRegisterProtectedName(string name, address requestOwner, bool nameProtected, bool ownerWhitelisted);
3939
/// @dev Thrown when received invalid array length
4040
error InvalidArrayLength();
41+
/// @dev Thrown when treasury address is set to null
42+
error NullAddress();
4143

4244
/**
4345
* @dev Emitted when the min registration duration is updated.
@@ -46,6 +48,9 @@ interface IRONRegistrarController {
4648
*/
4749
event MinRegistrationDurationUpdated(address indexed operator, uint256 duration);
4850

51+
/// @dev Emitted when the treasury is updated.
52+
event TreasuryUpdated(address indexed addr);
53+
4954
/**
5055
* @dev Emitted when RNSDomainPrice contract is updated.
5156
* @param operator The address of the operator who triggered the update.

0 commit comments

Comments
 (0)