@campnetwork/origin 1.4.0-alpha.2 → 1.4.0-alpha.4

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

@@ -566,20 +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 NFT's Token Bound Account (TBA) is used,
- * since RT tokens are held in the TBA by default.
+ * If no holder is provided, the connected wallet address is used,
+ * since RT tokens are sent directly to the wallet.
  *
  * @param tokenId The token ID whose vault to query.
  * @param revenueToken The ERC20 revenue token address.
- * @param holder Optional holder address. Defaults to the NFT's TBA.
+ * @param holder Optional holder address. Defaults to the connected wallet.
  * @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.
- * Executes the claim through the NFT's Token Bound Account (TBA),
- * since the TBA holds the Royalty Tokens.
+ * The connected wallet must hold Royalty Tokens for the given token.
+ * Revenue is sent directly to the connected wallet.
  *
  * @param tokenId The token ID whose vault to claim from.
  * @param revenueToken The ERC20 revenue token address to claim.
@@ -589,8 +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.
- * Executes the claim through the NFT's Token Bound Account (TBA),
- * since the TBA holds the Royalty Tokens.
+ * The connected wallet must hold Royalty Tokens for the given token.
+ * Revenue is sent directly to the connected wallet.
  *
  * @param tokenId The token ID whose vault to claim from.
  * @param revenueTokens Array of ERC20 revenue token addresses to claim.
@@ -616,11 +616,11 @@ interface RoyaltyTokenBalance {
 }
 /**
  * Gets the Royalty Token balance for a holder in a token's vault.
- * If no holder is provided, the NFT's Token Bound Account (TBA) is used,
- * since RT tokens are minted to the TBA by default.
+ * If no holder is provided, the connected wallet address is used,
+ * since RT tokens are sent directly to the wallet.
  *
  * @param tokenId The token ID whose vault to query.
- * @param holder Optional holder address. Defaults to the NFT's TBA.
+ * @param holder Optional holder address. Defaults to the connected wallet.
  * @returns The royalty token balance info including vault address, balance, total supply, percentage, and decimals.
  */
 declare function getRoyaltyTokenBalance(this: Origin, tokenId: bigint, holder?: Address): Promise<RoyaltyTokenBalance>;
