@morpho-org/blue-sdk 1.4.4 → 1.4.5

package/lib/token/ConstantWrappedToken.d.ts

@@ -0,0 +1,18 @@
+import { RoundingDirection } from "../maths";
+import { Address } from "../types";
+import { InputToken } from "./Token";
+import { WrappedToken } from "./WrappedToken";
+export declare class ConstantWrappedToken extends WrappedToken {
+    readonly underlying: Address;
+    private readonly _underlyingDecimals;
+    constructor(token: InputToken, underlying: Address, _underlyingDecimals?: number);
+    toWrappedExactAmountIn(unwrappedAmount: bigint, _slippage?: bigint, rounding?: RoundingDirection): bigint;
+    /** The amount of unwrappedTokens that should be wrapped to receive `wrappedAmount` */
+    toWrappedExactAmountOut(wrappedAmount: bigint, _slippage?: bigint, rounding?: RoundingDirection): bigint;
+    /** The expected amount when unwrapping `wrappedAmount` */
+    toUnwrappedExactAmountIn(wrappedAmount: bigint, _slippage?: bigint, rounding?: RoundingDirection): bigint;
+    /** The amount of wrappedTokens that should be unwrapped to receive `unwrappedAmount` */
+    toUnwrappedExactAmountOut(unwrappedAmount: bigint, _slippage?: bigint, rounding?: RoundingDirection): bigint;
+    protected _wrap(amount: bigint): bigint;
+    protected _unwrap(amount: bigint): bigint;
+}

package/lib/token/ConstantWrappedToken.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConstantWrappedToken = void 0;
+const maths_1 = require("../maths");
+const WrappedToken_1 = require("./WrappedToken");
+class ConstantWrappedToken extends WrappedToken_1.WrappedToken {
+    underlying;
+    _underlyingDecimals;
+    constructor(token, underlying, _underlyingDecimals = 18) {
+        super(token, underlying);
+        this.underlying = underlying;
+        this._underlyingDecimals = _underlyingDecimals;
+    }
+    toWrappedExactAmountIn(unwrappedAmount, _slippage, rounding = "Down") {
+        return super.toWrappedExactAmountIn(unwrappedAmount, 0n, rounding);
+    }
+    /** The amount of unwrappedTokens that should be wrapped to receive `wrappedAmount` */
+    toWrappedExactAmountOut(wrappedAmount, _slippage, rounding = "Up") {
+        return super.toWrappedExactAmountOut(wrappedAmount, 0n, rounding);
+    }
+    /** The expected amount when unwrapping `wrappedAmount` */
+    toUnwrappedExactAmountIn(wrappedAmount, _slippage, rounding = "Down") {
+        return super.toUnwrappedExactAmountIn(wrappedAmount, 0n, rounding);
+    }
+    /** The amount of wrappedTokens that should be unwrapped to receive `unwrappedAmount` */
+    toUnwrappedExactAmountOut(unwrappedAmount, _slippage, rounding = "Up") {
+        return super.toUnwrappedExactAmountOut(unwrappedAmount, 0n, rounding);
+    }
+    _wrap(amount) {
+        return maths_1.MathLib.mulDivDown(amount, 10n ** BigInt(this.decimals), 10n ** BigInt(this._underlyingDecimals));
+    }
+    _unwrap(amount) {
+        return maths_1.MathLib.mulDivDown(amount, 10n ** BigInt(this._underlyingDecimals), 10n ** BigInt(this.decimals));
+    }
+}
+exports.ConstantWrappedToken = ConstantWrappedToken;

package/lib/token/ExchangeRateWrappedToken.d.ts

@@ -0,0 +1,11 @@
+import { RoundingDirection } from "../maths";
+import { Address } from "../types";
+import { InputToken } from "./Token";
+import { WrappedToken } from "./WrappedToken";
+export declare class ExchangeRateWrappedToken extends WrappedToken {
+    readonly underlying: Address;
+    wrappedTokenExchangeRate: bigint;
+    constructor(token: InputToken, underlying: Address, wrappedTokenExchangeRate: bigint);
+    protected _wrap(amount: bigint, rounding: RoundingDirection): bigint;
+    protected _unwrap(amount: bigint, rounding: RoundingDirection): bigint;
+}

