fix(app2): allow no fee

ehegnes · ehegnes · commit 64d943d04294 · 2025-06-14T18:22:27.000-04:00
Signed-off-by: Eric Hegnes &lt;eric@hegnes.com&gt;
diff --git a/app2/src/lib/stores/fee.svelte.ts b/app2/src/lib/stores/fee.svelte.ts
@@ -166,14 +166,32 @@ const createFeeStore = () => {
   const baseFees: O.Option<BaseFees> = $derived(pipe(
     TransferData.channel,
     O.map(Struct.get("fees")),
-    O.map(Struct.omit("PACKET_SEND_LC_UPDATE_L2")),
     O.map((fees) => {
-      const withDefault = O.getOrElse<GasFee>(() => GasFee.make(BigDecimal.make(0n, 0)))<GasFee>
-      return Struct.evolve(fees, {
-        PACKET_RECV: withDefault,
-        PACKET_SEND_LC_UPDATE_L0: withDefault,
-        PACKET_SEND_LC_UPDATE_L1: withDefault,
-      })
+      // const withDefault = O.getOrElse<GasFee>(() => GasFee.make(BigDecimal.make(0n, 0)))<GasFee>
+      const withDefault = (x: O.Option<BigDecimal.BigDecimal>): GasFee => {
+        if (O.isSome(x)) {
+          console.log("IS SOME", JSON.stringify(x))
+          return GasFee.make(x.value)
+        } else {
+          console.log("IS NONE", JSON.stringify(x))
+          return GasFee.make(BigDecimal.make(0n, 0))
+        }
+      }
+      console.log("BEFORE EVOLUTION")
+      const result = {
+        PACKET_RECV: withDefault(fees.PACKET_RECV),
+        PACKET_SEND_LC_UPDATE_L0: withDefault(fees.PACKET_SEND_LC_UPDATE_L0),
+        PACKET_SEND_LC_UPDATE_L1: withDefault(fees.PACKET_SEND_LC_UPDATE_L1),
+      } as const
+      console.log("AFTER EVOLUTION")
+
+      return result
+
+      // return Struct.evolve(fees, {
+      //   PACKET_RECV: withDefault,
+      //   PACKET_SEND_LC_UPDATE_L0: withDefault,
+      //   PACKET_SEND_LC_UPDATE_L1: withDefault,
+      // })
     }),
   ))
 
@@ -618,36 +636,28 @@ const createFeeStore = () => {
   //   ucs03address: string
   // }
 
-  const feeIntent: E.Either<FeeIntent, string> = $derived(E.gen(function*() {
-    const _totalFee = yield* pipe(
-      totalFee,
-      E.fromOption(() => "No total fee"),
-    )
-    const sourceChain = yield* pipe(
-      TransferData.sourceChain,
-      E.fromOption(() => "No source chain"),
-    )
-    const gasDenom = yield* pipe(
-      R.get(GAS_DENOMS, sourceChain.universal_chain_id),
-      E.fromOption(() => `No gas denom for ${sourceChain.universal_chain_id}`),
-    )
+  const intent: O.Option<E.Either<FeeIntent, string>> = $derived(O.gen(function*() {
+    const _totalFee = yield* totalFee
+    const sourceChain = yield* TransferData.sourceChain
 
-    const baseToken = gasDenom.address
-    // TODO: get from more reliable source
-    const decimals = gasDenom.decimals
-    const baseAmount = BigDecimal.round(_totalFee, { scale: gasDenom.decimals })
-
-    return {
-      decimals,
-      baseToken,
-      quoteAmount: TokenRawAmount.make(0n),
-      baseAmount: TokenRawAmount.make(baseAmount.value),
-    } as const
+    return E.gen(function*() {
+      const { decimals, address: baseToken } = yield* pipe(
+        R.get(GAS_DENOMS, sourceChain.universal_chain_id),
+        E.fromOption(() => `No gas denom for ${sourceChain.universal_chain_id}`),
+      )
+      const baseAmount = BigDecimal.round(_totalFee, { scale: decimals })
+      return {
+        decimals,
+        baseToken,
+        quoteAmount: TokenRawAmount.make(0n),
+        baseAmount: TokenRawAmount.make(baseAmount.value),
+      } as const
+    })
   }))
 
   return {
-    get feeIntent() {
-      return feeIntent
+    get intent() {
+      return intent
     },
     get baseFees() {
       return baseFees
diff --git a/app2/src/lib/transfer/normal/index.svelte b/app2/src/lib/transfer/normal/index.svelte
@@ -134,12 +134,10 @@ $effect(() => {
     let context: TransferContext | null = null
 
     while (true) {
-      const feeIntent = Option.getRight(FeeStore.feeIntent)
-
       const result: StateResult | void = yield* createContextState(
         currentState,
         transferData,
-        feeIntent,
+        FeeStore.intent,
       )
 
       if (!result) {
diff --git a/app2/src/lib/transfer/normal/services/filling.ts b/app2/src/lib/transfer/normal/services/filling.ts
@@ -17,7 +17,7 @@ import {
   type TransferContext,
 } from "$lib/transfer/shared/services/filling/create-context.ts"
 import { createOrdersBatch } from "$lib/transfer/shared/services/filling/create-orders.ts"
-import { Data, Effect, Match, Option } from "effect"
+import { Data, Effect, Either as E, Match, Option } from "effect"
 import { pipe } from "effect/Function"
 
 export type StateResult = {
@@ -85,7 +85,7 @@ const complete = (msg: string, context: TransferContext): StateResult => ({
 export const createContextState = (
   cts: CreateContextState,
   transfer: TransferData,
-  fee: Option.Option<FeeIntent>,
+  fee: Option.Option<E.Either<FeeIntent, string>>,
 ) => {
   return CreateContextState.$match(cts, {
     Empty: () => Effect.void,
@@ -104,7 +104,7 @@ export const createContextState = (
         EmptyAmount: () => Effect.succeed(ok(Empty(), "Enter amount")),
         InvalidAmount: () => Effect.succeed(ok(Empty(), "Invalid amount")),
         ReceiverMissing: () => Effect.succeed(ok(Empty(), "Select receiver")),
-        NoFee: () => Effect.succeed(ok(Empty(), "No fee")),
+        NoFee: ({ message }) => Effect.succeed(ok(Empty(), message ?? "Loading fee...")),
         Ready: (args) => Effect.succeed(ok(Validation({ args }), "Validating...")),
       })
     },
diff --git a/app2/src/lib/transfer/shared/components/FeeDetails.svelte b/app2/src/lib/transfer/shared/components/FeeDetails.svelte
@@ -171,6 +171,7 @@ const feeConfig = O.none()
       </div>
 
       <!-- TODO: Receipt transparency -->
+      <!--
       <div class="border-t border-zinc-800 px-4 py-3">
         <div class="flex items-center justify-between text-xs mb-3">
           <span class="text-zinc-400 font-medium">Route</span>
diff --git a/app2/src/lib/transfer/shared/services/filling/check-filling.ts b/app2/src/lib/transfer/shared/services/filling/check-filling.ts
@@ -3,7 +3,7 @@ import { wallets } from "$lib/stores/wallets.svelte.ts"
 import type { TransferData } from "$lib/transfer/shared/data/transfer-data.svelte.ts"
 import { signingMode } from "$lib/transfer/signingMode.svelte.ts"
 import type { AddressCanonicalBytes, Chain, Channel, ChannelId } from "@unionlabs/sdk/schema"
-import { Data, Option } from "effect"
+import { Data, Either as E, Option } from "effect"
 
 export interface TransferArgs {
   sourceChain: Chain
@@ -34,15 +34,17 @@ export type FillingState = Data.TaggedEnum<{
   ReceiverMissing: {}
   NoRoute: {}
   NoContract: {}
-  NoFee: {}
+  NoFee: {
+    message?: string | undefined
+  }
   Ready: TransferArgs
 }>
 
 export const FillingState = Data.taggedEnum<FillingState>()
 
 export const getFillingState = (
   transferData: TransferData,
-  fee: Option.Option<FeeIntent>,
+  fee: Option.Option<E.Either<FeeIntent, string>>,
 ): FillingState => {
   if (!wallets.hasAnyWallet() && signingMode.mode === "single") {
     return FillingState.NoWallet()
@@ -90,12 +92,16 @@ export const getFillingState = (
         return FillingState.ReceiverMissing()
       }
 
-      if (
-        Option.isNone(fee)
-      ) {
-        return FillingState.NoFee()
+      if (Option.isNone(fee)) {
+        return FillingState.NoFee({})
       }
 
+      if (E.isLeft(fee.value)) {
+        return FillingState.NoFee({ message: fee.value.left })
+      }
+
+      const unwrappedFee = fee.value.right
+
       // TODO: if fee is Some<Either.Left<Error>> => error state
 
       const unwrapped = Option.all({
@@ -105,7 +111,6 @@ export const getFillingState = (
         parsedAmount: transferData.parsedAmount,
         baseToken: transferData.baseToken,
         ucs03address: transferData.ucs03address,
-        fee,
       })
 
       return Option.match(unwrapped, {
@@ -115,7 +120,7 @@ export const getFillingState = (
         },
 
         onSome: (
-          { destinationChain, channel, receiver, parsedAmount, baseToken, ucs03address, fee },
+          { destinationChain, channel, receiver, parsedAmount, baseToken, ucs03address },
         ) =>
           FillingState.Ready({
             sourceChain,
@@ -131,7 +136,7 @@ export const getFillingState = (
             sourceRpcType: sourceChain.rpc_type,
             destinationRpcType: destinationChain.rpc_type,
             sourceChannelId: channel.source_channel_id,
-            fee,
+            fee: unwrappedFee,
           }),
       })
     },
