@mezo-org/passport 0.4.0-dev.7 → 0.4.0-dev.70

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

@@ -1,26 +1,29 @@
-import { formatHumanReadableNumber, formatTokenAmount, fromFixedPoint, roundUpNumber, } from "./numbers";
-describe("formatHumanReadableNumber", () => {
+import { formatNumberToCompactString, fromFixedPoint, roundUpNumber, formatNumberToLocaleString, fromFixedPointToString, bigIntMax, } 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");
+    });
+    it("formats numbers with trailing zeros correctly", () => {
+        expect(formatNumberToCompactString(1_000, 2)).toBe("1K");
     });
 });
 describe("roundUpNumber", () => {
@@ -37,7 +40,7 @@ describe("roundUpNumber", () => {
 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);
+        expect(fromFixedPoint(raw, 18)).toBe(1.2345);
     });
     it("converts with truncation to 2 decimals", () => {
         const raw = 987654321000000000n; // ~0.987654321 ETH
@@ -48,21 +51,140 @@ describe("fromFixedPoint", () => {
         expect(fromFixedPoint(raw, 6, 2)).toBe(1000000000000000000);
     });
 });
-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");
+describe("formatNumberToLocaleString", () => {
+    it("formats zero with 0 decimals", () => {
+        expect(formatNumberToLocaleString(0, 0)).toBe("0");
+    });
+    it("formats zero with >0 decimals", () => {
+        expect(formatNumberToLocaleString(0, 2)).toBe("0.00");
+        expect(formatNumberToLocaleString(0, 4)).toBe("0.0000");
+    });
+    it("formats small decimal number", () => {
+        expect(formatNumberToLocaleString(0.123456, 2)).toBe("0.12");
+        expect(formatNumberToLocaleString(0.123456, 4)).toBe("0.1235");
+    });
+    it("formats number just above 1", () => {
+        expect(formatNumberToLocaleString(1.000001, 3)).toBe("1.000");
+        expect(formatNumberToLocaleString(1.234567, 2)).toBe("1.23");
+    });
+    it("formats whole number", () => {
+        expect(formatNumberToLocaleString(1234, 0)).toBe("1,234");
+        expect(formatNumberToLocaleString(1000, 2)).toBe("1,000.00");
+    });
+    it("formats number with trailing decimal zeroes", () => {
+        expect(formatNumberToLocaleString(10.1, 3)).toBe("10.100");
+        expect(formatNumberToLocaleString(5.0, 2)).toBe("5.00");
+    });
+    it("formats string input", () => {
+        expect(formatNumberToLocaleString("123.456", 2)).toBe("123.46");
+        expect(formatNumberToLocaleString("0.00123", 4)).toBe("0.0012");
+    });
+    it("formats negative number", () => {
+        expect(formatNumberToLocaleString(-123.456, 2)).toBe("-123.46");
+        expect(formatNumberToLocaleString("-0.00999", 3)).toBe("-0.010");
+    });
+    it("formats large number with commas", () => {
+        expect(formatNumberToLocaleString(12345678.9, 2)).toBe("12,345,678.90");
+    });
+    it("handles max decimals safely", () => {
+        expect(formatNumberToLocaleString(1.123456789, 8)).toBe("1.12345679");
+        expect(formatNumberToLocaleString("0.000000000000000001", 18)).toBe("0.000000000000000001");
+    });
+    it("defaults to 0 decimals if not passed", () => {
+        expect(formatNumberToLocaleString(1234.567)).toBe("1,235"); // rounds up by default
+    });
+});
+describe("fromFixedPointToString", () => {
+    const toFixedPoint = (num) => BigInt(Math.round(num * 1e18));
+    const cases = [
+        { input: 2.0, expected: "2.000" },
+        { input: 2.009, expected: "2.009" },
+        { input: 2.01, expected: "2.010" },
+        { input: 2.015, expected: "2.016" },
+        { input: 2.05, expected: "2.050" },
+        { input: 2.09, expected: "2.090" },
+    ];
+    describe("withRoundUp: true", () => {
+        cases.forEach(({ input, expected }) => {
+            it(`formats ${input} → ${expected}`, () => {
+                const fixed = toFixedPoint(input);
+                expect(fromFixedPointToString(fixed, 18, 3, true)).toBe(expected);
+            });
+        });
+    });
+    describe("withRoundUp: false", () => {
+        const noRoundCases = [
+            { input: 2.0099, expected: "2.009" },
+            { input: 2.0159, expected: "2.015" },
+            { input: 2.0101, expected: "2.010" },
+            { input: 2.0199, expected: "2.019" },
+        ];
+        noRoundCases.forEach(({ input, expected }) => {
+            it(`formats ${input} → ${expected} (no rounding)`, () => {
+                const fixed = toFixedPoint(input);
+                expect(fromFixedPointToString(fixed, 18, 3, false)).toBe(expected);
+            });
+        });
+    });
+    describe("zero handling", () => {
+        it("formats 0 → 0.000 (3 decimals)", () => {
+            expect(fromFixedPointToString(0n, 18, 3)).toBe("0.000");
+        });
+        it("formats 0 → 0.0000 (4 decimals)", () => {
+            expect(fromFixedPointToString(0n, 18, 4)).toBe("0.0000");
+        });
+    });
+    describe("very small numbers below display threshold", () => {
+        it("returns <0.0001 for small number (3 decimals)", () => {
+            const small = BigInt(123); // ~1.23e-16
+            expect(fromFixedPointToString(small, 18, 4)).toBe("<0.0001");
+        });
+        it("returns <0.01 for small number with only 2 decimals", () => {
+            const tiny = BigInt(9999999999999); // <0.01
+            expect(fromFixedPointToString(tiny, 18, 2)).toBe("<0.01");
+        });
+    });
+    describe("input types", () => {
+        it("accepts bigint", () => {
+            const amount = 2100000000000000000n;
+            expect(fromFixedPointToString(amount, 18, 3)).toBe("2.100");
+        });
+        it("accepts string", () => {
+            expect(fromFixedPointToString("2000000000000000000", 18, 3)).toBe("2.000");
+        });
+        it("accepts number", () => {
+            expect(fromFixedPointToString(Number("1000000000000000000"), 18, 3)).toBe("1.000");
+        });
+    });
+    describe("high values", () => {
+        it("formats 1_000_000.123456789 correctly", () => {
+            const big = toFixedPoint(1_000_000.123456789);
+            expect(fromFixedPointToString(big, 18, 6)).toBe("1,000,000.123456");
+        });
+        it("formats 1e12 ETH", () => {
+            const big = BigInt("1000000000000000000000000000000");
+            expect(fromFixedPointToString(big, 18, 2)).toBe("1,000,000,000,000.00");
+        });
+    });
+});
+describe("bigIntMax", () => {
+    it("returns the maximum of positive bigint values", () => {
+        expect(bigIntMax(1n, 2n, 3n)).toBe(3n);
+    });
+    it("returns the maximum of negative bigint values", () => {
+        expect(bigIntMax(-10n, -5n, -20n)).toBe(-5n);
+    });
+    it("returns the only element if array has one bigint", () => {
+        expect(bigIntMax(42n)).toBe(42n);
     });
-    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("works with a mix of positive and negative bigints", () => {
+        expect(bigIntMax(-100n, 0n, 50n, -10n)).toBe(50n);
     });
-    it("formats a normal value without rounding", () => {
-        const result = formatTokenAmount("1230000000000000000", 18, 2);
-        expect(result).toBe("1.23");
+    it("throws an error if called with no arguments", () => {
+        expect(() => bigIntMax()).toThrow();
     });
-    it("formats with rounding if withRoundUp = true", () => {
-        const result = formatTokenAmount("1234560000000000000", 18, 2, true);
-        expect(result).toBe("1.24");
+    it("returns the correct value when all values are equal", () => {
+        expect(bigIntMax(5n, 5n, 5n)).toBe(5n);
     });
 });
 //# 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.7",
+  "version": "0.4.0-dev.70",
   "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,20 @@
     "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.28",
+    "@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",
+    "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",
       },

package/src/components/Dropdown/ConnectedTrigger.tsx

@@ -1,54 +1,74 @@
-import { Block, ButtonProps, useStyletron } from "@mezo-org/mezo-clay"
-import React, { forwardRef, ReactNode } from "react"
+import { Block, Button, ButtonProps, useStyletron } from "@mezo-org/mezo-clay"
+import React, { forwardRef, ReactNode, useMemo } from "react"
 
-type ConnectedTriggerProps = Omit<ButtonProps, "children"> & {
+type ConnectedTriggerProps = Omit<ButtonProps, "children" | "size"> & {
   avatar: ReactNode
+  size?: "medium" | "large"
 }
 
 const ConnectedTrigger = forwardRef<HTMLButtonElement, ConnectedTriggerProps>(
   (props, ref) => {
-    const { onClick, avatar, ...restProps } = props
+    const { onClick, avatar, size = "medium", ...restProps } = props
 
     const [, theme] = useStyletron()
 
+    const avatarSize = useMemo(() => {
+      const sizeMap = {
+        medium: theme.sizing.scale950,
+        large: theme.sizing.scale1400,
+      }
+
+      return sizeMap[size]
+    }, [theme, size])
+
+    const buttonPadding = useMemo(() => {
+      const paddingMap = {
+        medium: theme.sizing.scale0,
+        large: theme.sizing.scale100,
+      }
+
+      return paddingMap[size]
+    }, [theme, size])
+
     return (
-      <Block
-        as="button"
+      <Button
         overrides={{
-          Block: {
+          BaseButton: {
             props: { ref, ...restProps },
             style: {
-              border: "none",
-              background: "none",
-              padding: 0,
-              margin: 0,
-              cursor: "pointer",
+              borderRadius: "100%",
+              overflow: "hidden",
+              padding: buttonPadding,
             },
           },
         }}
         onClick={onClick}
       >
-        <Block
-          width={theme.sizing.scale950}
-          height={theme.sizing.scale950}
-          overrides={{
-            Block: {
-              style: {
-                borderRadius: "100%",
-                border: `2px solid ${theme.colors.contentPrimary}`,
-                boxSizing: "border-box",
-                overflow: "hidden",
+        {typeof avatar === "string" ? (
+          <Block
+            width={avatarSize}
+            height={avatarSize}
+            as="img"
+            src={avatar}
+            alt=""
+          />
+        ) : (
+          <Block
+            width={avatarSize}
+            height={avatarSize}
+            overrides={{
+              Block: {
+                style: {
+                  borderRadius: "100%",
+                  overflow: "hidden",
+                },
               },
-            },
-          }}
-        >
-          {typeof avatar === "string" ? (
-            <Block as="img" src={avatar} alt="" />
-          ) : (
-            avatar
-          )}
-        </Block>
-      </Block>
+            }}
+          >
+            {avatar}
+          </Block>
+        )}
+      </Button>
     )
   },
 )