@mezo-org/passport 0.4.0-dev.9 → 0.5.0

package/dist/src/utils/numbers.js

@@ -1,81 +1,37 @@
 /**
- * Formats a number or bigint into a human-readable string with K, M, B, or T suffix.
+ * Formats a number or bigint into compact string with K, M, B, or T suffix.
  * @param value The number or bigint to format.
  * @param decimals Number of decimal places to include (ignored for bigint to avoid floating point issues).
  * @returns The formatted number as a string.
  */
-export function formatHumanReadableNumber(value, decimals = 4) {
-    const suffixes = ["", "K", "M", "B", "T"];
-    const numericValue = typeof value === "bigint" ? Number(value) : value;
-    if (numericValue < 1000)
-        return numericValue.toFixed(decimals);
-    const magnitude = Math.floor(Math.log10(numericValue) / 3);
-    if (magnitude >= suffixes.length) {
-        const max = 10 ** ((suffixes.length - 1) * 3) * 1000 - 1;
-        const capped = max / 10 ** ((suffixes.length - 1) * 3);
-        return `> ${capped.toFixed(0)}${suffixes[suffixes.length - 1]}`;
-    }
-    const scaledValue = numericValue / 10 ** (magnitude * 3);
-    return `${scaledValue.toFixed(decimals)}${suffixes[magnitude]}`;
-}
-/**
- * Returns a number rounded up to the desired number of decimals.
- * @param amount The number to round up.
- * @param desiredDecimals The number of decimals to round up to.
- * @returns The rounded up number.
- * @see https://github.com/thesis/acre/blob/main/dapp/src/utils/numbersUtils.ts#L1-L3
- */
-export function roundUpNumber(amount, desiredDecimals = 2) {
-    return Math.ceil(amount * 10 ** desiredDecimals) / 10 ** desiredDecimals;
-}
-/**
- * Convert a fixed point bigint with precision `fixedPointDecimals` to a
- * floating point number truncated to `desiredDecimals`.
- * @param fixedPoint The fixed point bigint to convert.
- * @param fixedPointDecimals The number of decimals in the fixed point bigint.
- * @param desiredDecimals The number of decimals in the output number.
- * @returns The floating point number truncated to `desiredDecimals`.
- * @see https://github.com/tahowallet/extension/blob/main/background/lib/fixed-point.ts#L216-L239
- */
-export function fromFixedPoint(fixedPoint, fixedPointDecimals, desiredDecimals = 2) {
-    const fixedPointDesiredDecimalsAmount = fixedPoint /
-        10n ** BigInt(Math.max(1, fixedPointDecimals - desiredDecimals));
-    const formattedAmount = Number(fixedPointDesiredDecimalsAmount) /
-        10 ** Math.min(desiredDecimals, fixedPointDecimals);
-    return formattedAmount;
+export function formatNumberToCompactString(value, decimals = 2) {
+    return value.toLocaleString("en-US", {
+        notation: "compact",
+        compactDisplay: "short",
+        maximumFractionDigits: decimals,
+    });
 }
 /**
- * Display a cryptoAsset amount correctly with desired decimals.
- * The function returns a string with a language-sensitive representation of this number.
- * - If the amount entered is zero, return the result with the desired decimals.
- *   For example, 0.00 for a precision of 2.
- * - If `formattedAmount` is less than the minimum amount to display
- *  for the specified precision return information about this.
- *  For example, <0.01 for a precision of 2.
- *  - Other amounts are formatted according to the use of the `bigIntToUserAmount` function.
- * @param amount The amount of tokens to format.
- * @param decimals The number of decimals the cryptoAsset has.
- * @param desiredDecimals The number of decimals to display.
- * @param withRoundUp If true, the amount will be rounded up.
- * @returns The formatted cryptoAsset amount.
- * @see https://github.com/thesis/acre/blob/main/dapp/src/utils/numbersUtils.ts#L57-L87
+ * Normalizes a bigint value to a target precision.
+ * @param value The bigint value to normalize.
+ * @param currentPrecision The current precision of the value.
+ * @param targetPrecision The target precision to normalize to.
+ * @returns The normalized bigint value.
  */
-export function formatTokenAmount(amount, decimals = 18, desiredDecimals = 2, withRoundUp = false) {
-    const fixedPoint = BigInt(amount);
-    if (fixedPoint === 0n) {
-        return `0.${"0".repeat(desiredDecimals)}`;
+export const normalizePrecision = (value, currentPrecision, targetPrecision = currentPrecision) => {
+    if (currentPrecision > targetPrecision) {
+        return value / 10n ** BigInt(currentPrecision - targetPrecision);
     }
-    const formattedAmount = fromFixedPoint(fixedPoint, decimals, 
-    // To round the amount up, let's increase the precision by one.
-    // The desired decimal numbers will be set later anyway.
-    withRoundUp ? desiredDecimals + 1 : desiredDecimals);
-    const minAmountToDisplay = 1 / 10 ** Math.min(desiredDecimals, decimals);
-    if (minAmountToDisplay > formattedAmount) {
-        return `<0.${"0".repeat(desiredDecimals - 1)}1`;
+    if (currentPrecision < targetPrecision) {
+        return value * 10n ** BigInt(targetPrecision - currentPrecision);
     }
-    const finalFormattedAmount = withRoundUp
-        ? roundUpNumber(formattedAmount, desiredDecimals)
-        : formattedAmount;
-    return formatHumanReadableNumber(finalFormattedAmount, desiredDecimals);
-}
+    return value;
+};
+/**
+ * Utility function to find the maximum value from given `BigInt` values.
+ * @param values Array of BigInt values to find the maximum from.
+ * @returns The maximum value from the provided `BigInt` values.
+ * @dev Works exactly like `Math.max` but for `BigInt` values.
+ */
+export const bigIntMax = (...values) => values.reduce((max, value) => (value > max ? value : max));
 //# sourceMappingURL=numbers.js.map

package/dist/src/utils/numbers.js.map

@@ -1 +1 @@
-{"version":3,"file":"numbers.js","sourceRoot":"","sources":["../../../src/utils/numbers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"numbers.js","sourceRoot":"","sources":["../../../src/utils/numbers.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,MAAM,UAAU,2BAA2B,CACzC,KAAsB,EACtB,WAAkC,CAAC;IAEnC,OAAO,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE;QACnC,QAAQ,EAAE,SAAS;QACnB,cAAc,EAAE,OAAO;QACvB,qBAAqB,EAAE,QAAQ;KAChC,CAAC,CAAA;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,KAAa,EACb,gBAAwB,EACxB,eAAe,GAAG,gBAAgB,EAC1B,EAAE;IACV,IAAI,gBAAgB,GAAG,eAAe,EAAE,CAAC;QACvC,OAAO,KAAK,GAAG,GAAG,IAAI,MAAM,CAAC,gBAAgB,GAAG,eAAe,CAAC,CAAA;IAClE,CAAC;IACD,IAAI,gBAAgB,GAAG,eAAe,EAAE,CAAC;QACvC,OAAO,KAAK,GAAG,GAAG,IAAI,MAAM,CAAC,eAAe,GAAG,gBAAgB,CAAC,CAAA;IAClE,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED;;;;;GAKG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,GAAG,MAAgB,EAAU,EAAE,CACvD,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA"}

package/dist/src/utils/numbers.test.js

@@ -1,68 +1,72 @@
-import { formatHumanReadableNumber, formatTokenAmount, fromFixedPoint, roundUpNumber, } from "./numbers";
-describe("formatHumanReadableNumber", () => {
+import { formatNumberToCompactString, bigIntMax, normalizePrecision, } from "./numbers";
+describe("formatNumberToCompactString", () => {
     it("formats number less than 1000 with decimals", () => {
-        expect(formatHumanReadableNumber(123.456789, 2)).toBe("123.46");
+        expect(formatNumberToCompactString(123.456789, 2)).toBe("123.46");
     });
     it("formats thousands with K", () => {
-        expect(formatHumanReadableNumber(12_345, 2)).toBe("12.35K");
+        expect(formatNumberToCompactString(12_345, 2)).toBe("12.35K");
     });
     it("formats millions with M", () => {
-        expect(formatHumanReadableNumber(12_345_678, 2)).toBe("12.35M");
+        expect(formatNumberToCompactString(12_345_678, 2)).toBe("12.35M");
     });
     it("formats billions with B", () => {
-        expect(formatHumanReadableNumber(12_345_678_901, 2)).toBe("12.35B");
+        expect(formatNumberToCompactString(12_345_678_901, 2)).toBe("12.35B");
     });
     it("formats trillions with T", () => {
-        expect(formatHumanReadableNumber(12_345_678_901_234, 2)).toBe("12.35T");
+        expect(formatNumberToCompactString(12_345_678_901_234, 2)).toBe("12.35T");
     });
     it("formats bigint as readable number", () => {
-        expect(formatHumanReadableNumber(1234567890123456789n, 2)).toBe("> 1000T");
+        expect(formatNumberToCompactString(1234567890123456789n, 2)).toBe("1,234,567.89T");
     });
     it("caps at > 1000T for huge numbers", () => {
         const hugeNumber = 10 ** 18; // 1e18
-        expect(formatHumanReadableNumber(hugeNumber, 2)).toBe("> 1000T");
+        expect(formatNumberToCompactString(hugeNumber, 2)).toBe("1,000,000T");
     });
-});
-describe("roundUpNumber", () => {
-    it("rounds up to 2 decimals", () => {
-        expect(roundUpNumber(1.234)).toBe(1.24);
-    });
-    it("rounds up to 3 decimals", () => {
-        expect(roundUpNumber(9.87654, 3)).toBe(9.877);
-    });
-    it("rounds up exact decimal", () => {
-        expect(roundUpNumber(2.5, 1)).toBe(2.5);
+    it("formats numbers with trailing zeros correctly", () => {
+        expect(formatNumberToCompactString(1_000, 2)).toBe("1K");
     });
 });
-describe("fromFixedPoint", () => {
-    it("converts fixed point with 18 decimals to float", () => {
-        const raw = 1234567890000000000n; // 1.23456789 ETH in 18 decimals
-        expect(fromFixedPoint(raw, 18, 4)).toBe(1.2345);
+describe("bigIntMax", () => {
+    it("returns the maximum of positive bigint values", () => {
+        expect(bigIntMax(1n, 2n, 3n)).toBe(3n);
     });
-    it("converts with truncation to 2 decimals", () => {
-        const raw = 987654321000000000n; // ~0.987654321 ETH
-        expect(fromFixedPoint(raw, 18, 2)).toBe(0.98);
+    it("returns the maximum of negative bigint values", () => {
+        expect(bigIntMax(-10n, -5n, -20n)).toBe(-5n);
     });
-    it("handles large fixedPoint decimals", () => {
-        const raw = 1000000000000000000000000n; // 1M with 6 decimals
-        expect(fromFixedPoint(raw, 6, 2)).toBe(1000000000000000000);
+    it("returns the only element if array has one bigint", () => {
+        expect(bigIntMax(42n)).toBe(42n);
     });
-});
-describe("formatTokenAmount", () => {
-    it("formats zero value with desired decimals", () => {
-        expect(formatTokenAmount(0, 18, 3)).toBe("0.000");
-        expect(formatTokenAmount("0", 18, 2)).toBe("0.00");
+    it("works with a mix of positive and negative bigints", () => {
+        expect(bigIntMax(-100n, 0n, 50n, -10n)).toBe(50n);
     });
-    it("returns <0.01 if amount is less than minimum display value", () => {
-        expect(formatTokenAmount("1", 18, 2)).toBe("<0.01"); // 1 wei = 1e-18
+    it("throws an error if called with no arguments", () => {
+        expect(() => bigIntMax()).toThrow();
     });
-    it("formats a normal value without rounding", () => {
-        const result = formatTokenAmount("1230000000000000000", 18, 2);
-        expect(result).toBe("1.23");
+    it("returns the correct value when all values are equal", () => {
+        expect(bigIntMax(5n, 5n, 5n)).toBe(5n);
     });
-    it("formats with rounding if withRoundUp = true", () => {
-        const result = formatTokenAmount("1234560000000000000", 18, 2, true);
-        expect(result).toBe("1.24");
+});
+describe("normalizePrecision", () => {
+    it("reduces precision correctly (scale down)", () => {
+        const result = normalizePrecision(1234500n, 6, 3);
+        expect(result).toBe(1234n);
+    });
+    it("increases precision correctly (scale up)", () => {
+        const result = normalizePrecision(1234n, 3, 6);
+        expect(result).toBe(1234000n);
+    });
+    it("returns the same value when precision is equal", () => {
+        const result = normalizePrecision(987654321n, 5, 5);
+        expect(result).toBe(987654321n);
+    });
+    it("handles zero value correctly", () => {
+        const result = normalizePrecision(0n, 4, 8);
+        expect(result).toBe(0n);
+    });
+    it("handles large numbers without precision loss", () => {
+        const value = 123456789012345678901234567890n;
+        const result = normalizePrecision(value, 18, 20);
+        expect(result).toBe(value * 100n);
     });
 });
 //# sourceMappingURL=numbers.test.js.map

package/dist/src/utils/numbers.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"numbers.test.js","sourceRoot":"","sources":["../../../src/utils/numbers.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"numbers.test.js","sourceRoot":"","sources":["../../../src/utils/numbers.test.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/siww.d.ts

@@ -1,4 +1,5 @@
 type NetworkFamily = "evm" | "bitcoin";
 export declare function createSignInWithWalletMessage(address: string, nonce: string, networkFamily: NetworkFamily, chainId?: number): string;
+export declare function verifyDomainInSignInWithWalletMessage(message: string, signature: string, nonce: string): Promise<void>;
 export {};
 //# sourceMappingURL=siww.d.ts.map

package/dist/src/utils/siww.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"siww.d.ts","sourceRoot":"","sources":["../../../src/utils/siww.ts"],"names":[],"mappings":"AAKA,KAAK,aAAa,GAAG,KAAK,GAAG,SAAS,CAAA;AAEtC,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,aAAa,EAAE,aAAa,EAC5B,OAAO,CAAC,EAAE,MAAM,UAmBjB"}
+{"version":3,"file":"siww.d.ts","sourceRoot":"","sources":["../../../src/utils/siww.ts"],"names":[],"mappings":"AAQA,KAAK,aAAa,GAAG,KAAK,GAAG,SAAS,CAAA;AAEtC,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,aAAa,EAAE,aAAa,EAC5B,OAAO,CAAC,EAAE,MAAM,UAwBjB;AASD,wBAAsB,qCAAqC,CACzD,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,iBAmCd"}

package/dist/src/utils/siww.js

@@ -1,19 +1,57 @@
-import { SignInWithWalletMessage } from "@mezo-org/sign-in-with-wallet";
+import { SignInWithWalletErrorType, SignInWithWalletMessage, } from "@mezo-org/sign-in-with-wallet";
 import { ONE_DAY_MS } from "./time";
 const SESSION_EXPIRATION_DURATION_MS = 14 * ONE_DAY_MS;
 export function createSignInWithWalletMessage(address, nonce, networkFamily, chainId) {
     const { host: domain, origin: uri } = window.location;
-    const message = new SignInWithWalletMessage({
-        domain,
-        address, // if "bitcoin" this should be btc address, not underlaying eth address
-        uri,
+    let siwwMessage;
+    try {
+        siwwMessage = new SignInWithWalletMessage({
+            domain,
+            address, // if "bitcoin" this should be btc address, not underlaying eth address
+            uri,
+            nonce,
+            issuedAt: new Date().toISOString(),
+            expirationTime: new Date(Date.now() + SESSION_EXPIRATION_DURATION_MS).toISOString(),
+            version: "1",
+            chainId: networkFamily === "evm" ? chainId : undefined,
+            networkFamily,
+        });
+    }
+    catch (error) {
+        throw new Error(`Failed to create sign in with wallet message: ${error}`);
+    }
+    return siwwMessage.prepareMessage();
+}
+class SIWWDomainError extends Error {
+    constructor(message) {
+        super(`Error when verifying domain in SIWW message: ${message}`);
+        this.name = "SIWWDomainError";
+    }
+}
+export async function verifyDomainInSignInWithWalletMessage(message, signature, nonce) {
+    const { host: domain } = window.location;
+    let siwwMessage;
+    try {
+        siwwMessage = new SignInWithWalletMessage(message);
+    }
+    catch (error) {
+        throw new SIWWDomainError("Failed to parse SIWW message");
+    }
+    if (!siwwMessage.expirationTime) {
+        throw new SIWWDomainError("SIWW messages must have an expiration time set");
+    }
+    const result = await siwwMessage.verify({
+        signature,
+        // Nonce has to match the session ID carried in the request.
         nonce,
-        issuedAt: new Date().toISOString(),
-        expirationTime: new Date(Date.now() + SESSION_EXPIRATION_DURATION_MS).toISOString(),
-        version: "1",
-        chainId: networkFamily === "evm" ? chainId : undefined,
-        networkFamily,
-    });
-    return message.prepareMessage();
+        domain,
+        // Time is used as a reference to verify the expiration time set in the
+        // message.
+        time: new Date().toISOString(),
+    }, { suppressExceptions: true });
+    if (result.error &&
+        result.error.type === SignInWithWalletErrorType.DOMAIN_MISMATCH) {
+        throw new SIWWDomainError("Domain does not match provided domain for verification.");
+    }
 }
 //# sourceMappingURL=siww.js.map

package/dist/src/utils/siww.js.map

@@ -1 +1 @@
-{"version":3,"file":"siww.js","sourceRoot":"","sources":["../../../src/utils/siww.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAEnC,MAAM,8BAA8B,GAAG,EAAE,GAAG,UAAU,CAAA;AAItD,MAAM,UAAU,6BAA6B,CAC3C,OAAe,EACf,KAAa,EACb,aAA4B,EAC5B,OAAgB;IAEhB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAA;IAErD,MAAM,OAAO,GAAG,IAAI,uBAAuB,CAAC;QAC1C,MAAM;QACN,OAAO,EAAE,uEAAuE;QAChF,GAAG;QACH,KAAK;QACL,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QAClC,cAAc,EAAE,IAAI,IAAI,CACtB,IAAI,CAAC,GAAG,EAAE,GAAG,8BAA8B,CAC5C,CAAC,WAAW,EAAE;QACf,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,aAAa,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;QACtD,aAAa;KACd,CAAC,CAAA;IAEF,OAAO,OAAO,CAAC,cAAc,EAAE,CAAA;AACjC,CAAC"}
+{"version":3,"file":"siww.js","sourceRoot":"","sources":["../../../src/utils/siww.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAEnC,MAAM,8BAA8B,GAAG,EAAE,GAAG,UAAU,CAAA;AAItD,MAAM,UAAU,6BAA6B,CAC3C,OAAe,EACf,KAAa,EACb,aAA4B,EAC5B,OAAgB;IAEhB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAA;IAErD,IAAI,WAAW,CAAA;IACf,IAAI,CAAC;QACH,WAAW,GAAG,IAAI,uBAAuB,CAAC;YACxC,MAAM;YACN,OAAO,EAAE,uEAAuE;YAChF,GAAG;YACH,KAAK;YACL,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YAClC,cAAc,EAAE,IAAI,IAAI,CACtB,IAAI,CAAC,GAAG,EAAE,GAAG,8BAA8B,CAC5C,CAAC,WAAW,EAAE;YACf,OAAO,EAAE,GAAG;YACZ,OAAO,EAAE,aAAa,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;YACtD,aAAa;SACd,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,iDAAiD,KAAK,EAAE,CAAC,CAAA;IAC3E,CAAC;IAED,OAAO,WAAW,CAAC,cAAc,EAAE,CAAA;AACrC,CAAC;AAED,MAAM,eAAgB,SAAQ,KAAK;IACjC,YAAY,OAAe;QACzB,KAAK,CAAC,gDAAgD,OAAO,EAAE,CAAC,CAAA;QAChE,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAA;IAC/B,CAAC;CACF;AAED,MAAM,CAAC,KAAK,UAAU,qCAAqC,CACzD,OAAe,EACf,SAAiB,EACjB,KAAa;IAEb,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAA;IACxC,IAAI,WAAoC,CAAA;IACxC,IAAI,CAAC;QACH,WAAW,GAAG,IAAI,uBAAuB,CAAC,OAAO,CAAC,CAAA;IACpD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,eAAe,CAAC,8BAA8B,CAAC,CAAA;IAC3D,CAAC;IAED,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QAChC,MAAM,IAAI,eAAe,CAAC,gDAAgD,CAAC,CAAA;IAC7E,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,MAAM,CACrC;QACE,SAAS;QACT,4DAA4D;QAC5D,KAAK;QACL,MAAM;QACN,uEAAuE;QACvE,WAAW;QACX,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KAC/B,EACD,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAC7B,CAAA;IAED,IACE,MAAM,CAAC,KAAK;QACZ,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,yBAAyB,CAAC,eAAe,EAC/D,CAAC;QACD,MAAM,IAAI,eAAe,CACvB,yDAAyD,CAC1D,CAAA;IACH,CAAC;AACH,CAAC"}

package/dist/src/utils/wagmi.d.ts

@@ -0,0 +1,3 @@
+import { Connector } from "wagmi";
+export declare function getBitcoinPublicKeyFromConnector(connector: Connector): Promise<string | undefined>;
+//# sourceMappingURL=wagmi.d.ts.map

package/dist/src/utils/wagmi.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wagmi.d.ts","sourceRoot":"","sources":["../../../src/utils/wagmi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEjC,wBAAsB,gCAAgC,CAAC,SAAS,EAAE,SAAS,+BAQ1E"}

package/dist/src/utils/wagmi.js

@@ -0,0 +1,7 @@
+export async function getBitcoinPublicKeyFromConnector(connector) {
+    if (connector.type !== "orangekit")
+        return undefined;
+    const provider = connector.getBitcoinProvider();
+    return provider.getPublicKey();
+}
+//# sourceMappingURL=wagmi.js.map

package/dist/src/utils/wagmi.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wagmi.js","sourceRoot":"","sources":["../../../src/utils/wagmi.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,KAAK,UAAU,gCAAgC,CAAC,SAAoB;IACzE,IAAI,SAAS,CAAC,IAAI,KAAK,WAAW;QAAE,OAAO,SAAS,CAAA;IAEpD,MAAM,QAAQ,GACZ,SACD,CAAC,kBAAkB,EAAE,CAAA;IAEtB,OAAO,QAAQ,CAAC,YAAY,EAAE,CAAA;AAChC,CAAC"}

package/dist/src/wallet/index.d.ts

@@ -1,2 +1,2 @@
-export { getOKXWallet, getUnisatWallet, getXverseWallet, BitcoinWalletConnectionError, WalletNetworkDoesNotMatchProviderChainError, isUnsupportedBitcoinAddressError, isWalletNetworkDoesNotMatchProviderChainError, } from "@mezo-org/orangekit";
+export { BitcoinWalletConnectionError, getOKXWallet, getUnisatWallet, getXverseWallet, isUnsupportedBitcoinAddressError, isWalletNetworkDoesNotMatchProviderChainError, OrangeKitConnector, WalletNetworkDoesNotMatchProviderChainError, } from "@mezo-org/orangekit";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/wallet/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/wallet/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,eAAe,EACf,eAAe,EACf,4BAA4B,EAC5B,2CAA2C,EAC3C,gCAAgC,EAChC,6CAA6C,GAC9C,MAAM,qBAAqB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/wallet/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,YAAY,EACZ,eAAe,EACf,eAAe,EACf,gCAAgC,EAChC,6CAA6C,EAC7C,kBAAkB,EAClB,2CAA2C,GAC5C,MAAM,qBAAqB,CAAA"}

package/dist/src/wallet/index.js

@@ -1,2 +1,2 @@
-export { getOKXWallet, getUnisatWallet, getXverseWallet, BitcoinWalletConnectionError, WalletNetworkDoesNotMatchProviderChainError, isUnsupportedBitcoinAddressError, isWalletNetworkDoesNotMatchProviderChainError, } from "@mezo-org/orangekit";
+export { BitcoinWalletConnectionError, getOKXWallet, getUnisatWallet, getXverseWallet, isUnsupportedBitcoinAddressError, isWalletNetworkDoesNotMatchProviderChainError, WalletNetworkDoesNotMatchProviderChainError, } from "@mezo-org/orangekit";
 //# sourceMappingURL=index.js.map

package/dist/src/wallet/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/wallet/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,eAAe,EACf,eAAe,EACf,4BAA4B,EAC5B,2CAA2C,EAC3C,gCAAgC,EAChC,6CAA6C,GAC9C,MAAM,qBAAqB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/wallet/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,YAAY,EACZ,eAAe,EACf,eAAe,EACf,gCAAgC,EAChC,6CAA6C,EAE7C,2CAA2C,GAC5C,MAAM,qBAAqB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mezo-org/passport",
-  "version": "0.4.0-dev.9",
+  "version": "0.5.0",
   "main": "dist/src/index.js",
   "license": "GPL-3.0-only",
   "scripts": {
@@ -28,8 +28,6 @@
     "@types/jest": "^29.5.12",
     "@types/node": "^20.11.30",
     "@types/react": "^18.2.64",
-    "@types/ungap__structured-clone": "^1.2.0",
-    "@ungap/structured-clone": "^1.3.0",
     "eslint": "^8.57.1",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
@@ -39,16 +37,21 @@
     "typescript": "^5.4.3"
   },
   "dependencies": {
-    "@mezo-org/mezo-clay": "0.1.0-dev.18",
-    "@mezo-org/orangekit": "1.0.0-beta.40-dev.0",
-    "@mezo-org/sign-in-with-wallet": "1.0.0-beta.8"
+    "@mezo-org/mezo-clay": "0.1.0-dev.30",
+    "@mezo-org/mezod-contracts": "^1.0.0",
+    "@mezo-org/musd-contracts": "^1.0.1",
+    "@mezo-org/orangekit": "1.0.0-beta.40-dev.19",
+    "@mezo-org/sign-in-with-wallet": "1.0.0-beta.8",
+    "qrcode.react": "^4.2.0",
+    "styletron-engine-monolithic": "^1.0.0",
+    "usehooks-ts": "^3.1.1",
+    "motion": "^12.23.6",
+    "zustand": "^5.0.3"
   },
   "peerDependencies": {
     "@rainbow-me/rainbowkit": "2.0.2",
     "@tanstack/react-query": "^5.28.4",
     "react": "^18.2.0",
-    "styletron-engine-monolithic": "^1.0.0",
-    "usehooks-ts": "^3.1.1",
     "viem": "2.22.8",
     "wagmi": "2.5.12"
   }

package/src/api/auth.ts

@@ -38,7 +38,7 @@ export type AuthenticationProviderRedirectResponse = {
   redirectTo: string
 }
 
-type SignatureData = {
+export type SignatureData = {
   message: string
   signature: string
 }
@@ -62,12 +62,14 @@ export type GetAccountByMezoIdOrAddressResponse = {
   linkedAccounts?: Extract<LinkedAccount, { type: "wallet" }>[]
 }
 
-export type LinkAccountRequest = CreateSessionRequest
+export type LinkAccountRequest = CreateAccountRequest | { type: "discord" }
 export type LinkAccountResponse =
   | Account
   | AuthenticationProviderRedirectResponse
 
-export type CreateAccountRequest = { type: "wallet" } & SignatureData
+export type CreateAccountRequest = { type: "wallet" } & SignatureData & {
+    bitcoinPublicKey?: string
+  }
 export type CreateAccountResponse = Account
 
 export type UpdateMezoIdResponse = Account
@@ -82,7 +84,9 @@ export class AuthApiClient extends ApiClient {
     environment: keyof typeof AUTH_API_ENDPOINTS_BY_ENV = "mainnet",
     apiUrl?: string,
   ) {
-    super(apiUrl ?? AUTH_API_ENDPOINTS_BY_ENV[environment])
+    super({
+      apiUrl: apiUrl ?? AUTH_API_ENDPOINTS_BY_ENV[environment],
+    })
   }
 
   async getSession(code?: string) {

package/src/api/client.ts

@@ -5,10 +5,19 @@ type RequestHandlerOptions = Omit<RequestInit, "credentials" | "body"> & {
   queryParams?: Record<string, string | undefined>
 }
 
+const ENDS_WITH_VERSIONING_REGEX = /\/v\d+(?=\/|$)/
+const TRAILING_SLASH_REGEX = /\/$/
+
 export abstract class ApiClient {
   private apiUrl: string
 
-  constructor(apiUrl: string) {
+  constructor(opts: { apiUrl: string; removeVersioning?: boolean }) {
+    const { apiUrl, removeVersioning = false } = opts
+
+    if (removeVersioning) {
+      this.apiUrl = apiUrl.replace(ENDS_WITH_VERSIONING_REGEX, "")
+      return
+    }
     this.apiUrl = apiUrl
   }
 
@@ -33,7 +42,7 @@ export abstract class ApiClient {
       const { method, body, queryParams = {}, ...restOptions } = options
 
       // If last character in apiUrl is forward slash we are removing it
-      const authApiUrlRoute = this.apiUrl.replace(/\/$/, "")
+      const authApiUrlRoute = this.apiUrl.replace(TRAILING_SLASH_REGEX, "")
       const url = new URL(`${authApiUrlRoute}${endpoint}`)
 
       // Removes falsy values (e.g. null, undefined etc.) from query params and

package/src/api/portal.ts

@@ -6,25 +6,19 @@ type PortalStatistics = {
   tvl: number
   currentUsdPerBtc: string
   currentUsdPerEth: string
+  currentUsdPerTToken: string
   usdPerBtc24hChange: string
 }
 
 type PortalMats = {
-  address: string
   totalMats: number
-  matsFromDeposits: number
-  matsFromReferrals: number
-  matsFromSecondaryReferrals: number
-  netMatsTransferred: number
-  dailyMats: number
-  dailyMatsFromDeposits: number
-  dailyMatsFromReferrals: number
-  dailyMatsFromSecondaryReferrals: number
+  inactiveMats: number
+  matsActivated: boolean
 }
 
 export const PORTAL_API_ENDPOINTS_BY_ENV = {
-  mainnet: "https://api.mezo.org/api/v1",
-  testnet: "https://api.test.mezo.org/api/v1",
+  mainnet: "https://api.mezo.org/api/",
+  testnet: "https://api.test.mezo.org/api/",
 }
 
 export class PortalApiClient extends ApiClient {
@@ -32,11 +26,14 @@ export class PortalApiClient extends ApiClient {
     environment: keyof typeof PORTAL_API_ENDPOINTS_BY_ENV = "mainnet",
     apiUrl?: string,
   ) {
-    super(apiUrl ?? PORTAL_API_ENDPOINTS_BY_ENV[environment])
+    super({
+      apiUrl: apiUrl ?? PORTAL_API_ENDPOINTS_BY_ENV[environment],
+      removeVersioning: true,
+    })
   }
 
   async getPortalStatistics() {
-    const data = await this.handleRequest<PortalStatistics>("/statistics", {
+    const data = await this.handleRequest<PortalStatistics>("/v1/statistics", {
       method: "GET",
     })
 
@@ -45,7 +42,7 @@ export class PortalApiClient extends ApiClient {
 
   async getPortalMats(address: string) {
     const data = await this.handleRequest<PortalMats>(
-      `/accounts/${address}/mats`,
+      `/v2/account/${address}/mats`,
       {
         method: "GET",
       },