diff --git a/pkg/pool-hooks/foundry.toml b/pkg/pool-hooks/foundry.toml
index b05e9c6b8..cefa2167c 100755
--- a/pkg/pool-hooks/foundry.toml
+++ b/pkg/pool-hooks/foundry.toml
@@ -20,7 +20,7 @@ remappings = [
 ]
 optimizer = true
 optimizer_runs = 999
-solc_version = '0.8.24'
+solc_version = '0.8.27'
 auto_detect_solc = false
 evm_version = 'cancun'
 ignored_error_codes = [2394, 5574, 3860] # Transient storage, code size
diff --git a/pkg/pool-stable/foundry.toml b/pkg/pool-stable/foundry.toml
index b05e9c6b8..cefa2167c 100755
--- a/pkg/pool-stable/foundry.toml
+++ b/pkg/pool-stable/foundry.toml
@@ -20,7 +20,7 @@ remappings = [
 ]
 optimizer = true
 optimizer_runs = 999
-solc_version = '0.8.24'
+solc_version = '0.8.27'
 auto_detect_solc = false
 evm_version = 'cancun'
 ignored_error_codes = [2394, 5574, 3860] # Transient storage, code size
diff --git a/pkg/pool-utils/foundry.toml b/pkg/pool-utils/foundry.toml
index b05e9c6b8..cefa2167c 100755
--- a/pkg/pool-utils/foundry.toml
+++ b/pkg/pool-utils/foundry.toml
@@ -20,7 +20,7 @@ remappings = [
 ]
 optimizer = true
 optimizer_runs = 999
-solc_version = '0.8.24'
+solc_version = '0.8.27'
 auto_detect_solc = false
 evm_version = 'cancun'
 ignored_error_codes = [2394, 5574, 3860] # Transient storage, code size
diff --git a/pkg/pool-weighted/foundry.toml b/pkg/pool-weighted/foundry.toml
index b05e9c6b8..cefa2167c 100755
--- a/pkg/pool-weighted/foundry.toml
+++ b/pkg/pool-weighted/foundry.toml
@@ -20,7 +20,7 @@ remappings = [
 ]
 optimizer = true
 optimizer_runs = 999
