nodpay 0.2.41 → 0.2.43

package/package.json

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

package/scripts/propose.mjs

@@ -85,6 +85,31 @@ 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}`;
 
+// --- CLI argument parsing (must precede remote_wallet branch) ---
+const args = process.argv.slice(2);
+function getArg(name) {
+  const idx = args.indexOf(name);
+  return idx !== -1 ? args[idx + 1] : undefined;
+}
+function hasFlag(name) {
+  return args.includes(name);
+}
+
+const to = getArg('--to');
+const valueEth = getArg('--value-eth') || getArg('--value') || '0';
+const safeOverride = getArg('--safe');
+let isCounterfactual = hasFlag('--counterfactual');
+const humanSigner = getArg('--human-signer-eoa');
+const salt = getArg('--salt') || '1001';
+
+// Passkey support
+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';
+let recoverySigner = getArg('--recovery-signer');
+let isPasskey = !!(passkeyX && passkeyY);
+
 // --- Agent key resolution: remote_wallet (config.json) or local key ---
 const _config = loadConfig();
 const _remoteWalletUrl = _config.remote_wallet || null;
@@ -154,30 +179,6 @@ if (_remoteWalletUrl) {
   };
 }
 
-const args = process.argv.slice(2);
-function getArg(name) {
-  const idx = args.indexOf(name);
-  return idx !== -1 ? args[idx + 1] : undefined;
-}
-function hasFlag(name) {
-  return args.includes(name);
-}
-
-const to = getArg('--to');
-const valueEth = getArg('--value-eth') || getArg('--value') || '0';
-const safeOverride = getArg('--safe');
-let isCounterfactual = hasFlag('--counterfactual');
-const humanSigner = getArg('--human-signer-eoa');
-const salt = getArg('--salt') || '1001';
-
-// Passkey support
-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';
-let recoverySigner = getArg('--recovery-signer');
-let isPasskey = !!(passkeyX && passkeyY);
-
 // remote_wallet + --human-signer-eoa is not supported
 if (_remoteWalletUrl && humanSigner) {
   console.error(JSON.stringify({ error: 'remote_wallet and --human-signer-eoa cannot be combined. Remote mode only supports passkey wallets.' }));
@@ -656,14 +657,15 @@ try {
       result.opStoreError = storeData.error || `HTTP ${storeRes.status}`;
     }
     if (storeData.shortHash) {
-      const webBase = env('WEB_APP_URL', 'https://nodpay.ai/');
+      // approve_base from config.json (SafeClaw) or default nodpay.ai
+      const approveBase = _config.approve_base || `${env('WEB_APP_URL', 'https://nodpay.ai/')}approve`;
       // Build approve URL with passkey params for SafeClaw users (no localStorage)
       const approveParams = new URLSearchParams({ safeOpHash: storeData.safeOpHash });
       if (passkeyX) approveParams.set('px', passkeyX);
       if (passkeyY) approveParams.set('py', passkeyY);
       if (recoverySigner) approveParams.set('recovery', recoverySigner);
       if (walletRpId) approveParams.set('rpId', walletRpId);
-      approveUrl = `${webBase}approve?${approveParams.toString()}`;
+      approveUrl = `${approveBase}?${approveParams.toString()}`;
       result.approveUrl = approveUrl;
       result.opStoreSafeOpHash = storeData.safeOpHash;
       result.opStoreShortHash = storeData.shortHash;