create-polymarket-strategy 0.2.0 → 0.2.2

package/dist/index.js

@@ -4,7 +4,7 @@
 import { program } from "commander";
 import fs from "fs-extra";
 import path from "path";
-import { execSync } from "child_process";
+import { execSync as execSync2 } from "child_process";
 import pc from "picocolors";
 import { fileURLToPath } from "url";
 
@@ -13,7 +13,7 @@ import { ethers } from "ethers";
 
 // src/wallet/constants.ts
 var CHAIN_ID = 137;
-var RPC_URL = "https://1rpc.io/matic";
+var RPC_URL = "https://polygon.drpc.org";
 var CLOB_API = "https://clob.polymarket.com";
 var USDC_NATIVE = "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359";
 var USDC_E = "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174";
@@ -23,6 +23,7 @@ var EXCHANGE_CONTRACTS = [
   { address: "0xC5d563A36AE78145C45a50134d48A1215220f80a", name: "Neg Risk CTF Exchange" },
   { address: "0xd91E80cF2E7be2e162c6513ceD06f1dD0dA35296", name: "Neg Risk Adapter" }
 ];
+var UNISWAP_ROUTER = "0xE592427A0AEce92De3Edee1F18E0157C05861564";
 var CLOB_AUTH_DOMAIN = {
   name: "ClobAuthDomain",
   version: "1",
@@ -38,6 +39,9 @@ var ERC1155_ABI = [
   "function setApprovalForAll(address operator, bool approved)",
   "function isApprovedForAll(address account, address operator) view returns (bool)"
 ];
+var UNISWAP_ROUTER_ABI = [
+  "function exactInputSingle((address tokenIn, address tokenOut, uint24 fee, address recipient, uint256 deadline, uint256 amountIn, uint256 amountOutMinimum, uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)"
+];
 
 // src/wallet/index.ts
 function generateWallet() {
@@ -116,6 +120,42 @@ async function getBalances(address) {
     totalUsdc: usdcNative + usdcE
   };
 }
+async function swapUsdcToUsdcE(privateKey, amount, onProgress) {
+  const provider = getProvider();
+  const wallet = new ethers.Wallet(privateKey, provider);
+  const amountIn = ethers.parseUnits(amount.toFixed(6), 6);
+  onProgress?.("Approving Uniswap to spend USDC...");
+  const usdcNative = new ethers.Contract(USDC_NATIVE, ERC20_ABI, wallet);
+  const currentAllowance = await usdcNative.allowance(wallet.address, UNISWAP_ROUTER);
+  if (currentAllowance < amountIn) {
+    const approveTx = await usdcNative.approve(UNISWAP_ROUTER, amountIn);
+    await approveTx.wait();
+  }
+  onProgress?.(`Swapping ${amount.toFixed(2)} USDC \u2192 USDC.e...`);
+  const router = new ethers.Contract(UNISWAP_ROUTER, UNISWAP_ROUTER_ABI, wallet);
+  const minOut = amountIn * 99n / 100n;
+  const deadline = Math.floor(Date.now() / 1e3) + 300;
+  const swapParams = {
+    tokenIn: USDC_NATIVE,
+    tokenOut: USDC_E,
+    fee: 500,
+    // 0.05% fee tier - standard for stablecoin pairs
+    recipient: wallet.address,
+    deadline,
+    amountIn,
+    amountOutMinimum: minOut,
+    sqrtPriceLimitX96: 0
+    // No price limit
+  };
+  const swapTx = await router.exactInputSingle(swapParams);
+  const receipt = await swapTx.wait();
+  const amountOutEstimate = Number(ethers.formatUnits(minOut, 6));
+  return {
+    amountIn: amount,
+    amountOut: amountOutEstimate,
+    txHash: receipt.hash
+  };
+}
 async function approveExchangeContracts(privateKey, onProgress) {
   const provider = getProvider();
   const wallet = new ethers.Wallet(privateKey, provider);
@@ -173,6 +213,124 @@ async function checkApprovals(address) {
   return { allApproved, details };
 }
 
+// src/wallet/onepassword.ts
+import { execSync } from "child_process";
+var WALLET_ITEM_PREFIX = "Polymarket Wallet";
+function check1PasswordCli() {
+  try {
+    execSync("which op", { encoding: "utf8", stdio: "pipe" });
+  } catch {
+    return {
+      available: false,
+      authenticated: false,
+      error: "1Password CLI not installed. Install with: brew install --cask 1password-cli"
+    };
+  }
+  try {
+    execSync("op account list", { encoding: "utf8", stdio: "pipe" });
+    return { available: true, authenticated: true };
+  } catch {
+    return {
+      available: true,
+      authenticated: false,
+      error: "1Password CLI not authenticated. Enable app integration: Settings \u2192 Developer \u2192 Integrate with 1Password CLI"
+    };
+  }
+}
+async function storeIn1Password(name, credentials, vault = "Private") {
+  const itemName = `${WALLET_ITEM_PREFIX} - ${name}`;
+  try {
+    const fields = [
+      `address[text]=${credentials.address}`,
+      `private_key[password]=${credentials.privateKey}`,
+      `api_key[text]=${credentials.apiKey}`,
+      `api_secret[password]=${credentials.apiSecret}`,
+      `api_passphrase[password]=${credentials.apiPassphrase}`,
+      `created_at[text]=${(/* @__PURE__ */ new Date()).toISOString()}`
+    ];
+    const cmd = [
+      "op",
+      "item",
+      "create",
+      "--category=Login",
+      `--title=${itemName}`,
+      `--vault=${vault}`,
+      ...fields.map((f) => `"${f}"`)
+    ].join(" ");
+    execSync(cmd, { encoding: "utf8", stdio: "pipe" });
+    return { itemName, success: true };
+  } catch (error) {
+    const msg = error instanceof Error ? error.message : String(error);
+    return { itemName, success: false, error: msg };
+  }
+}
+async function getFrom1Password(name) {
+  const itemName = `${WALLET_ITEM_PREFIX} - ${name}`;
+  try {
+    const output = execSync(
+      `op item get "${itemName}" --format json`,
+      { encoding: "utf8", stdio: "pipe" }
+    );
+    const item = JSON.parse(output);
+    const fields = {};
+    for (const field of item.fields || []) {
+      if (field.label && field.value) {
+        fields[field.label] = field.value;
+      }
+    }
+    if (!fields.address || !fields.private_key) {
+      return { error: `Wallet "${itemName}" is missing required fields` };
+    }
+    return {
+      credentials: {
+        address: fields.address,
+        privateKey: fields.private_key,
+        apiKey: fields.api_key || "",
+        apiSecret: fields.api_secret || "",
+        apiPassphrase: fields.api_passphrase || ""
+      }
+    };
+  } catch (error) {
+    const msg = error instanceof Error ? error.message : String(error);
+    if (msg.includes("isn't an item")) {
+      return { error: `Wallet "${itemName}" not found in 1Password` };
+    }
+    return { error: msg };
+  }
+}
+function listWallets(vault) {
+  try {
+    const vaultArg = vault ? `--vault="${vault}"` : "";
+    const output = execSync(
+      `op item list --format json ${vaultArg}`,
+      { encoding: "utf8", stdio: "pipe" }
+    );
+    const items = JSON.parse(output);
+    const wallets = [];
+    for (const item of items) {
+      if (item.title?.startsWith(WALLET_ITEM_PREFIX)) {
+        const name = item.title.replace(`${WALLET_ITEM_PREFIX} - `, "");
+        wallets.push(name);
+      }
+    }
+    return wallets;
+  } catch {
+    return [];
+  }
+}
+function getWalletAddress(name) {
+  const itemName = `${WALLET_ITEM_PREFIX} - ${name}`;
+  try {
+    const output = execSync(
+      `op item get "${itemName}" --fields address --reveal`,
+      { encoding: "utf8", stdio: "pipe" }
+    );
+    return output.trim();
+  } catch {
+    return null;
+  }
+}
+
 // src/index.ts
 var __dirname = path.dirname(fileURLToPath(import.meta.url));
 var TEMPLATE_DIR = path.resolve(__dirname, "..", "templates", "worker");
@@ -262,10 +420,10 @@ async function createStrategy(name, options) {
   if (options.install) {
     console.log(`  ${pc.green("\u2713")} Installing dependencies...`);
     try {
-      execSync("pnpm install", { cwd: targetDir, stdio: "pipe" });
+      execSync2("pnpm install", { cwd: targetDir, stdio: "pipe" });
     } catch {
       try {
-        execSync("npm install", { cwd: targetDir, stdio: "pipe" });
+        execSync2("npm install", { cwd: targetDir, stdio: "pipe" });
       } catch {
         console.log(
           pc.yellow("    Could not install dependencies automatically.")
@@ -279,8 +437,8 @@ async function createStrategy(name, options) {
   if (options.git) {
     console.log(`  ${pc.green("\u2713")} Initializing git repository...`);
     try {
-      execSync("git init", { cwd: targetDir, stdio: "pipe" });
-      execSync("git add -A", { cwd: targetDir, stdio: "pipe" });
+      execSync2("git init", { cwd: targetDir, stdio: "pipe" });
+      execSync2("git add -A", { cwd: targetDir, stdio: "pipe" });
     } catch {
       console.log(pc.yellow("    Could not initialize git repository."));
     }
@@ -296,10 +454,18 @@ async function createStrategy(name, options) {
   console.log(pc.cyan("  wrangler deploy"));
   console.log();
 }
-async function walletCreate() {
+async function walletCreate(options) {
   console.log();
   console.log(pc.cyan("Creating new Polymarket wallet..."));
   console.log();
+  if (options.store1password) {
+    const opStatus = check1PasswordCli();
+    if (!opStatus.available || !opStatus.authenticated) {
+      console.error(pc.red(`Error: ${opStatus.error}`));
+      process.exit(1);
+    }
+    console.log(`  ${pc.green("\u2713")} 1Password CLI authenticated`);
+  }
   console.log(`  ${pc.yellow("\u2192")} Generating Ethereum wallet...`);
   const wallet = generateWallet();
   console.log(`  ${pc.green("\u2713")} Address: ${pc.bold(wallet.address)}`);
@@ -307,16 +473,38 @@ async function walletCreate() {
   try {
     const apiCreds = await deriveApiCredentials(wallet.privateKey);
     console.log(`  ${pc.green("\u2713")} API credentials derived`);
+    const fullCreds = { ...wallet, ...apiCreds };
+    if (options.store1password && options.name) {
+      console.log(`  ${pc.yellow("\u2192")} Storing in 1Password...`);
+      const result = await storeIn1Password(
+        options.name,
+        fullCreds,
+        options.vault || "Private"
+      );
+      if (result.success) {
+        console.log(`  ${pc.green("\u2713")} Stored as "${result.itemName}"`);
+      } else {
+        console.error(pc.red(`  \u2717 Failed to store: ${result.error}`));
+      }
+    }
     console.log();
     console.log(pc.cyan("\u2550".repeat(60)));
-    console.log(pc.bold("SAVE THESE CREDENTIALS SECURELY"));
+    if (options.store1password && options.name) {
+      console.log(pc.bold("WALLET CREATED & STORED IN 1PASSWORD"));
+    } else {
+      console.log(pc.bold("SAVE THESE CREDENTIALS SECURELY"));
+    }
     console.log(pc.cyan("\u2550".repeat(60)));
     console.log();
     console.log(`${pc.bold("Address:")}        ${wallet.address}`);
-    console.log(`${pc.bold("Private Key:")}    ${wallet.privateKey}`);
-    console.log(`${pc.bold("API Key:")}        ${apiCreds.apiKey}`);
-    console.log(`${pc.bold("API Secret:")}     ${apiCreds.apiSecret}`);
-    console.log(`${pc.bold("API Passphrase:")} ${apiCreds.apiPassphrase}`);
+    if (!options.store1password) {
+      console.log(`${pc.bold("Private Key:")}    ${wallet.privateKey}`);
+      console.log(`${pc.bold("API Key:")}        ${apiCreds.apiKey}`);
+      console.log(`${pc.bold("API Secret:")}     ${apiCreds.apiSecret}`);
+      console.log(`${pc.bold("API Passphrase:")} ${apiCreds.apiPassphrase}`);
+    } else {
+      console.log(pc.dim("  (credentials stored securely in 1Password)"));
+    }
     console.log();
     console.log(pc.cyan("\u2550".repeat(60)));
     console.log();
@@ -329,13 +517,24 @@ async function walletCreate() {
     console.log(`     - Send ~1 POL for gas fees`);
     console.log();
     console.log(`  2. ${pc.yellow("Run on-chain setup:")}`);
-    console.log(
-      `     npx create-polymarket-strategy wallet setup --private-key ${wallet.privateKey}`
-    );
+    if (options.store1password && options.name) {
+      console.log(
+        `     npx create-polymarket-strategy wallet setup --from-1password ${options.name}`
+      );
+    } else {
+      console.log(
+        `     npx create-polymarket-strategy wallet setup --private-key <key>`
+      );
+    }
     console.log();
     console.log(`  3. ${pc.yellow("Add secrets to your worker:")}`);
-    console.log(`     wrangler secret put EXECUTOR_API_KEY`);
+    console.log(`     wrangler secret put WALLET_PRIVATE_KEY`);
     console.log();
+    if (options.store1password && options.name) {
+      console.log(pc.dim(`To retrieve later:`));
+      console.log(pc.dim(`  npx create-polymarket-strategy wallet get ${options.name}`));
+      console.log();
+    }
   } catch (error) {
     console.log(`  ${pc.red("\u2717")} Failed to derive API credentials`);
     console.log(
@@ -402,7 +601,80 @@ async function walletBalance(address) {
     process.exit(1);
   }
 }
-async function walletSetup(privateKey) {
+async function walletGet(name) {
+  console.log();
+  console.log(pc.cyan(`Retrieving wallet "${name}" from 1Password...`));
+  console.log();
+  const opStatus = check1PasswordCli();
+  if (!opStatus.available || !opStatus.authenticated) {
+    console.error(pc.red(`Error: ${opStatus.error}`));
+    process.exit(1);
+  }
+  const result = await getFrom1Password(name);
+  if (result.error) {
+    console.error(pc.red(`Error: ${result.error}`));
+    process.exit(1);
+  }
+  const creds = result.credentials;
+  console.log(pc.cyan("\u2550".repeat(60)));
+  console.log(pc.bold(`${WALLET_ITEM_PREFIX} - ${name}`));
+  console.log(pc.cyan("\u2550".repeat(60)));
+  console.log();
+  console.log(`${pc.bold("Address:")}        ${creds.address}`);
+  console.log(`${pc.bold("Private Key:")}    ${creds.privateKey}`);
+  if (creds.apiKey) {
+    console.log(`${pc.bold("API Key:")}        ${creds.apiKey}`);
+    console.log(`${pc.bold("API Secret:")}     ${creds.apiSecret}`);
+    console.log(`${pc.bold("API Passphrase:")} ${creds.apiPassphrase}`);
+  }
+  console.log();
+}
+async function walletList() {
+  console.log();
+  console.log(pc.cyan("Listing Polymarket wallets in 1Password..."));
+  console.log();
+  const opStatus = check1PasswordCli();
+  if (!opStatus.available || !opStatus.authenticated) {
+    console.error(pc.red(`Error: ${opStatus.error}`));
+    process.exit(1);
+  }
+  const wallets = listWallets();
+  if (wallets.length === 0) {
+    console.log(pc.yellow("No Polymarket wallets found in 1Password."));
+    console.log();
+    console.log(pc.dim("Create one with:"));
+    console.log(pc.dim("  npx create-polymarket-strategy wallet create --name my-trader --store-1password"));
+    console.log();
+    return;
+  }
+  console.log(pc.bold(`Found ${wallets.length} wallet(s):`));
+  console.log();
+  for (const name of wallets) {
+    const address = getWalletAddress(name);
+    console.log(`  ${pc.cyan(name)}`);
+    console.log(`    ${pc.dim(address || "address unavailable")}`);
+  }
+  console.log();
+}
+async function walletSetup(options) {
+  let privateKey = options.privateKey;
+  if (options.from1password) {
+    const opStatus = check1PasswordCli();
+    if (!opStatus.available || !opStatus.authenticated) {
+      console.error(pc.red(`Error: ${opStatus.error}`));
+      process.exit(1);
+    }
+    const result = await getFrom1Password(options.from1password);
+    if (result.error) {
+      console.error(pc.red(`Error: ${result.error}`));
+      process.exit(1);
+    }
+    privateKey = result.credentials.privateKey;
+  }
+  if (!privateKey) {
+    console.error(pc.red("Error: Either --private-key or --from-1password is required"));
+    process.exit(1);
+  }
   console.log();
   console.log(pc.cyan("Setting up wallet for Polymarket trading..."));
   console.log();
@@ -413,7 +685,7 @@ async function walletSetup(privateKey) {
     console.log(`  ${pc.bold("Address:")} ${address}`);
     console.log();
     console.log(pc.yellow("Checking balances..."));
-    const balances = await getBalances(address);
+    let balances = await getBalances(address);
     console.log(`  POL:    ${balances.pol.toFixed(4)}`);
     console.log(`  USDC:   $${balances.usdcNative.toFixed(2)}`);
     console.log(`  USDC.e: $${balances.usdcE.toFixed(2)}`);
@@ -424,15 +696,30 @@ async function walletSetup(privateKey) {
       process.exit(1);
     }
     if (balances.usdcNative > 1 && balances.usdcE < 1) {
-      console.log(
-        pc.yellow(
-          "Note: You have native USDC but Polymarket requires USDC.e"
-        )
-      );
-      console.log(
-        pc.yellow("Use a DEX like Uniswap to swap USDC \u2192 USDC.e first")
-      );
+      console.log(pc.yellow("Swapping native USDC \u2192 USDC.e via Uniswap V3..."));
+      console.log(pc.dim("(Polymarket requires USDC.e, not native USDC)"));
       console.log();
+      try {
+        const swapResult = await swapUsdcToUsdcE(
+          privateKey,
+          balances.usdcNative,
+          (msg) => {
+            console.log(`  ${pc.yellow("\u2192")} ${msg}`);
+          }
+        );
+        console.log(
+          `  ${pc.green("\u2713")} Swapped $${swapResult.amountIn.toFixed(2)} \u2192 $${swapResult.amountOut.toFixed(2)} USDC.e`
+        );
+        console.log(pc.dim(`    Tx: ${swapResult.txHash}`));
+        console.log();
+        balances = await getBalances(address);
+      } catch (error) {
+        console.error(pc.red(`  \u2717 Swap failed: ${error}`));
+        console.log(
+          pc.yellow("    You can manually swap at https://app.uniswap.org")
+        );
+        process.exit(1);
+      }
     }
     console.log(pc.yellow("Approving Polymarket exchange contracts..."));
     console.log(
@@ -473,8 +760,10 @@ program.argument("[name]", "Project name").option("--no-git", "Skip git initiali
   }
 });
 var walletCmd = program.command("wallet").description("Wallet management commands");
-walletCmd.command("create").description("Create a new wallet and derive API credentials").action(walletCreate);
+walletCmd.command("create").description("Create a new wallet and derive API credentials").option("--name <name>", "Trader/strategy name (required for 1Password storage)").option("--store-1password", "Store credentials in 1Password").option("--vault <vault>", "1Password vault name", "Private").action((options) => walletCreate(options));
 walletCmd.command("balance").description("Check wallet balances").argument("<address>", "Wallet address").action(walletBalance);
-walletCmd.command("setup").description("Approve exchange contracts for trading").requiredOption("--private-key <key>", "Wallet private key").action((options) => walletSetup(options.privateKey));
+walletCmd.command("setup").description("Approve exchange contracts for trading").option("--private-key <key>", "Wallet private key").option("--from-1password <name>", "Get private key from 1Password wallet").action((options) => walletSetup(options));
+walletCmd.command("get").description("Retrieve wallet credentials from 1Password").argument("<name>", "Trader/strategy name").action(walletGet);
+walletCmd.command("list").description("List all Polymarket wallets in 1Password").action(walletList);
 program.parse();
 //# sourceMappingURL=index.js.map