apow-cli 0.6.2 → 0.7.0

package/.env.example

@@ -25,10 +25,6 @@ LLM_API_KEY=
 # SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 # SQUID_INTEGRATOR_ID=
 
-# Ethereum mainnet RPC (only for `apow fund --chain ethereum`)
-# Default: https://ethereum-rpc.publicnode.com (free)
-# ETHEREUM_RPC_URL=
-
 # Contract addresses (defaults built-in, override only if needed)
 # MINING_AGENT_ADDRESS=0xB7caD3ca5F2BD8aEC2Eb67d6E8D448099B3bC03D
 # AGENT_COIN_ADDRESS=0x12577CF0D8a07363224D6909c54C056A183e13b3

package/README.md

@@ -45,7 +45,6 @@ EOF
 
 # 3. Fund the wallet (bridge from any chain, auto-splits into ETH + USDC)
 npx apow-cli fund --chain solana --token sol    # bridge SOL → ETH+USDC on Base
-npx apow-cli fund --chain ethereum --token eth  # bridge ETH → ETH+USDC on Base
 # Or send ETH/USDC on Base directly
 
 # 4. Mint a mining rig NFT (proves agent identity via LLM, one-time)
@@ -92,7 +91,7 @@ npx apow-cli mine
 | Command | Description |
 |---------|-------------|
 | `apow setup` | Interactive setup wizard: configure wallet, RPC, and LLM |
-| `apow fund` | Fund your wallet: bridge from Solana/Ethereum, swap on Base, auto-split ETH+USDC |
+| `apow fund` | Fund your wallet: bridge from Solana or send on Base, auto-split ETH+USDC |
 | `apow wallet new` | Generate a new mining wallet |
 | `apow wallet show` | Show configured wallet address |
 | `apow wallet export` | Export your wallet's private key |
@@ -116,8 +115,7 @@ LLM_MODEL=gpt-4o-mini         # Required for minting only; mining uses optimized
 LLM_API_KEY=sk-...             # Required for minting only
 # Bridging (only for `apow fund`)
 # SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
-# ETHEREUM_RPC_URL=https://ethereum-rpc.publicnode.com    # free, for `--chain ethereum` only
-# SQUID_INTEGRATOR_ID=          # free, get at squidrouter.com (deposit address flow only)
+# SQUID_INTEGRATOR_ID=          # free, get at squidrouter.com
 # Contract addresses (defaults built-in, override only if needed)
 # MINING_AGENT_ADDRESS=0xB7caD3ca5F2BD8aEC2Eb67d6E8D448099B3bC03D
 # AGENT_COIN_ADDRESS=0x12577CF0D8a07363224D6909c54C056A183e13b3
@@ -138,19 +136,14 @@ An LLM is required to mint your Mining Rig NFT (one-time identity verification).
 | Anthropic | `claude-sonnet-4-5-20250929` | ~$0.005 | Works but slower |
 | Ollama | `llama3.1` | Free | Local GPU required |
 
-## Funding (v0.6.0+)
+## Funding (v0.7.0+)
 
-Mining requires two assets on Base: **ETH** (gas) and **USDC** (x402 RPC). The `fund` command accepts deposits in 6 forms across 3 chains, auto-bridges to Base, and auto-splits into both:
+Mining requires two assets on Base: **ETH** (gas) and **USDC** (x402 RPC). The `fund` command bridges from Solana or accepts deposits on Base, and auto-splits into both:
 
 ```bash
-# From Solana
+# From Solana (deposit address — send from any wallet, QR code included)
 apow fund --chain solana --token sol              # bridge SOL → ETH, auto-swap portion to USDC
 apow fund --chain solana --token usdc             # bridge USDC, auto-swap portion to ETH
-apow fund --chain solana --token sol --key <b58>  # direct signing (fast, ~20s)
-
-# From Ethereum mainnet
-apow fund --chain ethereum --token eth            # bridge ETH → Base, auto-swap portion to USDC
-apow fund --chain ethereum --token usdc           # bridge USDC → Base, auto-swap portion to ETH
 
 # Already on Base
 apow fund --chain base --token eth                # show address, wait for deposit, auto-split
@@ -160,6 +153,8 @@ apow fund --chain base --token usdc               # show address, wait for depos
 apow fund --chain base --no-swap
 ```
 