-solc_version = '0.8.24'
+solc_version = '0.8.27'
 auto_detect_solc = false
 evm_version = 'cancun'
 ignored_error_codes = [2394, 5574, 3860] # Transient storage, code size
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots
index acc0bc17e..7cc12fa2a 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots	
@@ -1 +1 @@
-209.5k
\ No newline at end of file
+206.9k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] add liquidity using swapExactOur - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] add liquidity using swapExactOur - warm slots
index 366c3e22a..2cd259838 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] add liquidity using swapExactOur - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] add liquidity using swapExactOur - warm slots	
@@ -1 +1 @@
-187.2k
\ No newline at end of file
+184.5k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots
index 3b1a34860..dc73a17ed 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots	
@@ -1 +1 @@
-202.0k
\ No newline at end of file
+199.3k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots
index 8427aef81..8c72f025d 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots	
@@ -1 +1 @@
-235.0k
\ No newline at end of file
+232.3k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] swap exact in with one token and fees - cold slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] swap exact in with one token and fees - cold slots
index a6a4e56f4..61d910b6a 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] swap exact in with one token and fees - cold slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] swap exact in with one token and fees - cold slots	
@@ -1 +1 @@
-188.6k
\ No newline at end of file
+186.1k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] swap exact in with one token and fees - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] swap exact in with one token and fees - warm slots
index 6a4e21edd..4f9c232e4 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] swap exact in with one token and fees - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard - BatchRouter] swap exact in with one token and fees - warm slots	
@@ -1 +1 @@
-171.5k
\ No newline at end of file
+169.0k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity proportional b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity proportional
index 438d6c8b8..686ef4b38 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity proportional	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity proportional	
@@ -1 +1 @@
-180.0k
\ No newline at end of file
+177.9k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity single token exact out - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity single token exact out - warm slots
index a028d8bd3..8093cdd8a 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity single token exact out - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity single token exact out - warm slots	
@@ -1 +1 @@
-179.7k
\ No newline at end of file
+177.6k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity unbalanced - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity unbalanced - warm slots
index 4f13b594b..ce6782c51 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity unbalanced - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity unbalanced - warm slots	
@@ -1 +1 @@
-213.5k
\ No newline at end of file
+211.3k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] remove liquidity proportional b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] remove liquidity proportional
index 1353c06c8..34d039c9c 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] remove liquidity proportional	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] remove liquidity proportional	
@@ -1 +1 @@
-168.7k
\ No newline at end of file
+166.6k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] remove liquidity single token exact in - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] remove liquidity single token exact in - warm slots
index acf77277e..60bcf4864 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] remove liquidity single token exact in - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] remove liquidity single token exact in - warm slots	
@@ -1 +1 @@
-169.3k
\ No newline at end of file
+167.1k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] remove liquidity single token exact out - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] remove liquidity single token exact out - warm slots
index caa1a705d..6d0562c2a 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] remove liquidity single token exact out - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] remove liquidity single token exact out - warm slots	
@@ -1 +1 @@
-192.5k
\ No newline at end of file
+190.4k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] swap single token exact in with fees - cold slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] swap single token exact in with fees - cold slots
index 6a4e21edd..7221e1a20 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] swap single token exact in with fees - cold slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] swap single token exact in with fees - cold slots	
@@ -1 +1 @@
-171.5k
\ No newline at end of file
+170.3k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] swap single token exact in with fees - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] swap single token exact in with fees - warm slots
index e95e917e5..12dd3c11a 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] swap single token exact in with fees - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] swap single token exact in with fees - warm slots	
@@ -1 +1 @@
-154.4k
\ No newline at end of file
+153.2k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots
index 15aa845bf..15b423cf0 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots	
@@ -1 +1 @@
-231.4k
\ No newline at end of file
+228.7k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] add liquidity using swapExactOur - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] add liquidity using swapExactOur - warm slots
index 33862ebdb..d2de27d65 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] add liquidity using swapExactOur - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] add liquidity using swapExactOur - warm slots	
@@ -1 +1 @@
-209.0k
\ No newline at end of file
+206.3k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots
index 726fe6d5a..004790117 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots	
@@ -1 +1 @@
-223.5k
\ No newline at end of file
+220.8k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots
index 3b5a1de12..c4f1b9cee 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots	
@@ -1 +1 @@
-256.5k
\ No newline at end of file
+253.9k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] swap exact in with one token and fees - cold slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] swap exact in with one token and fees - cold slots
index 0cb6255ca..4ddef40d7 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] swap exact in with one token and fees - cold slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] swap exact in with one token and fees - cold slots	
@@ -1 +1 @@
-222.0k
\ No newline at end of file
+219.5k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] swap exact in with one token and fees - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] swap exact in with one token and fees - warm slots
index a1a745b5f..92f992c81 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] swap exact in with one token and fees - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate - BatchRouter] swap exact in with one token and fees - warm slots	
@@ -1 +1 @@
-187.8k
\ No newline at end of file
+185.3k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity proportional b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity proportional
index 3451a2402..078861fcf 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity proportional	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity proportional	
@@ -1 +1 @@
-235.5k
\ No newline at end of file
+233.4k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity single token exact out - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity single token exact out - warm slots
index 6637ded16..cee951944 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity single token exact out - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity single token exact out - warm slots	
@@ -1 +1 @@
-199.0k
\ No newline at end of file
+196.8k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity unbalanced - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity unbalanced - warm slots
index 1e3020238..04dce28e7 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity unbalanced - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity unbalanced - warm slots	
@@ -1 +1 @@
-230.3k
\ No newline at end of file
+228.1k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] remove liquidity proportional b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] remove liquidity proportional
index b08022f6d..adec91666 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] remove liquidity proportional	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] remove liquidity proportional	
@@ -1 +1 @@
-224.0k
\ No newline at end of file
+221.9k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] remove liquidity single token exact in - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] remove liquidity single token exact in - warm slots
index aeaaad228..9e5d45e3c 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] remove liquidity single token exact in - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] remove liquidity single token exact in - warm slots	
@@ -1 +1 @@
-188.3k
\ No newline at end of file
+186.2k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] remove liquidity single token exact out - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] remove liquidity single token exact out - warm slots
index 56ac56a80..e4ebcff9c 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] remove liquidity single token exact out - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] remove liquidity single token exact out - warm slots	
@@ -1 +1 @@
-211.5k
\ No newline at end of file
+209.4k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] swap single token exact in with fees - cold slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] swap single token exact in with fees - cold slots
index adf0102cd..417cdb87d 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] swap single token exact in with fees - cold slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] swap single token exact in with fees - cold slots	
@@ -1 +1 @@
-204.9k
\ No newline at end of file
+203.6k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] swap single token exact in with fees - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] swap single token exact in with fees - warm slots
index f5e4f3723..be52068b9 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] swap single token exact in with fees - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] swap single token exact in with fees - warm slots	
@@ -1 +1 @@
-170.7k
\ No newline at end of file
+169.4k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] donation b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] donation
index 68b670a11..1ce178592 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] donation	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] donation	
@@ -1 +1 @@
-178.8k
\ No newline at end of file
+176.7k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] initialize with ETH b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] initialize with ETH
index d5ce4e317..7d33f8dc1 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] initialize with ETH	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] initialize with ETH	
@@ -1 +1 @@
-348.3k
\ No newline at end of file
+347.0k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] initialize without ETH b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] initialize without ETH
index 8d41f35e7..106effdfc 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] initialize without ETH	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] initialize without ETH	
@@ -1 +1 @@
-335.8k
\ No newline at end of file
+334.5k
\ No newline at end of file
diff --git a/pkg/solidity-utils/foundry.toml b/pkg/solidity-utils/foundry.toml
index b05e9c6b8..cefa2167c 100755
--- a/pkg/solidity-utils/foundry.toml
+++ b/pkg/solidity-utils/foundry.toml
@@ -20,7 +20,7 @@ remappings = [
 ]
 optimizer = true
 optimizer_runs = 999
