feat: add Stellar signatures support

src/core/formatters.ts

@@ -1,8 +1,9 @@
-import type { AuthMethod } from "../types/authHandle"
+import {
+  authIdentity,
+  prepareBroadcastRequest,
+} from "@defuse-protocol/internal-utils"
+import type { AuthMethod, walletMessage } from "@defuse-protocol/internal-utils"
 import type { IntentsUserId } from "../types/intentsUserId"
-import type { WalletSignatureResult } from "../types/walletMessage"
-import { authHandleToIntentsUserId } from "../utils/authIdentity"
-import { prepareSwapSignedData } from "../utils/prepareBroadcastRequest"
 
 export type { IntentsUserId }
 
@@ -23,10 +24,10 @@
  * @returns Intent data serialized in protocol wire format
  */
 export function formatSignedIntent(
-  signature: WalletSignatureResult,
+  signature: walletMessage.WalletSignatureResult,
   credentials: SignerCredentials
 ) {
-  return prepareSwapSignedData(signature, {
+  return prepareBroadcastRequest.prepareSwapSignedData(signature, {
     userAddress: credentials.credential,
     userChainType: credentials.credentialType,
   })
@@ -40,7 +41,7 @@
 export function formatUserIdentity(
   credentials: SignerCredentials
 ): IntentsUserId {
-  return authHandleToIntentsUserId(
+  return authIdentity.authHandleToIntentsUserId(
     credentials.credential,
     credentials.credentialType
   )

src/core/messages.test.ts

@@ -1,5 +1,5 @@
+import { authIdentity } from "@defuse-protocol/internal-utils"
 import { describe, expect, it } from "vitest"
-import { authHandleToIntentsUserId } from "../utils/authIdentity"
 import {
   createEmptyIntentMessage,
   createSwapIntentMessage,
@@ -8,7 +8,7 @@
 } from "./messages"
 
 const TEST_TIMESTAMP = 1704110400000 // 2024-01-01T12:00:00.000Z
-const TEST_USER = authHandleToIntentsUserId("user.near", "near")
+const TEST_USER = authIdentity.authHandleToIntentsUserId("user.near", "near")
 
 describe("createSwapIntentMessage()", () => {
   it("creates a valid swap intent message", () => {

src/core/messages.ts

@@ -1,13 +1,8 @@
-import type { IntentsUserId } from "../types/intentsUserId"
-import type { WalletMessage } from "../types/walletMessage"
 import {
-  type WithdrawParams,
-  makeEmptyMessage,
-  makeInnerSwapAndWithdrawMessage,
-  makeInnerSwapMessage,
-  makeInnerTransferMessage,
-  makeSwapMessage,
-} from "../utils/messageFactory"
+  messageFactory,
+  type walletMessage,
+} from "@defuse-protocol/internal-utils"
+import type { IntentsUserId } from "../types/intentsUserId"
 import type { SignerCredentials } from "./formatters"
 import { formatUserIdentity } from "./formatters"
 
@@ -37,7 +32,7 @@
   memo?: string
 }
 
-export type WithdrawIntentMessageConfig = WithdrawParams
+export type WithdrawIntentMessageConfig = messageFactory.WithdrawParams
 
 function resolveSignerId(
   signerId: IntentsUserId | SignerCredentials
@@ -54,16 +49,16 @@
 export function createSwapIntentMessage(
   swapConfig: [string, bigint][],
   options: IntentMessageConfig
-): WalletMessage {
-  const innerMessage = makeInnerSwapMessage({
+): walletMessage.WalletMessage {
+  const innerMessage = messageFactory.makeInnerSwapMessage({
     tokenDeltas: swapConfig,
     signerId: resolveSignerId(options.signerId),
     deadlineTimestamp: options.deadlineTimestamp ?? minutesFromNow(5),
     referral: options.referral,
     memo: options.memo,
   })
 
-  return makeSwapMessage({
+  return messageFactory.makeSwapMessage({
     innerMessage,
     nonce: options.nonce,
   })
@@ -78,16 +73,16 @@
 export function createWithdrawIntentMessage(
   withdrawConfig: WithdrawIntentMessageConfig,
   options: IntentMessageConfig
-): WalletMessage {
-  const innerMessage = makeInnerSwapAndWithdrawMessage({
+): walletMessage.WalletMessage {
+  const innerMessage = messageFactory.makeInnerSwapAndWithdrawMessage({
     tokenDeltas: [],
     storageTokenDeltas: [],
     withdrawParams: withdrawConfig,
     signerId: resolveSignerId(options.signerId),
     deadlineTimestamp: options.deadlineTimestamp ?? minutesFromNow(5),
   })
 
-  return makeSwapMessage({
+  return messageFactory.makeSwapMessage({
     innerMessage,
     nonce: options.nonce,
   })
@@ -100,8 +95,8 @@
  */
 export function createEmptyIntentMessage(
   options: IntentMessageConfig
-): WalletMessage {
-  return makeEmptyMessage({
+): walletMessage.WalletMessage {
+  return messageFactory.makeEmptyMessage({
     signerId: resolveSignerId(options.signerId),
     deadlineTimestamp: options.deadlineTimestamp ?? minutesFromNow(5),
     nonce: options.nonce,
@@ -121,16 +116,16 @@
 export function createTransferMessage(
   tokenDeltas: [string, bigint][],
   options: IntentMessageConfig & { receiverId: string }
-): WalletMessage {
-  const innerMessage = makeInnerTransferMessage({
+): walletMessage.WalletMessage {
+  const innerMessage = messageFactory.makeInnerTransferMessage({
     tokenDeltas,
     signerId: resolveSignerId(options.signerId),
     deadlineTimestamp: options.deadlineTimestamp ?? minutesFromNow(5),
     receiverId: options.receiverId,
     memo: options.memo,
   })
 
-  return makeSwapMessage({
+  return messageFactory.makeSwapMessage({
     innerMessage,
     nonce: options.nonce,
   })

src/features/1Click/components/SwapSubmitter.tsx

@@ -1,7 +1,7 @@
+import type { AuthMethod } from "@defuse-protocol/internal-utils"
 import { type ReactNode, createContext } from "react"
 import { nearClient } from "../../../constants/nearClient"
 import { logger } from "../../../logger"
-import type { AuthMethod } from "../../../types/authHandle"
 import { SwapUIMachineContext } from "./SwapUIMachineProvider"
 
 export const SwapSubmitterContext = createContext<{

src/features/1Click/components/SwapUIMachineFormSyncProvider.tsx

@@ -1,7 +1,7 @@
+import type { AuthMethod } from "@defuse-protocol/internal-utils"
 import { useSelector } from "@xstate/react"
 import { type PropsWithChildren, useEffect, useRef } from "react"
 import { useFormContext } from "react-hook-form"
-import type { AuthMethod } from "../../../types/authHandle"
 import type { SwapWidgetProps } from "../../../types/swap"
 import { usePublicKeyModalOpener } from "../../swap/hooks/usePublicKeyModalOpener"
 import type { SwapFormValues } from "./SwapForm"

src/features/1Click/components/SwapUIMachineProvider.tsx

@@ -1,3 +1,4 @@
+import type { walletMessage } from "@defuse-protocol/internal-utils"
 import { createActorContext } from "@xstate/react"
 import type { PropsWithChildren, ReactElement, ReactNode } from "react"
 import { useFormContext } from "react-hook-form"
@@ -10,10 +11,6 @@
   fromPromise,
 } from "xstate"
 import type { SwappableToken } from "../../../types/swap"
-import type {
-  WalletMessage,
-  WalletSignatureResult,
-} from "../../../types/walletMessage"
 import { computeTotalDeltaDifferentDecimals } from "../../../utils/tokenUtils"
 import { swapIntentMachine } from "../../machines/swapIntentMachine"
 import { swapUIMachine } from "../../machines/swapUIMachine1Click"
@@ -53,7 +50,9 @@
   initialTokenIn?: SwappableToken
   initialTokenOut?: SwappableToken
   tokenList: SwappableToken[]
-  signMessage: (params: WalletMessage) => Promise<WalletSignatureResult | null>
+  signMessage: (
+    params: walletMessage.WalletMessage
+  ) => Promise<walletMessage.WalletSignatureResult | null>
   referral?: string
 }
 

src/features/account/components/AccountWidget.tsx

@@ -1,8 +1,8 @@
+import { authIdentity } from "@defuse-protocol/internal-utils"
+import type { AuthMethod } from "@defuse-protocol/internal-utils"
 import { WidgetRoot } from "../../../components/WidgetRoot"
-import type { AuthMethod } from "../../../types/authHandle"
 import type { BaseTokenInfo, UnifiedTokenInfo } from "../../../types/base"
 import type { RenderHostAppLink } from "../../../types/hostAppLink"
-import { authHandleToIntentsUserId } from "../../../utils/authIdentity"
 import { useWatchHoldings } from "../hooks/useWatchHoldings"
 import { computeTotalUsdValue } from "../utils/holdingsUtils"
 import { HoldingsIsland } from "./HoldingsIsland"
@@ -25,15 +25,15 @@ export function AccountWidget({
 }: AccountWidgetProps) {
   const userId =
     userAddress != null && userChainType != null
-      ? authHandleToIntentsUserId(userAddress, userChainType)
+      ? authIdentity.authHandleToIntentsUserId(userAddress, userChainType)
       : null
 
   const holdings = useWatchHoldings({ userId, tokenList })
   const totalValueUsd = holdings ? computeTotalUsdValue(holdings) : undefined
 
   const internalUserAddress =
     userAddress != null && userChainType != null
-      ? authHandleToIntentsUserId(userAddress, userChainType)
+      ? authIdentity.authHandleToIntentsUserId(userAddress, userChainType)
       : null
 
   return (

src/features/deposit/components/DepositForm/index.tsx

@@ -1,4 +1,5 @@
 import type { BlockchainEnum } from "@defuse-protocol/internal-utils"
+import type { AuthMethod } from "@defuse-protocol/internal-utils"
 import { ExclamationTriangleIcon } from "@radix-ui/react-icons"
 import { Callout } from "@radix-ui/themes"
 import { useSelector } from "@xstate/react"
@@ -26,7 +27,6 @@ import { getPOABridgeInfo } from "../../../../features/machines/poaBridgeInfoAct
 import { useModalStore } from "../../../../providers/ModalStoreProvider"
 import { getAvailableDepositRoutes } from "../../../../services/depositService"
 import { ModalType } from "../../../../stores/modalStore"
-import type { AuthMethod } from "../../../../types/authHandle"
 import type {
   BaseTokenInfo,
   SupportedChainName,

src/features/deposit/components/DepositUIMachineFormSyncProvider.tsx

@@ -1,6 +1,6 @@
+import type { AuthMethod } from "@defuse-protocol/internal-utils"
 import { type PropsWithChildren, useEffect } from "react"
 import { useFormContext } from "react-hook-form"
-import type { AuthMethod } from "../../../types/authHandle"
 import { reverseAssetNetworkAdapter } from "../../../utils/adapters"
 import type { DepositFormValues } from "./DepositForm"
 import { DepositUIMachineContext } from "./DepositUIMachineProvider"

src/features/deposit/components/DepositUIMachineProvider.tsx

@@ -1,3 +1,4 @@
+import { authIdentity } from "@defuse-protocol/internal-utils"
 import { createActorContext } from "@xstate/react"
 import type { PropsWithChildren, ReactElement, ReactNode } from "react"
 import { useFormContext } from "react-hook-form"
@@ -31,7 +32,6 @@ import type { Transaction } from "../../../types/deposit"
 import type { SwappableToken } from "../../../types/swap"
 import { assetNetworkAdapter } from "../../../utils/adapters"
 import { assert } from "../../../utils/assert"
-import { authHandleToIntentsUserId } from "../../../utils/authIdentity"
 import { getEVMChainId } from "../../../utils/evmChainId"
 import { isFungibleToken, isNativeToken } from "../../../utils/token"
 import { depositGenerateAddressMachine } from "../../machines/depositGenerateAddressMachine"
@@ -94,7 +94,10 @@ export function DepositUIMachineProvider({
                 const { userAddress, blockchain, userChainType } = input
 
                 const generatedResult = await generateDepositAddress(
-                  authHandleToIntentsUserId(userAddress, userChainType),
+                  authIdentity.authHandleToIntentsUserId(
+                    userAddress,
+                    userChainType
+                  ),
                   assetNetworkAdapter[blockchain]
                 )
 

src/features/gift/actors/giftMakerRootMachine.ts

@@ -1,4 +1,5 @@
 import { errors, solverRelay } from "@defuse-protocol/internal-utils"
+import type { walletMessage } from "@defuse-protocol/internal-utils"
 import {
   type ActorRefFrom,
   type DoneActorEvent,
@@ -14,10 +15,6 @@ import type { SignerCredentials } from "../../../core/formatters"
 import { logger } from "../../../logger"
 import { emitEvent } from "../../../services/emitter"
 import type { BaseTokenInfo, UnifiedTokenInfo } from "../../../types/base"
-import type {
-  WalletMessage,
-  WalletSignatureResult,
-} from "../../../types/walletMessage"
 import { assert } from "../../../utils/assert"
 import {
   type Events as DepositedBalanceEvents,
@@ -93,8 +90,8 @@ export const giftMakerRootMachine = setup({
           type: "REQUEST_SIGN"
           signerCredentials: SignerCredentials
           signMessage: (
-            params: WalletMessage
-          ) => Promise<WalletSignatureResult | null>
+            params: walletMessage.WalletMessage
+          ) => Promise<walletMessage.WalletSignatureResult | null>
         }
       | {
           type: "COMPLETE_SIGN"

src/features/gift/actors/giftMakerSignActor.ts

@@ -1,6 +1,9 @@
+import {
+  messageFactory,
+  type walletMessage,
+} from "@defuse-protocol/internal-utils"
 import { base64 } from "@scure/base"
 import type { MultiPayload } from "src/types/defuse-contracts-types"
-
 import { type PromiseActorLogic, assertEvent, setup } from "xstate"
 import {
   type SignerCredentials,
@@ -15,12 +18,7 @@ import type {
   TokenValue,
   UnifiedTokenInfo,
 } from "../../../types/base"
-import type {
-  WalletMessage,
-  WalletSignatureResult,
-} from "../../../types/walletMessage"
 import { findError } from "../../../utils/errors"
-import { randomDefuseNonce } from "../../../utils/messageFactory"
 import {
   adjustDecimals,
   getAnyBaseTokenInfo,
@@ -60,7 +58,7 @@ export type GiftMakerSignActorOutput =
       value: {
         multiPayload: MultiPayload
         signerCredentials: SignerCredentials
-        signatureResult: WalletSignatureResult
+        signatureResult: walletMessage.WalletSignatureResult
         escrowCredentials: EscrowCredentials
         giftId: string
       }
@@ -69,7 +67,7 @@ export type GiftMakerSignActorOutput =
 export type GiftMakerSignActorContext = {
   parsed: GiftMakerSignActorInput["parsed"]
   signerCredentials: GiftMakerSignActorInput["signerCredentials"]
-  walletMessage: WalletMessage
+  walletMessage: walletMessage.WalletMessage
   escrowCredentials: EscrowCredentials
 }
 
@@ -185,7 +183,7 @@ export const giftMakerSignActor = setup({
                     value: {
                       ...event.output.value,
                       escrowCredentials: context.escrowCredentials,
-                      giftId: base64.encode(randomDefuseNonce()),
+                      giftId: base64.encode(messageFactory.randomDefuseNonce()),
                     },
                   }
                 }

src/features/gift/components/GiftHistoryWidget.tsx

@@ -1,9 +1,9 @@
+import { authIdentity } from "@defuse-protocol/internal-utils"
+import type { AuthMethod } from "@defuse-protocol/internal-utils"
 import { useMemo } from "react"
-import { authHandleToIntentsUserId } from "src/utils/authIdentity"
 import { WidgetRoot } from "../../../components/WidgetRoot"
 import type { SignerCredentials } from "../../../core/formatters"
 import { SwapWidgetProvider } from "../../../providers/SwapWidgetProvider"
-import type { AuthMethod } from "../../../types/authHandle"
 import type { BaseTokenInfo, UnifiedTokenInfo } from "../../../types/base"
 import { useGiftMakerHistory } from "../stores/giftMakerHistory"
 import type { GenerateLink } from "../types/sharedTypes"
@@ -35,7 +35,7 @@ export function GiftHistoryWidget({
     if (!signerCredentials) {
       return undefined
     }
-    const userId = authHandleToIntentsUserId(
+    const userId = authIdentity.authHandleToIntentsUserId(
       signerCredentials.credential,
       signerCredentials.credentialType
     )

src/features/gift/components/GiftMakerForm.tsx

@@ -1,3 +1,4 @@
+import type { AuthMethod } from "@defuse-protocol/internal-utils"
 import { useActorRef, useSelector } from "@xstate/react"
 import clsx from "clsx"
 import { useEffect, useMemo } from "react"
@@ -12,7 +13,6 @@ import { usePublicKeyModalOpener } from "../../../features/swap/hooks/usePublicK
 import { useTokensUsdPrices } from "../../../hooks/useTokensUsdPrices"
 import { useModalStore } from "../../../providers/ModalStoreProvider"
 import { ModalType } from "../../../stores/modalStore"
-import type { AuthMethod } from "../../../types/authHandle"
 import type { BaseTokenInfo, UnifiedTokenInfo } from "../../../types/base"
 import type { RenderHostAppLink } from "../../../types/hostAppLink"
 import type { SwappableToken } from "../../../types/swap"

src/features/gift/components/GiftTakerWidget.tsx

@@ -1,10 +1,10 @@
+import type { AuthMethod } from "@defuse-protocol/internal-utils"
 import { useActorRef, useSelector } from "@xstate/react"
 import { useCallback, useEffect } from "react"
 import type { ActorRefFrom } from "xstate"
 import { WidgetRoot } from "../../../components/WidgetRoot"
 import type { SignerCredentials } from "../../../core/formatters"
 import { SwapWidgetProvider } from "../../../providers/SwapWidgetProvider"
-import type { AuthMethod } from "../../../types/authHandle"
 import type { BaseTokenInfo, UnifiedTokenInfo } from "../../../types/base"
 import type { RenderHostAppLink } from "../../../types/hostAppLink"
 import { giftTakerRootMachine } from "../actors/giftTakerRootMachine"