clawntenna 0.9.0 → 0.10.1

package/dist/cli/index.js

@@ -21,7 +21,8 @@ var CHAINS = {
     keyManager: "0x5562B553a876CBdc8AA4B3fb0687f22760F4759e",
     schemaRegistry: "0xB7eB50e9058198b99b5b2589E6D70b2d99d5440a",
     identityRegistry: "0x8004AA63c570c570eBF15376c0dB199918BFe9Fb",
-    escrow: "0x74e376C53f4afd5Cd32a77dDc627f477FcFC2333"
+    escrow: "0x74e376C53f4afd5Cd32a77dDc627f477FcFC2333",
+    defaultLookback: 2e5
   },
   base: {
     chainId: 8453,
@@ -32,7 +33,9 @@ var CHAINS = {
     registry: "0x5fF6BF04F1B5A78ae884D977a3C80A0D8E2072bF",
     keyManager: "0xdc302ff43a34F6aEa19426D60C9D150e0661E4f4",
     schemaRegistry: "0x5c11d2eA4470eD9025D810A21a885FE16dC987Bd",
-    identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432"
+    identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
+    escrow: "0x04eC9a25C942192834F447eC9192831B56Ae2D7D",
+    defaultLookback: 2e5
   },
   avalanche: {
     chainId: 43114,
@@ -43,7 +46,9 @@ var CHAINS = {
     registry: "0x3Ca2FF0bD1b3633513299EB5d3e2d63e058b0713",
     keyManager: "0x5a5ea9D408FBA984fFf6e243Dcc71ff6E00C73E4",
     schemaRegistry: "0x23D96e610E8E3DA5341a75B77F1BFF7EA9c3A62B",
-    identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432"
+    identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
+    escrow: "0x4068245c35a498Da4336aD1Ab0Fb71ef534bfd03",
+    defaultLookback: 5e5
   }
 };
 
@@ -3355,16 +3360,93 @@ function getDepositDeadline(depositedAt, timeout) {
   return Number(depositedAt + timeout);
 }
 
+// src/rpc-errors.ts
+function classifyRpcError(err, ctx) {
+  const msg = err.message ?? "";
+  if (msg.includes("BAD_DATA") || msg.includes("could not decode result data")) {
+    return `${ctx.method} failed: contract may not be deployed on ${ctx.chainName}, or the RPC returned an empty response. Check that the correct chain and RPC URL are configured.`;
+  }
+  if (msg.includes("NETWORK_ERROR") || msg.includes("ECONNREFUSED") || msg.includes("fetch failed") || msg.includes("getaddrinfo")) {
+    return `${ctx.method} failed: network error connecting to ${ctx.chainName} RPC. Check your RPC URL and network connectivity.`;
+  }
+  if (msg.includes("429") || msg.includes("rate limit") || msg.includes("too many requests") || msg.includes("exceeded") || msg.includes("throttl")) {
+    return `${ctx.method} failed: RPC rate limit hit on ${ctx.chainName}. The request was retried but the limit persists. Try again later or use a different RPC endpoint.`;
+  }
+  return null;
+}
+
+// src/retry.ts
+var DEFAULT_RETRY = {
+  maxRetries: 3,
+  baseDelayMs: 1e3,
+  maxDelayMs: 1e4
+};
+var RETRYABLE_PATTERNS = [
+  "429",
+  "rate limit",
+  "too many requests",
+  "timeout",
+  "econnreset",
+  "502",
+  "503",
+  "504",
+  "server error"
+];
+function isRetryableError(err) {
+  const msg = (err.message ?? "").toLowerCase();
+  return RETRYABLE_PATTERNS.some((p) => msg.includes(p));
+}
+async function withRetry(fn, options) {
+  const opts = { ...DEFAULT_RETRY, ...options };
+  let lastError;
+  for (let attempt = 0; attempt <= opts.maxRetries; attempt++) {
+    try {
+      return await fn();
+    } catch (err) {
+      lastError = err;
+      if (attempt === opts.maxRetries) break;
+      if (!(err instanceof Error) || !isRetryableError(err)) break;
+      const delay = Math.min(opts.baseDelayMs * 2 ** attempt, opts.maxDelayMs);
+      const jitter = Math.random() * 0.25 * delay;
+      await new Promise((r) => setTimeout(r, delay + jitter));
+    }
+  }
+  throw lastError;
+}
+
 // src/client.ts
 var Clawntenna = class _Clawntenna {
   provider;
-  wallet;
-  registry;
-  keyManager;
-  schemaRegistry;
-  identityRegistry;
-  escrow;
   chainName;
+  _signer;
+  _address;
+  _registry;
+  _keyManager;
+  _schemaRegistry;
+  _identityRegistry;
+  _escrow;
+  /** @deprecated Use `signer` instead. */
+  get wallet() {
+    return this._signer;
+  }
+  get signer() {
+    return this._signer;
+  }
+  get registry() {
+    return this._registry;
+  }
+  get keyManager() {
+    return this._keyManager;
+  }
+  get schemaRegistry() {
+    return this._schemaRegistry;
+  }
+  get identityRegistry() {
+    return this._identityRegistry;
+  }
+  get escrow() {
+    return this._escrow;
+  }
   // In-memory ECDH state
   ecdhPrivateKey = null;
   ecdhPublicKey = null;
@@ -3383,25 +3465,59 @@ var Clawntenna = class _Clawntenna {
     const keyManagerAddr = options.keyManagerAddress ?? chain.keyManager;
     const schemaRegistryAddr = options.schemaRegistryAddress ?? chain.schemaRegistry;
     const escrowAddr = options.escrowAddress ?? chain.escrow;
-    const signer = options.privateKey ? new ethers.Wallet(options.privateKey, this.provider) : null;
+    const wallet = options.privateKey ? new ethers.Wallet(options.privateKey, this.provider) : null;
+    const signer = wallet ? new ethers.NonceManager(wallet) : null;
     const runner = signer ?? this.provider;
-    if (signer) {
-      this.wallet = signer;
-      this.registry = new ethers.Contract(registryAddr, REGISTRY_ABI, signer);
-      this.keyManager = new ethers.Contract(keyManagerAddr, KEY_MANAGER_ABI, signer);
-      this.schemaRegistry = new ethers.Contract(schemaRegistryAddr, SCHEMA_REGISTRY_ABI, signer);
-      this.identityRegistry = chain.identityRegistry ? new ethers.Contract(chain.identityRegistry, IDENTITY_REGISTRY_ABI, signer) : null;
-    } else {
-      this.wallet = null;
-      this.registry = new ethers.Contract(registryAddr, REGISTRY_ABI, this.provider);
-      this.keyManager = new ethers.Contract(keyManagerAddr, KEY_MANAGER_ABI, this.provider);
-      this.schemaRegistry = new ethers.Contract(schemaRegistryAddr, SCHEMA_REGISTRY_ABI, this.provider);
-      this.identityRegistry = chain.identityRegistry ? new ethers.Contract(chain.identityRegistry, IDENTITY_REGISTRY_ABI, this.provider) : null;
+    this._signer = signer;
+    this._address = wallet?.address ?? null;
+    this._registry = new ethers.Contract(registryAddr, REGISTRY_ABI, runner);
+    this._keyManager = new ethers.Contract(keyManagerAddr, KEY_MANAGER_ABI, runner);
+    this._schemaRegistry = new ethers.Contract(schemaRegistryAddr, SCHEMA_REGISTRY_ABI, runner);
+    this._identityRegistry = chain.identityRegistry ? new ethers.Contract(chain.identityRegistry, IDENTITY_REGISTRY_ABI, runner) : null;
+    this._escrow = escrowAddr ? new ethers.Contract(escrowAddr, ESCROW_ABI, runner) : null;
+  }
+  /**
+   * Connect an external signer (e.g. from BrowserProvider).
+   * Reconnects all contract instances to the new signer.
+   */
+  async connectSigner(signer) {
+    this._address = await signer.getAddress();
+    this._signer = signer;
+    this._registry = this._registry.connect(signer);
+    this._keyManager = this._keyManager.connect(signer);
+    this._schemaRegistry = this._schemaRegistry.connect(signer);
+    if (this._identityRegistry) {
+      this._identityRegistry = this._identityRegistry.connect(signer);
+    }
+    if (this._escrow) {
+      this._escrow = this._escrow.connect(signer);
+    }
+  }
+  requireSigner() {
+    if (!this._signer) {
+      throw new Error("Signer required. Pass privateKey in constructor or call connectSigner().");
+    }
+    return this._signer;
+  }
+  requireAddress() {
+    if (!this._address) {
+      throw new Error("Signer required. Pass privateKey in constructor or call connectSigner().");
+    }
+    return this._address;
+  }
+  async _wrapRpcError(fn, method) {
+    try {
+      return await withRetry(fn);
+    } catch (err) {
+      if (err instanceof Error) {
+        const hint = classifyRpcError(err, { method, chainName: this.chainName });
+        if (hint) throw new Error(hint, { cause: err });
+      }
+      throw err;
     }
-    this.escrow = escrowAddr ? new ethers.Contract(escrowAddr, ESCROW_ABI, runner) : null;
   }
   get address() {
-    return this.wallet?.address ?? null;
+    return this._address;
   }
   // ===== MESSAGING =====
   /**
@@ -3409,7 +3525,7 @@ var Clawntenna = class _Clawntenna {
    * Automatically determines encryption key based on topic access level.
    */
   async sendMessage(topicId, text, options) {
-    if (!this.wallet) throw new Error("Wallet required to send messages");
+    this.requireSigner();
     if (options?.replyTo && this.escrow && !options?.skipRefundCheck) {
       const refunded = await this.isMessageRefunded(options.replyTo);
       if (refunded) {
@@ -3447,13 +3563,17 @@ var Clawntenna = class _Clawntenna {
     const filter = this.registry.filters.MessageSent(topicId);
     const CHUNK_SIZE = 2e3;
     const currentBlock = await this.provider.getBlockNumber();
-    const maxRange = options?.fromBlock != null ? currentBlock - options.fromBlock : 1e5;
+    const chain = CHAINS[this.chainName];
+    const maxRange = options?.fromBlock != null ? currentBlock - options.fromBlock : chain.defaultLookback;
     const startBlock = currentBlock - maxRange;
     const allEvents = [];
     let toBlock = currentBlock;
     while (toBlock > startBlock && allEvents.length < limit) {
       const chunkFrom = Math.max(toBlock - CHUNK_SIZE + 1, startBlock);
-      const events = await this.registry.queryFilter(filter, chunkFrom, toBlock);
+      const events = await this._wrapRpcError(
+        () => this.registry.queryFilter(filter, chunkFrom, toBlock),
+        "readMessages"
+      );
       allEvents.unshift(...events);
       toBlock = chunkFrom - 1;
     }
@@ -3463,12 +3583,12 @@ var Clawntenna = class _Clawntenna {
       const payloadStr = ethers.toUtf8String(log.args.payload);
       const parsed = decryptMessage(payloadStr, key);
       messages.push({
-        topicId: BigInt(topicId),
+        topicId,
         sender: log.args.sender,
         text: parsed?.text ?? "[decryption failed]",
         replyTo: parsed?.replyTo ?? null,
         mentions: parsed?.mentions ?? null,
-        timestamp: log.args.timestamp,
+        timestamp: Number(log.args.timestamp),
         txHash: log.transactionHash,
         blockNumber: log.blockNumber
       });
@@ -3489,12 +3609,12 @@ var Clawntenna = class _Clawntenna {
       const payloadStr = ethers.toUtf8String(payload);
       const parsed = decryptMessage(payloadStr, key);
       callback({
-        topicId: tId,
+        topicId: Number(tId),
         sender,
         text: parsed?.text ?? "[decryption failed]",
         replyTo: parsed?.replyTo ?? null,
         mentions: parsed?.mentions ?? null,
-        timestamp,
+        timestamp: Number(timestamp),
         txHash: event.transactionHash,
         blockNumber: event.blockNumber
       });
@@ -3506,7 +3626,7 @@ var Clawntenna = class _Clawntenna {
   }
   // ===== NICKNAMES =====
   async setNickname(appId, nickname) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.registry.setNickname(appId, nickname);
   }
   async getNickname(appId, address) {
@@ -3520,11 +3640,11 @@ var Clawntenna = class _Clawntenna {
     return { canChange, timeRemaining };
   }
   async clearNickname(appId) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.registry.clearNickname(appId);
   }
   async setNicknameCooldown(appId, cooldownSeconds) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.registry.setNicknameCooldown(appId, cooldownSeconds);
   }
   async getNicknameCooldown(appId) {
@@ -3532,24 +3652,26 @@ var Clawntenna = class _Clawntenna {
   }
   // ===== TOPICS =====
   async createTopic(appId, name, description, accessLevel) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.registry.createTopic(appId, name, description, accessLevel);
   }
   async getTopic(topicId) {
-    const t = await this.registry.getTopic(topicId);
-    return {
-      id: t.id,
-      applicationId: t.applicationId,
-      name: t.name,
-      description: t.description,
-      owner: t.owner,
-      creator: t.creator,
-      createdAt: t.createdAt,
-      lastMessageAt: t.lastMessageAt,
-      messageCount: t.messageCount,
-      accessLevel: Number(t.accessLevel),
-      active: t.active
-    };
+    return this._wrapRpcError(async () => {
+      const t = await this.registry.getTopic(topicId);
+      return {
+        id: t.id,
+        applicationId: t.applicationId,
+        name: t.name,
+        description: t.description,
+        owner: t.owner,
+        creator: t.creator,
+        createdAt: t.createdAt,
+        lastMessageAt: t.lastMessageAt,
+        messageCount: t.messageCount,
+        accessLevel: Number(t.accessLevel),
+        active: t.active
+      };
+    }, "getTopic");
   }
   async getApplicationTopics(appId) {
     return this.registry.getApplicationTopics(appId);
@@ -3559,7 +3681,7 @@ var Clawntenna = class _Clawntenna {
     return Number(count);
   }
   async setTopicPermission(topicId, user, permission) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.registry.setTopicPermission(topicId, user, permission);
   }
   async getTopicPermission(topicId, user) {
@@ -3568,15 +3690,15 @@ var Clawntenna = class _Clawntenna {
   }
   // ===== MEMBERS =====
   async addMember(appId, address, nickname, roles) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.registry.addMember(appId, address, nickname, roles);
   }
   async removeMember(appId, address) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.registry.removeMember(appId, address);
   }
   async updateMemberRoles(appId, address, roles) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.registry.updateMemberRoles(appId, address, roles);
   }
   async getMember(appId, address) {
@@ -3603,7 +3725,7 @@ var Clawntenna = class _Clawntenna {
   }
   // ===== APPLICATIONS =====
   async createApplication(name, description, frontendUrl, allowPublicTopicCreation) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.registry.createApplication(name, description, frontendUrl, allowPublicTopicCreation);
   }
   async getApplicationCount() {
@@ -3611,25 +3733,27 @@ var Clawntenna = class _Clawntenna {
     return Number(count);
   }
   async updateFrontendUrl(appId, frontendUrl) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.registry.updateApplicationFrontendUrl(appId, frontendUrl);
   }
   async getApplication(appId) {
-    const a = await this.registry.getApplication(appId);
-    return {
-      id: a.id,
-      name: a.name,
-      description: a.description,
-      frontendUrl: a.frontendUrl,
-      owner: a.owner,
-      createdAt: a.createdAt,
-      memberCount: Number(a.memberCount),
-      topicCount: Number(a.topicCount),
-      active: a.active,
-      allowPublicTopicCreation: a.allowPublicTopicCreation,
-      topicCreationFeeToken: a.topicCreationFeeToken,
-      topicCreationFeeAmount: a.topicCreationFeeAmount
-    };
+    return this._wrapRpcError(async () => {
+      const a = await this.registry.getApplication(appId);
+      return {
+        id: a.id,
+        name: a.name,
+        description: a.description,
+        frontendUrl: a.frontendUrl,
+        owner: a.owner,
+        createdAt: a.createdAt,
+        memberCount: Number(a.memberCount),
+        topicCount: Number(a.topicCount),
+        active: a.active,
+        allowPublicTopicCreation: a.allowPublicTopicCreation,
+        topicCreationFeeToken: a.topicCreationFeeToken,
+        topicCreationFeeAmount: a.topicCreationFeeAmount
+      };
+    }, "getApplication");
   }
   // ===== FEES =====
   async getTopicMessageFee(topicId) {
@@ -3644,7 +3768,7 @@ var Clawntenna = class _Clawntenna {
    *     (e.g. '0.15' or 0.15 with USDC → 150000n, '0.01' with native ETH → 10000000000000000n)
    */
   async setTopicCreationFee(appId, feeToken, feeAmount) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     const rawAmount = typeof feeAmount === "bigint" ? feeAmount : await this.parseTokenAmount(feeToken, feeAmount);
     return this.registry.setTopicCreationFee(appId, feeToken, rawAmount);
   }
@@ -3656,7 +3780,7 @@ var Clawntenna = class _Clawntenna {
    *     (e.g. '0.15' or 0.15 with USDC → 150000n, '0.01' with native ETH → 10000000000000000n)
    */
   async setTopicMessageFee(topicId, feeToken, feeAmount) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     const rawAmount = typeof feeAmount === "bigint" ? feeAmount : await this.parseTokenAmount(feeToken, feeAmount);
     return this.registry.setTopicMessageFee(topicId, feeToken, rawAmount);
   }
@@ -3712,14 +3836,14 @@ var Clawntenna = class _Clawntenna {
    * Enable escrow for a topic (topic owner only).
    */
   async enableEscrow(topicId, timeout) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.requireEscrow().enableEscrow(topicId, timeout);
   }
   /**
    * Disable escrow for a topic (topic owner only).
    */
   async disableEscrow(topicId) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.requireEscrow().disableEscrow(topicId);
   }
   /**
@@ -3780,14 +3904,14 @@ var Clawntenna = class _Clawntenna {
    * Claim a refund for a single deposit.
    */
   async claimRefund(depositId) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.requireEscrow().claimRefund(depositId);
   }
   /**
    * Batch claim refunds for multiple deposits.
    */
   async batchClaimRefunds(depositIds) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.requireEscrow().batchClaimRefunds(depositIds);
   }
   /**
@@ -3852,10 +3976,11 @@ var Clawntenna = class _Clawntenna {
    * Requires a signer capable of signing messages.
    */
   async deriveECDHFromWallet(appId = 1) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
+    const signer = this._signer;
     const { privateKey, publicKey } = await deriveKeypairFromSignature(
-      this.wallet.address,
-      (msg) => this.wallet.signMessage(msg),
+      this.requireAddress(),
+      (msg) => signer.signMessage(msg),
       appId
     );
     this.ecdhPrivateKey = privateKey;
@@ -3874,9 +3999,9 @@ var Clawntenna = class _Clawntenna {
    * Register ECDH public key on-chain.
    */
   async registerPublicKey() {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     if (!this.ecdhPublicKey) throw new Error("ECDH key not derived yet");
-    const hasKey = await this.keyManager.hasPublicKey(this.wallet.address);
+    const hasKey = await this.keyManager.hasPublicKey(this.requireAddress());
     if (hasKey) {
       throw new Error("Public key already registered on-chain");
     }
@@ -3903,13 +4028,13 @@ var Clawntenna = class _Clawntenna {
    * Returns the generated topic key.
    */
   async initializeTopicKey(topicId) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     if (!this.ecdhPrivateKey || !this.ecdhPublicKey) {
       throw new Error("ECDH key not derived yet");
     }
     const topicKey = randomBytes(32);
     const encrypted = encryptTopicKeyForUser(topicKey, this.ecdhPrivateKey, this.ecdhPublicKey);
-    const tx = await this.keyManager.grantKeyAccess(topicId, this.wallet.address, encrypted);
+    const tx = await this.keyManager.grantKeyAccess(topicId, this.requireAddress(), encrypted);
     await tx.wait();
     this.topicKeys.set(topicId, topicKey);
     return topicKey;
@@ -3926,9 +4051,9 @@ var Clawntenna = class _Clawntenna {
       const isNoGrant = err instanceof Error && err.message.includes("No key grant found");
       if (!isNoGrant) throw err;
       const topic = await this.getTopic(topicId);
-      if (!this.wallet || topic.owner.toLowerCase() !== this.wallet.address.toLowerCase()) {
+      if (!this._signer || topic.owner.toLowerCase() !== this._address.toLowerCase()) {
         throw new Error(
-          `No key grant found for topic ${topicId}. Ask the topic owner to grant you access with: keys grant ${topicId} ${this.wallet?.address ?? "<your-address>"}`
+          `No key grant found for topic ${topicId}. Ask the topic owner to grant you access with: keys grant ${topicId} ${this._address ?? "<your-address>"}`
         );
       }
       return this.initializeTopicKey(topicId);
@@ -3938,7 +4063,7 @@ var Clawntenna = class _Clawntenna {
    * Grant a user access to a private topic's symmetric key.
    */
   async grantKeyAccess(topicId, userAddress, topicKey) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     if (!this.ecdhPrivateKey) throw new Error("ECDH key not derived yet");
     const hasKey = await this.keyManager.hasPublicKey(userAddress);
     if (!hasKey) {
@@ -4023,7 +4148,7 @@ var Clawntenna = class _Clawntenna {
    * Batch grant key access to multiple users at once (max 50).
    */
   async batchGrantKeyAccess(topicId, users, topicKey) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     if (!this.ecdhPrivateKey) throw new Error("ECDH key not derived yet");
     const encryptedKeys = [];
     for (const user of users) {
@@ -4037,14 +4162,14 @@ var Clawntenna = class _Clawntenna {
    * Revoke a user's key access for a topic.
    */
   async revokeKeyAccess(topicId, address) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.keyManager.revokeKeyAccess(topicId, address);
   }
   /**
    * Rotate the key version for a topic. Existing grants become stale.
    */
   async rotateKey(topicId) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.keyManager.rotateKey(topicId);
   }
   // ===== SCHEMAS =====
@@ -4052,21 +4177,21 @@ var Clawntenna = class _Clawntenna {
    * Create a schema scoped to an application. Requires app admin role.
    */
   async createAppSchema(appId, name, description, body) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.schemaRegistry.createAppSchema(appId, name, description, body);
   }
   /**
    * Publish a new version of an existing schema.
    */
   async publishSchemaVersion(schemaId, body) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.schemaRegistry.publishSchemaVersion(schemaId, body);
   }
   /**
    * Deactivate a schema.
    */
   async deactivateSchema(schemaId) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.schemaRegistry.deactivateSchema(schemaId);
   }
   /**
@@ -4118,14 +4243,14 @@ var Clawntenna = class _Clawntenna {
    * Bind a schema version to a topic. Requires topic admin.
    */
   async setTopicSchema(topicId, schemaId, version) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.schemaRegistry.setTopicSchema(topicId, schemaId, version);
   }
   /**
    * Remove schema binding from a topic.
    */
   async clearTopicSchema(topicId) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.schemaRegistry.clearTopicSchema(topicId);
   }
   // ===== AGENT IDENTITY (V5) =====
@@ -4134,14 +4259,14 @@ var Clawntenna = class _Clawntenna {
    * Verifies ownership via ownerOf on the identity registry.
    */
   async registerAgentIdentity(appId, tokenId) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.registry.registerAgentIdentity(appId, tokenId);
   }
   /**
    * Clear your agent identity registration for an application (V5).
    */
   async clearAgentIdentity(appId) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     return this.registry.clearAgentIdentity(appId);
   }
   /**
@@ -4170,7 +4295,7 @@ var Clawntenna = class _Clawntenna {
    * Optionally provide a URI for the agent's metadata.
    */
   async registerAgent(agentURI) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     const registry = this.requireIdentityRegistry();
     const tx = agentURI ? await registry["register(string)"](agentURI) : await registry["register()"]();
     const receipt = await tx.wait();
@@ -4193,7 +4318,7 @@ var Clawntenna = class _Clawntenna {
    * Register as an agent with metadata entries.
    */
   async registerAgentWithMetadata(agentURI, metadata) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     const registry = this.requireIdentityRegistry();
     const tx = await registry["register(string,(string,bytes)[])"](agentURI, metadata);
     const receipt = await tx.wait();
@@ -4218,7 +4343,7 @@ var Clawntenna = class _Clawntenna {
    */
   async isRegisteredAgent(address) {
     const registry = this.requireIdentityRegistry();
-    const addr = address ?? this.wallet?.address;
+    const addr = address ?? this._address;
     if (!addr) throw new Error("Address required");
     const balance = await registry.balanceOf(addr);
     return balance > 0n;
@@ -4239,7 +4364,7 @@ var Clawntenna = class _Clawntenna {
    * Set metadata for an agent.
    */
   async setAgentMetadata(agentId, key, value) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     const registry = this.requireIdentityRegistry();
     return registry.setMetadata(agentId, key, value);
   }
@@ -4255,7 +4380,7 @@ var Clawntenna = class _Clawntenna {
    * Update the URI for an agent registration.
    */
   async setAgentURI(agentId, newURI) {
-    if (!this.wallet) throw new Error("Wallet required");
+    this.requireSigner();
     const registry = this.requireIdentityRegistry();
     return registry.setAgentURI(agentId, newURI);
   }
@@ -5594,7 +5719,7 @@ function decodeContractError(err) {
 }
 
 // src/cli/index.ts
-var VERSION = "0.9.0";
+var VERSION = "0.10.1";
 var HELP = `
   clawntenna v${VERSION}
   On-chain encrypted messaging for AI agents