zoda-agent-sdk 1.0.5 → 1.0.7

package/dist/cli.js

@@ -35,7 +35,7 @@ const { program } = await import("commander").then((m) => m);
 program
     .name("zoda-agent")
     .description("Zoda AI Agent SDK CLI — Deploy and run AI agents on zodaai.xyz")
-    .version("1.0.3");
+    .version("1.0.7");
 program
     .command("start")
     .description("Start the agent loop (polls tasks, responds, votes, deploys tokens)")
@@ -69,7 +69,7 @@ program
     .option("--type <type>", "Agent type: trader|creator|analyst|defi|meme|oracle", "creator")
     .option("--community <community>", "Default community", "general")
     .option("--ai <provider>", "AI provider: openai|claude", "openai")
-    .option("--api-url <url>", "API URL", "https://api.zodaai.xyz")
+    .option("--api-url <url>", "API URL", "https://zodaai.xyz")
     .option("--save", "Save credentials to .env file automatically")
     .action(async (opts) => {
     try {
@@ -255,4 +255,74 @@ program
         process.exit(1);
     }
 });
+program
+    .command("create-community")
+    .description("Create a new community/cluster on Zoda AI")
+    .requiredOption("--name <name>", "Community display name (2–60 chars)")
+    .requiredOption("--slug <slug>", "URL slug — lowercase, alphanumeric, hyphens (e.g. degen-trading)")
+    .requiredOption("--description <description>", "What this community is about (10–500 chars)")
+    .option("--focus <focus>", "Focus area: trading|defi|meme|analytics|general", "general")
+    .option("--icon <url>", "Icon image URL (optional)")
+    .option("--config <path>", "Path to config JSON file")
+    .action(async (opts) => {
+    await loadDotenv();
+    const config = loadConfig(opts.config);
+    if (!config.agentId) {
+        console.error("ERROR: ZODA_AGENT_ID is required. Set it in .env");
+        process.exit(1);
+    }
+    if (!config.apiKey) {
+        console.error("ERROR: ZODA_API_KEY is required. Set it in .env");
+        process.exit(1);
+    }
+    const validFocus = ["trading", "defi", "meme", "analytics", "general"];
+    if (!validFocus.includes(opts.focus)) {
+        console.error(`ERROR: --focus must be one of: ${validFocus.join(", ")}`);
+        process.exit(1);
+    }
+    const slugRegex = /^[a-z0-9-]+$/;
+    if (!slugRegex.test(opts.slug)) {
+        console.error("ERROR: --slug must be lowercase letters, numbers, and hyphens only (e.g. degen-trading)");
+        process.exit(1);
+    }
+    const apiUrl = config.apiUrl ?? "https://zodaai.xyz";
+    try {
+        console.log(`\nCreating community r/${opts.slug}...`);
+        const fetch = (await import("node-fetch")).default;
+        const resp = await fetch(`${apiUrl}/api/communities`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                "X-Api-Key": config.apiKey,
+            },
+            body: JSON.stringify({
+                agentId: config.agentId,
+                name: opts.name,
+                slug: opts.slug,
+                description: opts.description,
+                focus: opts.focus,
+                iconUrl: opts.icon,
+            }),
+        });
+        const data = await resp.json();
+        if (!resp.ok) {
+            console.error(`ERROR: ${data.error ?? resp.statusText}`);
+            process.exit(1);
+        }
+        console.log("\n╔══════════════════════════════════════╗");
+        console.log("║       COMMUNITY CREATED               ║");
+        console.log("╚══════════════════════════════════════╝\n");
+        console.log(`Community ID:   ${data.communityId}`);
+        console.log(`Name:           ${data.name}`);
+        console.log(`Slug:           r/${data.slug}`);
+        console.log(`Focus:          ${data.focus}`);
+        console.log(`\n${data.message}\n`);
+        console.log(`→ View it at: https://zodaai.xyz/communities/${data.slug}`);
+        console.log(`→ Post to it: zoda-agent ai-post --community ${data.slug}\n`);
+    }
+    catch (err) {
+        console.error("Create community failed:", err instanceof Error ? err.message : err);
+        process.exit(1);
+    }
+});
 program.parse(process.argv);

package/dist/solana.js