@@ -1067,6 +1067,12 @@ declare class Origin {
      * ```
      */
     claimRoyalties(tokenId: bigint, recipient?: Address, token?: Address): Promise<any>;
+    /**
+     * Get the connected wallet address.
+     * @returns {Promise<Address>} The connected wallet address.
+     * @throws {WalletError} Throws if no wallet is connected.
+     */
+    getWalletAddress(): Promise<Address>;
 }
 
 interface StorageAdapter {

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, encodeFunctionData, getAbiItem, formatEther, formatUnits, checksumAddress, parseEther } from 'viem';
+import { custom, createWalletClient, createPublicClient, http, zeroAddress, erc20Abi as erc20Abi$1, getAbiItem, formatEther, formatUnits, encodeFunctionData, checksumAddress, parseEther } from 'viem';
 import { toAccount } from 'viem/accounts';
 import { createSiweMessage } from 'viem/siwe';
 import axios from 'axios';
@@ -8032,17 +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 NFT's Token Bound Account (TBA) is used,
- * since RT tokens are held in the TBA by default.
+ * If no holder is provided, the connected wallet address is used,
+ * since RT tokens are sent directly to the wallet.
  *
  * @param tokenId The token ID whose vault to query.
  * @param revenueToken The ERC20 revenue token address.
- * @param holder Optional holder address. Defaults to the NFT's TBA.
+ * @param holder Optional holder address. Defaults to the connected wallet.
  * @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 = holder || (yield this.getTokenBoundAccount(tokenId));
+        const holderAddress = holder || (yield this.getWalletAddress());
         const amount = yield this.callContractMethod(this.environment.MARKETPLACE_CONTRACT_ADDRESS, this.environment.MARKETPLACE_ABI, "claimableRevenue", [tokenId, holderAddress, revenueToken]);
         return amount;
     });
@@ -8050,8 +8050,8 @@ function claimableRevenue(tokenId, revenueToken, holder) {
 
 /**
  * Claims accumulated revenue for a token from a specific revenue token.
- * Executes the claim through the NFT's Token Bound Account (TBA),
- * since the TBA holds the Royalty Tokens.
+ * The connected wallet must hold Royalty Tokens for the given token.
+ * Revenue is sent directly to the connected wallet.
  *
  * @param tokenId The token ID whose vault to claim from.
  * @param revenueToken The ERC20 revenue token address to claim.
@@ -8059,25 +8059,14 @@ function claimableRevenue(tokenId, revenueToken, holder) {
  */
 function claimRevenue(tokenId, revenueToken) {
     return __awaiter(this, void 0, void 0, function* () {
-        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) });
+        return this.callContractMethod(this.environment.MARKETPLACE_CONTRACT_ADDRESS, this.environment.MARKETPLACE_ABI, "claimRevenue", [tokenId, revenueToken], { waitForReceipt: true });
     });
 }
 
 /**
  * Claims accumulated revenue for a token from multiple revenue tokens in a single transaction.
- * Executes the claim through the NFT's Token Bound Account (TBA),
- * since the TBA holds the Royalty Tokens.
+ * The connected wallet must hold Royalty Tokens for the given token.
+ * Revenue is sent directly to the connected wallet.
  *
  * @param tokenId The token ID whose vault to claim from.
  * @param revenueTokens Array of ERC20 revenue token addresses to claim.
@@ -8085,18 +8074,7 @@ function claimRevenue(tokenId, revenueToken) {
  */
 function claimRevenueBatch(tokenId, revenueTokens) {
     return __awaiter(this, void 0, void 0, function* () {
-        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) });
+        return this.callContractMethod(this.environment.MARKETPLACE_CONTRACT_ADDRESS, this.environment.MARKETPLACE_ABI, "claimRevenueBatch", [tokenId, revenueTokens], { waitForReceipt: true });
     });
 }
 
@@ -8138,17 +8116,17 @@ const erc20Abi = [
 ];
 /**
  * Gets the Royalty Token balance for a holder in a token's vault.
- * If no holder is provided, the NFT's Token Bound Account (TBA) is used,
- * since RT tokens are minted to the TBA by default.
+ * If no holder is provided, the connected wallet address is used,
+ * since RT tokens are sent directly to the wallet.
  *
  * @param tokenId The token ID whose vault to query.
- * @param holder Optional holder address. Defaults to the NFT's TBA.
+ * @param holder Optional holder address. Defaults to the connected wallet.
  * @returns The royalty token balance info including vault address, balance, total supply, percentage, and decimals.
  */
 function getRoyaltyTokenBalance(tokenId, holder) {
     return __awaiter(this, void 0, void 0, function* () {
-        // Default to the NFT's TBA, since RT tokens are minted there
-        const holderAddress = holder || (yield this.getTokenBoundAccount(tokenId));
+        // Default to the connected wallet, since RT tokens are sent there directly
+        const holderAddress = holder || (yield this.getWalletAddress());
         // Get vault address
         const vaultAddress = yield this.callContractMethod(this.environment.DATANFT_CONTRACT_ADDRESS, this.environment.IPNFT_ABI, "getRoyaltyVault", [tokenId]);
         if (!vaultAddress || vaultAddress === zeroAddress) {
@@ -8874,7 +8852,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);
@@ -8889,12 +8867,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);
@@ -8912,7 +8890,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 });
                 }
@@ -9242,6 +9220,16 @@ class Origin {
             { waitForReceipt: true, value: BigInt(0) });
         });
     }
+    /**
+     * Get the connected wallet address.
+     * @returns {Promise<Address>} The connected wallet address.
+     * @throws {WalletError} Throws if no wallet is connected.
+     */
+    getWalletAddress() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return __classPrivateFieldGet(this, _Origin_instances, "m", _Origin_resolveWalletAddress).call(this);
+        });
+    }
 }
 _Origin_instances = new WeakSet(), _Origin_generateURL = function _Origin_generateURL(file, partCount) {
     return __awaiter(this, void 0, void 0, function* () {

package/package.json

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