@chipi-stack/chipi-react 14.13.1 → 14.15.0

package/dist/index.js

@@ -217,6 +217,17 @@ function useGetWallet(input) {
     fetchWallet
   };
 }
+
+// src/utils/wallet-capabilities.ts
+var SHHH_SESSION_SIGNER_KINDS = /* @__PURE__ */ new Set(["STARK", "ED25519"]);
+function walletSupportsSessions(wallet) {
+  if (!wallet) return false;
+  if (wallet.walletType === "CHIPI") return true;
+  if (wallet.walletType === "SHHH") {
+    return !wallet.signerKind || SHHH_SESSION_SIGNER_KINDS.has(wallet.signerKind);
+  }
+  return false;
+}
 function useChipiWallet(config3) {
   const { chipiSDK } = useChipiContext();
   const queryClient = reactQuery.useQueryClient();
@@ -297,7 +308,7 @@ function useChipiWallet(config3) {
     const data = walletQuery.data;
     return {
       ...data,
-      supportsSessionKeys: data.walletType === "CHIPI",
+      supportsSessionKeys: walletSupportsSessions(data),
       shortAddress: formatAddress(data.publicKey)
     };
   }, [walletQuery.data, walletQuery.isLoading]);
@@ -354,6 +365,7 @@ function useChipiSession(config3) {
   const {
     wallet,
     encryptKey,
+    getEncryptKey,
     getBearerToken,
     storedSession,
     onSessionCreated,
@@ -367,10 +379,13 @@ function useChipiSession(config3) {
   React.useEffect(() => {
     setLocalSession(storedSession ?? null);
   }, [storedSession]);
-  const supportsSession = React.useMemo(() => {
-    if (!wallet) return false;
-    return wallet.walletType === "CHIPI";
-  }, [wallet]);
+  const supportsSession = React.useMemo(() => walletSupportsSessions(wallet), [wallet]);
+  const resolveEncryptKey = React.useCallback(async () => {
+    const key = encryptKey || (getEncryptKey ? await getEncryptKey() : void 0);
+    if (!key) throw new Error("Encryption key (PIN) is required");
+    return key;
+  }, [encryptKey, getEncryptKey]);
+  const [awaitingRegistrationUntil, setAwaitingRegistrationUntil] = React.useState(null);
   const sessionStatusQuery = reactQuery.useQuery({
     queryKey: ["chipi-session-status", wallet?.publicKey, localSession?.publicKey],
     queryFn: async () => {
@@ -383,8 +398,12 @@ function useChipiSession(config3) {
     enabled: Boolean(
       autoCheckStatus && wallet?.publicKey && localSession?.publicKey && supportsSession
     ),
-    staleTime: 3e4
+    staleTime: 3e4,
     // 30 seconds
+    // The registration hash comes back before the transaction is in a block, so
+    // right after registerSession the struct can still read as zero. Poll until
+    // it shows up (or for two minutes), then go back to on-demand reads.
+    refetchInterval: (query) => awaitingRegistrationUntil !== null && Date.now() < awaitingRegistrationUntil && (query.state.data?.validUntil ?? 0) === 0 ? 3e3 : false
   });
   const [revokedSessionKey, setRevokedSessionKey] = React.useState(null);
   const sessionState = React.useMemo(() => {
@@ -407,13 +426,13 @@ function useChipiSession(config3) {
   const createSessionMutation = reactQuery.useMutation(
     {
       mutationFn: async (params = {}) => {
-        if (!encryptKey) throw new Error("Encryption key (PIN) is required");
         if (!supportsSession)
           throw new Error(
-            "Wallet does not support sessions. Only CHIPI wallets support session keys."
+            "Wallet does not support sessions. Session keys need a CHIPI wallet or a SHHH wallet with a STARK / ED25519 signer."
           );
+        const key = await resolveEncryptKey();
         const sessionData = chipiSDK.sessions.createSessionKey({
-          encryptKey,
+          encryptKey: key,
           durationSeconds: params.durationSeconds ?? defaultDurationSeconds
         });
         return sessionData;
@@ -433,29 +452,38 @@ function useChipiSession(config3) {
   const registerSessionMutation = reactQuery.useMutation({
     mutationFn: async (sessionConfig = {}) => {
       if (!wallet) throw new Error("Wallet is required");
-      if (!localSession) throw new Error("No session to register. Call createSession first.");
-      if (!encryptKey) throw new Error("Encryption key (PIN) is required");
+      const sessionPublicKey = sessionConfig.sessionPublicKey ?? localSession?.publicKey;
+      const validUntil = sessionConfig.validUntil ?? localSession?.validUntil;
+      if (!sessionPublicKey || validUntil === void 0)
+        throw new Error(
+          "No session to register. Call createSession first, or pass sessionPublicKey and validUntil."
+        );
       if (!supportsSession) throw new Error("Wallet does not support sessions");
+      const key = await resolveEncryptKey();
       const bearerToken = await getBearerToken();
       if (!bearerToken) throw new Error("Bearer token is required");
-      const txHash = await chipiSDK.sessions.addSessionKeyToContract(
-        {
-          encryptKey,
-          wallet,
-          sessionConfig: {
-            sessionPublicKey: localSession.publicKey,
-            validUntil: sessionConfig.validUntil ?? localSession.validUntil,
-            maxCalls: sessionConfig.maxCalls ?? defaultMaxCalls,
-            allowedEntrypoints: sessionConfig.allowedEntrypoints ?? []
-          }
-        },
-        bearerToken
-      );
-      return txHash;
+      const params = {
+        encryptKey: key,
+        wallet,
+        sessionConfig: {
+          sessionPublicKey,
+          validUntil,
+          maxCalls: sessionConfig.maxCalls ?? defaultMaxCalls,
+          allowedEntrypoints: sessionConfig.allowedEntrypoints ?? []
+        }
+      };
+      if (sessionConfig.spendingPolicies?.length) {
+        return chipiSDK.sessions.setupSession(
+          { ...params, spendingPolicies: sessionConfig.spendingPolicies },
+          bearerToken
+        );
+      }
+      return chipiSDK.sessions.addSessionKeyToContract(params, bearerToken);
     },
     onSuccess: () => {
       setError(null);
       if (localSession && revokedSessionKey === localSession.publicKey) setRevokedSessionKey(null);
+      setAwaitingRegistrationUntil(Date.now() + 12e4);
       queryClient.invalidateQueries({
         queryKey: ["chipi-session-status", wallet?.publicKey, localSession?.publicKey]
       });
@@ -465,26 +493,28 @@ function useChipiSession(config3) {
     }
   });
   const revokeSessionMutation = reactQuery.useMutation({
-    mutationFn: async () => {
+    mutationFn: async (sessionPublicKey) => {
       if (!wallet) throw new Error("Wallet is required");
-      if (!localSession) throw new Error("No session to revoke");
-      if (!encryptKey) throw new Error("Encryption key (PIN) is required");
+      const target = sessionPublicKey ?? localSession?.publicKey;
+      if (!target) throw new Error("No session to revoke");
       if (!supportsSession) throw new Error("Wallet does not support sessions");
+      const key = await resolveEncryptKey();
       const bearerToken = await getBearerToken();
       if (!bearerToken) throw new Error("Bearer token is required");
       const txHash = await chipiSDK.sessions.revokeSessionKey(
         {
-          encryptKey,
+          encryptKey: key,
           wallet,
-          sessionPublicKey: localSession.publicKey
+          sessionPublicKey: target
         },
         bearerToken
       );
       return txHash;
     },
-    onSuccess: () => {
+    onSuccess: (_txHash, sessionPublicKey) => {
       setError(null);
-      if (localSession) setRevokedSessionKey(localSession.publicKey);
+      const target = sessionPublicKey ?? localSession?.publicKey;
+      if (target) setRevokedSessionKey(target);
       queryClient.invalidateQueries({
         queryKey: ["chipi-session-status", wallet?.publicKey, localSession?.publicKey]
       });
@@ -497,13 +527,13 @@ function useChipiSession(config3) {
     mutationFn: async (calls) => {
       if (!wallet) throw new Error("Wallet is required");
       if (!localSession) throw new Error("No active session");
-      if (!encryptKey) throw new Error("Encryption key (PIN) is required");
       if (!hasActiveSession) throw new Error("Session is not active. Register the session first.");
+      const key = await resolveEncryptKey();
       const bearerToken = await getBearerToken();
       if (!bearerToken) throw new Error("Bearer token is required");
       const txHash = await chipiSDK.executeTransactionWithSession({
         params: {
-          encryptKey,
+          encryptKey: key,
           wallet,
           session: localSession,
           calls
@@ -527,13 +557,13 @@ function useChipiSession(config3) {
       if (!wallet) throw new Error("Wallet is required");
       if (!localSession)
         throw new Error("No session to set policy on. Create and register a session first.");
-      if (!encryptKey) throw new Error("Encryption key (PIN) is required");
       if (!supportsSession) throw new Error("Wallet does not support sessions");
+      const key = await resolveEncryptKey();
       const bearerToken = await getBearerToken();
       if (!bearerToken) throw new Error("Bearer token is required");
       const txHash = await chipiSDK.sessions.setSpendingPolicy(
         {
-          encryptKey,
+          encryptKey: key,
           wallet,
           spendingPolicyConfig: {
             sessionPublicKey: localSession.publicKey,
@@ -555,13 +585,13 @@ function useChipiSession(config3) {
     mutationFn: async (token) => {
       if (!wallet) throw new Error("Wallet is required");
       if (!localSession) throw new Error("No session to remove policy from");
-      if (!encryptKey) throw new Error("Encryption key (PIN) is required");
       if (!supportsSession) throw new Error("Wallet does not support sessions");
+      const key = await resolveEncryptKey();
       const bearerToken = await getBearerToken();
       if (!bearerToken) throw new Error("Bearer token is required");
       const txHash = await chipiSDK.sessions.removeSpendingPolicy(
         {
-          encryptKey,
+          encryptKey: key,
           wallet,
           sessionPublicKey: localSession.publicKey,
           token
@@ -589,9 +619,14 @@ function useChipiSession(config3) {
     },
     [registerSessionMutation]
   );
-  const revokeSession = React.useCallback(async () => {
-    return revokeSessionMutation.mutateAsync();
-  }, [revokeSessionMutation]);
+  const revokeSession = React.useCallback(
+    async (sessionPublicKey) => {
+      return revokeSessionMutation.mutateAsync(
+        typeof sessionPublicKey === "string" ? sessionPublicKey : void 0
+      );
+    },
+    [revokeSessionMutation]
+  );
   const executeWithSession = React.useCallback(
     async (calls) => {
       return executeWithSessionMutation.mutateAsync(calls);
@@ -21278,6 +21313,21 @@ function ChipiInjector({ children, ...config3 }) {
   }, [walletAddr]);
   return children ?? null;
 }
+var DEFAULT_RECOVER_LABELS = {
+  proposeAddDevice: "Propose new device",
+  proposeRecovery: "Initiate recovery",
+  executeAddDevice: "Execute add-owner",
+  executeRecovery: "Finalize recovery",
+  timelockAddDevice: "48-hour timelock before this device becomes active.",
+  timelockRecovery: "7-day timelock before the recovered wallet becomes active.",
+  submitting: "Submitting\u2026",
+  secondsRemaining: (s) => `${s}s remaining`,
+  cancel: "Cancel pending op",
+  timelockElapsed: "Timelock elapsed.",
+  cancelling: "Cancelling\u2026",
+  doneAddDevice: "New device added.",
+  doneRecovery: "Wallet recovered."
+};
 function deriveStaticPhase(pendingOp, executed, isReady, nowSecs) {
   if (executed) return "done";
   if (!pendingOp) return "form-idle";
@@ -21359,10 +21409,17 @@ function Recover(props) {
       setSubmittingAction(null);
     }
   }, [activePendingOp, onCancel]);
+  const L = React.useMemo(
+    () => ({
+      ...DEFAULT_RECOVER_LABELS,
+      ...Object.fromEntries(Object.entries(props.labels ?? {}).filter(([, v]) => v !== void 0))
+    }),
+    [props.labels]
+  );
   const isAddDevice = mode === "add-device";
-  const proposeLabel = isAddDevice ? "Propose new device" : "Initiate recovery";
-  const executeLabel = isAddDevice ? "Execute add-owner" : "Finalize recovery";
-  const timelockDescription = isAddDevice ? "48-hour timelock before this device becomes active." : "7-day timelock before the recovered wallet becomes active.";
+  const proposeLabel = isAddDevice ? L.proposeAddDevice : L.proposeRecovery;
+  const executeLabel = isAddDevice ? L.executeAddDevice : L.executeRecovery;
+  const timelockDescription = isAddDevice ? L.timelockAddDevice : L.timelockRecovery;
   return /* @__PURE__ */ jsxRuntime.jsxs(
     "div",
     {
@@ -21390,18 +21447,15 @@ function Recover(props) {
             }
           )
         ] }),
-        phase === "submitting-propose" && /* @__PURE__ */ jsxRuntime.jsx("section", { "data-chipi-recover-section": "propose", children: /* @__PURE__ */ jsxRuntime.jsx("p", { "data-chipi-recover-status": "submitting", children: "Submitting\u2026" }) }),
+        phase === "submitting-propose" && /* @__PURE__ */ jsxRuntime.jsx("section", { "data-chipi-recover-section": "propose", children: /* @__PURE__ */ jsxRuntime.jsx("p", { "data-chipi-recover-status": "submitting", children: L.submitting }) }),
         phase === "awaiting-timelock" && activePendingOp && /* @__PURE__ */ jsxRuntime.jsxs("section", { "data-chipi-recover-section": "awaiting", children: [
           /* @__PURE__ */ jsxRuntime.jsx("p", { "data-chipi-recover-status": "awaiting", children: timelockDescription }),
-          /* @__PURE__ */ jsxRuntime.jsxs(
+          /* @__PURE__ */ jsxRuntime.jsx(
             "p",
             {
               "data-chipi-recover-countdown": "",
               "data-chipi-recover-seconds-remaining": String(secondsRemaining),
-              children: [
-                secondsRemaining,
-                "s remaining"
-              ]
+              children: L.secondsRemaining(secondsRemaining)
             }
           ),
           /* @__PURE__ */ jsxRuntime.jsx("p", { "data-chipi-recover-op-id": "", children: String(activePendingOp.opId) }),
@@ -21412,12 +21466,12 @@ function Recover(props) {
               "data-chipi-recover-action": "cancel",
               onClick: handleCancel,
               disabled: submittingAction !== null,
-              children: "Cancel pending op"
+              children: L.cancel
             }
           )
         ] }),
         (phase === "ready-to-execute" || phase === "submitting-execute") && activePendingOp && /* @__PURE__ */ jsxRuntime.jsxs("section", { "data-chipi-recover-section": "execute", children: [
-          /* @__PURE__ */ jsxRuntime.jsx("p", { "data-chipi-recover-status": "ready", children: "Timelock elapsed." }),
+          /* @__PURE__ */ jsxRuntime.jsx("p", { "data-chipi-recover-status": "ready", children: L.timelockElapsed }),
           /* @__PURE__ */ jsxRuntime.jsx(
             "button",
             {
@@ -21435,12 +21489,12 @@ function Recover(props) {
               "data-chipi-recover-action": "cancel",
               onClick: handleCancel,
               disabled: submittingAction !== null,
-              children: "Cancel pending op"
+              children: L.cancel
             }
           )
         ] }),
-        phase === "submitting-cancel" && /* @__PURE__ */ jsxRuntime.jsx("section", { "data-chipi-recover-section": "cancel", children: /* @__PURE__ */ jsxRuntime.jsx("p", { "data-chipi-recover-status": "submitting", children: "Cancelling\u2026" }) }),
-        phase === "done" && /* @__PURE__ */ jsxRuntime.jsx("section", { "data-chipi-recover-section": "done", children: /* @__PURE__ */ jsxRuntime.jsx("p", { "data-chipi-recover-status": "done", children: isAddDevice ? "New device added." : "Wallet recovered." }) }),
+        phase === "submitting-cancel" && /* @__PURE__ */ jsxRuntime.jsx("section", { "data-chipi-recover-section": "cancel", children: /* @__PURE__ */ jsxRuntime.jsx("p", { "data-chipi-recover-status": "submitting", children: L.cancelling }) }),
+        phase === "done" && /* @__PURE__ */ jsxRuntime.jsx("section", { "data-chipi-recover-section": "done", children: /* @__PURE__ */ jsxRuntime.jsx("p", { "data-chipi-recover-status": "done", children: isAddDevice ? L.doneAddDevice : L.doneRecovery }) }),
         error && /* @__PURE__ */ jsxRuntime.jsx("p", { "data-chipi-recover-error": "", role: "alert", children: error.message })
       ]
     }
@@ -21480,6 +21534,7 @@ Object.defineProperty(exports, "ChainToken", {
 });
 exports.ChipiInjector = ChipiInjector;
 exports.ChipiProvider = ChipiProvider;
+exports.DEFAULT_RECOVER_LABELS = DEFAULT_RECOVER_LABELS;
 exports.Recover = Recover;
 exports.createChipiWindowObject = createChipiWindowObject;
 exports.derivePrivacyAccount = derivePrivacyAccount;
@@ -21520,5 +21575,6 @@ exports.useTransfer = useTransfer;
 exports.useUnshield = useUnshield;
 exports.useUpdateWalletEncryption = useUpdateWalletEncryption;
 exports.useX402Payment = useX402Payment;
+exports.walletSupportsSessions = walletSupportsSessions;
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map