balancer · joaobrunoah · Sep 27, 2024 · Sep 27, 2024 · EndymionJkb · Sep 27, 2024
diff --git a/pkg/interfaces/contracts/vault/VaultTypes.sol b/pkg/interfaces/contracts/vault/VaultTypes.sol
@@ -352,15 +352,13 @@ enum WrappingDirection {
  * @param amountGivenRaw Amount specified for tokenIn or tokenOut (depends on the type of swap and wrapping direction)
  * @param limitRaw Minimum or maximum amount specified for the other token (depends on the type of swap and wrapping
  * direction)
- * @param userData Optional user data
  */
 struct BufferWrapOrUnwrapParams {
     SwapKind kind;
     WrappingDirection direction;
     IERC4626 wrappedToken;
     uint256 amountGivenRaw;
     uint256 limitRaw;
-    bytes userData;
 }
 
 // Protocol Fees are 24-bit values. We transform them by multiplying by 1e11, so

diff --git a/...shots/[StablePool - ERC4626 - BatchRouter] swapExactIn - no buffer liquidity - warm slots b/...shots/[StablePool - ERC4626 - BatchRouter] swapExactIn - no buffer liquidity - warm slots
@@ -1 +1 @@
-304.6k
+301.9k
diff --git a/...ots/[StablePool - ERC4626 - BatchRouter] swapExactIn - with buffer liquidity - warm slots b/...ots/[StablePool - ERC4626 - BatchRouter] swapExactIn - with buffer liquidity - warm slots
@@ -1 +1 @@
-248.2k
+245.5k
diff --git a/...hots/[StablePool - ERC4626 - BatchRouter] swapExactOut - no buffer liquidity - warm slots b/...hots/[StablePool - ERC4626 - BatchRouter] swapExactOut - no buffer liquidity - warm slots
@@ -1 +1 @@
-343.3k
+340.7k
diff --git a/...ts/[StablePool - ERC4626 - BatchRouter] swapExactOut - with buffer liquidity - warm slots b/...ts/[StablePool - ERC4626 - BatchRouter] swapExactOut - with buffer liquidity - warm slots
@@ -1 +1 @@
-269.5k
+266.9k
diff --git a/...ots/[StablePool - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots b/...ots/[StablePool - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots
@@ -1 +1 @@
-214.2k
+214.1k
diff --git a/.../[StablePool - Standard - BatchRouter] swap exact in with one token and fees - warm slots b/.../[StablePool - Standard - BatchRouter] swap exact in with one token and fees - warm slots
@@ -1 +1 @@
-181.5k
+181.4k
diff --git a/...lePool - With rate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots b/...lePool - With rate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots
@@ -1 +1 @@
-236.4k
+236.3k
diff --git a/...ts/[StablePool - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots b/...ts/[StablePool - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots
@@ -1 +1 @@
-235.7k
+235.6k
diff --git a/...[StablePool - With rate - BatchRouter] swap exact in with one token and fees - cold slots b/...[StablePool - With rate - BatchRouter] swap exact in with one token and fees - cold slots
@@ -1 +1 @@
-228.7k
+228.6k
diff --git a/...est/gas/.hardhat-snapshots/[StablePool - With rate] add liquidity unbalanced - warm slots b/...est/gas/.hardhat-snapshots/[StablePool - With rate] add liquidity unbalanced - warm slots
@@ -1 +1 @@
-230.8k
+230.9k
diff --git a/...t-snapshots/[StablePool - With rate] remove liquidity single token exact out - warm slots b/...t-snapshots/[StablePool - With rate] remove liquidity single token exact out - warm slots
@@ -1 +1 @@
-210.7k
+210.6k
diff --git a/pkg/pool-weighted/foundry.toml b/pkg/pool-weighted/foundry.toml
@@ -29,11 +29,11 @@ evm_version = 'cancun'
 ignored_error_codes = [2394, 5574, 3860] # Transient storage, code size
 
 [fuzz]
-runs = 10000
+runs = 100
 max_test_rejects = 60000
 
 [profile.forkfuzz.fuzz]
-runs = 1000
+runs = 100
 max_test_rejects = 60000
 
 [profile.coverage.fuzz]

diff --git a/...ots/[WeightedPool - ERC4626 - BatchRouter] swapExactIn - no buffer liquidity - warm slots b/...ots/[WeightedPool - ERC4626 - BatchRouter] swapExactIn - no buffer liquidity - warm slots
@@ -1 +1 @@
-299.5k
+296.8k
diff --git a/...s/[WeightedPool - ERC4626 - BatchRouter] swapExactIn - with buffer liquidity - warm slots b/...s/[WeightedPool - ERC4626 - BatchRouter] swapExactIn - with buffer liquidity - warm slots
@@ -1 +1 @@
-234.7k
+232.0k
diff --git a/...ts/[WeightedPool - ERC4626 - BatchRouter] swapExactOut - no buffer liquidity - warm slots b/...ts/[WeightedPool - ERC4626 - BatchRouter] swapExactOut - no buffer liquidity - warm slots
@@ -1 +1 @@
-329.9k
+327.2k
diff --git a/.../[WeightedPool - ERC4626 - BatchRouter] swapExactOut - with buffer liquidity - warm slots b/.../[WeightedPool - ERC4626 - BatchRouter] swapExactOut - with buffer liquidity - warm slots
@@ -1 +1 @@
-256.1k
+253.5k
diff --git a/...edPool - With rate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots b/...edPool - With rate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots
@@ -1 +1 @@
-230.2k
+230.1k
diff --git a/...eightedPool - With rate - BatchRouter] swap exact in with one token and fees - cold slots b/...eightedPool - With rate - BatchRouter] swap exact in with one token and fees - cold slots
@@ -1 +1 @@
-218.4k
+218.3k
diff --git a/...eightedPool - With rate - BatchRouter] swap exact in with one token and fees - warm slots b/...eightedPool - With rate - BatchRouter] swap exact in with one token and fees - warm slots
@@ -1 +1 @@
-184.2k
+184.1k
diff --git a/pkg/vault/contracts/BatchRouter.sol b/pkg/vault/contracts/BatchRouter.sol
@@ -197,8 +197,7 @@ contract BatchRouter is IBatchRouter, BatchRouterCommon, ReentrancyGuardTransien
                                 : WrappingDirection.WRAP,
                             wrappedToken: IERC4626(step.pool),
                             amountGivenRaw: stepExactAmountIn,
-                            limitRaw: minAmountOut,
-                            userData: params.userData
+                            limitRaw: minAmountOut
                         })
                     );
 