package/lib/token/ExchangeRateWrappedToken.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExchangeRateWrappedToken = void 0;
+const maths_1 = require("../maths");
+const WrappedToken_1 = require("./WrappedToken");
+class ExchangeRateWrappedToken extends WrappedToken_1.WrappedToken {
+    underlying;
+    wrappedTokenExchangeRate;
+    constructor(token, underlying, wrappedTokenExchangeRate) {
+        super(token, underlying);
+        this.underlying = underlying;
+        this.wrappedTokenExchangeRate = wrappedTokenExchangeRate;
+    }
+    _wrap(amount, rounding) {
+        return maths_1.MathLib.wDiv(amount, this.wrappedTokenExchangeRate, rounding);
+    }
+    _unwrap(amount, rounding) {
+        return maths_1.MathLib.wMul(amount, this.wrappedTokenExchangeRate, rounding);
+    }
+}
+exports.ExchangeRateWrappedToken = ExchangeRateWrappedToken;

package/lib/token/VaultToken.d.ts

@@ -0,0 +1,14 @@
+import { RoundingDirection } from "../maths";
+import { InputVaultConfig } from "../vault/VaultConfig";
+import { WrappedToken } from "./WrappedToken";
+export declare class VaultToken extends WrappedToken {
+    decimalsOffset: bigint;
+    totalAssets: bigint;
+    totalSupply: bigint;
+    constructor(config: InputVaultConfig, { totalAssets, totalSupply }: {
+        totalAssets: bigint;
+        totalSupply: bigint;
+    });
+    protected _wrap(amount: bigint, rounding: RoundingDirection): bigint;
+    protected _unwrap(amount: bigint, rounding: RoundingDirection): bigint;
+}

package/lib/token/VaultToken.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VaultToken = void 0;
+const VaultUtils_1 = require("../vault/VaultUtils");
+const WrappedToken_1 = require("./WrappedToken");
+class VaultToken extends WrappedToken_1.WrappedToken {
+    decimalsOffset;
+    totalAssets;
+    totalSupply;
+    constructor(config, { totalAssets, totalSupply }) {
+        super(config, config.asset);
+        this.totalAssets = totalAssets;
+        this.totalSupply = totalSupply;
+        this.decimalsOffset = config.decimalsOffset;
+    }
+    _wrap(amount, rounding) {
+        return VaultUtils_1.VaultUtils.toShares(amount, this, this, rounding);
+    }
+    _unwrap(amount, rounding) {
+        return VaultUtils_1.VaultUtils.toAssets(amount, this, this, rounding);
+    }
+}
+exports.VaultToken = VaultToken;

package/lib/token/WrappedToken.d.ts

@@ -1,12 +1,8 @@
 import { RoundingDirection } from "../maths";
 import { Address } from "../types";