@@ -1,16 +1,22 @@
-const PUMP_PORTAL_API = "https://pumpportal.fun/api/trade-local";
 const SOLANA_RPC = "https://api.mainnet-beta.solana.com";
+const PUMP_FUN_PROGRAM_ID = "6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P";
+const MPL_TOKEN_METADATA_PROGRAM_ID = "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s";
+const TOKEN_PROGRAM_ID = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
+const ASSOCIATED_TOKEN_PROGRAM_ID = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
+// Anchor discriminator: SHA256("global:create")[0..8]
+const CREATE_DISCRIMINATOR = Buffer.from([24, 30, 200, 40, 5, 28, 7, 119]);
+// Anchor discriminator: SHA256("global:buy")[0..8]
+const BUY_DISCRIMINATOR = Buffer.from([102, 6, 61, 18, 1, 218, 235, 234]);
 export async function getSOLBalance(publicKey) {
-    const body = {
-        jsonrpc: "2.0",
-        id: 1,
-        method: "getBalance",
-        params: [publicKey],
-    };
     const res = await fetch(SOLANA_RPC, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(body),
+        body: JSON.stringify({
+            jsonrpc: "2.0",
+            id: 1,
+            method: "getBalance",
+            params: [publicKey],
+        }),
     });
     const data = (await res.json());
     return (data.result?.value ?? 0) / 1e9;
@@ -19,45 +25,136 @@ export function buildMetadataUri(apiUrl, coinId) {
     const base = apiUrl.replace(/\/$/, "");
     return `${base}/api/coins/${coinId}/metadata.json`;
 }
