@campnetwork/origin 1.4.0-alpha.1 → 1.4.0-alpha.3

package/dist/react/index.esm.d.ts

@@ -566,18 +566,20 @@ declare function getVaultRevenueTokens(this: Origin, tokenId: bigint): Promise<A
 
 /**
  * Returns the amount of revenue claimable by a holder for a given token and revenue token.
- * If no holder is provided, the connected wallet address is used.
+ * If no holder is provided, the NFT's Token Bound Account (TBA) is used,
+ * since RT tokens are held in the TBA by default.
  *
  * @param tokenId The token ID whose vault to query.
  * @param revenueToken The ERC20 revenue token address.
- * @param holder Optional holder address. Defaults to connected wallet.
+ * @param holder Optional holder address. Defaults to the NFT's TBA.
  * @returns The claimable amount in the revenue token's smallest unit.
  */
 declare function claimableRevenue(this: Origin, tokenId: bigint, revenueToken: Address, holder?: Address): Promise<bigint>;
 
 /**
  * Claims accumulated revenue for a token from a specific revenue token.
- * The caller must hold Royalty Tokens to claim their proportional share.
+ * Executes the claim through the NFT's Token Bound Account (TBA),
+ * since the TBA holds the Royalty Tokens.
  *
  * @param tokenId The token ID whose vault to claim from.
  * @param revenueToken The ERC20 revenue token address to claim.
@@ -587,7 +589,8 @@ declare function claimRevenue(this: Origin, tokenId: bigint, revenueToken: Addre
 
 /**
  * Claims accumulated revenue for a token from multiple revenue tokens in a single transaction.
- * The caller must hold Royalty Tokens to claim their proportional share.
+ * Executes the claim through the NFT's Token Bound Account (TBA),
+ * since the TBA holds the Royalty Tokens.
  *
  * @param tokenId The token ID whose vault to claim from.
  * @param revenueTokens Array of ERC20 revenue token addresses to claim.

package/dist/react/index.esm.js

@@ -1,6 +1,6 @@
 'use client';
 import React, { createContext, useState, useContext, useEffect, useLayoutEffect, useRef, useSyncExternalStore } from 'react';
-import { custom, createWalletClient, createPublicClient, http, zeroAddress, erc20Abi as erc20Abi$1, getAbiItem, formatEther, formatUnits, encodeFunctionData, checksumAddress, parseEther } from 'viem';
+import { custom, createWalletClient, createPublicClient, http, zeroAddress, erc20Abi as erc20Abi$1, encodeFunctionData, getAbiItem, formatEther, formatUnits, checksumAddress, parseEther } from 'viem';
 import { toAccount } from 'viem/accounts';
 import { createSiweMessage } from 'viem/siwe';
 import axios from 'axios';
@@ -8032,16 +8032,17 @@ function getVaultRevenueTokens(tokenId) {
 
 /**
  * Returns the amount of revenue claimable by a holder for a given token and revenue token.
- * If no holder is provided, the connected wallet address is used.
+ * If no holder is provided, the NFT's Token Bound Account (TBA) is used,
+ * since RT tokens are held in the TBA by default.
  *
  * @param tokenId The token ID whose vault to query.
  * @param revenueToken The ERC20 revenue token address.
- * @param holder Optional holder address. Defaults to connected wallet.
+ * @param holder Optional holder address. Defaults to the NFT's TBA.
  * @returns The claimable amount in the revenue token's smallest unit.
  */
 function claimableRevenue(tokenId, revenueToken, holder) {
     return __awaiter(this, void 0, void 0, function* () {
-        const holderAddress = yield resolveWalletAddress(this.viemClient, holder);
+        const holderAddress = holder || (yield this.getTokenBoundAccount(tokenId));
         const amount = yield this.callContractMethod(this.environment.MARKETPLACE_CONTRACT_ADDRESS, this.environment.MARKETPLACE_ABI, "claimableRevenue", [tokenId, holderAddress, revenueToken]);
         return amount;
     });
@@ -8049,7 +8050,8 @@ function claimableRevenue(tokenId, revenueToken, holder) {
 
 /**
  * Claims accumulated revenue for a token from a specific revenue token.
- * The caller must hold Royalty Tokens to claim their proportional share.
+ * Executes the claim through the NFT's Token Bound Account (TBA),
+ * since the TBA holds the Royalty Tokens.
  *
  * @param tokenId The token ID whose vault to claim from.
  * @param revenueToken The ERC20 revenue token address to claim.
@@ -8057,13 +8059,25 @@ function claimableRevenue(tokenId, revenueToken, holder) {
  */
 function claimRevenue(tokenId, revenueToken) {
     return __awaiter(this, void 0, void 0, function* () {
-        return this.callContractMethod(this.environment.MARKETPLACE_CONTRACT_ADDRESS, this.environment.MARKETPLACE_ABI, "claimRevenue", [tokenId, revenueToken], { waitForReceipt: true });
+        const tokenBoundAccount = yield this.getTokenBoundAccount(tokenId);
+        const data = encodeFunctionData({
+            abi: this.environment.MARKETPLACE_ABI,
+            functionName: "claimRevenue",
+            args: [tokenId, revenueToken],
+        });
+        return this.callContractMethod(tokenBoundAccount, this.environment.TBA_ABI, "execute", [
+            this.environment.MARKETPLACE_CONTRACT_ADDRESS,
+            BigInt(0),
+            data,
+            0,
+        ], { waitForReceipt: true, value: BigInt(0) });
     });
 }
 
 /**
  * Claims accumulated revenue for a token from multiple revenue tokens in a single transaction.
- * The caller must hold Royalty Tokens to claim their proportional share.
+ * Executes the claim through the NFT's Token Bound Account (TBA),
+ * since the TBA holds the Royalty Tokens.
  *
  * @param tokenId The token ID whose vault to claim from.
  * @param revenueTokens Array of ERC20 revenue token addresses to claim.
@@ -8071,7 +8085,18 @@ function claimRevenue(tokenId, revenueToken) {
  */
 function claimRevenueBatch(tokenId, revenueTokens) {
     return __awaiter(this, void 0, void 0, function* () {
-        return this.callContractMethod(this.environment.MARKETPLACE_CONTRACT_ADDRESS, this.environment.MARKETPLACE_ABI, "claimRevenueBatch", [tokenId, revenueTokens], { waitForReceipt: true });
+        const tokenBoundAccount = yield this.getTokenBoundAccount(tokenId);
+        const data = encodeFunctionData({
+            abi: this.environment.MARKETPLACE_ABI,
+            functionName: "claimRevenueBatch",
+            args: [tokenId, revenueTokens],
+        });
+        return this.callContractMethod(tokenBoundAccount, this.environment.TBA_ABI, "execute", [
+            this.environment.MARKETPLACE_CONTRACT_ADDRESS,
+            BigInt(0),
+            data,
+            0,
+        ], { waitForReceipt: true, value: BigInt(0) });
     });
 }
 
@@ -8849,7 +8874,7 @@ class Origin {
      */
     callContractMethod(contractAddress_1, abi_1, methodName_1, params_1) {
         return __awaiter(this, arguments, void 0, function* (contractAddress, abi, methodName, params, options = {}) {
-            var _a;
+            var _a, _b;
             let account = null;
             try {
                 account = yield __classPrivateFieldGet(this, _Origin_instances, "m", _Origin_getCurrentAccount).call(this);
@@ -8864,12 +8889,12 @@ class Origin {
                     abiItem.stateMutability === "pure");
             if (isView) {
                 const publicClient = getPublicClient();
-                const result = (yield publicClient.readContract({
+                const result = (_a = (yield publicClient.readContract({
                     address: contractAddress,
                     abi,
                     functionName: methodName,
                     args: params,
-                })) || null;
+                }))) !== null && _a !== void 0 ? _a : null;
                 return result;
             }
             yield __classPrivateFieldGet(this, _Origin_instances, "m", _Origin_ensureChainId).call(this, this.environment.CHAIN);
@@ -8887,7 +8912,7 @@ class Origin {
                 return simulatedResult;
             }
             try {
-                const txHash = yield ((_a = this.viemClient) === null || _a === void 0 ? void 0 : _a.writeContract(request));
+                const txHash = yield ((_b = this.viemClient) === null || _b === void 0 ? void 0 : _b.writeContract(request));
                 if (typeof txHash !== "string") {
                     throw new ContractError(`Transaction for "${methodName}" failed to send: no transaction hash returned`, { contractName: contractAddress, methodName });
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campnetwork/origin",
-  "version": "1.4.0-alpha.1",
+  "version": "1.4.0-alpha.3",
   "main": "dist/core.cjs",
   "exports": {
     ".": {