Switch to 0.001% fee and add checks %124

Author: phroi

src/Form.tsx

@@ -1,6 +1,7 @@
 import {
-  calculateRatio,
+  calculateOrderRatio,
   direction2Symbol,
+  calculateOrderResult,
   reservedCKB,
   symbol2Direction,
   toText,
@@ -98,7 +99,7 @@ export default function Form({
           ⇌
         </button>
         <span className="text-center">
-          {approxConversion(isCkb2Udt, CKB, tipHeader) + " " + b.name}
+          {approxConversion(isCkb2Udt, CKB, tipHeader)} {b.name}
         </span>
         <span className="col-span-3 text-center text-3xl text-amber-400">
           ⏳{approxConversion(isCkb2Udt, amount, tipHeader)}
@@ -132,12 +133,12 @@ function approxConversion(
   amount: bigint,
   tipHeader: I8Header,
 ): string {
-  //Worst case scenario is a 0.1% fee for bot
-  const { ckbMultiplier, udtMultiplier } = calculateRatio(isCkb2Udt, tipHeader);
-
-  const convertedAmount = isCkb2Udt
-    ? (amount * ckbMultiplier) / udtMultiplier
-    : (amount * udtMultiplier) / ckbMultiplier;
-
-  return toText(convertedAmount);
+  //Worst case scenario is a 0.001% fee for bot
+  return toText(
+    calculateOrderResult(
+      isCkb2Udt,
+      amount,
+      calculateOrderRatio(isCkb2Udt, tipHeader),
+    ),
+  );
 }

src/transaction.ts

@@ -22,7 +22,8 @@ import {
   type OrderRatio,
 } from "@ickb/v1-core";
 import {
-  calculateRatio,
+  calculateOrderRatio,
+  calculateOrderResult,
   maxEpoch,
   orderMaturityEstimate,
   txInfoPadding,
@@ -133,7 +134,7 @@ export function convert(
   }
   Object.freeze(ickbPool);
 
-  const ratio = calculateRatio(isCkb2Udt, tipHeader);
+  const ratio = calculateOrderRatio(isCkb2Udt, tipHeader);
   const depositAmount = ckbSoftCapPerDeposit(tipHeader);
   const N = isCkb2Udt ? Number(amount / depositAmount) : ickbPool.length;
   const txCache = Array<TxInfo | undefined>(N);
@@ -207,7 +208,7 @@ function convertAttempt(
     }
   }
 
-  let fee = txInfo.fee;
+  let orderFee = 0n;
   if (amount > 0n) {
     tx = orderMint(
       tx,
@@ -218,27 +219,34 @@ function convertAttempt(
       isCkb2Udt ? ratio : undefined,
       isCkb2Udt ? undefined : ratio,
     );
-    // 0.1% fee to bot
-    fee += isCkb2Udt
-      ? amount -
-        ickb2Ckb(
-          (amount * ratio.ckbMultiplier) / ratio.udtMultiplier,
-          tipHeader,
-        )
-      : ickb2Ckb(amount, tipHeader) -
-        (amount * ratio.udtMultiplier) / ratio.ckbMultiplier;
+
+    const convertedAmount = calculateOrderResult(isCkb2Udt, amount, ratio);
+    orderFee += isCkb2Udt
+      ? amount - ickb2Ckb(convertedAmount, tipHeader)
+      : ickb2Ckb(amount, tipHeader) - convertedAmount;
 
     estimatedMaturities.push(
       orderMaturityEstimate(isCkb2Udt, amount, tipHeader),
     );
   }
 
   const estimatedMaturity = maxEpoch(estimatedMaturities);
-  return addChange(
-    { ...txInfo, tx, estimatedMaturity, fee },
+
+  txInfo = addChange(
+    { ...txInfo, tx, estimatedMaturity, fee: txInfo.fee + orderFee },
     calculateFee,
     walletConfig,
   );
+
+  // Check that order provides enough fee to the bot for being matched
+  if (!txInfo.error && 10n * (txInfo.fee - orderFee) > orderFee) {
+    if (isCkb2Udt) {
+      return { ...txInfo, error: "CKB amount too small" };
+    } else {
+      return { ...txInfo, error: "iCKB amount too small" };
+    }
+  }
+  return txInfo;
 }
 
 export function addChange(

src/utils.ts

@@ -134,16 +134,27 @@ export const txInfoPadding: TxInfo = Object.freeze({
 // reservedCKB are reserved for state rent in conversions
 export const reservedCKB = 1000n * CKB;
 
-// Fix up ratio to pay 0.1% fee to bot
-export function calculateRatio(
+// Calculate ratio in a way to pay 0.001% fee to bot
+export function calculateOrderRatio(
   isCkb2Udt: boolean,
   tipHeader: I8Header,
 ): OrderRatio {
   const { ckbMultiplier, udtMultiplier } = ickbExchangeRatio(tipHeader);
   return {
     ckbMultiplier,
-    //   Pay 0.1% fee to bot
     udtMultiplier:
-      udtMultiplier + (isCkb2Udt ? 1n : -1n) * (udtMultiplier / 1000n),
+      // Pay 0.001% fee to bot
+      udtMultiplier + (isCkb2Udt ? 1n : -1n) * (udtMultiplier / 100000n),
   };
 }
+
+export function calculateOrderResult(
+  isCkb2Udt: boolean,
+  amount: bigint,
+  ratio: OrderRatio,
+): bigint {
+  const { ckbMultiplier, udtMultiplier } = ratio;
+  return isCkb2Udt
+    ? (amount * ckbMultiplier) / udtMultiplier
+    : (amount * udtMultiplier) / ckbMultiplier;
+}