@naculus/connect-appkit-core 0.4.0 → 0.6.0

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { Namespace, UniversalWalletSession, WalletCapabilities, TokenConfig, WalletError, WalletErrorCode, SimulationResult, NameResolverConfig, NameResolver, NotificationSettings, InAppChannel, NotificationItem, SessionKeyManagerConfig, SessionKeyManager, Hex, UserOperationReceipt, Address, SmartAccountConfig, AtomicityRequirement, ExecutionPlan, SessionKeyInfo, SessionKeyTransaction, delegationTypedData, SessionKeyScope, ScopeCheckResult } from '@naculus/connect-core';
+import { Namespace, UniversalWalletSession, WalletCapabilities, TokenConfig, WalletError, WalletErrorCode, SimulationResult, NameResolverConfig, NameResolver, NotificationSettings, InAppChannel, NotificationItem, SessionKeyManagerConfig, SessionKeyManager, Hex, UserOperationReceipt, Address, SmartAccountConfig, AtomicityRequirement, ExecutionPlan, SessionKeyInfo, SessionKeyTransaction, delegationTypedData, SessionKeyScope, ScopeCheckResult, SolanaSessionKeyInfo, SolanaSessionKeyScope, SolanaSessionKeyManager, SolanaPaymentRpc } from '@naculus/connect-core';
 
 /**
  * The types the framework-neutral half of appkit is built on.
@@ -890,6 +890,55 @@ interface PaymentRecord {
  */
 declare function describePayment(input: RequestInfo | URL, result: PaymentFetchResult): PaymentRecord | null;
 
