@morpho-org/blue-sdk 2.0.0-alpha.3 → 2.0.0-test.1

package/lib/addresses.d.ts

@@ -87,7 +87,7 @@ export declare const getChainAddresses: (chainId: number) => ChainAddresses;
  * - unwrapped token has same number of decimals than wrapped tokens.
  */
 export declare const unwrappedTokensMapping: Record<ChainId, Record<Address, Address>>;
-export declare function getUnwrappedToken(wrappedToken: Address, chainId: ChainId): `0x${string}` | undefined;
+export declare function getUnwrappedToken(wrappedToken: Address, chainId: ChainId): string | undefined;
 /**
  * The registry of all known ERC20Wrapper tokens.
  */

package/lib/errors.d.ts

@@ -46,6 +46,12 @@ export declare namespace BlueErrors {
         constructor(user: Address, marketId: MarketId);
     }
 }
+export declare class InvalidSignatureError extends Error {
+    readonly hash: string;
+    readonly signer: Address;
+    readonly recovered: Address;
+    constructor(hash: string, signer: Address, recovered: Address);
+}
 export interface ErrorClass<E extends Error> {
     new (...args: any[]): E;
 }

package/lib/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BlueErrors = exports.UnsupportedChainIdError = exports.UnknownVaultConfigError = exports.UnknownMarketConfigError = exports.UnknownTokenPriceError = exports.UnknownTokenError = exports.UnknownDataError = void 0;
+exports.InvalidSignatureError = exports.BlueErrors = exports.UnsupportedChainIdError = exports.UnknownVaultConfigError = exports.UnknownMarketConfigError = exports.UnknownTokenPriceError = exports.UnknownTokenError = exports.UnknownDataError = void 0;
 exports._try = _try;
 class UnknownDataError extends Error {
 }
@@ -94,6 +94,18 @@ var BlueErrors;
     }
     BlueErrors.InsufficientCollateral = InsufficientCollateral;
 })(BlueErrors || (exports.BlueErrors = BlueErrors = {}));
