Skip to content

fix(solana): recover completed swaps from the closed user-lock path #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yasha-meursault wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

fix(solana): recover completed swaps from the closed user-lock path #187

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe51fb5
fix(solana): recover completed swaps from the closed user-lock path
yasha-meursault Aug 6, 2026
2608539
small fix
yasha-meursault Aug 6, 2026
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
33 changes: 28 additions & 5 deletions packages/blockchains/solana/src/client/public/getUserLockDetails.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export async function getUserLockDetails(

const accountInfo = await connection.getAccountInfo(userLockPda)
if (!accountInfo) {
return recoverClosedUserLock(connection, id, userLockPda, program)
return recoverClosedUserLock(connection, userLockPda, program, id, params.decimals, params.txId)
}
try {
const result = await (program.account as TypedProgramAccounts).userLock.fetch(userLockPda)
Expand All @@ -56,17 +56,26 @@ export async function getUserLockDetails(

// ── Private Helpers ─────────────────────────────────────────────────

async function recoverClosedUserLock(connection: Connection, id: string, pda: PublicKey, program: Program): Promise<UserLockDetails | null> {
async function recoverClosedUserLock(connection: Connection, pda: PublicKey, program: Program, id: string, decimals: number, txId?: string): Promise<UserLockDetails | null> {
const sigs = await connection.getSignaturesForAddress(pda, { limit: 1 }).catch(() => [])
if (!sigs.length) return null
const closedTx = await connection.getTransaction(sigs[0].signature, { commitment: 'confirmed', maxSupportedTransactionVersion: 0 })
for (const event of parseLogEvents(closedTx?.meta?.logMessages ?? [], program)) {
const name = event.name.toLowerCase()
if (name === 'userrefunded' || name === 'userredeemed') {
const { eventData, lockTerms } = txId
? await findUserDataFromLogs(connection, txId, id, program)
: { eventData: {}, lockTerms: undefined }

const amountInBaseUnits = lockTerms?.amountInBaseUnits

return {
hashlock: `0x${id.replace('0x', '')}`,
amount: 0, timelock: 0, secret: 0n,
amount: amountInBaseUnits ? Number(formatUnits(amountInBaseUnits, decimals)) : 0,
timelock: 0, secret: 0n,
sender: '', recipient: '', token: '',
...lockTerms,
...eventData,
status: name === 'userrefunded' ? LockStatus.Refunded : LockStatus.Redeemed,
blockTimestamp: closedTx?.blockTime ? closedTx.blockTime * 1000 : undefined,
} as UserLockDetails
Expand All @@ -93,8 +102,9 @@ async function findUserDataFromLogs(
txId: string,
id: string,
program: Program
): Promise<{ eventData: Partial<EventDerivedData>; blockTimestamp?: number }> {
): Promise<{ eventData: Partial<EventDerivedData>; lockTerms?: Partial<BaseLockDetails>; blockTimestamp?: number }> {
const eventData: Partial<EventDerivedData> = {}
let lockTerms: Partial<BaseLockDetails> | undefined
try {
let tx = await connection.getTransaction(txId, {
commitment: 'confirmed',
Expand Down Expand Up @@ -154,7 +164,20 @@ async function findUserDataFromLogs(
: decodeBytes(rewardRecipient)
}

return { eventData, blockTimestamp }
const payoutCurve = new PublicKey(data.payout_curve ?? data.payoutCurve).toBase58()
const refundTo = data.refund_to ?? data.refundTo

lockTerms = {
amountInBaseUnits: BigInt(data.amount.toString()),
timelock: Number(data.timelock),
sender: new PublicKey(data.sender).toBase58(),
recipient: new PublicKey(data.recipient).toBase58(),
token: new PublicKey(data.token_mint ?? data.tokenMint).toBase58(),
refundTo: refundTo ? new PublicKey(refundTo).toBase58() : undefined,
payoutCurve: payoutCurve === NATIVE_SOL_ADDRESS ? null : payoutCurve,
}

return { eventData, lockTerms, blockTimestamp }
}

return { eventData, blockTimestamp }
Expand Down