fix: conversion from callbackData bytes to l2BlockRangeAccepted uint256

packages/linea-ens-resolver/contracts/L1Resolver.sol

@@ -39,7 +39,7 @@ contract L1Resolver is
     uint256 constant VERSIONABLE_HASHES_SLOT = 3;
     uint256 constant VERSIONABLE_TEXTS_SLOT = 10;
     // To check how old is the value/proof returned and is in the acceptable range
-    uint256 constant L2_BLOCK_RANGE_ACCEPTED = 86400;
+    uint256 constant ACCEPTED_L2_BLOCK_RANGE_LENGTH = 86400;
     string public graphqlUrl;
 
     event TargetSet(bytes name, address target);
@@ -63,6 +63,24 @@ contract L1Resolver is
      * @param contractAddress Contract Address at which the deferred mutation should transact with.
      */
     error StorageHandledByL2(uint256 chainId, address contractAddress);
+    error wrongl2BlockRangeLength(uint256 expected, uint256 actual);
+
+    /**
+     * @dev extra modifier added compared to the ENS initial implementation to make sure the
+     *      l2 block range sent in the callbackData is not altered during the ccip-read flow
+     *      when calling the EVMFetchTarget. It is not needed in the initial ENS implementation
+     *      since the callbackData is not used.
+     */
+    modifier callbackDataHasL2BlockRangeLength(bytes memory callbackData) {
+        uint256 callbackDataL2BlockRangeLength = uint256(bytes32(callbackData));
+        if (callbackDataL2BlockRangeLength != ACCEPTED_L2_BLOCK_RANGE_LENGTH) {
+            revert wrongl2BlockRangeLength(
+                ACCEPTED_L2_BLOCK_RANGE_LENGTH,
+                callbackDataL2BlockRangeLength
+            );
+        }
+        _;
+    }
 
     /**
      * @param _verifier     The chain verifier address
@@ -211,14 +229,19 @@ contract L1Resolver is
             .element(COIN_TYPE_ETH)
             .fetch(
                 this.addrCallback.selector,
-                abi.encode(L2_BLOCK_RANGE_ACCEPTED)
+                abi.encode(ACCEPTED_L2_BLOCK_RANGE_LENGTH)
             ); // recordVersions
     }
 
     function addrCallback(
         bytes[] memory values,
-        bytes memory
-    ) external pure returns (bytes memory) {
+        bytes memory callbackData
+    )
+        external
+        pure
+        callbackDataHasL2BlockRangeLength(callbackData)
+        returns (bytes memory)
+    {
         return abi.encode(address(bytes20(values[1])));
     }
 
@@ -237,14 +260,19 @@ contract L1Resolver is
             .element(coinType)
             .fetch(
                 this.addrCoinTypeCallback.selector,
-                abi.encode(L2_BLOCK_RANGE_ACCEPTED)
+                abi.encode(ACCEPTED_L2_BLOCK_RANGE_LENGTH)
             );
     }
 
     function addrCoinTypeCallback(
         bytes[] memory values,
-        bytes memory
-    ) external pure returns (bytes memory) {
+        bytes memory callbackData
+    )
+        external
+        pure
+        callbackDataHasL2BlockRangeLength(callbackData)
+        returns (bytes memory)
+    {
         return abi.encode(values[1]);
     }
 
@@ -263,14 +291,19 @@ contract L1Resolver is
             .element(key)
             .fetch(
                 this.textCallback.selector,
-                abi.encode(L2_BLOCK_RANGE_ACCEPTED)
+                abi.encode(ACCEPTED_L2_BLOCK_RANGE_LENGTH)
             );
     }
 
     function textCallback(
         bytes[] memory values,
-        bytes memory
-    ) external pure returns (bytes memory) {
+        bytes memory callbackData
+    )
+        external
+        pure
+        callbackDataHasL2BlockRangeLength(callbackData)
+        returns (bytes memory)
+    {
         return abi.encode(string(values[1]));
     }
 
@@ -287,14 +320,19 @@ contract L1Resolver is
             .element(node)
             .fetch(
                 this.contenthashCallback.selector,
-                abi.encode(L2_BLOCK_RANGE_ACCEPTED)
+                abi.encode(ACCEPTED_L2_BLOCK_RANGE_LENGTH)
             );
     }
 
     function contenthashCallback(
         bytes[] memory values,
-        bytes memory
-    ) external pure returns (bytes memory) {
+        bytes memory callbackData
+    )
+        external
+        pure
+        callbackDataHasL2BlockRangeLength(callbackData)
+        returns (bytes memory)
+    {
         return abi.encode(values[1]);
     }
 

packages/linea-ens-resolver/test/testData.ts

@@ -167,10 +167,19 @@ export const proofTest = {
 };
 
 export const extraDataTest =
-  "0x0000000000000000000000000b306bf915c4d645ff596e518faf3f9669b9701600000000000000000000000028f15b034f9744d43548ac64dce04ed77bdbd83200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000120f470901a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003200000000000000000000000000000000000000000000000000000000000000002000001ff000000000000000000000000000000000000000000000000000000000102200304ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e4922000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e49220000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000000";
+  "0x0000000000000000000000000b306bf915c4d645ff596e518faf3f9669b9701600000000000000000000000028f15b034f9744d43548ac64dce04ed77bdbd83200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000120f470901a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003200000000000000000000000000000000000000000000000000000000000000002000001ff000000000000000000000000000000000000000000000000000000000102200304ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e4922000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e49220000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000015180";
+
+export const extraDataWithWrongL2BlockRangeLength =
+  "0x0000000000000000000000000b306bf915c4d645ff596e518faf3f9669b9701600000000000000000000000028f15b034f9744d43548ac64dce04ed77bdbd83200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000120f470901a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003200000000000000000000000000000000000000000000000000000000000000002000001ff000000000000000000000000000000000000000000000000000000000102200304ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e4922000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e49220000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000009999999";
 
 export const wrongExtraData =
-  "0x0000000000000000000000000b306bf915c4d645ff596e518faf3f9669b9701600000000000000000000000028f15b034f9744d43548ac64dce04ed77bdbd83100000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000120f470901a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003200000000000000000000000000000000000000000000000000000000000000002000001ff000000000000000000000000000000000000000000000000000000000102200304ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e4922000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e49220000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000000";
+  "0x0000000000000000000000000b306bf915c4d645ff596e518faf3f9669b9701600000000000000000000000028f15b034f9744d43548ac64dce04ed77bdbd83100000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000120f470901a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003200000000000000000000000000000000000000000000000000000000000000002000001ff000000000000000000000000000000000000000000000000000000000102200304ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e4922000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e49220000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000015180";
+
+export const extraDataWithLongCallBackData =
+  "0x0000000000000000000000000b306bf915c4d645ff596e518faf3f9669b9701600000000000000000000000028f15b034f9744d43548ac64dce04ed77bdbd83200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000120f470901a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003200000000000000000000000000000000000000000000000000000000000000002000001ff000000000000000000000000000000000000000000000000000000000102200304ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e4922000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e49220000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000151801231242aef3450";
+
+export const extraDataWithShortCallBackData =
+  "0x0000000000000000000000000b306bf915c4d645ff596e518faf3f9669b9701600000000000000000000000028f15b034f9744d43548ac64dce04ed77bdbd83200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000120f470901a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003200000000000000000000000000000000000000000000000000000000000000002000001ff000000000000000000000000000000000000000000000000000000000102200304ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e4922000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e49220000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000015180";
 
 export const commandsTest = [
   "0x000001ff00000000000000000000000000000000000000000000000000000000",
@@ -190,3 +199,9 @@ export const constantsTest = [
   "0xbebd415b7c88e97082bae6b4e3ba6bd83b660b8620cd7f90d99c8564f6e8da9b",
   "0x000000000000000000000000000000000000000000000000000000000000003c",
 ];
+
+export const retValueTest =
+  "f470901a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003200000000000000000000000000000000000000000000000000000000000000002000001ff000000000000000000000000000000000000000000000000000000000102200304ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e4922000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e49220000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000015180";
+
+export const retValueLongTest =
+  "f470901a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003200000000000000000000000000000000000000000000000000000000000000002000001ff000000000000000000000000000000000000000000000000000000000102200304ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e4922000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020e312102006c30788eb679837a67baf80dc450ee6bb8ee493b14b16250d3e49220000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000151801231242aef345000000000000000000000000000000000000000000000000000";