-import { Vault, VaultConfig } from "../vault";
 import { InputToken, Token } from "./Token";
 export declare abstract class WrappedToken extends Token {
     readonly underlying: Address;
-    protected abstract _wrap(amount: bigint, rounding: RoundingDirection): bigint;
-    protected abstract _unwrap(amount: bigint, rounding: RoundingDirection): bigint;
-    protected _noSlippage: boolean;
     constructor(token: InputToken, underlying: Address);
     /** The expected amount when wrapping `unwrappedAmount` */
     toWrappedExactAmountIn(unwrappedAmount: bigint, slippage?: bigint, rounding?: RoundingDirection): bigint;
@@ -16,27 +12,6 @@ export declare abstract class WrappedToken extends Token {
     toUnwrappedExactAmountIn(wrappedAmount: bigint, slippage?: bigint, rounding?: RoundingDirection): bigint;
     /** The amount of wrappedTokens that should be unwrapped to receive `unwrappedAmount` */
     toUnwrappedExactAmountOut(unwrappedAmount: bigint, slippage?: bigint, rounding?: RoundingDirection): bigint;
-}
-export declare class ConstantWrappedToken extends WrappedToken {
-    readonly underlying: Address;
-    private readonly _underlyingDecimals;
-    protected _noSlippage: boolean;
-    constructor(token: InputToken, underlying: Address, _underlyingDecimals?: number);
-    protected _wrap(amount: bigint): bigint;
-    protected _unwrap(amount: bigint): bigint;
-}
-export declare class ExchangeRateWrappedToken extends WrappedToken {
-    readonly underlying: Address;
-    wrappedTokenExchangeRate: bigint;
-    protected _wrap(amount: bigint, rounding: RoundingDirection): bigint;
-    protected _unwrap(amount: bigint, rounding: RoundingDirection): bigint;
-    constructor(token: InputToken, underlying: Address, wrappedTokenExchangeRate: bigint);
-}
-export declare class VaultToken extends WrappedToken {
-    protected _wrap(amount: bigint, rounding: RoundingDirection): bigint;
-    protected _unwrap(amount: bigint, rounding: RoundingDirection): bigint;
-    totalAssets: bigint;
-    totalSupply: bigint;
-    config: VaultConfig;
-    constructor(token: InputToken, { totalAssets, totalSupply, config, }: Pick<Vault, "totalAssets" | "totalSupply" | "config">);
+    protected abstract _wrap(amount: bigint, rounding: RoundingDirection): bigint;
+    protected abstract _unwrap(amount: bigint, rounding: RoundingDirection): bigint;
 }

package/lib/token/WrappedToken.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VaultToken = exports.ExchangeRateWrappedToken = exports.ConstantWrappedToken = exports.WrappedToken = void 0;
+exports.WrappedToken = void 0;
 const maths_1 = require("../maths");
-const vault_1 = require("../vault");
 const Token_1 = require("./Token");
 class WrappedToken extends Token_1.Token {
     underlying;
-    _noSlippage = false;
     constructor(token, underlying) {
         super(token);
         this.underlying = underlying;
@@ -14,81 +12,22 @@ class WrappedToken extends Token_1.Token {
     /** The expected amount when wrapping `unwrappedAmount` */
     toWrappedExactAmountIn(unwrappedAmount, slippage = 0n, rounding = "Down") {
         const wrappedAmount = this._wrap(unwrappedAmount, rounding);
-        if (this._noSlippage)
-            return wrappedAmount;
         return maths_1.MathLib.wMul(wrappedAmount, maths_1.MathLib.WAD - slippage, "Down");
     }
     /** The amount of unwrappedTokens that should be wrapped to receive `wrappedAmount` */
     toWrappedExactAmountOut(wrappedAmount, slippage = 0n, rounding = "Up") {
-        const wAmountTarget = this._noSlippage
-            ? wrappedAmount
-            : maths_1.MathLib.wDiv(wrappedAmount, maths_1.MathLib.WAD - slippage, rounding);
+        const wAmountTarget = maths_1.MathLib.wDiv(wrappedAmount, maths_1.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);
-        if (this._noSlippage)
-            return unwrappedAmount;
         return maths_1.MathLib.wMul(unwrappedAmount, maths_1.MathLib.WAD - slippage, "Up");
     }
     /** The amount of wrappedTokens that should be unwrapped to receive `unwrappedAmount` */
     toUnwrappedExactAmountOut(unwrappedAmount, slippage = 0n, rounding = "Up") {
-        const unwrappedAmountToTarget = this._noSlippage
-            ? unwrappedAmount
-            : maths_1.MathLib.wDiv(unwrappedAmount, maths_1.MathLib.WAD - slippage, rounding);
+        const unwrappedAmountToTarget = maths_1.MathLib.wDiv(unwrappedAmount, maths_1.MathLib.WAD - slippage, rounding);
         return this._wrap(unwrappedAmountToTarget, rounding);
     }
 }
 exports.WrappedToken = WrappedToken;
-class ConstantWrappedToken extends WrappedToken {
-    underlying;
-    _underlyingDecimals;
-    _noSlippage = true;
-    constructor(token, underlying, _underlyingDecimals = 18) {
-        super(token, underlying);
-        this.underlying = underlying;
-        this._underlyingDecimals = _underlyingDecimals;
-    }
-    _wrap(amount) {
-        return maths_1.MathLib.mulDivDown(amount, 10n ** BigInt(this.decimals), 10n ** BigInt(this._underlyingDecimals));
-    }
-    _unwrap(amount) {
-        return maths_1.MathLib.mulDivDown(amount, 10n ** BigInt(this._underlyingDecimals), 10n ** BigInt(this.decimals));
-    }
-}
-exports.ConstantWrappedToken = ConstantWrappedToken;
-class ExchangeRateWrappedToken extends WrappedToken {
-    underlying;
-    wrappedTokenExchangeRate;
-    _wrap(amount, rounding) {
-        return maths_1.MathLib.wDiv(amount, this.wrappedTokenExchangeRate, rounding);
-    }
-    _unwrap(amount, rounding) {
-        return maths_1.MathLib.wMul(amount, this.wrappedTokenExchangeRate, rounding);
-    }
-    constructor(token, underlying, wrappedTokenExchangeRate) {
-        super(token, underlying);
-        this.underlying = underlying;
-        this.wrappedTokenExchangeRate = wrappedTokenExchangeRate;
-    }
-}
-exports.ExchangeRateWrappedToken = ExchangeRateWrappedToken;
-class VaultToken extends WrappedToken {
-    _wrap(amount, rounding) {
-        return vault_1.VaultUtils.toShares(amount, this, this.config, rounding);
-    }
-    _unwrap(amount, rounding) {
-        return vault_1.VaultUtils.toAssets(amount, this, this.config, rounding);
-    }
-    totalAssets;
-    totalSupply;
-    config;
-    constructor(token, { totalAssets, totalSupply, config, }) {
-        super(token, config.asset);
-        this.totalAssets = totalAssets;
-        this.totalSupply = totalSupply;
-        this.config = config;
-    }
-}
-exports.VaultToken = VaultToken;

package/lib/token/index.d.ts

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

package/lib/token/index.js

@@ -16,3 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 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);

package/lib/vault/Vault.d.ts

@@ -1,6 +1,6 @@
 import { CapacityLimit } from "../market";
 import { RoundingDirection } from "../maths";
-import { Token } from "../token";
+import { VaultToken } from "../token";
 import { Address, MarketId } from "../types";
 import { VaultConfig } from "./VaultConfig";
 import { InputVaultMarketAllocation, VaultMarketAllocation } from "./VaultMarketAllocation";
@@ -41,7 +41,7 @@ export interface InputVault {
     lastTotalAssets: bigint;
     publicAllocatorConfig?: VaultPublicAllocatorConfig;
 }
-export declare class Vault implements InputVault {
+export declare class Vault extends VaultToken implements InputVault {
     /**
      * The MetaMorpho vault's config.
      */
@@ -111,7 +111,6 @@ export declare class Vault implements InputVault {
      */
     publicAllocatorConfig?: VaultPublicAllocatorConfig;
     constructor({ config, curator, owner, guardian, publicAllocatorConfig, fee, feeRecipient, skimRecipient, pendingTimelock, pendingGuardian, pendingOwner, timelock, supplyQueue, withdrawQueue, totalSupply, totalAssets, lastTotalAssets, }: InputVault);
-    get address(): string;
     get asset(): string;
     /**
      * The amount of interest in assets accrued since the last interaction with the vault.
@@ -134,10 +133,6 @@ export declare class AccrualVault extends Vault implements InputAccrualVault {
      * The allocation of the vault on each market enabled.
      */
     readonly allocations: Map<MarketId, VaultMarketAllocation>;
-    /**
-     * The ERC4626 vault's share token.
-     */
-    token: Token;
     /**
      * The proportion of assets of the vault supplied to markets collateralized by each collateral asset.
      */

package/lib/vault/Vault.js

@@ -6,7 +6,7 @@ const maths_1 = require("../maths");
 const token_1 = require("../token");
 const VaultMarketAllocation_1 = require("./VaultMarketAllocation");
 const VaultUtils_1 = require("./VaultUtils");
-class Vault {
+class Vault extends token_1.VaultToken {
     /**
      * The MetaMorpho vault's config.
      */
@@ -76,6 +76,7 @@ class Vault {
      */
     publicAllocatorConfig;
     constructor({ config, curator, owner, guardian, publicAllocatorConfig, fee, feeRecipient, skimRecipient, pendingTimelock, pendingGuardian, pendingOwner, timelock, supplyQueue, withdrawQueue, totalSupply, totalAssets, lastTotalAssets, }) {
+        super(config, { totalAssets, totalSupply });
         this.config = config;
         this.curator = curator;
         this.owner = owner;
@@ -97,9 +98,6 @@ class Vault {
         this.lastTotalAssets = lastTotalAssets;
         this.publicAllocatorConfig = publicAllocatorConfig;
     }
-    get address() {
-        return this.config.address;
-    }
     get asset() {
         return this.config.asset;
     }
@@ -122,10 +120,6 @@ class AccrualVault extends Vault {
      * The allocation of the vault on each market enabled.
      */
     allocations;
-    /**
-     * The ERC4626 vault's share token.
-     */
-    token;
     /**
      * The proportion of assets of the vault supplied to markets collateralized by each collateral asset.
      */
@@ -148,7 +142,6 @@ class AccrualVault extends Vault {
                 position,
             }),
         ]));
-        this.token = new token_1.Token(this.config);
         this.collateralAllocations = new Map();
         for (const { marketId, position } of this.allocations.values()) {
             const address = position.market.config.collateralToken;

package/lib/vault/VaultConfig.d.ts

@@ -1,6 +1,6 @@
 import { ChainId } from "../chain";
 import { Address } from "../types";
-interface InputVaultConfig {
+export interface InputVaultConfig {
     address: Address;
     decimals: number;
     decimalsOffset: bigint;
@@ -20,4 +20,3 @@ export declare class VaultConfig implements InputVaultConfig {
     readonly asset: Address;
     constructor({ address, decimals, decimalsOffset, symbol, name, asset, }: InputVaultConfig, chainId?: number | undefined);
 }
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morpho-org/blue-sdk",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "author": "Morpho Association <contact@morpho.org>",
   "license": "MIT",
   "main": "lib/index.js",
@@ -16,8 +16,8 @@
     "keccak256": "^1.0.6"
   },
   "devDependencies": {
-    "@morpho-org/morpho-test": "^1.4.4",
-    "@morpho-org/morpho-ts": "^1.4.4",
+    "@morpho-org/morpho-test": "^1.4.5",
+    "@morpho-org/morpho-ts": "^1.4.5",
     "@types/jest": "^29.5.12",
     "@types/node": "^22.0.0",
     "jest": "^29.7.0",
@@ -25,7 +25,7 @@
     "typescript": "^5.4.5"
   },
   "peerDependencies": {
-    "@morpho-org/morpho-ts": "^1.4.4"
+    "@morpho-org/morpho-ts": "^1.4.5"
   },
   "publishConfig": {
     "access": "public"
@@ -49,5 +49,5 @@
     ],
     "preset": "ts-jest"
   },
-  "gitHead": "738eb35fe9382a350e3fd221260eb0586443af52"
+  "gitHead": "ccdff72b67bf77ef55d340d70106305bb8bbe4c2"
 }