refactor: update acp helper functions

Author: Ang-dot

examples/acp-base/helpers/acpHelperFunctions.ts

@@ -1,38 +1,40 @@
 import AcpClient, { AcpContractClientV2 } from "@virtuals-protocol/acp-node";
 import * as dotenv from "dotenv";
-import { Address } from "viem";
+import { BUYER_AGENT_WALLET_ADDRESS, BUYER_ENTITY_ID, WHITELISTED_WALLET_PRIVATE_KEY } from "./env";
 
 // Load environment variables
 dotenv.config({override: true});
 
+function subsection(title: string) {
+  console.log(`\n--- ${title} ---`);
+}
+
 async function testHelperFunctions() {
-  console.log("Testing ACP helper functions...");
+  console.log(`\n${"=".repeat(60)}`);
+  console.log("🔹 ACP Helper Functions Test");
+  console.log(`${"=".repeat(60)}\n`);
 
-  // Initialize AcpClient
+  console.log("Initializing ACP client...\n");
   const acpClient = new AcpClient({
     acpContractClient: await AcpContractClientV2.build(
-      process.env.WHITELISTED_WALLET_PRIVATE_KEY as `0x${string}`,
-      Number(process.env.WHITELISTED_WALLET_ENTITY_ID),
-      process.env.BUYER_AGENT_WALLET_ADDRESS as Address
+      WHITELISTED_WALLET_PRIVATE_KEY,
+      BUYER_ENTITY_ID,
+      BUYER_AGENT_WALLET_ADDRESS,
     )
   });
 
-  // Get active jobs
-  const activeJobs = await acpClient.getActiveJobs(1, 10);
+  /* ---------------- ACTIVE JOBS ---------------- */
+  subsection("Active Jobs");
+  const activeJobs = await acpClient.getActiveJobs(1, 3);
   console.log("\n🔵 Active Jobs:");
   console.log(activeJobs.length > 0 ? activeJobs : "No active jobs found.");
 
-  // Get completed jobs
-  const completedJobs = await acpClient.getCompletedJobs(1, 10);
+  /* ---------------- COMPLETED JOBS ---------------- */
+  const completedJobs = await acpClient.getCompletedJobs(1, 3);
   console.log("\n✅ Completed Jobs:");
-  console.log(completedJobs.length > 0 ? completedJobs : "No completed jobs found.");
-
-  // Get cancelled jobs
-  const cancelledJobs = await acpClient.getCancelledJobs(1, 10);
-  console.log("\n❌ Cancelled Jobs:");
-  console.log(cancelledJobs.length > 0 ? cancelledJobs : "No cancelled jobs found.");
-
   if (completedJobs.length > 0) {
+    console.log(completedJobs);
+
     const onChainJobId = completedJobs[0].id;
     if (onChainJobId) {
       const job = await acpClient.getJobById(onChainJobId);
@@ -50,26 +52,31 @@ async function testHelperFunctions() {
       }
     }
   } else {
-    console.log("\n⚠️ No completed jobs available for detailed inspection.");
+    console.log("No completed jobs found.");
   }
 
-  // Get jobs with pending memos
-  const jobsWithPendingMemos = await acpClient.getPendingMemoJobs();
+  /* ---------------- CANCELLED JOBS ---------------- */
+  const cancelledJobs = await acpClient.getCancelledJobs(1, 3);
+  console.log("\n❌ Cancelled Jobs:");
+  console.log(cancelledJobs.length > 0 ? cancelledJobs : "No cancelled jobs found.");
+
+  /* ---------------- PENDING MEMO JOBS ---------------- */
+  const jobsWithPendingMemos = await acpClient.getPendingMemoJobs(1, 3);
   console.log(jobsWithPendingMemos.length > 0 ? jobsWithPendingMemos : "No jobs with pending memos jobs found.");
 
-  // Get agent
+  /* ---------------- AGENT INFO ---------------- */
   const agentWalletAddress = acpClient.walletAddress;
   const agent = await acpClient.getAgent(agentWalletAddress);
   console.log(agent ? agent : `No agent with wallet address ${jobsWithPendingMemos} found.`);
 }
 
-// Run the test
 testHelperFunctions()
   .then(() => {
     console.log("\n✨ Test completed successfully");
     process.exit(0);
   })
-  .catch(error => {
-    console.error("Error in helper functions test:", error);
+  .catch((error) => {
+    console.error("\n❌ Error in helper functions test:");
+    console.error(error);
     process.exit(1);
   });

examples/acp-base/helpers/env.ts

@@ -0,0 +1,24 @@
+import dotenv from "dotenv";
+import { Address } from "viem";
+
+dotenv.config({ path: __dirname + "/.env" });
+
+function getEnvVar<T extends string = string>(key: string, required = true): T {
+  const value = process.env[key];
+  if (required && (value === undefined || value === "")) {
+    throw new Error(`${key} is not defined or is empty in the .env file`);
+  }
+  return value as T;
+}
+
+export const WHITELISTED_WALLET_PRIVATE_KEY = getEnvVar<Address>(
+  "WHITELISTED_WALLET_PRIVATE_KEY"
+);
+
+export const BUYER_AGENT_WALLET_ADDRESS = getEnvVar<Address>(
+  "BUYER_AGENT_WALLET_ADDRESS"
+);
+
+export const BUYER_ENTITY_ID = parseInt(getEnvVar("BUYER_ENTITY_ID"));
+
+if (isNaN(BUYER_ENTITY_ID)) throw new Error("BUYER_ENTITY_ID must be a valid number");

src/acpClient.ts

@@ -539,7 +539,7 @@ class AcpClient {
 
     if (errors.length > 0) {
       console.warn(
-        `[ACP] ${options?.logPrefix ?? "Skipped"} ${errors.length} malformed job(s)`,
+        `${options?.logPrefix ?? "Skipped"} ${errors.length} malformed job(s)`,
         errors.map(e => ({ jobId: e.jobId, message: e.error.message }))
       );
     }