@trustware/sdk-staging 1.1.9-staging.3 → 1.1.9-staging.6

package/dist/wallet.d.cts

@@ -1,6 +1,6 @@
-import { u as SolanaProviderLike, Q as WalletMeta, h as DetectedWallet, M as WalletId, v as SolanaWalletInterface } from './manager-B5aklGtm.cjs';
-export { A as WagmiBridge, C as WagmiConnector, a1 as WalletSnapshot, a2 as useWalletConnectConnect, Z as useWalletExternalDisconnect, _ as useWalletInfo, $ as useWireDetectionIntoManager, a0 as walletManager } from './manager-B5aklGtm.cjs';
-export { d as autoDetectWallet, e as buildDetectedWalletFromProvider, c as connectDetectedWallet, f as createWalletConnectEntry, t as toWalletInterfaceFromDetected, u as useEIP1193, g as useIsMobile, a as useWagmi, b as useWalletDetection } from './detect-DVpECOTa.cjs';
+import { u as SolanaProviderLike, Q as WalletMeta, h as DetectedWallet, M as WalletId, v as SolanaWalletInterface } from './manager-BZwbtOyf.cjs';
+export { A as WagmiBridge, C as WagmiConnector, a1 as WalletSnapshot, a2 as useWalletConnectConnect, Z as useWalletExternalDisconnect, _ as useWalletInfo, $ as useWireDetectionIntoManager, a0 as walletManager } from './manager-BZwbtOyf.cjs';
+export { d as autoDetectWallet, e as buildDetectedWalletFromProvider, c as connectDetectedWallet, f as createWalletConnectEntry, t as toWalletInterfaceFromDetected, u as useEIP1193, g as useIsMobile, a as useWagmi, b as useWalletDetection } from './detect-C8xpZRrL.cjs';
 import './blockchain-BxAFzp0s.cjs';
 
 type SolanaEventHandlers = {
@@ -8,6 +8,8 @@ type SolanaEventHandlers = {
     onAccountChanged?: () => void;
     onDisconnect?: () => void;
 };
+declare function decodeBase64(serializedTransaction: string): Uint8Array<ArrayBuffer>;
+declare function encodeBase64(bytes: Uint8Array): string;
 declare function getSolanaProviders(): Partial<Record<WalletId, SolanaProviderLike>>;
 declare function detectSolanaWallets(wallets: WalletMeta[]): DetectedWallet[];
 declare function bindSolanaProviderEvents(provider: SolanaProviderLike, handlers: SolanaEventHandlers): () => void;
@@ -35,4 +37,4 @@ declare function formatWalletConnectDeepLink(wcUri: string): string;
  */
 declare function formatWalletConnectDeepLinkForWallet(walletId: string, wcUri: string): string;
 
-export { POPULAR_ORDER, WALLETS, bindSolanaProviderEvents, detectSolanaWallets, formatDeepLink, formatWalletConnectDeepLink, formatWalletConnectDeepLinkForWallet, getSolanaProviders, toSolanaWalletInterface };
+export { POPULAR_ORDER, WALLETS, bindSolanaProviderEvents, decodeBase64, detectSolanaWallets, encodeBase64, formatDeepLink, formatWalletConnectDeepLink, formatWalletConnectDeepLinkForWallet, getSolanaProviders, toSolanaWalletInterface };

package/dist/wallet.d.ts

@@ -1,6 +1,6 @@
-import { u as SolanaProviderLike, Q as WalletMeta, h as DetectedWallet, M as WalletId, v as SolanaWalletInterface } from './manager-xFiq0SHr.js';
-export { A as WagmiBridge, C as WagmiConnector, a1 as WalletSnapshot, a2 as useWalletConnectConnect, Z as useWalletExternalDisconnect, _ as useWalletInfo, $ as useWireDetectionIntoManager, a0 as walletManager } from './manager-xFiq0SHr.js';
-export { d as autoDetectWallet, e as buildDetectedWalletFromProvider, c as connectDetectedWallet, f as createWalletConnectEntry, t as toWalletInterfaceFromDetected, u as useEIP1193, g as useIsMobile, a as useWagmi, b as useWalletDetection } from './detect-d2PUaxE_.js';
+import { u as SolanaProviderLike, Q as WalletMeta, h as DetectedWallet, M as WalletId, v as SolanaWalletInterface } from './manager-BMO1O-cW.js';
+export { A as WagmiBridge, C as WagmiConnector, a1 as WalletSnapshot, a2 as useWalletConnectConnect, Z as useWalletExternalDisconnect, _ as useWalletInfo, $ as useWireDetectionIntoManager, a0 as walletManager } from './manager-BMO1O-cW.js';
+export { d as autoDetectWallet, e as buildDetectedWalletFromProvider, c as connectDetectedWallet, f as createWalletConnectEntry, t as toWalletInterfaceFromDetected, u as useEIP1193, g as useIsMobile, a as useWagmi, b as useWalletDetection } from './detect-B8xXLwHK.js';
 import './blockchain-BxAFzp0s.js';
 
 type SolanaEventHandlers = {
@@ -8,6 +8,8 @@ type SolanaEventHandlers = {
     onAccountChanged?: () => void;
     onDisconnect?: () => void;
 };
+declare function decodeBase64(serializedTransaction: string): Uint8Array<ArrayBuffer>;
+declare function encodeBase64(bytes: Uint8Array): string;
 declare function getSolanaProviders(): Partial<Record<WalletId, SolanaProviderLike>>;
 declare function detectSolanaWallets(wallets: WalletMeta[]): DetectedWallet[];
 declare function bindSolanaProviderEvents(provider: SolanaProviderLike, handlers: SolanaEventHandlers): () => void;
@@ -35,4 +37,4 @@ declare function formatWalletConnectDeepLink(wcUri: string): string;
  */
 declare function formatWalletConnectDeepLinkForWallet(walletId: string, wcUri: string): string;
 
-export { POPULAR_ORDER, WALLETS, bindSolanaProviderEvents, detectSolanaWallets, formatDeepLink, formatWalletConnectDeepLink, formatWalletConnectDeepLinkForWallet, getSolanaProviders, toSolanaWalletInterface };
+export { POPULAR_ORDER, WALLETS, bindSolanaProviderEvents, decodeBase64, detectSolanaWallets, encodeBase64, formatDeepLink, formatWalletConnectDeepLink, formatWalletConnectDeepLinkForWallet, getSolanaProviders, toSolanaWalletInterface };

package/dist/wallet.mjs

@@ -224,7 +224,7 @@ var init_constants = __esm({
   "src/constants.ts"() {
     "use strict";
     SDK_NAME = "@trustware/sdk";
-    SDK_VERSION = "1.1.9-staging.3";
+    SDK_VERSION = "1.1.9-staging.6";
     API_ROOT = "https://bv-staging-api.trustware.io";
     API_PREFIX = "/api";
     WALLETCONNECT_PROJECT_ID = "72ea74c400f5111d43aea638d7d83a24";
@@ -1314,21 +1314,28 @@ function formatDeepLink(id, currentUrl) {
   const enc = encodeURIComponent(currentUrl);
   switch (id) {
     // EVM
+    // MetaMask's dapp browser also exposes its Wallet Standard Solana
+    // provider in the same session, so "metamask-solana" reuses this link.
     case "metamask":
+    case "metamask-solana":
       return `metamask://dapp/${currentUrl}`;
     case "coinbase":
       return `coinbase://wallet/dapp?url=${enc}`;
     case "rainbow":
-      return `rainbow://connect?uri=${enc}`;
+      return `https://rainbow.me/dapp?url=${enc}`;
     case "trust":
       return `https://link.trustwallet.com/open_url?coin_id=60&url=${enc}`;
     case "okx":
       return `okx://wallet/dapp/url?dappUrl=${enc}`;
     // Solana
+    // Phantom is one app with one in-app browser — browsing there injects
+    // both window.ethereum and window.phantom.solana, so "phantom-evm"
+    // reuses the same browse link as "phantom-solana".
     case "phantom-solana":
-      return `phantom://browse/${enc}`;
+    case "phantom-evm":
+      return `https://phantom.app/ul/browse/${enc}?ref=${enc}`;
     case "solflare":
-      return `solflare://ul/v1/browse/${enc}`;
+      return `https://solflare.com/ul/v1/browse/${enc}?ref=${enc}`;
     case "backpack":
       return `https://backpack.app/ul/v1/browse/${enc}?ref=${enc}`;
     // No confirmed deep link scheme
@@ -1477,8 +1484,10 @@ var init_metadata = __esm({
         homepage: "https://phantom.app/",
         ios: "https://apps.apple.com/app/phantom-crypto-wallet/id1598432977",
         android: "https://play.google.com/store/apps/details?id=app.phantom",
-        detectFlags: ["isPhantom"]
-        // No EVM dapp browser deep link — falls back to app store
+        detectFlags: ["isPhantom"],
+        // Same app/in-app browser as "phantom-solana" — browsing there injects
+        // window.ethereum too.
+        deepLink: (url) => formatDeepLink("phantom-evm", url) ?? ""
       },
       {
         id: "phantom-solana",
@@ -1526,8 +1535,10 @@ var init_metadata = __esm({
         emoji: "\u{1F98A}",
         homepage: "https://metamask.io/",
         ios: "https://apps.apple.com/app/metamask/id1438144202",
-        android: "https://play.google.com/store/apps/details?id=io.metamask"
-        // No Solana-specific deep link for MetaMask
+        android: "https://play.google.com/store/apps/details?id=io.metamask",
+        // Same app/in-app browser as "metamask" — its Wallet Standard Solana
+        // provider is exposed in that same browse session.
+        deepLink: (url) => formatDeepLink("metamask-solana", url) ?? ""
       },
       // ── Extension/desktop only — hidden on mobile ─────────────────────────────
       {
@@ -2050,7 +2061,7 @@ var init_walletconnect = __esm({
     solanaMainnet = {
       id: 900,
       chainNamespace: "solana",
-      caipNetworkId: "solana:5eykt4UsFv8P8NJdTREpY1vzqAQ3H1FQ",
+      caipNetworkId: "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
       name: "Solana Mainnet",
       nativeCurrency: {
         name: "Solana",
@@ -2929,8 +2940,62 @@ function getChainMeta(chainId) {
     rpcUrls: chain.rpcUrls.default.http
   };
 }
-async function buildWalletConnectAPI(walletCfg) {
+function extractSolanaAddress(connector) {
+  const caipAccount = connector.provider.session?.namespaces?.solana?.accounts?.[0];
+  if (!caipAccount) return null;
+  return caipAccount.split(":")[2] ?? null;
+}
+function buildWalletConnectSolanaProvider(connector) {
+  return {
+    get publicKey() {
+      const address = extractSolanaAddress(connector);
+      return address ? { toString: () => address } : void 0;
+    },
+    async connect() {
+      const address = extractSolanaAddress(connector);
+      if (!address) {
+        throw new Error(
+          "This wallet did not approve a Solana account over WalletConnect."
+        );
+      }
+      return { publicKey: { toString: () => address } };
+    },
+    async disconnect() {
+    },
+    async signTransaction(transaction) {
+      const tx = transaction;
+      const rawBytes = "version" in tx ? tx.serialize() : tx.serialize({
+        requireAllSignatures: false,
+        verifySignatures: false
+      });
+      const result = await connector.provider.request(
+        {
+          method: "solana_signTransaction",
+          params: { transaction: encodeBase64(rawBytes) }
+        },
+        solanaMainnet.caipNetworkId
+      );
+      if (!result.transaction) {
+        throw new Error(
+          "WalletConnect wallet did not return a signed Solana transaction."
+        );
+      }
+      const signedBytes = decodeBase64(result.transaction);
+      return { serialize: () => signedBytes };
+    },
+    on() {
+    },
+    off() {
+    },
+    removeListener() {
+    }
+  };
+}
+async function buildWalletConnectAPI(walletCfg, ecosystem = "evm") {
   const connector = await getUniversalConnector(walletCfg);
+  if (ecosystem === "solana") {
+    return toSolanaWalletInterface(buildWalletConnectSolanaProvider(connector));
+  }
   const provider = connector.provider;
   const api = {
     ecosystem: "evm",
@@ -3006,7 +3071,7 @@ function useWireDetectionIntoManager() {
 function useWalletConnectConnect(walletCfg) {
   const cfgRef = { current: walletCfg };
   return useCallback(
-    () => walletManager.connectWalletConnect(cfgRef.current),
+    (ecosystem) => walletManager.connectWalletConnect(cfgRef.current, ecosystem),
     []
   );
 }
@@ -3026,6 +3091,7 @@ function useWalletInfo(wagmi) {
     connectedVia: snapshot.connectedVia,
     walletType: snapshot.walletType,
     status: snapshot.status,
+    detected: snapshot.detected,
     disconnect
   };
 }
@@ -3177,44 +3243,39 @@ var init_manager = __esm({
           this.emit();
         }
       }
-      async connectWalletConnect(walletCfg) {
-        if (this._status === "connected" && this._connectedVia === "walletconnect" && this._wallet) {
+      async connectWalletConnect(walletCfg, ecosystem = "evm") {
+        if (this._status === "connected" && this._connectedVia === "walletconnect" && this._wallet && this._wallet.ecosystem === ecosystem) {
           this.emit();
           return { error: null, api: this._wallet };
         }
+        if (this._connectedVia === "walletconnect" && this._wallet) {
+          await this._wallet.disconnect?.().catch(() => {
+          });
+          resetUniversalConnector();
+        }
         this._status = "connecting";
         this.clearConnectedState();
         this.emit();
         try {
           const connector = await getUniversalConnector(walletCfg);
           await connector.connect();
-          const api = await buildWalletConnectAPI(walletCfg);
+          const api = await buildWalletConnectAPI(walletCfg, ecosystem);
+          try {
+            await api.getAddress();
+          } catch {
+            await api.disconnect?.().catch(() => {
+            });
+            resetUniversalConnector();
+            throw new Error(
+              `This wallet did not approve a${ecosystem === "evm" ? "n" : ""} ${ecosystem === "evm" ? "EVM" : "Solana"} account over WalletConnect.`
+            );
+          }
           this._wallet = api;
           this._connectedVia = "walletconnect";
           this._connectedWalletId = "walletconnect";
-          const provider = connector.provider;
-          this._providerCleanup = bindWalletConnectEvents(provider, {
-            onAccountsChanged: (accounts) => {
-              if (accounts.length === 0) {
-                this.fullReset();
-                this.triggerExternalDisconnect();
-                this.emit();
-                return;
-              }
-              void this.syncIdentityFromWallet("walletconnect");
-              this.emit();
-            },
-            onChainChanged: () => {
-              void this.syncIdentityFromWallet("walletconnect");
-              this.emit();
-            },
-            onDisconnect: () => {
-              this.fullReset();
-              resetUniversalConnector();
-              this.triggerExternalDisconnect();
-              this.emit();
-            }
-          });
+          this._providerCleanup = this.bindWalletConnectProviderEvents(
+            connector.provider
+          );
           await this.syncIdentityFromWallet("walletconnect");
           this._status = "connected";
           this._error = null;
@@ -3229,6 +3290,100 @@ var init_manager = __esm({
           return { error: message, api: null };
         }
       }
+      bindWalletConnectProviderEvents(provider) {
+        return bindWalletConnectEvents(provider, {
+          onAccountsChanged: (accounts) => {
+            if (accounts.length === 0) {
+              this.fullReset();
+              this.triggerExternalDisconnect();
+              this.emit();
+              return;
+            }
+            void this.syncIdentityFromWallet("walletconnect");
+            this.emit();
+          },
+          onChainChanged: () => {
+            void this.syncIdentityFromWallet("walletconnect");
+            this.emit();
+          },
+          onDisconnect: () => {
+            this.fullReset();
+            resetUniversalConnector();
+            this.triggerExternalDisconnect();
+            this.emit();
+          }
+        });
+      }
+      // WalletConnect's own SignClient auto-restores the last persisted session
+      // from storage on every init — including after a fresh page load — but
+      // that restoration happens silently inside the library. Nothing calls back
+      // into our code for it. On mobile, backgrounding the tab to approve in a
+      // wallet app can cause the OS to reload the page before the original
+      // connect() promise ever resolves, so the connect flow that triggered the
+      // approval never gets to record it as "connected" here — even though
+      // WalletConnect itself already has a live, approved session sitting in
+      // storage. Call this on mount to pick that back up.
+      async restoreWalletConnectSession(walletCfg) {
+        if (this._status === "connected" && this._connectedVia === "walletconnect") {
+          return this._wallet?.ecosystem === "solana" ? "solana" : "evm";
+        }
+        if (typeof window === "undefined") return null;
+        try {
+          if (!Object.keys(window.localStorage).some((key) => key.startsWith("wc@2"))) {
+            return null;
+          }
+        } catch {
+        }
+        let connector;
+        try {
+          connector = await getUniversalConnector(walletCfg);
+        } catch (e2) {
+          console.warn(
+            "[Trustware SDK] Failed to restore WalletConnect session:",
+            e2
+          );
+          return null;
+        }
+        const session = connector.provider.session;
+        if (!session) return null;
+        const ecosystem = session.namespaces?.solana?.accounts?.length ? "solana" : session.namespaces?.eip155?.accounts?.length ? "evm" : null;
+        if (!ecosystem) return null;
+        try {
+          const api = await buildWalletConnectAPI(walletCfg, ecosystem);
+          this._wallet = api;
+          this._connectedVia = "walletconnect";
+          this._connectedWalletId = "walletconnect";
+          this._providerCleanup = this.bindWalletConnectProviderEvents(
+            connector.provider
+          );
+          await this.syncIdentityFromWallet("walletconnect");
+          this._status = "connected";
+          this._error = null;
+          this.emit();
+          return ecosystem;
+        } catch {
+          return null;
+        }
+      }
+      // Forcibly abandon an in-progress connect() call the caller has decided is
+      // stuck (e.g. the UI's own connect timeout elapsed with no response).
+      // There's no clean way to cancel a pending WalletConnect pairing proposal
+      // from this side, so this tears down the whole connector — the next
+      // connect attempt starts against a brand new SignClient/pairing instead of
+      // racing the abandoned one, which would otherwise risk reproducing the
+      // "No matching key. proposal" class of error a real retry needs to avoid.
+      cancelWalletConnectAttempt() {
+        if (this._connectedVia === "walletconnect" && this._status === "connected") {
+          return;
+        }
+        resetUniversalConnector();
+        if (this._status === "connecting") {
+          this.clearConnectedState();
+          this._status = "idle";
+          this._error = null;
+          this.emit();
+        }
+      }
       async disconnect(wagmi) {
         if (wagmi && this._connectedVia === "extension") {
           await wagmi.disconnect().catch(() => {
@@ -4095,7 +4250,9 @@ export {
   buildDetectedWalletFromProvider,
   connectDetectedWallet,
   createWalletConnectEntry,
+  decodeBase64,
   detectSolanaWallets,
+  encodeBase64,
   formatDeepLink,
   formatWalletConnectDeepLink,
   formatWalletConnectDeepLinkForWallet,