@glowlabs-org/utils 0.2.23 → 0.2.25

package/dist/cjs/browser.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var regionRouter = require('./region-router-DZPbuGxv.js');
+var regionRouter = require('./region-router-C3X3im0d.js');
 require('ethers');
 require('viem');
 

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 regionRouter = require('./region-router-DZPbuGxv.js');
+var regionRouter = require('./region-router-C3X3im0d.js');
 
 const GENESIS_TIMESTAMP = 1700352000;
 
@@ -18694,7 +18694,7 @@ const NUMERIC_REGEX = /^(?:\d+\.?\d*|\.\d+)$/;
 
 const leafTypes = ["address", "uint256", "uint256"];
 function hashLeaf({ address, glowWeight, usdcWeight, }) {
-    const hash = ethers.ethers.utils.solidityKeccak256(leafTypes, [
+    const hash = ethers.solidityPackedKeccak256(leafTypes, [
         address,
         glowWeight,
         usdcWeight,
@@ -18789,14 +18789,14 @@ async function createWeeklyReportLegacy(args) {
         glowWeight: leaf.glowWeight,
         usdcWeight: leaf.usdgWeight,
     }));
-    const tree = new merkletreejs.MerkleTree(leaves, ethers.ethers.utils.keccak256, { sort: true });
+    const tree = new merkletreejs.MerkleTree(leaves, ethers.keccak256, { sort: true });
     const root = tree.getHexRoot();
-    const totalGlowWeightFinalizedLeavesSum = finalLeaves.reduce((acc, { glowWeight }) => acc.add(glowWeight), ethers.ethers.BigNumber.from(0));
-    const totalGCCWeightFinalizedLeavesSum = finalLeaves.reduce((acc, { usdgWeight }) => acc.add(usdgWeight), ethers.ethers.BigNumber.from(0));
-    if (totalGlowWeightFinalizedLeavesSum.toBigInt() > regionRouter.MAX_WEIGHT) {
+    const totalGlowWeightFinalizedLeavesSum = finalLeaves.reduce((acc, { glowWeight }) => acc + BigInt(glowWeight), 0n);
+    const totalGCCWeightFinalizedLeavesSum = finalLeaves.reduce((acc, { usdgWeight }) => acc + BigInt(usdgWeight), 0n);
+    if (totalGlowWeightFinalizedLeavesSum > regionRouter.MAX_WEIGHT) {
         throw new Error("Total glow weight is greater than max weight");
     }
-    if (totalGCCWeightFinalizedLeavesSum.toBigInt() > regionRouter.MAX_WEIGHT) {
+    if (totalGCCWeightFinalizedLeavesSum > regionRouter.MAX_WEIGHT) {
         throw new Error("Total gcc weight is greater than max weight");
     }
     const headlineStats = {
@@ -18827,21 +18827,21 @@ async function createWeeklyReportLegacy(args) {
             proof,
         };
     });
-    let forLoopedGlowWeightSum = ethers.ethers.BigNumber.from(0);
+    let forLoopedGlowWeightSum = 0n;
     for (const leafProof of farmsWithMerkleProofs) {
-        forLoopedGlowWeightSum = forLoopedGlowWeightSum.add(ethers.BigNumber.from(leafProof.glowWeight));
+        forLoopedGlowWeightSum += BigInt(leafProof.glowWeight);
     }
-    if (!forLoopedGlowWeightSum.eq(totalGlowWeightFinalizedLeavesSum)) {
+    if (forLoopedGlowWeightSum !== totalGlowWeightFinalizedLeavesSum) {
         console.error("Glow Weight Sum Mismatch:");
         console.error("Sum from loop:", forLoopedGlowWeightSum.toString());
         console.error("Sum from reduce:", totalGlowWeightFinalizedLeavesSum.toString());
         throw new Error("Glow weight sum is not equal");
     }
-    let forLoopedGCCWeightSum = ethers.ethers.BigNumber.from(0);
+    let forLoopedGCCWeightSum = 0n;
     for (const leafProof of farmsWithMerkleProofs) {
-        forLoopedGCCWeightSum = forLoopedGCCWeightSum.add(ethers.BigNumber.from(leafProof.usdgWeight));
+        forLoopedGCCWeightSum += BigInt(leafProof.usdgWeight);
     }
-    if (!forLoopedGCCWeightSum.eq(totalGCCWeightFinalizedLeavesSum)) {
+    if (forLoopedGCCWeightSum !== totalGCCWeightFinalizedLeavesSum) {
         console.error("USDG Weight Sum Mismatch:");
         console.error("Sum from loop:", forLoopedGCCWeightSum.toString());
         console.error("Sum from reduce:", totalGCCWeightFinalizedLeavesSum.toString());
@@ -19022,17 +19022,17 @@ async function createWeeklyReport({ week, gcaUrls, apiUrl, }) {
         usdcWeight: leaf.usdgWeight, // Note: Parameter name inconsistency (usdc vs usdg)
     }));
     // Build the Merkle tree.
-    const merkleTree = new merkletreejs.MerkleTree(hashedLeaves, ethers.ethers.utils.keccak256, {
+    const merkleTree = new merkletreejs.MerkleTree(hashedLeaves, ethers.keccak256, {
         sort: true, // Ensure consistent tree structure.
     });
     const merkleRoot = merkleTree.getHexRoot(); // Get the root hash.
     // Calculate the total weights across all finalized leaves.
-    const totalGlowWeight = finalizedLeaves.reduce((acc, { glowWeight }) => acc.add(glowWeight), ethers.ethers.BigNumber.from(0));
-    const totalUSDGWeight = finalizedLeaves.reduce((acc, { usdgWeight }) => acc.add(usdgWeight), ethers.ethers.BigNumber.from(0));
+    const totalGlowWeight = finalizedLeaves.reduce((acc, { glowWeight }) => acc + BigInt(glowWeight), 0n);
+    const totalUSDGWeight = finalizedLeaves.reduce((acc, { usdgWeight }) => acc + BigInt(usdgWeight), 0n);
     // Total Weight Overflow Checks: Ensure sums don't exceed maximum.
-    if (totalGlowWeight.toBigInt() > regionRouter.MAX_WEIGHT)
+    if (totalGlowWeight > regionRouter.MAX_WEIGHT)
         throw new Error("Total glow weight overflow");
-    if (totalUSDGWeight.toBigInt() > regionRouter.MAX_WEIGHT)
+    if (totalUSDGWeight > regionRouter.MAX_WEIGHT)
         throw new Error("Total USDG weight overflow");
     // Generate Merkle proofs for each leaf and verify them.
     const leavesWithProofs = finalizedLeaves.map((leaf) => {
@@ -19049,15 +19049,15 @@ async function createWeeklyReport({ week, gcaUrls, apiUrl, }) {
     });
     // --- Sanity Checks on Final Weights ---
     // Verify that summing weights from leavesWithProofs matches the earlier reduce calculation.
-    const glowSumProofLoop = leavesWithProofs.reduce((acc, l) => acc.add(l.glowWeight), ethers.ethers.BigNumber.from(0));
-    if (!glowSumProofLoop.eq(totalGlowWeight)) {
+    const glowSumProofLoop = leavesWithProofs.reduce((acc, l) => acc + BigInt(l.glowWeight), 0n);
+    if (glowSumProofLoop !== totalGlowWeight) {
         console.error("Glow Weight Sum Mismatch (Post-73):");
         console.error("Sum from loop:", glowSumProofLoop.toString());
         console.error("Sum from reduce:", totalGlowWeight.toString());
         throw new Error("Glow sum mismatch");
     }
-    const usdgSumProofLoop = leavesWithProofs.reduce((acc, l) => acc.add(l.usdgWeight), ethers.ethers.BigNumber.from(0));
-    if (!usdgSumProofLoop.eq(totalUSDGWeight)) {
+    const usdgSumProofLoop = leavesWithProofs.reduce((acc, l) => acc + BigInt(l.usdgWeight), 0n);
+    if (usdgSumProofLoop !== totalUSDGWeight) {
         console.error("USDG Weight Sum Mismatch (Post-73):");
         console.error("Sum from loop:", usdgSumProofLoop.toString());
         console.error("Sum from reduce:", totalUSDGWeight.toString());
@@ -19069,7 +19069,7 @@ async function createWeeklyReport({ week, gcaUrls, apiUrl, }) {
         return acc.plus(fromBigInt(adj, regionRouter.USDG_WEIGHT_DECIMAL_PRECISION));
     }, new Decimal(0));
     // Convert total USDG weight back to human-readable decimal for deviation check.
-    const totalUSDGWeightHuman = new Decimal(viem.formatUnits(BigInt(totalUSDGWeight.toString()), regionRouter.USDG_WEIGHT_DECIMAL_PRECISION));
+    const totalUSDGWeightHuman = new Decimal(viem.formatUnits(totalUSDGWeight, regionRouter.USDG_WEIGHT_DECIMAL_PRECISION));
     // Check deviation between total adjusted credits used and the final sum of USDG weights.
     if (greaterThanMaxDeviation(totalExpectedCredits.toNumber(), totalUSDGWeightHuman.toNumber(), 0.001 // 0.1% tolerance
     )) {
@@ -19080,7 +19080,7 @@ async function createWeeklyReport({ week, gcaUrls, apiUrl, }) {
         throw new Error("totalExpectedCredits vs USDG weight deviation >0.1% ");
     }
     // Convert total Glow weight back to human-readable decimal.
-    const totalGlowWeightHuman = new Decimal(viem.formatUnits(BigInt(totalGlowWeight.toString()), regionRouter.GLOW_WEIGHT_DECIMAL_PRECISION));
+    const totalGlowWeightHuman = new Decimal(viem.formatUnits(totalGlowWeight, regionRouter.GLOW_WEIGHT_DECIMAL_PRECISION));
     // Sum the original weekly protocol fee payments from farm data.
     const totalProtocolFeePayments = farms.reduce((acc, f) => acc + f.weeklyPayment, 0);
     // Check deviation between total glow weight and total protocol fees paid.
@@ -19098,7 +19098,7 @@ async function createWeeklyReport({ week, gcaUrls, apiUrl, }) {
         weekNumber: week,
         totalCreditsProduced: viem.formatUnits(totalCreditsProduced18dp, 18), // Original reported total
         totalCreditsProducedBN: totalCreditsProduced18dp.toString(),
-        totalGlowWeightInFinalized: totalGlowWeight.toString(), // Total weight as BigNumber string
+        totalGlowWeightInFinalized: totalGlowWeight.toString(), // Total weight as bigint string
         totalGlowWeightHuman: totalGlowWeightHuman.toString(), // Total weight as human-readable decimal
         totalUSDGWeightInFinalized: totalUSDGWeight.toString(),
         totalUSDGWeightHuman: totalUSDGWeightHuman.toString(),