+**Solana bridging:** Uses [Squid Router](https://squidrouter.com/) (Chainflip). Generates a one-time deposit address with QR code — send from Phantom, Backpack, or any Solana wallet. Requires `SQUID_INTEGRATOR_ID` in `.env` (free at [squidrouter.com](https://app.squidrouter.com/)).
+
 **Auto-split targets:** 0.003 ETH (gas for ~100 mine txns) + 2.00 USDC (~100K x402 RPC calls). If both are already met, the CLI skips the swap.
 
 ## Speed Mining (v0.4.0+)

package/dist/bridge/constants.js

@@ -4,9 +4,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SLIPPAGE_BPS = exports.MIN_USDC = exports.MIN_ETH = exports.TOKENS = exports.CHAIN_IDS = void 0;
 exports.bridgeOutputAsset = bridgeOutputAsset;
 exports.CHAIN_IDS = {
-    solana: { debridge: "7565164", squid: "solana" },
-    ethereum: { debridge: "1", squid: "1" },
-    base: { debridge: "8453", squid: "8453" },
+    solana: "solana",
+    base: "8453",
 };
 exports.TOKENS = {
     solana: {
@@ -14,11 +13,6 @@ exports.TOKENS = {
         nativeWrapped: "So11111111111111111111111111111111111111112",
         usdc: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
     },
-    ethereum: {
-        native: "0x0000000000000000000000000000000000000000",
-        nativeSquid: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-        usdc: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-    },
     base: {
         native: "0x0000000000000000000000000000000000000000",
         nativeSquid: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",

package/dist/bridge/solana.js

@@ -1,5 +1,5 @@
 "use strict";
-// Solana wallet utilities — key parsing, balance checks, transaction signing.
+// Solana balance utilities for deposit detection.
 // Uses dynamic import() for @solana/web3.js to avoid bloating startup.
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -36,76 +36,12 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSolanaRpcUrl = getSolanaRpcUrl;
-exports.parseSolanaKey = parseSolanaKey;
-exports.getSolanaBalance = getSolanaBalance;
 exports.getAddressBalance = getAddressBalance;
 exports.getSplTokenBalance = getSplTokenBalance;
-exports.signAndSendTransaction = signAndSendTransaction;
 const DEFAULT_SOLANA_RPC = "https://api.mainnet-beta.solana.com";
-const BASE58_ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
-function base58Decode(str) {
-    const bytes = [];
-    for (const char of str) {
-        const idx = BASE58_ALPHABET.indexOf(char);
-        if (idx === -1)
-            throw new Error(`Invalid base58 character: ${char}`);
-        let carry = idx;
-        for (let j = 0; j < bytes.length; j++) {
-            carry += bytes[j] * 58;
-            bytes[j] = carry & 0xff;
-            carry >>= 8;
-        }
-        while (carry > 0) {
-            bytes.push(carry & 0xff);
-            carry >>= 8;
-        }
-    }
-    // Preserve leading zeros
-    for (const char of str) {
-        if (char !== "1")
-            break;
-        bytes.push(0);
-    }
-    return new Uint8Array(bytes.reverse());
-}
 function getSolanaRpcUrl() {
     return process.env.SOLANA_RPC_URL || DEFAULT_SOLANA_RPC;
 }
-/** Parse a base58-encoded Solana secret key (64 bytes) or seed (32 bytes). */
-async function parseSolanaKey(input) {
-    const { Keypair } = await Promise.resolve().then(() => __importStar(require("@solana/web3.js")));
-    const trimmed = input.trim();
-    // Try JSON array format first (Solana CLI keygen output)
-    if (trimmed.startsWith("[")) {
-        try {
-            const arr = JSON.parse(trimmed);
-            const keypair = Keypair.fromSecretKey(new Uint8Array(arr));
-            return { keypair, publicKey: keypair.publicKey.toBase58() };
-        }
-        catch {
-            throw new Error("Invalid Solana key: looks like JSON but could not parse.");
-        }
-    }
-    // Base58 secret key (Phantom, Backpack export format)
-    const decoded = base58Decode(trimmed);
-    if (decoded.length === 64) {
-        const keypair = Keypair.fromSecretKey(decoded);
-        return { keypair, publicKey: keypair.publicKey.toBase58() };
-    }
-    if (decoded.length === 32) {
-        // 32-byte seed
-        const keypair = Keypair.fromSeed(decoded);
-        return { keypair, publicKey: keypair.publicKey.toBase58() };
-    }
-    throw new Error(`Invalid Solana key: expected 64 bytes (secret key) or 32 bytes (seed), got ${decoded.length}. Provide the full base58-encoded secret key from your wallet.`);
-}
-/** Get SOL balance for a public key (in SOL, not lamports). */
-async function getSolanaBalance(publicKeyBase58) {
-    const { Connection, PublicKey } = await Promise.resolve().then(() => __importStar(require("@solana/web3.js")));
-    const connection = new Connection(getSolanaRpcUrl(), "confirmed");
-    const lamports = await connection.getBalance(new PublicKey(publicKeyBase58));
-    return lamports / 1e9;
-}
 /** Get SOL balance for any address (used to detect deposits). */
 async function getAddressBalance(address) {
     const { Connection, PublicKey } = await Promise.resolve().then(() => __importStar(require("@solana/web3.js")));
@@ -125,31 +61,3 @@ async function getSplTokenBalance(publicKeyBase58, mintAddress) {
     const parsed = accounts.value[0].account.data.parsed;
     return parsed?.info?.tokenAmount?.uiAmount ?? 0;
 }
-/** Deserialize, sign, and submit a serialized Solana transaction (hex or base64). */
-async function signAndSendTransaction(serializedTx, keypair) {
-    const { Connection, VersionedTransaction, Transaction } = await Promise.resolve().then(() => __importStar(require("@solana/web3.js")));
-    const connection = new Connection(getSolanaRpcUrl(), "confirmed");
-    // deBridge returns hex (0x...), other bridges may return base64
-    const txBuffer = serializedTx.startsWith("0x")
-        ? Buffer.from(serializedTx.slice(2), "hex")
-        : Buffer.from(serializedTx, "base64");
-    // Get fresh blockhash (deBridge-generated txs may have stale ones)
-    const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash("confirmed");
-    // Try versioned transaction first, fall back to legacy.
-    // Skip preflight: deBridge Jupiter routes may fail simulation but succeed on-chain.
-    let signature;
-    try {
-        const tx = VersionedTransaction.deserialize(txBuffer);
-        tx.message.recentBlockhash = blockhash;
-        tx.sign([keypair]);
-        signature = await connection.sendTransaction(tx, { skipPreflight: true });
-    }
-    catch {
-        const tx = Transaction.from(txBuffer);
-        tx.recentBlockhash = blockhash;
-        tx.sign(keypair);
-        signature = await connection.sendRawTransaction(tx.serialize(), { skipPreflight: true });
-    }
-    await connection.confirmTransaction({ signature, blockhash, lastValidBlockHeight }, "confirmed");
-    return signature;
-}

package/dist/bridge/squid.js

@@ -1,6 +1,6 @@
 "use strict";
 // Squid Router bridge — deposit address flow.
-// Supports SOL→Base and Ethereum→Base via Chainflip multi-hop (~1-3 minutes).
+// Supports SOL→Base via Chainflip multi-hop (~1-3 minutes).
 // Requires SQUID_INTEGRATOR_ID (free, apply at squidrouter.com).
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQUID_ROUTES = void 0;
@@ -10,33 +10,17 @@ const constants_1 = require("./constants");
 const SQUID_API = "https://v2.api.squidrouter.com/v2";
 exports.SQUID_ROUTES = {
     sol_to_eth: {
-        fromChain: constants_1.CHAIN_IDS.solana.squid,
+        fromChain: constants_1.CHAIN_IDS.solana,
         fromToken: constants_1.TOKENS.solana.nativeWrapped,
-        toChain: constants_1.CHAIN_IDS.base.squid,
+        toChain: constants_1.CHAIN_IDS.base,
         toToken: constants_1.TOKENS.base.nativeSquid,
         srcDecimals: 9,
         dstDecimals: 18,
     },
     sol_usdc_to_base_usdc: {
-        fromChain: constants_1.CHAIN_IDS.solana.squid,
+        fromChain: constants_1.CHAIN_IDS.solana,
         fromToken: constants_1.TOKENS.solana.usdc,
-        toChain: constants_1.CHAIN_IDS.base.squid,
-        toToken: constants_1.TOKENS.base.usdc,
-        srcDecimals: 6,
-        dstDecimals: 6,
-    },
-    eth_to_base_eth: {
-        fromChain: constants_1.CHAIN_IDS.ethereum.squid,
-        fromToken: constants_1.TOKENS.ethereum.nativeSquid,
-        toChain: constants_1.CHAIN_IDS.base.squid,
-        toToken: constants_1.TOKENS.base.nativeSquid,
-        srcDecimals: 18,
-        dstDecimals: 18,
-    },
-    eth_usdc_to_base_usdc: {
-        fromChain: constants_1.CHAIN_IDS.ethereum.squid,
-        fromToken: constants_1.TOKENS.ethereum.usdc,
-        toChain: constants_1.CHAIN_IDS.base.squid,
+        toChain: constants_1.CHAIN_IDS.base,
         toToken: constants_1.TOKENS.base.usdc,
         srcDecimals: 6,
         dstDecimals: 6,
@@ -45,9 +29,8 @@ exports.SQUID_ROUTES = {
 function getIntegratorId() {
     const id = process.env.SQUID_INTEGRATOR_ID;
     if (!id) {
-        throw new Error("SQUID_INTEGRATOR_ID is required for the deposit address flow.\n" +
-            "Get one free at https://app.squidrouter.com/\n" +
-            "Or use direct signing instead: apow fund --chain solana --key <base58>");
+        throw new Error("SQUID_INTEGRATOR_ID is required for bridging from Solana.\n" +
+            "Get one free at https://app.squidrouter.com/");
     }
     return id;
 }

package/dist/errors.js

@@ -110,19 +110,11 @@ const patterns = [
         }),
     },
     {
-        test: (m) => m.includes("deBridge") && (m.includes("route") || m.includes("unavailable")),
+        test: (m) => m.includes("Squid") && (m.includes("route") || m.includes("deposit")),
         classify: () => ({
             category: "transient",
             userMessage: "Bridge route temporarily unavailable",
-            recovery: "Try a different bridge method or wait a few minutes",
-        }),
-    },
-    {
-        test: (m) => m.includes("ethereum-rpc.publicnode") || (m.includes("ETHEREUM_RPC") && m.includes("unreachable")),
-        classify: () => ({
-            category: "setup",
-            userMessage: "Ethereum mainnet RPC unreachable",
-            recovery: "Set ETHEREUM_RPC_URL in .env (default: https://ethereum-rpc.publicnode.com)",
+            recovery: "Wait a few minutes and try again",
         }),
     },
 ];

package/dist/fund.js

@@ -1,15 +1,13 @@
 "use strict";
 // Fund command — unified funding for mining on Base.
-// Accepts deposits in 6 forms across 3 chains, auto-bridges to Base,
+// Accepts deposits from Solana (via Squid Router bridge) or Base (direct send),
 // auto-splits into ETH (gas) + USDC (x402 RPC).
 //
 // Deposit types:
 //   1. Solana SOL     → bridge → ETH on Base → swap portion to USDC
 //   2. Solana USDC    → bridge → USDC on Base → swap portion to ETH
-//   3. Ethereum ETH   → bridge → ETH on Base → swap portion to USDC
-//   4. Ethereum USDC  → bridge → USDC on Base → swap portion to ETH
-//   5. Base ETH       → (already there) → swap portion to USDC
-//   6. Base USDC      → (already there) → swap portion to ETH
+//   3. Base ETH       → (already there) → swap portion to USDC
+//   4. Base USDC      → (already there) → swap portion to ETH
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -47,11 +45,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runFundFlow = runFundFlow;
 const viem_1 = require("viem");
 const constants_1 = require("./bridge/constants");
-const debridge_1 = require("./bridge/debridge");
 const squid_1 = require("./bridge/squid");
 const uniswap_1 = require("./bridge/uniswap");
 const wallet_1 = require("./wallet");
-const config_1 = require("./config");
 const ui = __importStar(require("./ui"));
 async function fetchPrices() {
     const res = await fetch("https://api.coingecko.com/api/v3/simple/price?ids=solana,ethereum&vs_currencies=usd");
@@ -189,94 +185,9 @@ async function showFinalBalances() {
     console.log("");
 }
 // ---------------------------------------------------------------------------
-// Solana direct bridge (deBridge DLN)
+// Solana fund (Squid Router deposit address)
 // ---------------------------------------------------------------------------
-async function runSolanaDirectBridge(solanaKeyInput, baseAddress, sourceToken, targetEth) {
-    const solanaSpinner = ui.spinner("Checking Solana balance...");
-    const solana = await Promise.resolve().then(() => __importStar(require("./bridge/solana")));
-    let kp;
-    try {
-        kp = await solana.parseSolanaKey(solanaKeyInput);
-    }
-    catch (err) {
-        solanaSpinner.fail("Invalid Solana key");
-        throw err;
-    }
-    if (sourceToken === "usdc") {
-        const usdcBal = await solana.getSplTokenBalance(kp.publicKey, constants_1.TOKENS.solana.usdc);
-        solanaSpinner.stop(`Solana USDC balance: ${usdcBal.toFixed(2)} USDC`);
-        const priceSpinner = ui.spinner("Fetching prices...");
-        const prices = await fetchPrices();
-        priceSpinner.stop(`ETH price: $${prices.ethPriceUsd.toFixed(0)}`);
-        const usdcAmount = targetEth * prices.ethPriceUsd * 1.1; // 10% buffer
-        if (usdcBal < usdcAmount) {
-            ui.error(`Insufficient USDC. Need ~${usdcAmount.toFixed(2)} USDC, have ${usdcBal.toFixed(2)} USDC.`);
-            return;
-        }
-        console.log("");
-        ui.table([
-            ["Bridging", `${usdcAmount.toFixed(2)} USDC → USDC on Base`],
-            ["Via", "deBridge DLN (~20 seconds)"],
-            ["From", `${kp.publicKey.slice(0, 4)}...${kp.publicKey.slice(-4)}`],
-            ["To", `${baseAddress.slice(0, 6)}...${baseAddress.slice(-4)}`],
-        ]);
-        console.log("");
-        const proceed = await ui.confirm("Confirm bridge?");
-        if (!proceed) {
-            console.log("  Cancelled.");
-            return;
-        }
-        const bridgeSpinner = ui.spinner("Signing bridge transaction...");
-        const result = await (0, debridge_1.bridgeFromSolana)(kp.keypair, baseAddress, usdcAmount, debridge_1.ROUTES.sol_usdc_to_base_usdc);
-        bridgeSpinner.stop(`Submitted! Order: ${result.orderId.slice(0, 12)}...`);
-        const pollSpinner = ui.spinner("Waiting for bridge fulfillment... (~20s)");
-        const fulfillment = await (0, debridge_1.pollOrderStatus)(result.orderId, (s) => pollSpinner.update(`Bridge status: ${s}`));
-        pollSpinner.stop("Bridge complete! USDC arrived on Base");
-        await autoSplit("usdc", prices, false);
-        await showFinalBalances();
-    }
-    else {
-        // SOL → ETH
-        const balance = await solana.getSolanaBalance(kp.publicKey);
-        solanaSpinner.stop(`Solana balance: ${balance.toFixed(4)} SOL`);
-        const priceSpinner = ui.spinner("Fetching prices...");
-        const prices = await fetchPrices();
-        const solAmount = amountNeededForEth(targetEth, prices.solPriceUsd, prices.ethPriceUsd);
-        priceSpinner.stop(`SOL/ETH rate: ${prices.solPerEth.toFixed(1)} SOL = 1 ETH`);
-        if (balance < solAmount) {
-            ui.error(`Insufficient SOL. Need ~${solAmount.toFixed(4)} SOL, have ${balance.toFixed(4)} SOL.`);
-            return;
-        }
-        console.log("");
-        ui.table([
-            ["Bridging", `${solAmount.toFixed(4)} SOL → ~${targetEth.toFixed(4)} ETH on Base`],
-            ["Via", "deBridge DLN (~20 seconds)"],
-            ["From", `${kp.publicKey.slice(0, 4)}...${kp.publicKey.slice(-4)}`],
-            ["To", `${baseAddress.slice(0, 6)}...${baseAddress.slice(-4)}`],
-        ]);
-        console.log("");
-        const proceed = await ui.confirm("Confirm bridge?");
-        if (!proceed) {
-            console.log("  Cancelled.");
-            return;
-        }
-        const bridgeSpinner = ui.spinner("Signing bridge transaction...");
-        const result = await (0, debridge_1.bridgeFromSolana)(kp.keypair, baseAddress, solAmount, debridge_1.ROUTES.sol_to_eth);
-        bridgeSpinner.stop(`Submitted! Order: ${result.orderId.slice(0, 12)}...`);
-        const pollSpinner = ui.spinner("Waiting for bridge fulfillment... (~20s)");
-        const fulfillment = await (0, debridge_1.pollOrderStatus)(result.orderId, (s) => pollSpinner.update(`Bridge status: ${s}`));
-        const received = fulfillment.received
-            ? (Number(fulfillment.received) / 1e18).toFixed(6)
-            : `~${targetEth.toFixed(4)}`;
-        pollSpinner.stop(`Bridge complete! ${received} ETH arrived on Base`);
-        await autoSplit("eth", prices, false);
-        await showFinalBalances();
-    }
-}
-// ---------------------------------------------------------------------------
-// Solana deposit address bridge (Squid Router)
-// ---------------------------------------------------------------------------
-async function runSolanaDepositBridge(baseAddress, sourceToken, targetEth) {
+async function runSolanaFund(baseAddress, sourceToken, targetEth) {
     const priceSpinner = ui.spinner("Fetching prices...");
     const prices = await fetchPrices();
     priceSpinner.stop(`ETH price: $${prices.ethPriceUsd.toFixed(0)}`);
@@ -377,109 +288,6 @@ async function runSolanaDepositBridge(baseAddress, sourceToken, targetEth) {
     await showFinalBalances();
 }
 // ---------------------------------------------------------------------------
-// Ethereum direct bridge (deBridge DLN)
-// ---------------------------------------------------------------------------
-async function runEthereumDirectBridge(baseAddress, sourceToken, targetEth) {
-    if (!config_1.config.privateKey) {
-        ui.error("No PRIVATE_KEY configured. Your wallet key is used on Ethereum mainnet too.");
-        return;
-    }
-    const priceSpinner = ui.spinner("Fetching prices...");
-    const prices = await fetchPrices();
-    priceSpinner.stop(`ETH price: $${prices.ethPriceUsd.toFixed(0)}`);
-    const route = sourceToken === "usdc"
-        ? debridge_1.ROUTES.eth_usdc_to_base_usdc
-        : debridge_1.ROUTES.eth_to_base_eth;
-    const amount = sourceToken === "usdc"
-        ? targetEth * prices.ethPriceUsd * 1.1
-        : targetEth * 1.1;
-    const tokenLabel = sourceToken === "usdc" ? "USDC" : "ETH";
-    const receivedLabel = sourceToken === "usdc" ? "USDC" : "ETH";
-    console.log("");
-    ui.table([
-        ["Bridging", `${amount.toFixed(sourceToken === "usdc" ? 2 : 6)} ${tokenLabel} → ${receivedLabel} on Base`],
-        ["Via", "deBridge DLN (~20 seconds)"],
-        ["From", `Ethereum mainnet (${baseAddress.slice(0, 6)}...${baseAddress.slice(-4)})`],
-        ["To", `Base (same address)`],
-    ]);
-    console.log("");
-    const proceed = await ui.confirm("Confirm bridge?");
-    if (!proceed) {
-        console.log("  Cancelled.");
-        return;
-    }
-    const bridgeSpinner = ui.spinner("Signing bridge transaction on Ethereum...");
-    try {
-        const result = await (0, debridge_1.bridgeFromEvm)(config_1.config.privateKey, baseAddress, amount, route);
-        bridgeSpinner.stop(`Submitted! Order: ${result.orderId.slice(0, 12)}...`);
-        const pollSpinner = ui.spinner("Waiting for bridge fulfillment... (~20s)");
-        const fulfillment = await (0, debridge_1.pollOrderStatus)(result.orderId, (s) => pollSpinner.update(`Bridge status: ${s}`));
-        pollSpinner.stop(`Bridge complete! ${receivedLabel} arrived on Base`);
-        const outputAsset = (0, constants_1.bridgeOutputAsset)(sourceToken);
-        await autoSplit(outputAsset, prices, false);
-        await showFinalBalances();
-    }
-    catch (err) {
-        bridgeSpinner.fail("Bridge failed");
-        throw err;
-    }
-}
-// ---------------------------------------------------------------------------
-// Ethereum deposit address bridge (Squid Router)
-// ---------------------------------------------------------------------------
-async function runEthereumDepositBridge(baseAddress, sourceToken, targetEth) {
-    const priceSpinner = ui.spinner("Fetching prices...");
-    const prices = await fetchPrices();
-    priceSpinner.stop(`ETH price: $${prices.ethPriceUsd.toFixed(0)}`);
-    const route = sourceToken === "usdc"
-        ? squid_1.SQUID_ROUTES.eth_usdc_to_base_usdc
-        : squid_1.SQUID_ROUTES.eth_to_base_eth;
-    const amount = sourceToken === "usdc"
-        ? targetEth * prices.ethPriceUsd * 1.1
-        : targetEth * 1.1;
-    const tokenLabel = sourceToken === "usdc" ? "USDC" : "ETH";
-    const addrSpinner = ui.spinner("Generating deposit address...");
-    const squid = await Promise.resolve().then(() => __importStar(require("./bridge/squid")));
-    let deposit;
-    try {
-        deposit = await squid.getDepositAddress(baseAddress, amount, route);
-    }
-    catch (err) {
-        addrSpinner.fail("Failed to get deposit address");
-        throw err;
-    }
-    addrSpinner.stop("Deposit address ready");
-    console.log("");
-    console.log(`  ${ui.bold(`Send ${tokenLabel} on Ethereum mainnet to:`)}`);
-    console.log("");
-    console.log(`  ${ui.cyan(deposit.depositAddress)}`);
-    console.log("");
-    await showQrCode(deposit.depositAddress);
-    console.log("");
-    ui.table([
-        ["Amount", `~${amount.toFixed(sourceToken === "usdc" ? 2 : 6)} ${tokenLabel}`],
-        ["Network", "Ethereum mainnet"],
-        ["You'll receive", `~${deposit.expectedReceive} ${sourceToken === "usdc" ? "USDC" : "ETH"} on Base`],
-        ["Bridge", "Squid Router (Chainflip)"],
-        ["Time", "~1-3 minutes"],
-    ]);
-    console.log("");
-    if (deposit.expiresAt) {
-        ui.warn(`Deposit address expires: ${deposit.expiresAt}`);
-        console.log("");
-    }
-    // Wait for user to send manually — poll Squid status directly
-    const bridgeSpinner = ui.spinner(`Send ${tokenLabel} and waiting for bridge... (Ctrl+C to cancel)`);
-    // For Ethereum deposits, we rely on Squid status API rather than polling an RPC
-    const result = await (0, squid_1.pollBridgeStatus)(deposit.requestId, route.dstDecimals, (status) => bridgeSpinner.update(`Bridge status: ${status}`), 900_000);
-    const received = result.received || deposit.expectedReceive;
-    const receivedAsset = sourceToken === "usdc" ? "USDC" : "ETH";
-    bridgeSpinner.stop(`Bridge complete! ${received} ${receivedAsset} arrived`);
-    const outputAsset = (0, constants_1.bridgeOutputAsset)(sourceToken);
-    await autoSplit(outputAsset, prices, false);
-    await showFinalBalances();
-}
-// ---------------------------------------------------------------------------
 // Base manual send (already on the right chain)
 // ---------------------------------------------------------------------------
 async function runBaseFund(baseAddress, sourceToken, noSwap) {
@@ -548,15 +356,10 @@ async function runBaseFund(baseAddress, sourceToken, noSwap) {
 async function selectSourceChain() {
     console.log("  Where are your funds?");
     console.log(`    ${ui.cyan("1.")} Solana (SOL or USDC)`);
-    console.log(`    ${ui.cyan("2.")} Ethereum mainnet (ETH or USDC)`);
-    console.log(`    ${ui.cyan("3.")} Base (send ETH or USDC manually)`);
+    console.log(`    ${ui.cyan("2.")} Base (send ETH or USDC directly)`);
     console.log("");
     const choice = await ui.prompt("Choice", "1");
-    switch (choice) {
-        case "2": return "ethereum";
-        case "3": return "base";
-        default: return "solana";
-    }
+    return choice === "2" ? "base" : "solana";
 }
 async function selectSourceToken(chain) {
     const nativeLabel = chain === "solana" ? "SOL" : "ETH";
@@ -574,8 +377,6 @@ function parseSourceChain(value) {
     const v = value.toLowerCase();
     if (v === "solana" || v === "sol")
         return "solana";
-    if (v === "ethereum" || v === "eth")
-        return "ethereum";
     if (v === "base")
         return "base";
     return undefined;
@@ -639,43 +440,7 @@ async function runFundFlow(options) {
     // Route to the appropriate flow
     switch (chain) {
         case "solana": {
-            if (options.key) {
-                await runSolanaDirectBridge(options.key, baseAddress, token, targetEth);
-            }
-            else {
-                console.log("");
-                console.log("  Bridge method:");
-                console.log(`    ${ui.cyan("A.")} Direct signing (~20s, need Solana private key)`);
-                console.log(`    ${ui.cyan("B.")} Deposit address (~1-3 min, send from any wallet)`);
-                console.log("");
-                const method = await ui.prompt("Choice", "A");
-                if (method.toUpperCase() === "A") {
-                    const key = await ui.promptSecret("Solana private key (base58)");
-                    if (!key) {
-                        ui.error("No key provided.");
-                        return;
-                    }
-                    await runSolanaDirectBridge(key, baseAddress, token, targetEth);
-                }
-                else {
-                    await runSolanaDepositBridge(baseAddress, token, targetEth);
-                }
-            }
-            break;
-        }
-        case "ethereum": {
-            console.log("");
-            console.log("  Bridge method:");
-            console.log(`    ${ui.cyan("A.")} Direct signing (~20s, uses your PRIVATE_KEY on mainnet)`);
-            console.log(`    ${ui.cyan("B.")} Deposit address (~1-3 min, send from any wallet)`);
-            console.log("");
-            const method = await ui.prompt("Choice", "A");
-            if (method.toUpperCase() === "A") {
-                await runEthereumDirectBridge(baseAddress, token, targetEth);
-            }
-            else {
-                await runEthereumDepositBridge(baseAddress, token, targetEth);
-            }
+            await runSolanaFund(baseAddress, token, targetEth);
             break;
         }
         case "base": {

package/dist/index.js

@@ -260,10 +260,9 @@ async function main() {
     });
     program
         .command("fund")
-        .description("Fund your wallet — bridge from Solana/Ethereum or swap on Base")
-        .option("--chain <chain>", "Source chain: solana, ethereum, base")
-        .option("--token <token>", "Source token: sol, eth, usdc")
-        .option("--key <base58>", "Solana private key for direct signing")
+        .description("Fund your wallet — bridge from Solana or send on Base")
+        .option("--chain <chain>", "Source chain: solana, base")
+        .option("--token <token>", "Source token: sol, usdc, eth")
         .option("--amount <eth>", "Target ETH amount (default: 0.005)")
         .option("--no-swap", "Skip auto-split after bridging")
         .hook("preAction", async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apow-cli",
-  "version": "0.6.2",
+  "version": "0.7.0",
   "description": "Mine AGENT tokens on Base L2 with Agentic Proof of Work",
   "keywords": [
     "apow",

package/skill.md

@@ -73,8 +73,7 @@ EOF
 
 # 3. Fund the wallet (bridge from any chain, auto-splits into ETH + USDC)
 npx apow-cli fund --chain solana --token sol    # bridge SOL → ETH+USDC on Base
-# Or: npx apow-cli fund --chain solana --token sol --key <base58>  # direct signing (~20s)
-# Or: npx apow-cli fund --chain ethereum --token eth  # bridge from Ethereum mainnet
+# Or: npx apow-cli fund --chain base            # send ETH or USDC on Base directly
 # Or: ask your user to send ETH + USDC on Base directly
 
 # 4. Mint + mine (fully autonomous from here)
@@ -152,33 +151,20 @@ Your mining wallet needs ETH on Base for gas and the mint fee.
 
 ### Built-in Bridge: `apow fund` (Recommended)
 
-The CLI accepts deposits in 6 forms across 3 chains, auto-bridges to Base, and auto-splits into ETH (gas) + USDC (x402 RPC):
+The CLI bridges from Solana via [Squid Router](https://squidrouter.com/) (Chainflip), or accepts deposits directly on Base. Auto-splits into ETH (gas) + USDC (x402 RPC):
 
 ```bash
 npx apow-cli fund                                          # Interactive: choose chain + token
 npx apow-cli fund --chain solana --token sol               # Bridge SOL → ETH+USDC on Base
-npx apow-cli fund --chain solana --token sol --key <b58>   # Direct Solana signing (~20s)
 npx apow-cli fund --chain solana --token usdc              # Bridge Solana USDC → Base
-npx apow-cli fund --chain ethereum --token eth             # Bridge ETH from mainnet
-npx apow-cli fund --chain ethereum --token usdc            # Bridge USDC from mainnet
 npx apow-cli fund --chain base                             # Show address, wait for deposit
 npx apow-cli fund --chain base --no-swap                   # Skip auto-split
 ```
 
-**Bridge methods per chain:**
-
-| Chain | Direct signing | Deposit address |
-|-------|---------------|-----------------|
-| Solana | deBridge DLN (~20s, `--key`) | Squid Router (~1-3 min) |
-| Ethereum | deBridge DLN (~20s, uses PRIVATE_KEY on mainnet) | Squid Router (~1-3 min) |
-| Base | N/A (already on Base) | Show address + QR code |
+**Solana bridging:** Generates a one-time deposit address with QR code. Send tokens from any Solana wallet (Phantom, Backpack, etc.). Requires `SQUID_INTEGRATOR_ID` in `.env` (free at [squidrouter.com](https://app.squidrouter.com/)). Bridge time: ~1-3 minutes via Chainflip.
 
 **Auto-split:** After bridging, the CLI checks ETH and USDC balances. If either is below the minimum (0.003 ETH for gas, 2.00 USDC for x402 RPC), it swaps the needed amount via Uniswap V3 on Base. Use `--no-swap` to skip.
 
-**Direct signing (Solana `--key`):** Provide your base58 Solana secret key. The CLI calls deBridge DLN to create a bridge order, signs the Solana transaction locally, submits it, and polls until funds arrive on Base. No API key needed.
-
-**Deposit address (no `--key`):** Requires `SQUID_INTEGRATOR_ID` in `.env` (free, apply at [squidrouter.com](https://app.squidrouter.com/)). Generates a one-time deposit address with a QR code. Send tokens from any wallet and the bridge handles the rest.
-
 ### Manual Funding Options
 
 If you prefer not to use the built-in bridge:
@@ -280,7 +266,6 @@ CHAIN=base
 | `RPC_URL` | No | Alchemy x402 | Base JSON-RPC endpoint. Default uses Alchemy x402 (premium, paid via USDC). Set to override with a custom endpoint. |
 | `CHAIN` | No | `base` | Network selector; auto-detects `baseSepolia` if RPC URL contains "sepolia" |
 | `SOLANA_RPC_URL` | No | `https://api.mainnet-beta.solana.com` | Solana RPC endpoint (only for `apow fund --chain solana`) |
-| `ETHEREUM_RPC_URL` | No | `https://ethereum-rpc.publicnode.com` | Ethereum mainnet RPC (only for `apow fund --chain ethereum`) |
 | `SQUID_INTEGRATOR_ID` | No | - | Squid Router integrator ID for deposit address flow (free at [squidrouter.com](https://app.squidrouter.com/)) |
 
 ### LLM Provider Recommendations (for Minting)
@@ -638,12 +623,11 @@ The CLI makes only these network calls:
 2. **LLM API** (to user-configured provider): sends only word-puzzle prompts for SMHL solving, never wallet data
 3. **Bridge APIs** (only when using `apow fund`):
    - **CoinGecko** (`api.coingecko.com`): SOL/ETH price quotes
-   - **deBridge DLN** (`dln.debridge.finance`): bridge order creation and status (direct signing flow)
-   - **Squid Router** (`v2.api.squidrouter.com`): deposit address generation (deposit address flow)
+   - **Squid Router** (`v2.api.squidrouter.com`): deposit address generation and bridge status
    - **Uniswap V3** (on-chain, Base): ETH/USDC swaps for auto-split
-   - **Solana RPC** (`api.mainnet-beta.solana.com` or custom): balance checks and tx submission
+   - **Solana RPC** (`api.mainnet-beta.solana.com` or custom): balance checks
 
-No private keys are transmitted to bridge providers. deBridge returns a serialized Solana transaction that is signed locally. Squid generates a deposit address, and the user sends SOL themselves.
+No private keys are transmitted to bridge providers. Squid generates a deposit address, and the user sends tokens from their own wallet.
 
 ### LLM Calls Are Data-Isolated
 

package/dist/bridge/debridge.js

@@ -1,251 +0,0 @@
-"use strict";
-// deBridge DLN bridge — direct signing flow.
-// Supports SOL→Base and Ethereum→Base bridging.
-// No API key needed.
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ROUTES = void 0;
-exports.bridgeFromSolana = bridgeFromSolana;
-exports.bridgeFromEvm = bridgeFromEvm;
-exports.pollOrderStatus = pollOrderStatus;
-const viem_1 = require("viem");
-const chains_1 = require("viem/chains");
-const accounts_1 = require("viem/accounts");
-const constants_1 = require("./constants");
-const solana = __importStar(require("./solana"));
-const DLN_API = "https://dln.debridge.finance/v1.0";
-exports.ROUTES = {
-    sol_to_eth: {
-        srcChainId: constants_1.CHAIN_IDS.solana.debridge,
-        srcToken: constants_1.TOKENS.solana.native,
-        srcDecimals: 9,
-        dstChainId: constants_1.CHAIN_IDS.base.debridge,
-        dstToken: constants_1.TOKENS.base.native,
-    },
-    sol_usdc_to_base_usdc: {
-        srcChainId: constants_1.CHAIN_IDS.solana.debridge,
-        srcToken: constants_1.TOKENS.solana.usdc,
-        srcDecimals: 6,
-        dstChainId: constants_1.CHAIN_IDS.base.debridge,
-        dstToken: constants_1.TOKENS.base.usdc,
-    },
-    eth_to_base_eth: {
-        srcChainId: constants_1.CHAIN_IDS.ethereum.debridge,
-        srcToken: constants_1.TOKENS.ethereum.native,
-        srcDecimals: 18,
-        dstChainId: constants_1.CHAIN_IDS.base.debridge,
-        dstToken: constants_1.TOKENS.base.native,
-    },
-    eth_usdc_to_base_usdc: {
-        srcChainId: constants_1.CHAIN_IDS.ethereum.debridge,
-        srcToken: constants_1.TOKENS.ethereum.usdc,
-        srcDecimals: 6,
-        dstChainId: constants_1.CHAIN_IDS.base.debridge,
-        dstToken: constants_1.TOKENS.base.usdc,
-    },
-};
-/**
- * Create DLN order params for any route.
- */
-function buildOrderParams(route, amount, senderAddress, baseAddress) {
-    const rawAmount = Math.floor(amount * 10 ** route.srcDecimals);
-    return new URLSearchParams({
-        srcChainId: route.srcChainId,
-        srcChainTokenIn: route.srcToken,
-        srcChainTokenInAmount: rawAmount.toString(),
-        dstChainId: route.dstChainId,
-        dstChainTokenOut: route.dstToken,
-        dstChainTokenOutRecipient: baseAddress,
-        senderAddress,
-        srcChainOrderAuthorityAddress: senderAddress,
-        dstChainOrderAuthorityAddress: baseAddress,
-    });
-}
-/**
- * Bridge from Solana to Base via deBridge DLN (direct signing).
- * Works for SOL→ETH and USDC→USDC routes.
- */
-async function bridgeFromSolana(solanaKeypair, baseAddress, amount, route = exports.ROUTES.sol_to_eth) {
-    const startTime = Date.now();
-    const srcPublicKey = solanaKeypair.publicKey.toBase58();
-    const params = buildOrderParams(route, amount, srcPublicKey, baseAddress);
-    const response = await fetch(`${DLN_API}/dln/order/create-tx?${params}`);
-    if (!response.ok) {
-        const body = await response.text();
-        throw new Error(`deBridge API error (${response.status}): ${body}`);
-    }
-    const data = (await response.json());
-    if (data.errorCode || data.error) {
-        throw new Error(`deBridge error: ${data.error || data.message || JSON.stringify(data)}`);
-    }
-    const orderId = data.orderId;
-    const txData = data.tx?.data;
-    if (!txData) {
-        throw new Error("deBridge API returned no transaction data");
-    }
-    const txSignature = await solana.signAndSendTransaction(txData, solanaKeypair);
-    return {
-        orderId,
-        txSignature,
-        status: "submitted",
-        timeMs: Date.now() - startTime,
-    };
-}
-/**
- * Bridge from Ethereum mainnet to Base via deBridge DLN (direct signing).
- * Uses the same PRIVATE_KEY — same address on all EVM chains.
- * Works for ETH→ETH and USDC→USDC routes.
- */
-async function bridgeFromEvm(privateKey, baseAddress, amount, route = exports.ROUTES.eth_to_base_eth) {
-    const startTime = Date.now();
-    const evmAccount = (0, accounts_1.privateKeyToAccount)(privateKey);
-    const rpcUrl = process.env.ETHEREUM_RPC_URL ?? "https://ethereum-rpc.publicnode.com";
-    const ethWalletClient = (0, viem_1.createWalletClient)({
-        account: evmAccount,
-        chain: chains_1.mainnet,
-        transport: (0, viem_1.http)(rpcUrl),
-    });
-    const params = buildOrderParams(route, amount, evmAccount.address, baseAddress);
-    const response = await fetch(`${DLN_API}/dln/order/create-tx?${params}`);
-    if (!response.ok) {
-        const body = await response.text();
-        throw new Error(`deBridge API error (${response.status}): ${body}`);
-    }
-    const data = (await response.json());
-    if (data.errorCode || data.error) {
-        throw new Error(`deBridge error: ${data.error || data.message || JSON.stringify(data)}`);
-    }
-    const orderId = data.orderId;
-    // For EVM, the API returns tx params instead of serialized tx
-    const tx = data.tx;
-    if (!tx || !tx.to) {
-        throw new Error("deBridge API returned no EVM transaction data");
-    }
-    // For USDC routes, handle token approval if needed
-    if (tx.allowanceTarget && tx.allowanceValue) {
-        const { createPublicClient } = await Promise.resolve().then(() => __importStar(require("viem")));
-        const ethPublicClient = createPublicClient({
-            chain: chains_1.mainnet,
-            transport: (0, viem_1.http)(rpcUrl),
-        });
-        const erc20Abi = [
-            {
-                type: "function",
-                name: "allowance",
-                inputs: [
-                    { name: "owner", type: "address" },
-                    { name: "spender", type: "address" },
-                ],
-                outputs: [{ name: "", type: "uint256" }],
-                stateMutability: "view",
-            },
-            {
-                type: "function",
-                name: "approve",
-                inputs: [
-                    { name: "spender", type: "address" },
-                    { name: "amount", type: "uint256" },
-                ],
-                outputs: [{ name: "", type: "bool" }],
-                stateMutability: "nonpayable",
-            },
-        ];
-        const currentAllowance = (await ethPublicClient.readContract({
-            address: route.srcToken,
-            abi: erc20Abi,
-            functionName: "allowance",
-            args: [evmAccount.address, tx.allowanceTarget],
-        }));
-        if (currentAllowance < BigInt(tx.allowanceValue)) {
-            const approveTx = await ethWalletClient.writeContract({
-                address: route.srcToken,
-                abi: erc20Abi,
-                functionName: "approve",
-                args: [tx.allowanceTarget, BigInt(tx.allowanceValue)],
-            });
-            await ethPublicClient.waitForTransactionReceipt({ hash: approveTx });
-        }
-    }
-    const txHash = await ethWalletClient.sendTransaction({
-        to: tx.to,
-        data: tx.data,
-        value: tx.value ? BigInt(tx.value) : 0n,
-    });
-    return {
-        orderId,
-        txSignature: txHash,
-        status: "submitted",
-        timeMs: Date.now() - startTime,
-    };
-}
-/**
- * Poll deBridge order status until fulfilled, cancelled, or timeout.
- * Works for all deBridge orders regardless of source chain.
- */
-async function pollOrderStatus(orderId, onUpdate, timeoutMs = 300_000) {
-    const deadline = Date.now() + timeoutMs;
-    while (Date.now() < deadline) {
-        try {
-            const response = await fetch(`${DLN_API}/dln/order/${orderId}/status`);
-            if (response.ok) {
-                const data = (await response.json());
-                const status = data.status || data.orderStatus || "unknown";
-                if (onUpdate)
-                    onUpdate(status);
-                if (status === "Fulfilled" ||
-                    status === "ClaimedUnlock" ||
-                    status === "SentUnlock") {
-                    return {
-                        status: "fulfilled",
-                        received: data.fulfilledDstAmount
-                            ? data.fulfilledDstAmount.toString()
-                            : undefined,
-                    };
-                }
-                if (status === "Cancelled" || status === "CancelledByMaker") {
-                    throw new Error(`Bridge order was cancelled: ${status}`);
-                }
-            }
-        }
-        catch (err) {
-            if (err instanceof Error && err.message.includes("cancelled"))
-                throw err;
-            // Transient fetch error — keep polling
-        }
-        await new Promise((r) => setTimeout(r, 5000));
-    }
-    throw new Error("Bridge order timed out after 5 minutes. Check deBridge explorer for order: " +
-        orderId);
-}