balancer · EndymionJkb · Oct 1, 2024 · Sep 19, 2024 · Sep 19, 2024 · Sep 23, 2024
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
+304.4k
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
+248.0k
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
+335.2k
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
+261.4k
diff --git a/...blePool - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots b/...blePool - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots
@@ -1 +1 @@
-214.6k
+197.7k
diff --git a/...shots/[StablePool - Standard - BatchRouter] add liquidity using swapExactOur - warm slots b/...shots/[StablePool - Standard - BatchRouter] add liquidity using swapExactOur - warm slots
@@ -1 +1 @@
-199.2k
+182.2k
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
+194.4k
diff --git a/...ts/[StablePool - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots b/...ts/[StablePool - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots
@@ -1 +1 @@
-233.5k
+213.7k
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/...ool-stable/test/gas/.hardhat-snapshots/[StablePool - Standard] add liquidity proportional b/...ool-stable/test/gas/.hardhat-snapshots/[StablePool - Standard] add liquidity proportional
@@ -1 +1 @@
-179.6k
+179.4k
diff --git a/...rdhat-snapshots/[StablePool - Standard] add liquidity single token exact out - warm slots b/...rdhat-snapshots/[StablePool - Standard] add liquidity single token exact out - warm slots
@@ -1 +1 @@
-192.6k
+171.9k
diff --git a/...test/gas/.hardhat-snapshots/[StablePool - Standard] add liquidity unbalanced - warm slots b/...test/gas/.hardhat-snapshots/[StablePool - Standard] add liquidity unbalanced - warm slots
@@ -1 +1 @@
-214.4k
+214.2k
diff --git a/...-stable/test/gas/.hardhat-snapshots/[StablePool - Standard] remove liquidity proportional b/...-stable/test/gas/.hardhat-snapshots/[StablePool - Standard] remove liquidity proportional
@@ -1 +1 @@
-168.0k
+167.6k
diff --git a/...hat-snapshots/[StablePool - Standard] remove liquidity single token exact in - warm slots b/...hat-snapshots/[StablePool - Standard] remove liquidity single token exact in - warm slots
@@ -1 +1 @@
-181.9k
+168.5k
diff --git a/...at-snapshots/[StablePool - Standard] remove liquidity single token exact out - warm slots b/...at-snapshots/[StablePool - Standard] remove liquidity single token exact out - warm slots
@@ -1 +1 @@
-191.7k
+178.3k
diff --git a/...rdhat-snapshots/[StablePool - Standard] swap single token exact in with fees - cold slots b/...rdhat-snapshots/[StablePool - Standard] swap single token exact in with fees - cold slots
@@ -1 +1 @@
-179.4k
+179.3k
diff --git a/...rdhat-snapshots/[StablePool - Standard] swap single token exact in with fees - warm slots b/...rdhat-snapshots/[StablePool - Standard] swap single token exact in with fees - warm slots
@@ -1 +1 @@
-165.5k
+165.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
+219.4k
diff --git a/...hots/[StablePool - With rate - BatchRouter] add liquidity using swapExactOur - warm slots b/...hots/[StablePool - With rate - BatchRouter] add liquidity using swapExactOur - warm slots
@@ -1 +1 @@
-220.9k
+204.0k
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
+215.9k
diff --git a/...s/[StablePool - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots b/...s/[StablePool - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots
@@ -1 +1 @@
-255.0k
+235.2k
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/...ol-stable/test/gas/.hardhat-snapshots/[StablePool - With rate] add liquidity proportional b/...ol-stable/test/gas/.hardhat-snapshots/[StablePool - With rate] add liquidity proportional
@@ -1 +1 @@
-235.0k
+234.8k
diff --git a/...dhat-snapshots/[StablePool - With rate] add liquidity single token exact out - warm slots b/...dhat-snapshots/[StablePool - With rate] add liquidity single token exact out - warm slots
@@ -1 +1 @@
-211.8k
+193.7k
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.7k
diff --git a/...stable/test/gas/.hardhat-snapshots/[StablePool - With rate] remove liquidity proportional b/...stable/test/gas/.hardhat-snapshots/[StablePool - With rate] remove liquidity proportional
@@ -1 +1 @@
-223.2k
+222.8k
diff --git a/...at-snapshots/[StablePool - With rate] remove liquidity single token exact in - warm slots b/...at-snapshots/[StablePool - With rate] remove liquidity single token exact in - warm slots
@@ -1 +1 @@
-200.9k
+190.0k
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
+199.8k
diff --git a/...dhat-snapshots/[StablePool - With rate] swap single token exact in with fees - cold slots b/...dhat-snapshots/[StablePool - With rate] swap single token exact in with fees - cold slots
@@ -1 +1 @@
-212.7k
+212.6k
diff --git a/...dhat-snapshots/[StablePool - With rate] swap single token exact in with fees - warm slots b/...dhat-snapshots/[StablePool - With rate] swap single token exact in with fees - warm slots
@@ -1 +1 @@
-182.3k
+182.2k
diff --git a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool] donation b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool] donation
@@ -1 +1 @@
-178.4k
+178.2k
diff --git a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool] initialize with ETH b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool] initialize with ETH
@@ -1 +1 @@
-347.6k
+347.5k
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
+299.3k
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
+234.5k
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
+321.8k
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
+248.0k
diff --git a/...tedPool - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots b/...tedPool - Standard - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots
@@ -1 +1 @@
-208.3k
+191.4k
diff --git a/...ots/[WeightedPool - Standard - BatchRouter] add liquidity using swapExactOur - warm slots b/...ots/[WeightedPool - Standard - BatchRouter] add liquidity using swapExactOur - warm slots
@@ -1 +1 @@
-185.9k
+169.0k
diff --git a/...s/[WeightedPool - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots b/...s/[WeightedPool - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots
@@ -1 +1 @@
-200.9k
+181.1k
diff --git a/.../[WeightedPool - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots b/.../[WeightedPool - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots
@@ -1 +1 @@
-233.6k
+213.8k
diff --git a/...weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity proportional b/...weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity proportional
@@ -1 +1 @@
-179.6k
+179.4k
diff --git a/...hat-snapshots/[WeightedPool - Standard] add liquidity single token exact out - warm slots b/...hat-snapshots/[WeightedPool - Standard] add liquidity single token exact out - warm slots
@@ -1 +1 @@
-179.3k
+158.7k
diff --git a/...st/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity unbalanced - warm slots b/...st/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity unbalanced - warm slots
@@ -1 +1 @@
-213.0k
+212.8k
diff --git a/...ghted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] remove liquidity proportional b/...ghted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] remove liquidity proportional
@@ -1 +1 @@
-168.0k
+167.6k
diff --git a/...t-snapshots/[WeightedPool - Standard] remove liquidity single token exact in - warm slots b/...t-snapshots/[WeightedPool - Standard] remove liquidity single token exact in - warm slots
@@ -1 +1 @@
-168.6k
+155.2k
diff --git a/...-snapshots/[WeightedPool - Standard] remove liquidity single token exact out - warm slots b/...-snapshots/[WeightedPool - Standard] remove liquidity single token exact out - warm slots
@@ -1 +1 @@
-191.7k
+178.3k
diff --git a/...hat-snapshots/[WeightedPool - Standard] swap single token exact in with fees - cold slots b/...hat-snapshots/[WeightedPool - Standard] swap single token exact in with fees - cold slots
@@ -1 +1 @@
-169.1k
+168.9k
diff --git a/...hat-snapshots/[WeightedPool - Standard] swap single token exact in with fees - warm slots b/...hat-snapshots/[WeightedPool - Standard] swap single token exact in with fees - warm slots
@@ -1 +1 @@
-152.0k
+151.8k
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
+213.2k
diff --git a/...ts/[WeightedPool - With rate - BatchRouter] add liquidity using swapExactOur - warm slots b/...ts/[WeightedPool - With rate - BatchRouter] add liquidity using swapExactOur - warm slots
@@ -1 +1 @@
-207.7k
+190.7k
diff --git a/.../[WeightedPool - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots b/.../[WeightedPool - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots
@@ -1 +1 @@
-222.4k
+202.6k
diff --git a/...[WeightedPool - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots b/...[WeightedPool - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots
@@ -1 +1 @@
-255.1k
+235.3k
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/...eighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity proportional b/...eighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity proportional
@@ -1 +1 @@
-235.0k
+234.8k
diff --git a/...at-snapshots/[WeightedPool - With rate] add liquidity single token exact out - warm slots b/...at-snapshots/[WeightedPool - With rate] add liquidity single token exact out - warm slots
@@ -1 +1 @@
-198.6k
+180.5k
diff --git a/...t/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity unbalanced - warm slots b/...t/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity unbalanced - warm slots
@@ -1 +1 @@
-229.7k
+229.5k
diff --git a/...hted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] remove liquidity proportional b/...hted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] remove liquidity proportional
@@ -1 +1 @@
-223.2k
+222.8k
diff --git a/...-snapshots/[WeightedPool - With rate] remove liquidity single token exact in - warm slots b/...-snapshots/[WeightedPool - With rate] remove liquidity single token exact in - warm slots
@@ -1 +1 @@
-187.6k
+176.7k
diff --git a/...snapshots/[WeightedPool - With rate] remove liquidity single token exact out - warm slots b/...snapshots/[WeightedPool - With rate] remove liquidity single token exact out - warm slots
@@ -1 +1 @@
-210.7k
+199.8k
diff --git a/...at-snapshots/[WeightedPool - With rate] swap single token exact in with fees - cold slots b/...at-snapshots/[WeightedPool - With rate] swap single token exact in with fees - cold slots
@@ -1 +1 @@
-202.4k
+202.3k
diff --git a/...at-snapshots/[WeightedPool - With rate] swap single token exact in with fees - warm slots b/...at-snapshots/[WeightedPool - With rate] swap single token exact in with fees - warm slots
@@ -1 +1 @@
-168.2k
+168.1k
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] donation b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] donation
@@ -1 +1 @@
-178.4k
+178.2k
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
@@ -1 +1 @@
-348.9k
+348.8k
diff --git a/pkg/solidity-utils/contracts/test/ERC20TestToken.sol b/pkg/solidity-utils/contracts/test/ERC20TestToken.sol
@@ -7,6 +7,9 @@ import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 contract ERC20TestToken is ERC20 {
     uint8 private immutable _decimals;
 
+    /// @dev Simulate tokens that don't allow zero transfers.
+    error ZeroTransfer();
+
     constructor(string memory name, string memory symbol, uint8 decimals_) ERC20(name, symbol) {
         _decimals = decimals_;
     }
@@ -22,4 +25,20 @@ contract ERC20TestToken is ERC20 {
     function burn(address sender, uint256 amount) external {
         _burn(sender, amount);
     }
+
+    function transfer(address to, uint256 value) public override returns (bool) {
+        if (value == 0) {
+            revert ZeroTransfer();
+        }
+
+        return super.transfer(to, value);
+    }
+
+    function transferFrom(address from, address to, uint256 value) public override returns (bool) {
+        if (value == 0) {
+            revert ZeroTransfer();
+        }
+
+        return super.transferFrom(from, to, value);
+    }
 }
diff --git a/pkg/vault/contracts/Router.sol b/pkg/vault/contracts/Router.sol
@@ -97,7 +97,7 @@ contract Router is IRouter, RouterCommon, ReentrancyGuardTransient {
                 // Transfer WETH from the Router to the Vault.
                 _weth.transfer(address(_vault), amountIn);
                 _vault.settle(_weth, amountIn);
-            } else {
+            } else if (amountIn > 0) {
                 // Transfer tokens from the user to the Vault.
                 // Any value over MAX_UINT128 would revert above in `initialize`, so this SafeCast shouldn't be
                 // necessary. Done out of an abundance of caution.
@@ -298,7 +298,7 @@ contract Router is IRouter, RouterCommon, ReentrancyGuardTransient {
                 _weth.deposit{ value: amountIn }();
                 _weth.transfer(address(_vault), amountIn);
                 _vault.settle(_weth, amountIn);
-            } else {
+            } else if (amountIn > 0) {
                 // Any value over MAX_UINT128 would revert above in `addLiquidity`, so this SafeCast shouldn't be
                 // necessary. Done out of an abundance of caution.
                 _permit2.transferFrom(params.sender, address(_vault), amountIn.toUint160(), address(token));
@@ -496,7 +496,9 @@ contract Router is IRouter, RouterCommon, ReentrancyGuardTransient {
         }
 
         // Send ETH to sender.
-        payable(params.sender).sendValue(ethAmountOut);
+        if (ethAmountOut > 0) {
+            payable(params.sender).sendValue(ethAmountOut);
+        }
     }
 
     /**