@campnetwork/origin 1.0.0-alpha.13 → 1.0.0-alpha.3

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

@@ -1,5 +1,5 @@
 import React, { JSX } from 'react';
-import { Address, Hex, WalletClient, Abi } from 'viem';
+import { Address, Hex, Abi } from 'viem';
 import { UseQueryResult } from '@tanstack/react-query';
 
 interface Environment {
@@ -85,10 +85,9 @@ declare function finalizeDelete(this: Origin, tokenId: bigint): Promise<any>;
 /**
  * Calls the getOrCreateRoyaltyVault method on the IPNFT contract.
  * @param tokenOwner The address of the token owner for whom to get or create the royalty vault.
- * @param simulateOnly If true, simulates the transaction without executing it.
  * @returns The address of the royalty vault associated with the specified token owner.
  */
-declare function getOrCreateRoyaltyVault(this: Origin, tokenOwner: Address, simulateOnly?: boolean): Promise<Address>;
+declare function getOrCreateRoyaltyVault(this: Origin, tokenOwner: Address): Promise<Address>;
 
 /**
  * Returns the license terms associated with a specific token ID.
@@ -181,7 +180,6 @@ type CallOptions = {
     value?: bigint;
     gas?: bigint;
     waitForReceipt?: boolean;
-    simulate?: boolean;
 };
 /**
  * The Origin class
@@ -210,9 +208,9 @@ declare class Origin {
     private jwt;
     environment: Environment;
     private viemClient?;
-    constructor(jwt: string, environment: Environment, viemClient?: WalletClient);
+    constructor(jwt: string, environment: Environment, viemClient?: any);
     getJwt(): string;
-    setViemClient(client: WalletClient): void;
+    setViemClient(client: any): void;
     uploadFile(file: File, options?: {
         progressCallback?: (percent: number) => void;
     }): Promise<any>;
@@ -253,7 +251,6 @@ declare class Origin {
     getData(tokenId: bigint): Promise<any>;
     /**
      * Get royalty information for a wallet address, including the royalty vault address and its balance.
-     * @param {Address} [token] - Optional token address to check royalties for. If not provided, checks for native token.
      * @param {Address} [owner] - Optional wallet address to check royalties for. If not provided, uses the connected wallet.
      * @returns {Promise<RoyaltyInfo>} A promise that resolves with the royalty vault address and balance information.
      * @throws {Error} Throws an error if no wallet is connected and no owner address is provided.

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, erc20Abi, getAbiItem, zeroAddress, formatEther, formatUnits, checksumAddress } from 'viem';
+import { custom, createWalletClient, createPublicClient, http, erc20Abi, getAbiItem, encodeFunctionData, zeroAddress, formatEther, formatUnits, checksumAddress } from 'viem';
 import { toAccount } from 'viem/accounts';
 import { createSiweMessage } from 'viem/siwe';
 import axios from 'axios';
@@ -128,20 +128,20 @@ const mainnet = {
 // @ts-ignore
 let client = null;
 let publicClient = null;
-let currentChain = null;
-const getClient = (provider, name = "window.ethereum", chain, address) => {
-    var _a, _b;
+const getClient = (provider, name = "window.ethereum", 
+// chain: "mainnet" | "testnet" = "testnet",
+chain, address) => {
+    var _a;
     if (!provider && !client) {
         console.warn("Provider is required to create a client.");
         return null;
     }
-    const selectedChain = chain || testnet;
     if (!client ||
         (client.transport.name !== name && provider) ||
-        (address !== ((_a = client.account) === null || _a === void 0 ? void 0 : _a.address) && provider) ||
-        (currentChain === null || currentChain === void 0 ? void 0 : currentChain.id) !== selectedChain.id) {
+        (address !== ((_a = client.account) === null || _a === void 0 ? void 0 : _a.address) && provider)) {
         const obj = {
-            chain: selectedChain,
+            // chain: chain === "mainnet" ? mainnet : testnet,
+            chain: chain || testnet,
             transport: custom(provider, {
                 name: name,
             }),
@@ -150,28 +150,18 @@ const getClient = (provider, name = "window.ethereum", chain, address) => {
             obj.account = toAccount(address);
         }
         client = createWalletClient(obj);
-        currentChain = selectedChain;
-        if (publicClient && ((_b = publicClient.chain) === null || _b === void 0 ? void 0 : _b.id) !== selectedChain.id) {
-            publicClient = null;
-        }
     }
     return client;
 };
-const getPublicClient = (chain) => {
-    var _a;
-    const selectedChain = currentChain || testnet;
-    if (!publicClient || ((_a = publicClient.chain) === null || _a === void 0 ? void 0 : _a.id) !== selectedChain.id) {
+const getPublicClient = () => {
+    if (!publicClient) {
         publicClient = createPublicClient({
-            chain: selectedChain,
+            chain: testnet,
             transport: http(),
         });
     }
     return publicClient;
 };
-const setChain = (chain) => {
-    currentChain = chain;
-    publicClient = null; // reset public client to be recreated with new chain
-};
 
 var ipnftMainnetAbi = [
 	{
@@ -2736,16 +2726,10 @@ function finalizeDelete(tokenId) {
 /**
  * Calls the getOrCreateRoyaltyVault method on the IPNFT contract.
  * @param tokenOwner The address of the token owner for whom to get or create the royalty vault.
- * @param simulateOnly If true, simulates the transaction without executing it.
  * @returns The address of the royalty vault associated with the specified token owner.
  */
-function getOrCreateRoyaltyVault(tokenOwner_1) {
-    return __awaiter(this, arguments, void 0, function* (tokenOwner, simulateOnly = false) {
-        const royaltyVaultTx = yield this.callContractMethod(this.environment.DATANFT_CONTRACT_ADDRESS, this.environment.IPNFT_ABI, "getOrCreateRoyaltyVault", [tokenOwner], { waitForReceipt: true, simulate: simulateOnly });
-        return simulateOnly
-            ? royaltyVaultTx
-            : royaltyVaultTx.simulatedResult;
-    });
+function getOrCreateRoyaltyVault(tokenOwner) {
+    return this.callContractMethod(this.environment.DATANFT_CONTRACT_ADDRESS, this.environment.IPNFT_ABI, "getOrCreateRoyaltyVault", [tokenOwner]);
 }
 
 /**
@@ -2976,15 +2960,14 @@ class Origin {
                 !uri) {
                 throw new Error("Failed to register IpNFT: Missing required fields in registration response.");
             }
-            const accounts = (yield this.viemClient.request({
+            const [account] = yield this.viemClient.request({
                 method: "eth_requestAccounts",
                 params: [],
-            }));
-            const account = accounts[0];
+            });
             const mintResult = yield this.mintWithSignature(account, tokenId, parents || [], creatorContentHash, uri, license, deadline, signature);
-            if (["0x1", "success"].indexOf(mintResult.receipt.status) === -1) {
+            if (mintResult.status !== "0x1") {
                 console.error("Minting failed:", mintResult);
-                throw new Error(`Minting failed with status: ${mintResult.receipt.status}`);
+                throw new Error(`Minting failed with status: ${mintResult.status}`);
             }
             return tokenId.toString();
         });
@@ -3004,13 +2987,12 @@ class Origin {
                 !uri) {
                 throw new Error("Failed to register Social IpNFT: Missing required fields in registration response.");
             }
-            const accounts = (yield this.viemClient.request({
+            const [account] = yield this.viemClient.request({
                 method: "eth_requestAccounts",
                 params: [],
-            }));
-            const account = accounts[0];
+            });
             const mintResult = yield this.mintWithSignature(account, tokenId, [], creatorContentHash, uri, license, deadline, signature);
-            if (["0x1", "success"].indexOf(mintResult.status) === -1) {
+            if (mintResult.status !== "0x1") {
                 throw new Error(`Minting Social IpNFT failed with status: ${mintResult.status}`);
             }
             return tokenId.toString();
@@ -3099,6 +3081,9 @@ class Origin {
                 "stateMutability" in abiItem &&
                 (abiItem.stateMutability === "view" ||
                     abiItem.stateMutability === "pure");
+            if (!isView && !this.viemClient) {
+                throw new Error("WalletClient not connected.");
+            }
             if (isView) {
                 const publicClient = getPublicClient();
                 const result = (yield publicClient.readContract({
@@ -3109,41 +3094,38 @@ class Origin {
                 })) || null;
                 return result;
             }
-            if (!this.viemClient) {
-                throw new Error("WalletClient not connected.");
-            }
-            const [account] = (yield this.viemClient.request({
-                method: "eth_requestAccounts",
-                params: [],
-            }));
-            yield __classPrivateFieldGet(this, _Origin_instances, "m", _Origin_ensureChainId).call(this, this.environment.CHAIN);
-            const publicClient = getPublicClient();
-            // simulate
-            const { result: simulatedResult, request } = yield publicClient.simulateContract({
-                account,
-                address: contractAddress,
-                abi,
-                functionName: methodName,
-                args: params,
-                value: options.value,
-            });
-            if (options.simulate) {
-                return simulatedResult;
-            }
-            try {
-                const txHash = yield this.viemClient.writeContract(request);
-                if (typeof txHash !== "string") {
-                    throw new Error("Transaction failed to send.");
+            else {
+                const [account] = yield this.viemClient.request({
+                    method: "eth_requestAccounts",
+                    params: [],
+                });
+                const data = encodeFunctionData({
+                    abi,
+                    functionName: methodName,
+                    args: params,
+                });
+                yield __classPrivateFieldGet(this, _Origin_instances, "m", _Origin_ensureChainId).call(this, this.environment.CHAIN);
+                try {
+                    const txHash = yield this.viemClient.sendTransaction({
+                        to: contractAddress,
+                        data,
+                        account,
+                        value: options.value,
+                        gas: options.gas,
+                    });
+                    if (typeof txHash !== "string") {
+                        throw new Error("Transaction failed to send.");
+                    }
+                    if (!options.waitForReceipt) {
+                        return txHash;
+                    }
+                    const receipt = yield __classPrivateFieldGet(this, _Origin_instances, "m", _Origin_waitForTxReceipt).call(this, txHash);
+                    return receipt;
                 }
-                if (!options.waitForReceipt) {
-                    return { txHash, simulatedResult };
+                catch (error) {
+                    console.error("Transaction failed:", error);
+                    throw new Error("Transaction failed: " + error);
                 }
-                const receipt = yield __classPrivateFieldGet(this, _Origin_instances, "m", _Origin_waitForTxReceipt).call(this, txHash);
-                return { txHash, receipt, simulatedResult };
-            }
-            catch (error) {
-                console.error("Transaction failed:", error);
-                throw new Error("Transaction failed: " + error);
             }
         });
     }
@@ -3166,11 +3148,10 @@ class Origin {
                 duration === undefined) {
                 throw new Error("Terms missing price, paymentToken, or duration");
             }
-            const accounts = (yield this.viemClient.request({
+            const [account] = yield this.viemClient.request({
                 method: "eth_requestAccounts",
                 params: [],
-            }));
-            const account = accounts[0];
+            });
             const totalCost = price;
             const isNative = paymentToken === zeroAddress;
             if (isNative) {
@@ -3205,7 +3186,6 @@ class Origin {
     }
     /**
      * Get royalty information for a wallet address, including the royalty vault address and its balance.
-     * @param {Address} [token] - Optional token address to check royalties for. If not provided, checks for native token.
      * @param {Address} [owner] - Optional wallet address to check royalties for. If not provided, uses the connected wallet.
      * @returns {Promise<RoyaltyInfo>} A promise that resolves with the royalty vault address and balance information.
      * @throws {Error} Throws an error if no wallet is connected and no owner address is provided.
@@ -3222,7 +3202,7 @@ class Origin {
         return __awaiter(this, void 0, void 0, function* () {
             const walletAddress = yield __classPrivateFieldGet(this, _Origin_instances, "m", _Origin_resolveWalletAddress).call(this, owner);
             try {
-                const royaltyVaultAddress = yield this.getOrCreateRoyaltyVault(walletAddress, true);
+                const royaltyVaultAddress = yield this.getOrCreateRoyaltyVault(walletAddress);
                 const publicClient = getPublicClient();
                 let balance;
                 let balanceFormatted;
@@ -3277,8 +3257,8 @@ class Origin {
     claimRoyalties(token, owner) {
         return __awaiter(this, void 0, void 0, function* () {
             const walletAddress = yield __classPrivateFieldGet(this, _Origin_instances, "m", _Origin_resolveWalletAddress).call(this, owner);
-            const royaltyVaultAddress = yield this.getOrCreateRoyaltyVault(walletAddress, true);
-            return this.callContractMethod(royaltyVaultAddress, this.environment.ROYALTY_VAULT_ABI, "claimRoyalty", [token !== null && token !== void 0 ? token : zeroAddress], { waitForReceipt: true });
+            const royaltyVaultAddress = yield this.getOrCreateRoyaltyVault(walletAddress);
+            return this.callContractMethod(royaltyVaultAddress, this.environment.ROYALTY_VAULT_ABI, "claimRoyalties", [token !== null && token !== void 0 ? token : zeroAddress], { waitForReceipt: true });
         });
     }
 }
@@ -3335,41 +3315,19 @@ _Origin_instances = new WeakSet(), _Origin_generateURL = function _Origin_genera
             throw error;
         }
     });
-}, _Origin_waitForTxReceipt = function _Origin_waitForTxReceipt(txHash_1) {
-    return __awaiter(this, arguments, void 0, function* (txHash, opts = {}) {
-        var _a, _b, _c;
-        const publicClient = getPublicClient();
-        let currentHash = txHash;
-        const confirmations = (_a = opts.confirmations) !== null && _a !== void 0 ? _a : 1;
-        const timeout = (_b = opts.timeoutMs) !== null && _b !== void 0 ? _b : 180000;
-        const pollingInterval = (_c = opts.pollingIntervalMs) !== null && _c !== void 0 ? _c : 1500;
-        try {
-            const receipt = yield publicClient.waitForTransactionReceipt({
-                hash: currentHash,
-                confirmations,
-                timeout,
-                pollingInterval,
-                onReplaced: (replacement) => {
-                    currentHash = replacement.transaction.hash;
-                },
+}, _Origin_waitForTxReceipt = function _Origin_waitForTxReceipt(txHash) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!this.viemClient)
+            throw new Error("WalletClient not connected.");
+        while (true) {
+            const receipt = yield this.viemClient.request({
+                method: "eth_getTransactionReceipt",
+                params: [txHash],
             });
-            return receipt;
-        }
-        catch (err) {
-            // fallback
-            const start = Date.now();
-            while (Date.now() - start < timeout) {
-                try {
-                    const receipt = yield publicClient.getTransactionReceipt({
-                        hash: currentHash,
-                    });
-                    if (receipt && receipt.blockNumber)
-                        return receipt;
-                }
-                catch (_d) { }
-                yield new Promise((r) => setTimeout(r, pollingInterval));
+            if (receipt && receipt.blockNumber) {
+                return receipt;
             }
-            throw err;
+            yield new Promise((res) => setTimeout(res, 1000));
         }
     });
 }, _Origin_ensureChainId = function _Origin_ensureChainId(chain) {
@@ -3377,15 +3335,14 @@ _Origin_instances = new WeakSet(), _Origin_generateURL = function _Origin_genera
         // return;
         if (!this.viemClient)
             throw new Error("WalletClient not connected.");
-        let currentChainId = (yield this.viemClient.request({
+        let currentChainId = yield this.viemClient.request({
             method: "eth_chainId",
             params: [],
-        }));
+        });
         if (typeof currentChainId === "string") {
             currentChainId = parseInt(currentChainId, 16);
         }
         if (currentChainId !== chain.id) {
-            setChain(chain);
             try {
                 yield this.viemClient.request({
                     method: "wallet_switchEthereumChain",

package/package.json

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