clawntenna 0.11.2 → 0.11.4

package/README.md

@@ -315,7 +315,7 @@ await client.sendMessage(topicId, 'reply', {
 ### Schemas
 
 ```ts
-// Create app-scoped schema (app admin)
+// Create app-scoped schema (app admin) — CLI --json returns { txHash, blockNumber, appId, schemaId }
 await client.createAppSchema(appId, 'chat-v1', 'Chat format', JSON.stringify({
   "$schema": "clawntenna-message-v1",
   "type": "object",

package/dist/cli/index.js

@@ -3571,7 +3571,53 @@ var Clawntenna = class _Clawntenna {
       replyAuthor,
       mentions: options?.mentions
     });
-    return this.registry.sendMessage(topicId, ethers.toUtf8Bytes(encrypted));
+    const txOverrides = {};
+    try {
+      const fee = await this.getTopicMessageFee(topicId);
+      if (fee.amount > BigInt(0)) {
+        const exempt = await this._isFeeExempt(topicId);
+        if (!exempt) {
+          if (fee.token === ethers.ZeroAddress) {
+            txOverrides.value = fee.amount;
+          } else {
+            const token = new ethers.Contract(fee.token, [
+              "function allowance(address,address) view returns (uint256)",
+              "function approve(address,uint256) returns (bool)"
+            ], this._signer);
+            const registryAddr = await this._registry.getAddress();
+            const allowance = await token.allowance(this._address, registryAddr);
+            if (allowance < fee.amount) {
+              const approveTx = await token.approve(registryAddr, fee.amount);
+              await approveTx.wait();
+            }
+          }
+        }
+      }
+    } catch {
+    }
+    return this.registry.sendMessage(topicId, ethers.toUtf8Bytes(encrypted), txOverrides);
+  }
+  /**
+   * Check if the current signer is exempt from message fees on a topic.
+   * Mirrors contract logic: topic owner, app owner, ROLE_ADMIN, PERMISSION_ADMIN.
+   */
+  async _isFeeExempt(topicId) {
+    const addr = this._address.toLowerCase();
+    const topic = await this.getTopic(topicId);
+    if (topic.owner.toLowerCase() === addr) return true;
+    const app = await this.getApplication(Number(topic.applicationId));
+    if (app.owner.toLowerCase() === addr) return true;
+    try {
+      const member = await this.getMember(Number(topic.applicationId), this._address);
+      if ((member.roles & 8 /* ADMIN */) !== 0) return true;
+    } catch {
+    }
+    try {
+      const perm = await this.getTopicPermission(topicId, this._address);
+      if (perm === 4 /* ADMIN */) return true;
+    } catch {
+    }
+    return false;
   }
   /**
    * Read and decrypt recent messages from a topic.
@@ -3672,7 +3718,28 @@ var Clawntenna = class _Clawntenna {
   // ===== TOPICS =====
   async createTopic(appId, name, description, accessLevel) {
     this.requireSigner();
-    return this.registry.createTopic(appId, name, description, accessLevel);
+    const txOverrides = {};
+    try {
+      const app = await this.getApplication(appId);
+      const feeAmount = app.topicCreationFeeAmount ?? BigInt(0);
+      const feeToken = app.topicCreationFeeToken ?? ethers.ZeroAddress;
+      if (feeAmount > BigInt(0) && feeToken === ethers.ZeroAddress) {
+        txOverrides.value = feeAmount;
+      } else if (feeAmount > BigInt(0)) {
+        const token = new ethers.Contract(feeToken, [
+          "function allowance(address,address) view returns (uint256)",
+          "function approve(address,uint256) returns (bool)"
+        ], this._signer);
+        const registryAddr = await this._registry.getAddress();
+        const allowance = await token.allowance(this._address, registryAddr);
+        if (allowance < feeAmount) {
+          const approveTx = await token.approve(registryAddr, feeAmount);
+          await approveTx.wait();
+        }
+      }
+    } catch {
+    }
+    return this.registry.createTopic(appId, name, description, accessLevel, txOverrides);
   }
   async getTopic(topicId) {
     return this._wrapRpcError(async () => {
@@ -5487,9 +5554,23 @@ async function schemaCreate(appId, name, description, body, flags) {
   if (!json) console.log(`Creating schema "${name}" in app ${appId}...`);
   const tx = await client.createAppSchema(appId, name, description, body);
   const receipt = await tx.wait();
+  let schemaId = null;
+  if (receipt) {
+    for (const log of receipt.logs) {
+      try {
+        const parsed = client.schemaRegistry.interface.parseLog(log);
+        if (parsed?.name === "AppSchemaCreated" || parsed?.name === "SchemaCreated") {
+          schemaId = Number(parsed.args.schemaId);
+          break;
+        }
+      } catch {
+      }
+    }
+  }
   if (json) {
-    output({ txHash: tx.hash, blockNumber: receipt?.blockNumber, appId }, true);
+    output({ txHash: tx.hash, blockNumber: receipt?.blockNumber, appId, schemaId }, true);
   } else {
+    console.log(`Schema created${schemaId ? ` (ID: ${schemaId})` : ""}`);
     console.log(`TX: ${tx.hash}`);
     console.log(`Confirmed in block ${receipt?.blockNumber}`);
   }
@@ -6127,7 +6208,7 @@ function decodeContractError(err) {
 }
 
 // src/cli/index.ts
-var VERSION = "0.11.2";
+var VERSION = "0.11.4";
 var HELP = `
   clawntenna v${VERSION}
   On-chain encrypted messaging for AI agents

package/dist/index.cjs

@@ -771,7 +771,53 @@ var Clawntenna = class _Clawntenna {
       replyAuthor,
       mentions: options?.mentions
     });
-    return this.registry.sendMessage(topicId, import_ethers.ethers.toUtf8Bytes(encrypted));
+    const txOverrides = {};
+    try {
+      const fee = await this.getTopicMessageFee(topicId);
+      if (fee.amount > BigInt(0)) {
+        const exempt = await this._isFeeExempt(topicId);
+        if (!exempt) {
+          if (fee.token === import_ethers.ethers.ZeroAddress) {
+            txOverrides.value = fee.amount;
+          } else {
+            const token = new import_ethers.ethers.Contract(fee.token, [
+              "function allowance(address,address) view returns (uint256)",
+              "function approve(address,uint256) returns (bool)"
+            ], this._signer);
+            const registryAddr = await this._registry.getAddress();
+            const allowance = await token.allowance(this._address, registryAddr);
+            if (allowance < fee.amount) {
+              const approveTx = await token.approve(registryAddr, fee.amount);
+              await approveTx.wait();
+            }
+          }
+        }
+      }
+    } catch {
+    }
+    return this.registry.sendMessage(topicId, import_ethers.ethers.toUtf8Bytes(encrypted), txOverrides);
+  }
+  /**
+   * Check if the current signer is exempt from message fees on a topic.
+   * Mirrors contract logic: topic owner, app owner, ROLE_ADMIN, PERMISSION_ADMIN.
+   */
+  async _isFeeExempt(topicId) {
+    const addr = this._address.toLowerCase();
+    const topic = await this.getTopic(topicId);
+    if (topic.owner.toLowerCase() === addr) return true;
+    const app = await this.getApplication(Number(topic.applicationId));
+    if (app.owner.toLowerCase() === addr) return true;
+    try {
+      const member = await this.getMember(Number(topic.applicationId), this._address);
+      if ((member.roles & 8 /* ADMIN */) !== 0) return true;
+    } catch {
+    }
+    try {
+      const perm = await this.getTopicPermission(topicId, this._address);
+      if (perm === 4 /* ADMIN */) return true;
+    } catch {
+    }
+    return false;
   }
   /**
    * Read and decrypt recent messages from a topic.
@@ -872,7 +918,28 @@ var Clawntenna = class _Clawntenna {
   // ===== TOPICS =====
   async createTopic(appId, name, description, accessLevel) {
     this.requireSigner();
-    return this.registry.createTopic(appId, name, description, accessLevel);
+    const txOverrides = {};
+    try {
+      const app = await this.getApplication(appId);
+      const feeAmount = app.topicCreationFeeAmount ?? BigInt(0);
+      const feeToken = app.topicCreationFeeToken ?? import_ethers.ethers.ZeroAddress;
+      if (feeAmount > BigInt(0) && feeToken === import_ethers.ethers.ZeroAddress) {
+        txOverrides.value = feeAmount;
+      } else if (feeAmount > BigInt(0)) {
+        const token = new import_ethers.ethers.Contract(feeToken, [
+          "function allowance(address,address) view returns (uint256)",
+          "function approve(address,uint256) returns (bool)"
+        ], this._signer);
+        const registryAddr = await this._registry.getAddress();
+        const allowance = await token.allowance(this._address, registryAddr);
+        if (allowance < feeAmount) {
+          const approveTx = await token.approve(registryAddr, feeAmount);
+          await approveTx.wait();
+        }
+      }
+    } catch {
+    }
+    return this.registry.createTopic(appId, name, description, accessLevel, txOverrides);
   }
   async getTopic(topicId) {
     return this._wrapRpcError(async () => {