-solc_version = '0.8.24'
+solc_version = '0.8.27'
 auto_detect_solc = false
 evm_version = 'cancun'
 ignored_error_codes = [2394, 5574, 3860] # Transient storage, code size
diff --git a/pkg/vault/foundry.toml b/pkg/vault/foundry.toml
index b05e9c6b8..cefa2167c 100755
--- a/pkg/vault/foundry.toml
+++ b/pkg/vault/foundry.toml
@@ -20,7 +20,7 @@ remappings = [
 ]
 optimizer = true
 optimizer_runs = 999
-solc_version = '0.8.24'
+solc_version = '0.8.27'
 auto_detect_solc = false
 evm_version = 'cancun'
 ignored_error_codes = [2394, 5574, 3860] # Transient storage, code size
diff --git a/pkg/vault/test/.contract-sizes/BatchRouter b/pkg/vault/test/.contract-sizes/BatchRouter
index 302ffe6bb..822dbbdf1 100644
--- a/pkg/vault/test/.contract-sizes/BatchRouter
+++ b/pkg/vault/test/.contract-sizes/BatchRouter
@@ -1,2 +1,2 @@
-Bytecode	23.200
-InitCode	24.890
\ No newline at end of file
+Bytecode	23.100
+InitCode	24.697
\ No newline at end of file
diff --git a/pkg/vault/test/.contract-sizes/Router b/pkg/vault/test/.contract-sizes/Router
index 4a56e8618..bb8410f96 100644
--- a/pkg/vault/test/.contract-sizes/Router
+++ b/pkg/vault/test/.contract-sizes/Router
@@ -1,2 +1,2 @@
-Bytecode	22.970
-InitCode	24.009
\ No newline at end of file
+Bytecode	22.881
+InitCode	23.853
\ No newline at end of file
diff --git a/pkg/vault/test/.contract-sizes/Vault b/pkg/vault/test/.contract-sizes/Vault
index 4e92b179e..8887a1fc1 100644
--- a/pkg/vault/test/.contract-sizes/Vault
+++ b/pkg/vault/test/.contract-sizes/Vault
@@ -1,2 +1,2 @@
-Bytecode	24.345* (353 over)
-InitCode	25.815
\ No newline at end of file
+Bytecode	23.881
+InitCode	25.222
\ No newline at end of file
diff --git a/pkg/vault/test/.contract-sizes/VaultAdmin b/pkg/vault/test/.contract-sizes/VaultAdmin
index 0b782e057..dfdd1f3a3 100644
--- a/pkg/vault/test/.contract-sizes/VaultAdmin
+++ b/pkg/vault/test/.contract-sizes/VaultAdmin
@@ -1,2 +1,2 @@
-Bytecode	13.858
-InitCode	14.956
\ No newline at end of file
+Bytecode	13.755
+InitCode	14.772
\ No newline at end of file
diff --git a/pkg/vault/test/.contract-sizes/VaultExtension b/pkg/vault/test/.contract-sizes/VaultExtension
index 61be46b5c..87af7c4d2 100644
--- a/pkg/vault/test/.contract-sizes/VaultExtension
+++ b/pkg/vault/test/.contract-sizes/VaultExtension
@@ -1,2 +1,2 @@
-Bytecode	19.488
-InitCode	20.676
\ No newline at end of file
+Bytecode	19.029
+InitCode	20.112
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots
index 506ee166e..d156e2659 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots	
@@ -1 +1 @@
-192.7k
\ No newline at end of file
+190.0k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] add liquidity using swapExactOur - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] add liquidity using swapExactOur - warm slots
index 4617ae956..6244ca739 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] add liquidity using swapExactOur - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] add liquidity using swapExactOur - warm slots	
@@ -1 +1 @@
-187.3k
\ No newline at end of file
+184.7k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots
index 5d2bd5446..485efd4c1 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots	
@@ -1 +1 @@
-202.1k
\ No newline at end of file
+199.5k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots
index 8ed89ae12..727026fc6 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots	
@@ -1 +1 @@
-218.3k
\ No newline at end of file
+215.6k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] swap exact in with one token and fees - cold slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] swap exact in with one token and fees - cold slots
index cdf9810ea..61d910b6a 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] swap exact in with one token and fees - cold slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] swap exact in with one token and fees - cold slots	
@@ -1 +1 @@
-188.7k
\ No newline at end of file
+186.1k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] swap exact in with one token and fees - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] swap exact in with one token and fees - warm slots
index ac5df1c57..4f9c232e4 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] swap exact in with one token and fees - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard - BatchRouter] swap exact in with one token and fees - warm slots	
@@ -1 +1 @@
-171.6k
\ No newline at end of file
+169.0k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] add liquidity proportional b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] add liquidity proportional
index 438d6c8b8..3926676da 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] add liquidity proportional	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] add liquidity proportional	
@@ -1 +1 @@
-180.0k
\ No newline at end of file
+177.8k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] add liquidity single token exact out - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] add liquidity single token exact out - warm slots
index a87088349..a1a7d1552 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] add liquidity single token exact out - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] add liquidity single token exact out - warm slots	
@@ -1 +1 @@
-179.9k
\ No newline at end of file
+177.7k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] add liquidity unbalanced - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] add liquidity unbalanced - warm slots
index dfc86c152..850b54988 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] add liquidity unbalanced - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] add liquidity unbalanced - warm slots	
@@ -1 +1 @@
-196.7k
\ No newline at end of file
+194.5k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] remove liquidity proportional b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] remove liquidity proportional
index 1353c06c8..34d039c9c 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] remove liquidity proportional	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] remove liquidity proportional	
@@ -1 +1 @@
-168.7k
\ No newline at end of file
+166.6k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] remove liquidity single token exact in - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] remove liquidity single token exact in - warm slots
index d81d6fa06..eba3d018d 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] remove liquidity single token exact in - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] remove liquidity single token exact in - warm slots	
@@ -1 +1 @@
-169.5k
\ No newline at end of file
+167.3k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] remove liquidity single token exact out - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] remove liquidity single token exact out - warm slots
index a9c2aa6f0..69d820457 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] remove liquidity single token exact out - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] remove liquidity single token exact out - warm slots	
@@ -1 +1 @@
-175.8k
\ No newline at end of file
+173.7k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] swap single token exact in with fees - cold slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] swap single token exact in with fees - cold slots
index 6a4e21edd..7221e1a20 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] swap single token exact in with fees - cold slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] swap single token exact in with fees - cold slots	
@@ -1 +1 @@
-171.5k
\ No newline at end of file
+170.3k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] swap single token exact in with fees - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] swap single token exact in with fees - warm slots
index e95e917e5..12dd3c11a 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] swap single token exact in with fees - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] swap single token exact in with fees - warm slots	
@@ -1 +1 @@
-154.4k
\ No newline at end of file
+153.2k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots
index 1ee00a46e..9da2b9249 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots	
@@ -1 +1 @@
-214.4k
\ No newline at end of file
+211.8k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] add liquidity using swapExactOur - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] add liquidity using swapExactOur - warm slots
index f3b28ae4f..cc4cb44f4 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] add liquidity using swapExactOur - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] add liquidity using swapExactOur - warm slots	
@@ -1 +1 @@
-209.1k
\ No newline at end of file
+206.5k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots
index 0d94ce1ea..70c3e94fb 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots	
@@ -1 +1 @@
-223.7k
\ No newline at end of file
+221.0k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots
index b0c83f644..0c6129a1d 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots	
@@ -1 +1 @@
-239.8k
\ No newline at end of file
+237.2k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] swap exact in with one token and fees - cold slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] swap exact in with one token and fees - cold slots
index 0cb6255ca..4ddef40d7 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] swap exact in with one token and fees - cold slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] swap exact in with one token and fees - cold slots	
@@ -1 +1 @@
-222.0k
\ No newline at end of file
+219.5k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] swap exact in with one token and fees - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] swap exact in with one token and fees - warm slots
index a1a745b5f..92f992c81 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] swap exact in with one token and fees - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate - BatchRouter] swap exact in with one token and fees - warm slots	
@@ -1 +1 @@
-187.8k
\ No newline at end of file
+185.3k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] add liquidity proportional b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] add liquidity proportional
index 3451a2402..595a5e235 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] add liquidity proportional	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] add liquidity proportional	
@@ -1 +1 @@
-235.5k
\ No newline at end of file
+233.3k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] add liquidity single token exact out - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] add liquidity single token exact out - warm slots
index 90e84e685..daf880c9d 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] add liquidity single token exact out - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] add liquidity single token exact out - warm slots	
@@ -1 +1 @@
-199.1k
\ No newline at end of file
+197.0k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] add liquidity unbalanced - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] add liquidity unbalanced - warm slots
index faf1ec64a..1eb803cca 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] add liquidity unbalanced - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] add liquidity unbalanced - warm slots	
@@ -1 +1 @@
-213.2k
\ No newline at end of file
+211.0k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] remove liquidity proportional b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] remove liquidity proportional
index b08022f6d..5324530d9 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] remove liquidity proportional	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] remove liquidity proportional	
@@ -1 +1 @@
-224.0k
\ No newline at end of file
+221.8k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] remove liquidity single token exact in - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] remove liquidity single token exact in - warm slots
index 7ee74488c..4f6a7be2f 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] remove liquidity single token exact in - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] remove liquidity single token exact in - warm slots	
@@ -1 +1 @@
-188.5k
\ No newline at end of file
+186.4k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] remove liquidity single token exact out - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] remove liquidity single token exact out - warm slots
index c31f5c445..506ee166e 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] remove liquidity single token exact out - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] remove liquidity single token exact out - warm slots	
@@ -1 +1 @@
-194.8k
\ No newline at end of file
+192.7k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] swap single token exact in with fees - cold slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] swap single token exact in with fees - cold slots
index adf0102cd..0db5d5ab7 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] swap single token exact in with fees - cold slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] swap single token exact in with fees - cold slots	
@@ -1 +1 @@
-204.9k
\ No newline at end of file
+203.7k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] swap single token exact in with fees - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] swap single token exact in with fees - warm slots
index f5e4f3723..d81d6fa06 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] swap single token exact in with fees - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] swap single token exact in with fees - warm slots	
@@ -1 +1 @@
-170.7k
\ No newline at end of file
+169.5k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots
index b52f387ff..1b3c249b7 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots	
@@ -1 +1 @@
-211.1k
\ No newline at end of file
+208.3k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] add liquidity using swapExactOur - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] add liquidity using swapExactOur - warm slots
index 6b0702577..4944083e2 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] add liquidity using swapExactOur - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] add liquidity using swapExactOur - warm slots	
@@ -1 +1 @@
-205.7k
\ No newline at end of file
+203.0k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots
index 3c0a54e75..007fed429 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots	
@@ -1 +1 @@
-220.5k
\ No newline at end of file
+217.8k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots
index 386a93cc7..7da882aa3 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots	
@@ -1 +1 @@
-236.7k
\ No newline at end of file
+233.9k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] swap exact in with one token and fees - cold slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] swap exact in with one token and fees - cold slots
index a214cdf2f..3926676da 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] swap exact in with one token and fees - cold slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] swap exact in with one token and fees - cold slots	
@@ -1 +1 @@
-180.5k
\ No newline at end of file
+177.8k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] swap exact in with one token and fees - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] swap exact in with one token and fees - warm slots
index a214cdf2f..3926676da 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] swap exact in with one token and fees - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard - BatchRouter] swap exact in with one token and fees - warm slots	
@@ -1 +1 @@
-180.5k
\ No newline at end of file
+177.8k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] add liquidity proportional b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] add liquidity proportional
index 2c5955baf..d45abbc2b 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] add liquidity proportional	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] add liquidity proportional	
@@ -1 +1 @@
-198.4k
\ No newline at end of file
+196.1k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] add liquidity single token exact out - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] add liquidity single token exact out - warm slots
index a5dc1053f..6f82b500f 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] add liquidity single token exact out - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] add liquidity single token exact out - warm slots	
@@ -1 +1 @@
-198.3k
\ No newline at end of file
+196.0k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] add liquidity unbalanced - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] add liquidity unbalanced - warm slots
index a0bdff74a..006e28933 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] add liquidity unbalanced - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] add liquidity unbalanced - warm slots	
@@ -1 +1 @@
-215.1k
\ No newline at end of file
+212.8k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] remove liquidity proportional b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] remove liquidity proportional
index da2903a1f..361866da9 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] remove liquidity proportional	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] remove liquidity proportional	
@@ -1 +1 @@
-187.1k
\ No newline at end of file
+184.8k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] remove liquidity single token exact in - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] remove liquidity single token exact in - warm slots
index a1a745b5f..17f953d26 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] remove liquidity single token exact in - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] remove liquidity single token exact in - warm slots	
@@ -1 +1 @@
-187.8k
\ No newline at end of file
+185.6k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] remove liquidity single token exact out - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] remove liquidity single token exact out - warm slots
index 434aaa7cb..74b630b3e 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] remove liquidity single token exact out - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] remove liquidity single token exact out - warm slots	
@@ -1 +1 @@
-194.2k
\ No newline at end of file
+191.9k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] swap single token exact in with fees - cold slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] swap single token exact in with fees - cold slots
index 74d884a26..0587ea192 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] swap single token exact in with fees - cold slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] swap single token exact in with fees - cold slots	
@@ -1 +1 @@
-163.3k
\ No newline at end of file
+162.0k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] swap single token exact in with fees - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] swap single token exact in with fees - warm slots
index 74d884a26..0587ea192 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] swap single token exact in with fees - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - Standard] swap single token exact in with fees - warm slots	
@@ -1 +1 @@
-163.3k
\ No newline at end of file
+162.0k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots
index 9017a86ce..40884c25f 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots	
@@ -1 +1 @@
-234.8k
\ No newline at end of file
+232.1k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] add liquidity using swapExactOur - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] add liquidity using swapExactOur - warm slots
index 21d3e9c7e..825dfb8c6 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] add liquidity using swapExactOur - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] add liquidity using swapExactOur - warm slots	
@@ -1 +1 @@
-229.5k
\ No newline at end of file
+226.7k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots
index f20a5077f..1b07c2095 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots	
@@ -1 +1 @@
-244.0k
\ No newline at end of file
+241.3k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots
index 69a312eb1..618a208c4 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots	
@@ -1 +1 @@
-260.2k
\ No newline at end of file
+257.4k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] swap exact in with one token and fees - cold slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] swap exact in with one token and fees - cold slots
index eeb58a936..8427aef81 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] swap exact in with one token and fees - cold slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] swap exact in with one token and fees - cold slots	
@@ -1 +1 @@
-237.7k
\ No newline at end of file
+235.0k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] swap exact in with one token and fees - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] swap exact in with one token and fees - warm slots
index 6e9558318..3621d275c 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] swap exact in with one token and fees - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate - BatchRouter] swap exact in with one token and fees - warm slots	
@@ -1 +1 @@
-203.5k
\ No newline at end of file
+200.8k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] add liquidity proportional b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] add liquidity proportional
index 8c0ff5edc..d02c29566 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] add liquidity proportional	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] add liquidity proportional	
@@ -1 +1 @@
-255.8k
\ No newline at end of file
+253.6k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] add liquidity single token exact out - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] add liquidity single token exact out - warm slots
index 4ddef40d7..9990f4815 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] add liquidity single token exact out - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] add liquidity single token exact out - warm slots	
@@ -1 +1 @@
-219.5k
\ No newline at end of file
+217.2k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] add liquidity unbalanced - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] add liquidity unbalanced - warm slots
index e6ab6cf98..92f712a35 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] add liquidity unbalanced - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] add liquidity unbalanced - warm slots	
@@ -1 +1 @@
-233.5k
\ No newline at end of file
+231.2k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] remove liquidity proportional b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] remove liquidity proportional
index db11d7f15..f99fe0703 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] remove liquidity proportional	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] remove liquidity proportional	
@@ -1 +1 @@
-244.3k
\ No newline at end of file
+242.0k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] remove liquidity single token exact in - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] remove liquidity single token exact in - warm slots
index 8a85979a0..2b4e02c86 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] remove liquidity single token exact in - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] remove liquidity single token exact in - warm slots	
@@ -1 +1 @@
-208.8k
\ No newline at end of file
+206.6k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] remove liquidity single token exact out - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] remove liquidity single token exact out - warm slots
index 1009b84da..16f431ba3 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] remove liquidity single token exact out - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] remove liquidity single token exact out - warm slots	
@@ -1 +1 @@
-215.2k
\ No newline at end of file
+212.9k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] swap single token exact in with fees - cold slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] swap single token exact in with fees - cold slots
index 3c0a54e75..73ffaddac 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] swap single token exact in with fees - cold slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] swap single token exact in with fees - cold slots	
@@ -1 +1 @@
-220.5k
\ No newline at end of file
+219.2k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] swap single token exact in with fees - warm slots b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] swap single token exact in with fees - warm slots
index e3f32da36..ccd83df97 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] swap single token exact in with fees - warm slots	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - With rate] swap single token exact in with fees - warm slots	
@@ -1 +1 @@
-186.3k
\ No newline at end of file
+185.0k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks] donation b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks] donation
index 90e84e685..26450a775 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks] donation	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks] donation	
@@ -1 +1 @@
-199.1k
\ No newline at end of file
+196.9k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks] initialize with ETH b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks] initialize with ETH
index 3b4f1d72f..9355d6a27 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks] initialize with ETH	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks] initialize with ETH	
@@ -1 +1 @@
-356.2k
\ No newline at end of file
+354.9k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks] initialize without ETH b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks] initialize without ETH
index 7c5e21eb0..f107edd30 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks] initialize without ETH	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks] initialize without ETH	
@@ -1 +1 @@
-343.6k
\ No newline at end of file
+342.3k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] donation b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] donation
index 68b670a11..1ce178592 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] donation	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] donation	
@@ -1 +1 @@
-178.8k
\ No newline at end of file
+176.7k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] initialize with ETH b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] initialize with ETH
index 3f495065a..90db088bd 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] initialize with ETH	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] initialize with ETH	
@@ -1 +1 @@
-342.9k
\ No newline at end of file
+341.6k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] initialize without ETH b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] initialize without ETH
index c32c3e95f..8ce688f27 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] initialize without ETH	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] initialize without ETH	
@@ -1 +1 @@
-330.3k
\ No newline at end of file
+329.0k
\ No newline at end of file
diff --git a/pvt/benchmarks/foundry.toml b/pvt/benchmarks/foundry.toml
index 597ee8cd3..4efd9c9b4 100644
--- a/pvt/benchmarks/foundry.toml
+++ b/pvt/benchmarks/foundry.toml
@@ -22,7 +22,7 @@ gas_reports = ["Router", "Vault", "WeightedPool"]
 optimizer = true
 optimizer_runs = 9999
 via_ir = true
