@unicitylabs/sphere-sdk 0.8.0-dev.2 → 0.8.0-dev.4

package/dist/core/index.cjs

@@ -7280,6 +7280,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).
@@ -7287,9 +7300,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);
@@ -7312,9 +7326,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 {
     }
@@ -9475,7 +9490,8 @@ var PaymentsModule = class _PaymentsModule {
     try {
       const peerInfo = await this.deps.transport.resolve?.(request.recipient) ?? null;
       const recipientPubkey = this.resolveTransportPubkey(request.recipient, peerInfo);
-      const recipientAddress = await this.resolveRecipientAddress(request.recipient, request.addressMode, peerInfo);
+      const willUseEngine = !!(this.deps?.tokenEngine && peerInfo?.chainPubkey);
+      const recipientAddress = willUseEngine ? null : await this.resolveRecipientAddress(request.recipient, request.addressMode, peerInfo);
       const signingService = await this.createSigningService();
       const stClient = this.deps.oracle.getStateTransitionClient?.();
       if (!stClient) {
@@ -9599,6 +9615,7 @@ var PaymentsModule = class _PaymentsModule {
             splitPlan.remainderAmount,
             splitPlan.coinId,
             recipientAddress,
+            // v1 path only — non-null (would have thrown in resolve otherwise)
             onChainMessage
           );
           committedOnChainTokenIds.add(splitPlan.tokenToSplit.uiToken.id);
@@ -9679,6 +9696,7 @@ var PaymentsModule = class _PaymentsModule {
             splitPlan.remainderAmount,
             splitPlan.coinId,
             recipientAddress,
+            // v1 path only — non-null (would have thrown in resolve otherwise)
             {
               memo: request.memo,
               message: onChainMessage,
@@ -12675,7 +12693,7 @@ var PaymentsModule = class _PaymentsModule {
     const nametag = recipient.startsWith("@") ? recipient.slice(1) : info.nametag || recipient;
     if (!info.directAddress) {
       throw new SphereError(
-        `"${nametag}" has no DirectAddress \u2014 the recipient must publish a key-based identity binding.`,
+        `"${nametag}" has no published identity \u2014 the recipient must register a Unicity ID (publish a key-based identity binding) before they can receive payments.`,
         "INVALID_RECIPIENT"
       );
     }
@@ -28058,6 +28076,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,
@@ -28092,6 +28112,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,
@@ -28179,6 +28201,12 @@ var Sphere = class _Sphere {
    * This method ensures the main bundle's TokenRegistry is properly configured.
    */
   static configureTokenRegistry(storage, network) {
+    if (!network) {
+      logger.warn(
+        "Sphere",
+        "configureTokenRegistry: no network provided \u2014 defaulting to testnet. Pass options.network to avoid loading the wrong-network registry."
+      );
+    }
     const netConfig = network ? NETWORKS[network] : NETWORKS.testnet;
     TokenRegistry.configure({ remoteUrl: netConfig.tokenRegistryUrl, storage });
   }
@@ -28330,7 +28358,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);