nodpay 0.2.37 → 0.2.38

package/package.json

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

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 {