+function encodeString(str) {
+    const bytes = Buffer.from(str, "utf8");
+    const len = Buffer.alloc(4);
+    len.writeUInt32LE(bytes.length, 0);
+    return Buffer.concat([len, bytes]);
+}
+function encodeBigIntLE(value, bytes) {
+    const buf = Buffer.alloc(bytes);
+    let v = value;
+    for (let i = 0; i < bytes; i++) {
+        buf[i] = Number(v & 0xffn);
+        v >>= 8n;
+    }
+    return buf;
+}
+async function getPumpFunPDAs(mintPubkey) {
+    const { PublicKey } = await import("@solana/web3.js");
+    const pumpProgram = new PublicKey(PUMP_FUN_PROGRAM_ID);
+    const mplProgram = new PublicKey(MPL_TOKEN_METADATA_PROGRAM_ID);
+    const tokenProgram = new PublicKey(TOKEN_PROGRAM_ID);
+    const ataProgram = new PublicKey(ASSOCIATED_TOKEN_PROGRAM_ID);
+    const [mintAuthority] = PublicKey.findProgramAddressSync([Buffer.from("mint-authority")], pumpProgram);
+    const [bondingCurve] = PublicKey.findProgramAddressSync([Buffer.from("bonding-curve"), mintPubkey.toBuffer()], pumpProgram);
+    const [global] = PublicKey.findProgramAddressSync([Buffer.from("global")], pumpProgram);
+    const [eventAuthority] = PublicKey.findProgramAddressSync([Buffer.from("__event_authority")], pumpProgram);
+    const [metadata] = PublicKey.findProgramAddressSync([Buffer.from("metadata"), mplProgram.toBuffer(), mintPubkey.toBuffer()], mplProgram);
+    const [assocBondingCurve] = PublicKey.findProgramAddressSync([bondingCurve.toBuffer(), tokenProgram.toBuffer(), mintPubkey.toBuffer()], ataProgram);
+    return { mintAuthority, bondingCurve, assocBondingCurve, global, eventAuthority, metadata };
+}
+async function buildCreateInstruction(mintPubkey, signerPubkey, name, symbol, uri) {
+    const { PublicKey, TransactionInstruction, SystemProgram, SYSVAR_RENT_PUBKEY } = await import("@solana/web3.js");
+    const pdas = await getPumpFunPDAs(mintPubkey);
+    const data = Buffer.concat([
+        CREATE_DISCRIMINATOR,
+        encodeString(name),
+        encodeString(symbol),
+        encodeString(uri),
+        signerPubkey.toBuffer(),
+    ]);
+    const keys = [
+        { pubkey: mintPubkey, isSigner: true, isWritable: true },
+        { pubkey: pdas.mintAuthority, isSigner: false, isWritable: false },
+        { pubkey: pdas.bondingCurve, isSigner: false, isWritable: true },
+        { pubkey: pdas.assocBondingCurve, isSigner: false, isWritable: true },
+        { pubkey: pdas.global, isSigner: false, isWritable: false },
+        { pubkey: new PublicKey(MPL_TOKEN_METADATA_PROGRAM_ID), isSigner: false, isWritable: false },
+        { pubkey: pdas.metadata, isSigner: false, isWritable: true },
+        { pubkey: signerPubkey, isSigner: true, isWritable: true },
+        { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
+        { pubkey: new PublicKey(TOKEN_PROGRAM_ID), isSigner: false, isWritable: false },
+        { pubkey: new PublicKey(ASSOCIATED_TOKEN_PROGRAM_ID), isSigner: false, isWritable: false },
+        { pubkey: SYSVAR_RENT_PUBKEY, isSigner: false, isWritable: false },
+        { pubkey: pdas.eventAuthority, isSigner: false, isWritable: false },
+        { pubkey: new PublicKey(PUMP_FUN_PROGRAM_ID), isSigner: false, isWritable: false },
+    ];
+    return new TransactionInstruction({
+        keys,
+        programId: new PublicKey(PUMP_FUN_PROGRAM_ID),
+        data,
+    });
+}
+async function buildBuyInstruction(mintPubkey, signerPubkey, buyAmountSOL) {
+    const { PublicKey, TransactionInstruction, SystemProgram } = await import("@solana/web3.js");
+    const pdas = await getPumpFunPDAs(mintPubkey);
+    const lamports = BigInt(Math.floor(buyAmountSOL * 1e9));
+    const maxSolCost = (lamports * 105n) / 100n;
+    const [assocUserAccount] = PublicKey.findProgramAddressSync([signerPubkey.toBuffer(), new PublicKey(TOKEN_PROGRAM_ID).toBuffer(), mintPubkey.toBuffer()], new PublicKey(ASSOCIATED_TOKEN_PROGRAM_ID));
+    const feeRecipient = new PublicKey("CebN5WGQ4jvEPvsVU4EoHEpgzq1VV7AbicfhtW4xC9iM");
+    const data = Buffer.concat([
+        BUY_DISCRIMINATOR,
+        encodeBigIntLE(0n, 8),
+        encodeBigIntLE(maxSolCost, 8),
+    ]);
+    const keys = [
+        { pubkey: pdas.global, isSigner: false, isWritable: false },
+        { pubkey: feeRecipient, isSigner: false, isWritable: true },
+        { pubkey: mintPubkey, isSigner: false, isWritable: false },
+        { pubkey: pdas.bondingCurve, isSigner: false, isWritable: true },
+        { pubkey: pdas.assocBondingCurve, isSigner: false, isWritable: true },
+        { pubkey: assocUserAccount, isSigner: false, isWritable: true },
+        { pubkey: signerPubkey, isSigner: true, isWritable: true },
+        { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
+        { pubkey: new PublicKey(TOKEN_PROGRAM_ID), isSigner: false, isWritable: false },
+        { pubkey: new PublicKey(ASSOCIATED_TOKEN_PROGRAM_ID), isSigner: false, isWritable: false },
+        { pubkey: pdas.eventAuthority, isSigner: false, isWritable: false },
+        { pubkey: new PublicKey(PUMP_FUN_PROGRAM_ID), isSigner: false, isWritable: false },
+    ];
+    return new TransactionInstruction({
+        keys,
+        programId: new PublicKey(PUMP_FUN_PROGRAM_ID),
+        data,
+    });
+}
 export async function deployTokenOnPumpFun(payload, wallet, buyAmountSOL = 0.001, apiUrl = "https://zodaai.xyz", coinId) {
-    const { Keypair, VersionedTransaction, Connection } = await import("@solana/web3.js");
+    const { Keypair, Connection, VersionedTransaction, TransactionMessage, ComputeBudgetProgram, PublicKey, } = await import("@solana/web3.js");
     const { default: bs58 } = await import("bs58");
     const mintKeypair = Keypair.generate();
     const signerKeypair = Keypair.fromSecretKey(bs58.decode(wallet.privateKeyBase58));
+    const mintPubkey = mintKeypair.publicKey;
+    const signerPubkey = signerKeypair.publicKey;
     const metadataUri = coinId
         ? buildMetadataUri(apiUrl, coinId)
-        : `data:application/json,${encodeURIComponent(JSON.stringify({ name: payload.name, symbol: payload.symbol, description: payload.description, image: payload.imageUrl ?? "", showName: true, createdOn: "https://pump.fun" }))}`;
-    const createParams = {
-        publicKey: signerKeypair.publicKey.toBase58(),
-        action: "create",
-        tokenMetadata: {
-            name: payload.name,
-            symbol: payload.symbol,
-            uri: metadataUri,
-        },
-        mint: mintKeypair.publicKey.toBase58(),
-        denominatedInSol: "true",
-        amount: buyAmountSOL,
-        slippage: 10,
-        priorityFee: 0.0005,
-        pool: "pump",
-    };
-    const txRes = await fetch(PUMP_PORTAL_API, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(createParams),
+        : `https://zodaai.xyz`;
+    console.log(`Mint: ${mintPubkey.toBase58()}`);
+    console.log(`Metadata: ${metadataUri}`);
+    console.log(`Building pump.fun transaction...`);
+    const connection = new Connection(SOLANA_RPC, "confirmed");
+    const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash("finalized");
+    const createIx = await buildCreateInstruction(mintPubkey, signerPubkey, payload.name, payload.symbol, metadataUri);
+    const priorityIx = ComputeBudgetProgram.setComputeUnitPrice({ microLamports: 500000 });
+    const budgetIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 400000 });
+    const instructions = [priorityIx, budgetIx, createIx];
+    const message = new TransactionMessage({
+        payerKey: signerPubkey,
+        recentBlockhash: blockhash,
+        instructions,
+    }).compileToV0Message();
+    const tx = new VersionedTransaction(message);
+    tx.sign([mintKeypair, signerKeypair]);
+    console.log(`Submitting to Solana...`);
+    const signature = await connection.sendTransaction(tx, {
+        skipPreflight: false,
+        preflightCommitment: "confirmed",
     });
-    if (!txRes.ok) {
-        const errText = await txRes.text();
-        throw new Error(`Pump.fun transaction creation failed: ${txRes.status} ${errText}`);
+    console.log(`Confirming transaction ${signature}...`);
+    const result = await connection.confirmTransaction({ signature, blockhash, lastValidBlockHeight }, "confirmed");
+    if (result.value.err) {
+        throw new Error(`Transaction failed: ${JSON.stringify(result.value.err)}`);
     }
-    const txData = await txRes.arrayBuffer();
-    const tx = VersionedTransaction.deserialize(new Uint8Array(txData));
-    tx.sign([mintKeypair, signerKeypair]);
-    const connection = new Connection(SOLANA_RPC, "confirmed");
-    const signature = await connection.sendTransaction(tx);
-    await connection.confirmTransaction(signature, "confirmed");
-    const mintAddress = mintKeypair.publicKey.toBase58();
+    const mintAddress = mintPubkey.toBase58();
     return {
         mintAddress,
         txHash: signature,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zoda-agent-sdk",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Official SDK for deploying AI agents on Zoda AI (zodaai.xyz) — real Solana wallets, Pump.fun token deployment, OpenAI/Claude integration",
   "type": "module",
   "main": "./dist/index.js",

package/src/cli.ts

@@ -43,7 +43,7 @@ const { program } = await import("commander").then((m) => m);
 program
   .name("zoda-agent")
   .description("Zoda AI Agent SDK CLI — Deploy and run AI agents on zodaai.xyz")
-  .version("1.0.3");
+  .version("1.0.7");
 
 program
   .command("start")
@@ -81,7 +81,7 @@ program
   .option("--type <type>", "Agent type: trader|creator|analyst|defi|meme|oracle", "creator")
   .option("--community <community>", "Default community", "general")
   .option("--ai <provider>", "AI provider: openai|claude", "openai")
-  .option("--api-url <url>", "API URL", "https://api.zodaai.xyz")
+  .option("--api-url <url>", "API URL", "https://zodaai.xyz")
   .option("--save", "Save credentials to .env file automatically")
   .action(async (opts) => {
     try {
@@ -304,4 +304,82 @@ program
     }
   });
 
+program
+  .command("create-community")
+  .description("Create a new community/cluster on Zoda AI")
+  .requiredOption("--name <name>", "Community display name (2–60 chars)")
+  .requiredOption("--slug <slug>", "URL slug — lowercase, alphanumeric, hyphens (e.g. degen-trading)")
+  .requiredOption("--description <description>", "What this community is about (10–500 chars)")
+  .option("--focus <focus>", "Focus area: trading|defi|meme|analytics|general", "general")
+  .option("--icon <url>", "Icon image URL (optional)")
+  .option("--config <path>", "Path to config JSON file")
+  .action(async (opts) => {
+    await loadDotenv();
+    const config = loadConfig(opts.config);
+
+    if (!config.agentId) {
+      console.error("ERROR: ZODA_AGENT_ID is required. Set it in .env");
+      process.exit(1);
+    }
+    if (!config.apiKey) {
+      console.error("ERROR: ZODA_API_KEY is required. Set it in .env");
+      process.exit(1);
+    }
+
+    const validFocus = ["trading", "defi", "meme", "analytics", "general"];
+    if (!validFocus.includes(opts.focus)) {
+      console.error(`ERROR: --focus must be one of: ${validFocus.join(", ")}`);
+      process.exit(1);
+    }
+
+    const slugRegex = /^[a-z0-9-]+$/;
+    if (!slugRegex.test(opts.slug)) {
+      console.error("ERROR: --slug must be lowercase letters, numbers, and hyphens only (e.g. degen-trading)");
+      process.exit(1);
+    }
+
+    const apiUrl = config.apiUrl ?? "https://zodaai.xyz";
+
+    try {
+      console.log(`\nCreating community r/${opts.slug}...`);
+      const fetch = (await import("node-fetch")).default;
+      const resp = await fetch(`${apiUrl}/api/communities`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          "X-Api-Key": config.apiKey,
+        },
+        body: JSON.stringify({
+          agentId: config.agentId,
+          name: opts.name,
+          slug: opts.slug,
+          description: opts.description,
+          focus: opts.focus,
+          iconUrl: opts.icon,
+        }),
+      });
+
+      const data = await resp.json() as Record<string, unknown>;
+
+      if (!resp.ok) {
+        console.error(`ERROR: ${(data as { error?: string }).error ?? resp.statusText}`);
+        process.exit(1);
+      }
+
+      console.log("\n╔══════════════════════════════════════╗");
+      console.log("║       COMMUNITY CREATED               ║");
+      console.log("╚══════════════════════════════════════╝\n");
+      console.log(`Community ID:   ${data.communityId}`);
+      console.log(`Name:           ${data.name}`);
+      console.log(`Slug:           r/${data.slug}`);
+      console.log(`Focus:          ${data.focus}`);
+      console.log(`\n${data.message}\n`);
+      console.log(`→ View it at: https://zodaai.xyz/communities/${data.slug}`);
+      console.log(`→ Post to it: zoda-agent ai-post --community ${data.slug}\n`);
+    } catch (err) {
+      console.error("Create community failed:", err instanceof Error ? err.message : err);
+      process.exit(1);
+    }
+  });
+
 program.parse(process.argv);

package/src/solana.ts

@@ -1,7 +1,15 @@
 import type { TokenDeployResult, DeployTokenPayload } from "./types.js";
 
-const PUMP_PORTAL_API = "https://pumpportal.fun/api/trade-local";
 const SOLANA_RPC = "https://api.mainnet-beta.solana.com";
+const PUMP_FUN_PROGRAM_ID = "6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P";
+const MPL_TOKEN_METADATA_PROGRAM_ID = "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s";
+const TOKEN_PROGRAM_ID = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
+const ASSOCIATED_TOKEN_PROGRAM_ID = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
+
+// Anchor discriminator: SHA256("global:create")[0..8]
+const CREATE_DISCRIMINATOR = Buffer.from([24, 30, 200, 40, 5, 28, 7, 119]);
+// Anchor discriminator: SHA256("global:buy")[0..8]
+const BUY_DISCRIMINATOR = Buffer.from([102, 6, 61, 18, 1, 218, 235, 234]);
 
 export interface SolanaWallet {
   publicKey: string;
@@ -9,16 +17,15 @@ export interface SolanaWallet {
 }
 
 export async function getSOLBalance(publicKey: string): Promise<number> {
-  const body = {
-    jsonrpc: "2.0",
-    id: 1,
-    method: "getBalance",
-    params: [publicKey],
-  };
   const res = await fetch(SOLANA_RPC, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(body),
+    body: JSON.stringify({
+      jsonrpc: "2.0",
+      id: 1,
+      method: "getBalance",
+      params: [publicKey],
+    }),
   });
   const data = (await res.json()) as { result: { value: number } };
   return (data.result?.value ?? 0) / 1e9;
@@ -29,6 +36,152 @@ export function buildMetadataUri(apiUrl: string, coinId: string): string {
   return `${base}/api/coins/${coinId}/metadata.json`;
 }
 
+function encodeString(str: string): Buffer {
+  const bytes = Buffer.from(str, "utf8");
+  const len = Buffer.alloc(4);
+  len.writeUInt32LE(bytes.length, 0);
+  return Buffer.concat([len, bytes]);
+}
+
+function encodeBigIntLE(value: bigint, bytes: number): Buffer {
+  const buf = Buffer.alloc(bytes);
+  let v = value;
+  for (let i = 0; i < bytes; i++) {
+    buf[i] = Number(v & 0xffn);
+    v >>= 8n;
+  }
+  return buf;
+}
+
+async function getPumpFunPDAs(mintPubkey: import("@solana/web3.js").PublicKey): Promise<{
+  mintAuthority: import("@solana/web3.js").PublicKey;
+  bondingCurve: import("@solana/web3.js").PublicKey;
+  assocBondingCurve: import("@solana/web3.js").PublicKey;
+  global: import("@solana/web3.js").PublicKey;
+  eventAuthority: import("@solana/web3.js").PublicKey;
+  metadata: import("@solana/web3.js").PublicKey;
+}> {
+  const { PublicKey } = await import("@solana/web3.js");
+  const pumpProgram = new PublicKey(PUMP_FUN_PROGRAM_ID);
+  const mplProgram = new PublicKey(MPL_TOKEN_METADATA_PROGRAM_ID);
+  const tokenProgram = new PublicKey(TOKEN_PROGRAM_ID);
+  const ataProgram = new PublicKey(ASSOCIATED_TOKEN_PROGRAM_ID);
+
+  const [mintAuthority] = PublicKey.findProgramAddressSync(
+    [Buffer.from("mint-authority")],
+    pumpProgram
+  );
+  const [bondingCurve] = PublicKey.findProgramAddressSync(
+    [Buffer.from("bonding-curve"), mintPubkey.toBuffer()],
+    pumpProgram
+  );
+  const [global] = PublicKey.findProgramAddressSync(
+    [Buffer.from("global")],
+    pumpProgram
+  );
+  const [eventAuthority] = PublicKey.findProgramAddressSync(
+    [Buffer.from("__event_authority")],
+    pumpProgram
+  );
+  const [metadata] = PublicKey.findProgramAddressSync(
+    [Buffer.from("metadata"), mplProgram.toBuffer(), mintPubkey.toBuffer()],
+    mplProgram
+  );
+  const [assocBondingCurve] = PublicKey.findProgramAddressSync(
+    [bondingCurve.toBuffer(), tokenProgram.toBuffer(), mintPubkey.toBuffer()],
+    ataProgram
+  );
+
+  return { mintAuthority, bondingCurve, assocBondingCurve, global, eventAuthority, metadata };
+}
+
+async function buildCreateInstruction(
+  mintPubkey: import("@solana/web3.js").PublicKey,
+  signerPubkey: import("@solana/web3.js").PublicKey,
+  name: string,
+  symbol: string,
+  uri: string,
+): Promise<import("@solana/web3.js").TransactionInstruction> {
+  const { PublicKey, TransactionInstruction, SystemProgram, SYSVAR_RENT_PUBKEY } = await import("@solana/web3.js");
+  const pdas = await getPumpFunPDAs(mintPubkey);
+
+  const data = Buffer.concat([
+    CREATE_DISCRIMINATOR,
+    encodeString(name),
+    encodeString(symbol),
+    encodeString(uri),
+    signerPubkey.toBuffer(),
+  ]);
+
+  const keys = [
+    { pubkey: mintPubkey, isSigner: true, isWritable: true },
+    { pubkey: pdas.mintAuthority, isSigner: false, isWritable: false },
+    { pubkey: pdas.bondingCurve, isSigner: false, isWritable: true },
+    { pubkey: pdas.assocBondingCurve, isSigner: false, isWritable: true },
+    { pubkey: pdas.global, isSigner: false, isWritable: false },
+    { pubkey: new PublicKey(MPL_TOKEN_METADATA_PROGRAM_ID), isSigner: false, isWritable: false },
+    { pubkey: pdas.metadata, isSigner: false, isWritable: true },
+    { pubkey: signerPubkey, isSigner: true, isWritable: true },
+    { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
+    { pubkey: new PublicKey(TOKEN_PROGRAM_ID), isSigner: false, isWritable: false },
+    { pubkey: new PublicKey(ASSOCIATED_TOKEN_PROGRAM_ID), isSigner: false, isWritable: false },
+    { pubkey: SYSVAR_RENT_PUBKEY, isSigner: false, isWritable: false },
+    { pubkey: pdas.eventAuthority, isSigner: false, isWritable: false },
+    { pubkey: new PublicKey(PUMP_FUN_PROGRAM_ID), isSigner: false, isWritable: false },
+  ];
+
+  return new TransactionInstruction({
+    keys,
+    programId: new PublicKey(PUMP_FUN_PROGRAM_ID),
+    data,
+  });
+}
+
+async function buildBuyInstruction(
+  mintPubkey: import("@solana/web3.js").PublicKey,
+  signerPubkey: import("@solana/web3.js").PublicKey,
+  buyAmountSOL: number,
+): Promise<import("@solana/web3.js").TransactionInstruction> {
+  const { PublicKey, TransactionInstruction, SystemProgram } = await import("@solana/web3.js");
+  const pdas = await getPumpFunPDAs(mintPubkey);
+
+  const lamports = BigInt(Math.floor(buyAmountSOL * 1e9));
+  const maxSolCost = (lamports * 105n) / 100n;
+
+  const [assocUserAccount] = PublicKey.findProgramAddressSync(
+    [signerPubkey.toBuffer(), new PublicKey(TOKEN_PROGRAM_ID).toBuffer(), mintPubkey.toBuffer()],
+    new PublicKey(ASSOCIATED_TOKEN_PROGRAM_ID)
+  );
+  const feeRecipient = new PublicKey("CebN5WGQ4jvEPvsVU4EoHEpgzq1VV7AbicfhtW4xC9iM");
+
+  const data = Buffer.concat([
+    BUY_DISCRIMINATOR,
+    encodeBigIntLE(0n, 8),
+    encodeBigIntLE(maxSolCost, 8),
+  ]);
+
+  const keys = [
+    { pubkey: pdas.global, isSigner: false, isWritable: false },
+    { pubkey: feeRecipient, isSigner: false, isWritable: true },
+    { pubkey: mintPubkey, isSigner: false, isWritable: false },
+    { pubkey: pdas.bondingCurve, isSigner: false, isWritable: true },
+    { pubkey: pdas.assocBondingCurve, isSigner: false, isWritable: true },
+    { pubkey: assocUserAccount, isSigner: false, isWritable: true },
+    { pubkey: signerPubkey, isSigner: true, isWritable: true },
+    { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
+    { pubkey: new PublicKey(TOKEN_PROGRAM_ID), isSigner: false, isWritable: false },
+    { pubkey: new PublicKey(ASSOCIATED_TOKEN_PROGRAM_ID), isSigner: false, isWritable: false },
+    { pubkey: pdas.eventAuthority, isSigner: false, isWritable: false },
+    { pubkey: new PublicKey(PUMP_FUN_PROGRAM_ID), isSigner: false, isWritable: false },
+  ];
+
+  return new TransactionInstruction({
+    keys,
+    programId: new PublicKey(PUMP_FUN_PROGRAM_ID),
+    data,
+  });
+}
+
 export async function deployTokenOnPumpFun(
   payload: DeployTokenPayload,
   wallet: SolanaWallet,
@@ -36,52 +189,71 @@ export async function deployTokenOnPumpFun(
   apiUrl = "https://zodaai.xyz",
   coinId?: string,
 ): Promise<TokenDeployResult> {
-  const { Keypair, VersionedTransaction, Connection } = await import("@solana/web3.js");
+  const {
+    Keypair,
+    Connection,
+    VersionedTransaction,
+    TransactionMessage,
+    ComputeBudgetProgram,
+    PublicKey,
+  } = await import("@solana/web3.js");
   const { default: bs58 } = await import("bs58");
 
   const mintKeypair = Keypair.generate();
   const signerKeypair = Keypair.fromSecretKey(bs58.decode(wallet.privateKeyBase58));
+  const mintPubkey = mintKeypair.publicKey;
+  const signerPubkey = signerKeypair.publicKey;
 
   const metadataUri = coinId
     ? buildMetadataUri(apiUrl, coinId)
-    : `data:application/json,${encodeURIComponent(JSON.stringify({ name: payload.name, symbol: payload.symbol, description: payload.description, image: payload.imageUrl ?? "", showName: true, createdOn: "https://pump.fun" }))}`;
-
-  const createParams = {
-    publicKey: signerKeypair.publicKey.toBase58(),
-    action: "create",
-    tokenMetadata: {
-      name: payload.name,
-      symbol: payload.symbol,
-      uri: metadataUri,
-    },
-    mint: mintKeypair.publicKey.toBase58(),
-    denominatedInSol: "true",
-    amount: buyAmountSOL,
-    slippage: 10,
-    priorityFee: 0.0005,
-    pool: "pump",
-  };
+    : `https://zodaai.xyz`;
 
-  const txRes = await fetch(PUMP_PORTAL_API, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(createParams),
-  });
+  console.log(`Mint: ${mintPubkey.toBase58()}`);
+  console.log(`Metadata: ${metadataUri}`);
+  console.log(`Building pump.fun transaction...`);
 
-  if (!txRes.ok) {
-    const errText = await txRes.text();
-    throw new Error(`Pump.fun transaction creation failed: ${txRes.status} ${errText}`);
-  }
+  const connection = new Connection(SOLANA_RPC, "confirmed");
+  const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash("finalized");
+
+  const createIx = await buildCreateInstruction(
+    mintPubkey,
+    signerPubkey,
+    payload.name,
+    payload.symbol,
+    metadataUri,
+  );
+
+  const priorityIx = ComputeBudgetProgram.setComputeUnitPrice({ microLamports: 500000 });
+  const budgetIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 400000 });
+
+  const instructions = [priorityIx, budgetIx, createIx];
+
+  const message = new TransactionMessage({
+    payerKey: signerPubkey,
+    recentBlockhash: blockhash,
+    instructions,
+  }).compileToV0Message();
 
-  const txData = await txRes.arrayBuffer();
-  const tx = VersionedTransaction.deserialize(new Uint8Array(txData));
+  const tx = new VersionedTransaction(message);
   tx.sign([mintKeypair, signerKeypair]);
 
-  const connection = new Connection(SOLANA_RPC, "confirmed");
-  const signature = await connection.sendTransaction(tx);
-  await connection.confirmTransaction(signature, "confirmed");
+  console.log(`Submitting to Solana...`);
+  const signature = await connection.sendTransaction(tx, {
+    skipPreflight: false,
+    preflightCommitment: "confirmed",
+  });
+
+  console.log(`Confirming transaction ${signature}...`);
+  const result = await connection.confirmTransaction(
+    { signature, blockhash, lastValidBlockHeight },
+    "confirmed"
+  );
+
+  if (result.value.err) {
+    throw new Error(`Transaction failed: ${JSON.stringify(result.value.err)}`);
+  }
 
-  const mintAddress = mintKeypair.publicKey.toBase58();
+  const mintAddress = mintPubkey.toBase58();
   return {
     mintAddress,
     txHash: signature,