create-message-kit 1.2.19 → 1.2.21

package/index.js

@@ -7,7 +7,7 @@ import { default as fs } from "fs-extra";
 import { isCancel } from "@clack/prompts";
 import { detect } from "detect-package-manager";
 import pc from "picocolors";
-const defVersion = "1.2.19";
+const defVersion = "1.2.21";
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 // Read package.json to get the version

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-message-kit",
-  "version": "1.2.19",
+  "version": "1.2.21",
   "license": "MIT",
   "type": "module",
   "main": "index.js",

package/templates/coinbase-agent/src/skills/drip.ts

@@ -5,7 +5,7 @@ import { LearnWeb3Client, Network } from "../plugins/learnweb3.js";
 
 export const registerSkill: Skill[] = [
   {
-    skill: "/drip [network] [address]",
+    skill: "drip",
     handler: handler,
     examples: [
       "/drip base_sepolia 0x123456789",

package/templates/coinbase-agent/src/skills/mint.ts

@@ -4,7 +4,7 @@ import { baseUrl } from "../index.js";
 
 export const registerSkill: Skill[] = [
   {
-    skill: "/mint [collection] [token_id] [url]",
+    skill: "mint",
     examples: [
       "/mint 0x73a333cb82862d4f66f0154229755b184fb4f5b0 1",
       "/mint https://zora.co/collect/base/0x123456789/1...",

package/templates/coinbase-agent/src/skills/pay.ts

@@ -3,7 +3,7 @@ import type { Skill } from "@xmtp/message-kit";
 
 export const registerSkill: Skill[] = [
   {
-    skill: "/pay [amount] [token] [username]",
+    skill: "pay",
     examples: ["/pay 10 vitalik.eth"],
     description:
       "Send a specified amount of a cryptocurrency to a destination address.",

package/templates/coinbase-agent/src/skills/swap.ts

@@ -4,7 +4,7 @@ import { baseUrl } from "../index.js";
 
 export const registerSkill: Skill[] = [
   {
-    skill: "/swap [amount] [token_from] [token_to]",
+    skill: "swap",
     examples: ["/swap 10 usdc eth", "/swap 1 dai usdc"],
     handler: handler,
     description: "Exchange one type of cryptocurrency for another.",
@@ -39,7 +39,7 @@ export async function handler(context: XMTPContext) {
 
   if (!amount || !token_from || !token_to) {
     context.reply(
-      "Missing required parameters. Please provide amount, token_from, and token_to."
+      "Missing required parameters. Please provide amount, token_from, and token_to.",
     );
     return;
   }

package/templates/ens/src/skills/weather.ts

@@ -0,0 +1 @@
+ 

package/templates/faucet/src/skills/faucet.ts

@@ -26,7 +26,7 @@ export const faucet: Skill[] = [
     },
   },
   {
-    skill: "/networks",
+    skill: "networks",
     handler: handleFaucet,
     examples: ["/networks"],
     description: "Get the list of supported networks.",

package/templates/toss/.env.example

@@ -2,6 +2,5 @@ KEY= # the private key of the wallet
 TEST_ENCRYPTION_KEY= # a different private key for encryption
 OPENAI_API_KEY= # the API key for OpenAI
 REDIS_CONNECTION_STRING= # the connection to the toss database in Redis
-COINBASE_API_REDIS_URL= # the API key for OpenAI
 COINBASE_API_KEY_NAME= # the API key name for Coinbase
 COINBASE_API_KEY_PRIVATE_KEY= # the private key for Coinbase

package/templates/toss/src/index.ts

@@ -9,8 +9,7 @@ import {
 import { systemPrompt } from "./prompt.js";
 import { toss } from "./skills/toss.js";
 import fs from "fs";
-import { getWalletService } from "./plugins/redis.js";
-const walletServiceDB = await getWalletService();
+
 export const agent: Agent = {
   name: "Toss Bot",
   tag: "@toss",
@@ -29,5 +28,5 @@ run(
     fs.writeFileSync("example_prompt.md", prompt);
     await agentReply(context, prompt);
   },
-  { agent, walletServiceDB },
+  { agent },
 );

package/templates/toss/src/plugins/helpers.ts

@@ -1,12 +1,10 @@
 import { XMTPContext } from "@xmtp/message-kit";
 import { getRedisClient } from "./redis.js";
 
-const tossDBClient = await getRedisClient();
 interface Participant {
   response: string;
   name: string;
   address: string;
-  agent_address: string;
 }
 export interface TossData {
   group_id: string;
@@ -18,9 +16,7 @@ export interface TossData {
   created_at: string;
   end_time: string;
   description: string;
-  encrypted_participants: string[];
-  participants?: Participant[];
-  toss_wallet_address: string;
+  participants: Participant[];
 }
 export async function checkTossCorrect(
   context: XMTPContext,
@@ -29,9 +25,9 @@ export async function checkTossCorrect(
     message: {
       content: { previousMsg },
     },
-    walletService,
     group,
   } = context;
+
   if (!group) {
     await context.reply("This command can only be used in a group.");
     return undefined;
@@ -47,15 +43,14 @@ export async function checkTossCorrect(
     );
     return undefined;
   }
-  let encryptedKey = walletService.encrypt(toss_id);
-  const tossDataString = await tossDBClient.get(`toss:${encryptedKey}`);
-  const hexString = tossDataString?.replace(/"/g, "");
-  let tossData = hexString ? walletService.decrypt(hexString) : null;
+  const tossDBClient = await getRedisClient();
+  const tossDataString = await tossDBClient.get(`toss:${toss_id}`);
+  let tossData = tossDataString ? JSON.parse(tossDataString) : null;
 
   if (typeof tossData === "string") {
     tossData = JSON.parse(tossData) as TossData;
   }
-  console.log("tossData", tossData);
+
   if (!tossData) {
     await context.reply("Toss not found");
     return undefined;
@@ -66,14 +61,8 @@ export async function checkTossCorrect(
     await context.reply("This toss is not in this group.");
     return undefined;
   }
-  tossData.participants = [];
-  if (tossData.encrypted_participants?.length) {
-    tossData.participants = tossData.encrypted_participants?.map((p: string) =>
-      walletService.decrypt(p),
-    );
-  }
-  const pool = tossData.amount * (tossData?.participants?.length || 0);
-  return { ...tossData, toss_id, pool };
+
+  return { ...tossData, toss_id };
 }
 
 export function extractTossId(message: string): string | null {

package/templates/toss/src/plugins/redis.ts

@@ -1,18 +1,7 @@
 import { createClient } from "@redis/client";
-import type { RedisClientType } from "@redis/client";
-
-let redisClient: RedisClientType | null = null;
+import { RedisClientType } from "@redis/client";
 
 export const getRedisClient = async () => {
-  if (redisClient?.isOpen) {
-    return redisClient;
-  }
-
-  if (!process.env.REDIS_CONNECTION_STRING) {
-    throw new Error(
-      "REDIS_CONNECTION_STRING not found in environment variables",
-    );
-  }
   const client = createClient({
     url: process.env.REDIS_CONNECTION_STRING,
   });
@@ -22,57 +11,5 @@ export const getRedisClient = async () => {
   });
 
   await client.connect();
-  redisClient = client as RedisClientType;
-  return client as RedisClientType;
-};
-
-let walletService: RedisClientType | null = null;
-
-export const getWalletService = async (): Promise<RedisClientType> => {
-  if (walletService?.isOpen) {
-    return walletService;
-  }
-
-  if (!process.env.COINBASE_API_REDIS_URL) {
-    throw new Error(
-      "COINBASE_API_REDIS_URL not found in environment variables",
-    );
-  }
-
-  const client = createClient({
-    url: process.env.COINBASE_API_REDIS_URL,
-  });
-
-  client.on("error", (error: Error) => {
-    console.error("Toss wallet Redis client error:", error);
-  });
-
-  client.on("connect", () => {
-    console.log("Connected to Toss Wallet Redis");
-  });
-  await client.connect();
-  walletService = client as RedisClientType;
   return client as RedisClientType;
 };
-
-export async function updateField(
-  client: RedisClientType,
-  key: string,
-  updateObject: any,
-) {
-  // Check if the key exists
-  const data = await client.get(key);
-
-  let updatedData;
-  if (data) {
-    // If the key exists, parse it and merge the updates
-    const parsedData = JSON.parse(data);
-    updatedData = { ...parsedData, ...updateObject };
-  } else {
-    // If the key doesn't exist, use the updateObject as the initial value
-    updatedData = updateObject;
-  }
-
-  // Save the updated or new data back to Redis
-  await client.set(key, JSON.stringify(updatedData));
-}

package/templates/toss/src/skills/toss.ts

@@ -1,5 +1,4 @@
 import { Skill, XMTPContext, getUserInfo } from "@xmtp/message-kit";
-import { TimeoutError } from "@coinbase/coinbase-sdk";
 import { getRedisClient } from "../plugins/redis.js";
 import {
   checkTossCorrect,
@@ -11,11 +10,9 @@ import {
   DM_HELP_MESSAGE,
 } from "../plugins/helpers.js";
 
-const tossDBClient = await getRedisClient();
-
 export const toss: Skill[] = [
   {
-    skill: "/end [option]",
+    skill: "end",
     description: "End a toss.",
     handler: handleEndToss,
     examples: ["/end yes", "/end no"],
@@ -26,14 +23,13 @@ export const toss: Skill[] = [
     },
   },
   {
-    skill: "/create",
+    skill: "create",
     description: "Create an agent wallet.",
     handler: handleDM,
     examples: ["/create"],
-    params: {},
   },
   {
-    skill: "/fund [amount]",
+    skill: "fund",
     description: "Fund your account.",
     handler: handleDM,
     examples: ["/fund 10"],
@@ -44,7 +40,7 @@ export const toss: Skill[] = [
     },
   },
   {
-    skill: "/withdraw [amount]",
+    skill: "withdraw",
     description: "Withdraw funds from your account.",
     handler: handleDM,
     examples: ["/withdraw 10"],
@@ -55,28 +51,25 @@ export const toss: Skill[] = [
     },
   },
   {
-    skill: "/help",
+    skill: "help",
     description: "Get help with tossing.",
     handler: handleDM,
     examples: ["/help"],
-    params: {},
   },
   {
-    skill: "/cancel",
+    skill: "cancel",
     description: "Cancel a toss.",
     handler: handleCancelToss,
     examples: ["/cancel"],
-    params: {},
   },
   {
-    skill: "/balance",
+    skill: "balance",
     description: "Check your balance.",
     handler: handleDM,
     examples: ["/balance"],
-    params: {},
   },
   {
-    skill: "/join [response]",
+    skill: "join",
     description: "Join a toss.",
     params: {
       response: {
@@ -87,15 +80,13 @@ export const toss: Skill[] = [
     examples: ["/join yes", "/join no"],
   },
   {
-    skill: "/status",
+    skill: "status",
     description: "Check the status of the toss.",
     handler: handleTossStatus,
     examples: ["/status"],
-    params: {},
   },
   {
-    skill:
-      "/toss [description] [options (separated by comma)] [amount] [judge(optional)] [endTime(optional)]",
+    skill: "toss",
     description:
       "Create a toss with a description, options, amount and judge(optional).",
     handler: handleTossCreation,
@@ -120,9 +111,11 @@ export const toss: Skill[] = [
       },
       judge: {
         type: "username",
+        optional: true,
       },
       endTime: {
         type: "quoted",
+        optional: true,
       },
     },
   },
@@ -142,12 +135,17 @@ export async function handleTossCreation(context: XMTPContext) {
     return;
   }
 
+  const tossDBClient = await getRedisClient();
   if (params.description && params.options && !isNaN(Number(params.amount))) {
     const keys = await tossDBClient.keys("*");
     let tossId = keys.length + 1;
-    const createdTossWallet = await walletService.createTempWallet(
-      tossId.toString(),
+    const isCreated = await walletService.createWallet(
+      tossId + ":" + sender.address,
     );
+    if (!isCreated) {
+      await context.reply("Failed to create toss wallet");
+      return;
+    }
 
     let tossData: TossData = {
       toss_id: tossId.toString(),
@@ -163,20 +161,14 @@ export async function handleTossCreation(context: XMTPContext) {
       end_time: params.endTime
         ? new Date(params.endTime).toLocaleString()
         : new Date(Date.now() + 24 * 60 * 60 * 1000).toLocaleString(),
-      encrypted_participants: [],
       participants: [],
-      toss_wallet_address: createdTossWallet?.address,
     };
-    await tossDBClient.set(
-      "toss:" + walletService.encrypt(tossId.toString()),
-      walletService.encrypt(tossData),
-    );
-
+    await tossDBClient.set("toss:" + tossId, JSON.stringify(tossData));
     if (tossId !== undefined) {
       await context.send(generateTossMessage(tossData));
     } else {
       await context.reply(
-        `An error occurred while creating the toss. ${JSON.stringify(tossId)}`,
+        `An error occurred while creating the toss. ${tossId}`,
       );
     }
   }
@@ -188,7 +180,7 @@ export async function handleJoinToss(context: XMTPContext) {
     return;
   }
 
-  const { toss_id, participants, encrypted_participants, amount } = tossData;
+  const { toss_id, participants, amount, admin_address } = tossData;
 
   const {
     message: {
@@ -197,55 +189,34 @@ export async function handleJoinToss(context: XMTPContext) {
         params: { response },
       },
     },
-    group,
     walletService,
   } = context;
 
+  const tossDBClient = await getRedisClient();
   if (participants?.some((p) => p.address === sender.address)) {
     await context.reply("You have already joined this toss.");
     return;
   }
-
-  const tossWallet = await walletService.getTempWallet(toss_id);
-  if (!tossWallet) {
-    await context.reply("Toss wallet not found");
-    return;
-  }
+  //Create wallet for sender
+  await walletService.createWallet(sender.address);
   const balance = await walletService.checkBalance(sender.address);
-
-  if (balance < amount) {
-    await context.send("You need to fund your account. Check your DMs:");
-    await walletService.requestFunds(context, amount);
-    return;
-  }
+  if (balance < amount) return walletService.requestFunds(amount);
 
   try {
-    const senderWallet = await walletService.getUserWallet(sender.address);
-    if (!senderWallet) {
-      await context.reply("Sender wallet not found");
-      return;
-    }
-    const transfer = await walletService.transfer(
-      senderWallet,
-      tossWallet,
-      amount,
-    );
-    console.log("Transfer:", transfer.getTransactionHash());
-    const encryptedParticipant = walletService.encrypt({
+    let tempWalletID = toss_id + ":" + admin_address;
+    await walletService.transfer(sender.address, tempWalletID, amount);
+    const participant = {
       address: sender.address,
-      agent_address: senderWallet.address,
       response: response,
       name:
         (await context.getUserInfo(sender.address))?.preferredName ??
         sender.address,
-    });
-    encrypted_participants.push(encryptedParticipant as string);
+    };
+    participants.push(participant);
 
     await tossDBClient.set(
-      `toss:${walletService.encrypt(toss_id)}`,
-      walletService.encrypt(
-        JSON.stringify({ ...tossData, encrypted_participants }),
-      ),
+      `toss:${toss_id}`,
+      JSON.stringify({ ...tossData, participants }),
     );
 
     await context.reply("Successfully joined the toss!");
@@ -275,58 +246,38 @@ export async function handleEndToss(context: XMTPContext) {
     walletService,
   } = context;
 
+  const tossDBClient = await getRedisClient();
   if (participants?.length === 0) {
     await context.reply("No participants for this toss.");
     return;
   } else if (admin_address.toLowerCase() !== sender.address.toLowerCase()) {
-    await context.reply("Only the admin can end the toss.");
-    return;
-  } else if (
-    !options
-      .split(",")
-      .map((o) => o.toLowerCase())
-      .includes(option.toLowerCase())
-  ) {
-    await context.reply("Invalid option selected.");
+    await context.reply("Only the admin can cancel the toss.");
     return;
   }
-  const { winners, losers } = await extractWinners(participants ?? [], option);
 
-  if (winners.length === 0) {
-    await context.reply("No winners for this toss.");
+  let tempWalletID = toss_id + ":" + admin_address;
+  const balance = await walletService.checkBalance(tempWalletID);
+  const fundsNeeded = tossData.amount * participants?.length;
+  if (balance < fundsNeeded) {
+    await context.reply(
+      `Toss wallet does not have enough funds ${fundsNeeded}, has ${balance}`,
+    );
     return;
   }
 
+  //Winners
+
+  const { winners, losers } = await extractWinners(participants, option);
+
   const prize =
     (tossData.amount * (participants?.length ?? 0)) / (winners.length ?? 1);
 
   try {
     for (const winner of winners) {
-      const tossWallet = await walletService.getTempWallet(toss_id);
-
-      if (!tossWallet) {
-        await context.reply("Toss wallet not found");
-        return;
-      }
-      const winnerWallet = await walletService.getUserWallet(
-        winner.address,
-        winner.address,
-      );
-      if (!winnerWallet) {
-        await context.reply("Winner wallet not found");
-        return;
-      }
-      const transfer = await walletService.transfer(
-        tossWallet,
-        winnerWallet,
-        prize,
-      );
-      console.log("Transfer:", transfer.getTransactionHash());
+      await walletService.transfer(tempWalletID, winner.address, prize);
       await tossDBClient.set(
-        `toss:${walletService.encrypt(toss_id)}`,
-        walletService.encrypt(
-          JSON.stringify({ ...tossData, status: "closed" }),
-        ),
+        `toss:${toss_id}`,
+        JSON.stringify({ ...tossData, status: "closed" }),
       );
     }
     // Clean up
@@ -355,6 +306,7 @@ export async function handleCancelToss(context: XMTPContext) {
     walletService,
   } = context;
 
+  const tossDBClient = await getRedisClient();
   if (participants?.length === 0) {
     await context.reply("No participants for this toss.");
     return;
@@ -363,31 +315,26 @@ export async function handleCancelToss(context: XMTPContext) {
     return;
   }
 
-  for (const participant of participants ?? []) {
+  let tempWalletID = toss_id + ":" + admin_address;
+  const balance = await walletService.checkBalance(tempWalletID);
+  const fundsNeeded = tossData.amount * participants?.length;
+  if (balance < fundsNeeded) {
+    await context.reply(
+      `Toss wallet does not have enough funds ${fundsNeeded}, has ${balance}`,
+    );
+    return;
+  }
+  for (const participant of participants) {
     try {
-      const tossWallet = await walletService.getTempWallet(toss_id);
-
-      if (!tossWallet) {
-        await context.reply("Toss wallet not found");
-        return;
-      }
-
-      const participantWallet = await walletService.getUserWallet(
-        participant.address,
+      await walletService.transfer(tempWalletID, participant.address, amount);
+    } catch (error) {
+      console.error(
+        `Failed to send prize to ${participant.address} agent wallet:`,
+        error,
       );
-      if (!participantWallet) {
-        await context.reply("Participant wallet not found");
-        return;
-      }
-      const transfer = await walletService.transfer(
-        tossWallet,
-        participantWallet,
-        amount,
+      await context.reply(
+        `Failed to send prize to ${participant.address} agent wallet`,
       );
-      console.log("Transfer:", transfer.getTransactionHash());
-    } catch (error) {
-      console.error(`Failed to send prize to ${participant.address}:`, error);
-      await context.reply(`Failed to send prize to ${participant.address}`);
     }
   }
 
@@ -395,8 +342,8 @@ export async function handleCancelToss(context: XMTPContext) {
   //await walletService.deleteTempWallet(tossWalletRedis, tossId.toString());
 
   await tossDBClient.set(
-    `toss:${walletService.encrypt(toss_id)}`,
-    walletService.encrypt(JSON.stringify({ ...tossData, status: "cancelled" })),
+    `toss:${toss_id}`,
+    JSON.stringify({ ...tossData, status: "cancelled" }),
   );
 
   await context.reply(
@@ -430,20 +377,17 @@ export async function handleDM(context: XMTPContext) {
   if (skill === "help") {
     await context.send(DM_HELP_MESSAGE);
   } else if (skill === "create") {
-    const walletExist = await walletService.getUserWallet(sender.address);
+    const walletExist = await walletService.getWallet(sender.address);
     if (walletExist) {
       await context.reply("You already have an agent wallet.");
       return;
     }
-    const userWallet = await walletService.createUserWallet(sender.address);
-    await context.reply(
-      `Your agent wallet address is ${userWallet.address}\nBalance: $${await walletService.checkBalance(sender.address)}`,
-    );
+    await walletService.createWallet(sender.address);
   } else if (skill === "balance") {
-    const userWallet = await walletService.getUserWallet(sender.address);
+    const userWallet = await walletService.getWallet(sender.address);
 
     context.sendTo(
-      `Your agent wallet address is ${userWallet?.address}\nBalance: $${await walletService.checkBalance(sender.address)}`,
+      `Your agent wallet for address is ${sender.address}\nBalance: $${await walletService.checkBalance(sender.address)}`,
       [sender.address],
     );
   } else if (skill === "fund") {
@@ -453,8 +397,7 @@ export async function handleDM(context: XMTPContext) {
       return;
     } else if (amount) {
       if (amount + balance <= 10) {
-        await walletService.requestFunds(context, Number(amount));
-        return;
+        return walletService.requestFunds(Number(amount));
       } else {
         await context.send("Wrong amount. Max 10 USDC.");
         return;
@@ -470,7 +413,7 @@ export async function handleDM(context: XMTPContext) {
       `Please specify the amount of USDC to prefund (1 to ${10 - balance}):`,
       options,
     );
-    await walletService.requestFunds(context, Number(response));
+    return walletService.requestFunds(Number(response));
   } else if (skill === "withdraw") {
     const balance = await walletService.checkBalance(sender.address);
     if (balance === 0) {
@@ -484,6 +427,6 @@ export async function handleDM(context: XMTPContext) {
       `Please specify the amount of USDC to withdraw (1 to ${balance}):`,
       options,
     );
-    await walletService.withdrawFunds(sender.address, Number(response));
+    await walletService.withdrawFunds(Number(response));
   }
 }