chore(rns-unified): merge from release/v0.2.0

.github/workflows/create-PR-release.yml

@@ -13,15 +13,19 @@ env:
   HEAD_BRANCH: ${{ github.head_ref || github.ref_name }}
 
 jobs:
-  mergeRelease2FeatureRnsUnified:
+  mergeRelease2FeatureRepo:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        branch_name: [feature/rns-unified, feature/controller, feature/domain-price, feature/auction, feature/public-resolver, feature/ci, feature/reverse-registrar]
     steps:
       - name: Set env
         run: |
-          echo "PR_BRANCH=merge/${HEAD_BRANCH}-feature/rns-unified" >> $GITHUB_ENV
+          echo "PR_BRANCH=merge/${HEAD_BRANCH}-${{matrix.branch_name}}" >> $GITHUB_ENV
+          echo "FEATURE_NAME=$(echo ${{matrix.branch_name}} | cut -d'/' -f2)" >> $GITHUB_ENV
       - uses: actions/checkout@v3
         with:
-          ref: feature/rns-unified
+          ref: ${{matrix.branch_name}}
       - name: Reset promotion branch
         run: |
           git fetch origin ${HEAD_BRANCH}:${HEAD_BRANCH}
@@ -34,205 +38,13 @@ jobs:
           template: .github/template/create-pull-request.md
           vars: |
             fromBranch: ${{env.HEAD_BRANCH}}
-            toBranch: feature/rns-unified
+            toBranch: ${{matrix.branch_name}}
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v5
         with:
           labels: automated PR
           delete-branch: true
-          title: 'chore(rns-unified): merge from `${{env.HEAD_BRANCH}}`'
-          body: ${{ steps.template.outputs.result }}
-          branch: ${{env.PR_BRANCH}}
-
-  mergeRelease2FeatureController:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set env
-        run: |
-          echo "PR_BRANCH=merge/${HEAD_BRANCH}-feature/controller" >> $GITHUB_ENV
-      - uses: actions/checkout@v3
-        with:
-          ref: feature/controller
-      - name: Reset promotion branch
-        run: |
-          git fetch origin ${HEAD_BRANCH}:${HEAD_BRANCH}
-          git reset --hard ${HEAD_BRANCH}
-
-      - name: Render template
-        id: template
-        uses: chuhlomin/render-template@v1.4
-        with:
-          template: .github/template/create-pull-request.md
-          vars: |
-            fromBranch: ${{env.HEAD_BRANCH}}
-            toBranch: feature/controller
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
-        with:
-          labels: automated PR
-          delete-branch: true
-          title: 'chore(controller): merge from `${{env.HEAD_BRANCH}}`'
-          body: ${{ steps.template.outputs.result }}
-          branch: ${{env.PR_BRANCH}}
-
-  mergeRelease2FeatureDomainPrice:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set env
-        run: |
-          echo "PR_BRANCH=merge/${HEAD_BRANCH}-feature/domain-price" >> $GITHUB_ENV
-      - uses: actions/checkout@v3
-        with:
-          ref: feature/domain-price
-      - name: Reset promotion branch
-        run: |
-          git fetch origin ${HEAD_BRANCH}:${HEAD_BRANCH}
-          git reset --hard ${HEAD_BRANCH}
-
-      - name: Render template
-        id: template
-        uses: chuhlomin/render-template@v1.4
-        with:
-          template: .github/template/create-pull-request.md
-          vars: |
-            fromBranch: ${{env.HEAD_BRANCH}}
-            toBranch: feature/domain-price
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
-        with:
-          labels: automated PR
-          delete-branch: true
-          title: 'chore(domain-price): merge from `${{env.HEAD_BRANCH}}`'
-          body: ${{ steps.template.outputs.result }}
-          branch: ${{env.PR_BRANCH}}
-
-  mergeRelease2FeatureAuction:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set env
-        run: |
-          echo "PR_BRANCH=merge/${HEAD_BRANCH}-feature/auction" >> $GITHUB_ENV
-      - uses: actions/checkout@v3
-        with:
-          ref: feature/auction
-      - name: Reset promotion branch
-        run: |
-          git fetch origin ${HEAD_BRANCH}:${HEAD_BRANCH}
-          git reset --hard ${HEAD_BRANCH}
-
-      - name: Render template
-        id: template
-        uses: chuhlomin/render-template@v1.4
-        with:
-          template: .github/template/create-pull-request.md
-          vars: |
-            fromBranch: ${{env.HEAD_BRANCH}}
-            toBranch: feature/auction
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
-        with:
-          labels: automated PR
-          delete-branch: true
-          title: 'chore(auction): merge from `${{env.HEAD_BRANCH}}`'
-          body: ${{ steps.template.outputs.result }}
-          branch: ${{env.PR_BRANCH}}
-
-  mergeRelease2FeaturePublicResolver:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set env
-        run: |
-          echo "PR_BRANCH=merge/${HEAD_BRANCH}-feature/public-resolver" >> $GITHUB_ENV
-      - uses: actions/checkout@v3
-        with:
-          ref: feature/public-resolver
-      - name: Reset promotion branch
-        run: |
-          git fetch origin ${HEAD_BRANCH}:${HEAD_BRANCH}
-          git reset --hard ${HEAD_BRANCH}
-
-      - name: Render template
-        id: template
-        uses: chuhlomin/render-template@v1.4
-        with:
-          template: .github/template/create-pull-request.md
-          vars: |
-            fromBranch: ${{env.HEAD_BRANCH}}
-            toBranch: feature/public-resolver
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
-        with:
-          labels: automated PR
-          delete-branch: true
-          title: 'chore(public-resolver): merge from `${{env.HEAD_BRANCH}}`'
-          body: ${{ steps.template.outputs.result }}
-          branch: ${{env.PR_BRANCH}}
-
-  mergeRelease2FeatureCI:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set env
-        run: |
-          echo "PR_BRANCH=merge/${HEAD_BRANCH}-feature/ci" >> $GITHUB_ENV
-      - uses: actions/checkout@v3
-        with:
-          ref: feature/ci
-      - name: Reset promotion branch
-        run: |
-          git fetch origin ${HEAD_BRANCH}:${HEAD_BRANCH}
-          git reset --hard ${HEAD_BRANCH}
-
-      - name: Render template
-        id: template
-        uses: chuhlomin/render-template@v1.4
-        with:
-          template: .github/template/create-pull-request.md
-          vars: |
-            fromBranch: ${{env.HEAD_BRANCH}}
-            toBranch: feature/ci
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
-        with:
-          labels: automated PR
-          delete-branch: true
-          title: 'chore(ci): merge from `${{env.HEAD_BRANCH}}`'
-          body: ${{ steps.template.outputs.result }}
-          branch: ${{env.PR_BRANCH}}
-
-  mergeRelease2FeatureReverseRegistrar:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set env
-        run: |
-          echo "PR_BRANCH=merge/${HEAD_BRANCH}-feature/reverse-registrar" >> $GITHUB_ENV
-      - uses: actions/checkout@v3
-        with:
-          ref: feature/reverse-registrar
-      - name: Reset promotion branch
-        run: |
-          git fetch origin ${HEAD_BRANCH}:${HEAD_BRANCH}
-          git reset --hard ${HEAD_BRANCH}
-
-      - name: Render template
-        id: template
-        uses: chuhlomin/render-template@v1.4
-        with:
-          template: .github/template/create-pull-request.md
-          vars: |
-            fromBranch: ${{env.HEAD_BRANCH}}
-            toBranch: feature/reverse-registrar
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
-        with:
-          labels: automated PR
-          delete-branch: true
-          title: 'chore(reverse-registrar): merge from `${{env.HEAD_BRANCH}}`'
+          title: 'chore(`${{env.FEATURE_NAME}}`): merge from `${{env.HEAD_BRANCH}}`'
           body: ${{ steps.template.outputs.result }}
           branch: ${{env.PR_BRANCH}}

