arc402-cli 1.3.15 → 1.4.0

package/dist/commands/wallet.js

@@ -2705,187 +2705,6 @@ function registerWalletCommands(program) {
             console.log(" " + colors_1.c.dim("Wallet:") + " " + colors_1.c.white(walletAddr));
         }
     });
-    // ─── force-close-context ───────────────────────────────────────────────────
-    //
-    // Workaround for wallets where wallet.closeContext() reverts because the deployed
-    // PolicyEngine doesn't have closeContext(). Instead of calling wallet.closeContext()
-    // (which internally calls pe.closeContext() and reverts), this command:
-    //   1. Calls PE.closeContext(wallet, contextId) directly via owner WalletConnect
-    //      (PE accepts calls from wallet owner via walletOwners mapping)
-    //   2. Then calls wallet.closeContext() — which should now succeed since PE call
-    //      was already made, but if it still reverts due to PE not having the function,
-    //      we directly zero the context via a raw storage slot write (not possible on mainnet)
-    //
-    // Fallback: call PE.closeContext directly as owner EOA (not via wallet) — PE accepts
-    // msg.sender == walletOwners[wallet].
-    wallet.command("force-close-context")
-        .description("Force-close stale context when wallet.closeContext() reverts (PE missing closeContext). Owner signs via WalletConnect.")
-        .option("--json")
-        .action(async (opts) => {
-        const config = (0, config_1.loadConfig)();
-        const walletAddr = config.walletContractAddress;
-        if (!walletAddr) {
-            console.error("walletContractAddress not set in config.");
-            process.exit(1);
-        }
-        if (!config.walletConnectProjectId) {
-            console.error("walletConnectProjectId not set in config.");
-            process.exit(1);
-        }
-        const provider = new ethers_1.ethers.JsonRpcProvider(config.rpcUrl);
-        // Check context is actually open
-        const walletAbi = ["function contextOpen() view returns (bool)", "function activeContextId() view returns (bytes32)"];
-        const walletReadOnly = new ethers_1.ethers.Contract(walletAddr, walletAbi, provider);
-        const isOpen = await walletReadOnly.contextOpen();
-        if (!isOpen) {
-            console.log("Context is already closed — nothing to do.");
-            return;
-        }
-        const contextId = await walletReadOnly.activeContextId();
-        console.log(`Open context found: ${contextId}`);
-        // Step 1: Call PE.closeContext(wallet, contextId) directly as owner via WalletConnect
-        // PE accepts: msg.sender == wallet OR msg.sender == walletOwners[wallet]
-        const policyEngineAddress = config.policyEngineAddress ?? "0xAA5Ef3489C929bFB3BFf5D5FE15aa62d3763c847";
-        const chainId = config.network === "base-mainnet" ? 8453 : 84532;
-        const peIface = new ethers_1.ethers.Interface(["function closeContext(address wallet, bytes32 contextId) external"]);
-        const peCalldata = peIface.encodeFunctionData("closeContext", [walletAddr, contextId]);
-        const telegramOpts = config.telegramBotToken && config.telegramChatId
-            ? { botToken: config.telegramBotToken, chatId: config.telegramChatId, threadId: config.telegramThreadId }
-            : undefined;
-        console.log("Step 1: Calling PE.closeContext as owner (WalletConnect)...");
-        let peTxHash;
-        try {
-            const result = await (0, walletconnect_1.requestPhoneWalletSignature)(config.walletConnectProjectId, chainId, () => ({ to: policyEngineAddress, data: peCalldata, value: "0x0" }), `Force-close wallet context — clear stale open context on ${walletAddr.slice(0, 10)}...`, telegramOpts, config);
-            peTxHash = result.txHash;
-            await provider.waitForTransaction(peTxHash);
-            console.log(" " + colors_1.c.success + colors_1.c.white(" PE.closeContext called"));
-        }
-        catch (e) {
-            console.log(" " + colors_1.c.warning + colors_1.c.white(` PE.closeContext failed (may not have this function): ${e instanceof Error ? e.message.slice(0, 80) : String(e)}`));
-            console.log(colors_1.c.dim("  Proceeding to wallet.closeContext anyway..."));
-        }
-        // Step 2: Call wallet.closeContext via executeContractCall (owner WalletConnect)
-        console.log("Step 2: Calling wallet.closeContext via executeContractCall (WalletConnect)...");
-        const walletIface = new ethers_1.ethers.Interface([
-            "function executeContractCall((address target, bytes data, uint256 value, uint256 minReturnValue, uint256 maxApprovalAmount, address approvalToken)) external returns (bytes)",
-            "function closeContext() external",
-        ]);
-        // Encode closeContext() call on the wallet itself — but wallet blocks self-targeting
-        // Instead, we already called PE directly. Now just call wallet.closeContext() directly
-        // from the owner EOA via WalletConnect (not via executeContractCall since target==wallet is blocked)
-        const closeCtxCalldata = walletIface.encodeFunctionData("closeContext", []);
-        try {
-            const result2 = await (0, walletconnect_1.requestPhoneWalletSignature)(config.walletConnectProjectId, chainId, () => ({ to: walletAddr, data: closeCtxCalldata, value: "0x0" }), `Close wallet context — final step`, telegramOpts, config);
-            await provider.waitForTransaction(result2.txHash);
-            console.log(" " + colors_1.c.success + colors_1.c.white(" Context closed"));
-            if (opts.json)
-                console.log(JSON.stringify({ ok: true, peTxHash, closeTxHash: result2.txHash, contextId }));
-        }
-        catch (e) {
-            console.error(" " + colors_1.c.failure + colors_1.c.white(` wallet.closeContext failed: ${e instanceof Error ? e.message.slice(0, 100) : String(e)}`));
-            console.error(colors_1.c.dim("  The stale context is still open. PolicyEngine redeployment required for full fix."));
-            if (opts.json)
-                console.log(JSON.stringify({ ok: false, peTxHash, contextId, error: String(e) }));
-            process.exit(1);
-        }
-    });
-    // ─── re-register-pe ────────────────────────────────────────────────────────
-    //
-    // After a PE redeploy, existing wallets need to re-register on the new PE.
-    // PE.registerWallet() requires msg.sender == wallet, so it goes via executeContractCall.
-    // Also sets the general spend limit (required for drain flow).
-    // Two WalletConnect approvals: registerWallet + setCategoryLimitFor.
-    wallet.command("re-register-pe")
-        .description("Re-register wallet on new PolicyEngine after PE redeploy (two WalletConnect approvals)")
-        .option("--spend-limit <eth>", "Per-tx spend limit for 'general' category in ETH", "0.01")
-        .option("--json")
-        .action(async (opts) => {
-        const config = (0, config_1.loadConfig)();
-        const walletAddr = config.walletContractAddress;
-        if (!walletAddr) {
-            console.error("walletContractAddress not set in config.");
-            process.exit(1);
-        }
-        if (!config.walletConnectProjectId) {
-            console.error("walletConnectProjectId not set in config.");
-            process.exit(1);
-        }
-        const provider = new ethers_1.ethers.JsonRpcProvider(config.rpcUrl);
-        const chainId = config.network === "base-mainnet" ? 8453 : 84532;
-        // Resolve current PE from registry
-        const registryAbi = ["function getContracts() external view returns (tuple(address policyEngine, address trustRegistry, address intentAttestation, address serviceAgreement, address sessionChannels, address agentRegistry, address reputationOracle, address settlementCoordinator, address vouchingRegistry, address migrationRegistry))"];
-        const registryAddress = "0xcc0D8731ccCf6CFfF4e66F6d68cA86330Ea8B622";
-        const registry = new ethers_1.ethers.Contract(registryAddress, registryAbi, provider);
-        let policyEngineAddress;
-        try {
-            const contracts = await registry.getContracts();
-            policyEngineAddress = contracts.policyEngine;
-        }
-        catch {
-            policyEngineAddress = config.policyEngineAddress ?? "0x0743ab6a7280b416D3b75c7e5457390906312139";
-        }
-        console.log(`Policy Engine: ${policyEngineAddress}`);
-        // Check if already registered
-        const peAbi = [
-            "function walletOwners(address) external view returns (address)",
-            "function registerWallet(address wallet, address owner) external",
-            "function setCategoryLimitFor(address wallet, string category, uint256 limitPerTx) external",
-        ];
-        const peReadOnly = new ethers_1.ethers.Contract(policyEngineAddress, peAbi, provider);
-        const registeredOwner = await peReadOnly.walletOwners(walletAddr);
-        const ownerAddress = config.ownerAddress ?? registeredOwner;
-        if (!ownerAddress || ownerAddress === ethers_1.ethers.ZeroAddress) {
-            console.error("ownerAddress not set in config. Run `arc402 config set ownerAddress <address>`.");
-            process.exit(1);
-        }
-        const walletIface = new ethers_1.ethers.Interface([
-            "function executeContractCall((address target, bytes data, uint256 value, uint256 minReturnValue, uint256 maxApprovalAmount, address approvalToken)) external returns (bytes)",
-        ]);
-        const peIface = new ethers_1.ethers.Interface(peAbi);
-        const telegramOpts = config.telegramBotToken && config.telegramChatId
-            ? { botToken: config.telegramBotToken, chatId: config.telegramChatId, threadId: config.telegramThreadId }
-            : undefined;
-        const spendLimitWei = ethers_1.ethers.parseEther(opts.spendLimit);
-        // Step 1: registerWallet (only if not already registered)
-        if (registeredOwner === ethers_1.ethers.ZeroAddress) {
-            console.log("Step 1: Registering wallet on new PE...");
-            const innerRegister = peIface.encodeFunctionData("registerWallet", [walletAddr, ownerAddress]);
-            const callDataRegister = walletIface.encodeFunctionData("executeContractCall", [{
-                    target: policyEngineAddress,
-                    data: innerRegister,
-                    value: 0n,
-                    minReturnValue: 0n,
-                    maxApprovalAmount: 0n,
-                    approvalToken: ethers_1.ethers.ZeroAddress,
-                }]);
-            const { txHash: tx1 } = await (0, walletconnect_1.requestPhoneWalletSignature)(config.walletConnectProjectId, chainId, () => ({ to: walletAddr, data: callDataRegister, value: "0x0" }), `Register wallet on new PolicyEngine`, telegramOpts, config);
-            await provider.waitForTransaction(tx1);
-            console.log(" " + colors_1.c.success + colors_1.c.white(" Wallet registered on new PE"));
-        }
-        else {
-            console.log(" " + colors_1.c.success + colors_1.c.white(` Already registered (owner: ${registeredOwner})`));
-        }
-        // Step 2: setCategoryLimitFor general
-        console.log(`Step 2: Setting 'general' spend limit to ${opts.spendLimit} ETH...`);
-        const innerLimit = peIface.encodeFunctionData("setCategoryLimitFor", [walletAddr, "general", spendLimitWei]);
-        const callDataLimit = walletIface.encodeFunctionData("executeContractCall", [{
-                target: policyEngineAddress,
-                data: innerLimit,
-                value: 0n,
-                minReturnValue: 0n,
-                maxApprovalAmount: 0n,
-                approvalToken: ethers_1.ethers.ZeroAddress,
-            }]);
-        const { txHash: tx2 } = await (0, walletconnect_1.requestPhoneWalletSignature)(config.walletConnectProjectId, chainId, () => ({ to: walletAddr, data: callDataLimit, value: "0x0" }), `Set 'general' spend limit: ${opts.spendLimit} ETH/tx`, telegramOpts, config);
-        await provider.waitForTransaction(tx2);
-        console.log(" " + colors_1.c.success + colors_1.c.white(" Spend limit set"));
-        if (opts.json) {
-            console.log(JSON.stringify({ ok: true, policyEngine: policyEngineAddress, wallet: walletAddr, spendLimit: opts.spendLimit }));
-        }
-        else {
-            console.log("\n" + colors_1.c.success + colors_1.c.white(" Wallet re-registered on new PE. You can now run `arc402 wallet drain`."));
-        }
-    });
     // ─── drain ─────────────────────────────────────────────────────────────────
     //
     // P1 + BUG-DRAIN-06: full autonomous drain via machine key.