nodpay 0.2.36 → 0.2.38

package/bin/nodpay.mjs

@@ -2,6 +2,20 @@
 
 const command = process.argv[2];
 
+// Remote wallet routing: if config.json has remote_wallet and command is sign/wallets,
+// delegate to SafeClaw vault proxy (HTTP passthrough) instead of local execution.
+const REMOTE_COMMANDS = new Set(['sign', 'wallets']);
+if (command && REMOTE_COMMANDS.has(command)) {
+  const { loadConfig } = await import('../scripts/config.mjs');
+  const config = loadConfig();
+  if (config.remote_wallet) {
+    const { remoteSign, remoteWallets } = await import('../scripts/remote.mjs');
+    if (command === 'sign') await remoteSign(config.remote_wallet);
+    else if (command === 'wallets') await remoteWallets(config.remote_wallet);
+    process.exit(0);
+  }
+}
+
 if (command === 'propose') {
   // Forward all args after 'propose' to the propose script
   const scriptPath = new URL('../scripts/propose.mjs', import.meta.url).pathname;
@@ -23,6 +37,14 @@ if (command === 'propose') {
   const scriptPath = new URL('../scripts/gasprice.mjs', import.meta.url).pathname;
   process.argv = [process.argv[0], scriptPath, ...process.argv.slice(3)];
   await import(scriptPath);
+} else if (command === 'sign') {
+  const scriptPath = new URL('../scripts/sign.mjs', import.meta.url).pathname;
+  process.argv = [process.argv[0], scriptPath, ...process.argv.slice(3)];
+  await import(scriptPath);
+} else if (command === 'wallets') {
+  const scriptPath = new URL('../scripts/wallets.mjs', import.meta.url).pathname;
+  process.argv = [process.argv[0], scriptPath, ...process.argv.slice(3)];
+  await import(scriptPath);
 } else if (command === 'version' || command === '--version' || command === '-v') {
   const { readFileSync } = await import('fs');
   const pkg = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
@@ -36,6 +58,8 @@ Commands:
   txs       List pending and completed transactions
   nonce     Query next nonce from on-chain EntryPoint
   gasprice  Get current gas price and estimated gas cost per chain
+  sign      Sign a hash with agent key (stdin JSON)
+  wallets   List all local wallets (JSON array)
 
 Examples:
   nodpay keygen
@@ -43,6 +67,12 @@ Examples:
   nodpay txs --safe 0x...
   nodpay nonce --safe 0x... --chain base
   nodpay gasprice --chain base
+  echo '{"hash":"0x..."}' | nodpay sign
+  nodpay wallets
+
+Remote wallet (SafeClaw):
+  Set ~/.nodpay/config.json: {"remote_wallet": "http://localhost:23295/nodpay"}
+  sign/wallets will delegate to SafeClaw vault proxy automatically.
 
 Docs: https://nodpay.ai/skill.md`);
   process.exit(command ? 1 : 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodpay",
-  "version": "0.2.36",
+  "version": "0.2.38",
   "description": "NodPay CLI — propose on-chain payments from agent-human shared wallets",
   "type": "module",
   "bin": {

package/scripts/config.mjs

@@ -0,0 +1,20 @@
+/**
+ * Load ~/.nodpay/config.json (optional).
+ *
+ * Returns parsed config or {} if file doesn't exist / is invalid.
+ */
+
+import { readFileSync, existsSync } from 'fs';
+import { join } from 'path';
+import { HOME } from './env.mjs';
+
+const CONFIG_PATH = join(HOME, '.nodpay', 'config.json');
+
+export function loadConfig(path = CONFIG_PATH) {
+  if (!existsSync(path)) return {};
+  try {
+    return JSON.parse(readFileSync(path, 'utf8'));
+  } catch {
+    return {};
+  }
+}

package/scripts/propose.mjs

@@ -32,6 +32,7 @@ import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 import { computeUserOpHash, ENTRYPOINT } from '@nodpay/core';
 import { loadDotEnv, env, HOME } from './env.mjs';
+import { loadConfig } from './config.mjs';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const PENDING_DIR = join(__dirname, '..', '.pending-txs');
@@ -85,7 +86,9 @@ const DEFAULT_SAFE = null; // always use --safe flag
 const opStoreBase = env('OP_STORE_URL', 'https://nodpay.ai/api');
 const BUNDLER_URL = `${opStoreBase}/bundler/${CHAIN_ID}`;
 
-// --- Agent key: remote signer (SafeClaw proxy) or local key (~/.nodpay/.env) ---
+// --- Agent key resolution: remote_wallet (config.json) > --remote-signer > local key ---
+const _config = loadConfig();
+const _remoteWalletUrl = _config.remote_wallet || null;
 const _remoteSignerUrl = process.argv.includes('--remote-signer')
   ? process.argv[process.argv.indexOf('--remote-signer') + 1]
   : undefined;
@@ -93,9 +96,41 @@ const _remoteSignerUrl = process.argv.includes('--remote-signer')
 let AGENT_ADDRESS;
 let signHash;
 let _localAgentKey; // only set in local mode, used for SDK init (EOA signer)
+let _remoteWalletsCache = null; // cached wallets from remote_wallet fetch
 
-if (_remoteSignerUrl) {
-  // Remote signer mode: get address + signing from SafeClaw proxy
+if (_remoteWalletUrl) {
+  // remote_wallet mode (config.json): get agent address from wallets, sign via proxy
+  const walletsRes = await fetch(`${_remoteWalletUrl.replace(/\/$/, '')}/wallets`);
+  if (!walletsRes.ok) {
+    const err = await walletsRes.json().catch(() => ({}));
+    console.error(JSON.stringify({
+      error: err.error || 'Failed to get wallets from remote_wallet',
+      code: err.code || 'REMOTE_WALLET_ERROR'
+    }));
+    process.exit(1);
+  }
+  const wallets = await walletsRes.json();
+  _remoteWalletsCache = wallets;
+  if (!wallets.length || !wallets[0].agentSigner) {
+    console.error(JSON.stringify({ error: 'No wallets found on remote_wallet' }));
+    process.exit(1);
+  }
+  AGENT_ADDRESS = wallets[0].agentSigner;
+
+  signHash = async (hash) => {
+    const signRes = await fetch(`${_remoteWalletUrl.replace(/\/$/, '')}/sign`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ hash })
+    });
+    if (!signRes.ok) {
+      const err = await signRes.json().catch(() => ({}));
+      throw new Error(err.error || 'Remote signing failed');
+    }
+    return (await signRes.json()).signature;
+  };
+} else if (_remoteSignerUrl) {
+  // Legacy --remote-signer mode (deprecated, use config.json remote_wallet)
   const addrRes = await fetch(`${_remoteSignerUrl}/address`);
   if (!addrRes.ok) {
     const err = await addrRes.json().catch(() => ({}));
@@ -123,7 +158,7 @@ if (_remoteSignerUrl) {
   // Local mode: read key from process.env (loaded from real env or ~/.nodpay/.env)
   const NODPAY_AGENT_KEY = env('NODPAY_AGENT_KEY');
   if (!NODPAY_AGENT_KEY) {
-    console.error(JSON.stringify({ error: 'Missing NODPAY_AGENT_KEY — set env var, add to ~/.nodpay/.env, or use --remote-signer' }));
+    console.error(JSON.stringify({ error: 'Missing NODPAY_AGENT_KEY — set env var, add to ~/.nodpay/.env, or set remote_wallet in ~/.nodpay/config.json' }));
     process.exit(1);
   }
   _localAgentKey = NODPAY_AGENT_KEY;
@@ -160,9 +195,9 @@ const passkeyVerifier = getArg('--passkey-verifier') || '0x445a0683e494ea0c5AF3E
 const recoverySigner = getArg('--recovery-signer');
 const isPasskey = !!(passkeyX && passkeyY);
 
-// Phase 1: --remote-signer + --human-signer-eoa is not supported
-if (_remoteSignerUrl && humanSigner) {
-  console.error(JSON.stringify({ error: '--remote-signer and --human-signer-eoa cannot be combined. Remote signer mode only supports passkey wallets.' }));
+// Phase 1: remote modes + --human-signer-eoa is not supported
+if ((_remoteSignerUrl || _remoteWalletUrl) && humanSigner) {
+  console.error(JSON.stringify({ error: 'Remote signer/wallet and --human-signer-eoa cannot be combined. Remote mode only supports passkey wallets.' }));
   process.exit(1);
 }
 
@@ -179,8 +214,13 @@ if (!ethers.isAddress(to)) {
 const SAFE_ADDRESS = safeOverride || DEFAULT_SAFE;
 
 // Read optional wallet JSON for rpId (SafeClaw cross-origin passkey support)
+// In remote_wallet mode, wallets were already fetched — use that data.
 let walletRpId = null;
-if (SAFE_ADDRESS) {
+if (SAFE_ADDRESS && _remoteWalletUrl && _remoteWalletsCache) {
+  const match = _remoteWalletsCache.find(w => w.safe?.toLowerCase() === SAFE_ADDRESS.toLowerCase());
+  if (match?.rpId) walletRpId = match.rpId;
+}
+if (!walletRpId && SAFE_ADDRESS) {
   const walletJsonPath = join(HOME, '.nodpay', 'wallets', `${SAFE_ADDRESS}.json`);
   if (existsSync(walletJsonPath)) {
     try {

package/scripts/remote.mjs

@@ -0,0 +1,58 @@
+/**
+ * Remote wallet proxy — delegates sign/wallets to SafeClaw vault proxy.
+ *
+ * Used when ~/.nodpay/config.json has "remote_wallet" set.
+ * Transparent: stdin/stdout/stderr/exitCode passthrough.
+ */
+
+/**
+ * POST {base}/sign — pipe stdin as body, stdout the response.
+ * @param {string} base - remote_wallet URL (e.g. http://localhost:23295/nodpay)
+ */
+export async function remoteSign(base) {
+  // Read stdin
+  const chunks = [];
+  for await (const chunk of process.stdin) chunks.push(chunk);
+  const body = Buffer.concat(chunks).toString('utf8').trim();
+
+  if (!body) {
+    console.error(JSON.stringify({ error: 'Empty stdin. Expected JSON: {"hash":"0x..."}' }));
+    process.exit(1);
+  }
+
+  try {
+    const res = await fetch(`${base.replace(/\/$/, '')}/sign`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body,
+    });
+    const text = await res.text();
+    if (!res.ok) {
+      console.error(text);
+      process.exit(1);
+    }
+    console.log(text);
+  } catch (e) {
+    console.error(JSON.stringify({ error: `Remote sign failed: ${e.message}` }));
+    process.exit(1);
+  }
+}
+
+/**
+ * GET {base}/wallets — stdout the response.
+ * @param {string} base - remote_wallet URL
+ */
+export async function remoteWallets(base) {
+  try {
+    const res = await fetch(`${base.replace(/\/$/, '')}/wallets`);
+    const text = await res.text();
+    if (!res.ok) {
+      console.error(text);
+      process.exit(1);
+    }
+    console.log(text);
+  } catch (e) {
+    console.error(JSON.stringify({ error: `Remote wallets failed: ${e.message}` }));
+    process.exit(1);
+  }
+}

package/scripts/sign.mjs

@@ -0,0 +1,51 @@
+#!/usr/bin/env node
+/**
+ * Sign a hash with the agent's private key.
+ *
+ * Reads JSON from stdin: {"hash": "0x..."}
+ * Outputs JSON to stdout: {"signature": "0x..."}
+ *
+ * Key source: process.env.NODPAY_AGENT_KEY (real env > ~/.nodpay/.env file)
+ *
+ * Usage:
+ *   echo '{"hash":"0xabc..."}' | npx nodpay sign
+ */
+
+import { ethers } from 'ethers';
+import { loadDotEnv, env } from './env.mjs';
+
+// Load .env file (real env takes priority)
+loadDotEnv();
+
+const NODPAY_AGENT_KEY = env('NODPAY_AGENT_KEY');
+if (!NODPAY_AGENT_KEY) {
+  console.error(JSON.stringify({ error: 'Missing NODPAY_AGENT_KEY — set env var or add to ~/.nodpay/.env' }));
+  process.exit(1);
+}
+
+// Read stdin
+const chunks = [];
+for await (const chunk of process.stdin) chunks.push(chunk);
+const input = Buffer.concat(chunks).toString('utf8').trim();
+
+if (!input) {
+  console.error(JSON.stringify({ error: 'Empty stdin. Expected JSON: {"hash":"0x..."}' }));
+  process.exit(1);
+}
+
+try {
+  const { hash } = JSON.parse(input);
+  if (!hash || !hash.startsWith('0x')) {
+    console.error(JSON.stringify({ error: 'Invalid input. Expected {"hash":"0x..."}' }));
+    process.exit(1);
+  }
+
+  const wallet = new ethers.Wallet(NODPAY_AGENT_KEY);
+  const sig = wallet.signingKey.sign(hash);
+  const signature = ethers.Signature.from(sig).serialized;
+
+  console.log(JSON.stringify({ signature }));
+} catch (e) {
+  console.error(JSON.stringify({ error: e.message || String(e) }));
+  process.exit(1);
+}

package/scripts/wallets.mjs

@@ -0,0 +1,38 @@
+#!/usr/bin/env node
+/**
+ * List all local NodPay wallets.
+ *
+ * Reads ~/.nodpay/wallets/*.json and outputs a JSON array to stdout.
+ *
+ * Usage:
+ *   npx nodpay wallets
+ *   npx nodpay wallets --json   (same, explicit)
+ */
+
+import { readdirSync, readFileSync, existsSync } from 'fs';
+import { join } from 'path';
+import { HOME } from './env.mjs';
+
+const WALLETS_DIR = join(HOME, '.nodpay', 'wallets');
+
+if (!existsSync(WALLETS_DIR)) {
+  console.log(JSON.stringify([]));
+  process.exit(0);
+}
+
+try {
+  const files = readdirSync(WALLETS_DIR).filter(f => f.endsWith('.json'));
+  const wallets = [];
+  for (const file of files) {
+    try {
+      const data = JSON.parse(readFileSync(join(WALLETS_DIR, file), 'utf8'));
+      wallets.push(data);
+    } catch {
+      // Skip invalid JSON files
+    }
+  }
+  console.log(JSON.stringify(wallets, null, 2));
+} catch (e) {
+  console.error(JSON.stringify({ error: e.message || String(e) }));
+  process.exit(1);
+}