nodpay 0.1.0 → 0.2.1

package/README.md

@@ -1,236 +1,48 @@
----
-name: nodpay
-description: Propose on-chain payments from a shared wallet. Use when user asks to send crypto, make a payment, or create a shared wallet.
-metadata:
-  { "openclaw": { "requires": { "env": ["NODPAY_AGENT_KEY"] }, "primaryEnv": "NODPAY_AGENT_KEY" } }
----
+# nodpay
 
-# NodPay — Agent Wallet
+Agent toolkit for [NodPay](https://nodpay.ai) — propose on-chain payments from a shared wallet.
 
-> Two minds, one wallet.
+> **This package is for AI agents.** If you're a human, visit [nodpay.ai](https://nodpay.ai).
 
-NodPay lets you (an AI agent) propose on-chain payments from a shared wallet. Your human co-signs with one tap. You cannot spend without their approval.
+## What NodPay does
 
-**When to use**: User asks you to send crypto, make a payment, or create a shared wallet.
-
-## How It Works
-
-```
-You (agent)          NodPay            User (human)
-    │                  │                    │
-    ├─ generate key ──►│                    │
-    ├─ send link ──────┼──────────────────►│
-    │                  │◄── create wallet ─┤
-    │◄── wallet info ──┤                    │
-    │                  │                    │
-    ├─ propose tx ────►│                    │
-    │                  ├── approve link ───►│
-    │                  │◄── sign + submit ─┤
-    │                  │                    │
-```
-
-The wallet is a **Safe 2-of-3 multisig**. You hold 1 key, the user holds 2 (passkey + recovery). You cannot move funds alone.
-
----
-
-## Setup (one-time)
-
-### 1. Install
-
-```bash
-git clone https://github.com/xhyumiracle/nodpay.git
-cd nodpay/skill && npm install
-```
-
-### 2. Set `NODPAY_AGENT_KEY` in your environment
-
-Generate one if you don't have it:
-
-```bash
-node -e "const w=require('ethers').Wallet.createRandom();console.log('Address:',w.address,'\nKey:',w.privateKey)"
-```
-
-Store the private key wherever your agent framework manages secrets (e.g. `.env`, system env vars). The address is your public agent identity.
-
-No bundler key needed — NodPay proxies bundler calls for you.
-
----
+You (an AI agent) and your human share a 2-of-3 multisig wallet. You propose transactions; the human approves or rejects each one. You cannot spend without their approval.
 
 ## Usage
 
-### Create a wallet
-
-Send the user this link:
-
-```
-https://nodpay.ai/?agent=YOUR_AGENT_ADDRESS
-```
-
-User opens → creates passkey → saves recovery phrase → gets a wallet. Takes 30 seconds.
-
-The user will copy wallet info back to you:
-
-```
-NodPay Wallet (Safe): 0x...
-Passkey X: 0x...
-Passkey Y: 0x...
-Agent: 0x...
-Recovery Signer: 0x...
-```
-
-**Store all fields** — you need them for proposing transactions.
-
-#### Wallet file management
-
-Store wallet info in `.nodpay/wallets/` in your workspace root (separate from skill code):
-
-```
-.nodpay/wallets/
-  0xAbC...123.json             # one file per wallet, named by Safe address
-```
-
-Each wallet file:
-
-```json
-{
-  "safe": "0x...",
-  "signerType": "passkey",
-  "passkeyX": "0x...",
-  "passkeyY": "0x...",
-  "recovery": "0x...",
-  "chain": "sepolia",
-  "createdAt": "2025-01-01"
-}
-```
-
-For EOA wallets, replace passkey fields with `"userSigner": "0x..."`.
-
-One agent key serves all wallets — multi-wallet is handled user-side (different passkeys/recovery keys → different Safe addresses, same agent).
-
-**⚠️ Verify the Agent address matches yours.** If it doesn't, the wallet is bound to someone else's key — alert the user and send a fresh link.
-
-**Multiple wallets**: A user may have multiple wallets (different devices, different passkeys). Before proposing, confirm which wallet to use — especially if you manage more than one.
-
-### Propose a transaction
-
-```bash
-NODPAY_AGENT_KEY=0x... \
-node scripts/propose.mjs \
-  --safe <WALLET_ADDRESS> \
-  --to <RECIPIENT> \
-  --value-eth <AMOUNT> \
-  --passkey-x <PASSKEY_X> \
-  --passkey-y <PASSKEY_Y> \
-  --recovery <RECOVERY_SIGNER> \
-  --signer-type passkey
-```
-
-The script outputs JSON with an `approveUrl`. Send it to the user:
-
-> 💰 Payment: 0.01 ETH → 0xRecipient...
-> 👉 Approve: https://nodpay.ai/approve?safeOpHash=0x...
-
-**First transaction deploys the wallet on-chain.** Pass `--passkey-x`, `--passkey-y`, and `--recovery` for the first tx. After deployment, `--safe` alone is sufficient (but passing all params is always safe).
-
-### Check balance
-
-```bash
-curl -s -X POST https://ethereum-sepolia-rpc.publicnode.com \
-  -H "Content-Type: application/json" \
-  -d '{"jsonrpc":"2.0","method":"eth_getBalance","params":["<WALLET_ADDRESS>","latest"],"id":1}'
-```
-
-If balance is 0, remind the user to deposit before proposing.
-
-### Check pending transactions
-
 ```bash
-curl https://nodpay.ai/api/txs?safe=<WALLET_ADDRESS>
+# No install needed
+NODPAY_AGENT_KEY=0x... npx nodpay propose \
+  --safe 0xWALLET --to 0xRECIPIENT --value-eth 0.01 \
+  --signer-type passkey --passkey-x 0x... --passkey-y 0x...
 ```
 
-Always check before proposing — this tells you the current nonce, pending ops, and wallet status.
+## Full guide
 
----
+**[nodpay.ai/skill.md](https://nodpay.ai/skill.md)** — complete setup + integration guide for agents (key generation, wallet creation, proposing, error handling).
 
-## Script Reference
+## How it works
 
-### Flags
-
-| Flag | Required | Description |
-|------|----------|-------------|
-| `--safe` | ✅ | Wallet (Safe) address |
-| `--to` | ✅ | Recipient address |
-| `--value-eth` | ✅ | Amount in ETH |
-| `--signer-type` | ✅ | `passkey` or `eoa` |
-| `--passkey-x` | passkey wallets | Passkey public key X |
-| `--passkey-y` | passkey wallets | Passkey public key Y |
-| `--user-signer` | eoa wallets | User's EOA address |
-| `--recovery` | first tx | Recovery signer address |
-| `--nonce` | ❌ | Force nonce (for replacements) |
-| `--purpose` | ❌ | Human-readable label |
-
-### Environment Variables
-
-| Var | Required | Description |
-|-----|----------|-------------|
-| `NODPAY_AGENT_KEY` | ✅ | Agent signing key |
-| `RPC_URL` | ❌ | RPC endpoint (default: Sepolia) |
-| `CHAIN_ID` | ❌ | Chain ID (default: 11155111) |
-| `PIMLICO_API_KEY` | ❌ | Own bundler key (optional, NodPay proxy is default) |
-
-### Supported Chains
-
-`sepolia`, `ethereum`, `base`, `base_sepolia`, `arbitrum`, `optimism`, `polygon`
-
-Set `RPC_URL` and `CHAIN_ID` for non-Sepolia chains. See `references/networks.json` for chain configs.
-
----
-
-## Transaction Patterns
-
-**Sequential**: Just call propose multiple times. Nonces auto-increment.
-
-**Replace**: Propose with `--nonce N` (same nonce as the pending tx). User picks which to approve.
-
-**Cascade**: Rejecting tx #N auto-invalidates all tx with nonce > N. This is irreversible.
-
-⚠️ **Never propose a new nonce then reject the old one** — the cascade will destroy your new tx too.
-
----
-
-## Reconnect (Wallet Recovery)
-
-If the user cleared their browser data, the wallet still exists on-chain. Build a reconnect link:
-
-```
-https://nodpay.ai/?agent=YOUR_AGENT_ADDRESS&safe=WALLET_ADDRESS&recovery=RECOVERY_SIGNER&x=PASSKEY_X&y=PASSKEY_Y
-```
+1. Agent generates a key → sends user a wallet creation link
+2. User creates a passkey wallet at nodpay.ai (30 seconds)
+3. Agent proposes transactions with `npx nodpay propose`
+4. User approves/rejects on their phone
 
-User opens → verifies passkey → wallet restored. No on-chain action needed.
+## Env
 
----
+| Variable | Required | Description |
+|----------|----------|-------------|
+| `NODPAY_AGENT_KEY` | ✅ | Agent's private key (hex) |
 
-## Security Model
+## Supported chains
 
-| Owner | Holder | Can do |
-|-------|--------|--------|
-| Agent EOA | You | Propose only |
-| Passkey | User's device | Approve or reject |
-| Recovery | User's 12-word phrase | Backup access |
+Ethereum · Base · Arbitrum · Optimism · Polygon · Sepolia · Base Sepolia
 
-- 2-of-3 threshold — you cannot execute alone
-- Passkey X/Y are public key material, safe to store
-- No private keys stored on NodPay's server
-- Funds are safe on-chain even if NodPay goes offline
+## Related
 
----
+- [`@nodpay/core`](https://www.npmjs.com/package/@nodpay/core) — Protocol primitives (hash, decode, verify)
+- [nodpay.ai](https://nodpay.ai) — Web app
 
-## Common Requests
+## License
 
-| User says | Action |
-|-----------|--------|
-| "create a wallet" | Send wallet creation link |
-| "send 0.1 ETH to 0x..." | Propose transaction |
-| "balance" | RPC `eth_getBalance` on Safe address |
-| "pending?" | `GET /api/txs?safe=...` |
-| "wallet disappeared" | Send reconnect link |
+MIT

package/SKILL.md

@@ -1,8 +1,10 @@
 ---
 name: nodpay
 description: Propose on-chain payments from a shared wallet. Use when user asks to send crypto, make a payment, or create a shared wallet.
-metadata:
-  { "openclaw": { "requires": { "env": ["NODPAY_AGENT_KEY"] }, "primaryEnv": "NODPAY_AGENT_KEY" } }
+openclaw:
+  requires:
+    env: [NODPAY_AGENT_KEY]
+  primaryEnv: NODPAY_AGENT_KEY
 ---
 
 # NodPay — Agent Wallet
@@ -16,16 +18,16 @@ NodPay lets you (an AI agent) propose on-chain payments from a shared wallet. Yo
 ## How It Works
 
 ```
-You (agent)                          User (human)
-    │                                     │
-    ├─ generate key ─────────────────────►│  (send setup link)
-    │                                     ├─ create wallet on NodPay
-    │◄── wallet info ─────────────────────┤  (user sends back wallet details)
-    │                                     │
-    ├─ propose tx ───► NodPay op-store    │
-    │                     ├── approve link ──►│
-    │                     │◄── sign + submit ─┤
-    │                                     │
+You (agent)              NodPay server           User (human)
+    │                         │                       │
+    ├── send setup link ──────┼─────────────────────►│
+    │                         │                       ├── create wallet
+    │◄── wallet info ─────────┼───────────────────────┤
+    │                         │                       │
+    ├── propose tx ──────────►│                       │
+    │                         ├── approve link ──────►│
+    │                         │◄── sign + submit ─────┤
+    │                         │                       │
 ```
 
 The wallet is a **Safe 2-of-3 multisig**. You hold 1 key, the user holds 2 (passkey + recovery). You cannot move funds alone.
@@ -54,7 +56,7 @@ Replace `YOUR_AGENT_ADDRESS` with your EOA address and send:
 
 **Use the URL above verbatim.** Do not search for NodPay or guess the URL — `nodpay.ai` is the only correct domain.
 
-User opens → creates passkey → saves recovery phrase → gets a wallet. They will copy wallet info back to you:
+The user will create the wallet and copy info back to you:
 
 ```
 NodPay Wallet (Safe): 0x...
@@ -66,9 +68,11 @@ Recovery Signer: 0x...
 
 **Store all fields** — you need them for proposing transactions.
 
+**After wallet creation**, tell the user their wallet is ready and the address works on any supported chain. Briefly offer: *"Want to try a test transaction on a testnet first?"* — only guide to testnets (Sepolia, etc.) if the user says yes.
+
 #### Wallet file management
 
-Store wallet info in `.nodpay/wallets/` in your workspace root (separate from skill code):
+Store wallet info in `.nodpay/wallets/` in your workspace root:
 
 ```
 .nodpay/wallets/
@@ -85,7 +89,6 @@ Each wallet file:
   "passkeyX": "0x...",
   "passkeyY": "0x...",
   "recovery": "0x...",
-  "chain": "sepolia",
   "createdAt": "2025-01-01"
 }
 ```
@@ -98,23 +101,11 @@ One agent key serves all wallets — multi-wallet is handled user-side (differen
 
 **⚠️ Verify the Agent address matches yours.** If it doesn't, the wallet is bound to someone else's key — alert the user and send a fresh link.
 
-**Multiple wallets**: A user may have multiple wallets (different devices, different passkeys). Before proposing, confirm which wallet to use — especially if you manage more than one.
-
 ### Propose a transaction
 
-First time only — install the propose script:
-
-```bash
-git clone https://github.com/xhyumiracle/nodpay.git
-cd nodpay/skill && npm install
-```
-
-Then propose:
-
 ```bash
-cd nodpay/skill && \
 NODPAY_AGENT_KEY=0x... \
-node scripts/propose.mjs \
+npx nodpay propose \
   --safe <WALLET_ADDRESS> \
   --to <RECIPIENT> \
   --value-eth <AMOUNT> \
@@ -182,7 +173,9 @@ Chain config (RPC, bundler, explorer) is auto-resolved from `references/networks
 
 ### Supported Chains
 
-`sepolia`, `ethereum`, `base`, `base_sepolia`, `arbitrum`, `optimism`, `polygon`
+`ethereum`, `base`, `arbitrum`, `optimism`, `polygon`, `sepolia`, `base_sepolia`
+
+The wallet address is the same across all chains (counterfactual). Chain is only relevant at transaction time. **Do not assume a default chain.** When the user asks to send, ask which chain if not specified.
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodpay",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "NodPay CLI — propose on-chain payments from agent-human shared wallets",
   "type": "module",
   "bin": {
@@ -9,11 +9,22 @@
   "files": [
     "bin/",
     "scripts/",
-    "references/",
-    "SKILL.md",
-    "AGENT-NOTES.md"
+    "SKILL.md"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/xhyumiracle/nodpay-cli.git"
+  },
+  "homepage": "https://nodpay.ai",
+  "keywords": [
+    "crypto",
+    "wallet",
+    "safe",
+    "multisig",
+    "agent",
+    "erc-4337",
+    "payment"
   ],
-  "keywords": ["crypto", "wallet", "safe", "multisig", "agent", "erc-4337", "payment"],
   "author": "xhyumiracle",
   "license": "MIT",
   "dependencies": {

package/scripts/propose.mjs

@@ -10,7 +10,7 @@
  *   NODPAY_AGENT_KEY  - Agent signer private key
  *   SAFE_ADDRESS       - Deployed Safe address (can be overridden with --safe)
  *   RPC_URL            - RPC endpoint
- *   CHAIN_ID           - Chain ID (default: 11155111)
+ *   CHAIN_ID           - Chain ID (required, no default)
  *
  * Args:
  *   --to <address>           - Recipient address
@@ -37,8 +37,12 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
 const PENDING_DIR = join(__dirname, '..', '.pending-txs');
 mkdirSync(PENDING_DIR, { recursive: true });
 
-const RPC_URL = process.env.RPC_URL || 'https://ethereum-sepolia-rpc.publicnode.com';
-const CHAIN_ID = process.env.CHAIN_ID || '11155111';
+const RPC_URL = process.env.RPC_URL;
+const CHAIN_ID = process.env.CHAIN_ID;
+if (!RPC_URL || !CHAIN_ID) {
+  console.error('Error: RPC_URL and CHAIN_ID environment variables are required.\nSet them for your target chain. See references/networks.json for supported chains.');
+  process.exit(1);
+}
 const ENTRYPOINT_ADDRESS = ENTRYPOINT;
 const NODPAY_AGENT_KEY = process.env.NODPAY_AGENT_KEY;
 const DEFAULT_SAFE = process.env.SAFE_ADDRESS;

package/AGENT-NOTES.md

@@ -1,53 +0,0 @@
-# Agent Operational Notes
-
-Advanced patterns and edge cases. Read SKILL.md first.
-
-## Nonce Management
-
-- **Auto-increment**: propose without `--nonce` → script fetches on-chain nonce, auto-increments past pending ops
-- **Replace**: use `--nonce N` with same nonce as pending tx → both appear in dashboard, user picks one
-- **Gas reuse**: when nonce > on-chain nonce, bundler rejects gas estimation (`AA25`). Script auto-reuses gas from the first pending op.
-
-## Status Lifecycle
-
-```
-pending → submitted → executed
-                   ↘ rejected
-                   ↘ replaced (another tx at same nonce was executed)
-                   ↘ invalidated (cascade from lower nonce rejection)
-```
-
-## Multi-Wallet
-
-One agent can serve multiple wallets. Different user devices → different passkeys → different Safe addresses. Always confirm which wallet before proposing.
-
-## EOA Wallets
-
-For users who prefer MetaMask/browser wallet over passkey:
-
-```bash
-node scripts/propose.mjs \
-  --safe <WALLET_ADDRESS> \
-  --to <RECIPIENT> \
-  --value-eth <AMOUNT> \
-  --user-signer <USER_EOA_ADDRESS> \
-  --recovery <RECOVERY_SIGNER> \
-  --signer-type eoa
-```
-
-## Owner Ordering (CREATE2)
-
-Safe address is deterministically derived. Owner order is fixed:
-
-- **Passkey**: `[agent, recovery, SharedSigner]`
-- **EOA**: `[userSigner, agent, recovery]`
-
-Wrong order → wrong address. The propose script handles this automatically.
-
-## API Reference
-
-```
-GET  /api/txs?safe=<addr>                    # list all ops for a wallet
-GET  /api/txs?safe=<addr>&status=pending     # filter by status
-GET  /api/tx/<shortHash>                     # get single op by hash prefix
-```

package/references/networks.json

@@ -1,91 +0,0 @@
-{
-  "mainnet": {
-    "ethereum": {
-      "name": "Ethereum",
-      "chainId": 1,
-      "rpcUrl": "https://ethereum-rpc.publicnode.com",
-      "txServiceUrl": "https://safe-transaction-mainnet.safe.global",
-      "safePrefix": "eth",
-      "explorerUrl": "https://etherscan.io",
-      "explorerTxPath": "/tx/",
-      "explorerAddrPath": "/address/",
-      "nativeCurrency": "ETH",
-      "bundlerUrlTemplate": "https://api.pimlico.io/v2/1/rpc?apikey={PIMLICO_API_KEY}"
-    },
-    "base": {
-      "name": "Base",
-      "chainId": 8453,
-      "rpcUrl": "https://base-rpc.publicnode.com",
-      "txServiceUrl": "https://safe-transaction-base.safe.global",
-      "safePrefix": "base",
-      "explorerUrl": "https://basescan.org",
-      "explorerTxPath": "/tx/",
-      "explorerAddrPath": "/address/",
-      "nativeCurrency": "ETH",
-      "gasSponsored": true,
-      "bundlerUrlTemplate": "https://api.pimlico.io/v2/8453/rpc?apikey={PIMLICO_API_KEY}"
-    },
-    "arbitrum": {
-      "name": "Arbitrum",
-      "chainId": 42161,
-      "rpcUrl": "https://arbitrum-one-rpc.publicnode.com",
-      "txServiceUrl": "https://safe-transaction-arbitrum.safe.global",
-      "safePrefix": "arb1",
-      "explorerUrl": "https://arbiscan.io",
-      "explorerTxPath": "/tx/",
-      "explorerAddrPath": "/address/",
-      "nativeCurrency": "ETH",
-      "bundlerUrlTemplate": "https://api.pimlico.io/v2/42161/rpc?apikey={PIMLICO_API_KEY}"
-    },
-    "polygon": {
-      "name": "Polygon",
-      "chainId": 137,
-      "rpcUrl": "https://polygon-bor-rpc.publicnode.com",
-      "txServiceUrl": "https://safe-transaction-polygon.safe.global",
-      "safePrefix": "matic",
-      "explorerUrl": "https://polygonscan.com",
-      "explorerTxPath": "/tx/",
-      "explorerAddrPath": "/address/",
-      "nativeCurrency": "MATIC",
-      "bundlerUrlTemplate": "https://api.pimlico.io/v2/137/rpc?apikey={PIMLICO_API_KEY}"
-    },
-    "optimism": {
-      "name": "Optimism",
-      "chainId": 10,
-      "rpcUrl": "https://optimism-rpc.publicnode.com",
-      "txServiceUrl": "https://safe-transaction-optimism.safe.global",
-      "safePrefix": "oeth",
-      "explorerUrl": "https://optimistic.etherscan.io",
-      "explorerTxPath": "/tx/",
-      "explorerAddrPath": "/address/",
-      "nativeCurrency": "ETH",
-      "bundlerUrlTemplate": "https://api.pimlico.io/v2/10/rpc?apikey={PIMLICO_API_KEY}"
-    }
-  },
-  "testnet": {
-    "sepolia": {
-      "name": "Sepolia (Ethereum)",
-      "chainId": 11155111,
-      "rpcUrl": "https://ethereum-sepolia-rpc.publicnode.com",
-      "txServiceUrl": "https://safe-transaction-sepolia.safe.global",
-      "safePrefix": "sep",
-      "explorerUrl": "https://sepolia.etherscan.io",
-      "explorerTxPath": "/tx/",
-      "explorerAddrPath": "/address/",
-      "nativeCurrency": "ETH",
-      "bundlerUrlTemplate": "https://api.pimlico.io/v2/11155111/rpc?apikey={PIMLICO_API_KEY}"
-    },
-    "base_sepolia": {
-      "name": "Base Sepolia",
-      "chainId": 84532,
-      "rpcUrl": "https://base-sepolia-rpc.publicnode.com",
-      "txServiceUrl": "https://safe-transaction-base-sepolia.safe.global",
-      "safePrefix": "basesep",
-      "explorerUrl": "https://sepolia.basescan.org",
-      "explorerTxPath": "/tx/",
-      "explorerAddrPath": "/address/",
-      "nativeCurrency": "ETH",
-      "bundlerUrlTemplate": "https://api.pimlico.io/v2/84532/rpc?apikey={PIMLICO_API_KEY}"
-    }
-  }
-}

package/scripts/predict-passkey.mjs

@@ -1,167 +0,0 @@
-#!/usr/bin/env node
-/**
- * Predict a Safe address for a passkey-based wallet (counterfactual).
- * 
- * Uses Safe4337Pack with passkey signer support to ensure the Safe setup
- * includes SharedSigner.configure() for passkey coordinates.
- *
- * Env vars:
- *   NODPAY_AGENT_KEY  - Agent signer private key
- *   RPC_URL            - RPC endpoint
- *   CHAIN_ID           - Chain ID (default: 11155111)
- *   PIMLICO_API_KEY    - Pimlico bundler API key
- *
- * Args:
- *   --raw-id <base64>     - Passkey rawId (base64 encoded)
- *   --x <hex>             - Passkey public key x coordinate
- *   --y <hex>             - Passkey public key y coordinate
- *   --salt <nonce>        - Salt nonce (optional, default: random)
- *   --chain-id <number>   - Override chain ID
- *
- * Output: JSON { predictedAddress, owners, threshold, chainId, salt, deployed, passkeyCoordinates }
- */
-
-import { Safe4337Pack } from '@safe-global/relay-kit';
-import Safe, { getMultiSendContract, encodeMultiSendData, SafeProvider } from '@safe-global/protocol-kit';
-import { OperationType } from '@safe-global/types-kit';
-import { ethers } from 'ethers';
-
-const SHARED_SIGNER_ADDRESS = '0x94a4F6affBd8975951142c3999aEAB7ecee555c2';
-
-// Default P-256 verifier (FCLP256Verifier) on major chains
-// From safe-modules-deployments v0.2.1
-const FCLP256_VERIFIERS = {
-  '11155111': '0x445a0683e494ea0c5AF3E83c5159fBE47Cf9e765', // Sepolia
-  '1':        '0x445a0683e494ea0c5AF3E83c5159fBE47Cf9e765', // Mainnet
-  '8453':     '0x445a0683e494ea0c5AF3E83c5159fBE47Cf9e765', // Base
-  '84532':    '0x445a0683e494ea0c5AF3E83c5159fBE47Cf9e765', // Base Sepolia
-  '42161':    '0x445a0683e494ea0c5AF3E83c5159fBE47Cf9e765', // Arbitrum
-  '10':       '0x445a0683e494ea0c5AF3E83c5159fBE47Cf9e765', // Optimism
-  '137':      '0x445a0683e494ea0c5AF3E83c5159fBE47Cf9e765', // Polygon
-};
-
-const RPC_URL = process.env.RPC_URL || 'https://ethereum-sepolia-rpc.publicnode.com';
-const NODPAY_AGENT_KEY = process.env.NODPAY_AGENT_KEY;
-const PIMLICO_API_KEY = process.env.PIMLICO_API_KEY;
-
-if (!NODPAY_AGENT_KEY) {
-  console.error(JSON.stringify({ error: 'Missing NODPAY_AGENT_KEY env var' }));
-  process.exit(1);
-}
-if (!PIMLICO_API_KEY) {
-  console.error(JSON.stringify({ error: 'Missing PIMLICO_API_KEY env var' }));
-  process.exit(1);
-}
-
-const agentWallet = new ethers.Wallet(NODPAY_AGENT_KEY);
-const DEFAULT_AGENT_ADDRESS = agentWallet.address;
-
-const args = process.argv.slice(2);
-function getArg(name) {
-  const idx = args.indexOf(name);
-  return idx !== -1 ? args[idx + 1] : undefined;
-}
-
-const rawId = getArg('--raw-id');
-const x = getArg('--x');
-const y = getArg('--y');
-const CHAIN_ID = parseInt(getArg('--chain-id') || process.env.CHAIN_ID || '11155111', 10);
-const salt = getArg('--salt') || Math.floor(Math.random() * 1_000_000_000).toString();
-// Agent address can be overridden via --agent flag (for multi-agent support)
-const AGENT_ADDRESS = getArg('--agent') || DEFAULT_AGENT_ADDRESS;
-const RECOVERY_ADDRESS = getArg('--recovery'); // Optional 3rd owner for 2-of-3
-
-if (!x || !y) {
-  console.error(JSON.stringify({ error: 'Missing --x <hex> and --y <hex> passkey coordinates' }));
-  process.exit(1);
-}
-
-try {
-  const owners = RECOVERY_ADDRESS
-    ? [AGENT_ADDRESS, SHARED_SIGNER_ADDRESS, RECOVERY_ADDRESS]
-    : [AGENT_ADDRESS, SHARED_SIGNER_ADDRESS];
-  const threshold = 2;
-  const bundlerUrl = `https://api.pimlico.io/v2/${CHAIN_ID}/rpc?apikey=${PIMLICO_API_KEY}`;
-  const verifier = FCLP256_VERIFIERS[String(CHAIN_ID)] || FCLP256_VERIFIERS['11155111'];
-
-  // Encode SharedSigner.configure() — stores passkey coordinates in Safe's storage
-  const sharedSignerIface = new ethers.Interface([
-    'function configure((uint256 x, uint256 y, uint176 verifiers) signer)'
-  ]);
-  const configureData = sharedSignerIface.encodeFunctionData('configure', [{
-    x: BigInt(x),
-    y: BigInt(y),
-    verifiers: BigInt(verifier)
-  }]);
-
-  // We need Safe4337Pack to use our custom setup that includes:
-  // 1. enableModules([Safe4337Module]) — done by Safe4337Pack
-  // 2. SharedSigner.configure({x, y, verifiers}) — we need to inject this
-  //
-  // Strategy: Initialize Safe4337Pack normally, then monkey-patch protocolKit
-  // to include our configure call in the predicted Safe config.
-  
-  // First, init Safe4337Pack to get module addresses and standard config
-  const safe4337Pack = await Safe4337Pack.init({
-    provider: RPC_URL,
-    signer: NODPAY_AGENT_KEY,
-    bundlerUrl,
-    options: {
-      owners,
-      threshold,
-      saltNonce: salt,
-    },
-  });
-
-  // Get the address WITHOUT passkey config (this is what we had before — wrong)
-  const addressWithoutPasskey = await safe4337Pack.protocolKit.getAddress();
-
-  // Now create a new Safe4337Pack with passkey signer to get the CORRECT address
-  // We pass a fake passkey signer object that Safe4337Pack recognizes
-  const passkeySignerObj = {
-    rawId: rawId || 'passkey-' + salt,
-    coordinates: { x, y },
-    customVerifierAddress: verifier,
-  };
-
-  const ownersForPasskeyPack = RECOVERY_ADDRESS
-    ? [AGENT_ADDRESS, RECOVERY_ADDRESS] // SharedSigner will be auto-added by SDK
-    : [AGENT_ADDRESS]; // SharedSigner will be auto-added by SDK
-  const safe4337PackWithPasskey = await Safe4337Pack.init({
-    provider: RPC_URL,
-    signer: passkeySignerObj,
-    bundlerUrl,
-    options: {
-      owners: ownersForPasskeyPack,
-      threshold,
-      saltNonce: salt,
-    },
-  });
-
-  const predictedAddress = await safe4337PackWithPasskey.protocolKit.getAddress();
-
-  // Check if already deployed
-  const provider = new ethers.JsonRpcProvider(RPC_URL);
-  const code = await provider.getCode(predictedAddress);
-  const deployed = code !== '0x';
-
-  const result = {
-    predictedAddress,
-    owners,
-    threshold,
-    chainId: CHAIN_ID,
-    salt,
-    deployed,
-    sharedSigner: SHARED_SIGNER_ADDRESS,
-    verifier,
-    passkeyCoordinates: { x, y },
-    rawId: rawId || null,
-    // For debugging: show old address without passkey config
-    _addressWithoutPasskeyConfig: addressWithoutPasskey,
-  };
-
-  console.log(JSON.stringify(result, null, 2));
-} catch (error) {
-  console.error(JSON.stringify({ error: error.message || String(error) }));
-  process.exit(1);
-}