+/**
+ * Solana session keys for the appkit shells (connect-lib STATE thread 18).
+ *
+ * The app builds the `SolanaSessionKeyManager` (its storage and password) and
+ * the RPC; the owner is the connected wallet's Solana signer role. Creating a
+ * key asks the wallet once to sign an SPL `ApproveChecked` (the key becomes
+ * the delegate of the owner's token account for that mint, up to the budget)
+ * and broadcasts it; revoking asks it to sign `Revoke`. Payments then go
+ * through `createX402Fetch` / `createMppFetch` with
+ * `solana: { sessionKey: { manager, id }, rpc }` — no prompt.
+ */
+interface SolanaOwnerSigner {
+    address: string;
+    signTransaction(transaction: Uint8Array): Promise<Uint8Array>;
+}
+interface SolanaSessionKeyFlowDeps {
+    manager: SolanaSessionKeyManager;
+    /** Must implement `sendTransaction` (e.g. `solanaPaymentRpc(url)`). */
+    rpc: SolanaPaymentRpc;
+    owner: SolanaOwnerSigner;
+}
+interface SolanaSessionKeyFlow {
+    /** The owner's keys, newest first. */
+    list(): Promise<SolanaSessionKeyInfo[]>;
+    /**
+     * Create a key, have the owner approve it, broadcast the approval.
+     * Approving replaces any delegate the owner's token account already had.
+     *
+     * On any failure the new key is revoked here, so it never signs. A failed
+     * broadcast does not prove the approval did not land (a timeout after
+     * submission): the error then says so, and `revoke(id)` sends the owner's
+     * on-chain `Revoke` to be sure.
+     */
+    create(scope: SolanaSessionKeyScope): Promise<{
+        key: SolanaSessionKeyInfo;
+        signature: string;
+    }>;
+    /**
+     * Stop the key here at once (before anything else can fail), then have the
+     * owner sign `Revoke` and broadcast it. If that fails, the key stays
+     * revoked locally; the on-chain delegate stays until a later revoke lands.
+     * Also works on a key already revoked locally.
+     */
+    revoke(id: string): Promise<{
+        signature: string;
+    }>;
+}
+declare function createSolanaSessionKeyFlow(deps: SolanaSessionKeyFlowDeps): SolanaSessionKeyFlow;
+
 declare function withTimeout<T>(promise: Promise<T>, ms: number, label?: string): Promise<T>;
 interface RetryOptions {
     maxRetries: number;
@@ -897,7 +946,12 @@ interface RetryOptions {
     label?: string;
 }
 declare function withRetry<T>(fn: () => Promise<T>, options: RetryOptions): Promise<T>;
-/** Convert EIP-1193 chainChanged values into the CAIP-2 form used by sessions. */
+/**
+ * Convert EIP-1193 chainChanged values into the CAIP-2 form used by sessions.
+ * Refuses chain 0 and anything above `Number.MAX_SAFE_INTEGER`, as
+ * connect-core's `normalizeEip155ChainId` does; switch to that export once
+ * the connect-lib release that adds it is the minimum supported version.
+ */
 declare function normalizeEip155ChainId(value: unknown): string | undefined;
 declare function toEip155Accounts(accounts: unknown[], chainId: string): string[];
 /**
@@ -962,4 +1016,4 @@ declare function siwxResultToSession<M extends SiwxMessageLike>(result: SiwxResu
     refreshedAt: null;
 };
 
-export { type AddressValidationLevel, type AtomicSupport, type ChainCapabilities, type ChainInfo, type CompareCosts, type CompareCostsInput, type ConnectionStatus, type CostComparison, type CostComparisonOperation, type CostComparisonOptions, DEFAULT_NOTIFICATION_SETTINGS, type DecimalsCache, type DelegationFrameworkAdapterOptions, type DelegationPolicyDeps, type DelegationPolicyFlow, type DelegationPolicyPreview, type DelegationTypedData, type DestinationIssue, type DestinationValidation, type ExecutableQuote, type ExecuteRoute, type ExecuteRouteError, type ExecuteRouteOptions, type ExecuteRouteResult, type GetRouteQuotes, InvalidUserOperationReceiptError, NOTIFICATION_SETTINGS_KEY, type NotificationSettingsStorage, type PaymentFetch, type PaymentFetchResult, type PaymentRecord, type PolicyExecutionAdapter, type PolicyExecutionCheck, type PolicyExecutionPreview, type PolicyExecutionRoute, type PolicyExecutionSubmission, type PolicySignatureVerifier, type PreparedPolicyExecution, type RedemptionCodec, type RedemptionRpc, type RedemptionTransaction, type RetryOptions, type RouteQuote, type RouteQuoteInput, type RouteQuoteOptions, type SimulationCallClient, type SimulationTransaction, type SiwxLocation, type SiwxMessageLike, type SiwxResultLike, type SmartAccountOptionsLike, type SmartAccountType, type SolanaIdentity, type SolanaPayer, type SolanaRoles, type SolanaRolesAbsence, type SolanaRolesSource, type SolanaRolesState, type SolanaSigner, type SolanaWalletFeatures, type TokenIdentity, type TransactionSimulationContext, type ViemChainShape, type WalletChain, type Web3Action, type Web3State, __resetResolverForTests, addInAppNotification, assertHexSignature, atomicSupportFor, bareEvmAddress, buildDelegationPolicyMessage, buildSmartAccountConfig, chainNamespace, chainNumber, chainsForNamespace, channelsUpdate, clearOneInAppNotification, compareCostsKey, createDecimalsCache, createDelegationFrameworkAdapter, createDelegationPolicyFlow, createNotification, createNotificationSettingsStorage, decodeRevertReason, defaultSiwxDomain, defaultSiwxUri, describeChain, describePayment, eip155ChainIdToNumber, encodeErc20Approve, encodeErc20Transfer, encodeErc20TransferFrom, fetchUserOperationReceipt, getResolver, getSharedSessionKeyManager, initialWeb3State, isBurnDestination, isEvmChainId, isPositiveIntegerAmount, isQuotableInput, isSiwxExpired, isSiwxNotBeforeValid, isVerifiablePolicy, loadNotificationSettings, mutedChainSettings, normalizeCapabilities, normalizeEip155ChainId, parseUserOperationReceipt, readDecimals, readSolanaRoles, resetSharedSessionKeyManager, resolveChain, resolveContextSimulationEndpoint, resolveEvmChainId, resolveRevertReason, resolveSimulationEndpoint, resolveUserOpChain, sameExecutionIntent, saveNotificationSettings, selectChainCapabilities, sessionKeyConfigFingerprint, simulateTransactionPreview, siwxResultToSession, toChainSwitchError, toEip155Accounts, toExecuteRouteError, toViemChain, tokenChainMismatch, tokenKey, updateNotificationSettings, validateDestination, validateRouteRecipient, web3Reducer, withRetry, withTimeout, writeDecimals };
+export { type AddressValidationLevel, type AtomicSupport, type ChainCapabilities, type ChainInfo, type CompareCosts, type CompareCostsInput, type ConnectionStatus, type CostComparison, type CostComparisonOperation, type CostComparisonOptions, DEFAULT_NOTIFICATION_SETTINGS, type DecimalsCache, type DelegationFrameworkAdapterOptions, type DelegationPolicyDeps, type DelegationPolicyFlow, type DelegationPolicyPreview, type DelegationTypedData, type DestinationIssue, type DestinationValidation, type ExecutableQuote, type ExecuteRoute, type ExecuteRouteError, type ExecuteRouteOptions, type ExecuteRouteResult, type GetRouteQuotes, InvalidUserOperationReceiptError, NOTIFICATION_SETTINGS_KEY, type NotificationSettingsStorage, type PaymentFetch, type PaymentFetchResult, type PaymentRecord, type PolicyExecutionAdapter, type PolicyExecutionCheck, type PolicyExecutionPreview, type PolicyExecutionRoute, type PolicyExecutionSubmission, type PolicySignatureVerifier, type PreparedPolicyExecution, type RedemptionCodec, type RedemptionRpc, type RedemptionTransaction, type RetryOptions, type RouteQuote, type RouteQuoteInput, type RouteQuoteOptions, type SimulationCallClient, type SimulationTransaction, type SiwxLocation, type SiwxMessageLike, type SiwxResultLike, type SmartAccountOptionsLike, type SmartAccountType, type SolanaIdentity, type SolanaOwnerSigner, type SolanaPayer, type SolanaRoles, type SolanaRolesAbsence, type SolanaRolesSource, type SolanaRolesState, type SolanaSessionKeyFlow, type SolanaSessionKeyFlowDeps, type SolanaSigner, type SolanaWalletFeatures, type TokenIdentity, type TransactionSimulationContext, type ViemChainShape, type WalletChain, type Web3Action, type Web3State, __resetResolverForTests, addInAppNotification, assertHexSignature, atomicSupportFor, bareEvmAddress, buildDelegationPolicyMessage, buildSmartAccountConfig, chainNamespace, chainNumber, chainsForNamespace, channelsUpdate, clearOneInAppNotification, compareCostsKey, createDecimalsCache, createDelegationFrameworkAdapter, createDelegationPolicyFlow, createNotification, createNotificationSettingsStorage, createSolanaSessionKeyFlow, decodeRevertReason, defaultSiwxDomain, defaultSiwxUri, describeChain, describePayment, eip155ChainIdToNumber, encodeErc20Approve, encodeErc20Transfer, encodeErc20TransferFrom, fetchUserOperationReceipt, getResolver, getSharedSessionKeyManager, initialWeb3State, isBurnDestination, isEvmChainId, isPositiveIntegerAmount, isQuotableInput, isSiwxExpired, isSiwxNotBeforeValid, isVerifiablePolicy, loadNotificationSettings, mutedChainSettings, normalizeCapabilities, normalizeEip155ChainId, parseUserOperationReceipt, readDecimals, readSolanaRoles, resetSharedSessionKeyManager, resolveChain, resolveContextSimulationEndpoint, resolveEvmChainId, resolveRevertReason, resolveSimulationEndpoint, resolveUserOpChain, sameExecutionIntent, saveNotificationSettings, selectChainCapabilities, sessionKeyConfigFingerprint, simulateTransactionPreview, siwxResultToSession, toChainSwitchError, toEip155Accounts, toExecuteRouteError, toViemChain, tokenChainMismatch, tokenKey, updateNotificationSettings, validateDestination, validateRouteRecipient, web3Reducer, withRetry, withTimeout, writeDecimals };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Namespace, UniversalWalletSession, WalletCapabilities, TokenConfig, WalletError, WalletErrorCode, SimulationResult, NameResolverConfig, NameResolver, NotificationSettings, InAppChannel, NotificationItem, SessionKeyManagerConfig, SessionKeyManager, Hex, UserOperationReceipt, Address, SmartAccountConfig, AtomicityRequirement, ExecutionPlan, SessionKeyInfo, SessionKeyTransaction, delegationTypedData, SessionKeyScope, ScopeCheckResult } from '@naculus/connect-core';
+import { Namespace, UniversalWalletSession, WalletCapabilities, TokenConfig, WalletError, WalletErrorCode, SimulationResult, NameResolverConfig, NameResolver, NotificationSettings, InAppChannel, NotificationItem, SessionKeyManagerConfig, SessionKeyManager, Hex, UserOperationReceipt, Address, SmartAccountConfig, AtomicityRequirement, ExecutionPlan, SessionKeyInfo, SessionKeyTransaction, delegationTypedData, SessionKeyScope, ScopeCheckResult, SolanaSessionKeyInfo, SolanaSessionKeyScope, SolanaSessionKeyManager, SolanaPaymentRpc } from '@naculus/connect-core';
 
 /**
  * The types the framework-neutral half of appkit is built on.
@@ -890,6 +890,55 @@ interface PaymentRecord {
  */
 declare function describePayment(input: RequestInfo | URL, result: PaymentFetchResult): PaymentRecord | null;
 
+/**
+ * Solana session keys for the appkit shells (connect-lib STATE thread 18).
+ *
+ * The app builds the `SolanaSessionKeyManager` (its storage and password) and
+ * the RPC; the owner is the connected wallet's Solana signer role. Creating a
+ * key asks the wallet once to sign an SPL `ApproveChecked` (the key becomes
+ * the delegate of the owner's token account for that mint, up to the budget)
+ * and broadcasts it; revoking asks it to sign `Revoke`. Payments then go
+ * through `createX402Fetch` / `createMppFetch` with
+ * `solana: { sessionKey: { manager, id }, rpc }` — no prompt.
+ */
+interface SolanaOwnerSigner {
+    address: string;
+    signTransaction(transaction: Uint8Array): Promise<Uint8Array>;
+}
+interface SolanaSessionKeyFlowDeps {
+    manager: SolanaSessionKeyManager;
+    /** Must implement `sendTransaction` (e.g. `solanaPaymentRpc(url)`). */
+    rpc: SolanaPaymentRpc;
+    owner: SolanaOwnerSigner;
+}
+interface SolanaSessionKeyFlow {
+    /** The owner's keys, newest first. */
+    list(): Promise<SolanaSessionKeyInfo[]>;
+    /**
+     * Create a key, have the owner approve it, broadcast the approval.
+     * Approving replaces any delegate the owner's token account already had.
+     *
+     * On any failure the new key is revoked here, so it never signs. A failed
+     * broadcast does not prove the approval did not land (a timeout after
+     * submission): the error then says so, and `revoke(id)` sends the owner's
+     * on-chain `Revoke` to be sure.
+     */
+    create(scope: SolanaSessionKeyScope): Promise<{
+        key: SolanaSessionKeyInfo;
+        signature: string;
+    }>;
+    /**
+     * Stop the key here at once (before anything else can fail), then have the
+     * owner sign `Revoke` and broadcast it. If that fails, the key stays
+     * revoked locally; the on-chain delegate stays until a later revoke lands.
+     * Also works on a key already revoked locally.
+     */
+    revoke(id: string): Promise<{
+        signature: string;
+    }>;
+}
+declare function createSolanaSessionKeyFlow(deps: SolanaSessionKeyFlowDeps): SolanaSessionKeyFlow;
+
 declare function withTimeout<T>(promise: Promise<T>, ms: number, label?: string): Promise<T>;
 interface RetryOptions {
     maxRetries: number;
@@ -897,7 +946,12 @@ interface RetryOptions {
     label?: string;
 }
 declare function withRetry<T>(fn: () => Promise<T>, options: RetryOptions): Promise<T>;
-/** Convert EIP-1193 chainChanged values into the CAIP-2 form used by sessions. */
+/**
+ * Convert EIP-1193 chainChanged values into the CAIP-2 form used by sessions.
+ * Refuses chain 0 and anything above `Number.MAX_SAFE_INTEGER`, as
+ * connect-core's `normalizeEip155ChainId` does; switch to that export once
+ * the connect-lib release that adds it is the minimum supported version.
+ */
 declare function normalizeEip155ChainId(value: unknown): string | undefined;
 declare function toEip155Accounts(accounts: unknown[], chainId: string): string[];
 /**
@@ -962,4 +1016,4 @@ declare function siwxResultToSession<M extends SiwxMessageLike>(result: SiwxResu
     refreshedAt: null;
 };
 
-export { type AddressValidationLevel, type AtomicSupport, type ChainCapabilities, type ChainInfo, type CompareCosts, type CompareCostsInput, type ConnectionStatus, type CostComparison, type CostComparisonOperation, type CostComparisonOptions, DEFAULT_NOTIFICATION_SETTINGS, type DecimalsCache, type DelegationFrameworkAdapterOptions, type DelegationPolicyDeps, type DelegationPolicyFlow, type DelegationPolicyPreview, type DelegationTypedData, type DestinationIssue, type DestinationValidation, type ExecutableQuote, type ExecuteRoute, type ExecuteRouteError, type ExecuteRouteOptions, type ExecuteRouteResult, type GetRouteQuotes, InvalidUserOperationReceiptError, NOTIFICATION_SETTINGS_KEY, type NotificationSettingsStorage, type PaymentFetch, type PaymentFetchResult, type PaymentRecord, type PolicyExecutionAdapter, type PolicyExecutionCheck, type PolicyExecutionPreview, type PolicyExecutionRoute, type PolicyExecutionSubmission, type PolicySignatureVerifier, type PreparedPolicyExecution, type RedemptionCodec, type RedemptionRpc, type RedemptionTransaction, type RetryOptions, type RouteQuote, type RouteQuoteInput, type RouteQuoteOptions, type SimulationCallClient, type SimulationTransaction, type SiwxLocation, type SiwxMessageLike, type SiwxResultLike, type SmartAccountOptionsLike, type SmartAccountType, type SolanaIdentity, type SolanaPayer, type SolanaRoles, type SolanaRolesAbsence, type SolanaRolesSource, type SolanaRolesState, type SolanaSigner, type SolanaWalletFeatures, type TokenIdentity, type TransactionSimulationContext, type ViemChainShape, type WalletChain, type Web3Action, type Web3State, __resetResolverForTests, addInAppNotification, assertHexSignature, atomicSupportFor, bareEvmAddress, buildDelegationPolicyMessage, buildSmartAccountConfig, chainNamespace, chainNumber, chainsForNamespace, channelsUpdate, clearOneInAppNotification, compareCostsKey, createDecimalsCache, createDelegationFrameworkAdapter, createDelegationPolicyFlow, createNotification, createNotificationSettingsStorage, decodeRevertReason, defaultSiwxDomain, defaultSiwxUri, describeChain, describePayment, eip155ChainIdToNumber, encodeErc20Approve, encodeErc20Transfer, encodeErc20TransferFrom, fetchUserOperationReceipt, getResolver, getSharedSessionKeyManager, initialWeb3State, isBurnDestination, isEvmChainId, isPositiveIntegerAmount, isQuotableInput, isSiwxExpired, isSiwxNotBeforeValid, isVerifiablePolicy, loadNotificationSettings, mutedChainSettings, normalizeCapabilities, normalizeEip155ChainId, parseUserOperationReceipt, readDecimals, readSolanaRoles, resetSharedSessionKeyManager, resolveChain, resolveContextSimulationEndpoint, resolveEvmChainId, resolveRevertReason, resolveSimulationEndpoint, resolveUserOpChain, sameExecutionIntent, saveNotificationSettings, selectChainCapabilities, sessionKeyConfigFingerprint, simulateTransactionPreview, siwxResultToSession, toChainSwitchError, toEip155Accounts, toExecuteRouteError, toViemChain, tokenChainMismatch, tokenKey, updateNotificationSettings, validateDestination, validateRouteRecipient, web3Reducer, withRetry, withTimeout, writeDecimals };
+export { type AddressValidationLevel, type AtomicSupport, type ChainCapabilities, type ChainInfo, type CompareCosts, type CompareCostsInput, type ConnectionStatus, type CostComparison, type CostComparisonOperation, type CostComparisonOptions, DEFAULT_NOTIFICATION_SETTINGS, type DecimalsCache, type DelegationFrameworkAdapterOptions, type DelegationPolicyDeps, type DelegationPolicyFlow, type DelegationPolicyPreview, type DelegationTypedData, type DestinationIssue, type DestinationValidation, type ExecutableQuote, type ExecuteRoute, type ExecuteRouteError, type ExecuteRouteOptions, type ExecuteRouteResult, type GetRouteQuotes, InvalidUserOperationReceiptError, NOTIFICATION_SETTINGS_KEY, type NotificationSettingsStorage, type PaymentFetch, type PaymentFetchResult, type PaymentRecord, type PolicyExecutionAdapter, type PolicyExecutionCheck, type PolicyExecutionPreview, type PolicyExecutionRoute, type PolicyExecutionSubmission, type PolicySignatureVerifier, type PreparedPolicyExecution, type RedemptionCodec, type RedemptionRpc, type RedemptionTransaction, type RetryOptions, type RouteQuote, type RouteQuoteInput, type RouteQuoteOptions, type SimulationCallClient, type SimulationTransaction, type SiwxLocation, type SiwxMessageLike, type SiwxResultLike, type SmartAccountOptionsLike, type SmartAccountType, type SolanaIdentity, type SolanaOwnerSigner, type SolanaPayer, type SolanaRoles, type SolanaRolesAbsence, type SolanaRolesSource, type SolanaRolesState, type SolanaSessionKeyFlow, type SolanaSessionKeyFlowDeps, type SolanaSigner, type SolanaWalletFeatures, type TokenIdentity, type TransactionSimulationContext, type ViemChainShape, type WalletChain, type Web3Action, type Web3State, __resetResolverForTests, addInAppNotification, assertHexSignature, atomicSupportFor, bareEvmAddress, buildDelegationPolicyMessage, buildSmartAccountConfig, chainNamespace, chainNumber, chainsForNamespace, channelsUpdate, clearOneInAppNotification, compareCostsKey, createDecimalsCache, createDelegationFrameworkAdapter, createDelegationPolicyFlow, createNotification, createNotificationSettingsStorage, createSolanaSessionKeyFlow, decodeRevertReason, defaultSiwxDomain, defaultSiwxUri, describeChain, describePayment, eip155ChainIdToNumber, encodeErc20Approve, encodeErc20Transfer, encodeErc20TransferFrom, fetchUserOperationReceipt, getResolver, getSharedSessionKeyManager, initialWeb3State, isBurnDestination, isEvmChainId, isPositiveIntegerAmount, isQuotableInput, isSiwxExpired, isSiwxNotBeforeValid, isVerifiablePolicy, loadNotificationSettings, mutedChainSettings, normalizeCapabilities, normalizeEip155ChainId, parseUserOperationReceipt, readDecimals, readSolanaRoles, resetSharedSessionKeyManager, resolveChain, resolveContextSimulationEndpoint, resolveEvmChainId, resolveRevertReason, resolveSimulationEndpoint, resolveUserOpChain, sameExecutionIntent, saveNotificationSettings, selectChainCapabilities, sessionKeyConfigFingerprint, simulateTransactionPreview, siwxResultToSession, toChainSwitchError, toEip155Accounts, toExecuteRouteError, toViemChain, tokenChainMismatch, tokenKey, updateNotificationSettings, validateDestination, validateRouteRecipient, web3Reducer, withRetry, withTimeout, writeDecimals };

package/dist/index.js

@@ -1347,6 +1347,89 @@ function describePayment(input, result) {
   };
 }
 
+// src/solana-session-key.ts
+import {
+  verifySignedOwnerTransaction,
+  WalletError as WalletError9
+} from "@naculus/connect-core";
+function send(rpc) {
+  const sendTransaction = rpc.sendTransaction;
+  if (!sendTransaction) {
+    throw new WalletError9(
+      "invalid_input",
+      "The Solana RPC must implement sendTransaction to approve or revoke."
+    );
+  }
+  return (tx) => sendTransaction.call(rpc, tx);
+}
+function createSolanaSessionKeyFlow(deps) {
+  const { manager, rpc, owner } = deps;
+  const list = async () => (await manager.listSessions()).filter((key) => key.owner === owner.address).sort((a, b) => b.createdAt - a.createdAt);
+  return {
+    list,
+    async create(scope) {
+      const broadcast = send(rpc);
+      const draft = await manager.createSessionKey(scope, owner.address, rpc);
+      let approval;
+      try {
+        const { transaction, recentBlockhash } = await manager.prepareApproval(
+          draft.id,
+          rpc
+        );
+        const signed = await owner.signTransaction(transaction);
+        approval = await manager.attachApproval(
+          draft.id,
+          signed,
+          recentBlockhash
+        );
+      } catch (cause) {
+        await manager.revoke(draft.id).catch(() => {
+        });
+        throw cause;
+      }
+      let signature;
+      try {
+        signature = await broadcast(approval);
+      } catch (cause) {
+        await manager.revoke(draft.id).catch(() => {
+        });
+        throw new WalletError9(
+          "rpc_error",
+          `The approval could not be confirmed as sent (${cause instanceof Error ? cause.message : String(cause)}); the key is revoked here. Call revoke("${draft.id}") to send the on-chain Revoke in case it landed.`
+        );
+      }
+      const key = (await list().catch(() => [])).find((k) => k.id === draft.id);
+      return { key: key ?? { ...draft, status: "active" }, signature };
+    },
+    async revoke(id) {
+      const key = (await list()).find((k) => k.id === id);
+      if (!key) {
+        throw new WalletError9(
+          "invalid_input",
+          `No Solana session key ${id} for this owner.`
+        );
+      }
+      await manager.revoke(id);
+      const broadcast = send(rpc);
+      const { transaction, recentBlockhash } = await manager.prepareRevocation(
+        id,
+        rpc
+      );
+      const signed = await owner.signTransaction(transaction);
+      const revocation = verifySignedOwnerTransaction(signed, {
+        kind: "revoke",
+        revocation: {
+          owner: key.owner,
+          mint: key.scope.mint,
+          tokenProgram: key.tokenProgram,
+          recentBlockhash
+        }
+      });
+      return { signature: await broadcast(revocation) };
+    }
+  };
+}
+
 // src/web3-store.ts
 import { logger } from "@naculus/connect-core";
 function withTimeout(promise, ms, label = "Operation") {
@@ -1382,18 +1465,25 @@ async function withRetry(fn, options) {
 }
 function normalizeEip155ChainId(value) {
   if (typeof value !== "string") return void 0;
+  let raw;
+  if (value.startsWith("eip155:")) {
+    raw = value.slice("eip155:".length);
+    if (!/^\d+$/.test(raw)) return void 0;
+  } else if (/^0x[0-9a-f]+$/i.test(value) || /^\d+$/.test(value)) {
+    raw = value;
+  } else {
+    return void 0;
+  }
+  let numeric;
   try {
-    if (value.startsWith("eip155:")) {
-      const reference = value.slice("eip155:".length);
-      if (!/^\d+$/.test(reference)) return void 0;
-      return `eip155:${BigInt(reference).toString(10)}`;
-    }
-    if (/^0x[0-9a-f]+$/i.test(value) || /^\d+$/.test(value)) {
-      return `eip155:${BigInt(value).toString(10)}`;
-    }
+    numeric = BigInt(raw);
   } catch {
+    return void 0;
   }
-  return void 0;
+  if (numeric <= 0n || numeric > BigInt(Number.MAX_SAFE_INTEGER)) {
+    return void 0;
+  }
+  return `eip155:${numeric.toString(10)}`;
 }
 function toEip155Accounts(accounts, chainId) {
   const reference = chainId.split(":")[1];
@@ -1497,6 +1587,7 @@ export {
   createDelegationPolicyFlow,
   createNotification,
   createNotificationSettingsStorage,
+  createSolanaSessionKeyFlow,
   decodeRevertReason,
   defaultSiwxDomain,
   defaultSiwxUri,