+class InvalidSignatureError extends Error {
+    hash;
+    signer;
+    recovered;
+    constructor(hash, signer, recovered) {
+        super(`invalid signature for hash ${hash}: expected ${signer}, recovered ${recovered}`);
+        this.hash = hash;
+        this.signer = signer;
+        this.recovered = recovered;
+    }
+}
+exports.InvalidSignatureError = InvalidSignatureError;
 function _try(accessor, ...errorClasses) {
     try {
         return accessor();

package/lib/helpers/format/format.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/helpers/format/format.test.js

@@ -0,0 +1,255 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const format_1 = require("./format");
+describe("format", () => {
+    const number = 12345.6789;
+    const bigint = 123456789n;
+    const decimals = 4;
+    describe("hex", () => {
+        describe("should properly format number in hex format", () => {
+            it("without option", () => {
+                expect(format_1.format.hex.of(number)).toEqual((123456789).toString(16));
+            });
+        });
+        describe("should properly format bigint in hex format", () => {
+            it("without option", () => {
+                expect(format_1.format.hex.of(bigint, decimals)).toEqual((123456789).toString(16));
+            });
+        });
+    });
+    describe("number", () => {
+        describe("should properly format number in number format", () => {
+            it("without option", () => {
+                expect(format_1.format.number.of(number)).toEqual("12345.6789");
+            });
+            it("with digits", () => {
+                expect(format_1.format.number.digits(2).of(number)).toEqual("12345.67");
+            });
+            it("with min", () => {
+                expect(format_1.format.number.min(20000).of(number)).toEqual("< 20000.0000");
+            });
+            it("with max", () => {
+                expect(format_1.format.number.max(10000).of(number)).toEqual("> 10000.0000");
+            });
+            it("with sign", () => {
+                expect(format_1.format.number.sign().of(number)).toEqual("+12345.6789");
+            });
+            it("with unit", () => {
+                expect(format_1.format.number.unit("$").of(number)).toEqual("$12345.6789");
+            });
+            it("without trailing zeros", () => {
+                expect(format_1.format.number.digits(6).of(number)).toEqual("12345.678900");
+                expect(format_1.format.number.digits(6).removeTrailingZero().of(number)).toEqual("12345.6789");
+            });
+            it("with locale", () => {
+                expect(format_1.format.number.locale("fr-FR").of(number)).toEqual("12345,6789");
+            });
+        });
+        describe("should properly format bigint in number format", () => {
+            it("without option", () => {
+                expect(format_1.format.number.of(bigint, decimals)).toEqual("12345.6789");
+            });
+            it("with digits", () => {
+                expect(format_1.format.number.digits(2).of(bigint, decimals)).toEqual("12345.67");
+            });
+            it("with min", () => {
+                expect(format_1.format.number.min(20000).of(bigint, decimals)).toEqual("< 20000.0000");
+            });
+            it("with max", () => {
+                expect(format_1.format.number.max(10000).of(bigint, decimals)).toEqual("> 10000.0000");
+            });
+            it("with sign", () => {
+                expect(format_1.format.number.sign().of(bigint, decimals)).toEqual("+12345.6789");
+            });
+            it("with unit", () => {
+                expect(format_1.format.number.unit("$").of(bigint, decimals)).toEqual("$12345.6789");
+            });
+            it("without trailing zeros", () => {
+                expect(format_1.format.number.digits(6).of(bigint, decimals)).toEqual("12345.678900");
+                expect(format_1.format.number.digits(6).removeTrailingZero().of(bigint, decimals)).toEqual("12345.6789");
+            });
+            it("with locale", () => {
+                expect(format_1.format.number.locale("fr-FR").of(bigint, decimals)).toEqual("12345,6789");
+            });
+        });
+    });
+    describe("short", () => {
+        describe("should properly format number in short format", () => {
+            it("without option", () => {
+                expect(format_1.format.short.of(number)).toEqual("12.3456789k");
+            });
+            it("with digits", () => {
+                expect(format_1.format.short.digits(2).of(number)).toEqual("12.34k");
+            });
+            it("with min", () => {
+                expect(format_1.format.short.min(20000).of(number)).toEqual("< 20.0000000k");
+            });
+            it("with max", () => {
+                expect(format_1.format.short.max(10000).of(number)).toEqual("> 10.0000000k");
+            });
+            it("with sign", () => {
+                expect(format_1.format.short.sign().of(number)).toEqual("+12.3456789k");
+            });
+            it("with unit", () => {
+                expect(format_1.format.short.unit("€").of(number)).toEqual("12.3456789k €");
+            });
+            it("without trailing zeros", () => {
+                expect(format_1.format.short.digits(8).of(number)).toEqual("12.34567890k");
+                expect(format_1.format.short.digits(8).removeTrailingZero().of(number)).toEqual("12.3456789k");
+            });
+            it("with small numbers with commas", () => {
+                expect(format_1.format.short.smallValuesWithCommas().of(number / 10)).toEqual("1,234.56789");
+            });
+            it("with locale", () => {
+                expect(format_1.format.short.locale("fr-FR").of(number)).toEqual("12,3456789k");
+            });
+        });
+        describe("should properly format bigint in short format", () => {
+            it("without option", () => {
+                expect(format_1.format.short.of(bigint, decimals)).toEqual("12.3456789k");
+            });
+            it("with digits", () => {
+                expect(format_1.format.short.digits(2).of(bigint, decimals)).toEqual("12.34k");
+            });
+            it("with min", () => {
+                expect(format_1.format.short.min(20000).of(bigint, decimals)).toEqual("< 20.0000000k");
+            });
+            it("with max", () => {
+                expect(format_1.format.short.max(10000).of(bigint, decimals)).toEqual("> 10.0000000k");
+            });
+            it("with sign", () => {
+                expect(format_1.format.short.sign().of(bigint, decimals)).toEqual("+12.3456789k");
+            });
+            it("with unit", () => {
+                expect(format_1.format.short.unit("€").of(bigint, decimals)).toEqual("12.3456789k €");
+            });
+            it("without trailing zeros", () => {
+                expect(format_1.format.short.digits(8).of(bigint, decimals)).toEqual("12.34567890k");
+                expect(format_1.format.short.digits(8).removeTrailingZero().of(bigint, decimals)).toEqual("12.3456789k");
+            });
+            it("with locale", () => {
+                expect(format_1.format.short.locale("fr-FR").of(bigint, decimals)).toEqual("12,3456789k");
+            });
+            it("with small numbers with commas", () => {
+                expect(format_1.format.short.smallValuesWithCommas().of(bigint, decimals + 1)).toEqual("1,234.56789");
+            });
+            it("with small numbers with commas with locale", () => {
+                expect(format_1.format.short
+                    .smallValuesWithCommas()
+                    .locale("fr-FR")
+                    .of(bigint, decimals + 1)).toEqual("1\u202F234,56789");
+            });
+        });
+    });
+    describe("commas", () => {
+        describe("should properly format number in commas format", () => {
+            it("without option", () => {
+                expect(format_1.format.commas.of(number)).toEqual("12,345.6789");
+            });
+            it("with digits", () => {
+                expect(format_1.format.commas.digits(2).of(number)).toEqual("12,345.67");
+            });
+            it("with min", () => {
+                expect(format_1.format.commas.min(20000).of(number)).toEqual("< 20,000.0000");
+            });
+            it("with max", () => {
+                expect(format_1.format.commas.max(10000).of(number)).toEqual("> 10,000.0000");
+            });
+            it("with sign", () => {
+                expect(format_1.format.commas.sign().of(number)).toEqual("+12,345.6789");
+            });
+            it("with unit", () => {
+                expect(format_1.format.commas.unit("ETH").of(number)).toEqual("12,345.6789 ETH");
+            });
+            it("without trailing zeros", () => {
+                expect(format_1.format.commas.digits(6).of(number)).toEqual("12,345.678900");
+                expect(format_1.format.commas.digits(6).removeTrailingZero().of(number)).toEqual("12,345.6789");
+            });
+            it("with locale", () => {
+                expect(format_1.format.commas.locale("fr-FR").of(number)).toEqual("12\u202F345,6789");
+            });
+        });
+        describe("should properly format bigint in commas format", () => {
+            it("without option", () => {
+                expect(format_1.format.commas.of(bigint, decimals)).toEqual("12,345.6789");
+            });
+            it("with digits", () => {
+                expect(format_1.format.commas.digits(2).of(bigint, decimals)).toEqual("12,345.67");
+            });
+            it("with min", () => {
+                expect(format_1.format.commas.min(20000).of(bigint, decimals)).toEqual("< 20,000.0000");
+            });
+            it("with max", () => {
+                expect(format_1.format.commas.max(10000).of(bigint, decimals)).toEqual("> 10,000.0000");
+            });
+            it("with sign", () => {
+                expect(format_1.format.commas.sign().of(bigint, decimals)).toEqual("+12,345.6789");
+            });
+            it("with unit", () => {
+                expect(format_1.format.commas.unit("ETH").of(bigint, decimals)).toEqual("12,345.6789 ETH");
+            });
+            it("without trailing zeros", () => {
+                expect(format_1.format.commas.digits(6).of(bigint, decimals)).toEqual("12,345.678900");
+                expect(format_1.format.commas.digits(6).removeTrailingZero().of(bigint, decimals)).toEqual("12,345.6789");
+            });
+            it("with locale", () => {
+                // the correct space in fr-FR is narrow no-break space (U+202F)
+                expect(format_1.format.commas.locale("fr-FR").of(bigint, decimals)).toEqual("12\u202F345,6789");
+            });
+        });
+    });
+    describe("percent", () => {
+        describe("should properly format number in percent format", () => {
+            it("without option", () => {
+                expect(format_1.format.percent.of(number)).toEqual("1234567.8900");
+            });
+            it("with digits", () => {
+                expect(format_1.format.percent.digits(1).of(number)).toEqual("1234567.8");
+            });
+            it("with min", () => {
+                expect(format_1.format.percent.min(20000).of(number)).toEqual("< 2000000.0000");
+            });
+            it("with max", () => {
+                expect(format_1.format.percent.max(10000).of(number)).toEqual("> 1000000.0000");
+            });
+            it("with sign", () => {
+                expect(format_1.format.percent.sign().of(number)).toEqual("+1234567.8900");
+            });
+            it("with unit", () => {
+                expect(format_1.format.percent.unit("%").of(number)).toEqual("1234567.8900%");
+            });
+            it("without trailing zeros", () => {
+                expect(format_1.format.percent.removeTrailingZero().of(number)).toEqual("1234567.89");
+            });
+            it("with locale", () => {
+                expect(format_1.format.percent.locale("fr-FR").of(number)).toEqual("1234567,8900");
+            });
+        });
+        describe("should properly format bigint in percent format", () => {
+            it("without option", () => {
+                expect(format_1.format.percent.of(bigint, decimals)).toEqual("1234567.8900");
+            });
+            it("with digits", () => {
+                expect(format_1.format.percent.digits(1).of(bigint, decimals)).toEqual("1234567.8");
+            });
+            it("with min", () => {
+                expect(format_1.format.percent.min(20000).of(bigint, decimals)).toEqual("< 2000000.0000");
+            });
+            it("with max", () => {
+                expect(format_1.format.percent.max(10000).of(bigint, decimals)).toEqual("> 1000000.0000");
+            });
+            it("with sign", () => {
+                expect(format_1.format.percent.sign().of(bigint, decimals)).toEqual("+1234567.8900");
+            });
+            it("with unit", () => {
+                expect(format_1.format.percent.unit("%").of(bigint, decimals)).toEqual("1234567.8900%");
+            });
+            it("without trailing zeros", () => {
+                expect(format_1.format.percent.removeTrailingZero().of(bigint, decimals)).toEqual("1234567.89");
+            });
+            it("with locale", () => {
+                expect(format_1.format.percent.locale("fr-FR").of(bigint, decimals)).toEqual("1234567,8900");
+            });
+        });
+    });
+});

package/lib/helpers/format/index.d.ts

@@ -0,0 +1 @@
+export * from "./format";

package/lib/helpers/format/index.js

@@ -0,0 +1,17 @@
+"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("./format"), exports);

package/lib/helpers/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./locale";
+export * from "./format";

package/lib/helpers/index.js

@@ -0,0 +1,18 @@
+"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("./locale"), exports);
+__exportStar(require("./format"), exports);

package/lib/holding/Holding.d.ts

@@ -1,4 +1,4 @@
-import { Address, BigIntish } from "../types";
+import { Address } 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,11 +8,6 @@ export interface Permit2Allowance {
     expiration: bigint;
     nonce: bigint;
 }
-export interface InputPermit2Allowance {
-    amount: BigIntish;
-    expiration: BigIntish;
-    nonce: BigIntish;
-}
 export interface InputHolding {
     user: Address;
     token: Address;
@@ -20,7 +15,7 @@ export interface InputHolding {
         [key in Erc20AllowanceRecipient]: bigint;
     };
     permit2Allowances: {
-        [key in Permit2AllowanceRecipient]: InputPermit2Allowance;
+        [key in Permit2AllowanceRecipient]: Permit2Allowance;
     };
     erc2612Nonce?: bigint;
     canTransfer?: boolean;

package/lib/holding/Holding.js

@@ -2,6 +2,7 @@
 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",
@@ -41,27 +42,16 @@ class Holding {
      * `undefined` if the token does not support ERC-2612.
      */
     erc2612Nonce;
-    constructor({ user, token, erc20Allowances, permit2Allowances, balance, erc2612Nonce, canTransfer, }) {
+    constructor({ user, token, erc20Allowances, permit2Allowances, balance, erc2612Nonce, canTransfer = true, }) {
         this.user = user;
         this.token = token;
         this.balance = balance;
-        this.canTransfer = canTransfer;
+        this.canTransfer = token === addresses_1.NATIVE_ADDRESS || canTransfer;
         this.erc20Allowances = (0, morpho_ts_1.fromEntries)((0, morpho_ts_1.entries)(erc20Allowances).map(([address, allowance]) => [
             address,
             allowance,
         ]));
-        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),
-            },
-        };
+        this.permit2Allowances = permit2Allowances;
         if (erc2612Nonce != null)
             this.erc2612Nonce = erc2612Nonce;
     }

package/lib/index.d.ts

@@ -9,6 +9,7 @@ export * from "./maths";
 export * from "./user";
 export * from "./holding";
 export * from "./position";
+export * from "./helpers";
 export * from "./vault";
 export * as constants from "./constants";
 export * as errors from "./errors";
@@ -20,4 +21,5 @@ export * as holding from "./holding";
 export * as types from "./types";
 export * as maths from "./maths";
 export * as user from "./user";
+export * as helpers from "./helpers";
 export * as vault from "./vault";

package/lib/index.js

@@ -26,7 +26,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vault = exports.user = exports.maths = exports.types = exports.holding = exports.position = exports.token = exports.chain = exports.market = exports.errors = exports.constants = void 0;
+exports.vault = exports.helpers = exports.user = exports.maths = exports.types = exports.holding = exports.position = exports.token = exports.chain = exports.market = exports.errors = exports.constants = void 0;
 __exportStar(require("./addresses"), exports);
 __exportStar(require("./constants"), exports);
 __exportStar(require("./errors"), exports);
@@ -38,6 +38,7 @@ __exportStar(require("./maths"), exports);
 __exportStar(require("./user"), exports);
 __exportStar(require("./holding"), exports);
 __exportStar(require("./position"), exports);
+__exportStar(require("./helpers"), exports);
 __exportStar(require("./vault"), exports);
 exports.constants = __importStar(require("./constants"));
 exports.errors = __importStar(require("./errors"));
@@ -49,4 +50,5 @@ exports.holding = __importStar(require("./holding"));
 exports.types = __importStar(require("./types"));
 exports.maths = __importStar(require("./maths"));
 exports.user = __importStar(require("./user"));
+exports.helpers = __importStar(require("./helpers"));
 exports.vault = __importStar(require("./vault"));

package/lib/maths/MathLib.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MathLib = void 0;
 const morpho_ts_1 = require("@morpho-org/morpho-ts");
+const helpers_1 = require("../helpers");
 /**
  * Library to manage fixed-point arithmetic.
  * This library reproduces the behaviour of the solidity library MathLib
@@ -156,7 +157,7 @@ class MathLib {
     static rateToApy(rate, period) {
         const { unit, duration } = morpho_ts_1.Time.toPeriod(period);
         const factor = morpho_ts_1.Time[unit].from.y(1) / duration;
-        return ((1 + Number(morpho_ts_1.format.number.locale("en").of(BigInt(rate), 18))) ** factor -
+        return ((1 + Number(helpers_1.format.number.locale("en").of(BigInt(rate), 18))) ** factor -
             1);
     }
     /**

package/lib/token/ConstantWrappedToken.d.ts

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

package/lib/token/ConstantWrappedToken.js

@@ -4,10 +4,12 @@ exports.ConstantWrappedToken = void 0;
 const maths_1 = require("../maths");
 const WrappedToken_1 = require("./WrappedToken");
 class ConstantWrappedToken extends WrappedToken_1.WrappedToken {
-    underlyingDecimals;
-    constructor(token, underlying, underlyingDecimals = 18n) {
+    underlying;
+    _underlyingDecimals;
+    constructor(token, underlying, _underlyingDecimals = 18) {
         super(token, underlying);
-        this.underlyingDecimals = BigInt(underlyingDecimals);
+        this.underlying = underlying;
+        this._underlyingDecimals = _underlyingDecimals;
     }
     toWrappedExactAmountIn(unwrappedAmount, _slippage, rounding = "Down") {
         return super.toWrappedExactAmountIn(unwrappedAmount, 0n, rounding);
@@ -25,10 +27,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 ** this.underlyingDecimals);
+        return maths_1.MathLib.mulDivDown(amount, 10n ** BigInt(this.decimals), 10n ** BigInt(this._underlyingDecimals));
     }
     _unwrap(amount) {
-        return maths_1.MathLib.mulDivDown(amount, 10n ** this.underlyingDecimals, 10n ** BigInt(this.decimals));
+        return maths_1.MathLib.mulDivDown(amount, 10n ** BigInt(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, BigIntish } from "../types";
+import { Address } from "../types";
 export interface InputToken {
     address: Address;
-    decimals: BigIntish;
+    decimals: number;
     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 = Number(decimals);
+        this.decimals = 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 = BigInt(config.decimalsOffset);
+        this.decimalsOffset = config.decimalsOffset;
     }
     _wrap(amount, rounding) {
         return VaultUtils_1.VaultUtils.toShares(amount, this, this, rounding);

package/lib/types.d.ts

@@ -1,11 +1,14 @@
+export type Hex64 = string & {
+    __LENGTH__: 64;
+};
 /**
  * The address of a Contract, or an EOA
  */
-export type Address = `0x${string}`;
+export type Address = string;
 /**
  * The id of a market used on the Blue contract
  */
-export type MarketId = `0x${string}` & {
+export type MarketId = `0x${Hex64}` & {
     __TYPE__: "marketId";
 };
 export type BigIntish = bigint | string | number | boolean;

package/lib/vault/Vault.d.ts

@@ -111,7 +111,7 @@ export declare class Vault extends VaultToken implements InputVault {
      */
     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}`;
+    get asset(): string;
     /**
      * The amount of interest in assets accrued since the last interaction with the vault.
      */

package/lib/vault/VaultConfig.d.ts

@@ -1,9 +1,9 @@
 import { ChainId } from "../chain";
-import { Address, BigIntish } from "../types";
+import { Address } from "../types";
 export interface InputVaultConfig {
     address: Address;
-    decimals: BigIntish;
-    decimalsOffset: BigIntish;
+    decimals: number;
+    decimalsOffset: bigint;
     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 = Number(decimals);
-        this.decimalsOffset = BigInt(decimalsOffset);
+        this.decimals = decimals;
+        this.decimalsOffset = decimalsOffset;
         this.symbol = symbol;
         this.name = name;
         this.asset = asset;

package/lib/vault/VaultMarketAllocation.d.ts

@@ -8,13 +8,13 @@ export declare class VaultMarketAllocation implements InputVaultMarketAllocation
     /**
      * The vault's configuration on the corresponding market.
      */
-    readonly config: VaultMarketConfig;
+    config: VaultMarketConfig;
     /**
      * The vault's position on the corresponding market.
      */
     readonly position: AccrualPosition;
     constructor({ config, position }: InputVaultMarketAllocation);
-    get vault(): `0x${string}`;
+    get vault(): string;
     get marketId(): import("..").MarketId;
     get utilization(): bigint;
 }

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.
      */
-    readonly vault: Address;
+    vault: Address;
     /**
      * The market's id.
      */
-    readonly marketId: MarketId;
+    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.
      */
-    readonly publicAllocatorConfig: VaultMarketPublicAllocatorConfig;
+    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.
      */
-    readonly vault: Address;
+    vault: Address;
     /**
      * The market's id.
      */
-    readonly marketId: MarketId;
+    marketId: MarketId;
     /**
      * The maximum amount of tokens that can be allocated to this market by the vault via the PublicAllocator.
      */

package/lib/vault/index.d.ts

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

package/lib/vault/index.js

@@ -19,5 +19,4 @@ __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": "2.0.0-alpha.3",
+  "version": "2.0.0-test.1",
   "author": "Morpho Association <contact@morpho.org>",
   "license": "MIT",
   "main": "lib/index.js",
@@ -17,8 +17,8 @@
     "keccak256": "^1.0.6"
   },
   "devDependencies": {
-    "@morpho-org/morpho-test": "^2.0.0-alpha.3",
-    "@morpho-org/morpho-ts": "^2.0.0-alpha.3",
+    "@morpho-org/morpho-test": "^2.0.0-test.1",
+    "@morpho-org/morpho-ts": "^2.0.0-test.1",
     "@nomicfoundation/hardhat-ethers": "^3.0.6",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.11",
     "@types/chai": "^4.3.14",
@@ -39,10 +39,10 @@
     "mocha": "^10.4.0",
     "ts-jest": "^29.2.4",
     "ts-node": "^10.9.2",
-    "typescript": "^5.6.2"
+    "typescript": "^5.4.5"
   },
   "peerDependencies": {
-    "@morpho-org/morpho-ts": "^2.0.0-alpha.3"
+    "@morpho-org/morpho-ts": "^2.0.0-test.1"
   },
   "publishConfig": {
     "access": "public"
@@ -66,5 +66,5 @@
     ],
     "preset": "ts-jest"
   },
-  "gitHead": "20ba4884a2b8919ceaff88959ab5d29f97183ab6"
+  "gitHead": "c435f8f652383995fd6bb52379d0b570138e43d9"
 }

package/lib/vault/VaultUser.d.ts

@@ -1,26 +0,0 @@
-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

@@ -1,28 +0,0 @@
-"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;