@@ -449,8 +448,7 @@ contract BatchRouter is IBatchRouter, BatchRouterCommon, ReentrancyGuardTransien
                                 : WrappingDirection.WRAP,
                             wrappedToken: IERC4626(step.pool),
                             amountGivenRaw: stepExactAmountOut,
-                            limitRaw: stepMaxAmountIn,
-                            userData: params.userData
+                            limitRaw: stepMaxAmountIn
                         })
                     );
 

diff --git a/pkg/vault/contracts/CompositeLiquidityRouter.sol b/pkg/vault/contracts/CompositeLiquidityRouter.sol
@@ -297,8 +297,7 @@ contract CompositeLiquidityRouter is ICompositeLiquidityRouter, BatchRouterCommo
                     direction: WrappingDirection.UNWRAP,
                     wrappedToken: wrappedToken,
                     amountGivenRaw: wrappedAmountsOut[i],
-                    limitRaw: params.minAmountsOut[i],
-                    userData: params.userData
+                    limitRaw: params.minAmountsOut[i]
                 })
             );
 
@@ -360,8 +359,7 @@ contract CompositeLiquidityRouter is ICompositeLiquidityRouter, BatchRouterCommo
                     direction: WrappingDirection.WRAP,
                     wrappedToken: wrappedToken,
                     amountGivenRaw: amountsIn[i],
-                    limitRaw: limits[i],
-                    userData: params.userData
+                    limitRaw: limits[i]
                 })
             );
 

