@canister-software/consensus-cli 0.1.0-beta.2 → 0.1.0-beta.4

package/bin/consensus.js

@@ -48,6 +48,25 @@ class ConsensusSDK {
   constructor() {
     this.configPath = path.join(process.cwd(), ".consensus-config.json");
     this.x402ProxyUrl = process.env.X402_PROXY_URL || "https://consensus.proxy.canister.software:3001";
+    this.extractPrivateKey = function extractPrivateKey(privateKeyData, keyType = "EVM") {
+  if (typeof privateKeyData === "string") {
+    if (keyType === "EVM") {
+      return privateKeyData.startsWith("0x") ? privateKeyData : `0x${privateKeyData}`;
+    }
+    return privateKeyData;
+  }
+  
+  if (privateKeyData?.privateKey) {
+    if (keyType === "EVM") {
+      return privateKeyData.privateKey.startsWith("0x") 
+        ? privateKeyData.privateKey 
+        : `0x${privateKeyData.privateKey}`;
+    }
+    return privateKeyData.privateKey;
+  }
+  
+  throw new Error(`Unexpected ${keyType} private key format from CDP`);
+}
   }
 
   generateWalletName() {
@@ -116,46 +135,57 @@ class ConsensusSDK {
   }
 
   async checkExistingSetup(forceFlag) {
-    const config = this.loadConfig();
+  const config = this.loadConfig();
+
+  if (config) {
+    console.log(chalk.yellow("⚠️  Existing Consensus setup found!"));
+    console.log(chalk.cyan("Wallet Name:"), config.wallet_name);
+
+    if (config.addresses?.evm) {
+      console.log(chalk.cyan("EVM Address:"), config.addresses.evm);
+    }
+    if (config.addresses?.solana) {
+      console.log(chalk.cyan("Solana Address:"), config.addresses.solana);
+    }
 
-    if (config) {
-      console.log(chalk.yellow("⚠️  Existing Consensus setup found!"));
-      console.log(chalk.cyan("Account Name:"), config.wallet_name);
+    if (config.account_address && !config.addresses) {
       console.log(chalk.cyan("Account Address:"), config.account_address);
-      console.log(chalk.cyan("Setup Date:"), config.setup_date);
-
-      if (!forceFlag) {
-        const { action } = await inquirer.prompt([
-          {
-            type: "list",
-            name: "action",
-            message: "What would you like to do?",
-            choices: [
-              { name: "Keep existing setup", value: "keep" },
-              { name: "Create new setup (reset)", value: "reset" },
-              { name: "Exit", value: "exit" },
-            ],
-          },
-        ]);
-
-        if (action === "keep") {
-          console.log(chalk.green("Using existing setup"));
-          return true;
-        }
-        if (action === "exit") {
-          process.exit(0);
-        }
-        if (action === "reset") {
-          return this.confirmReset();
-        }
-      } else {
+    }
+    
+    console.log(chalk.cyan("Setup Date:"), config.setup_date);
+
+    if (!forceFlag) {
+      const { action } = await inquirer.prompt([
+        {
+          type: "list",
+          name: "action",
+          message: "What would you like to do?",
+          choices: [
+            { name: "Keep existing setup", value: "keep" },
+            { name: "Create new setup (reset)", value: "reset" },
+            { name: "Exit", value: "exit" },
+          ],
+        },
+      ]);
+
+      if (action === "keep") {
+        console.log(chalk.green("Using existing setup"));
+        return true;
+      }
+      if (action === "exit") {
+        process.exit(0);
+      }
+      if (action === "reset") {
         return this.confirmReset();
       }
+    } else {
+      return this.confirmReset();
     }
-
-    return false;
   }
 
+  return false;
+}
+
   async confirmReset() {
     console.log(
       chalk.red(
@@ -183,145 +213,152 @@ class ConsensusSDK {
     return false;
   }
 
-  async createWallet() {
-    const spinner = ora("Creating CDP wallet...").start();
+async createWallets() {
+  const spinner = ora("Creating multi-chain CDP wallets...").start();
 
-    try {
-      const cdp = new CdpClient();
-      const walletName = this.generateWalletName();
+  try {
+    const cdp = new CdpClient();
+    const walletName = this.generateWalletName();
 
-      const cdpAccount = await cdp.evm.createAccount({ name: walletName });
-      const account = toAccount(cdpAccount);
+    const [evmAccount, solanaAccount] = await Promise.all([
+      cdp.evm.createAccount({ name: `${walletName}-evm` }),
+      cdp.solana.createAccount({ name: `${walletName}-solana` })
+    ]);
 
-      spinner.succeed("CDP wallet created");
+    const evmViemAccount = toAccount(evmAccount);
 
-      return {
-        wallet_name: walletName,
-        account_address: account.address,
-        cdpAccount: cdpAccount,
-      };
-    } catch (error) {
-      spinner.fail("Failed to create CDP wallet");
-      throw new Error(`Wallet creation failed: ${error.message}`);
-    }
+    spinner.succeed("Multi-chain wallets created");
+
+    return {
+      wallet_name: walletName,
+      evm_account: evmAccount,
+      evm_address: evmViemAccount.address,
+      solana_account: solanaAccount,
+      solana_address: solanaAccount.address,
+    };
+  } catch (error) {
+    spinner.fail("Failed to create wallets");
+    throw new Error(`Wallet creation failed: ${error.message}`);
   }
+}
 
-  async registerWithProxy(walletName, accountAddress, cdpAccount) {
-    const spinner = ora("Registering with x402 proxy...").start();
+async registerWithProxy(walletName, evmAddress, solanaAddress) {
+  const spinner = ora("Registering with x402 proxy...").start();
 
-    try {
-      const cdp = new CdpClient();
-      const privateKeyData = await cdp.evm.exportAccount({ name: walletName });
-
-      let privateKey;
-      if (typeof privateKeyData === "string") {
-        privateKey = privateKeyData.startsWith("0x")
-          ? privateKeyData
-          : `0x${privateKeyData}`;
-      } else if (privateKeyData && privateKeyData.privateKey) {
-        privateKey = privateKeyData.privateKey.startsWith("0x")
-          ? privateKeyData.privateKey
-          : `0x${privateKeyData.privateKey}`;
-      } else {
-        throw new Error("Unexpected private key format from CDP");
-      }
+  try {
+    const cdp = new CdpClient();
 
-      const response = await fetch(`${this.x402ProxyUrl}/register-wallet`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          wallet_name: walletName,
-          account_address: accountAddress,
-          private_key: privateKey,
-        }),
-      });
-
-      if (!response.ok) {
-        const error = await response
-          .json()
-          .catch(() => ({ error: "Unknown error" }));
-        throw new Error(
-          error.error || `Registration failed: ${response.status}`
-        );
+    const [evmPrivateKeyData, solanaPrivateKeyData] = await Promise.all([
+      cdp.evm.exportAccount({ name: `${walletName}-evm` }),
+      cdp.solana.exportAccount({ name: `${walletName}-solana` })
+    ]);
+    
+    const evmPrivateKey = this.extractPrivateKey(evmPrivateKeyData, "EVM");
+    const solanaPrivateKey = this.extractPrivateKey(solanaPrivateKeyData, "Solana");
+
+    const response = await fetch(`${this.x402ProxyUrl}/register-wallet`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        wallet_name: walletName,
+        evm: { address: evmAddress, private_key: evmPrivateKey },
+        solana: { address: solanaAddress, private_key: solanaPrivateKey },
+      }),
+    });
+
+    if (!response.ok) {
+      const raw = await response.text();
+
+      let message = raw;
+      try {
+        const parsed = JSON.parse(raw);
+        message = parsed.error || parsed.message || raw;
+      } catch {
       }
 
-      const data = await response.json();
-      spinner.succeed("Registered with x402 proxy");
+      throw new Error(`HTTP ${response.status}: ${message}`);
+    }
 
-      return data.api_key;
-    } catch (error) {
-      spinner.fail("Failed to register with x402 proxy");
-      if (error.message.includes("ECONNREFUSED")) {
-        throw new Error(
-          "Cannot connect to x402 proxy. Is it running on " +
-            this.x402ProxyUrl +
-            "?"
-        );
-      }
-      throw new Error(`Proxy registration failed: ${error.message}`);
+    const data = await response.json();
+    spinner.succeed("Registered with x402 proxy");
+
+    return data.api_key;
+
+  } catch (error) {
+    spinner.fail("Failed to register with x402 proxy");
+    if (error.message.includes("ECONNREFUSED")) {
+      throw new Error(
+        "Cannot connect to x402 proxy. Is it running on " +
+          this.x402ProxyUrl +
+          "?"
+      );
     }
+
+    throw error;
   }
+}
+
 
   async setup() {
-    try {
-      console.log(chalk.blue.bold("Consensus SDK Setup\n"));
+  try {
+    console.log(chalk.blue.bold("Consensus SDK Setup\n"));
 
-      if (!this.validateEnvironment()) {
-        process.exit(1);
-      }
+    if (!this.validateEnvironment()) {
+      process.exit(1);
+    }
 
-      const forceFlag = process.argv.includes("--force");
-      const shouldSkip = await this.checkExistingSetup(forceFlag);
+    const forceFlag = process.argv.includes("--force");
+    const shouldSkip = await this.checkExistingSetup(forceFlag);
 
-      if (shouldSkip) {
-        return;
-      }
+    if (shouldSkip) {
+      return;
+    }
 
-      const { wallet_name, account_address, cdpAccount } =
-        await this.createWallet();
-      const api_key = await this.registerWithProxy(
-        wallet_name,
-        account_address,
-        cdpAccount
-      );
+    const { wallet_name, evm_address, solana_address } = await this.createWallets();
 
-      const config = {
-        wallet_name,
-        account_address,
-        api_key,
-        x402_proxy_url: this.x402ProxyUrl,
-        setup_date: new Date().toISOString(),
-        version: "1.0.0",
-      };
-
-      this.saveConfig(config);
-
-      console.log(chalk.green.bold("\n✅ Setup Complete!\n"));
-      console.log(chalk.cyan("Wallet Name:"), wallet_name);
-      console.log(chalk.cyan("Account Address:"), account_address);
-      console.log(chalk.cyan("API Key:"), api_key);
-      console.log(chalk.cyan("x402 Proxy:"), this.x402ProxyUrl);
-
-      console.log(chalk.yellow("\n📋 Next Steps:"));
-      console.log("1. Fund your account with USDC on Base Sepolia");
-      console.log(`   Address: ${account_address}`);
-      console.log("2. Get USDC: https://faucet.circle.com/");
-      console.log("3. Make API calls using your API key");
-
-      console.log(chalk.blue("\n🔧 Usage Example:"));
-      console.log(`curl -X POST ${this.x402ProxyUrl}/proxy \\`);
-      console.log(`  -H "X-API-Key: ${api_key}" \\`);
-      console.log('  -H "Content-Type: application/json" \\');
-      console.log(
-        `  -d '{"target_url": "https://api.example.com", "idempotency_key": "unique-key"}'`
-      );
-    } catch (error) {
-      console.error(chalk.red("\n❌ Setup failed:"), error.message);
-      process.exit(1);
-    }
+    const api_key = await this.registerWithProxy(wallet_name, evm_address, solana_address);
+
+    const config = {
+      wallet_name,
+      addresses: {
+        evm: evm_address,
+        solana: solana_address,
+      },
+      api_key,
+      x402_proxy_url: this.x402ProxyUrl,
+      setup_date: new Date().toISOString(),
+      version: "2.0.0",
+    };
+
+    this.saveConfig(config);
+
+    console.log(chalk.green.bold("\n✅ Setup Complete!\n"));
+    console.log(chalk.cyan("Wallet Name:"), wallet_name);
+    console.log(chalk.cyan("EVM Address:"), evm_address);
+    console.log(chalk.cyan("Solana Address:"), solana_address);
+    console.log(chalk.cyan("API Key:"), api_key);
+    console.log(chalk.cyan("x402 Proxy:"), this.x402ProxyUrl);
+
+    console.log(chalk.yellow("\n📋 Next Steps:"));
+    console.log("1. Fund your wallets:");
+    console.log(chalk.dim("   EVM (Base Sepolia):"), evm_address);
+    console.log(chalk.dim("      Get USDC: https://faucet.circle.com/"));
+    console.log(chalk.dim("   Solana (Devnet):"), solana_address);
+    console.log(chalk.dim("      Get SOL: https://faucet.solana.com/"));
+    console.log("2. Make API calls using your API key");
+
+    console.log(chalk.blue("\n🔧 Usage Example:"));
+    console.log(`curl -X POST ${this.x402ProxyUrl}/proxy \\`);
+    console.log(`  -H "X-API-Key: ${api_key}" \\`);
+    console.log('  -H "Content-Type: application/json" \\');
+    console.log(
+      `  -d '{"target_url": "https://api.example.com", "chain": "base"}'`
+    );
+  } catch (error) {
+    console.error(chalk.red("\n❌ Setup failed:"), error.message);
+    process.exit(1);
   }
+}
 
   showHelp() {
     console.log(chalk.blue.bold("Consensus SDK\n"));

package/dist/index.js

@@ -0,0 +1,2 @@
+export { ProxyClient } from "./proxy-client.js";
+export { SocketClient } from "./socket-client.js";