@morpho-org/blue-sdk 1.7.4 → 1.7.6

package/lib/holding/Holding.d.ts

@@ -1,4 +1,4 @@
-import { Address } from "../types";
+import { Address, BigIntish } from "../types";
 export declare const ERC20_ALLOWANCE_RECIPIENTS: readonly ["morpho", "permit2", "bundler"];
 export declare const PERMIT2_ALLOWANCE_RECIPIENTS: readonly ["morpho", "bundler"];
 export type Erc20AllowanceRecipient = (typeof ERC20_ALLOWANCE_RECIPIENTS)[number];
@@ -8,6 +8,11 @@ export interface Permit2Allowance {
     expiration: bigint;
     nonce: bigint;
 }
+export interface InputPermit2Allowance {
+    amount: BigIntish;
+    expiration: BigIntish;
+    nonce: BigIntish;
+}
 export interface InputHolding {
     user: Address;
     token: Address;
@@ -15,7 +20,7 @@ export interface InputHolding {
         [key in Erc20AllowanceRecipient]: bigint;
     };
     permit2Allowances: {
-        [key in Permit2AllowanceRecipient]: Permit2Allowance;
+        [key in Permit2AllowanceRecipient]: InputPermit2Allowance;
     };
     erc2612Nonce?: bigint;
     canTransfer?: boolean;

package/lib/holding/Holding.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Holding = exports.PERMIT2_ALLOWANCE_RECIPIENTS = exports.ERC20_ALLOWANCE_RECIPIENTS = void 0;
 const morpho_ts_1 = require("@morpho-org/morpho-ts");
-const addresses_1 = require("../addresses");
 exports.ERC20_ALLOWANCE_RECIPIENTS = [
     "morpho",
     "permit2",
@@ -42,16 +41,27 @@ class Holding {
      * `undefined` if the token does not support ERC-2612.
      */
     erc2612Nonce;
-    constructor({ user, token, erc20Allowances, permit2Allowances, balance, erc2612Nonce, canTransfer = true, }) {
+    constructor({ user, token, erc20Allowances, permit2Allowances, balance, erc2612Nonce, canTransfer, }) {
         this.user = user;
         this.token = token;
         this.balance = balance;
-        this.canTransfer = token === addresses_1.NATIVE_ADDRESS || canTransfer;
+        this.canTransfer = canTransfer;
         this.erc20Allowances = (0, morpho_ts_1.fromEntries)((0, morpho_ts_1.entries)(erc20Allowances).map(([address, allowance]) => [
             address,
             allowance,
         ]));
-        this.permit2Allowances = permit2Allowances;
+        this.permit2Allowances = {
+            morpho: {
+                amount: BigInt(permit2Allowances.morpho.amount),
+                expiration: BigInt(permit2Allowances.morpho.expiration),
+                nonce: BigInt(permit2Allowances.morpho.nonce),
+            },
+            bundler: {
+                amount: BigInt(permit2Allowances.bundler.amount),
+                expiration: BigInt(permit2Allowances.bundler.expiration),
+                nonce: BigInt(permit2Allowances.bundler.nonce),
+            },
+        };
         if (erc2612Nonce != null)
             this.erc2612Nonce = erc2612Nonce;
     }

package/lib/position/Position.d.ts

@@ -1,4 +1,4 @@
-import { Market } from "../market";
+import { Market, MaxBorrowOptions, MaxWithdrawCollateralOptions } from "../market";
 import { Address, BigIntish, MarketId } from "../types";
 export interface InputPosition {
     user: Address;
@@ -119,5 +119,8 @@ export declare class AccrualPosition extends Position implements InputAccrualPos
         shares: bigint;
     };
     getRepayCapacityLimit(loanTokenBalance: bigint): import("../market").CapacityLimit;
-    getMaxCapacities(loanTokenBalance: bigint, collateralTokenBalance: bigint): import("../market").MaxPositionCapacities;
+    getMaxCapacities(loanTokenBalance: bigint, collateralTokenBalance: bigint, options?: {
+        borrow?: MaxBorrowOptions;
+        withdrawCollateral?: MaxWithdrawCollateralOptions;
+    }): import("../market").MaxPositionCapacities;
 }

package/lib/position/Position.js

@@ -196,8 +196,8 @@ class AccrualPosition extends Position {
     getRepayCapacityLimit(loanTokenBalance) {
         return this.market.getRepayCapacityLimit(this.borrowShares, loanTokenBalance);
     }
-    getMaxCapacities(loanTokenBalance, collateralTokenBalance) {
-        return this.market.getMaxCapacities(this, loanTokenBalance, collateralTokenBalance);
+    getMaxCapacities(loanTokenBalance, collateralTokenBalance, options) {
+        return this.market.getMaxCapacities(this, loanTokenBalance, collateralTokenBalance, options);
     }
 }
 exports.AccrualPosition = AccrualPosition;

package/lib/token/ConstantWrappedToken.d.ts

@@ -1,11 +1,10 @@
 import { RoundingDirection } from "../maths";
-import { Address } from "../types";
+import { Address, BigIntish } 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);
+    readonly underlyingDecimals: bigint;
+    constructor(token: InputToken, underlying: Address, underlyingDecimals?: BigIntish);
     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;

package/lib/token/ConstantWrappedToken.js

@@ -4,12 +4,10 @@ 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) {
+    underlyingDecimals;
+    constructor(token, underlying, underlyingDecimals = 18n) {
         super(token, underlying);
-        this.underlying = underlying;
-        this._underlyingDecimals = _underlyingDecimals;
+        this.underlyingDecimals = BigInt(underlyingDecimals);
     }
     toWrappedExactAmountIn(unwrappedAmount, _slippage, rounding = "Down") {
         return super.toWrappedExactAmountIn(unwrappedAmount, 0n, rounding);
@@ -27,10 +25,10 @@ class ConstantWrappedToken extends WrappedToken_1.WrappedToken {
         return super.toUnwrappedExactAmountOut(unwrappedAmount, 0n, rounding);
     }
     _wrap(amount) {
-        return maths_1.MathLib.mulDivDown(amount, 10n ** BigInt(this.decimals), 10n ** BigInt(this._underlyingDecimals));
+        return maths_1.MathLib.mulDivDown(amount, 10n ** BigInt(this.decimals), 10n ** this.underlyingDecimals);
     }
     _unwrap(amount) {
-        return maths_1.MathLib.mulDivDown(amount, 10n ** BigInt(this._underlyingDecimals), 10n ** BigInt(this.decimals));
+        return maths_1.MathLib.mulDivDown(amount, 10n ** this.underlyingDecimals, 10n ** BigInt(this.decimals));
     }
 }
 exports.ConstantWrappedToken = ConstantWrappedToken;

package/lib/token/Token.d.ts

@@ -1,9 +1,9 @@
 import { ChainId } from "../chain";
 import { RoundingDirection } from "../maths";
-import { Address } from "../types";
+import { Address, BigIntish } from "../types";
 export interface InputToken {
     address: Address;
-    decimals: number;
+    decimals: BigIntish;
     symbol: string;
     name?: string;
 }

package/lib/token/Token.js

@@ -27,7 +27,7 @@ class Token {
     name;
     constructor({ address, decimals, symbol, name }) {
         this.address = address;
-        this.decimals = decimals;
+        this.decimals = Number(decimals);
         this.symbol = symbol;
         this.name = name ?? symbol;
     }

package/lib/token/VaultToken.js

@@ -11,7 +11,7 @@ class VaultToken extends WrappedToken_1.WrappedToken {
         super(config, config.asset);
         this.totalAssets = totalAssets;
         this.totalSupply = totalSupply;
-        this.decimalsOffset = config.decimalsOffset;
+        this.decimalsOffset = BigInt(config.decimalsOffset);
     }
     _wrap(amount, rounding) {
         return VaultUtils_1.VaultUtils.toShares(amount, this, this, rounding);

package/lib/vault/VaultConfig.d.ts

@@ -1,9 +1,9 @@
 import { ChainId } from "../chain";
-import { Address } from "../types";
+import { Address, BigIntish } from "../types";
 export interface InputVaultConfig {
     address: Address;
-    decimals: number;
-    decimalsOffset: bigint;
+    decimals: BigIntish;
+    decimalsOffset: BigIntish;
     symbol: string;
     name: string;
     asset: Address;

package/lib/vault/VaultConfig.js

@@ -20,8 +20,8 @@ class VaultConfig {
     constructor({ address, decimals, decimalsOffset, symbol, name, asset, }, chainId) {
         this.chainId = chainId;
         this.address = address;
-        this.decimals = decimals;
-        this.decimalsOffset = decimalsOffset;
+        this.decimals = Number(decimals);
+        this.decimalsOffset = BigInt(decimalsOffset);
         this.symbol = symbol;
         this.name = name;
         this.asset = asset;

package/lib/vault/VaultMarketAllocation.d.ts

@@ -8,7 +8,7 @@ export declare class VaultMarketAllocation implements InputVaultMarketAllocation
     /**
      * The vault's configuration on the corresponding market.
      */
-    config: VaultMarketConfig;
+    readonly config: VaultMarketConfig;
     /**
      * The vault's position on the corresponding market.
      */

package/lib/vault/VaultMarketConfig.d.ts

@@ -8,17 +8,17 @@ export interface InputVaultMarketConfig {
     pendingCap: Pending<bigint>;
     removableAt: bigint;
     enabled: boolean;
-    publicAllocatorConfig?: VaultMarketPublicAllocatorConfig;
+    publicAllocatorConfig: VaultMarketPublicAllocatorConfig;
 }
 export declare class VaultMarketConfig implements InputVaultMarketConfig {
     /**
      * The vault's address.
      */
-    vault: Address;
+    readonly vault: Address;
     /**
      * The market's id.
      */
-    marketId: MarketId;
+    readonly marketId: MarketId;
     /**
      * The maximum amount of tokens that can be allocated to this market.
      */
@@ -38,6 +38,6 @@ export declare class VaultMarketConfig implements InputVaultMarketConfig {
     /**
      * The vault's PublicAllocator configuration on the corresponding market.
      */
-    publicAllocatorConfig?: VaultMarketPublicAllocatorConfig;
+    readonly publicAllocatorConfig: VaultMarketPublicAllocatorConfig;
     constructor({ vault, marketId, cap, pendingCap, removableAt, enabled, publicAllocatorConfig, }: InputVaultMarketConfig);
 }

package/lib/vault/VaultMarketPublicAllocatorConfig.d.ts

@@ -12,11 +12,11 @@ export declare class VaultMarketPublicAllocatorConfig implements InputVaultMarke
     /**
      * The vault's address.
      */
-    vault: Address;
+    readonly vault: Address;
     /**
      * The market's id.
      */
-    marketId: MarketId;
+    readonly marketId: MarketId;
     /**
      * The maximum amount of tokens that can be allocated to this market by the vault via the PublicAllocator.
      */

package/lib/vault/VaultUser.d.ts

@@ -0,0 +1,26 @@
+import { Address } from "../types";
+export interface InputVaultUser {
+    vault: Address;
+    user: Address;
+    isAllocator: boolean;
+    allowance: bigint;
+}
+export declare class VaultUser implements InputVaultUser {
+    /**
+     * The vault's address.
+     */
+    readonly vault: Address;
+    /**
+     * The user's address.
+     */
+    readonly user: Address;
+    /**
+     * Whether the user is an allocator of the vault.
+     */
+    isAllocator: boolean;
+    /**
+     * The allowance of the vault over the user's underlying assets.
+     */
+    allowance: bigint;
+    constructor({ vault, user, isAllocator, allowance }: InputVaultUser);
+}

package/lib/vault/VaultUser.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VaultUser = void 0;
+class VaultUser {
+    /**
+     * The vault's address.
+     */
+    vault;
+    /**
+     * The user's address.
+     */
+    user;
+    /**
+     * Whether the user is an allocator of the vault.
+     */
+    isAllocator;
+    /**
+     * The allowance of the vault over the user's underlying assets.
+     */
+    allowance;
+    constructor({ vault, user, isAllocator, allowance }) {
+        this.vault = vault;
+        this.user = user;
+        this.isAllocator = isAllocator;
+        this.allowance = allowance;
+    }
+}
+exports.VaultUser = VaultUser;

package/lib/vault/index.d.ts

@@ -3,4 +3,5 @@ export * from "./VaultConfig";
 export * from "./VaultMarketAllocation";
 export * from "./VaultMarketConfig";
 export * from "./VaultMarketPublicAllocatorConfig";
+export * from "./VaultUser";
 export * from "./Vault";

package/lib/vault/index.js

@@ -19,4 +19,5 @@ __exportStar(require("./VaultConfig"), exports);
 __exportStar(require("./VaultMarketAllocation"), exports);
 __exportStar(require("./VaultMarketConfig"), exports);
 __exportStar(require("./VaultMarketPublicAllocatorConfig"), exports);
+__exportStar(require("./VaultUser"), exports);
 __exportStar(require("./Vault"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morpho-org/blue-sdk",
-  "version": "1.7.4",
+  "version": "1.7.6",
   "author": "Morpho Association <contact@morpho.org>",
   "license": "MIT",
   "main": "lib/index.js",
@@ -16,16 +16,16 @@
     "keccak256": "^1.0.6"
   },
   "devDependencies": {
-    "@morpho-org/morpho-test": "^1.7.4",
-    "@morpho-org/morpho-ts": "^1.7.4",
+    "@morpho-org/morpho-test": "^1.7.6",
+    "@morpho-org/morpho-ts": "^1.7.6",
     "@types/jest": "^29.5.12",
     "@types/node": "^22.1.0",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.2",
-    "typescript": "^5.4.5"
+    "typescript": "^5.6.2"
   },
   "peerDependencies": {
-    "@morpho-org/morpho-ts": "^1.7.4"
+    "@morpho-org/morpho-ts": "^1.7.6"
   },
   "publishConfig": {
     "access": "public"
@@ -49,5 +49,5 @@
     ],
     "preset": "ts-jest"
   },
-  "gitHead": "09517429d483381a758182323547e8a6fe75f2c9"
+  "gitHead": "b9b7433ff982d938ed14653295a9badb747b22dd"
 }