@owney/sdk 0.6.6-beta.3 → 0.6.6-beta.5

package/dist/index.cjs

@@ -550,36 +550,71 @@ var isJwtExpired = (token) => {
     return false;
   }
 };
+var memorySessions = /* @__PURE__ */ new Map();
+var isFreshSession = (session) => !!session && !!session.token && !isJwtExpired(session.token);
 var readSession = (address, chainId) => {
+  if (typeof window === "undefined") return null;
+  const key = buildKey(address, chainId);
   const store = storage();
-  if (!store) return null;
-  const raw = store.getItem(buildKey(address, chainId));
-  if (!raw) return null;
+  let raw = null;
   try {
-    const parsed = JSON.parse(raw);
-    if (!parsed.token || isJwtExpired(parsed.token)) {
-      store.removeItem(buildKey(address, chainId));
-      return null;
-    }
-    return parsed;
+    raw = store?.getItem(key) ?? null;
   } catch {
-    store.removeItem(buildKey(address, chainId));
+    raw = null;
+  }
+  if (raw) {
+    try {
+      const parsed = JSON.parse(raw);
+      if (isFreshSession(parsed)) return parsed;
+    } catch {
+    }
+    memorySessions.delete(key);
+    try {
+      store?.removeItem(key);
+    } catch {
+    }
     return null;
   }
+  const cached = memorySessions.get(key);
+  if (isFreshSession(cached)) return cached;
+  if (cached) memorySessions.delete(key);
+  return null;
 };
 var writeSession = (address, chainId, session) => {
+  if (typeof window === "undefined") return;
+  const key = buildKey(address, chainId);
+  memorySessions.set(key, session);
   const store = storage();
-  if (!store) return;
   try {
-    store.setItem(buildKey(address, chainId), JSON.stringify(session));
+    store?.setItem(key, JSON.stringify(session));
   } catch {
   }
 };
 var clearSession = (address, chainId) => {
+  const key = buildKey(address, chainId);
+  memorySessions.delete(key);
+  const store = storage();
+  try {
+    store?.removeItem(key);
+  } catch {
+  }
+};
+var SESSION_KEY_PREFIX = "owney.zyfai.sessionkey";
+var buildSessionKeyKey = (address, chainId) => `${SESSION_KEY_PREFIX}:${address.toLowerCase()}:${chainId}`;
+var wasSessionKeyActivated = (address, chainId) => {
+  const store = storage();
+  if (!store) return false;
+  try {
+    return store.getItem(buildSessionKeyKey(address, chainId)) === "1";
+  } catch {
+    return false;
+  }
+};
+var markSessionKeyActivated = (address, chainId) => {
   const store = storage();
   if (!store) return;
   try {
-    store.removeItem(buildKey(address, chainId));
+    store.setItem(buildSessionKeyKey(address, chainId), "1");
   } catch {
   }
 };
