@unicitylabs/sphere-sdk 0.8.0-dev.3 → 0.8.0-dev.5

package/dist/core/index.d.cts

@@ -6728,13 +6728,14 @@ type DecryptionProgressCallback = (iteration: number, total: number) => Promise<
  *
  * const storage = createLocalStorageProvider();
  * const transport = createNostrTransportProvider();
- * const oracle = createUnicityAggregatorProvider({ url: '/rpc' });
+ * const oracle = createUnicityAggregatorProvider({ url: '/rpc', network: 'testnet2' });
  *
  * // Option 1: Unified init (recommended)
  * const { sphere, created, generatedMnemonic } = await Sphere.init({
  *   storage,
  *   transport,
  *   oracle,
+ *   network: 'testnet2', // required: selects registry/trustbase/aggregator
  *   mnemonic: 'your twelve words...', // optional - will load if wallet exists
  *   autoGenerate: true, // generate new mnemonic if needed
  * });
@@ -6745,9 +6746,9 @@ type DecryptionProgressCallback = (iteration: number, total: number) => Promise<
  *
  * // Option 2: Manual create/load
  * if (await Sphere.exists(storage)) {
- *   const sphere = await Sphere.load({ storage, transport, oracle });
+ *   const sphere = await Sphere.load({ storage, transport, oracle, network: 'testnet2' });
  * } else {
- *   const sphere = await Sphere.create({ mnemonic, storage, transport, oracle });
+ *   const sphere = await Sphere.create({ mnemonic, storage, transport, oracle, network: 'testnet2' });
  * }
  *
  * // Use the wallet
