@elisym/sdk 0.10.0 → 0.10.2

package/dist/{assets-CMf-v55Z.d.cts → assets-C-nzSYD4.d.cts}

@@ -52,7 +52,11 @@ declare function resolveAssetFromPaymentRequest(request: {
  * call-sites safe).
  */
 declare function parseAssetAmount(asset: Asset, human: string): bigint;
-/** Format raw subunits back to `"<whole>.<frac> <SYMBOL>"`. Keeps all `decimals` digits. */
+/**
+ * Format raw subunits back to `"<value> <SYMBOL>"`. Trailing zeros and a bare
+ * trailing dot are stripped, so 0.01 USDC renders as `"0.01 USDC"` rather than
+ * `"0.010000 USDC"`.
+ */
 declare function formatAssetAmount(asset: Asset, raw: bigint): string;
 
 export { type Asset as A, type Chain as C, KNOWN_ASSETS as K, NATIVE_SOL as N, USDC_SOLANA_DEVNET as U, assetByKey as a, assetKey as b, resolveKnownAsset as c, formatAssetAmount as f, parseAssetAmount as p, resolveAssetFromPaymentRequest as r };

package/dist/{assets-CMf-v55Z.d.ts → assets-C-nzSYD4.d.ts}

@@ -52,7 +52,11 @@ declare function resolveAssetFromPaymentRequest(request: {
  * call-sites safe).
  */
 declare function parseAssetAmount(asset: Asset, human: string): bigint;
-/** Format raw subunits back to `"<whole>.<frac> <SYMBOL>"`. Keeps all `decimals` digits. */
+/**
+ * Format raw subunits back to `"<value> <SYMBOL>"`. Trailing zeros and a bare
+ * trailing dot are stripped, so 0.01 USDC renders as `"0.01 USDC"` rather than
+ * `"0.010000 USDC"`.
+ */
 declare function formatAssetAmount(asset: Asset, raw: bigint): string;
 
 export { type Asset as A, type Chain as C, KNOWN_ASSETS as K, NATIVE_SOL as N, USDC_SOLANA_DEVNET as U, assetByKey as a, assetKey as b, resolveKnownAsset as c, formatAssetAmount as f, parseAssetAmount as p, resolveAssetFromPaymentRequest as r };

package/dist/index.cjs

@@ -3,7 +3,7 @@
 var system = require('@solana-program/system');
 var token = require('@solana-program/token');
 var kit = require('@solana/kit');
-var Decimal2 = require('decimal.js-light');
+var Decimal3 = require('decimal.js-light');
 var zod = require('zod');
 var nostrTools = require('nostr-tools');
 var nip44 = require('nostr-tools/nip44');
@@ -28,7 +28,7 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var Decimal2__default = /*#__PURE__*/_interopDefault(Decimal2);
+var Decimal3__default = /*#__PURE__*/_interopDefault(Decimal3);
 var nip44__namespace = /*#__PURE__*/_interopNamespace(nip44);
 
 // src/constants.ts
@@ -176,8 +176,6 @@ async function getProtocolConfig(rpc, programId, options) {
     );
   }
 }
-
-// src/payment/assets.ts
 var NATIVE_SOL = {
   chain: "solana",
   token: "sol",
@@ -258,16 +256,10 @@ function parseAssetAmount(asset, human) {
   }
   return raw;
 }
