@envarai/envarpay 0.2.0-alpha.2 → 0.2.0-alpha.20

package/examples/seller.json

@@ -1,52 +1,169 @@
 {
   "configVersion": 1,
-  "agent": {"id": "hermes-researcher", "name": "我的研究助手"},
+  "agent": {
+    "id": "hermes-researcher",
+    "name": "我的研究助手"
+  },
   "paymentProfiles": {
-    "base-usdc": {
-      "adapter": "x402", "scheme": "exact", "network": "eip155:84532",
-      "asset": "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
-      "payTo": "0x2222222222222222222222222222222222222222",
-      "facilitatorUrl": "https://facilitator.example"
-    },
-    "stripe-usd": {"adapter": "mpp", "method": "stripe", "intent": "charge", "currency": "usd", "accountRef": "seller-stripe"}
+    "envar-usd": {
+      "adapter": "envar_balance",
+      "currency": "usd",
+      "accountRef": "envar"
+    }
   },
   "services": [
     {
-      "id": "research", "name": "竞品调研", "revision": 1,
-      "execution": {"type": "a2a", "cardUrl": "http://hermes:9000/research/agent-card.json"},
+      "id": "research",
+      "name": "竞品调研",
+      "revision": 1,
+      "execution": {
+        "type": "a2a",
+        "cardUrl": "http://hermes:9000/research/agent-card.json"
+      },
       "contract": {
         "inputSchema": {
           "$schema": "https://json-schema.org/draft/2020-12/schema",
-          "type": "object", "additionalProperties": false, "required": ["topic", "competitors"],
+          "type": "object",
+          "additionalProperties": false,
+          "required": [
+            "topic",
+            "competitors"
+          ],
           "properties": {
-            "topic": {"type": "string", "minLength": 1, "maxLength": 500},
-            "competitors": {"type": "array", "minItems": 1, "maxItems": 3, "uniqueItems": true, "items": {"type": "string", "minLength": 1, "maxLength": 120}}
+            "topic": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 500
+            },
+            "competitors": {
+              "type": "array",
+              "minItems": 1,
+              "maxItems": 3,
+              "uniqueItems": true,
+              "items": {
+                "type": "string",
+                "minLength": 1,
+                "maxLength": 120
+              }
+            }
           }
         },
-        "deliverables": ["report.md", "comparison.csv"], "targetDurationSeconds": 600, "includedRevisions": 0
+        "deliverables": [
+          "report.md",
+          "comparison.csv"
+        ],
+        "targetDurationSeconds": 600,
+        "includedRevisions": 0
       },
       "offers": [
-        {"id": "usdc-once", "pricing": {"kind": "fixed", "amount": "3000000"}, "collection": {"kind": "upfront"}, "paymentProfile": "base-usdc"},
-        {"id": "card-once", "pricing": {"kind": "fixed", "amount": "300"}, "collection": {"kind": "upfront"}, "paymentProfile": "stripe-usd"}
+        {
+          "id": "balance-once",
+          "pricing": {
+            "kind": "fixed",
+            "amount": "3000000"
+          },
+          "collection": {
+            "kind": "upfront"
+          },
+          "paymentProfile": "envar-usd"
+        }
       ]
     },
     {
-      "id": "summary-preview", "name": "免费试读", "revision": 1,
-      "execution": {"type": "a2a", "cardUrl": "http://hermes:9000/preview/agent-card.json"},
+      "id": "summary-preview",
+      "name": "免费试读",
+      "revision": 1,
+      "execution": {
+        "type": "a2a",
+        "cardUrl": "http://hermes:9000/preview/agent-card.json"
+      },
       "contract": {
-        "inputSchema": {"type": "object", "additionalProperties": false, "required": ["text"], "properties": {"text": {"type": "string", "minLength": 1, "maxLength": 500}}},
-        "deliverables": ["summary.txt"], "targetDurationSeconds": 60, "includedRevisions": 0
+        "inputSchema": {
+          "type": "object",
+          "additionalProperties": false,
+          "required": [
+            "text"
+          ],
+          "properties": {
+            "text": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 500
+            }
+          }
+        },
+        "deliverables": [
+          "summary.txt"
+        ],
+        "targetDurationSeconds": 60,
+        "includedRevisions": 0
       },
-      "offers": [{"id": "free", "pricing": {"kind": "free"}, "collection": {"kind": "none"}}]
+      "offers": [
+        {
+          "id": "free",
+          "pricing": {
+            "kind": "free"
+          },
+          "collection": {
+            "kind": "none"
+          }
+        }
+      ]
     },
     {
-      "id": "translation", "name": "文档翻译", "revision": 1,
-      "execution": {"type": "a2a", "cardUrl": "http://openclaw:9000/translate/agent-card.json"},
+      "id": "translation",
+      "name": "文档翻译",
+      "revision": 1,
+      "execution": {
+        "type": "a2a",
+        "cardUrl": "http://openclaw:9000/translate/agent-card.json"
+      },
       "contract": {
-        "inputSchema": {"type": "object", "additionalProperties": false, "required": ["documents"], "properties": {"documents": {"type": "array", "minItems": 1, "maxItems": 20, "items": {"type": "string", "minLength": 1, "maxLength": 10000}}}},
-        "deliverables": ["translations.json"], "targetDurationSeconds": 600, "includedRevisions": 0
+        "inputSchema": {
+          "type": "object",
+          "additionalProperties": false,
+          "required": [
+            "documents"
+          ],
+          "properties": {
+            "documents": {
+              "type": "array",
+              "minItems": 1,
+              "maxItems": 20,
+              "items": {
+                "type": "string",
+                "minLength": 1,
+                "maxLength": 10000
+              }
+            }
+          }
+        },
+        "deliverables": [
+          "translations.json"
+        ],
+        "targetDurationSeconds": 600,
+        "includedRevisions": 0
       },
-      "offers": [{"id": "per-document", "pricing": {"kind": "quantity", "unit": "document", "unitAmount": "100000", "quantity": {"pointer": "/documents", "measure": "count", "min": 1, "max": 20}}, "collection": {"kind": "upfront"}, "paymentProfile": "base-usdc"}]
+      "offers": [
+        {
+          "id": "per-document",
+          "pricing": {
+            "kind": "quantity",
+            "unit": "document",
+            "unitAmount": "100000",
+            "quantity": {
+              "pointer": "/documents",
+              "measure": "count",
+              "min": 1,
+              "max": 20
+            }
+          },
+          "collection": {
+            "kind": "upfront"
+          },
+          "paymentProfile": "envar-usd"
+        }
+      ]
     }
   ]
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@envarai/envarpay",
-  "version": "0.2.0-alpha.2",
-  "description": "Independent A2A service commerce, budgeted buyers and x402/MPP payments",
+  "version": "0.2.0-alpha.20",
+  "description": "A2A services with Envar account-balance payments",
   "type": "module",
   "license": "MIT",
   "engines": {
@@ -20,18 +20,10 @@
       "types": "./dist/commerce/runtime.d.ts",
       "import": "./dist/commerce/runtime.js"
     },
