@elisym/sdk 0.10.3 → 0.11.0

package/dist/index.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+var memo = require('@solana-program/memo');
 var system = require('@solana-program/system');
 var token = require('@solana-program/token');
 var kit = require('@solana/kit');
@@ -64,6 +65,7 @@ var LAMPORTS_PER_SOL = 1e9;
 var PROTOCOL_FEE_BPS = 300;
 var PROTOCOL_TREASURY = "GY7vnWMkKpftU4nQ16C2ATkj1JwrQpHhknkaBUn67VTy";
 var PROTOCOL_PROGRAM_ID_DEVNET = "BrX1CRkSgvcjxBvc2bgc3QqgWjinusofDmeP7ZVxvwrE";
+var ELISYM_PROTOCOL_TAG = "ELiZksgwDt41LaeuPDLkUfWgFXhGgVayTMP7L5nTSEL8";
 function getProtocolProgramId(cluster) {
   switch (cluster) {
     case "devnet":
@@ -119,13 +121,13 @@ function decodeConfig(encodedAccount) {
     getConfigDecoder()
   );
 }
-async function fetchConfig(rpc, address3, config) {
-  const maybeAccount = await fetchMaybeConfig(rpc, address3, config);
+async function fetchConfig(rpc, address4, config) {
+  const maybeAccount = await fetchMaybeConfig(rpc, address4, config);
   kit.assertAccountExists(maybeAccount);
   return maybeAccount;
 }
-async function fetchMaybeConfig(rpc, address3, config) {
-  const maybeAccount = await kit.fetchEncodedAccount(rpc, address3, config);
+async function fetchMaybeConfig(rpc, address4, config) {
+  const maybeAccount = await kit.fetchEncodedAccount(rpc, address4, config);
   return decodeConfig(maybeAccount);
 }
 if (process.env.NODE_ENV !== "production") ;
@@ -597,7 +599,9 @@ var SolanaPaymentStrategy = class {
     if (!Number.isInteger(computeUnitLimit) || computeUnitLimit <= 0) {
       throw new Error(`Invalid computeUnitLimit: ${computeUnitLimit}. Must be a positive integer.`);
     }
-    const paymentInstructions = await buildPaymentInstructions(paymentRequest, payerSigner);
+    const paymentInstructions = await buildPaymentInstructions(paymentRequest, payerSigner, {
+      jobEventId: options?.jobEventId
+    });
     const priorityFeeMicroLamports = options?.priorityFeeMicroLamports ?? await estimatePriorityFeeMicroLamports(rpc, {
       percentile: options?.priorityFeePercentile ?? DEFAULT_PRIORITY_FEE_PERCENTILE
     });
@@ -894,9 +898,10 @@ function bigIntDelta(post, pre) {
 function waitMs(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
-async function buildPaymentInstructions(paymentRequest, payerSigner) {
+async function buildPaymentInstructions(paymentRequest, payerSigner, options) {
   const recipient = kit.address(paymentRequest.recipient);
   const reference = kit.address(paymentRequest.reference);
+  const protocolTag = kit.address(ELISYM_PROTOCOL_TAG);
   const feeAmount = paymentRequest.fee_amount ?? 0;
   const providerAmount = paymentRequest.fee_address && feeAmount > 0 ? paymentRequest.amount - feeAmount : paymentRequest.amount;
   if (providerAmount <= 0) {
@@ -904,6 +909,7 @@ async function buildPaymentInstructions(paymentRequest, payerSigner) {
       `Fee amount (${feeAmount}) exceeds or equals total amount (${paymentRequest.amount}). Cannot create transaction with non-positive provider amount.`
     );
   }
+  const memoInstruction = options?.jobEventId ? memo.getAddMemoInstruction({ memo: `elisym:v1:${options.jobEventId}` }) : null;
   const asset = resolveAssetFromPaymentRequest(paymentRequest);
   if (!asset.mint) {
     const providerTransferIx2 = system.getTransferSolInstruction({
@@ -911,14 +917,19 @@ async function buildPaymentInstructions(paymentRequest, payerSigner) {
       destination: recipient,
       amount: BigInt(providerAmount)
     });
-    const providerTransferIxWithReference2 = {
+    const providerTransferIxWithMarkers2 = {
       ...providerTransferIx2,
       accounts: [
         ...providerTransferIx2.accounts,
-        { address: reference, role: kit.AccountRole.READONLY }
+        { address: reference, role: kit.AccountRole.READONLY },
+        { address: protocolTag, role: kit.AccountRole.READONLY }
       ]
     };
-    const instructions2 = [providerTransferIxWithReference2];
+    const instructions2 = [];
+    if (memoInstruction) {
+      instructions2.push(memoInstruction);
+    }
+    instructions2.push(providerTransferIxWithMarkers2);
     if (paymentRequest.fee_address && feeAmount > 0) {
       instructions2.push(
         system.getTransferSolInstruction({
@@ -943,6 +954,9 @@ async function buildPaymentInstructions(paymentRequest, payerSigner) {
     mint
   });
   const instructions = [];
+  if (memoInstruction) {
+    instructions.push(memoInstruction);
+  }
   instructions.push(
     token.getCreateAssociatedTokenIdempotentInstruction(
       {
@@ -982,11 +996,15 @@ async function buildPaymentInstructions(paymentRequest, payerSigner) {
     amount: BigInt(providerAmount),
     decimals: asset.decimals
   });
-  const providerTransferIxWithReference = {
+  const providerTransferIxWithMarkers = {
     ...providerTransferIx,
-    accounts: [...providerTransferIx.accounts, { address: reference, role: kit.AccountRole.READONLY }]
+    accounts: [
+      ...providerTransferIx.accounts,
+      { address: reference, role: kit.AccountRole.READONLY },
+      { address: protocolTag, role: kit.AccountRole.READONLY }
+    ]
   };
-  instructions.push(providerTransferIxWithReference);
+  instructions.push(providerTransferIxWithMarkers);
   if (treasuryAta && paymentRequest.fee_address && feeAmount > 0) {
     instructions.push(
       token.getTransferCheckedInstruction({
@@ -1141,21 +1159,6 @@ var DiscoveryService = class {
   constructor(pool) {
     this.pool = pool;
   }
-  /** Count elisym agents (kind:31990 with "elisym" tag). */
-  async fetchAllAgentCount() {
-    const events = await this.pool.querySync({
-      kinds: [KIND_APP_HANDLER],
-      "#t": ["elisym"]
-    });
-    const uniquePubkeys = /* @__PURE__ */ new Set();
-    for (const event of events) {
-      if (!nostrTools.verifyEvent(event)) {
-        continue;
-      }
-      uniquePubkeys.add(event.pubkey);
-    }
-    return uniquePubkeys.size;
-  }
   /**
    * Fetch a single page of elisym agents with relay-side pagination.
    * Uses `until` cursor for Nostr cursor-based pagination.
@@ -1236,18 +1239,20 @@ var DiscoveryService = class {
    *
    * Ranking algorithm:
    * 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.
+   *    `payment-completed` feedback timestamp, gated by a matching kind:6xxx
+   *    result from the provider on the same job event). 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).
    *
-   * 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
+   * NOTE: We do not verify the `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. As a
+   * lighter sybil mitigation we cross-check `payment-completed` feedback
+   * against a kind:6xxx result event authored by the provider on the same
+   * job: a customer can publish a fake `payment-completed`, but they cannot
+   * forge a result event signed by the provider. Tighten with recipient-tied
+   * on-chain checks when the network moves to mainnet with a paid RPC
    * provider.
    */
   async fetchAgents(network = "devnet", limit) {
@@ -1290,14 +1295,27 @@ var DiscoveryService = class {
       ),
       this.enrichWithMetadata(agents)
     ]);
+    const deliveredJobsByProvider = /* @__PURE__ */ new Map();
     for (const ev of resultEvents) {
       if (!nostrTools.verifyEvent(ev)) {
         continue;
       }
       const agent = agentMap.get(ev.pubkey);
-      if (agent && ev.created_at > agent.lastSeen) {
+      if (!agent) {
+        continue;
+      }
+      if (ev.created_at > agent.lastSeen) {
         agent.lastSeen = ev.created_at;
       }
+      const jobEventId = ev.tags.find((t) => t[0] === "e")?.[1];
+      if (jobEventId) {
+        let delivered = deliveredJobsByProvider.get(ev.pubkey);
+        if (!delivered) {
+          delivered = /* @__PURE__ */ new Set();
+          deliveredJobsByProvider.set(ev.pubkey, delivered);
+        }
+        delivered.add(jobEventId);
+      }
     }
     for (const ev of feedbackEvents) {
       if (!nostrTools.verifyEvent(ev)) {
@@ -1324,7 +1342,9 @@ var DiscoveryService = class {
       const status = ev.tags.find((t) => t[0] === "status")?.[1];
       const txTag = ev.tags.find((t) => t[0] === "tx");
       const txSignature = txTag?.[1];
-      if (status === "payment-completed" && typeof txSignature === "string" && txSignature) {
+      const jobEventId = ev.tags.find((t) => t[0] === "e")?.[1];
+      const hasDeliveredResult = jobEventId !== void 0 && deliveredJobsByProvider.get(targetPubkey)?.has(jobEventId) === true;
+      if (status === "payment-completed" && typeof txSignature === "string" && txSignature && hasDeliveredResult) {
         if (!agent.lastPaidJobAt || ev.created_at > agent.lastPaidJobAt) {
           agent.lastPaidJobAt = ev.created_at;
           agent.lastPaidJobTx = txSignature;
@@ -2901,6 +2921,83 @@ async function doVerifyOnce(rpc, txSignature, expectedRecipient) {
   }
   return { verified: false, txSignature: sigStr, reason: "recipient_mismatch" };
 }
+var DEFAULT_LIMIT = 1e3;
+var NATIVE_KEY = "native";
+async function aggregateNetworkStats(rpc, options) {
+  const limit = options?.limit ?? DEFAULT_LIMIT;
+  const concurrency = options?.concurrency ?? DEFAULTS.QUERY_MAX_CONCURRENCY;
+  const tag = kit.address(ELISYM_PROTOCOL_TAG);
+  const signatures = await rpc.getSignaturesForAddress(tag, { limit, before: options?.before }).send();
+  const validSigs = signatures.filter((entry) => entry.err === null);
+  if (validSigs.length === 0) {
+    return { jobCount: 0, volumeByAsset: {} };
+  }
+  const volumeByAsset = {};
+  let jobCount = 0;
+  for (let start = 0; start < validSigs.length; start += concurrency) {
+    const batch = validSigs.slice(start, start + concurrency);
+    const txResults = await Promise.all(
+      batch.map(
+        (entry) => rpc.getTransaction(entry.signature, {
+          commitment: "confirmed",
+          encoding: "json",
+          maxSupportedTransactionVersion: 0
+        }).send().catch(() => null)
+      )
+    );
+    for (const tx of txResults) {
+      if (!tx?.meta || tx.meta.err) {
+        continue;
+      }
+      jobCount += 1;
+      accumulateTransfers(tx, volumeByAsset);
+    }
+  }
+  const latest = validSigs[0]?.signature;
+  const oldest = validSigs.at(-1)?.signature;
+  return {
+    jobCount,
+    volumeByAsset,
+    latestSignature: latest,
+    oldestSignature: oldest
+  };
+}
+function accumulateTransfers(tx, volumeByAsset) {
+  const raw = tx;
+  const meta = raw.meta;
+  if (!meta) {
+    return;
+  }
+  const preTokens = meta.preTokenBalances ?? [];
+  const postTokens = meta.postTokenBalances ?? [];
+  const isSpl = postTokens.length > 0 || preTokens.length > 0;
+  if (isSpl) {
+    accumulateSplDeltas(preTokens, postTokens, volumeByAsset);
+    return;
+  }
+  accumulateNativeDeltas(meta.preBalances, meta.postBalances, volumeByAsset);
+}
+function accumulateSplDeltas(pre, post, volumeByAsset) {
+  for (const postEntry of post) {
+    const preEntry = pre.find((entry) => entry.accountIndex === postEntry.accountIndex);
+    const preAmount = preEntry ? BigInt(preEntry.uiTokenAmount.amount) : 0n;
+    const postAmount = BigInt(postEntry.uiTokenAmount.amount);
+    const delta = postAmount - preAmount;
+    if (delta > 0n) {
+      volumeByAsset[postEntry.mint] = (volumeByAsset[postEntry.mint] ?? 0n) + delta;
+    }
+  }
+}
+function accumulateNativeDeltas(pre, post, volumeByAsset) {
+  for (let i = 1; i < post.length; i++) {
+    const preValue = pre[i] ?? 0n;
+    const postValue = post[i] ?? 0n;
+    const delta = BigInt(postValue) - BigInt(preValue);
+    if (delta > 0n) {
+      volumeByAsset[NATIVE_KEY] = (volumeByAsset[NATIVE_KEY] ?? 0n) + delta;
+    }
+  }
+}
 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"),
@@ -3106,6 +3203,7 @@ exports.DEFAULTS = DEFAULTS;
 exports.DEFAULT_KIND_OFFSET = DEFAULT_KIND_OFFSET;
 exports.DEFAULT_REDACT_PATHS = DEFAULT_REDACT_PATHS;
 exports.DiscoveryService = DiscoveryService;
+exports.ELISYM_PROTOCOL_TAG = ELISYM_PROTOCOL_TAG;
 exports.ElisymClient = ElisymClient;
 exports.ElisymIdentity = ElisymIdentity;
 exports.GlobalConfigSchema = GlobalConfigSchema;
@@ -3135,6 +3233,7 @@ exports.SECRET_REDACT_PATHS = SECRET_REDACT_PATHS;
 exports.SessionSpendLimitEntrySchema = SessionSpendLimitEntrySchema;
 exports.SolanaPaymentStrategy = SolanaPaymentStrategy;
 exports.USDC_SOLANA_DEVNET = USDC_SOLANA_DEVNET;
+exports.aggregateNetworkStats = aggregateNetworkStats;
 exports.assertExpiry = assertExpiry;
 exports.assertLamports = assertLamports;
 exports.assetByKey = assetByKey;