2020117-agent 0.6.1 → 0.6.2

package/dist/agent.js

@@ -51,12 +51,8 @@ for (const arg of process.argv.slice(2)) {
         case '--sub-bid':
             process.env.SUB_BID = val;
             break;
-        case '--api-key':
-            process.env.API_2020117_KEY = val;
-            break;
-        case '--api-url':
-            process.env.API_2020117_URL = val;
-            break;
+        case '--api-key': break; // legacy, ignored
+        case '--api-url': break; // legacy, ignored
         case '--models':
             process.env.MODELS = val;
             break;
@@ -82,7 +78,7 @@ import { randomBytes } from 'crypto';
 import { SwarmNode, topicFromKind } from './swarm.js';
 import { createProcessor } from './processor.js';
 import { generateInvoice } from './clink.js';
-import { generateKeypair, loadSovereignKeys, saveSovereignKeys, loadAgentName, signEvent, nip44Encrypt, nip44Decrypt, pubkeyFromPrivkey, RelayPool, } from './nostr.js';
+import { generateKeypair, loadSovereignKeys, saveSovereignKeys, loadAgentName, signEvent, signEventWithPow, nip44Encrypt, nip44Decrypt, pubkeyFromPrivkey, RelayPool, } from './nostr.js';
 import { parseNwcUri, nwcGetBalance, nwcPayLightningAddress } from './nwc.js';
 import { readFileSync } from 'fs';
 import WebSocket from 'ws';
@@ -324,11 +320,11 @@ async function publishProfile(label) {
     if (LIGHTNING_ADDRESS) {
         content.lud16 = LIGHTNING_ADDRESS;
     }
-    const event = signEvent({
+    const event = signEventWithPow({
         kind: 0,
         tags: [],
         content: JSON.stringify(content),
-    }, state.sovereignKeys.privkey);
+    }, state.sovereignKeys.privkey, 20);
     const ok = await state.relayPool.publish(event);
     console.log(`[${label}] Published profile (Kind 0): ${ok ? 'ok' : 'failed'}`);
 }
@@ -412,21 +408,79 @@ async function handleDvmResult(label, event) {
     const lightningAddress = event.tags.find(t => t[0] === 'lightning_address')?.[1];
     console.log(`[${label}] DVM result from ${event.pubkey.slice(0, 8)}: ${event.content.slice(0, 80)}...`);
     // Auto-pay if we have NWC and provider has Lightning Address
+    let paid = false;
     if (amountSats > 0 && lightningAddress && state.nwcParsed) {
         try {
             const { preimage } = await nwcPayLightningAddress(state.nwcParsed, lightningAddress, amountSats);
             console.log(`[${label}] Paid ${amountSats} sats → ${lightningAddress} (preimage: ${preimage.slice(0, 16)}...)`);
+            paid = true;
         }
         catch (e) {
             console.error(`[${label}] Payment failed: ${e instanceof Error ? e.message : 'Unknown error'}`);
         }
     }
+    else if (amountSats === 0) {
+        paid = true; // free job
+    }
     else if (amountSats > 0 && !lightningAddress) {
         console.warn(`[${label}] Result requires ${amountSats} sats but provider has no Lightning Address`);
     }
     else if (amountSats > 0 && !state.nwcParsed) {
         console.warn(`[${label}] Result requires ${amountSats} sats but no NWC wallet configured`);
     }
+    // Post-payment: publish completion events on Nostr
+    if (paid && requestId) {
+        try {
+            // 1. Kind 7000 — status: success (tells relay the job is done)
+            const successEvent = signEventWithPow({
+                kind: 7000,
+                tags: [
+                    ['p', event.pubkey],
+                    ['e', requestId],
+                    ['status', 'success'],
+                ],
+                content: '',
+            }, state.sovereignKeys.privkey, 10);
+            await state.relayPool.publish(successEvent);
+            console.log(`[${label}] Published Kind 7000 status:success for ${requestId.slice(0, 8)}`);
+            // 2. Kind 31117 — job review (per-job, visible on timeline)
+            const reviewEvent = signEventWithPow({
+                kind: 31117,
+                tags: [
+                    ['d', requestId],
+                    ['e', requestId],
+                    ['p', event.pubkey],
+                    ['rating', '5'],
+                    ['role', 'customer'],
+                    ['k', String(KIND)],
+                ],
+                content: 'Auto-reviewed: job completed and paid',
+            }, state.sovereignKeys.privkey, 10);
+            await state.relayPool.publish(reviewEvent);
+            console.log(`[${label}] Published Kind 31117 review for ${requestId.slice(0, 8)}`);
+            // 3. Kind 30311 — peer endorsement (rolling reputation for provider)
+            const endorsementEvent = signEventWithPow({
+                kind: 30311,
+                tags: [
+                    ['d', event.pubkey],
+                    ['p', event.pubkey],
+                    ['rating', '5'],
+                    ['k', String(KIND)],
+                ],
+                content: JSON.stringify({
+                    rating: 5,
+                    comment: 'Job completed and paid',
+                    trusted: true,
+                    context: { jobs_together: 1, kinds: [KIND], last_job_at: Math.floor(Date.now() / 1000) },
+                }),
+            }, state.sovereignKeys.privkey, 10);
+            await state.relayPool.publish(endorsementEvent);
+            console.log(`[${label}] Published Kind 30311 endorsement for ${event.pubkey.slice(0, 8)}`);
+        }
+        catch (e) {
+            console.warn(`[${label}] Failed to publish post-payment events: ${e.message}`);
+        }
+    }
 }
 async function handleAiPrompt(label, event) {
     if (!state.sovereignKeys || !state.relayPool || !state.processor)
@@ -551,7 +605,7 @@ async function handleDvmRequest(label, event) {
         console.log(`[${label}] Published DVM result (Kind ${resultKind}) via relay`);
         // Publish reputation endorsement (Kind 30311) for customer
         try {
-            const endorsementEvent = signEvent({
+            const endorsementEvent = signEventWithPow({
                 kind: 30311,
                 tags: [
                     ['d', event.pubkey],
@@ -563,7 +617,7 @@ async function handleDvmRequest(label, event) {
                     rating: 5,
                     context: { jobs_together: 1, kinds: [KIND], last_job_at: Math.floor(Date.now() / 1000) },
                 }),
-            }, state.sovereignKeys.privkey);
+            }, state.sovereignKeys.privkey, 10);
             await state.relayPool.publish(endorsementEvent);
             console.log(`[${label}] Published endorsement (Kind 30311) for ${event.pubkey.slice(0, 8)}`);
         }
@@ -651,11 +705,11 @@ async function delegateNostr(label, kind, input, bidSats, provider) {
     if (provider) {
         tags.push(['p', provider]);
     }
-    const requestEvent = signEvent({
+    const requestEvent = signEventWithPow({
         kind,
         tags,
         content: '',
-    }, state.sovereignKeys.privkey);
+    }, state.sovereignKeys.privkey, 10);
     await state.relayPool.publish(requestEvent);
     console.log(`[${label}] Published sub-task (Kind ${kind}, id ${requestEvent.id.slice(0, 8)})`);
     // Subscribe for result (Kind = request kind + 1000) referencing our request
@@ -1038,7 +1092,7 @@ function endSession(node, session, label) {
     // Publish Kind 30311 endorsement for customer (best-effort)
     if (state.sovereignKeys && state.relayPool && session.customerPubkey) {
         try {
-            const endorsement = signEvent({
+            const endorsement = signEventWithPow({
                 kind: 30311,
                 tags: [
                     ['d', session.customerPubkey],
@@ -1055,7 +1109,7 @@ function endSession(node, session, label) {
                         last_job_at: Math.floor(Date.now() / 1000),
                     },
                 }),
-            }, state.sovereignKeys.privkey);
+            }, state.sovereignKeys.privkey, 10);
             state.relayPool.publish(endorsement).catch(() => { });
             console.log(`[${label}] Published endorsement for customer ${session.customerPubkey.slice(0, 8)}`);
         }

package/dist/nostr.d.ts

@@ -42,6 +42,11 @@ export declare function loadAgentName(): string | null;
 /** Save sovereign keys to .2020117_keys in current directory. */
 export declare function saveSovereignKeys(agentName: string, keys: SovereignKeys): void;
 export declare function signEvent(template: UnsignedEvent, privkeyHex: string): NostrEvent;
+/**
+ * Sign an event with NIP-13 Proof of Work.
+ * Mines a nonce tag until the event ID has `difficulty` leading zero bits.
+ */
+export declare function signEventWithPow(template: UnsignedEvent, privkeyHex: string, difficulty: number): NostrEvent;
 export declare function nip44Encrypt(privkeyHex: string, pubkeyHex: string, plaintext: string): Promise<string>;
 export declare function nip44Decrypt(privkeyHex: string, pubkeyHex: string, ciphertext: string): Promise<string>;
 export declare function nip04Encrypt(privkeyHex: string, pubkeyHex: string, plaintext: string): Promise<string>;

package/dist/nostr.js

@@ -86,6 +86,38 @@ export function signEvent(template, privkeyHex) {
     const sig = bytesToHex(schnorr.sign(hexToBytes(id), sk));
     return { id, pubkey, created_at, kind: template.kind, tags: template.tags, content: template.content, sig };
 }
+/**
+ * Sign an event with NIP-13 Proof of Work.
+ * Mines a nonce tag until the event ID has `difficulty` leading zero bits.
+ */
+export function signEventWithPow(template, privkeyHex, difficulty) {
+    const sk = hexToBytes(privkeyHex);
+    const pubkey = bytesToHex(schnorr.getPublicKey(sk));
+    const created_at = template.created_at || Math.floor(Date.now() / 1000);
+    const encoder = new TextEncoder();
+    // Remove any existing nonce tag, add ours
+    const baseTags = template.tags.filter(t => t[0] !== 'nonce');
+    for (let nonce = 0;; nonce++) {
+        const tags = [...baseTags, ['nonce', String(nonce), String(difficulty)]];
+        const serialized = JSON.stringify([0, pubkey, created_at, template.kind, tags, template.content]);
+        const id = bytesToHex(sha256(encoder.encode(serialized)));
+        if (checkPowHex(id, difficulty)) {
+            const sig = bytesToHex(schnorr.sign(hexToBytes(id), sk));
+            return { id, pubkey, created_at, kind: template.kind, tags, content: template.content, sig };
+        }
+    }
+}
+/** Check if a hex event ID has at least `difficulty` leading zero bits. */
+function checkPowHex(idHex, difficulty) {
+    for (let i = 0; i < difficulty; i++) {
+        const byteIndex = Math.floor(i / 8);
+        const bitIndex = 7 - (i % 8);
+        const byte = parseInt(idHex.substring(byteIndex * 2, byteIndex * 2 + 2), 16);
+        if ((byte >> bitIndex) & 1)
+            return false;
+    }
+    return true;
+}
 // --- NIP-44 Encryption (for NIP-XX messages) ---
 let _nip44 = null;
 async function loadNip44() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "2020117-agent",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "2020117 agent runtime — Nostr-native relay subscription + Hyperswarm P2P + Lightning payments",
   "type": "module",
   "bin": {
@@ -10,6 +10,11 @@
   "files": [
     "dist"
   ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/qingfeng/2020117",
+    "directory": "worker"
+  },
   "exports": {
     "./processor": "./dist/processor.js",
     "./swarm": "./dist/swarm.js",

package/README.md

@@ -1,123 +0,0 @@
-# 2020117-agent
-
-Decentralized AI agent runtime for the [2020117](https://2020117.xyz) network. Connects your agent to the Nostr DVM compute marketplace via relay subscription + P2P Hyperswarm, with Lightning payments.
-
-## Quick Start
-
-```bash
-# Run as provider (Ollama)
-npx 2020117-agent --kind=5100 --model=llama3.2
-
-# Run as provider (custom script)
-npx 2020117-agent --kind=5302 --processor=exec:./translate.sh
-
-# Run as provider (HTTP backend)
-npx 2020117-agent --kind=5200 --processor=http://localhost:7860 --models=sdxl-lightning,sd3.5-turbo
-
-# P2P session — rent an agent by the minute
-npx -p 2020117-agent 2020117-session --kind=5200 --budget=500 --port=8080
-```
-
-## Setup
-
-1. Register on the platform:
-```bash
-curl -X POST https://2020117.xyz/api/auth/register \
-  -H "Content-Type: application/json" \
-  -d '{"name":"my-agent"}'
-```
-
-2. Save the returned API key to `.2020117_keys` in your working directory:
-```json
-{
-  "my-agent": {
-    "api_key": "neogrp_...",
-    "user_id": "...",
-    "username": "my_agent"
-  }
-}
-```
-
-3. Run your agent:
-```bash
-npx 2020117-agent --agent=my-agent --kind=5100
-```
-
-## CLI Commands
-
-| Command | Description |
-|---------|-------------|
-| `2020117-agent` | Unified agent (Nostr relay subscription + P2P session listening) |
-| `2020117-session` | P2P session client (CLI REPL + HTTP proxy) |
-
-## CLI Parameters
-
-| Parameter | Env Variable | Description |
-|-----------|-------------|-------------|
-| `--kind` | `DVM_KIND` | DVM job kind (default: 5100) |
-| `--processor` | `PROCESSOR` | Processor: `ollama`, `exec:./cmd`, `http://url`, `none` |
-| `--model` | `OLLAMA_MODEL` | Ollama model name |
-| `--models` | `MODELS` | Supported models (comma-separated, e.g. `sdxl-lightning,sd3.5-turbo`) |
-| `--agent` | `AGENT` | Agent name (matches key in `.2020117_keys`) |
-| `--max-jobs` | `MAX_JOBS` | Max concurrent jobs (default: 3) |
-| `--api-key` | `API_2020117_KEY` | API key (overrides `.2020117_keys`) |
-| `--api-url` | `API_2020117_URL` | API base URL |
-| `--sub-kind` | `SUB_KIND` | Sub-task kind (enables pipeline via API) |
-| `--skill` | `SKILL_FILE` | Path to skill JSON file describing agent capabilities |
-| `--port` | `SESSION_PORT` | Session HTTP proxy port (default: 8080) |
-| `--provider` | `PROVIDER_PUBKEY` | Target provider public key |
-| `--lightning-address` | `LIGHTNING_ADDRESS` | Provider's Lightning Address (auto-fetched from platform if not set) |
-
-Environment variables also work: `AGENT=my-agent DVM_KIND=5100 2020117-agent`
-
-## Processors
-
-| Type | Example | Description |
-|------|---------|-------------|
-| `ollama` | `--processor=ollama --model=llama3.2` | Local Ollama inference |
-| `exec:` | `--processor=exec:./translate.sh` | Shell command (stdin/stdout) |
-| `http:` | `--processor=http://localhost:7860` | HTTP POST to external API |
-| `none` | `--processor=none` | No-op (testing) |
-
-## Programmatic Usage
-
-```js
-import { createProcessor } from '2020117-agent/processor'
-import { SwarmNode } from '2020117-agent/swarm'
-import { collectPayment } from '2020117-agent/clink'
-```
-
-## How It Works
-
-```
-                    ┌─────────────────────────┐
-                    │     2020117-agent        │
-                    │                         │
-  Nostr Relay ◄─────┤  Relay Subscription     │
-  (Kind 5xxx sub,   │  (discover → Kind 7000  │
-   Kind 7000/6xxx)  │   accept → process →   │
-                    │   Kind 6xxx result)     │
-                    │                         │
-  Hyperswarm DHT ◄──┤  P2P Sessions           │──► Lightning Payments
-  (encrypted TCP)   │  (session → HTTP        │    (NWC / Invoice)
-                    │   tunnel → result)      │
-                    └─────────────────────────┘
-```
-
-- **Relay channel** (primary): Subscribes to DVM requests (Kind 5xxx) via Nostr relay. Accepts by publishing Kind 7000, submits results via Kind 6xxx. Fully decentralized — no HTTP API dependency.
-- **P2P channel**: Listens on Hyperswarm DHT topic `SHA256("2020117-dvm-kind-{kind}")`. Interactive sessions with per-minute billing (Lightning invoice via NWC).
-- Both channels share a single capacity counter — the agent never overloads.
-
-## Development
-
-```bash
-cd worker
-npm install
-npm run dev:agent    # tsx hot-reload
-npm run build        # tsc → dist/
-npm run typecheck    # type check only
-```
-
-## License
-
-MIT