Switch ratio calculations to closure %58

Author: phroi

src/App.tsx

@@ -36,6 +36,7 @@ export default function App({
     ckbBalance,
     ickbBalance,
     tipHeader,
+    calculateRatio,
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   } = useQuery(l1StateOptions(walletConfig, isFrozen)).data!;
 
@@ -77,7 +78,7 @@ export default function App({
           rawText: symbol + text,
           setRawText,
           amount,
-          tipHeader,
+          calculateRatio,
           isFrozen,
           ckbNative,
           ickbNative,

src/Form.tsx

@@ -1,18 +1,19 @@
 import {
-  calculateRatio,
   direction2Symbol,
+  previewConversion,
   reservedCKB,
   symbol2Direction,
   toText,
 } from "./utils.ts";
-import { CKB, max, min, type I8Header } from "@ickb/lumos-utils";
+import { CKB, max, min } from "@ickb/lumos-utils";
+import type { OrderRatio } from "@ickb/v1-core";
 import type { JSX } from "react";
 
 export default function Form({
   rawText,
   setRawText,
   amount,
-  tipHeader,
+  calculateRatio,
   isFrozen,
   ckbNative,
   ickbNative,
@@ -24,7 +25,7 @@ export default function Form({
   rawText: string;
   setRawText: (s: string) => void;
   amount: bigint;
-  tipHeader: I8Header;
+  calculateRatio: (isCkb2Udt: boolean, amount: bigint) => OrderRatio;
   isFrozen: boolean;
   ckbNative: bigint;
   ickbNative: bigint;
@@ -98,10 +99,10 @@ export default function Form({
           ⇌
         </button>
         <span className="text-center">
-          {approxConversion(isCkb2Udt, CKB, tipHeader) + " " + b.name}
+          {textConversionPreview(isCkb2Udt, CKB, calculateRatio)} {b.name}
         </span>
         <span className="col-span-3 text-center text-3xl text-amber-400">
-          ⏳{approxConversion(isCkb2Udt, amount, tipHeader)}
+          ⏳{textConversionPreview(isCkb2Udt, amount, calculateRatio)}
         </span>
         <span className="text-amber-400">{display(b.native, "✅")}</span>
         <span className="text-2xl text-amber-400">{b.name}</span>
@@ -127,17 +128,12 @@ function display(shannons: bigint, prefix: string): JSX.Element {
   );
 }
 
-function approxConversion(
+function textConversionPreview(
   isCkb2Udt: boolean,
   amount: bigint,
-  tipHeader: I8Header,
+  calculateRatio: (isCkb2Udt: boolean, amount: bigint) => OrderRatio,
 ): 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);
+  return toText(
+    previewConversion(isCkb2Udt, amount, calculateRatio(isCkb2Udt, amount)),
+  );
 }

src/queries.ts

@@ -20,12 +20,14 @@ import {
 } from "@ickb/lumos-utils";
 import {
   ickbDelta,
+  ickbExchangeRatio,
   ickbLogicScript,
   ickbPoolSifter,
   ickbSifter,
   limitOrderScript,
   orderSifter,
   ownedOwnerScript,
+  type OrderRatio,
 } from "@ickb/v1-core";
 import {
   txInfoPadding,
@@ -44,6 +46,7 @@ export interface L1StateType {
   ckbAvailable: bigint;
   ickbAvailable: bigint;
   tipHeader: Readonly<I8Header>;
+  calculateRatio: (isCkb2Udt: boolean, amount: bigint) => OrderRatio;
   txBuilder: (isCkb2Udt: boolean, amount: bigint) => TxInfo;
   hasMatchable: boolean;
 }
@@ -73,6 +76,7 @@ export function l1StateOptions(
       ckbBalance: 6n * CKB * CKB,
       ickbBalance: 3n * CKB * CKB,
       tipHeader: headerPlaceholder,
+      calculateRatio: () => ({ ckbMultiplier: 1n, udtMultiplier: 1n }),
       txBuilder: () => txInfoPadding,
       hasMatchable: false,
     },
@@ -217,6 +221,18 @@ async function getL1State(walletConfig: WalletConfig): Promise<L1StateType> {
   const calculateFee = (tx: TransactionSkeletonType): bigint =>
     calculateTxFee(txSize(tx) + txSizeOverhead, feeRate);
 
+  const currentRatio = ickbExchangeRatio(tipHeader);
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const calculateRatio = (isCkb2Udt: boolean, _amount: bigint): OrderRatio => {
+    return {
+      ...currentRatio,
+      udtMultiplier:
+        currentRatio.udtMultiplier +
+        //   Pay 0.1% fee to bot
+        (isCkb2Udt ? 1n : -1n) * (currentRatio.udtMultiplier / 1000n),
+    };
+  };
+
   const txBuilder = (isCkb2Udt: boolean, amount: bigint): TxInfo => {
     if (amount > 0n) {
       return convert(
@@ -225,6 +241,7 @@ async function getL1State(walletConfig: WalletConfig): Promise<L1StateType> {
         amount,
         ickbPool,
         tipHeader,
+        calculateRatio,
         calculateFee,
         walletConfig,
       );
@@ -248,6 +265,7 @@ async function getL1State(walletConfig: WalletConfig): Promise<L1StateType> {
     ckbAvailable,
     ickbAvailable,
     tipHeader,
+    calculateRatio,
     txBuilder,
     hasMatchable,
   };

src/transaction.ts

@@ -22,7 +22,6 @@ import {
   type OrderRatio,
 } from "@ickb/v1-core";
 import {
-  calculateRatio,
   maxEpoch,
   orderMaturityEstimate,
   txInfoPadding,
@@ -108,6 +107,7 @@ export function convert(
   amount: bigint,
   deposits: readonly ExtendedDeposit[],
   tipHeader: I8Header,
+  calculateRatio: (isCkb2Udt: boolean, amount: bigint) => OrderRatio,
   calculateFee: (tx: TransactionSkeletonType) => bigint,
   walletConfig: WalletConfig,
 ): Readonly<ConversionAttempt> {
@@ -132,8 +132,6 @@ export function convert(
     }
   }
   Object.freeze(ickbPool);
-
-  const ratio = calculateRatio(isCkb2Udt, tipHeader);
   const depositAmount = ckbSoftCapPerDeposit(tipHeader);
   const N = isCkb2Udt ? Number(amount / depositAmount) : ickbPool.length;
   const txCache = Array<TxInfo | undefined>(N);
@@ -146,10 +144,10 @@ export function convert(
         isCkb2Udt,
         amount,
         txInfo,
-        ratio,
         depositAmount,
         ickbPool,
         tipHeader,
+        calculateRatio,
         calculateFee,
         walletConfig,
       ));
@@ -164,10 +162,10 @@ function convertAttempt(
   isCkb2Udt: boolean,
   amount: bigint,
   txInfo: TxInfo,
-  ratio: OrderRatio,
   depositAmount: bigint,
   ickbPool: readonly MyExtendedDeposit[],
   tipHeader: I8Header,
+  calculateRatio: (isCkb2Udt: boolean, amount: bigint) => OrderRatio,
   calculateFee: (tx: TransactionSkeletonType) => bigint,
   walletConfig: WalletConfig,
 ): ConversionAttempt {
@@ -209,6 +207,7 @@ function convertAttempt(
 
   let fee = txInfo.fee;
   if (amount > 0n) {
+    const ratio = calculateRatio(isCkb2Udt, amount);
     tx = orderMint(
       tx,
       accountLocks[0],
@@ -218,7 +217,7 @@ function convertAttempt(
       isCkb2Udt ? ratio : undefined,
       isCkb2Udt ? undefined : ratio,
     );
-    // 0.1% fee to bot
+    // Take in account the fee paid to the bot
     fee += isCkb2Udt
       ? amount -
         ickb2Ckb(

src/utils.ts

@@ -13,7 +13,7 @@ import {
   type I8Script,
 } from "@ickb/lumos-utils";
 import { parseEpoch, type EpochSinceValue } from "@ckb-lumos/base/lib/since";
-import { ickbExchangeRatio, type OrderRatio } from "@ickb/v1-core";
+import type { OrderRatio } from "@ickb/v1-core";
 
 export interface RootConfig extends ChainConfig {
   queryClient: QueryClient;
@@ -134,16 +134,13 @@ 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(
+export function previewConversion(
   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),
-  };
+  amount: bigint,
+  ratio: OrderRatio,
+): bigint {
+  const { ckbMultiplier, udtMultiplier } = ratio;
+  return isCkb2Udt
+    ? (amount * ckbMultiplier) / udtMultiplier
+    : (amount * udtMultiplier) / ckbMultiplier;
 }