nodpay 0.2.39 → 0.2.41

package/package.json

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

package/scripts/propose.mjs

@@ -113,6 +113,18 @@ if (_remoteWalletUrl) {
   }
   AGENT_ADDRESS = wallets[0].agentSigner;
 
+  // remote_wallet: extract passkey/recovery from wallet data for approvalContext
+  // (CLI args take precedence if provided, but agents in remote_wallet mode don't pass them)
+  const rw = wallets[0];
+  if (!passkeyX && rw.humanSignerPasskeyX) {
+    passkeyX = rw.humanSignerPasskeyX;
+    passkeyY = rw.humanSignerPasskeyY;
+    isPasskey = true;
+  }
+  if (!recoverySigner && rw.recoverySigner) {
+    recoverySigner = rw.recoverySigner;
+  }
+
   signHash = async (hash) => {
     const signRes = await fetch(`${_remoteWalletUrl.replace(/\/$/, '')}/sign`, {
       method: 'POST',
@@ -159,12 +171,12 @@ const humanSigner = getArg('--human-signer-eoa');
 const salt = getArg('--salt') || '1001';
 
 // Passkey support
-const passkeyX = getArg('--human-signer-passkey-x');
-const passkeyY = getArg('--human-signer-passkey-y');
+let passkeyX = getArg('--human-signer-passkey-x');
+let passkeyY = getArg('--human-signer-passkey-y');
 const passkeyRawId = getArg('--passkey-raw-id');
 const passkeyVerifier = getArg('--passkey-verifier') || '0x445a0683e494ea0c5AF3E83c5159fBE47Cf9e765';
-const recoverySigner = getArg('--recovery-signer');
-const isPasskey = !!(passkeyX && passkeyY);
+let recoverySigner = getArg('--recovery-signer');
+let isPasskey = !!(passkeyX && passkeyY);
 
 // remote_wallet + --human-signer-eoa is not supported
 if (_remoteWalletUrl && humanSigner) {
@@ -177,19 +189,53 @@ if (!to) {
   process.exit(1);
 }
 
+// ENS support: if --to is not a raw 0x address, try resolving as ENS name.
+// ENS registry lives on Ethereum mainnet — always resolve against mainnet RPC,
+// regardless of the target --chain.
+let resolvedTo = to;
 if (!ethers.isAddress(to)) {
-  console.error(JSON.stringify({ error: `Invalid recipient address: ${to}` }));
-  process.exit(1);
+  if (!to.includes('.')) {
+    console.error(JSON.stringify({ error: `Invalid recipient address: ${to} (not a valid address or ENS name)` }));
+    process.exit(1);
+  }
+  try {
+    const ensRpcUrl = NETWORKS.mainnet.ethereum?.rpcUrl;
+    if (!ensRpcUrl) {
+      console.error(JSON.stringify({ error: `Cannot resolve ENS name "${to}": no Ethereum mainnet RPC available` }));
+      process.exit(1);
+    }
+    const ensProvider = new ethers.JsonRpcProvider(ensRpcUrl);
+    const resolved = await ensProvider.resolveName(to);
+    if (!resolved) {
+      console.error(JSON.stringify({ error: `Cannot resolve ENS name: ${to}` }));
+      process.exit(1);
+    }
+    resolvedTo = resolved;
+    console.error(`[INFO] Resolved ENS ${to} → ${resolved}`);
+  } catch (e) {
+    console.error(JSON.stringify({ error: `Cannot resolve ENS name "${to}": ${e.message}` }));
+    process.exit(1);
+  }
 }
 
 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.
+// rpId MUST be present in approveUrl when available, otherwise the web app
+// defaults to rpId=nodpay.ai which causes passkey mismatch errors.
 let walletRpId = null;
-if (SAFE_ADDRESS && _remoteWalletUrl && _remoteWalletsCache) {
-  const match = _remoteWalletsCache.find(w => w.safe?.toLowerCase() === SAFE_ADDRESS.toLowerCase());
-  if (match?.rpId) walletRpId = match.rpId;
+if (_remoteWalletUrl && _remoteWalletsCache) {
+  // Try exact safe match first
+  if (SAFE_ADDRESS) {
+    const match = _remoteWalletsCache.find(w => w.safe?.toLowerCase() === SAFE_ADDRESS.toLowerCase());
+    if (match?.rpId) walletRpId = match.rpId;
+  }
+  // Fallback: use rpId from any wallet in cache (remote proxy typically serves one wallet set)
+  if (!walletRpId) {
+    const withRpId = _remoteWalletsCache.find(w => w.rpId);
+    if (withRpId) walletRpId = withRpId.rpId;
+  }
 }
 if (!walletRpId && SAFE_ADDRESS) {
   const walletJsonPath = join(HOME, '.nodpay', 'wallets', `${SAFE_ADDRESS}.json`);
@@ -478,7 +524,7 @@ try {
 
   // Create the transaction as a SafeOperation (UserOp wrapper)
   const safeOperation = await safe4337Pack.createTransaction({
-    transactions: [{ to, value, data: '0x' }],
+    transactions: [{ to: resolvedTo, value, data: '0x' }],
     options: txOptions,
   });
 
@@ -533,7 +579,7 @@ try {
     userOpHash: entryPointUserOpHash,
     safeOpHash,
     shortId,
-    to,
+    to: resolvedTo,
     value,
     valueEth,
     safeAddress,
@@ -548,12 +594,32 @@ try {
   writeFileSync(join(PENDING_DIR, `4337-${shortId}.json`), JSON.stringify(result, null, 2));
 
   // Store to op-store API for hash-based web app lookup
-  // NOTE: signerType intentionally NOT sent — it's determined by user's browser
-  // (localStorage), not by agent. See ARCHITECTURE.md Client Verification Chain.
+  // Build approvalContext: server-side approval context (replaces localStorage dependency)
+  const approvalContext = isPasskey
+    ? {
+        version: 1,
+        signerType: 'passkey',
+        rpId: walletRpId || 'nodpay.ai',
+        passkeyX,
+        passkeyY,
+        recoveryAddress: recoverySigner || null,
+        safeAddress,
+        chainId: parseInt(CHAIN_ID, 10),
+      }
+    : humanSigner
+      ? {
+          version: 1,
+          signerType: 'eoa',
+          humanSignerAddress: humanSigner,
+          safeAddress,
+          chainId: parseInt(CHAIN_ID, 10),
+        }
+      : null;
+
   const storePayload = {
     safeOperationJson,
     userOpHash: entryPointUserOpHash,
-    to,
+    to: resolvedTo,
     value,
     valueEth,
     safeAddress,
@@ -562,10 +628,12 @@ try {
     agent: AGENT_ADDRESS,
     agentSignature: safeOperationJson.signatures,
     createdAt: new Date().toISOString(),
-    // SafeClaw integration: passkey coordinates + recovery for approve page fallback
+    // Legacy fields (kept for URL-param fallback during transition)
     passkeyX: passkeyX || null,
     passkeyY: passkeyY || null,
     recoveryAddress: recoverySigner || null,
+    // Server-side approval context
+    approvalContext,
   };
 
   // Extract raw agent signature for server auth