@coin-voyage/crypto 0.0.20 → 0.0.21

package/dist/evm/use-sign-in-with-evm.d.ts

@@ -1,6 +1,6 @@
+import type { BaseConnector } from "../types/base-connector";
 import { SignInWith } from "../types/sign-in-with";
-import { BaseConnector } from "../types/base-connector";
-export declare function useSignInWithEvm({ signIn, callbackUrl }: SignInWith): {
+export declare function useSignInWithEvm({ signIn, onError, generateNonce }: SignInWith): {
     onSelect: (id: string) => Promise<void>;
     wallets: BaseConnector[];
 };

package/dist/evm/use-sign-in-with-evm.js

@@ -1,46 +1,55 @@
-import { useAccount, useConfig, useConnect, useConnectors, useSignMessage } from "wagmi";
+import { randomStringForEntropy } from "@stablelib/random";
+import { useCallback, useEffect, useState } from "react";
+import { useAccount, useConnect, useConnectors, useSignMessage } from "wagmi";
 import { isWalletInstalled } from "../lib/utils/is-wallet-installed";
 import { toMessage } from "../lib/utils/message";
 import { toBaseConnector } from "./utils";
-export function useSignInWithEvm({ signIn, callbackUrl }) {
-    const { address, connector } = useAccount();
+export function useSignInWithEvm({ signIn, onError, generateNonce }) {
+    const { address, connector, isConnected } = useAccount();
     const { connectAsync } = useConnect();
-    const connectors = useConnectors();
-    const wagmiConnectors = useConfig().connectors;
-    const wallets = Array.from(wagmiConnectors).filter((c) => isWalletInstalled(c.id)).map(toBaseConnector);
     const { signMessageAsync } = useSignMessage();
-    const handleSignature = async (address) => {
+    const connectors = useConnectors();
+    const [wallets, setWallets] = useState([]);
+    const handleSignature = useCallback(async (address) => {
+        const nonce = generateNonce ? await generateNonce() : randomStringForEntropy(96);
         const msg = {
             domain: window.location.host,
             address,
             statement: "Sign in with Ethereum to CoinVoyage.io",
             uri: window.location.origin,
-            nonce: Math.random().toString(),
+            nonce,
             version: "1"
         };
         const message = toMessage(msg, "Ethereum");
-        const signature = await signMessageAsync({ message });
-        signIn("ethereum", {
+        const signature = await signMessageAsync({ message }, {
+            onError
+        });
+        signIn({
             address,
             message,
             domain: window.location.host,
             signature,
-            callbackUrl: callbackUrl ?? "/"
         });
-    };
-    const onSelect = async (id) => {
+    }, [generateNonce, onError, signIn, signMessageAsync]);
+    useEffect(() => {
+        const installedWallets = Array.from(connectors)
+            .filter((c) => isWalletInstalled(c.id))
+            .map(toBaseConnector);
+        setWallets(installedWallets);
+    }, [connectors]);
+    const onSelect = useCallback(async (id) => {
         const selectedConnector = connectors.find((w) => w.id === id);
         if (!selectedConnector)
             return;
-        if (connector?.id === selectedConnector.id && address) {
-            handleSignature(address);
+        if (connector?.id === selectedConnector.id && isConnected && address) {
+            await handleSignature(address);
             return;
         }
         const res = await connectAsync({ connector: selectedConnector });
         if (!res.accounts[0])
             return;
-        handleSignature(res.accounts[0]);
-    };
+        await handleSignature(res.accounts[0]);
+    }, [address, connector?.id, connectors, connectAsync, handleSignature, isConnected]);
     return { onSelect, wallets };
 }
 //# sourceMappingURL=use-sign-in-with-evm.js.map

package/dist/evm/use-sign-in-with-evm.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-sign-in-with-evm.js","sourceRoot":"","sources":["../../src/evm/use-sign-in-with-evm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAI1C,MAAM,UAAU,gBAAgB,CAAC,EAAE,MAAM,EAAE,WAAW,EAAc;IAChE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,UAAU,EAAE,CAAC;IAC5C,MAAM,EAAE,YAAY,EAAE,GAAG,UAAU,EAAE,CAAC;IACtC,MAAM,UAAU,GAAG,aAAa,EAAE,CAAA;IAElC,MAAM,eAAe,GAAG,SAAS,EAAE,CAAC,UAAU,CAAA;IAC9C,MAAM,OAAO,GACT,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAC5F,MAAM,EAAE,gBAAgB,EAAE,GAAG,cAAc,EAAE,CAAC;IAE9C,MAAM,eAAe,GAAG,KAAK,EAAE,OAAe,EAAE,EAAE;QAC9C,MAAM,GAAG,GAAG;YACR,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI;YAC5B,OAAO;YACP,SAAS,EAAE,wCAAwC;YACnD,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;YAC3B,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAC/B,OAAO,EAAE,GAAG;SACE,CAAC;QAEnB,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAC3C,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAEtD,MAAM,CAAC,UAAU,EAAE;YACf,OAAO;YACP,OAAO;YACP,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI;YAC5B,SAAS;YACT,WAAW,EAAE,WAAW,IAAI,GAAG;SAClC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG,KAAK,EAAE,EAAU,EAAE,EAAE;QAClC,MAAM,iBAAiB,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,iBAAiB;YAAE,OAAO;QAC/B,IAAI,SAAS,EAAE,EAAE,KAAK,iBAAiB,CAAC,EAAE,IAAI,OAAO,EAAE,CAAC;YACpD,eAAe,CAAC,OAAO,CAAC,CAAC;YACzB,OAAO;QACX,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;QACjE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;YAAE,OAAO;QAC7B,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC,CAAC;IAEF,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AACjC,CAAC"}
+{"version":3,"file":"use-sign-in-with-evm.js","sourceRoot":"","sources":["../../src/evm/use-sign-in-with-evm.ts"],"names":[],"mappings":"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"}

package/dist/lib/utils/get-nonce-from-message.d.ts

@@ -0,0 +1 @@
+export declare function getNonceFromMessage(message: string): string | null;

package/dist/lib/utils/get-nonce-from-message.js

@@ -0,0 +1,5 @@
+export function getNonceFromMessage(message) {
+    const nonceMatch = message.match(/Nonce:\s*([^\n]+)/);
+    return nonceMatch ? nonceMatch[1].trim() : null;
+}
+//# sourceMappingURL=get-nonce-from-message.js.map

package/dist/lib/utils/get-nonce-from-message.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-nonce-from-message.js","sourceRoot":"","sources":["../../../src/lib/utils/get-nonce-from-message.ts"],"names":[],"mappings":"AACA,MAAM,UAAU,mBAAmB,CAAC,OAAe;IAC/C,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACtD,OAAO,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACpD,CAAC"}

package/dist/solana/base-provider.js

@@ -1,10 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { ConnectionProvider, WalletProvider, } from "@solana/wallet-adapter-react";
+import { CoinbaseWalletAdapter } from '@solana/wallet-adapter-coinbase';
 import { useMemo } from "react";
 const DEFAULT_SOLANA_RPC = "https://proportionate-light-research.solana-mainnet.quiknode.pro/139da87a36c1883d642064c0ebe64ba9819a98cf/";
-const wallets = [];
+const wallets = [new CoinbaseWalletAdapter()];
 export function SolanaBaseProvider({ children, config }) {
     const solanaConfig = useMemo(() => config, [JSON.stringify(config)]);
-    return (_jsx(ConnectionProvider, { endpoint: solanaConfig?.rpcUrl ?? DEFAULT_SOLANA_RPC, children: _jsx(WalletProvider, { ...solanaConfig?.walletConfiguration, autoConnect: solanaConfig?.walletConfiguration?.autoConnect || true, wallets: solanaConfig?.walletConfiguration?.wallets || wallets, children: children }) }));
+    return (_jsx(ConnectionProvider, { endpoint: solanaConfig?.rpcUrl ?? DEFAULT_SOLANA_RPC, children: _jsx(WalletProvider, { ...solanaConfig?.walletConfiguration, localStorageKey: solanaConfig?.walletConfiguration?.localStorageKey || "coin-voyage-widget-solana-wallet-connection", autoConnect: solanaConfig?.walletConfiguration?.autoConnect || true, wallets: solanaConfig?.walletConfiguration?.wallets || wallets, children: children }) }));
 }
 //# sourceMappingURL=base-provider.js.map

package/dist/solana/base-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-provider.js","sourceRoot":"","sources":["../../src/solana/base-provider.tsx"],"names":[],"mappings":";AACA,OAAO,EACL,kBAAkB,EAClB,cAAc,GACf,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,OAAO,EAA0B,MAAM,OAAO,CAAA;AAGvD,MAAM,kBAAkB,GAAG,4GAA4G,CAAA;AAEvI,MAAM,OAAO,GAAc,EAAE,CAAA;AAE7B,MAAM,UAAU,kBAAkB,CAAC,EAAE,QAAQ,EAAE,MAAM,EAEnD;IACA,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IACpE,OAAO,CACL,KAAC,kBAAkB,IAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,IAAI,kBAAkB,YACtE,KAAC,cAAc,OACT,YAAY,EAAE,mBAAmB,EACrC,WAAW,EAAE,YAAY,EAAE,mBAAmB,EAAE,WAAW,IAAI,IAAI,EACnE,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,OAAO,IAAI,OAAO,YAE7D,QAAQ,GACM,GACE,CACtB,CAAA;AACH,CAAC"}
+{"version":3,"file":"base-provider.js","sourceRoot":"","sources":["../../src/solana/base-provider.tsx"],"names":[],"mappings":";AACA,OAAO,EACL,kBAAkB,EAClB,cAAc,GACf,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAA;AACvE,OAAO,EAAE,OAAO,EAA0B,MAAM,OAAO,CAAA;AAGvD,MAAM,kBAAkB,GAAG,4GAA4G,CAAA;AAEvI,MAAM,OAAO,GAAc,CAAC,IAAI,qBAAqB,EAAE,CAAC,CAAA;AAExD,MAAM,UAAU,kBAAkB,CAAC,EAAE,QAAQ,EAAE,MAAM,EAEnD;IACA,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IACpE,OAAO,CACL,KAAC,kBAAkB,IAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,IAAI,kBAAkB,YACtE,KAAC,cAAc,OACT,YAAY,EAAE,mBAAmB,EACrC,eAAe,EAAE,YAAY,EAAE,mBAAmB,EAAE,eAAe,IAAI,6CAA6C,EACpH,WAAW,EAAE,YAAY,EAAE,mBAAmB,EAAE,WAAW,IAAI,IAAI,EACnE,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,OAAO,IAAI,OAAO,YAE7D,QAAQ,GACM,GACE,CACtB,CAAA;AACH,CAAC"}

package/dist/sui/base-provider.js

@@ -6,6 +6,6 @@ export function SuiBaseProvider({ children, config }) {
     return (_jsx(SuiClientProvider, { networks: {
             mainnet: { url: config?.rpcUrl ?? "https://fullnode.mainnet.sui.io:443" },
             devnet: { url: "https://fullnode.devnet.sui.io:443" },
-        }, defaultNetwork: "mainnet", children: _jsx(WalletProvider, { ...suiConfig?.walletConfiguration, autoConnect: suiConfig?.walletConfiguration?.autoConnect || true, children: children }) }));
+        }, defaultNetwork: "mainnet", children: _jsx(WalletProvider, { ...suiConfig?.walletConfiguration, storageKey: suiConfig?.walletConfiguration?.storageKey || "coin-voyage-widget-sui-wallet-connection", autoConnect: suiConfig?.walletConfiguration?.autoConnect || true, children: children }) }));
 }
 //# sourceMappingURL=base-provider.js.map

package/dist/sui/base-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-provider.js","sourceRoot":"","sources":["../../src/sui/base-provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACpE,OAAO,EAAE,OAAO,EAA0B,MAAM,OAAO,CAAA;AAGvD,MAAM,UAAU,eAAe,CAAC,EAAE,QAAQ,EAAE,MAAM,EAEhD;IACA,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IACjE,OAAO,CACL,KAAC,iBAAiB,IAChB,QAAQ,EAAE;YACR,OAAO,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,IAAI,qCAAqC,EAAE;YACzE,MAAM,EAAE,EAAE,GAAG,EAAE,oCAAoC,EAAE;SACtD,EACD,cAAc,EAAE,SAAS,YAEzB,KAAC,cAAc,OACT,SAAS,EAAE,mBAAmB,EAClC,WAAW,EAAE,SAAS,EAAE,mBAAmB,EAAE,WAAW,IAAI,IAAI,YAChE,QAAQ,GAAkB,GACV,CACrB,CAAA;AACH,CAAC"}
+{"version":3,"file":"base-provider.js","sourceRoot":"","sources":["../../src/sui/base-provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACpE,OAAO,EAAE,OAAO,EAA0B,MAAM,OAAO,CAAA;AAGvD,MAAM,UAAU,eAAe,CAAC,EAAE,QAAQ,EAAE,MAAM,EAEhD;IACA,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IACjE,OAAO,CACL,KAAC,iBAAiB,IAChB,QAAQ,EAAE;YACR,OAAO,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,IAAI,qCAAqC,EAAE;YACzE,MAAM,EAAE,EAAE,GAAG,EAAE,oCAAoC,EAAE;SACtD,EACD,cAAc,EAAC,SAAS,YAExB,KAAC,cAAc,OACT,SAAS,EAAE,mBAAmB,EAClC,UAAU,EAAE,SAAS,EAAE,mBAAmB,EAAE,UAAU,IAAI,0CAA0C,EACpG,WAAW,EAAE,SAAS,EAAE,mBAAmB,EAAE,WAAW,IAAI,IAAI,YAChE,QAAQ,GAAkB,GACV,CACrB,CAAA;AACH,CAAC"}

package/dist/sui/use-sign-in-with-sui.d.ts

@@ -1,6 +1,6 @@
 import { BaseConnector } from "../types/base-connector";
 import { SignInWith } from "../types/sign-in-with";
-export declare function useSignInWithSui({ signIn, onError, callbackUrl }: SignInWith): {
-    onSelect: (id: string) => void;
+export declare function useSignInWithSui({ signIn, onError, generateNonce }: SignInWith): {
+    onSelect: (id: string) => Promise<void>;
     wallets: BaseConnector[];
 };

package/dist/sui/use-sign-in-with-sui.js

@@ -1,44 +1,50 @@
-import { useConnectWallet, useSignPersonalMessage, useWallets } from "@mysten/dapp-kit";
+import { useConnectWallet, useCurrentWallet, useSignPersonalMessage, useWallets } from "@mysten/dapp-kit";
+import { randomStringForEntropy } from "@stablelib/random";
 import { toMessage } from "../lib/utils/message";
-export function useSignInWithSui({ signIn, onError, callbackUrl }) {
+export function useSignInWithSui({ signIn, onError, generateNonce }) {
     const { mutate: connect } = useConnectWallet();
+    const { currentWallet, isConnected } = useCurrentWallet();
     const { mutate: signPersonalMessage } = useSignPersonalMessage();
     const wallets = useWallets();
     const handleSignature = async (address) => {
+        const nonce = generateNonce ? await generateNonce() : randomStringForEntropy(96);
         const msg = {
             domain: window.location.host,
             address,
             statement: "Sign in with Sui to CoinVoyage.io",
             uri: window.location.origin,
-            nonce: Math.random().toString(),
+            nonce,
             version: "1"
         };
         const message = toMessage(msg, "Sui");
         signPersonalMessage({ message: new TextEncoder().encode(message) }, {
             onSuccess: (result) => {
-                signIn("sui", {
+                signIn({
                     address,
                     message,
                     domain: window.location.host,
                     signature: result.signature,
-                    callbackUrl: callbackUrl ?? "/"
                 });
             },
-            onError: (error) => {
-                onError?.(error);
-            }
+            onError
         });
     };
-    const onSelect = (id) => {
+    const onSelect = async (id) => {
         const selectedWallet = wallets.find((w) => w.id === id);
+        console.log("selectedWallet", selectedWallet);
         if (!selectedWallet)
             return;
+        console.log("currentWallet", currentWallet?.id, "isConnected", isConnected);
+        if (currentWallet?.id === selectedWallet.id && isConnected && currentWallet.accounts[0]?.address) {
+            await handleSignature(currentWallet.accounts[0].address);
+            return;
+        }
         connect({ wallet: selectedWallet }, {
             onSuccess: (res) => handleSignature(res.accounts[0].address)
         });
     };
     const toBaseConnector = (wallet) => ({
-        id: wallet.name,
+        id: wallet.id ?? wallet.name,
         name: wallet.name,
         icon: wallet.icon,
     });

package/dist/sui/use-sign-in-with-sui.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-sign-in-with-sui.js","sourceRoot":"","sources":["../../src/sui/use-sign-in-with-sui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAExF,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAIjD,MAAM,UAAU,gBAAgB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAc;IAC3E,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAC/C,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,GAAG,sBAAsB,EAAE,CAAC;IACjE,MAAM,OAAO,GAAG,UAAU,EAAE,CAAA;IAE5B,MAAM,eAAe,GAAG,KAAK,EAAE,OAAe,EAAE,EAAE;QAChD,MAAM,GAAG,GAAG;YACV,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI;YAC5B,OAAO;YACP,SAAS,EAAE,mCAAmC;YAC9C,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;YAC3B,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAC/B,OAAO,EAAE,GAAG;SACI,CAAC;QAEnB,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAEtC,mBAAmB,CAAC,EAAE,OAAO,EAAE,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE;YAClE,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE;gBACpB,MAAM,CAAC,KAAK,EAAE;oBACZ,OAAO;oBACP,OAAO;oBACP,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI;oBAC5B,SAAS,EAAE,MAAM,CAAC,SAAS;oBAC3B,WAAW,EAAE,WAAW,IAAI,GAAG;iBAChC,CAAC,CAAC;YACL,CAAC;YACD,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBACjB,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG,CAAC,EAAU,EAAE,EAAE;QAC9B,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,cAAc;YAAE,OAAO;QAC5B,OAAO,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE;YAClC,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;SAC7D,CAAC,CAAA;IACJ,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,CAAC,MAAkC,EAAiB,EAAE,CAAC,CAAC;QAC9E,EAAE,EAAE,MAAM,CAAC,IAAI;QACf,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI,EAAE,MAAM,CAAC,IAAI;KAClB,CAAC,CAAC;IAEH,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CAAA;AAC5D,CAAC"}
+{"version":3,"file":"use-sign-in-with-sui.js","sourceRoot":"","sources":["../../src/sui/use-sign-in-with-sui.ts"],"names":[],"mappings":"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"}

package/dist/types/sign-in-with.d.ts

@@ -1,13 +1,13 @@
+export type SignInWithData = {
+    address: string;
+    message: string;
+    domain: string;
+    signature: string;
+};
 export interface SignInWith {
-    signIn: (provider: string, data: {
-        address: string;
-        message: string;
-        domain: string;
-        signature: string;
-        callbackUrl?: string;
-    }) => void;
+    signIn: (data: SignInWithData) => void;
     onError?: (error: Error) => void;
-    callbackUrl?: string;
+    generateNonce?: () => Promise<string>;
 }
 export type SignInMessage = {
     address: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coin-voyage/crypto",
   "description": "Crypto utilities for Coin Voyage",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "private": false,
   "sideEffects": false,
   "author": "Lars <lars@coinvoyage.io>",
@@ -34,6 +34,7 @@
     "@noble/secp256k1": "1.7.1",
     "@scure/base": "1.1.1",
     "@scure/btc-signer": "1.6.0",
+    "@stablelib/random": "2.0.1",
     "jsontokens": "4.0.1",
     "bitcoinjs-lib": "6.1.7",
     "bitcoinjs-message": "^2.2.0",
@@ -42,6 +43,7 @@
     "@mysten/wallet-standard": "0.15.6",
     "@solana/spl-token": "0.4.13",
     "@solana/wallet-adapter-base": "0.9.26",
+    "@solana/wallet-adapter-coinbase": "0.1.23",
     "@coin-voyage/shared": "0.0.12"
   },
   "devDependencies": {