feat(app2): multisig progress

Author: Swepool

app2/src/lib/components/Transfer/index.svelte

@@ -21,7 +21,7 @@ import { wallets } from "$lib/stores/wallets.svelte.ts"
 import { beforeNavigate } from "$app/navigation"
 import { onMount } from "svelte"
 import { fly } from "svelte/transition"
-import type { TransferIntents } from "$lib/components/Transfer/state/filling/create-intents.ts"
+import type {TransferIntent} from "$lib/components/Transfer/state/filling/create-intents.ts"
 import { generateMultisigTx } from "$lib/utils/multisig.ts"
 
 let currentPage = $state(0)
@@ -62,7 +62,7 @@ let actionButtonText = $derived.by(() => {
 function handleActionButtonClick() {
   if (transfer.signingMode === "multi") {
     console.log("SIGNING MODE IS MULTISIG")
-    const b = Effect.runSync(generateMultisigTx(localIntents))
+    const b = Effect.runSync(generateMultisigTx(localIntent))
     console.log({ b })
     return
   }
@@ -99,7 +99,7 @@ function newTransfer() {
   wallets.clearInputAddress()
 }
 
-let localIntents = $state<TransferIntents>([])
+let localIntent = $state<TransferIntent>()
 
 $effect(() => {
   if (currentPage !== 0) return
@@ -111,7 +111,7 @@ $effect(() => {
 
   const machineEffect = Effect.gen(function* () {
     let currentState: CreateTransferState = CreateTransferState.Filling()
-    let intents: TransferIntents = []
+    let intent: TransferIntent
 
     while (true) {
       const result: StateResult = yield* createTransferState(currentState, transfer)
@@ -130,8 +130,8 @@ $effect(() => {
         continue
       }
 
-      if (Option.isSome(result.intents)) {
-        intents = result.intents.value
+      if (Option.isSome(result.intent)) {
+        intent = result.intent.value
       }
 
       break
@@ -160,32 +160,36 @@ $effect(() => {
       )
     }
 
-    for (const intent of intents) {
+    if (intent) {
+      localIntent = intent
+
       if (Option.isSome(intent.allowances)) {
-        const allowance = intent.allowances.value
-
-        steps.push(
-          TransferStep.ApprovalRequired({
-            token: allowance.token,
-            requiredAmount: allowance.requiredAmount,
-            currentAllowance: allowance.currentAllowance,
-            context: intent.context
-          })
-        )
+        const allowances = intent.allowances.value
+
+        for (let i = 0; i < allowances.length; i++) {
+          const allowance = allowances[i]
+          const context = intent.contexts[i]
+
+          steps.push(
+            TransferStep.ApprovalRequired({
+              token: allowance.token,
+              requiredAmount: allowance.requiredAmount,
+              currentAllowance: allowance.currentAllowance,
+              context
+            })
+          )
+        }
       }
 
-      localIntents = intents
-
-      if (Option.isSome(intent.instructions)) {
-        steps.push(
-          TransferStep.SubmitInstruction({
-            instruction: intent.instructions.value,
-            context: intent.context
-          }),
-          TransferStep.WaitForIndex({
-            context: intent.context
-          })
-        )
+      if (Option.isSome(intent.instruction)) {
+        const instruction = intent.instruction.value
+
+        for (const context of intent.contexts) {
+          steps.push(
+            TransferStep.SubmitInstruction({ instruction, context }),
+            TransferStep.WaitForIndex({ context })
+          )
+        }
       }
     }
 
@@ -307,7 +311,6 @@ const flyRight = (node: Element) =>
 
 </Card>
 
-
 {#if showDetails}
   {#if Option.isSome(transferErrors)}
     <strong>Error</strong>
@@ -326,3 +329,4 @@ const flyRight = (node: Element) =>
     </div>
   {/if}
 {/if}
+

app2/src/lib/components/Transfer/pages/FillingPage.svelte

@@ -6,12 +6,14 @@ import Button from "$lib/components/ui/Button.svelte"
 import AngleArrowIcon from "$lib/components/icons/AngleArrowIcon.svelte"
 import AddressComponent from "$lib/components/model/AddressComponent.svelte"
 import { transfer } from "$lib/components/Transfer/transfer.svelte.ts"
-import { Match, Option } from "effect"
+import { Match, Option, Schema } from "effect"
 import type { TransferFlowError } from "$lib/components/Transfer/state/errors.ts"
 import InsetError from "$lib/components/model/InsetError.svelte"
 import Input from "$lib/components/ui/Input.svelte"
 import { wallets } from "$lib/stores/wallets.svelte.ts"
 import { getDerivedReceiverSafe } from "$lib/services/shared"
+import {AddressCosmosCanonical, Bech32, Bech32FromAddressCanonicalBytesWithPrefix} from "@unionlabs/sdk/schema";
+import { bech32AddressToHex } from "@unionlabs/client"
 
 type Props = {
   onContinue: () => void
@@ -64,6 +66,11 @@ const uiStatus = $derived.by(() => {
 const isButtonEnabled = $derived.by(() => !loading)
 
 let sender = $state("")
+
+const cosmosAddressFromBech32 = (address: string) => {
+  const hexAddress = bech32AddressToHex({ address })
+  return AddressCosmosCanonical.make(hexAddress)
+}
 </script>
 
 <div class="min-w-full p-4 flex flex-col grow">
@@ -104,14 +111,9 @@ let sender = $state("")
         placeholder="0x123"
         spellcheck="false"
         oninput={(event) => {
-          getDerivedReceiverSafe(event.target.value).pipe(
-            Option.match({
-              onNone: () => {},
-              onSome: (address) => {
-                wallets.addInputAddress(address)
-              }
-            })
-          )
+          console.log(Schema.encodeUnknownSync(Bech32FromAddressCanonicalBytesWithPrefix(''))(event.target.value))
+          wallets.addInputAddress(bech32AddressToHex({address: event.target.value}))
+          console.log(wallets.inputAddress)
         }}
       />
     {/if}

app2/src/lib/components/Transfer/state/filling/check-allowance.ts

@@ -1,77 +1,90 @@
 import { Data, Effect, Match, Option } from "effect"
 import type { AddressCanonicalBytes, Chain } from "@unionlabs/sdk/schema"
 import { fromHex, http, isHex } from "viem"
-import { createViemPublicClient, readErc20Allowance, ViemPublicClient } from "@unionlabs/sdk/evm"
-import { CosmWasmClientSource, createCosmWasmClient } from "@unionlabs/sdk/cosmos"
+import {
+  createViemPublicClient,
+  readErc20Allowance,
+  ViemPublicClient
+} from "@unionlabs/sdk/evm"
+import {
+  CosmWasmClientSource,
+  createCosmWasmClient
+} from "@unionlabs/sdk/cosmos"
 import { isValidBech32ContractAddress } from "@unionlabs/client"
 import { cosmosSpenderAddresses } from "$lib/constants/spender-addresses.ts"
 import {
   AllowanceCheckError,
   CosmosQueryError,
   type TransferFlowError
 } from "$lib/components/Transfer/state/errors.ts"
-import type { TransferIntents } from "$lib/components/Transfer/state/filling/create-intents.ts"
-import { groupBy } from "effect/Array"
+import type { TransferIntent } from "$lib/components/Transfer/state/filling/create-intents.ts"
 
 export class ApprovalStep extends Data.TaggedClass("ApprovalStep")<{
   token: string
   requiredAmount: bigint
   currentAllowance: bigint
 }> {}
 
-function gatherNeededAmounts(intents: TransferIntents): Map<string, bigint> {
-  const neededMap = new Map<string, bigint>()
-  for (const { context } of intents) {
-    const current = neededMap.get(context.baseToken) ?? 0n
-    neededMap.set(context.baseToken, current + context.baseAmount)
+function gatherNeededAmounts(contexts: Array<{ baseToken: string; baseAmount: bigint }>) {
+  const map = new Map<string, bigint>()
+  for (const { baseToken, baseAmount } of contexts) {
+    const current = map.get(baseToken) ?? 0n
+    map.set(baseToken, current + baseAmount)
   }
-  return neededMap
+  return map
 }
 
 export function checkAllowances(
-  intents: TransferIntents
+  intent: TransferIntent
 ): Effect.Effect<Option.Option<Array<ApprovalStep>>, TransferFlowError> {
   return Effect.gen(function* () {
-    if (intents.length === 0) return Option.none()
-
-    const grouped = groupBy(intents, intent => intent.context.sourceChain.universal_chain_id)
+    if (intent.contexts.length === 0) return Option.none()
 
-    const allSteps: Array<ApprovalStep> = []
+    const [firstContext] = intent.contexts
+    const chain = firstContext.sourceChain
+    const sender = firstContext.sender
+    const spender = firstContext.ucs03address
 
-    for (const [, group] of Object.entries(grouped)) {
-      const chain = group[0].context.sourceChain
-      const sender = group[0].context.sender
-      const neededMap = gatherNeededAmounts(group)
-      const tokenAddresses = [...neededMap.keys()]
-
-      const allowancesOpt = yield* Match.value(chain.rpc_type).pipe(
-        Match.when("evm", () =>
-          handleEvmAllowances(tokenAddresses, sender, group[0].context.ucs03address, chain).pipe(
-            Effect.mapError(err => new AllowanceCheckError({ cause: err }))
-          )
-        ),
-        Match.when("cosmos", () =>
-          handleCosmosAllowances(tokenAddresses, sender, chain).pipe(
-            Effect.mapError(err => new AllowanceCheckError({ cause: err }))
-          )
-        ),
-        Match.orElse(() => Effect.succeed(Option.none()))
-      )
+    const neededMap = gatherNeededAmounts(
+      intent.contexts.map(({ baseToken, baseAmount }) => ({ baseToken, baseAmount }))
+    )
+    const tokenAddresses = [...neededMap.keys()]
 
-      const allowances = Option.getOrElse(allowancesOpt, () => [])
+    const allowancesOpt = yield* Match.value(chain.rpc_type).pipe(
+      Match.when("evm", () =>
+        handleEvmAllowances(tokenAddresses, sender, spender, chain).pipe(
+          Effect.mapError(err => new AllowanceCheckError({ cause: err }))
+        )
+      ),
+      Match.when("cosmos", () =>
+        handleCosmosAllowances(tokenAddresses, sender, chain).pipe(
+          Effect.mapError(err => new AllowanceCheckError({ cause: err }))
+        )
+      ),
+      Match.orElse(() => Effect.succeed(Option.none()))
+    )
 
-      for (const { token, allowance } of allowances) {
-        const requiredAmount = neededMap.get(token) ?? 0n
-        if (allowance < requiredAmount) {
-          allSteps.push(new ApprovalStep({ token, requiredAmount, currentAllowance: allowance }))
-        }
+    const allowances = Option.getOrElse(allowancesOpt, () => [])
+    const steps: Array<ApprovalStep> = []
+
+    for (const { token, allowance } of allowances) {
+      const requiredAmount = neededMap.get(token) ?? 0n
+      if (allowance < requiredAmount) {
+        steps.push(
+          new ApprovalStep({
+            token,
+            requiredAmount,
+            currentAllowance: allowance
+          })
+        )
       }
     }
 
-    return allSteps.length > 0 ? Option.some(allSteps) : Option.none()
+    return steps.length > 0 ? Option.some(steps) : Option.none()
   })
 }
 
+
 function handleEvmAllowances(
   tokenAddresses: Array<string>,
   sender: AddressCanonicalBytes,
@@ -80,9 +93,7 @@ function handleEvmAllowances(
 ): Effect.Effect<Option.Option<Array<{ token: string; allowance: bigint }>>, unknown> {
   return Effect.gen(function* () {
     const viemChainOpt = sourceChain.toViemChain()
-    if (Option.isNone(viemChainOpt)) {
-      return Option.none()
-    }
+    if (Option.isNone(viemChainOpt)) return Option.none()
 
     const publicClientSource = yield* createViemPublicClient({
       chain: viemChainOpt.value,
@@ -167,28 +178,20 @@ export function handleCosmosAllowances(
             }
           }
 
-          if (!bech32Address) {
-            return { token: tokenAddress, allowance: 0n }
-          }
+          if (!bech32Address) return { token: tokenAddress, allowance: 0n }
 
           const result = yield* Effect.tryPromise(() =>
             cosmwasmClient.queryContractSmart(bech32Address, {
               allowance: { owner, spender }
             })
-          ).pipe(Effect.mapError(err => new CosmosQueryError({ token: tokenAddress, cause: err })))
+          ).pipe(
+            Effect.mapError(err => new CosmosQueryError({ token: tokenAddress, cause: err }))
+          )
 
           const allowance = result.allowance ? BigInt(result.allowance) : 0n
           return { token: tokenAddress, allowance }
         }).pipe(Effect.provideService(CosmWasmClientSource, { client: cosmwasmClient }))
       )
-    ).pipe(
-      Effect.mapError(
-        err =>
-          new CosmosQueryError({
-            token: "N/A",
-            cause: err
-          })
-      )
     )
 
     return Option.some(checks)