-solc_version = '0.8.24'
+solc_version = '0.8.27'
 auto_detect_solc = false
 evm_version = 'cancun'
 ignored_error_codes = [2394, 5574, 3860] # Transient storage, code size
diff --git a/pvt/common/hardhat-base-config.ts b/pvt/common/hardhat-base-config.ts
index f8abbed27..0f9788bd2 100644
--- a/pvt/common/hardhat-base-config.ts
+++ b/pvt/common/hardhat-base-config.ts
@@ -9,22 +9,34 @@ type SolcConfig = {
     optimizer: {
       enabled: boolean;
       runs?: number;
+      details: {
+        yulDetails: {
+          optimizerSteps: string;
+        };
+      };
     };
   };
 };
 
 // The coverage report doesn't work well with via-ir flags, so we disable it
 const viaIR = !process.env.COVERAGE;
+const optimizerSteps =
+  'dhfoDgvulfnTUtnIf [ xa[r]EscLM cCTUtTOntnfDIul Lcul Vcul [j] Tpeul xa[rul] xa[r]cL gvif CTUca[r]LSsTFOtfDnca[r]Iulc ] jmul[jul] VcTOcul jmul : fDnTOcmu';
 
 export const compilers: [SolcConfig] = [
   {
-    version: '0.8.24',
+    version: '0.8.27',
     settings: {
       viaIR,
       evmVersion: 'cancun',
       optimizer: {
         enabled: true,
         runs: 9999,
+        details: {
+          yulDetails: {
+            optimizerSteps,
+          },
+        },
       },
     },
   },
@@ -46,12 +58,12 @@ const contractSettings: ContractSettings = {
     viaIR,
   },
   '@balancer-labs/v3-vault/contracts/Vault.sol': {
-    version: '0.8.24',
+    version: '0.8.27',
     runs: 200,
     viaIR,
   },
   '@balancer-labs/v3-vault/contracts/VaultExtension.sol': {
-    version: '0.8.24',
+    version: '0.8.27',
     runs: 500,
     viaIR,
   },
@@ -86,6 +98,11 @@ export const overrides = (packageName: string): Record<string, SolcConfig> => {
         optimizer: {
           enabled: true,
           runs: contractSettings[contract].runs,
+          details: {
+            yulDetails: {
+              optimizerSteps,
+            },
+          },
         },
       },
     };