feat: strengthen net payable amount logic

Author: Ang-dot

src/acpFare.ts

@@ -13,7 +13,18 @@ class Fare {
   constructor(public contractAddress: Address, public decimals: number) {}
 
   formatAmount(amount: number) {
-    return parseUnits(amount.toString(), this.decimals);
+    if (!Number.isFinite(amount) || amount < 0) {
+      throw new AcpError(
+        `Invalid amount: ${amount}. Amount must be a finite, non-negative number.`
+      );
+    }
+
+    const numStr = amount.toString();
+    const amountStr = numStr.includes('e')
+      ? amount.toFixed(this.decimals)
+      : numStr;
+
+    return parseUnits(amountStr, this.decimals);
   }
 
   static async fromContractAddress(

src/acpJob.ts

@@ -138,36 +138,39 @@ class AcpJob {
         ? this.baseFare.decimals
         : 18;
 
-    const formattedAmount = formatUnits(
-      payableMemo.payableDetails.amount,
-      decimals
-    );
+    const grossAmount = payableMemo.payableDetails.amount;
 
-    const payableAmount = parseFloat(formattedAmount);
+    let netAmount: bigint;
+    if (this.priceType === PriceType.PERCENTAGE) {
+      const feeBasisPoints = BigInt(Math.round(this.priceValue * 10000));
+      let feeAmount = (grossAmount * feeBasisPoints) / BigInt(10000);
 
-    if (!Number.isFinite(payableAmount)) {
-      throw new AcpError(
-        `Payable amount overflow: ${formattedAmount} exceeds safe number range`
-      );
+      if (feeBasisPoints > BigInt(0) && feeAmount === BigInt(0)) {
+        feeAmount = BigInt(1);
+      }
+
+      netAmount = grossAmount - feeAmount;
+    } else {
+      netAmount = grossAmount;
     }
 
-    if (payableAmount > Number.MAX_SAFE_INTEGER) {
+    const formattedAmount = formatUnits(netAmount, decimals);
+    const amountNumber = parseFloat(formattedAmount);
+
+    if (!Number.isFinite(amountNumber)) {
       throw new AcpError(
-        `Payable amount ${formattedAmount} exceeds MAX_SAFE_INTEGER (${Number.MAX_SAFE_INTEGER}). Precision may be lost.`
+        `Net payable amount overflow: ${formattedAmount} exceeds safe number range`
       );
     }
 
-    if (this.priceType === PriceType.PERCENTAGE) {
-      const netAmount = payableAmount * (1 - this.priceValue);
-      if (!Number.isFinite(netAmount)) {
-        throw new AcpError(
-          `Net payable amount calculation overflow for percentage pricing`
-        );
-      }
-      return netAmount;
+    if (amountNumber > Number.MAX_SAFE_INTEGER) {
+      throw new AcpError(
+        `Net payable amount ${formattedAmount} exceeds MAX_SAFE_INTEGER (${Number.MAX_SAFE_INTEGER}). Precision may be lost.`
+      );
     }
 
-    return payableAmount;
+    const factor = Math.pow(10, decimals);
+    return Math.floor(amountNumber * factor) / factor;
   }
 
   async createRequirement(content: string) {