feat: SparseCalldataSegmentLib optimization (#200)

erc6900 · Oct 15, 2024 · 2e8ca59 · 2e8ca59
1 parent c75f885
commit 2e8ca59
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/helpers/EmptyCalldataSlice.sol b/src/helpers/EmptyCalldataSlice.sol
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity ^0.8.20;
+
+function getEmptyCalldataSlice() pure returns (bytes calldata) {
+    bytes calldata empty;
+
+    assembly ("memory-safe") {
+        empty.length := 0
+    }
+
+    return empty;
+}
diff --git a/src/libraries/SparseCalldataSegmentLib.sol b/src/libraries/SparseCalldataSegmentLib.sol
@@ -2,6 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {RESERVED_VALIDATION_DATA_INDEX} from "../helpers/Constants.sol";
+import {getEmptyCalldataSlice} from "../helpers/EmptyCalldataSlice.sol";
 
 /// @title Sparse Calldata Segment Library
 /// @notice Library for working with sparsely-packed calldata segments, identified with an index.
@@ -51,7 +52,7 @@ library SparseCalldataSegmentLib {
     function advanceSegmentIfAtIndex(bytes calldata source, uint8 index)
         internal
         pure
-        returns (bytes memory, bytes calldata)
+        returns (bytes calldata, bytes calldata)
     {
         uint8 nextIndex = getIndex(source);
 
@@ -69,7 +70,7 @@ library SparseCalldataSegmentLib {
             return (segment, remainder);
         }
 
-        return ("", source);
+        return (getEmptyCalldataSlice(), source);
     }
 
     /// @notice Extracts the final segment from the source.