@campnetwork/origin 1.0.0-alpha.6 → 1.0.0-alpha.8

package/dist/react/index.esm.js

@@ -128,20 +128,20 @@ const mainnet = {
 // @ts-ignore
 let client = null;
 let publicClient = null;
-const getClient = (provider, name = "window.ethereum", 
-// chain: "mainnet" | "testnet" = "testnet",
-chain, address) => {
-    var _a;
+let currentChain = null;
+const getClient = (provider, name = "window.ethereum", chain, address) => {
+    var _a, _b;
     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)) {
+        (address !== ((_a = client.account) === null || _a === void 0 ? void 0 : _a.address) && provider) ||
+        (currentChain === null || currentChain === void 0 ? void 0 : currentChain.id) !== selectedChain.id) {
         const obj = {
-            // chain: chain === "mainnet" ? mainnet : testnet,
-            chain: chain || testnet,
+            chain: selectedChain,
             transport: custom(provider, {
                 name: name,
             }),
@@ -150,18 +150,28 @@ 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 = () => {
-    if (!publicClient) {
+const getPublicClient = (chain) => {
+    var _a;
+    const selectedChain = currentChain || testnet;
+    if (!publicClient || ((_a = publicClient.chain) === null || _a === void 0 ? void 0 : _a.id) !== selectedChain.id) {
         publicClient = createPublicClient({
-            chain: testnet,
+            chain: selectedChain,
             transport: http(),
         });
     }
     return publicClient;
 };
+const setChain = (chain) => {
+    currentChain = chain;
+    publicClient = null; // reset public client to be recreated with new chain
+};
 
 var ipnftMainnetAbi = [
 	{
@@ -2964,10 +2974,11 @@ class Origin {
                 !uri) {
                 throw new Error("Failed to register IpNFT: Missing required fields in registration response.");
             }
-            const [account] = yield this.viemClient.request({
+            const accounts = (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 (mintResult.status !== "0x1") {
                 console.error("Minting failed:", mintResult);
@@ -2991,10 +3002,11 @@ class Origin {
                 !uri) {
                 throw new Error("Failed to register Social IpNFT: Missing required fields in registration response.");
             }
-            const [account] = yield this.viemClient.request({
+            const accounts = (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 (mintResult.status !== "0x1") {
                 throw new Error(`Minting Social IpNFT failed with status: ${mintResult.status}`);
@@ -3085,9 +3097,6 @@ 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({
@@ -3098,40 +3107,41 @@ class Origin {
                 })) || null;
                 return result;
             }
-            else {
-                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.sendTransaction(request);
-                    if (typeof txHash !== "string") {
-                        throw new Error("Transaction failed to send.");
-                    }
-                    if (!options.waitForReceipt) {
-                        return { txHash, simulatedResult };
-                    }
-                    const receipt = yield __classPrivateFieldGet(this, _Origin_instances, "m", _Origin_waitForTxReceipt).call(this, txHash);
-                    return { txHash, receipt, simulatedResult };
+            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.");
                 }
-                catch (error) {
-                    console.error("Transaction failed:", error);
-                    throw new Error("Transaction failed: " + error);
+                if (!options.waitForReceipt) {
+                    return { txHash, simulatedResult };
                 }
+                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);
             }
         });
     }
@@ -3154,10 +3164,11 @@ class Origin {
                 duration === undefined) {
                 throw new Error("Terms missing price, paymentToken, or duration");
             }
-            const [account] = yield this.viemClient.request({
+            const accounts = (yield this.viemClient.request({
                 method: "eth_requestAccounts",
                 params: [],
-            });
+            }));
+            const account = accounts[0];
             const totalCost = price;
             const isNative = paymentToken === zeroAddress;
             if (isNative) {
@@ -3322,19 +3333,41 @@ _Origin_instances = new WeakSet(), _Origin_generateURL = function _Origin_genera
             throw error;
         }
     });
-}, _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],
+}, _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;
+                },
             });
-            if (receipt && receipt.blockNumber) {
-                return receipt;
+            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));
             }
-            yield new Promise((res) => setTimeout(res, 1000));
+            throw err;
         }
     });
 }, _Origin_ensureChainId = function _Origin_ensureChainId(chain) {
@@ -3342,14 +3375,15 @@ _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.6",
+  "version": "1.0.0-alpha.8",
   "main": "dist/core.cjs",
   "exports": {
     ".": {