test: add swapETHForEnzymeVaultShare tests

Author: shark0der

contracts/external/WETH9.sol

@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.28;
 
-import "../interfaces/IERC20.sol";
+contract WETH9 {
 
-contract WETH9 is IERC20 {
   string public name = "Wrapped Ether";
   string public symbol = "WETH";
   uint8  public decimals = 18;
@@ -23,9 +22,9 @@ contract WETH9 is IERC20 {
   }
 
   function withdraw(uint wad) public {
-    require(balanceOf[msg.sender] >= wad, "");
+    require(balanceOf[msg.sender] >= wad, "ERC20: transfer amount exceeds balance");
     balanceOf[msg.sender] -= wad;
-    msg.sender.transfer(wad);
+    payable(msg.sender).transfer(wad);
     emit Withdrawal(msg.sender, wad);
   }
 
@@ -44,13 +43,14 @@ contract WETH9 is IERC20 {
   }
 
   function transferFrom(address src, address dst, uint wad) public returns (bool){
-    require(balanceOf[src] >= wad, "");
 
-    if (src != msg.sender && allowance[src][msg.sender] != uint(- 1)) {
-      require(allowance[src][msg.sender] >= wad, "");
+    if (src != msg.sender && allowance[src][msg.sender] != type(uint).max) {
+      require(allowance[src][msg.sender] >= wad, "ERC20: insufficient allowance");
       allowance[src][msg.sender] -= wad;
     }
 
+    require(balanceOf[src] >= wad, "ERC20: transfer amount exceeds balance");
+
     balanceOf[src] -= wad;
     balanceOf[dst] += wad;
 

contracts/external/enzyme/IEnzymeFundValueCalculatorRouter.sol

@@ -3,13 +3,13 @@
 pragma solidity >=0.5.0;
 
 interface IEnzymeFundValueCalculatorRouter {
-  function calcGrossShareValue(address _vaultProxy)
-  external
-  returns (address denominationAsset_, uint256 grossShareValue_);
 
-  function calcNetShareValue(address _vaultProxy)
-  external
-  returns (address denominationAsset_, uint256 netShareValue_);
-}
+  function calcGrossShareValue(
+    address _vaultProxy
+  ) external returns (address denominationAsset_, uint256 grossShareValue_);
 
+  function calcNetShareValue(
+    address _vaultProxy
+  ) external returns (address denominationAsset_, uint256 netShareValue_);
 
+}

contracts/external/enzyme/IEnzymePolicyManager.sol

@@ -3,11 +3,11 @@
 pragma solidity >=0.5.0;
 
 interface IPolicyManager {
+
   function updatePolicySettingsForFund(
     address _comptrollerProxy,
     address _policy,
     bytes calldata _settingsData
   ) external;
-}
-
 
+}

contracts/external/enzyme/IEnzymeV4Comptroller.sol

@@ -3,19 +3,15 @@
 pragma solidity >=0.5.0;
 
 interface IEnzymeV4Comptroller {
-    function getDenominationAsset() external view returns (address denominationAsset_);
-    function redeemSharesForSpecificAssets(
-        address _recipient,
-        uint256 _sharesQuantity,
-        address[] calldata _payoutAssets,
-        uint256[] calldata _payoutAssetPercentages
-    ) external returns (uint256[] memory payoutAmounts_);
 
-  function vaultCallOnContract(
-    address _contract,
-    bytes4 _selector,
-    bytes calldata _encodedArgs
-  ) external;
+  function getDenominationAsset() external view returns (address denominationAsset_);
+
+  function redeemSharesForSpecificAssets(
+      address _recipient,
+      uint256 _sharesQuantity,
+      address[] calldata _payoutAssets,
+      uint256[] calldata _payoutAssetPercentages
+  ) external returns (uint256[] memory payoutAmounts_);
 
   function buyShares(uint _investmentAmount, uint _minSharesQuantity) external;
 }

contracts/external/enzyme/IEnzymeV4DepositWrapper.sol

@@ -3,9 +3,11 @@
 pragma solidity >=0.5.0;
 
 interface IEnzymeV4Vault {
+
   function getAccessor() external view returns (address);
 
   function getOwner() external view returns (address);
 
   function mintShares(address, uint256) external;
+
 }

contracts/external/enzyme/IEnzymeV4Vault.sol

@@ -47,8 +47,6 @@ interface ISwapOperator {
 
   function enzymeV4VaultProxyAddress() external view returns (address);
 
-  function enzymeFundValueCalculatorRouter() external view returns (IEnzymeFundValueCalculatorRouter);
-
   /* ==== MUTATIVE FUNCTIONS ==== */
 
   function placeOrder(GPv2Order.Data calldata order, bytes calldata orderUID) external;
@@ -85,8 +83,8 @@ interface ISwapOperator {
   error ToAmountTooLow(uint expectedToAmount, uint actualToAmount);
 
   // order amounts vs actual amounts
-  error SwappedFromAmountTooHigh(uint expectedFromAmount, uint actualFromAmount);
-  error SwappedToAmountTooLow(uint expectedToAmount, uint actualToAmount);
+  error SwappedFromAmountTooHigh(uint expectedMaxFromAmount, uint actualFromAmount);
+  error SwappedToAmountTooLow(uint expectedMinToAmount, uint actualToAmount);
 
   error FeeNotZero();
   error InvalidDenominationAsset(address expectedAsset, address actualAsset);

contracts/interfaces/ISwapOperator.sol

@@ -1,35 +1,91 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.5.17;
+pragma solidity ^0.8.28;
 
 import "../../../external/enzyme/IEnzymeV4Comptroller.sol";
 import "./SOMockEnzymeV4Vault.sol";
+import "./SOMockExtraSpender.sol";
 
 contract SOMockEnzymeV4Comptroller is IEnzymeV4Comptroller {
 
-  address weth;
-  SOMockEnzymeV4Vault private vault;
+  ERC20 internal denominationAsset;
+  SOMockEnzymeV4Vault internal vault;
 
-  uint public ethToSharesRate = 10000;
+  // mock helpers
+  uint internal sharesToMintOnDeposit;
+  uint internal amountToPullOnDeposit;
+  uint internal sharesToBurnOnRedeem;
+  uint internal amountToPushOnRedeem;
 
-  constructor(address _weth) public {
-    weth = _weth;
+  // bypasses the allowance and pulls an extra amount using another address
+  SOMockExtraSpender public extraSpender;
+  uint public extraExpenseAmount;
+
+  constructor(address _denominationAsset, SOMockEnzymeV4Vault _vault) {
+    denominationAsset = ERC20(_denominationAsset);
+    vault = _vault;
+    extraSpender = new SOMockExtraSpender();
+  }
+
+  function setDepositMockAmounts(uint _sharesToMintOnDeposit, uint _amountToPullOnDeposit) external {
+    sharesToMintOnDeposit = _sharesToMintOnDeposit;
+    amountToPullOnDeposit = _amountToPullOnDeposit;
   }
 
-  function getDenominationAsset() external view returns (address denominationAsset_) {
-    return weth;
+  function setExtraExpenseAmount(uint _extraExpenseAmount) external {
+    extraExpenseAmount = _extraExpenseAmount;
+  }
+
+  function setRedeemMockAmounts(uint _sharesToBurnOnRedeem, uint _amountToPushOnRedeem) external {
+    sharesToBurnOnRedeem = _sharesToBurnOnRedeem;
+    amountToPushOnRedeem = _amountToPushOnRedeem;
+  }
+
+  function setDenominationAsset(address _denominationAsset) external {
+    denominationAsset = ERC20(_denominationAsset);
+  }
+
+  function getDenominationAsset() external view returns (address) {
+    return address(denominationAsset);
+  }
+
+  event BuyCalledWith(
+    uint _investmentAmount,
+    uint _minSharesQuantity
+  );
+
+  function buyShares(uint _investmentAmount, uint _minSharesQuantity) external {
+
+    denominationAsset.transferFrom(msg.sender, address(vault), amountToPullOnDeposit);
+    vault.mint(msg.sender, sharesToMintOnDeposit);
+
+    if (extraExpenseAmount > 0) {
+      extraSpender.spend(denominationAsset, msg.sender, extraExpenseAmount);
+    }
+
+    emit BuyCalledWith(_investmentAmount, _minSharesQuantity);
   }
 
+  event RedeemCalledWith(
+    address indexed _recipient,
+    uint _sharesQuantity,
+    address[] _payoutAssets,
+    uint[] _payoutAssetPercentages
+  );
+
   function redeemSharesForSpecificAssets(
     address _recipient,
-    uint256 _sharesQuantity,
-    address[] calldata /* _payoutAssets */,
-    uint256[] calldata /* _payoutAssetPercentages */
-  ) external returns (uint256[] memory payoutAmounts_) {
-    payoutAmounts_ =  new uint256[](0);
+    uint _sharesQuantity,
+    address[] calldata _payoutAssets,
+    uint[] calldata _payoutAssetPercentages
+  ) external returns (uint[] memory payoutAmounts) {
 
-    vault.burn(_recipient, _sharesQuantity);
-    IERC20(weth).transfer(_recipient, _sharesQuantity * 10000 / ethToSharesRate);
+    payoutAmounts = new uint[](0); // unchecked
+
+    vault.burn(_recipient, sharesToBurnOnRedeem);
+    vault.withdraw(denominationAsset, _recipient, amountToPushOnRedeem);
+
+    emit RedeemCalledWith(_recipient, _sharesQuantity, _payoutAssets, _payoutAssetPercentages);
   }
 
   function vaultCallOnContract(
@@ -39,17 +95,4 @@ contract SOMockEnzymeV4Comptroller is IEnzymeV4Comptroller {
   ) external {
     // no-op
   }
-
-  function buyShares(uint _investmentAmount, uint /* _minSharesQuantity */) external {
-    uint shares = _investmentAmount * ethToSharesRate / 10000;
-    vault.mint(msg.sender, shares);
-  }
-
-  function setETHToVaultSharesRate(uint _ethToSharesRate) public {
-    ethToSharesRate = _ethToSharesRate;
-  }
-
-  function setVault(SOMockEnzymeV4Vault _vault) public {
-    vault = _vault;
-  }
 }