Revert back from chainId to coinType

ensdomains · Mar 28, 2024 · 469086e · 469086e
1 parent 18d4b17
commit 469086e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/contracts/reverseRegistrar/L2ReverseRegistrar.sol b/contracts/reverseRegistrar/L2ReverseRegistrar.sol
@@ -31,12 +31,12 @@ contract L2ReverseRegistrar is
     /*
      * @dev Constructor
      * @param _L2ReverseNode The namespace to set. The converntion is '${coinType}.reverse'
-     * @param _chainId The chainId converted from the chainId of the chain this contract is deployed to.
+     * @param _coinType The cointype converted from the chainId of the chain this contract is deployed to.
      */
     constructor(
         bytes32 _L2ReverseNode,
-        uint256 _chainId
-    ) SignatureReverseResolver(_L2ReverseNode, _chainId) {
+        uint256 _coinType
+    ) SignatureReverseResolver(_L2ReverseNode, _coinType) {
         L2ReverseNode = _L2ReverseNode;
     }
 
@@ -80,7 +80,7 @@ contract L2ReverseRegistrar is
                 addr,
                 owner,
                 inceptionDate,
-                chainId
+                coinType
             )
         ).toEthSignedMessageHash();
         bytes32 node = _getNamehash(addr);

diff --git a/contracts/reverseRegistrar/SignatureReverseResolver.sol b/contracts/reverseRegistrar/SignatureReverseResolver.sol
@@ -21,16 +21,16 @@ contract SignatureReverseResolver is Ownable, ISignatureReverseResolver {
     mapping(bytes32 => uint64) internal recordVersions;
 
     bytes32 public immutable parentNode;
-    uint256 public immutable chainId;
+    uint256 public immutable coinType;
 
     /*
      * @dev Constructor
      * @param parentNode The namespace to set.
-     * @param _chainId The chainId converted from the chainId of the chain this contract is deployed to.
+     * @param _coinType The coinType converted from the chainId of the chain this contract is deployed to.
      */
-    constructor(bytes32 _parentNode, uint256 _chainId) {
+    constructor(bytes32 _parentNode, uint256 _coinType) {
         parentNode = _parentNode;
-        chainId = _chainId;
+        coinType = _coinType;
     }
 
     modifier authorised(address addr) {
@@ -67,7 +67,7 @@ contract SignatureReverseResolver is Ownable, ISignatureReverseResolver {
                 hash,
                 addr,
                 inceptionDate,
-                chainId
+                coinType
             )
         ).toEthSignedMessageHash();
         bytes32 node = _getNamehash(addr);

diff --git a/deploy/l2/03_l2reverse_registrar.ts b/deploy/l2/03_l2reverse_registrar.ts
@@ -19,7 +19,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   )
   await deploy('L2ReverseRegistrar', {
     from: deployer,
-    args: [REVERSENODE, chainId],
+    args: [REVERSENODE, coinType],
     log: true,
   })
 }

diff --git a/test/reverseRegistrar/TestL2ReverseRegistrar.js b/test/reverseRegistrar/TestL2ReverseRegistrar.js
@@ -26,7 +26,7 @@ describe('L2ReverseRegistrar', function () {
     'setTextForAddrWithSignature(address,string,string,uint256,bytes)'
   let setTextForAddrWithSignatureAndOwnableFuncSig =
     'setTextForAddrWithSignatureAndOwnable(address,address,string,string,uint256,bytes)'
-  let chainId = 123
+  let coinType = 123
 
   before(async function () {
     signers = await ethers.getSigners()
@@ -38,7 +38,7 @@ describe('L2ReverseRegistrar', function () {
     )
     L2ReverseRegistrar = await L2ReverseRegistrarFactory.deploy(
       namehash('optimism.reverse'),
-      chainId,
+      coinType,
     )
 
     const MockSmartContractWalletFactory = await ethers.getContractFactory(
@@ -116,7 +116,7 @@ describe('L2ReverseRegistrar', function () {
               keccak256(['bytes4', 'string'], [funcId, name]),
               account,
               inceptionDate,
-              chainId,
+              coinType,
             ],
           ),
         ),
@@ -193,7 +193,7 @@ describe('L2ReverseRegistrar', function () {
               keccak256(['bytes4', 'string'], [funcId, 'hello.eth']),
               account,
               inceptionDate,
-              chainId,
+              coinType,
             ],
           ),
         ),
@@ -219,7 +219,7 @@ describe('L2ReverseRegistrar', function () {
               keccak256(['bytes4', 'string'], [funcId, 'hello.eth']),
               account,
               inceptionDate2,
-              chainId,
+              coinType,
             ],
           ),
         ),
@@ -268,7 +268,7 @@ describe('L2ReverseRegistrar', function () {
               MockOwnable.address,
               MockSmartContractWallet.address,
               inceptionDate,
-              chainId,
+              coinType,
             ],
           ),
         ),
@@ -338,7 +338,7 @@ describe('L2ReverseRegistrar', function () {
               ),
               account,
               inceptionDate,
-              chainId,
+              coinType,
             ],
           ),
         ),
@@ -417,7 +417,7 @@ describe('L2ReverseRegistrar', function () {
               ),
               account,
               inceptionDate,
-              chainId,
+              coinType,
             ],
           ),
         ),
@@ -450,7 +450,7 @@ describe('L2ReverseRegistrar', function () {
               ),
               account,
               inceptionDate2,
-              chainId,
+              coinType,
             ],
           ),
         ),
@@ -498,7 +498,7 @@ describe('L2ReverseRegistrar', function () {
               MockOwnable.address,
               MockSmartContractWallet.address,
               inceptionDate,
-              chainId,
+              coinType,
             ],
           ),
         ),
@@ -572,7 +572,7 @@ describe('L2ReverseRegistrar', function () {
               ),
               account,
               inceptionDate,
-              chainId,
+              coinType,
             ],
           ),
         ),
@@ -587,7 +587,7 @@ describe('L2ReverseRegistrar', function () {
               keccak256(['bytes4', 'string'], [funcId2, 'hello.eth']),
               account,
               inceptionDate + 1,
-              chainId,
+              coinType,
             ],
           ),
         ),
@@ -654,7 +654,7 @@ describe('L2ReverseRegistrar', function () {
               keccak256(['bytes4'], [funcId]),
               account,
               inceptionDate,
-              chainId,
+              coinType,
             ],
           ),
         ),
@@ -694,7 +694,7 @@ describe('L2ReverseRegistrar', function () {
               keccak256(['bytes4'], [funcId]),
               account,
               inceptionDate,
-              chainId,
+              coinType,
             ],
           ),
         ),