Merge pull request #956 from sandwichfarm/fix/rstate-contextvm-sdk-013

Align rstate with ContextVM SDK 0.13

Author: dskvr

apps/rstate/.env.example

@@ -33,6 +33,7 @@ CVM_AUTH_ALLOW_ANY=false
 # CEP-8 CVM Payments
 CVM_PAYMENTS_ENABLED=false
 CVM_NWC_CONNECTION_STRING=
+CVM_PAYMENT_INTERACTION_POLICY=optional
 # CVM_PRICING_YAML=./config/pricing.cvm.yaml  # optional CVM-specific overrides
 
 # ========================================

apps/rstate/package.json

@@ -35,11 +35,10 @@
     "docker:stop": "docker-compose down"
   },
   "dependencies": {
-    "@contextvm/sdk": "^0.6.2",
+    "@contextvm/sdk": "^0.13.9",
     "@fastify/cors": "^11.1.0",
     "@fastify/swagger": "^9.5.2",
     "@modelcontextprotocol/sdk": "^1.26.0",
-    "@noble/hashes": "^1.5.0",
     "@noble/secp256k1": "^2.1.0",
     "@nostrwatch/announce": "workspace:^",
     "@nostrwatch/publisher": "workspace:^",
@@ -60,7 +59,7 @@
     "@types/ws": "^8.5.13",
     "tsup": "^8.3.5",
     "tsx": "^4.19.2",
-    "typescript": "^5.7.2",
+    "typescript": "^5.9.3",
     "vitest": "^3.2.6"
   },
   "engines": {

apps/rstate/src/payments/cvm-payment-policy.ts

@@ -0,0 +1,16 @@
+import type { PaymentInteractionPolicy } from '@contextvm/sdk'
+
+const DEFAULT_CVM_PAYMENT_INTERACTION_POLICY: PaymentInteractionPolicy = 'optional'
+
+export function resolveCvmPaymentInteractionPolicy(
+  env: { [key: string]: string | undefined } = process.env
+): PaymentInteractionPolicy {
+  const rawPolicy = env.CVM_PAYMENT_INTERACTION_POLICY?.trim()
+
+  if (!rawPolicy) return DEFAULT_CVM_PAYMENT_INTERACTION_POLICY
+  if (rawPolicy === 'optional' || rawPolicy === 'transparent') return rawPolicy
+
+  throw new Error(
+    `CVM_PAYMENT_INTERACTION_POLICY must be "optional" or "transparent"; got "${rawPolicy}"`
+  )
+}

apps/rstate/src/resilient-relay-pool.ts

@@ -171,6 +171,7 @@ export class ResilientRelayPool implements RelayPool {
         this.subscriptions.clear()
         logger.info('RelayHandler: all subscriptions unsubscribed')
       },
+      getRelayUrls: () => this.relays.map(relay => relay.url),
     }
   }
 

apps/rstate/src/server.ts

@@ -7,6 +7,7 @@
 import { Server } from '@modelcontextprotocol/sdk/server/index.js'
 import { NostrServerTransport, PrivateKeySigner, EncryptionMode, withServerPayments, LnBolt11NwcPaymentProcessor } from '@contextvm/sdk'
 import { loadPricedCapabilities } from './payments/cvm-pricing.js'
+import { resolveCvmPaymentInteractionPolicy } from './payments/cvm-payment-policy.js'
 import { ResilientRelayPool } from './resilient-relay-pool.js'
 import type { Config } from './config.js'
 import { getLogger } from './utils/logger.js'
@@ -207,7 +208,7 @@ export class CVMServer {
         name: 'RelayVM',
         about: 'ContextVM server that aggregates NIP-66 relay intelligence and exposes it via MCP over Nostr. Service provided by nostr.watch',
       },
-      isPublicServer: cvmConfig.allowedPubkeys.length === 0,
+      isAnnouncedServer: cvmConfig.allowedPubkeys.length === 0,
       allowedPublicKeys: cvmConfig.allowedPubkeys.length > 0 ? cvmConfig.allowedPubkeys : undefined,
     })
 
@@ -224,13 +225,18 @@ export class CVMServer {
       })
 
       const pricedCapabilities = loadPricedCapabilities()
+      const paymentInteraction = resolveCvmPaymentInteractionPolicy()
 
       this.transport = withServerPayments(this.transport, {
         processors: [nwcProcessor],
         pricedCapabilities,
+        paymentInteraction,
       })
 
-      logger.info({ pricedTools: pricedCapabilities.length }, 'CVM payment gating enabled (CEP-8)')
+      logger.info({
+        pricedTools: pricedCapabilities.length,
+        paymentInteraction,
+      }, 'CVM payment gating enabled (CEP-8)')
     }
 
     // DISABLED: Subscription system

apps/rstate/test/cvm-payment-policy.test.ts

@@ -0,0 +1,22 @@
+import { describe, expect, it } from 'vitest'
+import { resolveCvmPaymentInteractionPolicy } from '../src/payments/cvm-payment-policy.js'
+
+describe('CVM payment interaction policy', () => {
+  it('defaults to the ContextVM 0.13 optional lifecycle policy', () => {
+    expect(resolveCvmPaymentInteractionPolicy({})).toBe('optional')
+  })
+
+  it('accepts transparent-only compatibility mode', () => {
+    expect(resolveCvmPaymentInteractionPolicy({ CVM_PAYMENT_INTERACTION_POLICY: 'transparent' })).toBe('transparent')
+  })
+
+  it('accepts the explicit optional policy value', () => {
+    expect(resolveCvmPaymentInteractionPolicy({ CVM_PAYMENT_INTERACTION_POLICY: ' optional ' })).toBe('optional')
+  })
+
+  it('rejects wire-level payment interaction modes as server policy values', () => {
+    expect(() => resolveCvmPaymentInteractionPolicy({
+      CVM_PAYMENT_INTERACTION_POLICY: 'explicit_gating',
+    })).toThrow('CVM_PAYMENT_INTERACTION_POLICY must be "optional" or "transparent"')
+  })
+})