diff --git a/pkg/vault/test/.contract-sizes/BatchRouter b/pkg/vault/test/.contract-sizes/BatchRouter
@@ -1,2 +1,2 @@
-Bytecode	16.785
-InitCode	18.245
+Bytecode	16.818
+InitCode	18.306
diff --git a/pkg/vault/test/.contract-sizes/CompositeLiquidityRouter b/pkg/vault/test/.contract-sizes/CompositeLiquidityRouter
@@ -1,2 +1,2 @@
-Bytecode	23.774
-InitCode	25.313
+Bytecode	23.557
+InitCode	25.096
diff --git a/pkg/vault/test/.contract-sizes/Vault b/pkg/vault/test/.contract-sizes/Vault
@@ -1,2 +1,2 @@
-Bytecode	23.066
-InitCode	24.407
+Bytecode	23.006
+InitCode	24.347
diff --git a/pkg/vault/test/foundry/BufferDoSProtection.t.sol b/pkg/vault/test/foundry/BufferDoSProtection.t.sol
@@ -95,8 +95,7 @@ contract BufferDoSProtectionTest is BaseVaultTest {
                         direction: WrappingDirection.WRAP,
                         wrappedToken: IERC4626(address(waDAI)),
                         amountGivenRaw: amountGivenRaw,
-                        limitRaw: limitRaw,
-                        userData: bytes("")
+                        limitRaw: limitRaw
                     }),
                     lp,
                     frontrunnerUnderlyingAmount
@@ -137,8 +136,7 @@ contract BufferDoSProtectionTest is BaseVaultTest {
                         direction: WrappingDirection.UNWRAP,
                         wrappedToken: IERC4626(address(waDAI)),
                         amountGivenRaw: amountGivenRaw,
-                        limitRaw: limitRaw,
-                        userData: bytes("")
+                        limitRaw: limitRaw
                     }),
                     lp,
                     frontrunnerWrappedAmount

diff --git a/pkg/vault/test/foundry/BufferVaultPrimitive.t.sol b/pkg/vault/test/foundry/BufferVaultPrimitive.t.sol
@@ -229,8 +229,7 @@ contract BufferVaultPrimitiveTest is BaseVaultTest {
                     direction: WrappingDirection.WRAP,
                     wrappedToken: IERC4626(address(waDAI)),
                     amountGivenRaw: vaultBalance,
-                    limitRaw: 0,
-                    userData: bytes("")
+                    limitRaw: 0
                 })
             )
         );
@@ -387,8 +386,7 @@ contract BufferVaultPrimitiveTest is BaseVaultTest {
                     direction: WrappingDirection.WRAP,
                     wrappedToken: IERC4626(address(waDAI)),
                     amountGivenRaw: PRODUCTION_MIN_WRAP_AMOUNT,
-                    limitRaw: MAX_UINT128,
-                    userData: bytes("")
+                    limitRaw: MAX_UINT128
                 })
             )
         );

