balancer · elshan-eth · Oct 25, 2024 · Nov 15, 2024 · Nov 15, 2024 · Nov 15, 2024
diff --git a/pkg/interfaces/contracts/vault/IVaultExtension.sol b/pkg/interfaces/contracts/vault/IVaultExtension.sol
@@ -277,31 +277,6 @@ interface IVaultExtension {
      */
     function approve(address owner, address spender, uint256 amount) external returns (bool);
 
-    /**
-     * @notice Transfers pool token from owner to a recipient.
-     * @dev Notice that the pool token address is not included in the params. This function is exclusively called by
-     * the pool contract, so msg.sender is used as the token address.
-     *
-     * @param owner Address of the owner
-     * @param to Address of the recipient
-     * @param amount Amount of tokens to transfer
-     * @return success True if successful, false otherwise
-     */
-    function transfer(address owner, address to, uint256 amount) external returns (bool);
-
-    /**
-     * @notice Transfers pool token from a sender to a recipient using an allowance.
-     * @dev Notice that the pool token address is not included in the params. This function is exclusively called by
-     * the pool contract, so msg.sender is used as the token address.
-     *
-     * @param spender Address allowed to perform the transfer
-     * @param from Address of the sender
-     * @param to Address of the recipient
-     * @param amount Amount of tokens to transfer
-     * @return success True if successful, false otherwise
-     */
-    function transferFrom(address spender, address from, address to, uint256 amount) external returns (bool);
-
     /*******************************************************************************
                                      Pool Pausing
     *******************************************************************************/

diff --git a/pkg/interfaces/contracts/vault/IVaultMain.sol b/pkg/interfaces/contracts/vault/IVaultMain.sol
@@ -127,6 +127,35 @@ interface IVaultMain {
      */
     function getPoolTokenCountAndIndexOfToken(address pool, IERC20 token) external view returns (uint256, uint256);
 
+    /*******************************************************************************
+                                 Balancer Pool Tokens
+    *******************************************************************************/
+
+    /**
+     * @notice Transfers pool token from owner to a recipient.
+     * @dev Notice that the pool token address is not included in the params. This function is exclusively called by
+     * the pool contract, so msg.sender is used as the token address.
+     *
+     * @param owner Address of the owner
+     * @param to Address of the recipient
+     * @param amount Amount of tokens to transfer
+     * @return success True if successful, false otherwise
+     */
+    function transfer(address owner, address to, uint256 amount) external returns (bool);
+
+    /**
+     * @notice Transfers pool token from a sender to a recipient using an allowance.
+     * @dev Notice that the pool token address is not included in the params. This function is exclusively called by
+     * the pool contract, so msg.sender is used as the token address.
+     *
+     * @param spender Address allowed to perform the transfer
+     * @param from Address of the sender
+     * @param to Address of the recipient
+     * @param amount Amount of tokens to transfer
+     * @return success True if successful, false otherwise
+     */
+    function transferFrom(address spender, address from, address to, uint256 amount) external returns (bool);
+
     /*******************************************************************************
                                   ERC4626 Buffers
     *******************************************************************************/

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 @@
-308.8k
+308.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 @@
-244.3k
+244.4k
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 @@
-331.2k
+331.3k
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 @@
-257.7k
+257.8k
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 @@
-196.4k
+196.5k
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 @@
-180.5k
+180.6k
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 @@
-193.5k
+190.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 @@
-213.6k
+209.5k
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 @@
-194.5k
+194.6k
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 @@
-180.6k
+180.7k
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.0k
+179.1k
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 @@
-171.7k
+171.8k
diff --git a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - Standard] donation b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - Standard] donation
@@ -1 +1 @@
-170.7k
+170.8k
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 @@
-178.8k
+178.9k
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
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
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
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
diff --git a/...shots/[StablePool - WithNestedPool - BatchRouter] swap exact in - reverse - tokenD-tokenA b/...shots/[StablePool - WithNestedPool - BatchRouter] swap exact in - reverse - tokenD-tokenA
@@ -1 +1 @@
-538.1k
+537.3k
diff --git a/...rdhat-snapshots/[StablePool - WithNestedPool - BatchRouter] swap exact in - tokenA-tokenD b/...rdhat-snapshots/[StablePool - WithNestedPool - BatchRouter] swap exact in - tokenA-tokenD
@@ -1 +1 @@
-558.3k
+558.4k
diff --git a/...blePool - WithRate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots b/...blePool - WithRate - BatchRouter] add liquidity unbalanced using swapExactIn - warm slots
@@ -1 +1 @@
-217.8k
+217.9k
diff --git a/...ots/[StablePool - WithRate - BatchRouter] remove liquidity using swapExactIn - warm slots b/...ots/[StablePool - WithRate - BatchRouter] remove liquidity using swapExactIn - warm slots
@@ -1 +1 @@
-214.8k
+211.7k
diff --git a/...ts/[StablePool - WithRate - BatchRouter] remove liquidity using swapExactOut - warm slots b/...ts/[StablePool - WithRate - BatchRouter] remove liquidity using swapExactOut - warm slots
@@ -1 +1 @@
-234.8k
+230.8k
diff --git a/.../[StablePool - WithRate - BatchRouter] swap exact in with one token and fees - cold slots b/.../[StablePool - WithRate - BatchRouter] swap exact in with one token and fees - cold slots
@@ -1 +1 @@
-227.6k
+227.7k
diff --git a/.../[StablePool - WithRate - BatchRouter] swap exact in with one token and fees - warm slots b/.../[StablePool - WithRate - BatchRouter] swap exact in with one token and fees - warm slots
@@ -1 +1 @@
-196.6k
+196.7k
diff --git a/...rdhat-snapshots/[StablePool - WithRate] add liquidity single token exact out - warm slots b/...rdhat-snapshots/[StablePool - WithRate] add liquidity single token exact out - warm slots
@@ -1 +1 @@
-193.1k
+193.2k
diff --git a/...-stable/test/gas/.hardhat-snapshots/[StablePool - WithRate] remove liquidity proportional b/...-stable/test/gas/.hardhat-snapshots/[StablePool - WithRate] remove liquidity proportional
@@ -1 +1 @@
-221.8k
+221.9k
diff --git a/...hat-snapshots/[StablePool - WithRate] remove liquidity single token exact in - warm slots b/...hat-snapshots/[StablePool - WithRate] remove liquidity single token exact in - warm slots
@@ -1 +1 @@
-187.5k
+187.6k
diff --git a/...at-snapshots/[StablePool - WithRate] remove liquidity single token exact out - warm slots b/...at-snapshots/[StablePool - WithRate] remove liquidity single token exact out - warm slots
@@ -1 +1 @@
-197.9k
+198.0k
diff --git a/...rdhat-snapshots/[StablePool - WithRate] swap single token exact in with fees - cold slots b/...rdhat-snapshots/[StablePool - WithRate] swap single token exact in with fees - cold slots
@@ -1 +1 @@
-211.9k
+212.0k
diff --git a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool] donation b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool] donation
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 @@
-230.5k
+230.6k
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 @@
-317.4k
+317.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 @@
-244.0k
+244.1k
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 @@
-189.4k
+189.5k
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 @@
-166.9k
+167.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 @@
-179.8k
+176.8k
diff --git a/.../[WeightedPool - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots b/.../[WeightedPool - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots
@@ -1 +1 @@
-212.8k
+208.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 @@
-158.2k
+158.3k
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] donation b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] donation
@@ -1 +1 @@
-170.7k
+170.8k
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] initialize with ETH b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] initialize with ETH
@@ -1 +1 @@
-348.6k
+348.7k
diff --git a/...ool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] initialize without ETH b/...ool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] initialize without ETH
@@ -1 +1 @@
-336.1k
+336.2k
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 @@
-152.6k
+152.7k
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 @@
-175.9k
+176.0k
diff --git a/...ots/[WeightedPool - WithRate - BatchRouter] add liquidity using swapExactOur - warm slots b/...ots/[WeightedPool - WithRate - BatchRouter] add liquidity using swapExactOur - warm slots
@@ -1 +1 @@
-188.3k
+188.4k
diff --git a/...s/[WeightedPool - WithRate - BatchRouter] remove liquidity using swapExactIn - warm slots b/...s/[WeightedPool - WithRate - BatchRouter] remove liquidity using swapExactIn - warm slots
@@ -1 +1 @@
-201.1k
+198.1k
diff --git a/.../[WeightedPool - WithRate - BatchRouter] remove liquidity using swapExactOut - warm slots b/.../[WeightedPool - WithRate - BatchRouter] remove liquidity using swapExactOut - warm slots
@@ -1 +1 @@
-234.0k
+230.0k
diff --git a/...ghted/test/gas/.hardhat-snapshots/[WeightedPool - WithRate] remove liquidity proportional b/...ghted/test/gas/.hardhat-snapshots/[WeightedPool - WithRate] remove liquidity proportional
@@ -1 +1 @@
-221.8k
+221.9k
diff --git a/...t-snapshots/[WeightedPool - WithRate] remove liquidity single token exact in - warm slots b/...t-snapshots/[WeightedPool - WithRate] remove liquidity single token exact in - warm slots
@@ -1 +1 @@
-173.9k
+174.0k
diff --git a/...-snapshots/[WeightedPool - WithRate] remove liquidity single token exact out - warm slots b/...-snapshots/[WeightedPool - WithRate] remove liquidity single token exact out - warm slots
@@ -1 +1 @@
-197.2k
+197.3k
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] donation b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] donation
diff --git a/pkg/vault/.forge-snapshots/forkBoostedPoolEmptyBufferSwapExactIn.snap b/pkg/vault/.forge-snapshots/forkBoostedPoolEmptyBufferSwapExactIn.snap
diff --git a/pkg/vault/.forge-snapshots/forkBoostedPoolEmptyBufferSwapExactOut.snap b/pkg/vault/.forge-snapshots/forkBoostedPoolEmptyBufferSwapExactOut.snap
diff --git a/pkg/vault/contracts/Vault.sol b/pkg/vault/contracts/Vault.sol
@@ -1091,6 +1091,28 @@ contract Vault is IVaultMain, VaultCommon, Proxy {
         return (poolTokens.length, index);
     }
 
