@glowlabs-org/utils 0.2.140 → 0.2.142

package/dist/cjs/index.js

@@ -15,7 +15,7 @@ var viem = require('viem');
 var merkletreejs = require('merkletreejs');
 var ethers = require('ethers');
 var Decimal = require('decimal.js');
-var farmsRouter = require('./farms-router-Darq9ZsF.js');
+var farmsRouter = require('./farms-router-CCva--xp.js');
 
 const GENESIS_TIMESTAMP = 1700352000;
 

package/dist/cjs/lib/types/index.d.ts

@@ -370,6 +370,7 @@ export interface GlwRegionRewardsResponse {
 export interface ControlWallet {
     address: string;
     controlBalance: string;
+    committedControl: string;
     stakedControl: string;
     createdAt: string;
 }
@@ -409,11 +410,11 @@ export interface WalletFarmInfo {
 export interface WalletDetails {
     wallet: string;
     controlBalance: string;
+    committedControl: string;
     stakedControl: string;
     createdAt: string;
     regions: WalletRegionStakeTotal[];
     ownedFarms: WalletFarmInfo[];
-    purchasedFarms: WalletFarmInfo[];
 }
 export interface EstimateRewardScoreParams {
     userId: string;

package/dist/cjs/utils/transaction-utils.d.ts

@@ -0,0 +1,23 @@
+import { type PublicClient } from "viem";
+import { type Signer } from "ethers";
+export declare function parseViemError(error: unknown): string;
+export declare function parseEthersError(error: unknown): string;
+export interface TransactionRetryOptions {
+    maxRetries?: number;
+    timeoutMs?: number;
+    enableLogging?: boolean;
+}
+/**
+ * Enhanced transaction receipt handler with retry logic for viem
+ * @param publicClient The viem public client
+ * @param hash The transaction hash
+ * @param options Retry configuration options
+ */
+export declare function waitForViemTransactionWithRetry(publicClient: PublicClient, hash: `0x${string}`, options?: TransactionRetryOptions): Promise<void>;
+/**
+ * Enhanced transaction receipt handler with retry logic for ethers.js
+ * @param signer The ethers signer
+ * @param txHash The transaction hash
+ * @param options Retry configuration options
+ */
+export declare function waitForEthersTransactionWithRetry(signer: Signer, txHash: string, options?: TransactionRetryOptions): Promise<void>;

package/dist/esm/browser.d.ts

@@ -13,3 +13,4 @@ export * from "./constants/addresses";
 export * from "./constants/weights";
 export * from "./constants/urls";
 export * from "./utils/stake-control";
+export * from "./utils/transaction-utils";

package/dist/esm/browser.js

@@ -1,5 +1,5 @@
-import { T as TRANSFER_TYPES } from './farms-router-B5g58fsT.js';
-export { C as ControlRouter, D as DECIMALS_BY_TOKEN, i as FORWARDER_ABI, F as FarmsRouter, d as ForwarderError, l as GCA_URLS, G as GLOW_WEIGHT_DECIMAL_PRECISION, H as HUB_URL, c as KICKSTARTER_STATUS, K as KickstarterRouter, M as MAX_WEIGHT, j as OFFCHAIN_FRACTIONS_ABI, O as OFF_CHAIN_PAYMENT_CURRENCIES, e as OffchainFractionsError, P as PAYMENT_CURRENCIES, b as REGIONS, R as RegionRouter, S as STAKING_DIRECTIONS, U as USDG_WEIGHT_DECIMAL_PRECISION, W as WalletsRouter, f as allRegions, h as countries, k as getAddresses, r as regionMetadata, g as usStates, u as useForwarder, a as useOffchainFractions } from './farms-router-B5g58fsT.js';
+import { T as TRANSFER_TYPES } from './farms-router-Cxbn5Hap.js';
+export { C as ControlRouter, D as DECIMALS_BY_TOKEN, i as FORWARDER_ABI, F as FarmsRouter, d as ForwarderError, l as GCA_URLS, G as GLOW_WEIGHT_DECIMAL_PRECISION, H as HUB_URL, c as KICKSTARTER_STATUS, K as KickstarterRouter, M as MAX_WEIGHT, j as OFFCHAIN_FRACTIONS_ABI, O as OFF_CHAIN_PAYMENT_CURRENCIES, e as OffchainFractionsError, P as PAYMENT_CURRENCIES, b as REGIONS, R as RegionRouter, S as STAKING_DIRECTIONS, U as USDG_WEIGHT_DECIMAL_PRECISION, W as WalletsRouter, f as allRegions, h as countries, k as getAddresses, m as parseEthersError, p as parseViemError, r as regionMetadata, g as usStates, u as useForwarder, a as useOffchainFractions, n as waitForEthersTransactionWithRetry, w as waitForViemTransactionWithRetry } from './farms-router-Cxbn5Hap.js';
 import { verifyTypedData, checksumAddress } from 'viem';
 import 'ethers';
 

package/dist/esm/{farms-router-B5g58fsT.js → farms-router-Cxbn5Hap.js}

@@ -301,15 +301,27 @@ const DECIMALS_BY_TOKEN = {
     GLW: 18,
 };
 
-var ForwarderError;
-(function (ForwarderError) {
-    ForwarderError["CONTRACT_NOT_AVAILABLE"] = "Contract not available";
-    ForwarderError["SIGNER_NOT_AVAILABLE"] = "Signer not available";
-    ForwarderError["UNKNOWN_ERROR"] = "Unknown error";
-    ForwarderError["INVALID_FORWARD_TYPE"] = "Invalid forward type";
-    ForwarderError["MISSING_REQUIRED_PARAMS"] = "Missing required parameters";
-})(ForwarderError || (ForwarderError = {}));
-// Utility to extract the most useful revert reason from an ethers error object
+// Error parsing utilities
+function parseViemError(error) {
+    if (!error)
+        return "Unknown error";
+    // Check if it's a viem BaseError
+    if (error instanceof Error) {
+        // For contract revert errors
+        if (error.cause?.reason) {
+            return error.cause.reason;
+        }
+        // For viem's shortMessage
+        if (error.shortMessage) {
+            return error.shortMessage;
+        }
+        // Fallback to regular message
+        if (error.message) {
+            return error.message;
+        }
+    }
+    return "Unknown error";
+}
 function parseEthersError(error) {
     if (!error)
         return "Unknown error";
@@ -334,8 +346,174 @@ function parseEthersError(error) {
         return possibleError.reason;
     if (possibleError?.message)
         return possibleError.message;
-    return ForwarderError.UNKNOWN_ERROR;
+    return "Unknown error";
+}
+const DEFAULT_OPTIONS = {
+    maxRetries: 3,
+    timeoutMs: 60000,
+    enableLogging: true,
+};
+/**
+ * Enhanced transaction receipt handler with retry logic for viem
+ * @param publicClient The viem public client
+ * @param hash The transaction hash
+ * @param options Retry configuration options
+ */
+async function waitForViemTransactionWithRetry(publicClient, hash, options = {}) {
+    const { maxRetries, timeoutMs, enableLogging } = {
+        ...DEFAULT_OPTIONS,
+        ...options,
+    };
+    let lastError = null;
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+        try {
+            // Wait for transaction receipt with timeout
+            const receipt = await publicClient.waitForTransactionReceipt({
+                hash,
+                timeout: timeoutMs,
+            });
+            // Check transaction status
+            if (receipt.status === "reverted") {
+                throw new Error(`Transaction ${hash} was reverted on-chain`);
+            }
+            if (enableLogging) {
+                console.log(`Transaction ${hash} confirmed successfully in block ${receipt.blockNumber}`);
+            }
+            return; // Success, exit the function
+        }
+        catch (error) {
+            lastError = error;
+            // Check if it's a timeout or not found error
+            const errorMessage = parseViemError(error);
+            const isRetryableError = errorMessage.includes("could not be found") ||
+                errorMessage.includes("timeout") ||
+                errorMessage.includes("timed out") ||
+                errorMessage.includes("receipt") ||
+                errorMessage.includes("not be processed");
+            if (!isRetryableError || attempt === maxRetries) {
+                // If it's not a retryable error or we've exhausted retries, throw
+                throw new Error(`Transaction failed after ${attempt} attempts: ${errorMessage}`);
+            }
+            // Wait before retrying (exponential backoff)
+            const delay = Math.min(2000 * Math.pow(2, attempt - 1), 10000);
+            if (enableLogging) {
+                console.warn(`Transaction receipt not found (attempt ${attempt}/${maxRetries}), retrying in ${delay}ms...`);
+            }
+            await new Promise((resolve) => setTimeout(resolve, delay));
+            // Check transaction status before retrying
+            try {
+                const transaction = await publicClient.getTransaction({ hash });
+                if (!transaction) {
+                    throw new Error("Transaction not found in mempool or blockchain");
+                }
+                if (enableLogging) {
+                    console.log(`Transaction ${hash} found in ${transaction.blockNumber ? "block" : "mempool"}, waiting for confirmation...`);
+                }
+            }
+            catch (txError) {
+                if (enableLogging) {
+                    console.warn(`Could not fetch transaction ${hash}: ${parseViemError(txError)}`);
+                }
+                // Continue with retry anyway in case it's just an RPC issue
+            }
+        }
+    }
+    // This should never be reached, but just in case
+    throw new Error(`Transaction failed after ${maxRetries} attempts: ${parseViemError(lastError)}`);
+}
+/**
+ * Enhanced transaction receipt handler with retry logic for ethers.js
+ * @param signer The ethers signer
+ * @param txHash The transaction hash
+ * @param options Retry configuration options
+ */
+async function waitForEthersTransactionWithRetry(signer, txHash, options = {}) {
+    const { maxRetries, timeoutMs, enableLogging } = {
+        ...DEFAULT_OPTIONS,
+        ...options,
+    };
+    let lastError = null;
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+        try {
+            // Wait for transaction receipt with timeout
+            const provider = signer.provider;
+            if (!provider) {
+                throw new Error("Provider not available");
+            }
+            // Create a timeout promise
+            const timeoutPromise = new Promise((_, reject) => {
+                setTimeout(() => reject(new Error("Transaction receipt timeout")), timeoutMs);
+            });
+            // Race between waiting for receipt and timeout
+            const receipt = await Promise.race([
+                provider.waitForTransaction(txHash, 1, timeoutMs),
+                timeoutPromise,
+            ]);
+            if (!receipt) {
+                throw new Error("Transaction receipt not found");
+            }
+            // Check transaction status (ethers.js uses status: 0 for failed, 1 for success)
+            if (receipt.status === 0) {
+                throw new Error(`Transaction ${txHash} was reverted on-chain`);
+            }
+            if (enableLogging) {
+                console.log(`Transaction ${txHash} confirmed successfully in block ${receipt.blockNumber}`);
+            }
+            return; // Success, exit the function
+        }
+        catch (error) {
+            lastError = error;
+            // Check if it's a timeout or not found error
+            const errorMessage = parseEthersError(error);
+            const isRetryableError = errorMessage.includes("could not be found") ||
+                errorMessage.includes("timeout") ||
+                errorMessage.includes("timed out") ||
+                errorMessage.includes("receipt") ||
+                errorMessage.includes("not be processed") ||
+                errorMessage.includes("Transaction receipt timeout");
+            if (!isRetryableError || attempt === maxRetries) {
+                // If it's not a retryable error or we've exhausted retries, throw
+                throw new Error(`Transaction failed after ${attempt} attempts: ${errorMessage}`);
+            }
+            // Wait before retrying (exponential backoff)
+            const delay = Math.min(2000 * Math.pow(2, attempt - 1), 10000);
+            if (enableLogging) {
+                console.warn(`Transaction receipt not found (attempt ${attempt}/${maxRetries}), retrying in ${delay}ms...`);
+            }
+            await new Promise((resolve) => setTimeout(resolve, delay));
+            // Check transaction status before retrying
+            try {
+                const provider = signer.provider;
+                if (provider) {
+                    const transaction = await provider.getTransaction(txHash);
+                    if (!transaction) {
+                        throw new Error("Transaction not found in mempool or blockchain");
+                    }
+                    if (enableLogging) {
+                        console.log(`Transaction ${txHash} found in ${transaction.blockNumber ? "block" : "mempool"}, waiting for confirmation...`);
+                    }
+                }
+            }
+            catch (txError) {
+                if (enableLogging) {
+                    console.warn(`Could not fetch transaction ${txHash}: ${parseEthersError(txError)}`);
+                }
+                // Continue with retry anyway in case it's just an RPC issue
+            }
+        }
+    }
+    // This should never be reached, but just in case
+    throw new Error(`Transaction failed after ${maxRetries} attempts: ${parseEthersError(lastError)}`);
 }
+
+var ForwarderError;
+(function (ForwarderError) {
+    ForwarderError["CONTRACT_NOT_AVAILABLE"] = "Contract not available";
+    ForwarderError["SIGNER_NOT_AVAILABLE"] = "Signer not available";
+    ForwarderError["UNKNOWN_ERROR"] = "Unknown error";
+    ForwarderError["INVALID_FORWARD_TYPE"] = "Invalid forward type";
+    ForwarderError["MISSING_REQUIRED_PARAMS"] = "Missing required parameters";
+})(ForwarderError || (ForwarderError = {}));
 // Type-guard style helper to ensure a signer exists throughout the rest of the function.
 function assertSigner(maybeSigner) {
     if (!maybeSigner) {
@@ -481,7 +659,7 @@ function useForwarder(signer, CHAIN_ID) {
             setIsProcessing(true);
             // Approve only the specific amount needed
             const approveTx = await tokenContract.approve(ADDRESSES.FORWARDER, amount);
-            await approveTx.wait();
+            await waitForEthersTransactionWithRetry(signer, approveTx.hash);
             return true;
         }
         catch (error) {
@@ -525,7 +703,7 @@ function useForwarder(signer, CHAIN_ID) {
             if (allowance < amount) {
                 try {
                     const approveTx = await tokenContract.approve(ADDRESSES.FORWARDER, MaxUint256);
-                    await approveTx.wait();
+                    await waitForEthersTransactionWithRetry(signer, approveTx.hash);
                 }
                 catch (approveError) {
                     throw new Error(parseEthersError(approveError) || "Token approval failed");
@@ -578,7 +756,7 @@ function useForwarder(signer, CHAIN_ID) {
                     ? ADDRESSES.AUDIT_FEE_WALLET
                     : ADDRESSES.FOUNDATION_WALLET, amount, sendToCounterfactualWallet, message);
             }
-            await tx.wait();
+            await waitForEthersTransactionWithRetry(signer, tx.hash);
             return tx.hash;
         }
         catch (txError) {
@@ -801,7 +979,7 @@ function useForwarder(signer, CHAIN_ID) {
             setIsProcessing(true);
             // Try to call mint function (common for test tokens)
             const tx = await usdcContract.mint(recipient, amount);
-            await tx.wait();
+            await waitForEthersTransactionWithRetry(signer, tx.hash);
             return tx.hash;
         }
         catch (error) {
@@ -1318,27 +1496,6 @@ var OffchainFractionsError;
     OffchainFractionsError["INSUFFICIENT_BALANCE"] = "Insufficient balance";
     OffchainFractionsError["INSUFFICIENT_ALLOWANCE"] = "Insufficient allowance";
 })(OffchainFractionsError || (OffchainFractionsError = {}));
-// Utility to extract the most useful revert reason from a viem error object
-function parseViemError(error) {
-    if (!error)
-        return "Unknown error";
-    // Check if it's a viem BaseError
-    if (error instanceof Error) {
-        // For contract revert errors
-        if (error.cause?.reason) {
-            return error.cause.reason;
-        }
-        // For viem's shortMessage
-        if (error.shortMessage) {
-            return error.shortMessage;
-        }
-        // Fallback to regular message
-        if (error.message) {
-            return error.message;
-        }
-    }
-    return OffchainFractionsError.UNKNOWN_ERROR;
-}
 // Type-guard style helper to ensure a wallet client exists throughout the rest of the function.
 function assertWalletClient(maybeWalletClient) {
     if (!maybeWalletClient) {
@@ -1420,9 +1577,7 @@ function useOffchainFractions(walletClient, publicClient, CHAIN_ID) {
                 chain: walletClient.chain,
                 account: walletClient.account,
             });
-            await publicClient.waitForTransactionReceipt({
-                hash,
-            });
+            await waitForViemTransactionWithRetry(publicClient, hash);
             return true;
         }
         catch (error) {
@@ -1494,9 +1649,7 @@ function useOffchainFractions(walletClient, publicClient, CHAIN_ID) {
                 chain: walletClient.chain,
                 account: walletClient.account,
             });
-            await publicClient.waitForTransactionReceipt({
-                hash,
-            });
+            await waitForViemTransactionWithRetry(publicClient, hash);
             return hash;
         }
         catch (error) {
@@ -1549,9 +1702,7 @@ function useOffchainFractions(walletClient, publicClient, CHAIN_ID) {
                     chain: walletClient.chain,
                     account: walletClient.account,
                 });
-                await publicClient.waitForTransactionReceipt({
-                    hash: approveHash,
-                });
+                await waitForViemTransactionWithRetry(publicClient, approveHash);
             }
             // Run a simulation first to surface any revert reason
             try {
@@ -1591,9 +1742,7 @@ function useOffchainFractions(walletClient, publicClient, CHAIN_ID) {
                 chain: walletClient.chain,
                 account: walletClient.account,
             });
-            await publicClient.waitForTransactionReceipt({
-                hash,
-            });
+            await waitForViemTransactionWithRetry(publicClient, hash);
             return hash;
         }
         catch (error) {
@@ -1671,9 +1820,7 @@ function useOffchainFractions(walletClient, publicClient, CHAIN_ID) {
                 chain: walletClient.chain,
                 account: walletClient.account,
             });
-            await publicClient.waitForTransactionReceipt({
-                hash,
-            });
+            await waitForViemTransactionWithRetry(publicClient, hash);
             return hash;
         }
         catch (error) {
@@ -1723,9 +1870,7 @@ function useOffchainFractions(walletClient, publicClient, CHAIN_ID) {
                 chain: walletClient.chain,
                 account: walletClient.account,
             });
-            await publicClient.waitForTransactionReceipt({
-                hash,
-            });
+            await waitForViemTransactionWithRetry(publicClient, hash);
             return hash;
         }
         catch (error) {
@@ -1891,9 +2036,7 @@ function useOffchainFractions(walletClient, publicClient, CHAIN_ID) {
                 chain: walletClient.chain,
                 account: walletClient.account,
             });
-            await publicClient.waitForTransactionReceipt({
-                hash,
-            });
+            await waitForViemTransactionWithRetry(publicClient, hash);
             return hash;
         }
         catch (error) {
@@ -1943,9 +2086,7 @@ function useOffchainFractions(walletClient, publicClient, CHAIN_ID) {
                 chain: walletClient.chain,
                 account: walletClient.account,
             });