+var FormatDecimal = Decimal3__default.default.clone({ toExpNeg: -100, toExpPos: 100, precision: 50 });
 function formatAssetAmount(asset, raw) {
-  const sign = raw < 0n ? "-" : "";
-  const abs = raw < 0n ? -raw : raw;
-  const unit = 10n ** BigInt(asset.decimals);
-  const whole = abs / unit;
-  const frac = abs % unit;
-  if (asset.decimals === 0) {
-    return `${sign}${whole} ${asset.symbol}`;
-  }
-  return `${sign}${whole}.${frac.toString().padStart(asset.decimals, "0")} ${asset.symbol}`;
+  const value = new FormatDecimal(raw.toString()).div(new FormatDecimal(10).pow(asset.decimals));
+  return `${value.toString()} ${asset.symbol}`;
 }
 var BPS_DENOMINATOR = 1e4;
 function assertLamports(value, field) {
@@ -285,7 +277,7 @@ function calculateProtocolFee(amount, feeBps) {
   if (amount === 0 || feeBps === 0) {
     return 0;
   }
-  return new Decimal2__default.default(amount).mul(feeBps).div(BPS_DENOMINATOR).toDecimalPlaces(0, Decimal2__default.default.ROUND_CEIL).toNumber();
+  return new Decimal3__default.default(amount).mul(feeBps).div(BPS_DENOMINATOR).toDecimalPlaces(0, Decimal3__default.default.ROUND_CEIL).toNumber();
 }
 function validateExpiry(createdAt, expirySecs) {
   if (!Number.isInteger(createdAt) || createdAt <= 0) {
@@ -1019,95 +1011,9 @@ async function createPaymentRequestWithOnchainConfig(rpc, programId, recipient,
     options
   );
 }
-var NEGATIVE_CACHE_TTL_MS = 6e4;
-var verifyCache = /* @__PURE__ */ new Map();
-function clearQuickVerifyCache() {
-  verifyCache.clear();
-}
-async function verifyJobPaymentQuick(rpc, txSignature, expectedRecipient) {
-  if (!txSignature) {
-    return { verified: false, txSignature: "", reason: "invalid_input" };
-  }
-  if (!expectedRecipient || !kit.isAddress(expectedRecipient)) {
-    return { verified: false, txSignature, reason: "invalid_input" };
-  }
-  const cacheKey2 = `${txSignature}:${expectedRecipient}`;
-  const cached = verifyCache.get(cacheKey2);
-  if (cached) {
-    if (cached.result.verified) {
-      return cached.result;
-    }
-    if (Date.now() - cached.cachedAt < NEGATIVE_CACHE_TTL_MS) {
-      return cached.result;
-    }
-  }
-  const result = await doVerifyOnce(rpc, txSignature, expectedRecipient);
-  verifyCache.set(cacheKey2, { result, cachedAt: Date.now() });
-  return result;
-}
-async function doVerifyOnce(rpc, txSignature, expectedRecipient) {
-  const sigStr = txSignature;
-  if (!rpc || typeof rpc.getTransaction !== "function") {
-    return { verified: false, txSignature: sigStr, reason: "rpc_error" };
-  }
-  let tx;
-  try {
-    tx = await rpc.getTransaction(txSignature, {
-      commitment: "confirmed",
-      encoding: "json",
-      maxSupportedTransactionVersion: 0
-    }).send();
-  } catch {
-    return { verified: false, txSignature: sigStr, reason: "rpc_error" };
-  }
-  if (!tx) {
-    return { verified: false, txSignature: sigStr, reason: "not_found" };
-  }
-  if (!tx.meta || tx.meta.err) {
-    return { verified: false, txSignature: sigStr, reason: "tx_failed" };
-  }
-  const accountKeys = tx.transaction.message.accountKeys;
-  const recipientStr = expectedRecipient;
-  const recipientIdx = accountKeys.indexOf(recipientStr);
-  if (recipientIdx !== -1) {
-    const preBalances = tx.meta.preBalances;
-    const postBalances = tx.meta.postBalances;
-    if (preBalances && postBalances) {
-      const pre = preBalances[recipientIdx];
-      const post = postBalances[recipientIdx];
-      if (pre !== void 0 && post !== void 0) {
-        const delta = BigInt(post) - BigInt(pre);
-        if (delta > 0n) {
-          return { verified: true, txSignature: sigStr };
-        }
-      }
-    }
-  }
-  const postTokenBalances = tx.meta.postTokenBalances;
-  const preTokenBalances = tx.meta.preTokenBalances;
-  if (postTokenBalances) {
-    for (const post of postTokenBalances) {
-      if (post.owner !== recipientStr) {
-        continue;
-      }
-      const pre = preTokenBalances?.find(
-        (entry) => entry.owner === recipientStr && entry.mint === post.mint
-      );
-      const preAmount = pre ? BigInt(pre.uiTokenAmount.amount) : 0n;
-      const postAmount = BigInt(post.uiTokenAmount.amount);
-      if (postAmount > preAmount) {
-        return { verified: true, txSignature: sigStr };
-      }
-    }
-  }
-  return { verified: false, txSignature: sigStr, reason: "recipient_mismatch" };
-}
-
-// src/services/discovery.ts
 var RANKING_ACTIVITY_WINDOW_SECS = 30 * 24 * 60 * 60;
 var RANKING_BUCKET_SIZE_SECS = 60;
 var COLD_START_BUCKET = -Infinity;
-var MAX_PAID_CANDIDATES_PER_AGENT = 5;
 function toDTag(name) {
   const tag = name.toLowerCase().replace(/[^a-z0-9\s-]/g, (ch) => "_" + ch.charCodeAt(0).toString(16).padStart(2, "0")).replace(/\s+/g, "-").replace(/^-+|-+$/g, "");
   if (!tag) {
@@ -1231,37 +1137,9 @@ function buildAgentsFromEvents(events, network) {
   }
   return agentMap;
 }
-function pickSolanaAddress(agent) {
-  for (const card of agent.cards) {
-    const addr = card.payment?.address;
-    if (card.payment?.chain === "solana" && typeof addr === "string" && addr.length > 0) {
-      return addr;
-    }
-  }
-  return null;
-}
-async function verifyNewestPaidCandidate(rpc, recipient, candidatesNewestFirst) {
-  const settled = await Promise.allSettled(
-    candidatesNewestFirst.map(
-      (candidate) => verifyJobPaymentQuick(rpc, candidate.txSignature, recipient)
-    )
-  );
-  for (let i = 0; i < settled.length; i++) {
-    const entry = settled[i];
-    if (entry?.status === "fulfilled" && entry.value.verified) {
-      return candidatesNewestFirst[i] ?? null;
-    }
-  }
-  return null;
-}
 var DiscoveryService = class {
-  constructor(pool, defaultRpc) {
+  constructor(pool) {
     this.pool = pool;
-    this.defaultRpc = defaultRpc;
-  }
-  /** Configure the Solana RPC used for on-chain payment verification in `fetchAgents`. */
-  setRpc(rpc) {
-    this.defaultRpc = rpc;
   }
   /** Count elisym agents (kind:31990 with "elisym" tag). */
   async fetchAllAgentCount() {
@@ -1350,20 +1228,26 @@ var DiscoveryService = class {
     return agents;
   }
   /**
-   * Fetch elisym agents filtered by network, ranked by verified paid-job recency.
+   * Fetch elisym agents filtered by network, ranked by paid-job recency and
+   * positive-feedback rate.
    *
    * Ranking algorithm:
-   * 1. Bucket each agent into 1-minute slots by `lastPaidJobAt` (last on-chain
-   *    verified payment). Cold-start agents (no verified paid job) go into a
+   * 1. Bucket each agent into 1-minute slots by `lastPaidJobAt` (newest
+   *    `payment-completed` feedback timestamp). Cold-start agents go into a
    *    sentinel bucket below all populated buckets.
    * 2. Within a bucket, sort by positive review rate descending.
    * 3. Tiebreak by raw `lastPaidJobAt`, then `lastSeen` (NIP-89 freshness).
    *
-   * On-chain verification uses {@link verifyJobPaymentQuick} - one-shot, cached.
-   * If `rpc` is not configured, all agents fall through to cold-start and order
-   * is determined by `lastSeen` only.
+   * NOTE: We trust the `payment-completed` feedback timestamp directly; we do
+   * not verify the embedded `tx` signature on-chain. Public Solana devnet RPC
+   * rate-limits trivially exceed what discovery needs (N agents * up-to-5
+   * candidates), and the resulting 429s blocked discovery entirely. This
+   * means a malicious customer can publish a fake `payment-completed` to lift
+   * an agent's ranking. Acceptable trade-off for devnet / MVP; tighten via
+   * recipient-tied checks when the network moves to mainnet with a paid RPC
+   * provider.
    */
-  async fetchAgents(network = "devnet", limit, rpcOverride) {
+  async fetchAgents(network = "devnet", limit) {
     const filter = {
       kinds: [KIND_APP_HANDLER],
       "#t": ["elisym"]
@@ -1412,7 +1296,6 @@ var DiscoveryService = class {
         agent.lastSeen = ev.created_at;
       }
     }
-    const paidCandidates = /* @__PURE__ */ new Map();
     for (const ev of feedbackEvents) {
       if (!nostrTools.verifyEvent(ev)) {
         continue;
@@ -1439,33 +1322,12 @@ var DiscoveryService = class {
       const txTag = ev.tags.find((t) => t[0] === "tx");
       const txSignature = txTag?.[1];
       if (status === "payment-completed" && typeof txSignature === "string" && txSignature) {
-        const list = paidCandidates.get(targetPubkey);
-        const candidate = { txSignature, createdAt: ev.created_at };
-        if (list) {
-          list.push(candidate);
-        } else {
-          paidCandidates.set(targetPubkey, [candidate]);
+        if (!agent.lastPaidJobAt || ev.created_at > agent.lastPaidJobAt) {
+          agent.lastPaidJobAt = ev.created_at;
+          agent.lastPaidJobTx = txSignature;
         }
       }
     }
-    const rpc = rpcOverride ?? this.defaultRpc;
-    if (rpc && paidCandidates.size > 0) {
-      const perAgent = Array.from(paidCandidates.entries()).map(([agentPubkey, list]) => {
-        const agent = agentMap.get(agentPubkey);
-        const recipient = agent ? pickSolanaAddress(agent) : null;
-        if (!agent || !recipient) {
-          return Promise.resolve();
-        }
-        const ordered = [...list].sort((a, b) => b.createdAt - a.createdAt).slice(0, MAX_PAID_CANDIDATES_PER_AGENT);
-        return verifyNewestPaidCandidate(rpc, recipient, ordered).then((winner) => {
-          if (winner) {
-            agent.lastPaidJobAt = winner.createdAt;
-            agent.lastPaidJobTx = winner.txSignature;
-          }
-        });
-      });
-      await Promise.all(perAgent);
-    }
     agents.sort(compareAgentsByRank);
     return agents;
   }
@@ -2165,6 +2027,7 @@ var MarketplaceService = class {
       let status = "processing";
       let amount;
       let txHash;
+      let asset;
       if (result) {
         status = "success";
         const amtTag = result.tags.find((t) => t[0] === "amount");
@@ -2173,9 +2036,18 @@ var MarketplaceService = class {
       const allFeedbacksForReq = feedbacksByRequestId.get(req.id) ?? [];
       for (const fb of allFeedbacksForReq) {
         const txTag = fb.tags.find((t) => t[0] === "tx");
-        if (txTag?.[1]) {
+        if (txTag?.[1] && !txHash) {
           txHash = txTag[1];
-          break;
+        }
+        if (!asset) {
+          const amtTag = fb.tags.find((t) => t[0] === "amount");
+          const requestJson = amtTag?.[2];
+          if (requestJson) {
+            const parsed = parsePaymentRequest(requestJson);
+            if (parsed.ok && parsed.data.asset) {
+              asset = parsed.data.asset;
+            }
+          }
         }
       }
       if (feedback) {
@@ -2204,6 +2076,7 @@ var MarketplaceService = class {
         resultEventId: result?.id,
         amount,
         txHash,
+        asset,
         createdAt: req.created_at
       });
     }
@@ -2814,7 +2687,7 @@ var ElisymClient = class {
   payment;
   constructor(config = {}) {
     this.pool = new NostrPool(config.relays ?? RELAYS);
-    this.discovery = new DiscoveryService(this.pool, config.rpc);
+    this.discovery = new DiscoveryService(this.pool);
     this.marketplace = new MarketplaceService(this.pool);
     this.ping = new PingService(this.pool);
     this.media = new MediaService(config.uploadUrl);
@@ -2942,6 +2815,89 @@ function lamportsToSol(lamports) {
   const frac = lamports % LAMPORTS_PER_SOL2;
   return `${whole}.${frac.toString().padStart(9, "0")}`;
 }
+var NEGATIVE_CACHE_TTL_MS = 6e4;
+var verifyCache = /* @__PURE__ */ new Map();
+function clearQuickVerifyCache() {
+  verifyCache.clear();
+}
+async function verifyJobPaymentQuick(rpc, txSignature, expectedRecipient) {
+  if (!txSignature) {
+    return { verified: false, txSignature: "", reason: "invalid_input" };
+  }
+  if (!expectedRecipient || !kit.isAddress(expectedRecipient)) {
+    return { verified: false, txSignature, reason: "invalid_input" };
+  }
+  const cacheKey2 = `${txSignature}:${expectedRecipient}`;
+  const cached = verifyCache.get(cacheKey2);
+  if (cached) {
+    if (cached.result.verified) {
+      return cached.result;
+    }
+    if (Date.now() - cached.cachedAt < NEGATIVE_CACHE_TTL_MS) {
+      return cached.result;
+    }
+  }
+  const result = await doVerifyOnce(rpc, txSignature, expectedRecipient);
+  verifyCache.set(cacheKey2, { result, cachedAt: Date.now() });
+  return result;
+}
+async function doVerifyOnce(rpc, txSignature, expectedRecipient) {
+  const sigStr = txSignature;
+  if (!rpc || typeof rpc.getTransaction !== "function") {
+    return { verified: false, txSignature: sigStr, reason: "rpc_error" };
+  }
+  let tx;
+  try {
+    tx = await rpc.getTransaction(txSignature, {
+      commitment: "confirmed",
+      encoding: "json",
+      maxSupportedTransactionVersion: 0
+    }).send();
+  } catch {
+    return { verified: false, txSignature: sigStr, reason: "rpc_error" };
+  }
+  if (!tx) {
+    return { verified: false, txSignature: sigStr, reason: "not_found" };
+  }
+  if (!tx.meta || tx.meta.err) {
+    return { verified: false, txSignature: sigStr, reason: "tx_failed" };
+  }
+  const accountKeys = tx.transaction.message.accountKeys;
+  const recipientStr = expectedRecipient;
+  const recipientIdx = accountKeys.indexOf(recipientStr);
+  if (recipientIdx !== -1) {
+    const preBalances = tx.meta.preBalances;
+    const postBalances = tx.meta.postBalances;
+    if (preBalances && postBalances) {
+      const pre = preBalances[recipientIdx];
+      const post = postBalances[recipientIdx];
+      if (pre !== void 0 && post !== void 0) {
+        const delta = BigInt(post) - BigInt(pre);
+        if (delta > 0n) {
+          return { verified: true, txSignature: sigStr };
+        }
+      }
+    }
+  }
+  const postTokenBalances = tx.meta.postTokenBalances;
+  const preTokenBalances = tx.meta.preTokenBalances;
+  if (postTokenBalances) {
+    for (const post of postTokenBalances) {
+      if (post.owner !== recipientStr) {
+        continue;
+      }
+      const pre = preTokenBalances?.find(
+        (entry) => entry.owner === recipientStr && entry.mint === post.mint
+      );
+      const preAmount = pre ? BigInt(pre.uiTokenAmount.amount) : 0n;
+      const postAmount = BigInt(post.uiTokenAmount.amount);
+      if (postAmount > preAmount) {
+        return { verified: true, txSignature: sigStr };
+      }
+    }
+  }
+  return { verified: false, txSignature: sigStr, reason: "recipient_mismatch" };
+}
 var SessionSpendLimitEntrySchema = zod.z.object({
   chain: zod.z.enum(["solana"]),
   token: zod.z.string().min(1).max(16).regex(/^[a-z0-9]+$/, "token must be lowercase alphanumeric"),
@@ -2952,7 +2908,7 @@ var GlobalConfigSchema = zod.z.object({
   session_spend_limits: zod.z.array(SessionSpendLimitEntrySchema).max(16).optional()
 }).strict();
 function formatSol(lamports) {
-  const sol = new Decimal2__default.default(lamports).div(LAMPORTS_PER_SOL);
+  const sol = new Decimal3__default.default(lamports).div(LAMPORTS_PER_SOL);
   if (sol.gte(1e6)) {
     return `${sol.idiv(1e6)}m SOL`;
   }
@@ -2966,12 +2922,12 @@ function compactSol(sol) {
     return "0";
   }
   if (sol.gte(1e3)) {
-    return sol.toDecimalPlaces(0, Decimal2__default.default.ROUND_FLOOR).toString();
+    return sol.toDecimalPlaces(0, Decimal3__default.default.ROUND_FLOOR).toString();
   }
   const maxFrac = 9;
   for (let d = 1; d <= maxFrac; d++) {
     const s = sol.toFixed(d);
-    if (new Decimal2__default.default(s).eq(sol)) {
+    if (new Decimal3__default.default(s).eq(sol)) {
       return s.replace(/0+$/, "").replace(/\.$/, "");
     }
   }