Use Arrays.sol

ernestognw · ernestognw · commit 326c466e63c1 · 2025-06-02T14:31:32.000-06:00
diff --git a/contracts/utils/structs/EnumerableSet.sol b/contracts/utils/structs/EnumerableSet.sol
@@ -502,11 +502,7 @@ library EnumerableSet {
         for (uint256 i = 0; i < len; ++i) {
             delete set._positions[set._values[i]];
         }
-        // Replace when these are available in Arrays.sol
-        string[] storage array = set._values;
-        assembly ("memory-safe") {
-            sstore(array.slot, 0)
-        }
+        Arrays.unsafeSetLength(set._values, 0);
     }
 
     /**
@@ -626,11 +622,7 @@ library EnumerableSet {
         for (uint256 i = 0; i < len; ++i) {
             delete set._positions[set._values[i]];
         }
-        // Replace when these are available in Arrays.sol
-        bytes[] storage array = set._values;
-        assembly ("memory-safe") {
-            sstore(array.slot, 0)
-        }
+        Arrays.unsafeSetLength(set._values, 0);
     }
 
     /**
diff --git a/scripts/generate/templates/EnumerableSet.js b/scripts/generate/templates/EnumerableSet.js
@@ -345,11 +345,7 @@ function clear(${name} storage set) internal {
     for (uint256 i = 0; i < len; ++i) {
         delete set._positions[set._values[i]];
     }
-    // Replace when these are available in Arrays.sol
-    ${value.type}[] storage array = set._values;
-    assembly ("memory-safe") {
-        sstore(array.slot, 0)
-    }
+    Arrays.unsafeSetLength(set._values, 0);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -502,11 +502,7 @@ library EnumerableSet {`
`502`	`502`	`for (uint256 i = 0; i < len; ++i) {`
`503`	`503`	`delete set._positions[set._values[i]];`
`504`	`504`	`}`
`505`		`- // Replace when these are available in Arrays.sol`
`506`		`- string[] storage array = set._values;`
`507`		`- assembly ("memory-safe") {`
`508`		`- sstore(array.slot, 0)`
`509`		`- }`
	`505`	`+ Arrays.unsafeSetLength(set._values, 0);`
`510`	`506`	`}`
`511`	`507`
`512`	`508`	`/**`
`@@ -626,11 +622,7 @@ library EnumerableSet {`
`626`	`622`	`for (uint256 i = 0; i < len; ++i) {`
`627`	`623`	`delete set._positions[set._values[i]];`
`628`	`624`	`}`
`629`		`- // Replace when these are available in Arrays.sol`
`630`		`- bytes[] storage array = set._values;`
`631`		`- assembly ("memory-safe") {`
`632`		`- sstore(array.slot, 0)`
`633`		`- }`
	`625`	`+ Arrays.unsafeSetLength(set._values, 0);`
`634`	`626`	`}`
`635`	`627`
`636`	`628`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -345,11 +345,7 @@ function clear(${name} storage set) internal {`
`345`	`345`	`for (uint256 i = 0; i < len; ++i) {`
`346`	`346`	`delete set._positions[set._values[i]];`
`347`	`347`	`}`
`348`		`- // Replace when these are available in Arrays.sol`
`349`		`- ${value.type}[] storage array = set._values;`
`350`		`- assembly ("memory-safe") {`
`351`		`- sstore(array.slot, 0)`
`352`		`- }`
	`348`	`+ Arrays.unsafeSetLength(set._values, 0);`
`353`	`349`	`}`
`354`	`350`
`355`	`351`	`/**`