-            await publicClient.waitForTransactionReceipt({
-                hash,
-            });
+            await waitForViemTransactionWithRetry(publicClient, hash);
             return hash;
         }
         catch (error) {
@@ -3694,5 +3835,5 @@ function FarmsRouter(baseUrl) {
     };
 }
 
-export { ControlRouter as C, DECIMALS_BY_TOKEN as D, FarmsRouter as F, GLOW_WEIGHT_DECIMAL_PRECISION as G, HUB_URL as H, KickstarterRouter as K, MAX_WEIGHT as M, OFF_CHAIN_PAYMENT_CURRENCIES as O, PAYMENT_CURRENCIES as P, RegionRouter as R, STAKING_DIRECTIONS as S, TRANSFER_TYPES as T, USDG_WEIGHT_DECIMAL_PRECISION as U, WalletsRouter as W, useOffchainFractions as a, REGIONS as b, KICKSTARTER_STATUS as c, ForwarderError as d, OffchainFractionsError as e, allRegions as f, usStates as g, countries as h, FORWARDER_ABI as i, OFFCHAIN_FRACTIONS_ABI as j, getAddresses as k, GCA_URLS as l, regionMetadata as r, useForwarder as u };
-//# sourceMappingURL=farms-router-B5g58fsT.js.map
+export { ControlRouter as C, DECIMALS_BY_TOKEN as D, FarmsRouter as F, GLOW_WEIGHT_DECIMAL_PRECISION as G, HUB_URL as H, KickstarterRouter as K, MAX_WEIGHT as M, OFF_CHAIN_PAYMENT_CURRENCIES as O, PAYMENT_CURRENCIES as P, RegionRouter as R, STAKING_DIRECTIONS as S, TRANSFER_TYPES as T, USDG_WEIGHT_DECIMAL_PRECISION as U, WalletsRouter as W, useOffchainFractions as a, REGIONS as b, KICKSTARTER_STATUS as c, ForwarderError as d, OffchainFractionsError as e, allRegions as f, usStates as g, countries as h, FORWARDER_ABI as i, OFFCHAIN_FRACTIONS_ABI as j, getAddresses as k, GCA_URLS as l, parseEthersError as m, waitForEthersTransactionWithRetry as n, parseViemError as p, regionMetadata as r, useForwarder as u, waitForViemTransactionWithRetry as w };
+//# sourceMappingURL=farms-router-Cxbn5Hap.js.map