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,18 +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

diff --git a/pkg/interfaces/contracts/vault/IVaultMain.sol b/pkg/interfaces/contracts/vault/IVaultMain.sol
@@ -127,6 +127,22 @@ 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);
+
     /*******************************************************************************
                                   ERC4626 Buffers
     *******************************************************************************/

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
+212.5k
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.8k
+171.9k
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 @@
-166.5k
+166.6k
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 @@
-215.0k
+214.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 @@
-234.9k
+233.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 @@
-193.2k
+193.3k
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 @@
-167.2k
+167.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 @@
-213.2k
+212.1k
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 @@
-201.6k
+201.5k
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 @@
-234.5k
+233.4k
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.5k
+336.6k
diff --git a/pkg/vault/contracts/Vault.sol b/pkg/vault/contracts/Vault.sol
@@ -1085,6 +1085,16 @@ 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;
+    }
+
     /*******************************************************************************
                                   ERC4626 Buffers
     *******************************************************************************/

diff --git a/pkg/vault/contracts/VaultExtension.sol b/pkg/vault/contracts/VaultExtension.sol
@@ -625,12 +625,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,

diff --git a/pkg/vault/test/.contract-sizes/Vault b/pkg/vault/test/.contract-sizes/Vault
@@ -1,2 +1,2 @@
-Bytecode	23.569
-InitCode	24.978
+Bytecode	23.972
+InitCode	25.380
diff --git a/pkg/vault/test/.contract-sizes/VaultExtension b/pkg/vault/test/.contract-sizes/VaultExtension
@@ -1,2 +1,2 @@
-Bytecode	19.350
-InitCode	20.495
+Bytecode	19.289
+InitCode	20.435
diff --git a/pkg/vault/test/foundry/mutation/vault/VaultExtension.t.sol b/pkg/vault/test/foundry/mutation/vault/VaultExtension.t.sol
@@ -159,11 +159,6 @@ contract VaultExtensionMutationTest is BaseVaultTest {
         vaultExtension.allowance(address(dai), address(1), address(2));
     }
 
-    function testTransferWhenNotVault() public {
-        vm.expectRevert(IVaultErrors.NotVaultDelegateCall.selector);
-        vaultExtension.transfer(address(0), address(1), 1);
-    }
-
     function testApproveWhenNotVault() public {
         vm.expectRevert(IVaultErrors.NotVaultDelegateCall.selector);
         vaultExtension.approve(address(0), address(1), 0);

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 @@
-196.6k
+195.5k
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 @@
-159.7k
+159.8k
diff --git a/...pshots/[PoolMock - With rate - BatchRouter] add liquidity using swapExactOur - warm slots b/...pshots/[PoolMock - With rate - BatchRouter] add liquidity using swapExactOur - warm slots
@@ -1 +1 @@
-188.6k
+188.7k
diff --git a/...hots/[PoolMock - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots b/...hots/[PoolMock - With rate - BatchRouter] remove liquidity using swapExactIn - warm slots
@@ -1 +1 @@
-201.7k
+201.6k
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 @@
-217.8k
+216.7k
diff --git a/...dhat-snapshots/[PoolMock - With rate] remove liquidity single token exact in - warm slots b/...dhat-snapshots/[PoolMock - With rate] remove liquidity single token exact in - warm slots
@@ -1 +1 @@
-174.4k
+174.5k
diff --git a/...olMockWithHooks - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots b/...olMockWithHooks - Standard - BatchRouter] remove liquidity using swapExactIn - warm slots
@@ -1 +1 @@
-198.4k
+198.3k
diff --git a/...lMockWithHooks - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots b/...lMockWithHooks - Standard - BatchRouter] remove liquidity using swapExactOut - warm slots
@@ -1 +1 @@
-214.5k
+213.4k
diff --git a/...MockWithHooks - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots b/...MockWithHooks - With rate - BatchRouter] remove liquidity using swapExactOut - warm slots
@@ -1 +1 @@
-237.7k
+236.6k