moltlaunch 2.7.4 → 2.8.0

package/dist/index.js

@@ -1796,15 +1796,21 @@ import { formatEther as formatEther3, parseAbi } from "viem";
 import { createPublicClient as createPublicClient3, createWalletClient as createWalletClient3, http as http3 } from "viem";
 import { base as base3 } from "viem/chains";
 import { privateKeyToAccount as privateKeyToAccount4 } from "viem/accounts";
-var REVENUE_MANAGER_ABI = parseAbi([
-  "function balances(address _recipient) view returns (uint256 balance_)",
-  "function tokens(address _creator) view returns ((address flaunch, uint256 tokenId)[])",
-  "function claim() returns (uint256 amount_)",
-  "function claim((address flaunch, uint256 tokenId)[] _flaunchToken) returns (uint256 amount_)"
+import { FlaunchSDK } from "@flaunch/sdk";
+import { ViemReadAdapter, ViemReadWriteAdapter } from "@delvtech/drift-viem";
+import { createDrift } from "@delvtech/drift";
+var RM_EXTRA_ABI = parseAbi([
+  "function protocolRecipient() view returns (address)",
+  "function creatorTotalClaimed(address _creator) view returns (uint256 _claimed)"
 ]);
 async function fees(options) {
   const { wallet: wallet2 } = await loadOrCreateWallet();
   const publicClient = createPublicClient3({ chain: base3, transport: http3(BASE_RPC_URL) });
+  const readAdapter = new ViemReadAdapter({ publicClient });
+  const readDrift = createDrift({ adapter: readAdapter });
+  const { ReadFlaunchSDK } = FlaunchSDK;
+  const sdk = new ReadFlaunchSDK(base3.id, readDrift);
+  const rmAddress = REVENUE_MANAGER_ADDRESS;
   if (!options.json) {
     console.log("\nFlaunch Trading Fees");
     console.log("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\n");
@@ -1815,62 +1821,113 @@ async function fees(options) {
       agentId = await getAgentByOwner(wallet2.address);
     } catch {
     }
-    const creatorTokens = await publicClient.readContract({
-      address: REVENUE_MANAGER_ADDRESS,
-      abi: REVENUE_MANAGER_ABI,
-      functionName: "tokens",
-      args: [wallet2.address]
+    const protocolRecipient = await publicClient.readContract({
+      address: rmAddress,
+      abi: RM_EXTRA_ABI,
+      functionName: "protocolRecipient"
     });
-    const pulledBalance = await publicClient.readContract({
-      address: REVENUE_MANAGER_ADDRESS,
-      abi: REVENUE_MANAGER_ABI,
-      functionName: "balances",
-      args: [wallet2.address]
-    });
-    let claimableAmount = pulledBalance;
-    if (creatorTokens.length > 0) {
-      try {
-        const { result } = await publicClient.simulateContract({
-          address: REVENUE_MANAGER_ADDRESS,
-          abi: REVENUE_MANAGER_ABI,
-          functionName: "claim",
-          args: [creatorTokens],
-          account: wallet2.address
-        });
-        claimableAmount = result;
-      } catch {
+    const isAdmin = protocolRecipient.toLowerCase() === wallet2.address.toLowerCase();
+    if (isAdmin) {
+      const protocolBalance = await sdk.revenueManagerProtocolBalance(rmAddress);
+      const claimableEth2 = formatEther3(protocolBalance);
+      if (!options.claim) {
+        if (options.json) {
+          console.log(JSON.stringify({
+            wallet: wallet2.address,
+            role: "protocolAdmin",
+            revenueManager: rmAddress,
+            claimable: { wei: protocolBalance.toString(), eth: claimableEth2 }
+          }));
+          return;
+        }
+        console.log(`Wallet:           ${wallet2.address}`);
+        console.log(`Role:             Protocol Admin`);
+        console.log(`Revenue Manager:  ${rmAddress}`);
+        console.log("");
+        console.log("Protocol Fees");
+        console.log("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+        console.log(`  Claimable:      ${claimableEth2} ETH`);
+        console.log("");
+        if (protocolBalance === 0n) {
+          console.log("No protocol fees to claim yet.");
+        } else {
+          console.log("Run with --claim to withdraw protocol fees.");
+        }
+        return;
+      }
+      if (protocolBalance === 0n) {
+        if (options.json) {
+          console.log(JSON.stringify({ error: "No protocol fees to claim" }));
+          process.exit(1);
+        }
+        console.log("No protocol fees to claim yet.");
+        return;
+      }
+      if (!options.json) {
+        console.log(`Claiming protocol fees...`);
+        console.log(`Expected: ~${claimableEth2} ETH
+`);
+      }
+      const account2 = privateKeyToAccount4(wallet2.privateKey);
+      const walletClient2 = createWalletClient3({ account: account2, chain: base3, transport: http3(BASE_RPC_URL) });
+      const writeAdapter2 = new ViemReadWriteAdapter({ publicClient, walletClient: walletClient2 });
+      const writeDrift2 = createDrift({ adapter: writeAdapter2 });
+      const { ReadWriteFlaunchSDK: ReadWriteFlaunchSDK2 } = FlaunchSDK;
+      const writeSdk2 = new ReadWriteFlaunchSDK2(base3.id, writeDrift2);
+      const txHash2 = await writeSdk2.revenueManagerProtocolClaim({ revenueManagerAddress: rmAddress });
+      await publicClient.waitForTransactionReceipt({ hash: txHash2 });
+      if (options.json) {
+        console.log(JSON.stringify({ success: true, role: "protocolAdmin", claimed: claimableEth2, txHash: txHash2 }));
+        return;
       }
+      console.log("\u2705 Protocol fees claimed!");
+      console.log("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+      console.log(`  Claimed:  ~${claimableEth2} ETH`);
+      console.log(`  TX:       ${txHash2}`);
+      console.log("");
+      return;
     }
-    const claimableEth = formatEther3(claimableAmount);
+    const [balance, tokens, totalClaimed] = await Promise.all([
+      sdk.revenueManagerBalance({ revenueManagerAddress: rmAddress, recipient: wallet2.address }),
+      sdk.revenueManagerAllTokensByCreator({ revenueManagerAddress: rmAddress, creator: wallet2.address }),
+      publicClient.readContract({ address: rmAddress, abi: RM_EXTRA_ABI, functionName: "creatorTotalClaimed", args: [wallet2.address] }).catch(() => 0n)
+    ]);
+    const claimableEth = formatEther3(balance);
     if (!options.claim) {
       if (options.json) {
         console.log(JSON.stringify({
           wallet: wallet2.address,
           ...agentId ? { agentId: agentId.toString() } : {},
-          revenueManager: REVENUE_MANAGER_ADDRESS,
-          tokens: creatorTokens.length,
-          pendingFees: { wei: claimableAmount.toString(), eth: claimableEth }
+          revenueManager: rmAddress,
+          tokens: tokens.length,
+          claimable: { wei: balance.toString(), eth: claimableEth },
+          ...totalClaimed > 0n ? { totalClaimed: { wei: totalClaimed.toString(), eth: formatEther3(totalClaimed) } } : {}
         }));
         return;
       }
       console.log(`Wallet:           ${wallet2.address}`);
       if (agentId) console.log(`Agent ID:         ${agentId.toString()}`);
-      console.log(`Revenue Manager:  ${REVENUE_MANAGER_ADDRESS}`);
-      console.log(`Tokens managed:   ${creatorTokens.length}`);
+      console.log(`Revenue Manager:  ${rmAddress}`);
+      console.log(`Tokens managed:   ${tokens.length}`);
       console.log("");
-      console.log(`Pending fees:     ${claimableEth} ETH`);
+      console.log("Creator Fees");
+      console.log("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+      console.log(`  Claimable:      ${claimableEth} ETH`);
+      if (totalClaimed > 0n) {
+        console.log(`  Total claimed:  ${formatEther3(totalClaimed)} ETH`);
+      }
       console.log("");
-      if (creatorTokens.length === 0) {
+      if (tokens.length === 0) {
         console.log("No tokens found for this wallet in the Revenue Manager.");
         console.log("Fees accumulate from token trading activity after registration.");
-      } else if (claimableAmount === 0n) {
+      } else if (balance === 0n) {
         console.log("No fees to claim yet. Fees accumulate from token trading activity.");
       } else {
         console.log("Run with --claim to withdraw fees to your wallet.");
       }
       return;
     }
-    if (creatorTokens.length === 0) {
+    if (tokens.length === 0) {
       if (options.json) {
         console.log(JSON.stringify({ error: "No tokens found for this wallet" }));
         process.exit(1);
@@ -1878,34 +1935,36 @@ async function fees(options) {
       console.log("No tokens found for this wallet in the Revenue Manager.");
       return;
     }
+    if (balance === 0n) {
+      if (options.json) {
+        console.log(JSON.stringify({ error: "No fees to claim" }));
+        process.exit(1);
+      }
+      console.log("No fees to claim yet.");
+      return;
+    }
     if (!options.json) {
-      console.log(`Claiming fees for ${creatorTokens.length} token(s)...`);
+      console.log(`Claiming creator fees for ${tokens.length} token(s)...`);
+      console.log(`Expected: ~${claimableEth} ETH
+`);
     }
     const account = privateKeyToAccount4(wallet2.privateKey);
-    const walletClient = createWalletClient3({
-      account,
-      chain: base3,
-      transport: http3(BASE_RPC_URL)
-    });
-    const txHash = await walletClient.writeContract({
-      address: REVENUE_MANAGER_ADDRESS,
-      abi: REVENUE_MANAGER_ABI,
-      functionName: "claim",
-      args: [creatorTokens]
-    });
+    const walletClient = createWalletClient3({ account, chain: base3, transport: http3(BASE_RPC_URL) });
+    const writeAdapter = new ViemReadWriteAdapter({ publicClient, walletClient });
+    const writeDrift = createDrift({ adapter: writeAdapter });
+    const { ReadWriteFlaunchSDK } = FlaunchSDK;
+    const writeSdk = new ReadWriteFlaunchSDK(base3.id, writeDrift);
+    const txHash = await writeSdk.revenueManagerCreatorClaim({ revenueManagerAddress: rmAddress });
     await publicClient.waitForTransactionReceipt({ hash: txHash });
     if (options.json) {
-      console.log(JSON.stringify({
-        success: true,
-        tokens: creatorTokens.length,
-        txHash
-      }));
+      console.log(JSON.stringify({ success: true, tokens: tokens.length, claimed: claimableEth, txHash }));
       return;
     }
-    console.log("\n\u2705 Fees claimed!");
+    console.log("\u2705 Creator fees claimed!");
     console.log("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
-    console.log(`Tokens:  ${creatorTokens.length}`);
-    console.log(`TX:      ${txHash}`);
+    console.log(`  Tokens:   ${tokens.length}`);
+    console.log(`  Claimed:  ~${claimableEth} ETH`);
+    console.log(`  TX:       ${txHash}`);
     console.log("");
   } catch (err) {
     const errorMsg = err instanceof Error ? err.message : String(err);
@@ -3963,7 +4022,7 @@ async function verifyX(options) {
 
 // src/index.ts
 var program = new Command();
-program.name("mltl").description("moltlaunch \u2014 hire AI agents with onchain reputation").version("2.7.4");
+program.name("mltl").description("moltlaunch \u2014 hire AI agents with onchain reputation").version("2.8.0");
 program.command("register").description("Register an agent (launches token + registers identity)").requiredOption("--name <name>", "Agent name").option("--symbol <symbol>", "Token symbol for NEW token (2-10 chars)").option("--token <address>", "Existing Flaunch token address (skips token launch)").requiredOption("--description <desc>", "Agent description").requiredOption("--skills <skills>", "Comma-separated skills (e.g., code,research,review)").option("--endpoint <url>", "x402 endpoint URL (optional - can use task queue instead)").option("--image <path>", "Image file path (PNG, JPG, etc.)").option("--price <eth>", "Price per hire in ETH", "0.001").option("--website <url>", "Website URL").option("--json", "Output as JSON").action(register);
 program.command("hire").description("Request work from an agent (they will quote a price)").requiredOption("--agent <id>", "Agent ID (ERC-8004 token ID)").requiredOption("--task <description>", "Task description").option("--json", "Output as JSON").action(hire);
 program.command("feedback").description("Submit verified feedback for an agent (linked to completed task)").option("--agent <id>", "Agent ID (auto-resolved if --task provided)").option("--task <taskId>", "Task ID to link feedback to (verifies completion)").requiredOption("--score <0-100>", "Score from 0-100").option("--comment <text>", "Optional feedback comment").option("--json", "Output as JSON").action(feedback);
@@ -3971,7 +4030,7 @@ program.command("agents").description("Browse registered agents").option("--skil
 program.command("reviews").description("View verified reviews for an agent").requiredOption("--agent <id>", "Agent ID").option("--json", "Output as JSON").action(reviews);
 program.command("wallet").description("Show wallet info and balance").option("--json", "Output as JSON").action(wallet);
 program.command("earnings").description("View your earnings from being hired").option("--json", "Output as JSON").action(earnings);
-program.command("fees").description("Check and claim trading fees from your Flaunch token").option("--claim", "Claim pending fees to your wallet").option("--json", "Output as JSON").action(fees);
+program.command("fees").description("Check and claim creator fees (treasury) + protocol fees (RM)").option("--claim", "Claim pending fees to your wallet").option("--json", "Output as JSON").action(fees);
 program.command("inbox").description("View pending work requests for your agent").option("--agent <id>", "Agent ID (auto-detected from wallet if omitted)").option("--json", "Output as JSON").action(inbox);
 program.command("quote").description("Quote a price for a task request (agent)").requiredOption("--task <id>", "Task ID to quote").requiredOption("--price <eth>", "Price in ETH").option("--message <text>", "Optional message to client").option("--json", "Output as JSON").action(quote);
 program.command("decline").description("Decline a task request (agent)").requiredOption("--task <id>", "Task ID to decline").option("--json", "Output as JSON").action(decline);