arc402-cli 1.8.3 → 1.8.5

package/dist/commands/wallet.js

@@ -58,7 +58,6 @@ const telegram_notify_1 = require("../telegram-notify");
 const tree_1 = require("../ui/tree");
 const spinner_1 = require("../ui/spinner");
 const colors_1 = require("../ui/colors");
-const POLICY_ENGINE_DEFAULT = "0x44102e70c2A366632d98Fe40d892a2501fC7fFF2";
 const GUARDIAN_KEY_PATH = path_1.default.join(os_1.default.homedir(), ".arc402", "guardian.key");
 /** Save guardian private key to a restricted standalone file (never to config.json). */
 function saveGuardianKey(privateKey) {
@@ -86,6 +85,34 @@ function parseAmount(raw) {
     }
     return BigInt(raw);
 }
+function resolvePolicyEngineAddress(config) {
+    return (config.policyEngineAddress ??
+        config_1.NETWORK_DEFAULTS[config.network]?.policyEngineAddress ??
+        "0x9449B15268bE7042C0b473F3f711a41A29220866");
+}
+function getWalletAddressFromFactoryLogs(factoryInterface, logs) {
+    for (const log of logs) {
+        try {
+            const parsed = factoryInterface.parseLog(log);
+            if (!parsed)
+                continue;
+            if (parsed.name === "WalletDeployed") {
+                const wallet = parsed.args.wallet ?? parsed.args.walletAddress ?? parsed.args[0];
+                if (wallet)
+                    return ethers_1.ethers.getAddress(wallet);
+            }
+            if (parsed.name === "WalletCreated") {
+                const wallet = parsed.args.walletAddress ?? parsed.args.wallet ?? parsed.args[1] ?? parsed.args[0];
+                if (wallet)
+                    return ethers_1.ethers.getAddress(wallet);
+            }
+        }
+        catch {
+            // skip unparseable logs
+        }
+    }
+    return null;
+}
 // Standard onboarding categories required for a newly deployed wallet.
 // These cover the full ARC-402 flow: spending, hiring, compute, research, protocol ops.
 const ONBOARDING_CATEGORIES = [
@@ -102,7 +129,7 @@ const ONBOARDING_CATEGORIES = [
  * Skips registerWallet/enableDeFiAccess if they were already done by the wallet constructor.
  */
 async function runWalletOnboardingCeremony(walletAddress, ownerAddress, config, provider, sendTx) {
-    const policyAddress = config.policyEngineAddress ?? POLICY_ENGINE_DEFAULT;
+    const policyAddress = resolvePolicyEngineAddress(config);
     const executeIface = new ethers_1.ethers.Interface(abis_1.ARC402_WALLET_EXECUTE_ABI);
     const govIface = new ethers_1.ethers.Interface(abis_1.POLICY_ENGINE_GOVERNANCE_ABI);
     const limitsIface = new ethers_1.ethers.Interface(abis_1.POLICY_ENGINE_LIMITS_ABI);
@@ -181,7 +208,7 @@ async function runWalletOnboardingCeremony(walletAddress, ownerAddress, config,
  *   6. Summary    — branded tree
  */
 async function runCompleteOnboardingCeremony(walletAddress, ownerAddress, config, provider, sendTx) {
-    const policyAddress = config.policyEngineAddress ?? POLICY_ENGINE_DEFAULT;
+    const policyAddress = resolvePolicyEngineAddress(config);
     const agentRegistryAddress = config.agentRegistryV2Address ??
         config_1.NETWORK_DEFAULTS[config.network]?.agentRegistryV2Address;
     const handshakeAddress = config.handshakeAddress ??
@@ -703,22 +730,33 @@ function registerWalletCommands(program) {
     // ─── new ───────────────────────────────────────────────────────────────────
     wallet.command("new")
         .description("Generate a fresh keypair and save to config")
-        .option("--network <network>", "Network (base-mainnet or base-sepolia)", "base-sepolia")
+        .option("--network <network>", "Network (base-mainnet or base-sepolia)")
         .action(async (opts) => {
-        const network = opts.network;
+        const existing = fs_1.default.existsSync((0, config_1.getConfigPath)()) ? (0, config_1.loadConfig)() : undefined;
+        const network = (opts.network ?? existing?.network ?? "base-mainnet");
         const defaults = config_1.NETWORK_DEFAULTS[network];
         if (!defaults) {
             console.error(`Unknown network: ${network}. Use base-mainnet or base-sepolia.`);
             process.exit(1);
         }
         const generated = ethers_1.ethers.Wallet.createRandom();
+        const networkChanged = !!existing && existing.network !== network;
         const config = {
+            ...(existing ?? {}),
             network,
             rpcUrl: defaults.rpcUrl,
             privateKey: generated.privateKey,
             trustRegistryAddress: defaults.trustRegistryAddress,
+            policyEngineAddress: defaults.policyEngineAddress,
             walletFactoryAddress: defaults.walletFactoryAddress,
+            agentRegistryV2Address: defaults.agentRegistryV2Address,
         };
+        if (networkChanged) {
+            delete config.walletContractAddress;
+            delete config.ownerAddress;
+            delete config.onboardingProgress;
+            delete config.wcSession;
+        }
         (0, config_1.saveConfig)(config);
         (0, tree_1.renderTree)([
             { label: "Address", value: generated.address },
@@ -729,10 +767,11 @@ function registerWalletCommands(program) {
     // ─── import ────────────────────────────────────────────────────────────────
     wallet.command("import")
         .description("Import an existing private key (use --key-file or stdin prompt)")
-        .option("--network <network>", "Network (base-mainnet or base-sepolia)", "base-sepolia")
+        .option("--network <network>", "Network (base-mainnet or base-sepolia)")
         .option("--key-file <path>", "Read private key from file instead of prompting")
         .action(async (opts) => {
-        const network = opts.network;
+        const existing = fs_1.default.existsSync((0, config_1.getConfigPath)()) ? (0, config_1.loadConfig)() : undefined;
+        const network = (opts.network ?? existing?.network ?? "base-mainnet");
         const defaults = config_1.NETWORK_DEFAULTS[network];
         if (!defaults) {
             console.error(`Unknown network: ${network}. Use base-mainnet or base-sepolia.`);
@@ -769,13 +808,23 @@ function registerWalletCommands(program) {
             console.error("Invalid private key. Must be a 0x-prefixed hex string.");
             process.exit(1);
         }
+        const networkChanged = !!existing && existing.network !== network;
         const config = {
+            ...(existing ?? {}),
             network,
             rpcUrl: defaults.rpcUrl,
             privateKey: imported.privateKey,
             trustRegistryAddress: defaults.trustRegistryAddress,
+            policyEngineAddress: defaults.policyEngineAddress,
             walletFactoryAddress: defaults.walletFactoryAddress,
+            agentRegistryV2Address: defaults.agentRegistryV2Address,
         };
+        if (networkChanged) {
+            delete config.walletContractAddress;
+            delete config.ownerAddress;
+            delete config.onboardingProgress;
+            delete config.wcSession;
+        }
         (0, config_1.saveConfig)(config);
         (0, tree_1.renderTree)([
             { label: "Address", value: imported.address },
@@ -1054,18 +1103,8 @@ function registerWalletCommands(program) {
                 console.error("Transaction not confirmed. Check on-chain.");
                 process.exit(1);
             }
-            let walletAddress = null;
             const factoryContract = new ethers_1.ethers.Contract(factoryAddress, abis_1.WALLET_FACTORY_ABI, provider);
-            for (const log of receipt.logs) {
-                try {
-                    const parsed = factoryContract.interface.parseLog(log);
-                    if (parsed?.name === "WalletDeployed" || parsed?.name === "WalletCreated") {
-                        walletAddress = parsed.args.walletAddress;
-                        break;
-                    }
-                }
-                catch { /* skip unparseable logs */ }
-            }
+            const walletAddress = getWalletAddressFromFactoryLogs(factoryContract.interface, receipt.logs);
             if (!walletAddress) {
                 console.error("Could not find WalletDeployed/WalletCreated event in receipt. Check the transaction on-chain.");
                 process.exit(1);
@@ -1156,18 +1195,8 @@ function registerWalletCommands(program) {
                     console.error("Transaction not confirmed. Check on-chain.");
                     process.exit(1);
                 }
-                let deployedWallet = null;
                 const factoryContract = new ethers_1.ethers.Contract(factoryAddress, abis_1.WALLET_FACTORY_ABI, provider);
-                for (const log of receipt.logs) {
-                    try {
-                        const parsed = factoryContract.interface.parseLog(log);
-                        if (parsed?.name === "WalletDeployed" || parsed?.name === "WalletCreated") {
-                            deployedWallet = parsed.args.walletAddress;
-                            break;
-                        }
-                    }
-                    catch { /* skip unparseable logs */ }
-                }
+                const deployedWallet = getWalletAddressFromFactoryLogs(factoryContract.interface, receipt.logs);
                 if (!deployedWallet) {
                     console.error("Could not find WalletDeployed/WalletCreated event in receipt. Check the transaction on-chain.");
                     process.exit(1);
@@ -1207,17 +1236,7 @@ function registerWalletCommands(program) {
             const deploySpinner = (0, spinner_1.startSpinner)(`Deploying ARC402Wallet via factory at ${factoryAddress}...`);
             const tx = await factory["deployWallet()"]();
             const receipt = await tx.wait();
-            let walletAddress = null;
-            for (const log of receipt.logs) {
-                try {
-                    const parsed = factory.interface.parseLog(log);
-                    if (parsed?.name === "WalletDeployed" || parsed?.name === "WalletDeployed" || parsed?.name === "WalletCreated") {
-                        walletAddress = parsed.args.walletAddress;
-                        break;
-                    }
-                }
-                catch { /* skip unparseable logs */ }
-            }
+            const walletAddress = getWalletAddressFromFactoryLogs(factory.interface, receipt.logs);
             if (!walletAddress) {
                 deploySpinner.fail("Could not find WalletDeployed/WalletCreated event in receipt. Check the transaction on-chain.");
                 process.exit(1);
@@ -1277,7 +1296,7 @@ function registerWalletCommands(program) {
             process.exit(1);
         }
         const walletAddress = config.walletContractAddress;
-        const policyAddress = config.policyEngineAddress ?? POLICY_ENGINE_DEFAULT;
+        const policyAddress = resolvePolicyEngineAddress(config);
         const chainId = config.network === "base-mainnet" ? 8453 : 84532;
         const provider = new ethers_1.ethers.JsonRpcProvider(config.rpcUrl);
         // Resolve protocol contracts to whitelist
@@ -1490,7 +1509,7 @@ function registerWalletCommands(program) {
         .requiredOption("--category <cat>", "Category name (e.g. code.review)")
         .action(async (opts) => {
         const config = (0, config_1.loadConfig)();
-        const policyAddress = config.policyEngineAddress ?? POLICY_ENGINE_DEFAULT;
+        const policyAddress = resolvePolicyEngineAddress(config);
         const walletAddr = config.walletContractAddress;
         if (!walletAddr) {
             console.error("walletContractAddress not set in config. Run `arc402 wallet deploy` first.");
@@ -1516,7 +1535,7 @@ function registerWalletCommands(program) {
         .requiredOption("--amount <eth>", "Limit in ETH (e.g. 0.1)")
         .action(async (opts) => {
         const config = (0, config_1.loadConfig)();
-        const policyAddress = config.policyEngineAddress ?? POLICY_ENGINE_DEFAULT;
+        const policyAddress = resolvePolicyEngineAddress(config);
         const chainId = config.network === "base-mainnet" ? 8453 : 84532;
         const amount = ethers_1.ethers.parseEther(opts.amount);
         const policyInterface = new ethers_1.ethers.Interface(abis_1.POLICY_ENGINE_LIMITS_ABI);
@@ -1564,7 +1583,7 @@ function registerWalletCommands(program) {
         console.log(`  1. Wallet-level (arc402 wallet set-velocity-limit): ETH cap per rolling hour, enforced by ARC402Wallet contract. Breach auto-freezes wallet.`);
         console.log(`  2. PolicyEngine-level (arc402 wallet policy set-daily-limit): Per-category daily cap, enforced by PolicyEngine. Breach returns a soft error without freezing.`);
         console.log(`  Both must be configured for full protection.\n`);
-        const policyAddress = config.policyEngineAddress ?? POLICY_ENGINE_DEFAULT;
+        const policyAddress = resolvePolicyEngineAddress(config);
         const chainId = config.network === "base-mainnet" ? 8453 : 84532;
         const walletAddr = config.walletContractAddress;
         if (!walletAddr) {
@@ -1607,7 +1626,7 @@ function registerWalletCommands(program) {
         .option("--protocol <eth>", "Protocol limit", "0.1")
         .action(async (opts) => {
         const config = (0, config_1.loadConfig)();
-        const policyAddress = config.policyEngineAddress ?? POLICY_ENGINE_DEFAULT;
+        const policyAddress = resolvePolicyEngineAddress(config);
         const chainId = config.network === "base-mainnet" ? 8453 : 84532;
         const walletAddr = config.walletContractAddress;
         if (!walletAddr) {
@@ -2050,7 +2069,7 @@ function registerWalletCommands(program) {
             console.error(`Invalid address: ${target}`);
             process.exit(1);
         }
-        const policyAddress = config.policyEngineAddress ?? POLICY_ENGINE_DEFAULT;
+        const policyAddress = resolvePolicyEngineAddress(config);
         const chainId = config.network === "base-mainnet" ? 8453 : 84532;
         const provider = new ethers_1.ethers.JsonRpcProvider(config.rpcUrl);
         // Check if already whitelisted
@@ -2211,7 +2230,7 @@ function registerWalletCommands(program) {
             console.error("walletConnectProjectId not set in config. Run `arc402 config set walletConnectProjectId <id>`.");
             process.exit(1);
         }
-        const policyAddress = config.policyEngineAddress ?? POLICY_ENGINE_DEFAULT;
+        const policyAddress = resolvePolicyEngineAddress(config);
         const chainId = config.network === "base-mainnet" ? 8453 : 84532;
         const provider = new ethers_1.ethers.JsonRpcProvider(config.rpcUrl);
         let ownerAddress = config.ownerAddress;
@@ -2339,7 +2358,7 @@ function registerWalletCommands(program) {
             console.error("walletConnectProjectId not set in config. Run `arc402 config set walletConnectProjectId <id>`.");
             process.exit(1);
         }
-        const policyAddress = config.policyEngineAddress ?? POLICY_ENGINE_DEFAULT;
+        const policyAddress = resolvePolicyEngineAddress(config);
         const chainId = config.network === "base-mainnet" ? 8453 : 84532;
         // ── Step 1: velocity limit ────────────────────────────────────────────
         const { velocityEth } = await (0, prompts_1.default)({
@@ -3077,7 +3096,7 @@ function registerWalletCommands(program) {
             process.exit(1);
         }
         // Check category is configured on PolicyEngine
-        const policyAddress = config.policyEngineAddress ?? POLICY_ENGINE_DEFAULT;
+        const policyAddress = resolvePolicyEngineAddress(config);
         const policyContract = new ethers_1.ethers.Contract(policyAddress, abis_1.POLICY_ENGINE_LIMITS_ABI, provider);
         const categoryLimit = await policyContract.categoryLimits(walletAddr, opts.category);
         if (categoryLimit === 0n) {
@@ -3330,7 +3349,7 @@ function registerWalletCommands(program) {
             process.exit(1);
         }
         // Check category is configured on PolicyEngine
-        const policyAddressT = config.policyEngineAddress ?? POLICY_ENGINE_DEFAULT;
+        const policyAddressT = resolvePolicyEngineAddress(config);
         const policyContractT = new ethers_1.ethers.Contract(policyAddressT, abis_1.POLICY_ENGINE_LIMITS_ABI, provider);
         const categoryLimitT = await policyContractT.categoryLimits(walletAddr, opts.category);
         if (categoryLimitT === 0n) {