script: minor refactor

Author: TuDo1403

script/20231024-upgrade-domain-price/20231024_UpgradeDomainPrice.s.sol

@@ -14,7 +14,7 @@ contract Migration__20231024_UpgradeDomainPrice is Config__20231024 {
     console.log("operator", param.domainPriceOperators[0]);
     console.log("overrider", param.overrider);
 
-    RNSDomainPrice domainPrice = RNSDomainPrice(config.getAddressFromCurrentNetwork(Contract.RNSDomainPrice.key()));
+    RNSDomainPrice domainPrice = RNSDomainPrice(loadContract(Contract.RNSDomainPrice.key()));
     address admin = domainPrice.getRoleMember(0x00, 0);
     bytes32 overriderRole = domainPrice.OVERRIDER_ROLE();
     vm.broadcast(admin);

script/20231106-config-prelaunch/20231106_RevertRenewalFees.s.sol

@@ -7,7 +7,7 @@ import { RNSDomainPrice } from "@rns-contracts/RNSDomainPrice.sol";
 
 contract Migration__20231106_RevertRenewalFees is Migration {
   function run() public {
-    RNSDomainPrice domainPrice = RNSDomainPrice(config.getAddressFromCurrentNetwork(Contract.RNSDomainPrice.key()));
+    RNSDomainPrice domainPrice = RNSDomainPrice(loadContract(Contract.RNSDomainPrice.key()));
 
     ISharedArgument.RNSDomainPriceParam memory param = config.sharedArguments().rnsDomainPrice;
     vm.broadcast(domainPrice.getRoleMember(domainPrice.DEFAULT_ADMIN_ROLE(), 0));

script/20231106-config-prelaunch/20231106_SubmitReservedNames.s.sol

@@ -15,11 +15,11 @@ contract Migration__20231106_SubmitReservedNames is Migration {
     // default duration is 1 year
     uint64 duration = uint64(365 days);
 
-    RNSUnified rns = RNSUnified(config.getAddressFromCurrentNetwork(Contract.RNSUnified.key()));
-    address resolver = config.getAddressFromCurrentNetwork(Contract.PublicResolver.key());
-    OwnedMulticaller multicall = OwnedMulticaller(config.getAddressFromCurrentNetwork(Contract.OwnedMulticaller.key()));
+    RNSUnified rns = RNSUnified(loadContract(Contract.RNSUnified.key()));
+    address resolver = loadContract(Contract.PublicResolver.key());
+    OwnedMulticaller multicall = OwnedMulticaller(loadContract(Contract.OwnedMulticaller.key()));
 
-    console.log(config.getAddressFromCurrentNetwork(Contract.OwnedMulticaller.key()));
+    console.log(loadContract(Contract.OwnedMulticaller.key()));
 
     // vm.broadcast(rns.ownerOf(LibRNSDomain.RON_ID));
     //

script/20231106-config-prelaunch/20231106_TransferOwnership.s.sol

@@ -18,11 +18,11 @@ contract Migration__20231106_TransferOwnership is Migration {
     // fill in original owner
     address originalOwner = config.getSender();
 
-    RNSUnified rns = RNSUnified(config.getAddressFromCurrentNetwork(Contract.RNSUnified.key()));
+    RNSUnified rns = RNSUnified(loadContract(Contract.RNSUnified.key()));
     OwnedMulticaller multicall = OwnedMulticaller(loadContractOrDeploy(Contract.OwnedMulticaller.key()));
-    address auction = config.getAddressFromCurrentNetwork(Contract.RNSAuction.key());
-    address ronController = config.getAddressFromCurrentNetwork(Contract.RONRegistrarController.key());
-    address reverseRegistrar = config.getAddressFromCurrentNetwork(Contract.RNSReverseRegistrar.key());
+    address auction = loadContract(Contract.RNSAuction.key());
+    address ronController = loadContract(Contract.RONRegistrarController.key());
+    address reverseRegistrar = loadContract(Contract.RNSReverseRegistrar.key());
 
     uint256 reverseId = uint256(LibRNSDomain.namehash("reverse"));
     console.log("reverseId", reverseId);

script/20231114-deploy-name-checker-logic/20231114_DeployNameCheckerLogic.s.sol

@@ -17,7 +17,7 @@ contract Migration__20231114_DeployNameCheckerLogic is Migration {
   function run() public {
     address newLogic = _deployLogic(Contract.NameChecker.key());
 
-    NameChecker currentNameChecker = NameChecker(config.getAddressFromCurrentNetwork(Contract.NameChecker.key()));
+    NameChecker currentNameChecker = NameChecker(loadContract(Contract.NameChecker.key()));
     assertTrue(currentNameChecker.forbidden("hell"), "hell");
     assertTrue(currentNameChecker.forbidden("hellscream"), "hellscream");
     assertTrue(currentNameChecker.forbidden("hell123"), "hell123");

script/20231115-migrate-invalid-auction-names/2021115_MigrateInvalidAuctionNames.s.sol

@@ -8,7 +8,7 @@ import { Migration } from "script/Migration.s.sol";
 
 contract Migration__20231115_MigrateInvalidAuctionNames is Migration {
   function run() public {
-    RNSAuction auction = RNSAuction(config.getAddressFromCurrentNetwork(Contract.RNSAuction.key()));
+    RNSAuction auction = RNSAuction(loadContract(Contract.RNSAuction.key()));
 
     uint256[] memory ids = new uint256[](2);
     // namehash`pc.ron`

script/20231123-upgrade-auction-claim-unbidded-names/20231123_UpgradeAuctionClaimUnbiddedNames.s.sol

@@ -14,8 +14,8 @@ contract Migration__20231123_UpgradeAuctionClaimeUnbiddedNames is Migration {
   }
 
   function _validataBulkClaimUnbiddedNames(uint256 size) internal logFn("_validataBulkClaimUnbiddedNames") {
-    RNSAuction auction = RNSAuction(config.getAddressFromCurrentNetwork(Contract.RNSAuction.key()));
-    RNSUnified rns = RNSUnified(config.getAddressFromCurrentNetwork(Contract.RNSUnified.key()));
+    RNSAuction auction = RNSAuction(loadContract(Contract.RNSAuction.key()));
+    RNSUnified rns = RNSUnified(loadContract(Contract.RNSUnified.key()));
 
     uint256 auctionBalance = size;
     console.log("auctionBalance", auctionBalance);

script/20231124-deploy-rns-operation/20231124_DeployRNSOperation.s.sol

@@ -22,9 +22,9 @@ contract Migration__20231124_DeployRNSOperation is Migration {
   function run() public {
     rnsOperation = new RNSOperationDeploy().run();
 
-    domainPrice = RNSDomainPrice(config.getAddressFromCurrentNetwork(Contract.RNSDomainPrice.key()));
-    rns = RNSUnified(config.getAddressFromCurrentNetwork(Contract.RNSUnified.key()));
-    auction = RNSAuction(config.getAddressFromCurrentNetwork(Contract.RNSAuction.key()));
+    domainPrice = RNSDomainPrice(loadContract(Contract.RNSDomainPrice.key()));
+    rns = RNSUnified(loadContract(Contract.RNSUnified.key()));
+    auction = RNSAuction(loadContract(Contract.RNSAuction.key()));
 
     address admin = rns.ownerOf(LibRNSDomain.RON_ID);
 

script/20231205-deploy-upgrade-auction-and-deploy-rns-operation/20231205_UpgradeRNSAuctionAndDeployRNSOperation.s.sol

@@ -26,8 +26,8 @@ contract Migration__20231205_UpgradeRNSAuctionAndDeployRNSOperation is Config__M
   function run() public onlyOn(DefaultNetwork.RoninMainnet.key()) {
     ISharedArgument.RNSOperationParam memory param = config.sharedArguments().rnsOperation;
 
-    ProxyAdmin proxyAdmin = ProxyAdmin(config.getAddressFromCurrentNetwork(DefaultContract.ProxyAdmin.key()));
-    address rnsAuctionProxy = config.getAddressFromCurrentNetwork(Contract.RNSAuction.key());
+    ProxyAdmin proxyAdmin = ProxyAdmin(loadContract(DefaultContract.ProxyAdmin.key()));
+    address rnsAuctionProxy = loadContract(Contract.RNSAuction.key());
     address logic = _deployLogic(Contract.RNSAuction.key());
 
     vm.prank(proxyAdmin.owner());
@@ -39,7 +39,7 @@ contract Migration__20231205_UpgradeRNSAuctionAndDeployRNSOperation is Config__M
 
     // deploy rns operation contract
     new DeployRNSOperationScript().run();
-    RNSOperation rnsOperation = RNSOperation(config.getAddressFromCurrentNetwork(Contract.RNSOperation.key()));
+    RNSOperation rnsOperation = RNSOperation(loadContract(Contract.RNSOperation.key()));
 
     // transfer owner ship for RNSOperation
     vm.broadcast(rnsOperation.owner());
@@ -49,8 +49,8 @@ contract Migration__20231205_UpgradeRNSAuctionAndDeployRNSOperation is Config__M
   }
 
   function _validataBulkClaimUnbiddedNames(uint256 size) internal logFn("_validataBulkClaimUnbiddedNames") {
-    RNSAuction auction = RNSAuction(config.getAddressFromCurrentNetwork(Contract.RNSAuction.key()));
-    RNSUnified rns = RNSUnified(config.getAddressFromCurrentNetwork(Contract.RNSUnified.key()));
+    RNSAuction auction = RNSAuction(loadContract(Contract.RNSAuction.key()));
+    RNSUnified rns = RNSUnified(loadContract(Contract.RNSUnified.key()));
 
     uint256 auctionBalance = size;
     console.log("auctionBalance", auctionBalance);