Merge branch 'dev' into feat/several-improvements

Author: 0xAustrian

src/contracts/L2Resolver.sol

@@ -59,7 +59,6 @@ contract L2Resolver is IL2Resolver, IERC165 {
   /// @inheritdoc IL2Resolver
   function setRecord(bytes32 _node, string calldata _key, bytes calldata _value) external {
     _setRecord(_node, _key, _value);
-    emit RecordSet(_node, _key, _value);
   }
 
   /// @inheritdoc IL2Resolver
@@ -72,8 +71,6 @@ contract L2Resolver is IL2Resolver, IERC165 {
     for (uint256 i = 0; i < _length; i++) {
       _setRecord(_nodes[i], _keys[i], _values[i]);
     }
-
-    emit RecordsSet(_nodes, _keys, _values);
   }
 
   /// @inheritdoc IL2Resolver
@@ -137,6 +134,7 @@ contract L2Resolver is IL2Resolver, IERC165 {
     }
 
     records[_node][_key] = _value;
+    emit RecordSet(_node, _key, _value);
   }
 
   /**

src/interfaces/IL2Resolver.sol

@@ -21,14 +21,6 @@ interface IL2Resolver {
    */
   event RecordSet(bytes32 indexed _node, string indexed _key, bytes _value);
 
-  /**
-   * @notice Emitted when records are set in batch.
-   * @param _nodes The ENS nodes to store the data for.
-   * @param _keys The keys to store the data under.
-   * @param _values The data to store under the keys.
-   */
-  event RecordsSet(bytes32[] _nodes, string[] _keys, bytes[] _values);
-
   /*///////////////////////////////////////////////////////////////
                             ERRORS
   //////////////////////////////////////////////////////////////*/

test/unit/L2Resolver.t.sol

@@ -903,10 +903,10 @@ contract UnitL2Resolver is Test {
       _mockAndExpect(address(_ensRegistry), abi.encodeWithSelector(IENS.owner.selector, _nodes[i]), abi.encode(_caller));
     }
 
-    // it emits the RecordsSet event
+    // it emits the RecordSet event
     vm.prank(_caller);
     vm.expectEmit();
-    emit IL2Resolver.RecordsSet(_nodes, _keys, _values);
+    emit IL2Resolver.RecordSet(_nodes[0], _keys[0], _values[0]);
     _l2Resolver.setRecords(_nodes, _keys, _values);
 
     // it sets the records
@@ -939,7 +939,7 @@ contract UnitL2Resolver is Test {
     // it emits the RecordsSet event
     vm.prank(_caller);
     vm.expectEmit();
-    emit IL2Resolver.RecordsSet(_nodes, _keys, _values);
+    emit IL2Resolver.RecordSet(_nodes[0], _keys[0], _values[0]);
     _l2Resolver.setRecords(_nodes, _keys, _values);
 
     // it sets the records
@@ -957,7 +957,9 @@ contract UnitL2Resolver is Test {
     _keysLength = bound(_keysLength, 1, _BATCH_RECORDS);
     _valuesLength = bound(_valuesLength, 1, _BATCH_RECORDS);
 
-    vm.assume(_nodesLength != _keysLength && _nodesLength != _valuesLength && _keysLength != _valuesLength);
+    vm.assume(_nodesLength != _keysLength);
+    vm.assume(_nodesLength != _valuesLength);
+    vm.assume(_keysLength != _valuesLength);
 
     // it reverts
     vm.expectRevert(abi.encodeWithSelector(IL2Resolver.InvalidDataLength.selector));

test/unit/L2Resolver.tree

@@ -108,10 +108,10 @@ UnitL2Resolver::resolve
 
 UnitL2Resolver::setRecords
 ├── when setting multiple records in batch
-│   ├── it emits the RecordsSet event
+│   ├── it emits the RecordSet event
 │   └── it sets the records
 ├── when setting multiple reverse lookup records in batch
-│   ├── it emits the RecordsSet event
+│   ├── it emits the RecordSet event
 │   └── it sets the records
 └── when the parameters length does not match the records length
     └── it reverts