diff --git a/foundry/src/executors/MaverickV2Executor.sol b/foundry/src/executors/MaverickV2Executor.sol
index a5971c2..08c0350 100644
--- a/foundry/src/executors/MaverickV2Executor.sol
+++ b/foundry/src/executors/MaverickV2Executor.sol
@@ -64,7 +64,8 @@ contract MaverickV2Executor is IExecutor {
     }
 
     function _verifyPairAddress(address target) internal view {
-        if (!IMaverickV2Factory(factory).isFactoryPool(IMaverickV2Pool(target))) {
+        if (!IMaverickV2Factory(factory).isFactoryPool(IMaverickV2Pool(target)))
+        {
             revert MaverickV2Executor__InvalidTarget();
         }
     }
diff --git a/foundry/test/executors/MaverickV2Executor.t.sol b/foundry/test/executors/MaverickV2Executor.t.sol
index 8d7fe6b..14769e9 100644
--- a/foundry/test/executors/MaverickV2Executor.t.sol
+++ b/foundry/test/executors/MaverickV2Executor.t.sol
@@ -7,23 +7,17 @@ import {Constants} from "../Constants.sol";
 
 contract MaverickV2ExecutorExposed is MaverickV2Executor {
     constructor(address _factory) MaverickV2Executor(_factory) {}
+
     function decodeParams(bytes calldata data)
         external
         pure
-        returns (
-            IERC20 tokenIn,
-            address target,
-            address receiver
-        )
+        returns (IERC20 tokenIn, address target, address receiver)
     {
         return _decodeData(data);
     }
 }
 
-contract MaverickV2ExecutorTest is
-    Test,
-    Constants
-{
+contract MaverickV2ExecutorTest is Test, Constants {
     using SafeERC20 for IERC20;
 
     MaverickV2ExecutorExposed maverickV2Exposed;
@@ -37,15 +31,11 @@ contract MaverickV2ExecutorTest is
     }
 
     function testDecodeParams() public view {
-        bytes memory params = abi.encodePacked(
-            GHO_ADDR, GHO_USDC_POOL, address(2)
-        );
+        bytes memory params =
+            abi.encodePacked(GHO_ADDR, GHO_USDC_POOL, address(2));
 
-        (
-            IERC20 tokenIn,
-            address target,
-            address receiver
-        ) = maverickV2Exposed.decodeParams(params);
+        (IERC20 tokenIn, address target, address receiver) =
+            maverickV2Exposed.decodeParams(params);
 
         assertEq(address(tokenIn), GHO_ADDR);
         assertEq(target, GHO_USDC_POOL);
@@ -74,4 +64,33 @@ contract MaverickV2ExecutorTest is
         assertGt(balanceAfter, balanceBefore);
         assertEq(balanceAfter - balanceBefore, amountOut);
     }
+
+    function testDecodeIntegration() public view {
+        // Generated by the SwapEncoder - test_encode_maverick_v2
+        bytes memory protocolData =
+            hex"40d16fc0246ad3160ccc09b8d0d3a2cd28ae6c2f14cf6d2fe3e1b326114b07d22a6f6bb59e346c671d96f2f6bef1202e4ce1ff6dad0c2cb002861d3e";
+
+        (IERC20 tokenIn, address pool, address receiver) =
+            maverickV2Exposed.decodeParams(protocolData);
+
+        assertEq(address(tokenIn), GHO_ADDR);
+        assertEq(pool, GHO_USDC_POOL);
+        assertEq(receiver, BOB);
+    }
+
+    function testSwapIntegration() public {
+        // Generated by the SwapEncoder - test_encode_maverick_v2
+        bytes memory protocolData =
+            hex"40d16fc0246ad3160ccc09b8d0d3a2cd28ae6c2f14cf6d2fe3e1b326114b07d22a6f6bb59e346c671d96f2f6bef1202e4ce1ff6dad0c2cb002861d3e";
+
+        uint256 amountIn = 10 ** 18;
+        deal(GHO_ADDR, address(maverickV2Exposed), amountIn);
+        uint256 balanceBefore = GHO.balanceOf(BOB);
+
+        uint256 amountOut = maverickV2Exposed.swap(amountIn, protocolData);
+
+        uint256 balanceAfter = USDC.balanceOf(BOB);
+        assertGt(balanceAfter, balanceBefore);
+        assertEq(balanceAfter - balanceBefore, amountOut);
+    }
 }
diff --git a/src/encoding/evm/swap_encoder/swap_encoders.rs b/src/encoding/evm/swap_encoder/swap_encoders.rs
index cf41e88..7f9c8c4 100644
--- a/src/encoding/evm/swap_encoder/swap_encoders.rs
+++ b/src/encoding/evm/swap_encoder/swap_encoders.rs
@@ -560,6 +560,45 @@ impl SwapEncoder for CurveSwapEncoder {
     }
 }
 