-    "./client": {
-      "types": "./dist/commerce/client-runtime.d.ts",
-      "import": "./dist/commerce/client-runtime.js"
-    },
     "./server": {
       "types": "./dist/commerce/runtime.d.ts",
       "import": "./dist/commerce/runtime.js"
     },
-    "./mpp": {
-      "types": "./dist/commerce/mpp-runtime.d.ts",
-      "import": "./dist/commerce/mpp-runtime.js"
-    },
     "./envar": {
       "types": "./dist/commerce/envar.d.ts",
       "import": "./dist/commerce/envar.js"
@@ -54,21 +46,18 @@
     "tag": "next"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\" && tsc",
     "test": "npm run build && node --test test/*.test.mjs",
     "prepack": "npm run build"
   },
   "dependencies": {
     "@a2a-js/sdk": "1.2.1",
     "@modelcontextprotocol/sdk": "^1.31.0",
-    "@x402/core": "2.24.0",
-    "@x402/evm": "2.24.0",
-    "@x402/extensions": "2.24.0",
     "ajv": "8.20.0",
     "ajv-formats": "3.0.1",
     "canonicalize": "2.1.0",
-    "mppx": "0.13.1",
-    "viem": "2.57.1"
+    "yaml": "2.8.2",
+    "zod": "4.6.5"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",

package/schemas/envarpay.config.schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "urn:envarpay:config:1",
+  "$id": "urn:envarpay:config:1-or-2",
   "title": "EnvarPay A2A commerce MVP configuration",
   "type": "object",
   "additionalProperties": false,
@@ -12,7 +12,7 @@
   ],
   "properties": {
     "configVersion": {
-      "const": 1
+      "enum": [1, 2]
     },
     "agent": {
       "type": "object",
@@ -38,20 +38,11 @@
       "propertyNames": {
         "$ref": "#/$defs/id"
       },
-      "additionalProperties": {
-        "oneOf": [
-          {
-            "$ref": "#/$defs/x402"
-          },
-          {
-            "$ref": "#/$defs/mpp"
-          }
-        ]
-      }
+      "additionalProperties": { "$ref": "#/$defs/envarBalance" }
     },
     "services": {
       "type": "array",
-      "minItems": 1,
+      "minItems": 0,
       "maxItems": 64,
       "items": {
         "$ref": "#/$defs/service"
@@ -67,77 +58,20 @@
       "type": "string",
       "pattern": "^[1-9][0-9]{0,77}$"
     },
-    "address": {
-      "type": "string",
-      "pattern": "^0x[0-9a-fA-F]{40}$"
-    },
     "httpUrl": {
       "type": "string",
       "format": "uri",
       "pattern": "^https?://",
       "maxLength": 2048
     },
-    "x402": {
+    "envarBalance": {
       "type": "object",
       "additionalProperties": false,
-      "required": [
-        "adapter",
-        "scheme",
-        "network",
-        "asset",
-        "payTo",
-        "facilitatorUrl"
-      ],
+      "required": ["adapter", "currency", "accountRef"],
       "properties": {
-        "adapter": {
-          "const": "x402"
-        },
-        "scheme": {
-          "const": "exact"
-        },
-        "network": {
-          "type": "string",
-          "pattern": "^eip155:[1-9][0-9]*$"
-        },
-        "asset": {
-          "$ref": "#/$defs/address"
-        },
-        "payTo": {
-          "$ref": "#/$defs/address"
-        },
-        "facilitatorUrl": {
-          "type": "string",
-          "format": "uri",
-          "pattern": "^https://"
-        }
-      }
-    },
-    "mpp": {
-      "type": "object",
-      "additionalProperties": false,
-      "required": [
-        "adapter",
-        "method",
-        "intent",
-        "currency",
-        "accountRef"
-      ],
-      "properties": {
-        "adapter": {
-          "const": "mpp"
-        },
-        "method": {
-          "const": "stripe"
-        },
-        "intent": {
-          "const": "charge"
-        },
-        "currency": {
-          "const": "usd"
-        },
-        "accountRef": {
-          "$ref": "#/$defs/id"
-        }
+        "adapter": { "const": "envar_balance" },
+        "currency": { "const": "usd" },
+        "accountRef": { "$ref": "#/$defs/id" }
       }
     },
     "service": {
@@ -165,20 +99,27 @@
           "maximum": 2147483647
         },
         "execution": {
-          "type": "object",
-          "additionalProperties": false,
-          "required": [
-            "type",
-            "cardUrl"
-          ],
-          "properties": {
-            "type": {
-              "const": "a2a"
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": false,
+              "required": ["type", "cardUrl"],
+              "properties": {
+                "type": { "const": "a2a" },
+                "cardUrl": { "$ref": "#/$defs/httpUrl" }
+              }
             },
-            "cardUrl": {
-              "$ref": "#/$defs/httpUrl"
+            {
+              "type": "object",
+              "additionalProperties": false,
+              "required": ["type", "cardUrl", "skillDigest"],
+              "properties": {
+                "type": { "const": "skill" },
+                "cardUrl": { "$ref": "#/$defs/httpUrl" },
+                "skillDigest": { "type": "string", "pattern": "^[0-9a-f]{64}$" }
+              }
             }
-          }
+          ]
         },
         "contract": {
           "type": "object",

package/dist/commerce/buyer-store.d.ts

@@ -1,101 +0,0 @@
-import type { PaymentRequired, PaymentRequirements, SettleResponse } from '@x402/core/types';
-import type { Challenge } from 'mppx';
-import type { MppReceipt } from './mpp-client.js';
-import { type BuyerPolicy, type Input } from './types.js';
-export interface BuyerQuote {
-    messageId: string;
-    payer: string;
-    amount: string;
-    currency: string | null;
-    recipient: string | null;
-    expiresAt: string;
-    serviceId: string;
-    serviceRevision: number;
-    offerId: string;
-    inputDigest: string;
-    termsDigest: string;
-    quoteId: string;
-    /** Absent for the original seller-advertised EnvarPay contract. */
-    termsSource?: 'local-policy';
-}
-export interface BuyerRecord {
-    id: string;
-    caller: string;
-    peerId: string;
-    cardUrl: string;
-    endpoint: string;
-    messageId: string;
-    fingerprint: string;
-    body: string;
-    quoteToken: string;
-    quote: BuyerQuote;
-    input: Input;
-    inputSchema: Record<string, unknown>;
-    peerMode?: 'standard-a2a';
-    standardBinding?: {
-        policyDigest: string;
-        bodyDigest: string;
-        challengeDigest: string;
-    };
-    continuations?: {
-        messageId: string;
-        input: Input;
-        body?: string;
-        state: 'pending' | 'unknown' | 'resolved';
-        beforeDigest: string;
-    }[];
-    protocol?: 'x402' | 'mpp' | 'free';
-    mppChallenge?: Challenge.Challenge;
-    tokenOperationId?: string;
-    tokenRef?: string;
-    mppMode?: 'test' | 'live';
-    mppPaymentMethod?: string;
-    required?: PaymentRequired;
-    requirements?: PaymentRequirements;
-    createdAt: string;
-    updatedAt: string;
-    state: 'previewed' | 'signing' | 'submitted' | 'unknown' | 'completed' | 'failed';
-    paymentState: 'quoted' | 'reserved' | 'unknown' | 'confirmed' | 'rejected' | 'not_required';
-    executionState: string;
-    credentialRef?: string;
-    nonce?: string;
-    fromBlock?: string;
-    receipt?: SettleResponse | MppReceipt;
-    task?: Record<string, unknown>;
-    result?: unknown;
-    errorCode?: string;
-    rejectionEvidence?: {
-        kind: 'finalized_expired_unused';
-        checkedAt: string;
-        nonce: string;
-    };
-}
-/** One wallet ledger, one process. Unknown authorizations retain cumulative budget. */
-export declare class BuyerStore {
-    private readonly db;
-    private readonly owner?;
-    constructor(path: string);
-    close(): void;
-    private transaction;
-    get(id: string, caller: string): BuyerRecord | undefined;
-    assertMessageOwner(caller: string, messageId: string): void;
-    find(caller: string, messageId: string): BuyerRecord | undefined;
-    insert(value: Omit<BuyerRecord, 'id' | 'createdAt' | 'updatedAt' | 'state' | 'paymentState' | 'executionState'>): BuyerRecord;
-    update(id: string, patch: Partial<Pick<BuyerRecord, 'state' | 'paymentState' | 'executionState' | 'credentialRef' | 'nonce' | 'fromBlock' | 'receipt' | 'task' | 'result' | 'errorCode' | 'continuations' | 'tokenOperationId' | 'tokenRef' | 'rejectionEvidence'>>): BuyerRecord;
-    pendingTasks(): BuyerRecord[];
-    usage(currency: string): {
-        reserved: string;
-        spent: string;
-    };
-    reserve(id: string, caller: string, policy: BuyerPolicy): {
-        record: BuyerRecord;
-        fresh: boolean;
-    };
-    beginFree(id: string, caller: string): {
-        record: BuyerRecord;
-        fresh: boolean;
-    };
-    rejectBeforeSigning(id: string, caller: string, errorCode: string): BuyerRecord;
-    rejectExpiredAuthorization(id: string, caller: string): BuyerRecord;
-    confirmed(id: string, receipt: SettleResponse | MppReceipt): BuyerRecord;
-}