2020117-agent 0.6.16 → 0.6.18

package/dist/agent.js

@@ -571,14 +571,53 @@ async function handleDvmRequest(label, event) {
     if (!acquireSlot())
         return;
     try {
-        // Parse DVM request: input is in 'i' tag, optional model in ['param','model','...']
-        const inputTag = event.tags.find(t => t[0] === 'i');
-        const input = inputTag?.[1] || '';
-        const requestedModel = event.tags.find(t => t[0] === 'param' && t[1] === 'model')?.[2];
+        // Step 1: p-tag filter — if request is directed (has p tags) but not to us, skip
+        const pTags = event.tags.filter(t => t[0] === 'p').map(t => t[1]);
+        if (pTags.length > 0 && !pTags.includes(state.sovereignKeys.pubkey)) {
+            console.log(`[${label}] DVM request ${event.id.slice(0, 8)} directed to another agent, skipping`);
+            return;
+        }
+        // Step 2: handle NIP-44 encrypted requests
+        const isEncrypted = event.tags.some(t => t[0] === 'encrypted');
+        let rawInput;
+        if (isEncrypted) {
+            try {
+                rawInput = await nip44Decrypt(state.sovereignKeys.privkey, event.pubkey, event.content);
+                console.log(`[${label}] DVM request ${event.id.slice(0, 8)} decrypted successfully`);
+            }
+            catch {
+                console.log(`[${label}] DVM request ${event.id.slice(0, 8)} decryption failed (not for us), skipping`);
+                return;
+            }
+        }
+        else {
+            rawInput = '';
+        }
+        // Parse DVM request: for encrypted jobs, decrypted content is a JSON array of tags
+        // Per NIP-90: [["i","actual input","text"],["param","model","..."],...]
+        let effectiveTags = event.tags;
+        if (isEncrypted) {
+            try {
+                const parsed = JSON.parse(rawInput);
+                if (Array.isArray(parsed))
+                    effectiveTags = parsed;
+            }
+            catch { /* rawInput is plain text — fall through, handled below */ }
+        }
+        const inputTag = effectiveTags.find(t => t[0] === 'i');
+        // For encrypted plain-text fallback: rawInput itself is the input
+        const input = inputTag?.[1] || (isEncrypted ? rawInput : '');
+        const requestedModel = effectiveTags.find(t => t[0] === 'param' && t[1] === 'model')?.[2];
         if (!input) {
             console.warn(`[${label}] DVM request ${event.id.slice(0, 8)} has no input`);
             return;
         }
+        // Reject jobs with bid below minimum price
+        const jobBidMsats = Number(event.tags.find(t => t[0] === 'bid')?.[1] || '0');
+        if (jobBidMsats > 0 && jobBidMsats < MIN_BID_SATS * 1000) {
+            console.log(`[${label}] DVM request ${event.id.slice(0, 8)} bid ${jobBidMsats} msats below minimum ${MIN_BID_SATS * 1000} msats, skipping`);
+            return;
+        }
         console.log(`[${label}] DVM request from ${event.pubkey.slice(0, 8)}: "${input.slice(0, 60)}..."`);
         // Send feedback (Kind 7000)
         const feedbackEvent = signEvent({
@@ -613,7 +652,11 @@ async function handleDvmRequest(label, event) {
         console.log(`[${label}] DVM result: ${result.length} chars`);
         // Send result (Kind 6xxx = request kind + 1000)
         const resultKind = KIND + 1000;
-        const amountMsats = SATS_PER_CHUNK * CHUNKS_PER_PAYMENT * 1000;
+        // Prefer the bid the customer declared in the job; fall back to local fixed price.
+        // bid tag is in the outer (unencrypted) event tags per NIP-90.
+        const bidMsats = Number(event.tags.find(t => t[0] === 'bid')?.[1] || '0');
+        const fixedPriceMsats = SATS_PER_CHUNK * CHUNKS_PER_PAYMENT * 1000;
+        const amountMsats = bidMsats > 0 ? bidMsats : fixedPriceMsats;
         let amountTag;
         if (amountMsats > 0 && state.nwcParsed) {
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "2020117-agent",
-  "version": "0.6.16",
+  "version": "0.6.18",
   "description": "2020117 agent runtime — Nostr-native relay subscription + Hyperswarm P2P + Lightning payments",
   "type": "module",
   "bin": {