nodpay 0.2.32 → 0.2.33

package/SKILL.md

@@ -31,7 +31,7 @@ You propose payments, your human approves with one tap. 2-of-3 multisig — you
 | **Zero Trust** | **End-to-end verification:** no party is implicitly trusted. Server validates signatures; client and CLI independently verify server responses (decode calldata → recompute hash → recover signer → check owner set). The blockchain serves as the canonical source of truth. |
 | **Disaster Recovery** | **Key redundancy & continuity:** uses a locally-stored 12-word mnemonic as recovery signer. Any two of the three signers can reconstruct authority to unlock the wallet, ensuring the user is never locked out by a single lost credential. |
 | **Hardened Key Isolation** | `keygen` writes to `~/.nodpay/.env` (chmod 600). The CLI reads the key via file I/O at runtime — not passed through CLI arguments, environment variables, or stdout. Only the public address is returned to the caller. |
-| **Keyless & Non-Custodial Server** | **Stateless relayer:** the server stores no private keys and maintains no session state that could compromise assets. All signing happens locally. Funds stay on-chain if the server goes offline. |
+| **Keyless & Non-Custodial Server** | **Stateless relayer:** the server stores no private keys, no passkey credentials, and no session state. Identity verification uses CREATE2 address prediction + cryptographic signatures — zero trusted storage. Funds stay on-chain if the server goes offline. |
 
 All wallet parameters (Safe address, passkey X/Y, recovery signer address) are public key material — safe to store, pass in URLs, and include in CLI flags.
 
@@ -181,16 +181,18 @@ Wallet address is the same across all chains. **Ask which chain if not specified
 
 ## Reconnect
 
-Browser data cleared? Build a reconnect link from the wallet's stored parameters (all public — no secrets):
+Browser data cleared? Build a reconnect link from the wallet's stored parameters (all public — no secrets).
+
+**You MUST include `signerType`** — the client uses it to show the correct verification flow.
 
 **Passkey:**
 ```
-https://nodpay.ai/?agent=AGENT_SIGNER&safe=SAFE_ADDRESS&recovery=RECOVERY_SIGNER&x=PASSKEY_X&y=PASSKEY_Y
+https://nodpay.ai/?agent=AGENT_SIGNER&safe=SAFE_ADDRESS&recovery=RECOVERY_SIGNER&signerType=passkey&x=PASSKEY_X&y=PASSKEY_Y
 ```
 
 **EOA:**
 ```
-https://nodpay.ai/?agent=AGENT_SIGNER&safe=SAFE_ADDRESS&recovery=RECOVERY_SIGNER&eoa=HUMAN_SIGNER_EOA
+https://nodpay.ai/?agent=AGENT_SIGNER&safe=SAFE_ADDRESS&recovery=RECOVERY_SIGNER&signerType=eoa&eoa=HUMAN_SIGNER_EOA
 ```
 
-User opens → verifies identity → wallet restored.
+User opens → verifies identity (passkey assertion or MetaMask connect) → wallet restored.

package/package.json

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

package/scripts/propose.mjs

@@ -309,7 +309,50 @@ try {
 
   const safe4337Pack = await Safe4337Pack.init(initOptions);
 
-  const safeAddress = await safe4337Pack.protocolKit.getAddress();
+  let safeAddress = await safe4337Pack.protocolKit.getAddress();
+
+  // --- Ethereum mainnet: force L2 singleton for cross-chain address consistency ---
+  //
+  // Safe SDK defaults to the L1 singleton on chainId 1, but all other chains use the L2
+  // singleton. Different singleton → different CREATE2 address → cross-chain mismatch.
+  //
+  // The L2 singleton (0x29fc...) IS deployed on Ethereum mainnet. Using it there costs
+  // ~2.3% more gas per tx (~$0.14 at 15 Gwei) due to extra event emissions — acceptable.
+  //
+  // Trade-off: safe.global may not fully index L2-singleton Safes on mainnet (their L1
+  // indexer uses trace-based filtering by known singleton addresses). NodPay uses its own
+  // op-store, so this doesn't affect us.
+  //
+  // Long-term plan: support separate L1/L2 wallet families — user chooses at creation time.
+  // For now, we unify on L2 singleton across all chains for address consistency.
+  if (
+    isCounterfactual &&
+    CHAIN_ID === '1' &&
+    SAFE_ADDRESS &&
+    safeAddress.toLowerCase() !== SAFE_ADDRESS.toLowerCase()
+  ) {
+    const Safe = (await import('@safe-global/protocol-kit')).default;
+    // getPredictedSafe() returns the full config Safe4337Pack assembled — owners, threshold,
+    // module setup (to/data), fallbackHandler, salt, etc. We re-init with the same config
+    // but isL1SafeSingleton=false so the SDK picks L2 singleton.
+    const predictedSafe = safe4337Pack.protocolKit.getPredictedSafe();
+    safe4337Pack.protocolKit = await Safe.init({
+      provider: RPC_URL,
+      signer: initOptions.signer,
+      isL1SafeSingleton: false,
+      predictedSafe,
+    });
+    safeAddress = await safe4337Pack.protocolKit.getAddress();
+  }
+
+  // Safety check: if --safe was explicitly given, the computed address MUST match.
+  // Mismatch means owner set / salt / SDK version differs from wallet creation — abort.
+  if (SAFE_ADDRESS && safeAddress.toLowerCase() !== SAFE_ADDRESS.toLowerCase()) {
+    console.error(JSON.stringify({
+      error: `Address mismatch: --safe ${SAFE_ADDRESS} but SDK computed ${safeAddress}. Check --human-signer-eoa, --recovery-signer, and --salt match the original wallet creation params.`
+    }));
+    process.exit(1);
+  }
 
   // Auto-detect deployment status: if Safe is already deployed, drop counterfactual
   if (isCounterfactual) {