feat: rm selector from usv3, usv4, update tests, and rename dispatcher file

foundry/src/Dispatcher.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.8.26;
 
 import "@interfaces/IExecutor.sol";
 import "@interfaces/ICallback.sol";
+import "forge-std/console.sol";
 
 error Dispatcher__UnapprovedExecutor();
 error Dispatcher__NonContractExecutor();
@@ -81,7 +82,7 @@ contract Dispatcher {
     }
 
     function _handleCallback(bytes calldata data) internal {
-        address executor = address(uint160(bytes20(data[data.length - 24:])));
+        address executor = address(uint160(bytes20(data[data.length - 20:])));
 
         if (!executors[executor]) {
             revert Dispatcher__UnapprovedExecutor();

foundry/src/executors/UniswapV3Executor.sol

@@ -148,9 +148,7 @@ contract UniswapV3Executor is IExecutor, ICallback {
         view
         returns (bytes memory)
     {
-        return abi.encodePacked(
-            tokenIn, tokenOut, fee, self, ICallback.handleCallback.selector
-        );
+        return abi.encodePacked(tokenIn, tokenOut, fee, self);
     }
 
     function _verifyPairAddress(

foundry/src/executors/UniswapV4Executor.sol

@@ -42,7 +42,6 @@ contract UniswapV4Executor is IExecutor, V4Router, ICallback {
             address tokenOut,
             bool zeroForOne,
             address callbackExecutor,
-            bytes4 callbackSelector,
             UniswapV4Executor.UniswapV4Pool[] memory pools
         ) = _decodeData(data);
 
@@ -108,8 +107,7 @@ contract UniswapV4Executor is IExecutor, V4Router, ICallback {
             params[2] = abi.encode(Currency.wrap(tokenOut), uint256(0));
             swapData = abi.encode(actions, params);
         }
-        bytes memory fullData =
-            abi.encodePacked(swapData, callbackExecutor, callbackSelector);
+        bytes memory fullData = abi.encodePacked(swapData, callbackExecutor);
         uint256 tokenOutBalanceBefore;
 
         tokenOutBalanceBefore = tokenOut == address(0)
@@ -143,11 +141,10 @@ contract UniswapV4Executor is IExecutor, V4Router, ICallback {
             address tokenOut,
             bool zeroForOne,
             address callbackExecutor,
-            bytes4 callbackSelector,
             UniswapV4Pool[] memory pools
         )
     {
-        if (data.length < 91) {
+        if (data.length < 87) {
             revert UniswapV4Executor__InvalidDataLength();
         }
 
@@ -155,11 +152,10 @@ contract UniswapV4Executor is IExecutor, V4Router, ICallback {
         tokenOut = address(bytes20(data[20:40]));
         zeroForOne = (data[40] != 0);
         callbackExecutor = address(bytes20(data[41:61]));
-        callbackSelector = bytes4(data[61:65]);
 
-        uint256 poolsLength = (data.length - 65) / 26; // 26 bytes per pool object
+        uint256 poolsLength = (data.length - 61) / 26; // 26 bytes per pool object
         pools = new UniswapV4Pool[](poolsLength);
-        bytes memory poolsData = data[65:];
+        bytes memory poolsData = data[61:];
         uint256 offset = 0;
         for (uint256 i = 0; i < poolsLength; i++) {
             address intermediaryToken;