Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions packages/swapper/src/swappers/RelaySwapper/utils/getTrade.ts
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,16 @@ export async function getTrade<T extends 'quote' | 'rate'>({

const { data: quote } = maybeQuote.unwrap()

const orderId = quote.protocol?.v2?.orderId
if (!orderId) {
return Err(
makeSwapErrorRight({
message: 'Relay quote missing protocol.v2.orderId',
code: TradeQuoteError.UnknownError,
}),
)
}

const { slippageTolerance, currencyOut, timeEstimate } = quote.details

const buyAmountAfterFeesCryptoBaseUnit = currencyOut.amount
Expand Down Expand Up @@ -504,7 +514,7 @@ export async function getTrade<T extends 'quote' | 'rate'>({
value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
chainSpecific: {
pubkey: xpub ?? getRelayDefaultUserAddress(sellAsset.chainId),
opReturnData: firstStep.requestId,
opReturnData: orderId,
},
sendMax: false,
}
Expand Down Expand Up @@ -599,9 +609,10 @@ export async function getTrade<T extends 'quote' | 'rate'>({
relayTransactionMetadata: {
from: sendAddress,
psbt: selectedItem.data.psbt,
opReturnData: quoteStep.requestId,
opReturnData: orderId,
to: relayer,
relayId: quote.steps[0].requestId,
orderId,
},
solanaTransactionMetadata: undefined,
}
Expand All @@ -620,6 +631,7 @@ export async function getTrade<T extends 'quote' | 'rate'>({
gasLimit: selectedItem.data?.gas,
chainId: Number(fromChainId(sellAsset.chainId).chainReference),
relayId: quote.steps[0].requestId,
orderId,
},
solanaTransactionMetadata: undefined,
}
Expand All @@ -634,6 +646,7 @@ export async function getTrade<T extends 'quote' | 'rate'>({
},
relayTransactionMetadata: {
relayId: quote.steps[0].requestId,
orderId,
},
}
}
Expand All @@ -644,6 +657,7 @@ export async function getTrade<T extends 'quote' | 'rate'>({
solanaTransactionMetadata: undefined,
relayTransactionMetadata: {
relayId: quote.steps[0].requestId,
orderId,
to: selectedItem.data?.parameter?.contract_address,
},
}
Expand Down
17 changes: 17 additions & 0 deletions packages/swapper/src/swappers/RelaySwapper/utils/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export type RelayTransactionMetadata = {
psbt?: string
opReturnData?: string
relayId: string
orderId: string
}

export type RelayStatus = {
Expand Down Expand Up @@ -146,10 +147,26 @@ export type RelayQuoteStep = {
items?: RelayQuoteItem[]
}

export type RelayProtocolV2 = {
orderId: string
orderData?: unknown
paymentDetails?: {
chainId: string
depository: string
currency: string
amount: string
}
}

export type RelayProtocol = {
v2?: RelayProtocolV2
}

export type RelayQuote = {
fees: RelayFees
details: QuoteDetails
steps: RelayQuoteStep[]
protocol?: RelayProtocol
}

export const isRelayQuoteUtxoItemData = (
Expand Down
Loading