@glowlabs-org/utils 0.2.172 → 0.2.174

package/dist/cjs/browser.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var calculateFarmEfficiency = require('./calculate-farm-efficiency-CIHgzMwj.js');
+var calculateFarmEfficiency = require('./calculate-farm-efficiency-CBI3L6Cz.js');
 require('decimal.js');
 var viem = require('viem');
 require('ethers');

package/dist/cjs/{calculate-farm-efficiency-CIHgzMwj.js → calculate-farm-efficiency-CBI3L6Cz.js}

@@ -443,12 +443,20 @@ async function waitForEthersTransactionWithRetry(signer, txHash, options = {}) {
         }
         catch (error) {
             const errorMessage = parseEthersError(error);
-            consecutiveErrors++;
-            if (consecutiveErrors >= maxRetries) {
-                throw new Error(`Transaction failed after ${consecutiveErrors} attempts: ${errorMessage}`);
-            }
-            if (enableLogging) {
-                console.warn(`Error fetching receipt (attempt ${consecutiveErrors}/${maxRetries}), retrying in ${pollIntervalMs}ms...`);
+            // Treat not found/receipt missing as retryable without counting towards errors
+            const isNotFound = errorMessage.toLowerCase().includes("not found") ||
+                errorMessage.toLowerCase().includes("could not be found") ||
+                errorMessage.toLowerCase().includes("receipt") ||
+                errorMessage.toLowerCase().includes("not confirmed") ||
+                errorMessage.toLowerCase().includes("transactionreceiptnotfound");
+            if (!isNotFound) {
+                consecutiveErrors++;
+                if (consecutiveErrors >= maxRetries) {
+                    throw new Error(`Transaction failed after ${consecutiveErrors} attempts: ${errorMessage}`);
+                }
+                if (enableLogging) {
+                    console.warn(`Error fetching receipt (attempt ${consecutiveErrors}/${maxRetries}), retrying in ${pollIntervalMs}ms...`);
+                }
             }
         }
         await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
@@ -534,7 +542,7 @@ function assertSigner(maybeSigner) {
         throw new Error(exports.ForwarderError.SIGNER_NOT_AVAILABLE);
     }
 }
-function useForwarder(signer, CHAIN_ID) {
+function useForwarder(signer, CHAIN_ID, publicClient) {
     // Use dynamic addresses based on chain configuration
     const ADDRESSES = getAddresses(CHAIN_ID);
     // Framework-agnostic processing flag
@@ -673,10 +681,18 @@ function useForwarder(signer, CHAIN_ID) {
             setIsProcessing(true);
             // Approve only the specific amount needed
             const approveTx = await tokenContract.approve(ADDRESSES.FORWARDER, amount);
-            await waitForEthersTransactionWithRetry(signer, approveTx.hash, {
-                timeoutMs: 30000,
-                pollIntervalMs: 2000,
-            });
+            if (publicClient) {
+                await waitForViemTransactionWithRetry(publicClient, approveTx.hash, {
+                    timeoutMs: 60000,
+                    pollIntervalMs: 2000,
+                });
+            }
+            else {
+                await waitForEthersTransactionWithRetry(signer, approveTx.hash, {
+                    timeoutMs: 60000,
+                    pollIntervalMs: 2000,
+                });
+            }
             return true;
         }
         catch (error) {
@@ -736,10 +752,18 @@ function useForwarder(signer, CHAIN_ID) {
             if (allowance < amount) {
                 try {
                     const approveTx = await tokenContract.approve(ADDRESSES.FORWARDER, ethers.MaxUint256);
-                    await waitForEthersTransactionWithRetry(signer, approveTx.hash, {
-                        timeoutMs: 30000,
-                        pollIntervalMs: 2000,
-                    });
+                    if (publicClient) {
+                        await waitForViemTransactionWithRetry(publicClient, approveTx.hash, {
+                            timeoutMs: 60000,
+                            pollIntervalMs: 2000,
+                        });
+                    }
+                    else {
+                        await waitForEthersTransactionWithRetry(signer, approveTx.hash, {
+                            timeoutMs: 60000,
+                            pollIntervalMs: 2000,
+                        });
+                    }
                 }
                 catch (approveError) {
                     sentryCaptureException(approveError, {
@@ -810,10 +834,18 @@ function useForwarder(signer, CHAIN_ID) {
                     ? ADDRESSES.AUDIT_FEE_WALLET
                     : ADDRESSES.FOUNDATION_WALLET, amount, sendToCounterfactualWallet, message);
             }
-            await waitForEthersTransactionWithRetry(signer, tx.hash, {
-                timeoutMs: 30000,
-                pollIntervalMs: 2000,
-            });
+            if (publicClient) {
+                await waitForViemTransactionWithRetry(publicClient, tx.hash, {
+                    timeoutMs: 60000,
+                    pollIntervalMs: 2000,
+                });
+            }
+            else {
+                await waitForEthersTransactionWithRetry(signer, tx.hash, {
+                    timeoutMs: 60000,
+                    pollIntervalMs: 2000,
+                });
+            }
             return tx.hash;
         }
         catch (txError) {
@@ -1048,10 +1080,18 @@ function useForwarder(signer, CHAIN_ID) {
             setIsProcessing(true);
             // Try to call mint function (common for test tokens)
             const tx = await usdcContract.mint(recipient, amount);
-            await waitForEthersTransactionWithRetry(signer, tx.hash, {
-                timeoutMs: 30000,
-                pollIntervalMs: 2000,
-            });
+            if (publicClient) {
+                await waitForViemTransactionWithRetry(publicClient, tx.hash, {
+                    timeoutMs: 60000,
+                    pollIntervalMs: 2000,
+                });
+            }
+            else {
+                await waitForEthersTransactionWithRetry(signer, tx.hash, {
+                    timeoutMs: 60000,
+                    pollIntervalMs: 2000,
+                });
+            }
             return tx.hash;
         }
         catch (error) {
@@ -5331,4 +5371,4 @@ exports.useOffchainFractions = useOffchainFractions;
 exports.useRewardsKernel = useRewardsKernel;
 exports.waitForEthersTransactionWithRetry = waitForEthersTransactionWithRetry;
 exports.waitForViemTransactionWithRetry = waitForViemTransactionWithRetry;
-//# sourceMappingURL=calculate-farm-efficiency-CIHgzMwj.js.map
+//# sourceMappingURL=calculate-farm-efficiency-CBI3L6Cz.js.map