fix(app): fix bbn 1 fee and refactor

Author: Swepool

app2/src/lib/transfer/shared/services/filling/create-context.ts

@@ -1,3 +1,4 @@
+import { uiStore } from "$lib/stores/ui.svelte.ts"
 import { GAS_DENOMS } from "@unionlabs/sdk/constants/gas-denoms.ts"
 import type {
   AddressCanonicalBytes,
@@ -50,167 +51,122 @@ export type TransferContext = {
 export const createContext = (args: TransferArgs): Option.Option<TransferContext> => {
   console.debug("[createContext] args:", args)
 
-  let baseAmount: TokenRawAmount
-  try {
-    baseAmount = BigInt(args.baseAmount) as TokenRawAmount
-  } catch (err) {
-    console.warn("[createContext] baseAmount parse failed", err)
-    return Option.none()
-  }
+  return parseBaseAmount(args.baseAmount).pipe(
+    Option.flatMap(baseAmount => {
+      const intents = createIntents(args, baseAmount)
+
+      return intents.length > 0
+        ? Option.some({
+          intents,
+          native: calculateNativeValue(intents, args),
+          allowances: Option.none(),
+          instruction: Option.none(),
+          message: Option.none(),
+        })
+        : Option.none()
+    }),
+  )
+}
+
+const createBaseIntent = (
+  args: TransferArgs,
+  baseAmount: TokenRawAmount,
+): Omit<Intent, "baseToken"> => ({
+  sender: args.sender,
+  receiver: args.receiver,
+  baseAmount,
+  quoteAmount: baseAmount,
+  decimals: args.decimals,
+  sourceChain: args.sourceChain,
+  sourceChainId: args.sourceChain.universal_chain_id,
+  sourceChannelId: args.channel.source_channel_id,
+  destinationChain: args.destinationChain,
+  channel: args.channel,
+  ucs03address: args.ucs03address,
+})
+
+const createIntents = (args: TransferArgs, baseAmount: TokenRawAmount): Intent[] => {
+  const shouldIncludeFees = shouldChargeFees(uiStore.edition, args.sourceChain)
+  const baseIntent = createBaseIntent(args, baseAmount)
 
   return Match.value(args.sourceChain.rpc_type).pipe(
     Match.when("evm", () => {
       const intent: Intent = {
-        sender: args.sender,
-        receiver: args.receiver,
+        ...baseIntent,
         baseToken: args.baseToken,
-        baseAmount,
-        quoteAmount: baseAmount,
-        decimals: args.decimals,
-        sourceChain: args.sourceChain,
-        sourceChainId: args.sourceChain.universal_chain_id,
-        sourceChannelId: args.channel.source_channel_id,
-        destinationChain: args.destinationChain,
-        channel: args.channel,
-        ucs03address: args.ucs03address,
       }
 
       const feeIntent: Intent = {
-        sender: args.sender,
-        receiver: args.receiver,
+        ...baseIntent,
         baseToken: args.fee.baseToken,
         baseAmount: args.fee.baseAmount,
         quoteAmount: args.fee.quoteAmount,
         decimals: args.fee.decimals,
-        sourceChain: args.sourceChain,
-        sourceChainId: args.sourceChain.universal_chain_id,
-        sourceChannelId: args.channel.source_channel_id,
-        destinationChain: args.destinationChain,
-        channel: args.channel,
-        ucs03address: args.ucs03address,
-      }
-
-      // Calculate native value for EVM
-      const calculateNativeValue = () => {
-        const chainGasDenom = GAS_DENOMS[args.sourceChain.universal_chain_id]
-        if (!chainGasDenom) {
-          return Option.none()
-        }
-
-        let totalAmount = 0n
-
-        // Check if intent uses native token
-        if (intent.baseToken === chainGasDenom.address) {
-          totalAmount += intent.baseAmount
-        }
-
-        // Check if fee intent uses native token
-        if (feeIntent.baseToken === chainGasDenom.address) {
-          totalAmount += feeIntent.baseAmount
-        }
-
-        if (totalAmount > 0n) {
-          return Option.some({
-            baseToken: args.fee.baseToken, // Always use fee baseToken
-            amount: totalAmount as TokenRawAmount,
-          })
-        }
-
-        return Option.none()
       }
 
-      return Option.some({
-        intents: [intent, feeIntent],
-        native: calculateNativeValue(),
-        allowances: Option.none(),
-        instruction: Option.none(),
-        message: Option.none(),
-      })
+      return shouldIncludeFees ? [intent, feeIntent] : [intent]
     }),
     Match.when("cosmos", () => {
-      const baseToken = isHex(args.baseToken) ? fromHex(args.baseToken, "string") : args.baseToken
-
       const intent: Intent = {
-        sender: args.sender,
-        // XXX: guarantee lowercase as part of schema transform
-        receiver: args.receiver.toLowerCase() as typeof args.receiver,
-        baseToken: baseToken,
-        baseAmount: baseAmount,
-        quoteAmount: baseAmount,
-        decimals: args.decimals,
-        sourceChain: args.sourceChain,
-        sourceChainId: args.sourceChain.universal_chain_id,
-        sourceChannelId: args.channel.source_channel_id,
-        destinationChain: args.destinationChain,
-        channel: args.channel,
-        ucs03address: args.ucs03address,
+        ...baseIntent,
+        baseToken: normalizeToken(args.baseToken, "cosmos"),
       }
 
       const feeIntent: Intent = {
-        sender: args.sender.toLowerCase() as typeof args.sender,
-        receiver: args.receiver.toLowerCase() as typeof args.receiver,
-        baseToken: isHex(args.fee.baseToken)
-          ? fromHex(args.fee.baseToken, "string")
-          : args.fee.baseToken,
+        ...baseIntent,
+        baseToken: normalizeToken(args.fee.baseToken, "cosmos"),
         baseAmount: args.fee.baseAmount,
         quoteAmount: args.fee.quoteAmount,
         decimals: args.fee.decimals,
-        sourceChain: args.sourceChain,
-        sourceChainId: args.sourceChain.universal_chain_id,
-        sourceChannelId: args.channel.source_channel_id,
-        destinationChain: args.destinationChain,
-        channel: args.channel,
-        ucs03address: args.ucs03address,
       }
 
-      // Calculate native value for Cosmos
-      const calculateNativeValue = () => {
-        const chainGasDenom = GAS_DENOMS[args.sourceChain.universal_chain_id]
-        if (!chainGasDenom) {
-          return Option.none()
-        }
-
-        let totalAmount = 0n
-
-        // Convert hex format to string for comparison
-        const nativeTokenString = fromHex(chainGasDenom.address, "string")
-
-        // Check if intent uses native token
-        if (intent.baseToken === nativeTokenString) {
-          totalAmount += intent.baseAmount
-        }
-
-        // Check if fee intent uses native token
-        if (feeIntent.baseToken === nativeTokenString) {
-          totalAmount += feeIntent.baseAmount
-        }
-
-        if (totalAmount > 0n) {
-          // For Cosmos, ensure fee baseToken is in string format (not hex)
-          const feeBaseToken = isHex(args.fee.baseToken)
-            ? fromHex(args.fee.baseToken, "string")
-            : args.fee.baseToken
-
-          return Option.some({
-            baseToken: feeBaseToken,
-            amount: totalAmount as TokenRawAmount,
-          })
-        }
-
-        return Option.none()
-      }
-
-      return Option.some({
-        intents: [intent, feeIntent],
-        native: calculateNativeValue(),
-        allowances: Option.none(),
-        instruction: Option.none(),
-        message: Option.none(),
-      })
+      return shouldIncludeFees ? [intent, feeIntent] : [intent]
     }),
-    Match.orElse(() => {
-      console.warn("[createContext] Unknown chain rpc_type", args.sourceChain.rpc_type)
-      return Option.none()
+    Match.orElse(() => []),
+  )
+}
+
+// Fee strategy: BTC edition only charges fees when going FROM Babylon to cosmos
+const shouldChargeFees = (edition: string, sourceChain: Chain): boolean => {
+  return Match.value(edition).pipe(
+    Match.when("btc", () => sourceChain.universal_chain_id === "babylon.bbn-1"),
+    Match.orElse(() => true),
+  )
+}
+
+const normalizeToken = (token: string | `0x${string}`, rpcType: string): string => {
+  return rpcType === "cosmos" && isHex(token) ? fromHex(token, "string") : token
+}
+
+const parseBaseAmount = (amount: string): Option.Option<TokenRawAmount> => {
+  return Option.fromNullable(amount)
+    .pipe(
+      Option.filter(str => str.trim() !== ""),
+      Option.filter(str => /^\d+$/.test(str.trim())),
+      Option.map(str => BigInt(str.trim()) as TokenRawAmount),
+    )
+}
+
+const calculateNativeValue = (
+  intents: Intent[],
+  args: TransferArgs,
+): Option.Option<{ baseToken: TokenRawDenom | string; amount: TokenRawAmount }> => {
+  return Option.fromNullable(GAS_DENOMS[args.sourceChain.universal_chain_id]).pipe(
+    Option.flatMap(chainGasDenom => {
+      const nativeToken = normalizeToken(chainGasDenom.address, args.sourceChain.rpc_type)
+      const nativeIntents = intents.filter(intent =>
+        normalizeToken(intent.baseToken, args.sourceChain.rpc_type) === nativeToken
+      )
+
+      const totalAmount = nativeIntents.reduce((sum, intent) => sum + intent.baseAmount, 0n)
+      const preferredBaseToken = nativeIntents.at(-1)?.baseToken || nativeToken
+
+      return totalAmount > 0n
+        ? Option.some({
+          baseToken: preferredBaseToken,
+          amount: totalAmount as TokenRawAmount,
+        })
+        : Option.none()
     }),
   )
 }