+    /*******************************************************************************
+                                 Balancer Pool Tokens
+    *******************************************************************************/
+
+    /// @inheritdoc IVaultMain
+    function transfer(address owner, address to, uint256 amount) external returns (bool) {
+        _transfer(msg.sender, owner, to, amount);
+        return true;
+    }
+
+    /// @inheritdoc IVaultMain
+    function transferFrom(
+        address spender,
+        address from,
+        address to,
+        uint256 amount
+    ) external returns (bool) {
+        _spendAllowance(msg.sender, from, spender, amount);
+        _transfer(msg.sender, from, to, amount);
+        return true;
+    }
+
     /*******************************************************************************
                                   ERC4626 Buffers
     *******************************************************************************/

diff --git a/pkg/vault/contracts/VaultExtension.sol b/pkg/vault/contracts/VaultExtension.sol
@@ -626,24 +626,6 @@ contract VaultExtension is IVaultExtension, VaultCommon, Proxy {
         return true;
     }
 
-    /// @inheritdoc IVaultExtension
-    function transfer(address owner, address to, uint256 amount) external onlyVaultDelegateCall returns (bool) {
-        _transfer(msg.sender, owner, to, amount);
-        return true;
-    }
-
-    /// @inheritdoc IVaultExtension
-    function transferFrom(
-        address spender,
-        address from,
-        address to,
-        uint256 amount
-    ) external onlyVaultDelegateCall returns (bool) {
-        _spendAllowance(msg.sender, from, spender, amount);
-        _transfer(msg.sender, from, to, amount);
-        return true;
-    }
-
     /*******************************************************************************
                                    ERC4626 Buffers
     *******************************************************************************/

diff --git a/pkg/vault/test/.contract-sizes/Vault b/pkg/vault/test/.contract-sizes/Vault
@@ -1,2 +1,2 @@
-Bytecode	23.378
-InitCode	24.786
+Bytecode	23.850
+InitCode	25.258
diff --git a/pkg/vault/test/.contract-sizes/VaultExtension b/pkg/vault/test/.contract-sizes/VaultExtension
@@ -1,2 +1,2 @@
-Bytecode	19.576
-InitCode	20.729
+Bytecode	19.141
+InitCode	20.293