diff --git a/...apshots/[PoolMock - ERC4626 - BatchRouter] swapExactIn - no buffer liquidity - warm slots b/...apshots/[PoolMock - ERC4626 - BatchRouter] swapExactIn - no buffer liquidity - warm slots
@@ -1 +1 @@
-291.1k
+288.4k
diff --git a/...shots/[PoolMock - ERC4626 - BatchRouter] swapExactIn - with buffer liquidity - warm slots b/...shots/[PoolMock - ERC4626 - BatchRouter] swapExactIn - with buffer liquidity - warm slots
@@ -1 +1 @@
-234.7k
+232.0k
diff --git a/...pshots/[PoolMock - ERC4626 - BatchRouter] swapExactOut - no buffer liquidity - warm slots b/...pshots/[PoolMock - ERC4626 - BatchRouter] swapExactOut - no buffer liquidity - warm slots
@@ -1 +1 @@
-321.4k
+318.8k
diff --git a/...hots/[PoolMock - ERC4626 - BatchRouter] swapExactOut - with buffer liquidity - warm slots b/...hots/[PoolMock - ERC4626 - BatchRouter] swapExactOut - with buffer liquidity - warm slots
@@ -1 +1 @@
-256.0k
+253.4k
diff --git a/...oolMock - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots b/...oolMock - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots
@@ -1 +1 @@
-191.6k
+191.5k
diff --git a/...hots/[PoolMock - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots b/...hots/[PoolMock - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots
@@ -1 +1 @@
-217.0k
+216.9k
diff --git a/...hardhat-snapshots/[PoolMock - Standard] add liquidity single token exact out - warm slots b/...hardhat-snapshots/[PoolMock - Standard] add liquidity single token exact out - warm slots
@@ -1 +1 @@
-179.3k
+179.4k
diff --git a/...dhat-snapshots/[PoolMock - Standard] remove liquidity single token exact out - warm slots b/...dhat-snapshots/[PoolMock - Standard] remove liquidity single token exact out - warm slots
@@ -1 +1 @@
-175.1k
+175.0k
diff --git a/...hardhat-snapshots/[PoolMock - Standard] swap single token exact in with fees - cold slots b/...hardhat-snapshots/[PoolMock - Standard] swap single token exact in with fees - cold slots
@@ -1 +1 @@
-169.0k
+169.1k
diff --git a/...hardhat-snapshots/[PoolMock - Standard] swap single token exact in with fees - warm slots b/...hardhat-snapshots/[PoolMock - Standard] swap single token exact in with fees - warm slots
@@ -1 +1 @@
-151.9k
+152.0k
diff --git a/...ots/[PoolMock - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots b/...ots/[PoolMock - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots
@@ -1 +1 @@
-238.5k
+238.4k
diff --git a/...PoolMockWithHooks - ERC4626 - BatchRouter] swapExactIn - no buffer liquidity - warm slots b/...PoolMockWithHooks - ERC4626 - BatchRouter] swapExactIn - no buffer liquidity - warm slots
@@ -1 +1 @@
-309.5k
+306.9k
diff --git a/...olMockWithHooks - ERC4626 - BatchRouter] swapExactIn - with buffer liquidity - warm slots b/...olMockWithHooks - ERC4626 - BatchRouter] swapExactIn - with buffer liquidity - warm slots
@@ -1 +1 @@
-248.3k
+245.6k
diff --git a/...oolMockWithHooks - ERC4626 - BatchRouter] swapExactOut - no buffer liquidity - warm slots b/...oolMockWithHooks - ERC4626 - BatchRouter] swapExactOut - no buffer liquidity - warm slots
@@ -1 +1 @@
-343.7k
+341.0k
diff --git a/...lMockWithHooks - ERC4626 - BatchRouter] swapExactOut - with buffer liquidity - warm slots b/...lMockWithHooks - ERC4626 - BatchRouter] swapExactOut - with buffer liquidity - warm slots
@@ -1 +1 @@
-269.9k
+267.3k
diff --git a/...olMockWithHooks - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots b/...olMockWithHooks - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots
@@ -1 +1 @@
-219.3k
+219.2k
diff --git a/...lMockWithHooks - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots b/...lMockWithHooks - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots
@@ -1 +1 @@
-242.7k
+242.6k
diff --git a/...ckWithHooks - With rate - BatchRouter] swap exact in with one token and fees - cold slots b/...ckWithHooks - With rate - BatchRouter] swap exact in with one token and fees - cold slots
@@ -1 +1 @@
-233.9k
+233.8k
diff --git a/...ckWithHooks - With rate - BatchRouter] swap exact in with one token and fees - warm slots b/...ckWithHooks - With rate - BatchRouter] swap exact in with one token and fees - warm slots
@@ -1 +1 @@
-199.7k
+199.6k
diff --git a/.../.hardhat-snapshots/[PoolMockWithHooks - With rate] add liquidity unbalanced - warm slots b/.../.hardhat-snapshots/[PoolMockWithHooks - With rate] add liquidity unbalanced - warm slots
@@ -1 +1 @@
-232.8k
+232.9k
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] initialize with ETH b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] initialize with ETH
@@ -1 +1 @@
-343.4k
+343.5k
diff --git 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.9k
+331.0k