@@ -6878,6 +6879,10 @@ interface SphereImportOptions {
     derivationMode?: DerivationMode;
     /** Optional nametag to register for this wallet (e.g., 'alice' for @alice). Token is auto-minted. */
     nametag?: string;
+    /** Network this wallet runs on — drives TokenRegistry config. Without it, import
+     *  falls back to NETWORKS.testnet and a non-testnet wallet loads the wrong registry
+     *  (symbols resolve via baked values but icons/metadata don't) until a reload. */
+    network?: NetworkType;
     /** Storage provider instance */
     storage: StorageProvider;
     /** Optional token storage provider */

package/dist/core/index.d.ts

@@ -6728,13 +6728,14 @@ type DecryptionProgressCallback = (iteration: number, total: number) => Promise<
  *
  * const storage = createLocalStorageProvider();
  * const transport = createNostrTransportProvider();
- * const oracle = createUnicityAggregatorProvider({ url: '/rpc' });
+ * const oracle = createUnicityAggregatorProvider({ url: '/rpc', network: 'testnet2' });
  *
  * // Option 1: Unified init (recommended)
  * const { sphere, created, generatedMnemonic } = await Sphere.init({
  *   storage,
  *   transport,
  *   oracle,
+ *   network: 'testnet2', // required: selects registry/trustbase/aggregator
  *   mnemonic: 'your twelve words...', // optional - will load if wallet exists
  *   autoGenerate: true, // generate new mnemonic if needed
  * });
@@ -6745,9 +6746,9 @@ type DecryptionProgressCallback = (iteration: number, total: number) => Promise<
  *
  * // Option 2: Manual create/load
  * if (await Sphere.exists(storage)) {
- *   const sphere = await Sphere.load({ storage, transport, oracle });
+ *   const sphere = await Sphere.load({ storage, transport, oracle, network: 'testnet2' });
  * } else {
- *   const sphere = await Sphere.create({ mnemonic, storage, transport, oracle });
+ *   const sphere = await Sphere.create({ mnemonic, storage, transport, oracle, network: 'testnet2' });
  * }
  *
  * // Use the wallet
@@ -6878,6 +6879,10 @@ interface SphereImportOptions {
     derivationMode?: DerivationMode;
     /** Optional nametag to register for this wallet (e.g., 'alice' for @alice). Token is auto-minted. */
     nametag?: string;
+    /** Network this wallet runs on — drives TokenRegistry config. Without it, import
+     *  falls back to NETWORKS.testnet and a non-testnet wallet loads the wrong registry
+     *  (symbols resolve via baked values but icons/metadata don't) until a reload. */
+    network?: NetworkType;
     /** Storage provider instance */
     storage: StorageProvider;
     /** Optional token storage provider */

package/dist/core/index.js

@@ -7199,6 +7199,19 @@ var TokenRegistry = class _TokenRegistry {
   // ===========================================================================
   // Cache (StorageProvider)
   // ===========================================================================
+  /**
+   * Per-network cache keys. The registry cache MUST be namespaced by remoteUrl:
+   * testnet and testnet2 ship DIFFERENT coinIds for the same symbol, so a single
+   * global key let a stale testnet snapshot be served for a testnet2 request —
+   * wrong/missing icons AND self-mint resolving the wrong-network coinId. Keying
+   * by remoteUrl isolates the snapshots so a network can never read another's.
+   */
+  cacheKeys() {
+    const base = STORAGE_KEYS_GLOBAL.TOKEN_REGISTRY_CACHE;
+    const baseTs = STORAGE_KEYS_GLOBAL.TOKEN_REGISTRY_CACHE_TS;
+    if (!this.remoteUrl) return { data: base, ts: baseTs };
+    return { data: `${base}:${this.remoteUrl}`, ts: `${baseTs}:${this.remoteUrl}` };
+  }
   /**
    * Load definitions from StorageProvider cache.
    * Only applies if cache exists and is fresh (within refreshIntervalMs).
@@ -7206,9 +7219,10 @@ var TokenRegistry = class _TokenRegistry {
   async loadFromCache() {
     if (!this.storage) return false;
     try {
+      const { data: dataKey, ts: tsKey } = this.cacheKeys();
       const [cached, cachedTs] = await Promise.all([
-        this.storage.get(STORAGE_KEYS_GLOBAL.TOKEN_REGISTRY_CACHE),
-        this.storage.get(STORAGE_KEYS_GLOBAL.TOKEN_REGISTRY_CACHE_TS)
+        this.storage.get(dataKey),
+        this.storage.get(tsKey)
       ]);
       if (!cached || !cachedTs) return false;
       const ts = parseInt(cachedTs, 10);
@@ -7231,9 +7245,10 @@ var TokenRegistry = class _TokenRegistry {
   async saveToCache(definitions) {
     if (!this.storage) return;
     try {
+      const { data: dataKey, ts: tsKey } = this.cacheKeys();
       await Promise.all([
-        this.storage.set(STORAGE_KEYS_GLOBAL.TOKEN_REGISTRY_CACHE, JSON.stringify(definitions)),
-        this.storage.set(STORAGE_KEYS_GLOBAL.TOKEN_REGISTRY_CACHE_TS, String(Date.now()))
+        this.storage.set(dataKey, JSON.stringify(definitions)),
+        this.storage.set(tsKey, String(Date.now()))
       ]);
     } catch {
     }
@@ -27984,6 +27999,8 @@ var Sphere = class _Sphere {
     const walletExists = await _Sphere.exists(options.storage);
     if (walletExists) {
       const sphere2 = await _Sphere.load({
+        network: options.network,
+        // forward network so load's configureTokenRegistry uses it (not the testnet default)
         storage: options.storage,
         transport: options.transport,
         oracle: options.oracle,
@@ -28018,6 +28035,8 @@ var Sphere = class _Sphere {
     }
     const sphere = await _Sphere.create({
       mnemonic,
+      network: options.network,
+      // forward network so create's configureTokenRegistry uses it (not the testnet default)
       storage: options.storage,
       transport: options.transport,
       oracle: options.oracle,
@@ -28052,13 +28071,14 @@ var Sphere = class _Sphere {
    */
   static resolveGroupChatConfig(config, network) {
     if (!config) return void 0;
+    if (!network) {
+      throw new SphereError("network is required to resolve group chat relays.", "INVALID_CONFIG");
+    }
     if (config === true) {
-      const netConfig = network ? NETWORKS[network] : NETWORKS.mainnet;
-      return { relays: [...netConfig.groupRelays] };
+      return { relays: [...NETWORKS[network].groupRelays] };
     }
     if (!config.relays || config.relays.length === 0) {
-      const netConfig = network ? NETWORKS[network] : NETWORKS.mainnet;
-      return { ...config, relays: [...netConfig.groupRelays] };
+      return { ...config, relays: [...NETWORKS[network].groupRelays] };
     }
     return config;
   }
@@ -28105,8 +28125,13 @@ var Sphere = class _Sphere {
    * This method ensures the main bundle's TokenRegistry is properly configured.
    */
   static configureTokenRegistry(storage, network) {
-    const netConfig = network ? NETWORKS[network] : NETWORKS.testnet;
-    TokenRegistry.configure({ remoteUrl: netConfig.tokenRegistryUrl, storage });
+    if (!network) {
+      throw new SphereError(
+        "network is required to configure the TokenRegistry. Every Sphere entry point must forward options.network.",
+        "INVALID_CONFIG"
+      );
+    }
+    TokenRegistry.configure({ remoteUrl: NETWORKS[network].tokenRegistryUrl, storage });
   }
   /**
    * Create new wallet with mnemonic
@@ -28256,7 +28281,8 @@ var Sphere = class _Sphere {
       await options.storage.connect();
       logger.debug("Sphere", "Storage reconnected");
     }
-    const groupChatConfig = _Sphere.resolveGroupChatConfig(options.groupChat);
+    _Sphere.configureTokenRegistry(options.storage, options.network);
+    const groupChatConfig = _Sphere.resolveGroupChatConfig(options.groupChat, options.network);
     const marketConfig = _Sphere.resolveMarketConfig(options.market);
     const accountingConfig = _Sphere.resolveAccountingConfig(options.accounting);
     const swapConfig = _Sphere.resolveSwapConfig(options.swap);