nodpay 0.2.39 → 0.2.40

package/package.json

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

package/scripts/propose.mjs

@@ -177,19 +177,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 +512,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 +567,7 @@ try {
     userOpHash: entryPointUserOpHash,
     safeOpHash,
     shortId,
-    to,
+    to: resolvedTo,
     value,
     valueEth,
     safeAddress,
@@ -553,7 +587,7 @@ try {
   const storePayload = {
     safeOperationJson,
     userOpHash: entryPointUserOpHash,
-    to,
+    to: resolvedTo,
     value,
     valueEth,
     safeAddress,