feat: changed L2 resolver to ERC721Enumerable

Consensys · Apr 18, 2023 · a29cdd2 · a29cdd2
1 parent 4611164
commit a29cdd2
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 40 deletions.
diff --git a/packages/contracts/contracts/l1/LineaResolverStub.sol b/packages/contracts/contracts/l1/LineaResolverStub.sol
@@ -109,7 +109,9 @@ contract LineaResolverStub is IExtendedResolver, SupportsInterface {
     );
 
     // step 2: check storage values, get itemId first and then get the address result
-    bytes32 tokenIdSlot = keccak256(abi.encodePacked(node, uint256(7)));
+    // the index slot 11 is for 'mapping(bytes32 => uint256) public addresses' in the L2 resolver
+    // the index slot 2 is for 'mapping(uint256 => address) private _owners' in the L2 resolver
+    bytes32 tokenIdSlot = keccak256(abi.encodePacked(node, uint256(11)));
     (bool tokenIdExists, bytes32 tokenId) = getStorageValue(
       l2resolver,
       tokenIdSlot,

diff --git a/packages/contracts/contracts/l2/LineaResolver.sol b/packages/contracts/contracts/l2/LineaResolver.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.18;
 
-import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
+import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
 import "@openzeppelin/contracts/utils/Strings.sol";
 import "@openzeppelin/contracts/utils/Counters.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
@@ -12,7 +12,7 @@ import "@ensdomains/ens-contracts/contracts/utils/NameEncoder.sol";
 @dev A Solidity contract that implements an ERC721 token for resolving Ethereum domain names to addresses.
 @author ConsenSys
 */
-contract LineaResolver is ERC721, Ownable {
+contract LineaResolver is ERC721Enumerable, Ownable {
   // Mapping to store Ethereum domain names (as bytes32) and their corresponding addresses (as uint256)
   mapping(bytes32 => uint256) public addresses;
   // Mapping to store token IDs (as uint256) and their corresponding domain name (as string)

diff --git a/packages/contracts/scripts/deployL2.ts b/packages/contracts/scripts/deployL2.ts
@@ -24,7 +24,7 @@ async function main() {
         address: lineaResolver.address,
         constructorArguments: [nftName, symbol, baseUri],
       });
-    }, 20000);
+    }, 30000);
   }
 }