@@ -836,7 +871,7 @@ var ZyfaiAgent = class {
     const wallet = await this.sdk.getSmartWalletAddress(address, validChainId);
     this.smartWalletCache.set(`${address}_${validChainId}`, wallet.address);
     if (!wallet.isDeployed) {
-      await this.sdk.deploySafe(address, validChainId, "aggressive", true);
+      await this.sdk.deploySafe(address, validChainId, "aggressive", false);
       try {
         if (validChainId === 42161) {
           await this.sdk.updateUserProfile({
@@ -854,10 +889,33 @@ var ZyfaiAgent = class {
         );
       }
     }
-    const user = await this.sdk.getUserDetails();
-    if (!user.hasActiveSessionKey) {
-      await this.sdk.createSessionKey(address, validChainId);
-    }
+    await this.ensureSessionKey(address, validChainId);
+  }
+  /**
+   * Ensures a session key is active for THIS chain.
+   *
+   * The Zyfai SDK tracks session-key state with a single global boolean — the
+   * in-memory `hasActiveSessionKey` and the `/users/me` field of the same name
+   * are neither chain-scoped. Once a key is activated on one chain, both
+   * `getUserDetails()` and the SDK's own `createSessionKey` guard report
+   * "active" on every other chain, so a deposit on a freshly-used chain runs
+   * without a valid session key and reverts. See [[zyfai-per-chain-session-key]].
+   *
+   * We keep our own per-(address, chainId) record of activated chains (in
+   * localStorage). On a miss we clear the SDK's global guard so
+   * `createSessionKey` actually signs and activates for THIS chain.
+   *
+   * Cost: on a chain we've never recorded (e.g. a key created on another device
+   * or a prior app version), this forces one `createSessionKey` — an extra
+   * wallet signature, idempotent on the backend. A prompt-free variant would
+   * read the session-validator module state on-chain instead of self-tracking.
+   */
+  async ensureSessionKey(address, chainId) {
+    if (wasSessionKeyActivated(address, chainId)) return;
+    const internals = this.sdk;
+    internals.hasActiveSessionKey = false;
+    await this.sdk.createSessionKey(address, chainId);
+    markSessionKeyActivated(address, chainId);
   }
   /** Connect + resolve smart wallet address for read operations. */
   async resolveSmartWallet(state, chainId) {
@@ -1007,9 +1065,7 @@ var ZyfaiAgent = class {
     await this.connectAuth(state, chainId);
     const validChainId = isValidChainId(chainId);
     const raw = await this.sdk.getUserDetails();
-    if (!raw.hasActiveSessionKey) {
-      await this.sdk.createSessionKey(this.getAddress(), validChainId);
-    }
+    await this.ensureSessionKey(this.getAddress(), validChainId);
     return mapUserProfile(raw, this.connectedAddress);
   }
   async ensureAutoSelectProtocols(state, chainId, asset) {
@@ -2662,31 +2718,47 @@ var storage2 = () => {
   }
 };
 var buildKey2 = (address, chainId) => `${KEY_PREFIX2}:${address.toLowerCase()}:${chainId}`;
+var memorySiwxSessions = /* @__PURE__ */ new Map();
 var readSiwxSession = (address, chainId) => {
+  if (typeof window === "undefined") return null;
+  const key = buildKey2(address, chainId);
   const store = storage2();
-  if (!store) return null;
-  const raw = store.getItem(buildKey2(address, chainId));
-  if (!raw) return null;
+  let raw = null;
   try {
-    return JSON.parse(raw);
+    raw = store?.getItem(key) ?? null;
   } catch {
-    store.removeItem(buildKey2(address, chainId));
-    return null;
+    raw = null;
+  }
+  if (raw) {
+    try {
+      return JSON.parse(raw);
+    } catch {
+      memorySiwxSessions.delete(key);
+      try {
+        store?.removeItem(key);
+      } catch {
+      }
+      return null;
+    }
   }
+  return memorySiwxSessions.get(key) ?? null;
 };
 var writeSiwxSession = (address, chainId, session) => {
+  if (typeof window === "undefined") return;
+  const key = buildKey2(address, chainId);
+  memorySiwxSessions.set(key, session);
   const store = storage2();
-  if (!store) return;
   try {
-    store.setItem(buildKey2(address, chainId), JSON.stringify(session));
+    store?.setItem(key, JSON.stringify(session));
   } catch {
   }
 };
 var clearSiwxSession = (address, chainId) => {
+  const key = buildKey2(address, chainId);
+  memorySiwxSessions.delete(key);
   const store = storage2();
-  if (!store) return;
   try {
-    store.removeItem(buildKey2(address, chainId));
+    store?.removeItem(key);
   } catch {
   }
 };

package/dist/index.js

@@ -518,36 +518,71 @@ var isJwtExpired = (token) => {
     return false;
   }
 };
+var memorySessions = /* @__PURE__ */ new Map();
+var isFreshSession = (session) => !!session && !!session.token && !isJwtExpired(session.token);
 var readSession = (address, chainId) => {
+  if (typeof window === "undefined") return null;
+  const key = buildKey(address, chainId);
   const store = storage();
-  if (!store) return null;
-  const raw = store.getItem(buildKey(address, chainId));
-  if (!raw) return null;
+  let raw = null;
   try {
-    const parsed = JSON.parse(raw);
-    if (!parsed.token || isJwtExpired(parsed.token)) {
-      store.removeItem(buildKey(address, chainId));
-      return null;
-    }
-    return parsed;
+    raw = store?.getItem(key) ?? null;
   } catch {
-    store.removeItem(buildKey(address, chainId));
+    raw = null;
+  }
+  if (raw) {
+    try {
+      const parsed = JSON.parse(raw);
+      if (isFreshSession(parsed)) return parsed;
+    } catch {
+    }
+    memorySessions.delete(key);
+    try {
+      store?.removeItem(key);
+    } catch {
+    }
     return null;
   }
+  const cached = memorySessions.get(key);
+  if (isFreshSession(cached)) return cached;
+  if (cached) memorySessions.delete(key);
+  return null;
 };
 var writeSession = (address, chainId, session) => {
+  if (typeof window === "undefined") return;
+  const key = buildKey(address, chainId);
+  memorySessions.set(key, session);
   const store = storage();
-  if (!store) return;
   try {
-    store.setItem(buildKey(address, chainId), JSON.stringify(session));
+    store?.setItem(key, JSON.stringify(session));
   } catch {
   }
 };
 var clearSession = (address, chainId) => {
+  const key = buildKey(address, chainId);
+  memorySessions.delete(key);
+  const store = storage();
+  try {
+    store?.removeItem(key);
+  } catch {
+  }
+};
+var SESSION_KEY_PREFIX = "owney.zyfai.sessionkey";
+var buildSessionKeyKey = (address, chainId) => `${SESSION_KEY_PREFIX}:${address.toLowerCase()}:${chainId}`;
+var wasSessionKeyActivated = (address, chainId) => {
+  const store = storage();
+  if (!store) return false;
+  try {
+    return store.getItem(buildSessionKeyKey(address, chainId)) === "1";
+  } catch {
+    return false;
+  }
+};
+var markSessionKeyActivated = (address, chainId) => {
   const store = storage();
   if (!store) return;
   try {
-    store.removeItem(buildKey(address, chainId));
+    store.setItem(buildSessionKeyKey(address, chainId), "1");
   } catch {
   }
 };
@@ -804,7 +839,7 @@ var ZyfaiAgent = class {
     const wallet = await this.sdk.getSmartWalletAddress(address, validChainId);
     this.smartWalletCache.set(`${address}_${validChainId}`, wallet.address);
     if (!wallet.isDeployed) {
-      await this.sdk.deploySafe(address, validChainId, "aggressive", true);
+      await this.sdk.deploySafe(address, validChainId, "aggressive", false);
       try {
         if (validChainId === 42161) {
           await this.sdk.updateUserProfile({
@@ -822,10 +857,33 @@ var ZyfaiAgent = class {
         );
       }
     }
-    const user = await this.sdk.getUserDetails();
-    if (!user.hasActiveSessionKey) {
-      await this.sdk.createSessionKey(address, validChainId);
-    }
+    await this.ensureSessionKey(address, validChainId);
+  }
+  /**
+   * Ensures a session key is active for THIS chain.
+   *
+   * The Zyfai SDK tracks session-key state with a single global boolean — the
+   * in-memory `hasActiveSessionKey` and the `/users/me` field of the same name
+   * are neither chain-scoped. Once a key is activated on one chain, both
+   * `getUserDetails()` and the SDK's own `createSessionKey` guard report
+   * "active" on every other chain, so a deposit on a freshly-used chain runs
+   * without a valid session key and reverts. See [[zyfai-per-chain-session-key]].
+   *
+   * We keep our own per-(address, chainId) record of activated chains (in
+   * localStorage). On a miss we clear the SDK's global guard so
+   * `createSessionKey` actually signs and activates for THIS chain.
+   *
+   * Cost: on a chain we've never recorded (e.g. a key created on another device
+   * or a prior app version), this forces one `createSessionKey` — an extra
+   * wallet signature, idempotent on the backend. A prompt-free variant would
+   * read the session-validator module state on-chain instead of self-tracking.
+   */
+  async ensureSessionKey(address, chainId) {
+    if (wasSessionKeyActivated(address, chainId)) return;
+    const internals = this.sdk;
+    internals.hasActiveSessionKey = false;
+    await this.sdk.createSessionKey(address, chainId);
+    markSessionKeyActivated(address, chainId);
   }
   /** Connect + resolve smart wallet address for read operations. */
   async resolveSmartWallet(state, chainId) {
@@ -975,9 +1033,7 @@ var ZyfaiAgent = class {
     await this.connectAuth(state, chainId);
     const validChainId = isValidChainId(chainId);
     const raw = await this.sdk.getUserDetails();
-    if (!raw.hasActiveSessionKey) {
-      await this.sdk.createSessionKey(this.getAddress(), validChainId);
-    }
+    await this.ensureSessionKey(this.getAddress(), validChainId);
     return mapUserProfile(raw, this.connectedAddress);
   }
   async ensureAutoSelectProtocols(state, chainId, asset) {
@@ -2634,31 +2690,47 @@ var storage2 = () => {
   }
 };
 var buildKey2 = (address, chainId) => `${KEY_PREFIX2}:${address.toLowerCase()}:${chainId}`;
+var memorySiwxSessions = /* @__PURE__ */ new Map();
 var readSiwxSession = (address, chainId) => {
+  if (typeof window === "undefined") return null;
+  const key = buildKey2(address, chainId);
   const store = storage2();
-  if (!store) return null;
-  const raw = store.getItem(buildKey2(address, chainId));
-  if (!raw) return null;
+  let raw = null;
   try {
-    return JSON.parse(raw);
+    raw = store?.getItem(key) ?? null;
   } catch {
-    store.removeItem(buildKey2(address, chainId));
-    return null;
+    raw = null;
+  }
+  if (raw) {
+    try {
+      return JSON.parse(raw);
+    } catch {
+      memorySiwxSessions.delete(key);
+      try {
+        store?.removeItem(key);
+      } catch {
+      }
+      return null;
+    }
   }
+  return memorySiwxSessions.get(key) ?? null;
 };
 var writeSiwxSession = (address, chainId, session) => {
+  if (typeof window === "undefined") return;
+  const key = buildKey2(address, chainId);
+  memorySiwxSessions.set(key, session);
   const store = storage2();
-  if (!store) return;
   try {
-    store.setItem(buildKey2(address, chainId), JSON.stringify(session));
+    store?.setItem(key, JSON.stringify(session));
   } catch {
   }
 };
 var clearSiwxSession = (address, chainId) => {
+  const key = buildKey2(address, chainId);
+  memorySiwxSessions.delete(key);
   const store = storage2();
-  if (!store) return;
   try {
-    store.removeItem(buildKey2(address, chainId));
+    store?.removeItem(key);
   } catch {
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owney/sdk",
-  "version": "0.6.6-beta.3",
+  "version": "0.6.6-beta.5",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",