script/20231021-upgrade-domain-price-and-auction/20231021_UpgradeDomainPriceAndAuction.s..sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.19;
+
+import { ContractKey } from "foundry-deployment-kit/configs/ContractConfig.sol";
+import { RNSDeploy } from "script/RNSDeploy.s.sol";
+
+contract Migration__20231021_UpgradeDomainPriceAndAuction is RNSDeploy {
+  function run() public trySetUp {
+    _upgradeProxy(ContractKey.RNSAuction, EMPTY_ARGS);
+    _upgradeProxy(ContractKey.RNSDomainPrice, EMPTY_ARGS);
+  }
+}

src/RNSAuction.sol

@@ -23,11 +23,12 @@ contract RNSAuction is Initializable, AccessControlEnumerable, INSAuction {
   /// @inheritdoc INSAuction
   uint64 public constant DOMAIN_EXPIRY_DURATION = 365 days;
   /// @inheritdoc INSAuction
+  uint64 public constant MAX_AUCTION_DOMAIN_EXPIRY = 365 days * 3;
+  /// @inheritdoc INSAuction
   bytes32 public constant OPERATOR_ROLE = keccak256("OPERATOR_ROLE");
 
   /// @dev Gap for upgradeability.
   uint256[50] private ____gap;
-
   /// @dev The RNSUnified contract.
   INSUnified internal _rnsUnified;
   /// @dev Mapping from auction Id => event range
@@ -207,13 +208,13 @@ contract RNSAuction is Initializable, AccessControlEnumerable, INSAuction {
   /**
    * @inheritdoc INSAuction
    */
-  function bulkClaimBidNames(uint256[] calldata ids) external returns (bool[] memory claimeds) {
+  function bulkClaimBidNames(uint256[] calldata ids) external returns (uint256[] memory claimedAts) {
     uint256 id;
     uint256 accumulatedRON;
     EventRange memory range;
     DomainAuction memory auction;
     uint256 length = ids.length;
-    claimeds = new bool[](length);
+    claimedAts = new uint256[](length);
     INSUnified rnsUnified = _rnsUnified;
     uint64 expiry = uint64(block.timestamp.addWithUpperbound(DOMAIN_EXPIRY_DURATION, MAX_EXPIRY));
 
@@ -222,15 +223,15 @@ contract RNSAuction is Initializable, AccessControlEnumerable, INSAuction {
       auction = _domainAuction[id];
       range = _auctionRange[auction.auctionId];
 
-      if (!auction.bid.claimed) {
+      if (auction.bid.claimedAt == 0) {
         if (!range.isEnded()) revert NotYetEnded();
         if (auction.bid.timestamp == 0) revert NoOneBidded();
 
         accumulatedRON += auction.bid.price;
         rnsUnified.setExpiry(id, expiry);
         rnsUnified.transferFrom(address(this), auction.bid.bidder, id);
 
-        _domainAuction[id].bid.claimed = claimeds[i] = true;
+        _domainAuction[id].bid.claimedAt = claimedAts[i] = block.timestamp;
       }
 
       unchecked {

src/RNSDomainPrice.sol

@@ -5,10 +5,12 @@ import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable
 import { AccessControlEnumerable } from "@openzeppelin/contracts/access/AccessControlEnumerable.sol";
 import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
 import { IPyth, PythStructs } from "@pythnetwork/IPyth.sol";
+import { INSUnified } from "./interfaces/INSUnified.sol";
 import { INSAuction } from "./interfaces/INSAuction.sol";
 import { INSDomainPrice } from "./interfaces/INSDomainPrice.sol";
 import { PeriodScaler, LibPeriodScaler, Math } from "./libraries/math/PeriodScalingUtils.sol";
 import { TimestampWrapper } from "./libraries/TimestampWrapperUtils.sol";
+import { LibSafeRange } from "./libraries/math/LibSafeRange.sol";
 import { LibString } from "./libraries/LibString.sol";
 import { LibRNSDomain } from "./libraries/LibRNSDomain.sol";
 import { PythConverter } from "./libraries/pyth/PythConverter.sol";
@@ -253,8 +255,17 @@ contract RNSDomainPrice is Initializable, AccessControlEnumerable, INSDomainPric
     } else {
       uint256 renewalFeeByLength = _rnFee[Math.min(nameLen, _rnfMaxLength)];
       basePrice.usd = duration * renewalFeeByLength;
-      // tax is added of name is reserved for auction
-      if (_auction.reserved(LibRNSDomain.toId(LibRNSDomain.RON_ID, label))) {
+      uint256 id = LibRNSDomain.toId(LibRNSDomain.RON_ID, label);
+      INSAuction auction = _auction;
+      if (auction.reserved(id)) {
+        INSUnified rns = auction.getRNSUnified();
+        uint256 expiry = LibSafeRange.addWithUpperbound(rns.getRecord(id).mut.expiry, duration, type(uint64).max);
+        (INSAuction.DomainAuction memory domainAuction,) = auction.getAuction(id);
+        uint256 claimedAt = domainAuction.bid.claimedAt;
+        if (claimedAt != 0 && expiry - claimedAt > auction.MAX_AUCTION_DOMAIN_EXPIRY()) {
+          revert ExceedAuctionDomainExpiry();
+        }
+        // Tax is added to the name reserved for the auction
         tax.usd = Math.mulDiv(_taxRatio, _getDomainPrice(lbHash), MAX_PERCENTAGE);
       }
     }

src/interfaces/INSAuction.sol

@@ -22,7 +22,7 @@ interface INSAuction {
     address payable bidder;
     uint256 price;
     uint256 timestamp;
-    bool claimed;
+    uint256 claimedAt;
   }
 
   struct DomainAuction {
@@ -54,6 +54,11 @@ interface INSAuction {
    */
   function MAX_EXPIRY() external pure returns (uint64);
 
+  /**
+   * @dev The maximum expiry duration of a domain after transferring to bidder.
+   */
+  function MAX_AUCTION_DOMAIN_EXPIRY() external pure returns (uint64);
+
   /**
    * @dev Returns the operator role.
    */
@@ -161,7 +166,7 @@ interface INSAuction {
    *
    * @param ids The namehash id of domain name. Eg, namehash('foo.ron') for 'foo.ron'
    */
-  function bulkClaimBidNames(uint256[] calldata ids) external returns (bool[] memory claimeds);
+  function bulkClaimBidNames(uint256[] calldata ids) external returns (uint256[] memory claimedAts);
 
   /**
    * @dev Returns the treasury.

src/interfaces/INSDomainPrice.sol

@@ -7,6 +7,7 @@ import { IPyth } from "@pythnetwork/IPyth.sol";
 interface INSDomainPrice {
   error InvalidArrayLength();
   error RenewalFeeIsNotOverriden();
+  error ExceedAuctionDomainExpiry();
 
   struct RenewalFee {
     uint256 labelLength;