lint

Author: thedavidmeister

src/abstract/ReceiptVault.sol

@@ -182,11 +182,6 @@ abstract contract ReceiptVault is
         (from, to, ids, amounts);
     }
 
-    /// @inheritdoc IReceiptVaultV2
-    function receipt() public view virtual returns (IReceiptV2) {
-        return sReceipt;
-    }
-
     /// The spec demands this function ignores per-user concerns. It seems to
     /// imply minting but doesn't provide a sibling conversion for burning.
     /// > The amount of shares that the Vault would exchange for the amount of
@@ -198,6 +193,26 @@ abstract contract ReceiptVault is
         return val;
     }
 
+    /// The spec demands that this function ignores per-user concerns. It seems
+    /// to imply burning but doesn't provide a sibling conversion for minting.
+    /// > The amount of assets that the Vault would exchange for the amount of
+    /// > shares provided
+    /// @inheritdoc IReceiptVaultV1
+    function convertToAssets(uint256 shares, uint256 id) external view virtual returns (uint256) {
+        return _calculateRedeem(
+            shares,
+            // Not clear what a good ID for a hypothetical context free burn
+            // should be. Next ID is technically nonsense but we don't have
+            // any other ID to prefer either.
+            _shareRatioUserAgnostic(id, ShareAction.Burn)
+        );
+    }
+
+    /// @inheritdoc IReceiptVaultV2
+    function receipt() public view virtual returns (IReceiptV2) {
+        return sReceipt;
+    }
+
     /// @inheritdoc IReceiptVaultV1
     function previewDeposit(uint256 assets, uint256 minShareRatio) external payable virtual returns (uint256) {
         uint256 val = _calculateDeposit(
@@ -443,21 +458,6 @@ abstract contract ReceiptVault is
         return 1;
     }
 
-    /// The spec demands that this function ignores per-user concerns. It seems
-    /// to imply burning but doesn't provide a sibling conversion for minting.
-    /// > The amount of assets that the Vault would exchange for the amount of
-    /// > shares provided
-    /// @inheritdoc IReceiptVaultV1
-    function convertToAssets(uint256 shares, uint256 id) external view virtual returns (uint256) {
-        return _calculateRedeem(
-            shares,
-            // Not clear what a good ID for a hypothetical context free burn
-            // should be. Next ID is technically nonsense but we don't have
-            // any other ID to prefer either.
-            _shareRatioUserAgnostic(id, ShareAction.Burn)
-        );
-    }
-
     /// @inheritdoc IReceiptVaultV1
     function maxDeposit(address) external pure virtual returns (uint256) {
         // The spec states to return this if there is no deposit limit.

test/src/concrete/vault/ERC20PriceOracleReceiptVault.convertToAssets.t.sol

@@ -24,7 +24,7 @@ contract ERC20PriceOracleReceiptVaultConvertToAssetsTest is ERC20PriceOracleRece
         address alice = LibUniqueAddressesGenerator.generateUniqueAddresses(vm, aliceSeed);
 
         id = bound(id, 1, type(uint256).max);
-        shares = bound(shares, 1, type(uint64).max);
+        shares = bound(shares, 1, type(uint128).max);
 
         vm.startPrank(alice);
 
@@ -52,6 +52,7 @@ contract ERC20PriceOracleReceiptVaultConvertToAssetsTest is ERC20PriceOracleRece
 
         vm.startPrank(alice);
 
+        uint256 expectedAssets = shares.fixedPointDiv(id, Math.Rounding.Down);
         ERC20PriceOracleReceiptVault vault = createVault(iVaultOracle, shareName, shareSymbol);
 
         uint256 resultAssetsAlice = vault.convertToAssets(shares, id);
@@ -62,5 +63,6 @@ contract ERC20PriceOracleReceiptVaultConvertToAssetsTest is ERC20PriceOracleRece
         uint256 resultAssetsBob = vault.convertToAssets(shares, id);
 
         assertEqUint(resultAssetsAlice, resultAssetsBob);
+        assertEqUint(expectedAssets, resultAssetsAlice);
     }
 }

test/src/concrete/vault/OffchainAssetReceiptVault.convertToAssets.t.sol

@@ -24,13 +24,12 @@ contract OffchainAssetReceiptVaultConvertToAssetsTest is OffchainAssetReceiptVau
         address alice = LibUniqueAddressesGenerator.generateUniqueAddresses(vm, aliceSeed);
 
         id = bound(id, 1, type(uint256).max);
-        shares = bound(shares, 1, type(uint64).max);
+        shares = bound(shares, 1, type(uint128).max);
 
         OffchainAssetReceiptVault vault = createVault(alice, shareName, shareSymbol);
 
         uint256 expectedAssets = shares;
 
-        vm.startPrank(alice);
         uint256 resultAssets = vault.convertToAssets(shares, id);
 
         assertEqUint(expectedAssets, resultAssets);