From f0147d3f9de9c5b983e81b9ed9f74e422eb113a1 Mon Sep 17 00:00:00 2001 From: tringuyenskymavis Date: Fri, 5 Jul 2024 14:50:38 +0700 Subject: [PATCH] script: migrate auction + controller treasury --- ...AuctionAndControllerAdminAndTreasury.s.sol} | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) rename script/{20240705-migration-aution-and-controller-treasury/20240705_MigrateAuctionAndControllerAdmin.s.sol => 20240705-migrate-aution-and-controller-admin-and-treasury/20240705_MigrateAuctionAndControllerAdminAndTreasury.s.sol} (71%) diff --git a/script/20240705-migration-aution-and-controller-treasury/20240705_MigrateAuctionAndControllerAdmin.s.sol b/script/20240705-migrate-aution-and-controller-admin-and-treasury/20240705_MigrateAuctionAndControllerAdminAndTreasury.s.sol similarity index 71% rename from script/20240705-migration-aution-and-controller-treasury/20240705_MigrateAuctionAndControllerAdmin.s.sol rename to script/20240705-migrate-aution-and-controller-admin-and-treasury/20240705_MigrateAuctionAndControllerAdminAndTreasury.s.sol index 92f237d..39b31d6 100644 --- a/script/20240705-migration-aution-and-controller-treasury/20240705_MigrateAuctionAndControllerAdmin.s.sol +++ b/script/20240705-migrate-aution-and-controller-admin-and-treasury/20240705_MigrateAuctionAndControllerAdminAndTreasury.s.sol @@ -7,10 +7,12 @@ import { } from "script/contracts/RONRegistrarControllerDeploy.s.sol"; import { Contract } from "script/utils/Contract.sol"; import { Migration } from "script/Migration.s.sol"; +import { RNSCommission, RNSCommissionDeploy } from "script/contracts/RNSCommissionDeploy.s.sol"; -contract Migration__20240507_MigrateAuctionAndControllerAdminMainnet is Migration { +contract Migration__20240507_MigrateAuctionAndControllerAdminAndTreasuryMainnet is Migration { RONRegistrarController private _controller; RNSAuction private _auction; + RNSCommission private _commission; address private _currentAdmin; address private _nextAdmin; bytes32 public constant DEFAULT_ADMIN_ROLE = 0x00; @@ -18,10 +20,14 @@ contract Migration__20240507_MigrateAuctionAndControllerAdminMainnet is Migratio function run() public { _auction = RNSAuction(loadContract(Contract.RNSAuction.key())); _controller = RONRegistrarController(loadContract(Contract.RONRegistrarController.key())); + _commission = RNSCommission(loadContract(Contract.RNSCommission.key())); _currentAdmin = 0x0F68eDBE14C8f68481771016d7E2871d6a35DE11; _nextAdmin = 0x9D05D1F5b0424F8fDE534BC196FFB6Dd211D902a; vm.startBroadcast(_currentAdmin); + _auction.setTreasury(payable(address(_commission))); + _controller.setTreasury(payable(address(_commission))); + _auction.grantRole(DEFAULT_ADMIN_ROLE, _nextAdmin); _controller.grantRole(DEFAULT_ADMIN_ROLE, _nextAdmin); @@ -31,9 +37,15 @@ contract Migration__20240507_MigrateAuctionAndControllerAdminMainnet is Migratio } function _postCheck() internal override { + _validateTreasuryAddress(); _validateNewAdmin(); _validatePrevAdminIsRevoked(); - _validateNumberOfAdmin(); + _validateAdminCount(); + } + + function _validateTreasuryAddress() internal logFn("_validateTreasuryAddress") { + assertEq(_auction.getTreasury(), address(_commission)); + assertEq(_controller.getTreasury(), address(_commission)); } function _validateNewAdmin() internal logFn("_validateNewAdmin") { @@ -48,7 +60,7 @@ contract Migration__20240507_MigrateAuctionAndControllerAdminMainnet is Migratio require(!_controller.hasRole(DEFAULT_ADMIN_ROLE, prevAdmin)); } - function _validateNumberOfAdmin() internal logFn("_validateNumberOfAdmin") { + function _validateAdminCount() internal logFn("_validateAdminCount") { assertEq(_auction.getRoleMemberCount(DEFAULT_ADMIN_ROLE), 1); assertEq(_controller.getRoleMemberCount(DEFAULT_ADMIN_ROLE), 1); }