+/// Encodes a swap on a Maverick V2 pool through the given executor address.
+///
+/// # Fields
+/// * `executor_address` - The address of the executor contract that will perform the swap.
+#[derive(Clone)]
+pub struct MaverickV2SwapEncoder {
+    executor_address: String,
+}
+
+impl SwapEncoder for MaverickV2SwapEncoder {
+    fn new(executor_address: String) -> Self {
+        Self {
+            executor_address,
+        }
+    }
+    fn encode_swap(
+        &self,
+        swap: Swap,
+        encoding_context: EncodingContext,
+    ) -> Result<Vec<u8>, EncodingError> {
+        let component_id = AlloyBytes::from_str(&swap.component.id)
+            .map_err(|_| EncodingError::FatalError("Invalid component ID".to_string()))?;
+
+        let args = (
+            bytes_to_address(&swap.token_in)?,
+            component_id,
+            bytes_to_address(&encoding_context.receiver)?,
+        );
+        Ok(args.abi_encode_packed())
+    }
+
+    fn executor_address(&self) -> &str {
+        &self.executor_address
+    }
+    fn clone_box(&self) -> Box<dyn SwapEncoder> {
+        Box::new(self.clone())
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::collections::HashMap;
@@ -1394,4 +1433,47 @@ mod tests {
             );
         }
     }
+
+    #[test]
+    fn test_encode_maverick_v2() {
+        let maverick_pool = ProtocolComponent {
+            id: String::from("0x14Cf6D2Fe3E1B326114b07d22A6F6bb59e346c67"),
+            protocol_system: String::from("vm:maverick_v2"),
+            ..Default::default()
+        };
+        let token_in = Bytes::from("0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f");
+        let token_out = Bytes::from("0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48");
+        let swap = Swap {
+            component: maverick_pool,
+            token_in: token_in.clone(),
+            token_out: token_out.clone(),
+            split: 0f64,
+        };
+        let encoding_context = EncodingContext {
+            // The receiver was generated with `makeAddr("bob") using forge`
+            receiver: Bytes::from("0x1d96f2f6bef1202e4ce1ff6dad0c2cb002861d3e"),
+            exact_out: false,
+            router_address: Bytes::zero(20),
+            group_token_in: token_in.clone(),
+            group_token_out: token_out.clone(),
+        };
+        let encoder =
+            MaverickV2SwapEncoder::new(String::from("0x543778987b293C7E8Cf0722BB2e935ba6f4068D4"));
+        let encoded_swap = encoder
+            .encode_swap(swap, encoding_context)
+            .unwrap();
+        let hex_swap = encode(&encoded_swap);
+
+        assert_eq!(
+            hex_swap,
+            String::from(concat!(
+                // token in
+                "40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f",
+                // pool
+                "14Cf6D2Fe3E1B326114b07d22A6F6bb59e346c67",
+                // receiver
+                "1d96f2f6bef1202e4ce1ff6dad0c2cb002861d3e",
+            )).to_lowercase()
+        );
+    }
 }