@morpho-org/blue-sdk 2.0.0-alpha.6 → 2.0.0-next.2

package/lib/token/WrappedToken.d.ts

@@ -1,6 +1,6 @@
-import { RoundingDirection } from "../maths";
-import { Address } from "../types";
-import { InputToken, Token } from "./Token";
+import { type RoundingDirection } from "../math/index.js";
+import type { Address } from "../types.js";
+import { type InputToken, Token } from "./Token.js";
 export declare abstract class WrappedToken extends Token {
     readonly underlying: Address;
     constructor(token: InputToken, underlying: Address);

package/lib/token/WrappedToken.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WrappedToken = void 0;
-const maths_1 = require("../maths");
-const Token_1 = require("./Token");
-class WrappedToken extends Token_1.Token {
+import { MathLib } from "../math/index.js";
+import { Token } from "./Token.js";
+export class WrappedToken extends Token {
     underlying;
     constructor(token, underlying) {
         super(token);
@@ -12,22 +9,21 @@ class WrappedToken extends Token_1.Token {
     /** The expected amount when wrapping `unwrappedAmount` */
     toWrappedExactAmountIn(unwrappedAmount, slippage = 0n, rounding = "Down") {
         const wrappedAmount = this._wrap(unwrappedAmount, rounding);
-        return maths_1.MathLib.wMul(wrappedAmount, maths_1.MathLib.WAD - slippage, "Down");
+        return MathLib.wMul(wrappedAmount, MathLib.WAD - slippage, "Down");
     }
     /** The amount of unwrappedTokens that should be wrapped to receive `wrappedAmount` */
     toWrappedExactAmountOut(wrappedAmount, slippage = 0n, rounding = "Up") {
-        const wAmountTarget = maths_1.MathLib.wDiv(wrappedAmount, maths_1.MathLib.WAD - slippage, rounding);
+        const wAmountTarget = MathLib.wDiv(wrappedAmount, MathLib.WAD - slippage, rounding);
         return this._unwrap(wAmountTarget, rounding);
     }
     /** The expected amount when unwrapping `wrappedAmount` */
     toUnwrappedExactAmountIn(wrappedAmount, slippage = 0n, rounding = "Down") {
         const unwrappedAmount = this._unwrap(wrappedAmount, rounding);
-        return maths_1.MathLib.wMul(unwrappedAmount, maths_1.MathLib.WAD - slippage, "Up");
+        return MathLib.wMul(unwrappedAmount, MathLib.WAD - slippage, "Up");
     }
     /** The amount of wrappedTokens that should be unwrapped to receive `unwrappedAmount` */
     toUnwrappedExactAmountOut(unwrappedAmount, slippage = 0n, rounding = "Up") {
-        const unwrappedAmountToTarget = maths_1.MathLib.wDiv(unwrappedAmount, maths_1.MathLib.WAD - slippage, rounding);
+        const unwrappedAmountToTarget = MathLib.wDiv(unwrappedAmount, MathLib.WAD - slippage, rounding);
         return this._wrap(unwrappedAmountToTarget, rounding);
     }
 }
-exports.WrappedToken = WrappedToken;

package/lib/token/index.d.ts

@@ -1,5 +1,5 @@
-export * from "./Token";
-export * from "./WrappedToken";
-export * from "./ConstantWrappedToken";
-export * from "./ExchangeRateWrappedToken";
-export * from "./VaultToken";
+export * from "./Token.js";
+export * from "./WrappedToken.js";
+export * from "./ConstantWrappedToken.js";
+export * from "./ExchangeRateWrappedToken.js";
+export * from "./VaultToken.js";

package/lib/token/index.js

@@ -1,21 +1,5 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./Token"), exports);
-__exportStar(require("./WrappedToken"), exports);
-__exportStar(require("./ConstantWrappedToken"), exports);
-__exportStar(require("./ExchangeRateWrappedToken"), exports);
-__exportStar(require("./VaultToken"), exports);
+export * from "./Token.js";
+export * from "./WrappedToken.js";
+export * from "./ConstantWrappedToken.js";
+export * from "./ExchangeRateWrappedToken.js";
+export * from "./VaultToken.js";

package/lib/types.d.ts

@@ -24,4 +24,4 @@ export type Loadable<T> = T | undefined;
 export type Failable<T> = T | null;
 export type Fetchable<T> = Failable<Loadable<T>>;
 export declare function isFetched<T>(v: Fetchable<T>): v is T;
-export declare const isMarketId: (value: any) => value is MarketId;
+export declare const isMarketId: (value: unknown) => value is MarketId;

package/lib/types.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMarketId = exports.TransactionType = void 0;
-exports.isFetched = isFetched;
 /**
  * The possible transaction type on the Blue contract
  */
-var TransactionType;
+export var TransactionType;
 (function (TransactionType) {
     TransactionType["Supply"] = "Supply";
     TransactionType["SupplyCollateral"] = "Supply Collateral";
@@ -13,10 +9,9 @@ var TransactionType;
     TransactionType["WithdrawCollateral"] = "Withdraw Collateral";
     TransactionType["Borrow"] = "Borrow";
     TransactionType["Repay"] = "Repay";
-})(TransactionType || (exports.TransactionType = TransactionType = {}));
+})(TransactionType || (TransactionType = {}));
 // TODO: replace with isDefined
-function isFetched(v) {
+export function isFetched(v) {
     return v !== undefined && v !== null;
 }
-const isMarketId = (value) => typeof value === "string" && /^0x[0-9A-Fa-f]{64}$/.test(value);
-exports.isMarketId = isMarketId;
+export const isMarketId = (value) => typeof value === "string" && /^0x[0-9A-Fa-f]{64}$/.test(value);

package/lib/user/User.d.ts

@@ -1,4 +1,4 @@
-import { Address } from "../types";
+import type { Address } from "../types.js";
 export declare class User {
     /**
      * The user's address.

package/lib/user/User.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.User = void 0;
-class User {
+export class User {
     /**
      * The user's address.
      */
@@ -20,4 +17,3 @@ class User {
         this.morphoNonce = morphoNonce;
     }
 }
-exports.User = User;

package/lib/user/index.d.ts

@@ -1 +1 @@
-export * from "./User";
+export * from "./User.js";

package/lib/user/index.js

@@ -1,17 +1 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./User"), exports);
+export * from "./User.js";

package/lib/vault/Vault.d.ts

@@ -1,9 +1,9 @@
-import { CapacityLimit } from "../market";
-import { RoundingDirection } from "../maths";
-import { VaultToken } from "../token";
-import { Address, BigIntish, MarketId } from "../types";
-import { VaultConfig } from "./VaultConfig";
-import { InputVaultMarketAllocation, VaultMarketAllocation } from "./VaultMarketAllocation";
+import { type CapacityLimit } from "../market/index.js";
+import { type RoundingDirection } from "../math/index.js";
+import { VaultToken } from "../token/index.js";
+import type { Address, BigIntish, MarketId } from "../types.js";
+import type { InputVaultConfig } from "./VaultConfig.js";
+import { type InputVaultMarketAllocation, VaultMarketAllocation } from "./VaultMarketAllocation.js";
 export interface Pending<T> {
     value: T;
     validAt: bigint;
@@ -22,8 +22,7 @@ export interface VaultPublicAllocatorConfig {
      */
     accruedFee: bigint;
 }
-export interface InputVault {
-    config: VaultConfig;
+export interface InputVault extends InputVaultConfig {
     curator: Address;
     owner: Address;
     guardian: Address;
@@ -42,10 +41,6 @@ export interface InputVault {
     publicAllocatorConfig?: VaultPublicAllocatorConfig;
 }
 export declare class Vault extends VaultToken implements InputVault {
-    /**
-     * The MetaMorpho vault's config.
-     */
-    readonly config: VaultConfig;
     /**
      * The MetaMorpho vault's owner address.
      */
@@ -94,14 +89,6 @@ export declare class Vault extends VaultToken implements InputVault {
      * The MetaMorpho vault's ordered withdraw queue.
      */
     withdrawQueue: MarketId[];
-    /**
-     * The ERC4626 vault's total supply of shares.
-     */
-    totalSupply: bigint;
-    /**
-     * The ERC4626 vault's total assets.
-     */
-    totalAssets: bigint;
     /**
      * The MetaMorpho vault's last total assets used to calculate performance fees.
      */
@@ -110,8 +97,7 @@ export declare class Vault extends VaultToken implements InputVault {
      * The MetaMorpho vault's public allocator configuration.
      */
     publicAllocatorConfig?: VaultPublicAllocatorConfig;
-    constructor({ config, curator, owner, guardian, publicAllocatorConfig, fee, feeRecipient, skimRecipient, pendingTimelock, pendingGuardian, pendingOwner, timelock, supplyQueue, withdrawQueue, totalSupply, totalAssets, lastTotalAssets, }: InputVault);
-    get asset(): `0x${string}`;
+    constructor({ curator, owner, guardian, publicAllocatorConfig, fee, feeRecipient, skimRecipient, pendingTimelock, pendingGuardian, pendingOwner, timelock, supplyQueue, withdrawQueue, totalSupply, totalAssets, lastTotalAssets, ...config }: InputVault);
     /**
      * The amount of interest in assets accrued since the last interaction with the vault.
      */

package/lib/vault/Vault.js

@@ -1,16 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AccrualVault = exports.Vault = void 0;
-const market_1 = require("../market");
-const maths_1 = require("../maths");
-const token_1 = require("../token");
-const VaultMarketAllocation_1 = require("./VaultMarketAllocation");
-const VaultUtils_1 = require("./VaultUtils");
-class Vault extends token_1.VaultToken {
-    /**
-     * The MetaMorpho vault's config.
-     */
-    config;
+import { CapacityLimitReason } from "../market/index.js";
+import { MathLib } from "../math/index.js";
+import { VaultToken } from "../token/index.js";
+import { VaultMarketAllocation, } from "./VaultMarketAllocation.js";
+export class Vault extends VaultToken {
     /**
      * The MetaMorpho vault's owner address.
      */
@@ -59,14 +51,6 @@ class Vault extends token_1.VaultToken {
      * The MetaMorpho vault's ordered withdraw queue.
      */
     withdrawQueue;
-    /**
-     * The ERC4626 vault's total supply of shares.
-     */
-    totalSupply;
-    /**
-     * The ERC4626 vault's total assets.
-     */
-    totalAssets;
     /**
      * The MetaMorpho vault's last total assets used to calculate performance fees.
      */
@@ -75,9 +59,8 @@ class Vault extends token_1.VaultToken {
      * The MetaMorpho vault's public allocator configuration.
      */
     publicAllocatorConfig;
-    constructor({ config, curator, owner, guardian, publicAllocatorConfig, fee, feeRecipient, skimRecipient, pendingTimelock, pendingGuardian, pendingOwner, timelock, supplyQueue, withdrawQueue, totalSupply, totalAssets, lastTotalAssets, }) {
+    constructor({ curator, owner, guardian, publicAllocatorConfig, fee, feeRecipient, skimRecipient, pendingTimelock, pendingGuardian, pendingOwner, timelock, supplyQueue, withdrawQueue, totalSupply, totalAssets, lastTotalAssets, ...config }) {
         super(config, { totalAssets, totalSupply });
-        this.config = config;
         this.curator = curator;
         this.owner = owner;
         this.guardian = guardian;
@@ -93,29 +76,23 @@ class Vault extends token_1.VaultToken {
         this.timelock = timelock;
         this.supplyQueue = supplyQueue;
         this.withdrawQueue = withdrawQueue;
-        this.totalSupply = totalSupply;
-        this.totalAssets = totalAssets;
         this.lastTotalAssets = lastTotalAssets;
         this.publicAllocatorConfig = publicAllocatorConfig;
     }
-    get asset() {
-        return this.config.asset;
-    }
     /**
      * The amount of interest in assets accrued since the last interaction with the vault.
      */
     get totalInterest() {
-        return maths_1.MathLib.zeroFloorSub(this.totalAssets, this.lastTotalAssets);
+        return MathLib.zeroFloorSub(this.totalAssets, this.lastTotalAssets);
     }
     toAssets(shares, rounding) {
-        return VaultUtils_1.VaultUtils.toAssets(shares, this, this.config, rounding);
+        return this._unwrap(shares, rounding);
     }
     toShares(assets, rounding) {
-        return VaultUtils_1.VaultUtils.toShares(assets, this, this.config, rounding);
+        return this._wrap(assets, rounding);
     }
 }
-exports.Vault = Vault;
-class AccrualVault extends Vault {
+export class AccrualVault extends Vault {
     /**
      * The allocation of the vault on each market enabled.
      */
@@ -137,7 +114,7 @@ class AccrualVault extends Vault {
         });
         this.allocations = new Map(allocations.map((allocation) => [
             allocation.position.market.id,
-            new VaultMarketAllocation_1.VaultMarketAllocation(allocation),
+            new VaultMarketAllocation(allocation),
         ]));
         this.collateralAllocations = new Map();
         for (const { marketId, position } of this.allocations.values()) {
@@ -161,7 +138,9 @@ class AccrualVault extends Vault {
      * The vault's liquidity directly available from allocated markets.
      */
     get liquidity() {
-        return Array.from(this.allocations.values()).reduce((total, { position }) => total + position.withdrawCapacityLimit.value, 0n);
+        return this.allocations
+            .values()
+            .reduce((total, { position }) => total + position.withdrawCapacityLimit.value, 0n);
     }
     /**
      * The MetaMorpho vault's average APY on its assets, including the performance fee.
@@ -169,13 +148,15 @@ class AccrualVault extends Vault {
     get avgApy() {
         if (this.totalAssets === 0n)
             return 0n;
-        return (Array.from(this.allocations.values()).reduce((total, { position }) => total + position.market.supplyApy * position.supplyAssets, 0n) / this.totalAssets);
+        return (this.allocations
+            .values()
+            .reduce((total, { position }) => total + position.market.supplyApy * position.supplyAssets, 0n) / this.totalAssets);
     }
     /**
      * The MetaMorpho vault's average APY on its assets, excluding the performance fee.
      */
     get netApy() {
-        return maths_1.MathLib.wMulDown(this.avgApy, maths_1.MathLib.WAD - this.fee);
+        return MathLib.wMulDown(this.avgApy, MathLib.WAD - this.fee);
     }
     getAllocationProportion(marketId) {
         if (this.totalAssets === 0n)
@@ -183,21 +164,23 @@ class AccrualVault extends Vault {
         const allocation = this.allocations.get(marketId);
         if (!allocation)
             return 0n;
-        return maths_1.MathLib.wDivDown(allocation.position.supplyAssets, this.totalAssets);
+        return MathLib.wDivDown(allocation.position.supplyAssets, this.totalAssets);
     }
     getDepositCapacityLimit(assets) {
-        const suppliable = Array.from(this.allocations.values()).reduce((total, { config: { cap }, position: { marketId, supplyAssets } }) => maths_1.MathLib.min(total +
+        const suppliable = this.allocations
+            .values()
+            .reduce((total, { config: { cap }, position: { marketId, supplyAssets } }) => MathLib.min(total +
             (this.supplyQueue.includes(marketId)
-                ? maths_1.MathLib.zeroFloorSub(cap, supplyAssets)
-                : 0n), maths_1.MathLib.MAX_UINT_256), 0n);
+                ? MathLib.zeroFloorSub(cap, supplyAssets)
+                : 0n), MathLib.MAX_UINT_256), 0n);
         if (assets > suppliable)
             return {
                 value: suppliable,
-                limiter: market_1.CapacityLimitReason.cap,
+                limiter: CapacityLimitReason.cap,
             };
         return {
             value: assets,
-            limiter: market_1.CapacityLimitReason.balance,
+            limiter: CapacityLimitReason.balance,
         };
     }
     getWithdrawCapacityLimit(shares) {
@@ -206,11 +189,11 @@ class AccrualVault extends Vault {
         if (assets > liquidity)
             return {
                 value: liquidity,
-                limiter: market_1.CapacityLimitReason.liquidity,
+                limiter: CapacityLimitReason.liquidity,
             };
         return {
             value: assets,
-            limiter: market_1.CapacityLimitReason.balance,
+            limiter: CapacityLimitReason.balance,
         };
     }
     /**
@@ -218,11 +201,16 @@ class AccrualVault extends Vault {
      * @param timestamp The timestamp at which to accrue interest. Must be greater than or equal to each of the vault's market's `lastUpdate`.
      */
     accrueInterest(timestamp) {
-        const vault = new AccrualVault(this, Array.from(this.allocations.values(), ({ config, position }) => ({
-            config,
-            position: position.accrueInterest(timestamp),
-        })));
-        const feeAssets = maths_1.MathLib.wMulDown(vault.totalInterest, vault.fee);
+        const vault = new AccrualVault(this, 
+        // Keep withdraw queue order.
+        this.withdrawQueue.map((marketId) => {
+            const { config, position } = this.allocations.get(marketId);
+            return {
+                config,
+                position: position.accrueInterest(timestamp),
+            };
+        }));
+        const feeAssets = MathLib.wMulDown(vault.totalInterest, vault.fee);
         vault.totalAssets -= feeAssets;
         const feeShares = vault.toShares(feeAssets, "Down");
         vault.totalAssets += feeAssets;
@@ -231,4 +219,3 @@ class AccrualVault extends Vault {
         return vault;
     }
 }
-exports.AccrualVault = AccrualVault;

package/lib/vault/VaultConfig.d.ts

@@ -1,5 +1,5 @@
-import { ChainId } from "../chain";
-import { Address, BigIntish } from "../types";
+import type { ChainId } from "../chain.js";
+import type { Address, BigIntish } from "../types.js";
 export interface InputVaultConfig {
     address: Address;
     decimals: BigIntish;

package/lib/vault/VaultConfig.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VaultConfig = void 0;
-const errors_1 = require("../errors");
-class VaultConfig {
+import { UnknownVaultConfigError } from "../errors.js";
+export class VaultConfig {
     chainId;
     static _CACHE = {};
     static get(address, chainId) {
         const config = VaultConfig._CACHE[chainId]?.[address];
         if (!config)
-            throw new errors_1.UnknownVaultConfigError(address);
+            throw new UnknownVaultConfigError(address);
         return config;
     }
     address;
@@ -29,4 +26,3 @@ class VaultConfig {
             (VaultConfig._CACHE[chainId] ??= {})[address] = this;
     }
 }
-exports.VaultConfig = VaultConfig;

package/lib/vault/VaultMarketAllocation.d.ts

@@ -1,5 +1,5 @@
-import { AccrualPosition } from "../position";
-import { VaultMarketConfig } from "./VaultMarketConfig";
+import type { AccrualPosition } from "../position/index.js";
+import type { VaultMarketConfig } from "./VaultMarketConfig.js";
 export interface InputVaultMarketAllocation {
     config: VaultMarketConfig;
     position: AccrualPosition;
@@ -15,6 +15,6 @@ export declare class VaultMarketAllocation implements InputVaultMarketAllocation
     readonly position: AccrualPosition;
     constructor({ config, position }: InputVaultMarketAllocation);
     get vault(): `0x${string}`;
-    get marketId(): import("..").MarketId;
+    get marketId(): import("../types.js").MarketId;
     get utilization(): bigint;
 }

package/lib/vault/VaultMarketAllocation.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VaultMarketAllocation = void 0;
-const maths_1 = require("../maths");
-class VaultMarketAllocation {
+import { MathLib } from "../math/index.js";
+export class VaultMarketAllocation {
     /**
      * The vault's configuration on the corresponding market.
      */
@@ -23,8 +20,7 @@ class VaultMarketAllocation {
     }
     get utilization() {
         if (this.config.cap === 0n)
-            return maths_1.MathLib.MAX_UINT_256;
-        return maths_1.MathLib.wDivDown(this.position.supplyAssets, this.config.cap);
+            return MathLib.MAX_UINT_256;
+        return MathLib.wDivDown(this.position.supplyAssets, this.config.cap);
     }
 }
-exports.VaultMarketAllocation = VaultMarketAllocation;

package/lib/vault/VaultMarketConfig.d.ts

@@ -1,6 +1,6 @@
-import { Address, MarketId } from "../types";
-import { Pending } from "./Vault";
-import { VaultMarketPublicAllocatorConfig } from "./VaultMarketPublicAllocatorConfig";
+import type { Address, MarketId } from "../types.js";
+import type { Pending } from "./Vault.js";
+import type { VaultMarketPublicAllocatorConfig } from "./VaultMarketPublicAllocatorConfig.js";
 export interface InputVaultMarketConfig {
     vault: Address;
     marketId: MarketId;

package/lib/vault/VaultMarketConfig.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VaultMarketConfig = void 0;
-class VaultMarketConfig {
+export class VaultMarketConfig {
     /**
      * The vault's address.
      */
@@ -40,4 +37,3 @@ class VaultMarketConfig {
         this.publicAllocatorConfig = publicAllocatorConfig;
     }
 }
-exports.VaultMarketConfig = VaultMarketConfig;

package/lib/vault/VaultMarketPublicAllocatorConfig.d.ts

@@ -1,4 +1,4 @@
-import { Address, MarketId } from "../types";
+import type { Address, MarketId } from "../types.js";
 /**
  * The vault's configuration of a market on the PublicAllocator.
  */

package/lib/vault/VaultMarketPublicAllocatorConfig.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VaultMarketPublicAllocatorConfig = void 0;
-class VaultMarketPublicAllocatorConfig {
+export class VaultMarketPublicAllocatorConfig {
     /**
      * The vault's address.
      */
@@ -25,4 +22,3 @@ class VaultMarketPublicAllocatorConfig {
         this.maxOut = maxOut;
     }
 }
-exports.VaultMarketPublicAllocatorConfig = VaultMarketPublicAllocatorConfig;

package/lib/vault/VaultUser.d.ts

@@ -1,4 +1,4 @@
-import { Address } from "../types";
+import type { Address } from "../types.js";
 export interface InputVaultUser {
     vault: Address;
     user: Address;

package/lib/vault/VaultUser.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VaultUser = void 0;
-class VaultUser {
+export class VaultUser {
     /**
      * The vault's address.
      */
@@ -25,4 +22,3 @@ class VaultUser {
         this.allowance = allowance;
     }
 }
-exports.VaultUser = VaultUser;

package/lib/vault/VaultUtils.d.ts

@@ -1,18 +1,16 @@
-import { RoundingDirection } from "../maths";
-import { BigIntish } from "../types";
+import { type RoundingDirection } from "../math/index.js";
+import type { BigIntish } from "../types.js";
 export declare namespace VaultUtils {
     const VIRTUAL_ASSETS = 1n;
     function decimalsOffset(decimals: BigIntish): bigint;
-    function toAssets(shares: BigIntish, { totalAssets, totalSupply, }: {
+    function toAssets(shares: BigIntish, { totalAssets, totalSupply, decimalsOffset, }: {
         totalAssets: BigIntish;
         totalSupply: BigIntish;
-    }, { decimalsOffset }: {
         decimalsOffset: BigIntish;
     }, rounding?: RoundingDirection): bigint;
-    function toShares(assets: BigIntish, { totalAssets, totalSupply, }: {
+    function toShares(assets: BigIntish, { totalAssets, totalSupply, decimalsOffset, }: {
         totalAssets: BigIntish;
         totalSupply: BigIntish;
-    }, { decimalsOffset }: {
         decimalsOffset: BigIntish;
     }, rounding?: RoundingDirection): bigint;
 }

package/lib/vault/VaultUtils.js

@@ -1,20 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VaultUtils = void 0;
-const maths_1 = require("../maths");
-var VaultUtils;
+import { MathLib } from "../math/index.js";
+export var VaultUtils;
 (function (VaultUtils) {
     VaultUtils.VIRTUAL_ASSETS = 1n;
     function decimalsOffset(decimals) {
-        return maths_1.MathLib.zeroFloorSub(18n, decimals);
+        return MathLib.zeroFloorSub(18n, decimals);
     }
     VaultUtils.decimalsOffset = decimalsOffset;
-    function toAssets(shares, { totalAssets, totalSupply, }, { decimalsOffset }, rounding = "Down") {
-        return maths_1.MathLib.mulDiv(shares, BigInt(totalAssets) + VaultUtils.VIRTUAL_ASSETS, BigInt(totalSupply) + 10n ** BigInt(decimalsOffset), rounding);
+    function toAssets(shares, { totalAssets, totalSupply, decimalsOffset, }, rounding = "Down") {
+        return MathLib.mulDiv(shares, BigInt(totalAssets) + VaultUtils.VIRTUAL_ASSETS, BigInt(totalSupply) + 10n ** BigInt(decimalsOffset), rounding);
     }
     VaultUtils.toAssets = toAssets;
-    function toShares(assets, { totalAssets, totalSupply, }, { decimalsOffset }, rounding = "Up") {
-        return maths_1.MathLib.mulDiv(assets, BigInt(totalSupply) + 10n ** BigInt(decimalsOffset), BigInt(totalAssets) + VaultUtils.VIRTUAL_ASSETS, rounding);
+    function toShares(assets, { totalAssets, totalSupply, decimalsOffset, }, rounding = "Up") {
+        return MathLib.mulDiv(assets, BigInt(totalSupply) + 10n ** BigInt(decimalsOffset), BigInt(totalAssets) + VaultUtils.VIRTUAL_ASSETS, rounding);
     }
     VaultUtils.toShares = toShares;
-})(VaultUtils || (exports.VaultUtils = VaultUtils = {}));
+})(VaultUtils || (VaultUtils = {}));

package/lib/vault/index.d.ts

@@ -1,7 +1,7 @@
-export * from "./VaultUtils";
-export * from "./VaultConfig";
-export * from "./VaultMarketAllocation";
-export * from "./VaultMarketConfig";
-export * from "./VaultMarketPublicAllocatorConfig";
-export * from "./VaultUser";
-export * from "./Vault";
+export * from "./VaultUtils.js";
+export * from "./VaultConfig.js";
+export * from "./VaultMarketAllocation.js";
+export * from "./VaultMarketConfig.js";
+export * from "./VaultMarketPublicAllocatorConfig.js";
+export * from "./VaultUser.js";
+export * from "./Vault.js";