Avoid zero value transfers (#1014)

balancer · Oct 1, 2024 · 59ed949 · 59ed949
1 parent 448f48e
commit 59ed949
Show file tree

Hide file tree

Showing 149 changed files with 308 additions and 215 deletions.
diff --git a/pkg/interfaces/contracts/test/IVaultMainMock.sol b/pkg/interfaces/contracts/test/IVaultMainMock.sol
@@ -269,6 +269,8 @@ interface IVaultMainMock {
 
     function manualSetBufferTotalShares(IERC4626 wrappedToken, uint256 shares) external;
 
+    function manualSetBufferBalances(IERC4626 wrappedToken, uint256 underlyingAmount, uint256 wrappedAmount) external;
+
     function manualSettleReentrancy(IERC20 token) external returns (uint256 paid);
 
     function manualSendToReentrancy(IERC20 token, address to, uint256 amount) external;

diff --git a/pkg/pool-hooks/contracts/MinimalRouter.sol b/pkg/pool-hooks/contracts/MinimalRouter.sol
@@ -138,6 +138,10 @@ abstract contract MinimalRouter is RouterCommon, ReentrancyGuardTransient {
             IERC20 token = tokens[i];
             uint256 amountIn = amountsIn[i];
 
+            if (amountIn == 0) {
+                continue;
+            }
+
             // There can be only one WETH token in the pool.
             if (params.wethIsEth && address(token) == address(_weth)) {
                 if (address(this).balance < amountIn) {
@@ -222,26 +226,26 @@ abstract contract MinimalRouter is RouterCommon, ReentrancyGuardTransient {
         // minAmountsOut length is checked against tokens length at the Vault.
         IERC20[] memory tokens = _vault.getPoolTokens(params.pool);
 
-        uint256 ethAmountOut = 0;
         for (uint256 i = 0; i < tokens.length; ++i) {
             uint256 amountOut = amountsOut[i];
+
+            if (amountOut == 0) {
+                continue;
+            }
+
             IERC20 token = tokens[i];
 
             // There can be only one WETH token in the pool.
             if (params.wethIsEth && address(token) == address(_weth)) {
                 // Send WETH here and unwrap to native ETH.
                 _vault.sendTo(_weth, address(this), amountOut);
                 _weth.withdraw(amountOut);
-                ethAmountOut = amountOut;
+                // Send ETH to receiver.
+                payable(params.receiver).sendValue(amountOut);
             } else {
                 // Transfer the token to the receiver (amountOut).
                 _vault.sendTo(token, params.receiver, amountOut);
             }
         }
-
-        if (ethAmountOut > 0) {
-            // Send ETH to receiver.
-            payable(params.receiver).sendValue(ethAmountOut);
-        }
     }
 }
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 @@
-301.9k
+302.1k
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 @@
-245.5k
+245.6k
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 @@
-340.7k
+333.0k
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 @@
-266.9k
+259.2k
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
+196.4k
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
+181.0k
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.1k
+194.5k
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.8k
diff --git a/.../[StablePool - Standard - BatchRouter] swap exact in with one token and fees - cold slots b/.../[StablePool - Standard - BatchRouter] swap exact in with one token and fees - cold slots
@@ -1 +1 @@
-195.3k
+195.5k
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.4k
+181.6k
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.7k
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
+172.1k
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.5k
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.7k
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
+166.9k
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
+176.7k
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.5k
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.6k
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.3k
+218.2k
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
+202.7k
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.6k
+216.0k
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.3k
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.6k
+228.8k
diff --git a/...[StablePool - With rate - BatchRouter] swap exact in with one token and fees - warm slots b/...[StablePool - With rate - BatchRouter] swap exact in with one token and fees - warm slots
@@ -1 +1 @@
-198.2k
+198.4k
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
+235.1k
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.8k
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.9k
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
+188.4k
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.6k
+198.2k
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.8k
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.4k
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.5k
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.7k
diff --git a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool] initialize without ETH b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool] initialize without ETH
@@ -1 +1 @@
-335.1k
+335.2k
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 @@
-296.8k
+297.0k
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 @@
-232.0k
+232.1k
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 @@
-327.2k
+319.5k
diff --git a/.../[WeightedPool - ERC4626 - BatchRouter] swapExactOut - with buffer liquidity - warm slots b/.../[WeightedPool - ERC4626 - BatchRouter] swapExactOut - with buffer liquidity - warm slots
@@ -1 +1 @@
-253.5k
+245.7k
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
+190.2k
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
+167.8k
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.3k
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.9k
diff --git a/...WeightedPool - Standard - BatchRouter] swap exact in with one token and fees - cold slots b/...WeightedPool - Standard - BatchRouter] swap exact in with one token and fees - cold slots
@@ -1 +1 @@
-185.0k
+185.1k
diff --git a/...WeightedPool - Standard - BatchRouter] swap exact in with one token and fees - warm slots b/...WeightedPool - Standard - BatchRouter] swap exact in with one token and fees - warm slots
@@ -1 +1 @@
-167.9k
+168.0k
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.7k
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.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.7k
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
+153.6k
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
+176.8k
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
+169.2k
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
+152.1k
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.1k
+212.0k
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
+189.5k
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.8k
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.4k
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.3k
+218.5k
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.1k
+184.3k
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
+235.1k
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.6k
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.8k
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.9k
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
+175.1k
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
+198.3k
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.5k
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.3k
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.5k
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
+349.0k
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
@@ -1 +1 @@
-336.4k
+336.5k