Skip to content

feat(frontend): fix and harden order recovery from coordinator after reload #228

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
dykdee wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(frontend): fix and harden order recovery from coordinator after reload #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
166 changes: 166 additions & 0 deletions frontend/src/components/TransactionHistory.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
import { render, screen, waitFor } from '@testing-library/react';
import { beforeEach, afterEach, describe, expect, test, vi } from 'vitest';
import TransactionHistory from './TransactionHistory';

vi.mock('../config/networks', () => ({
isTestnet: () => true,
}));

vi.mock('../features/refund/RefundDialog', () => ({
default: () => null,
}));

const STORAGE_KEY = 'oversync_transactions_v2';

function coordinatorOrder(overrides: Partial<Record<string, any>> = {}) {
return {
id: 'order-recovered',
direction: 'eth_to_xlm',
status: 'src_locked',
hashlock: '0xhashlockrecovered',
src: {
chain: 'ethereum',
address: '0xEthAddress',
asset: 'ETH',
amount: '1000000000000000000',
safetyDeposit: '0',
orderId: '0xonchainorderid',
lockTx: '0xrecoveredlocktx',
lockBlock: 1,
timelock: 9999999999,
},
dst: {
chain: 'stellar',
address: 'GSTELLARADDRESS',
asset: 'XLM',
amount: '10000000',
orderId: null,
lockTx: null,
lockBlock: null,
timelock: null,
},
secret: { revealed: false, preimage: null, revealedTx: null },
resolver: '0xResolverContract',
createdAt: Math.floor(Date.now() / 1000),
updatedAt: Math.floor(Date.now() / 1000),
...overrides,
};
}

describe('TransactionHistory recovery', () => {
beforeEach(() => {
window.localStorage.clear();
});

afterEach(() => {
vi.unstubAllGlobals();
vi.restoreAllMocks();
});

test('recovers orders from the coordinator after reconnecting a wallet and renders them', async () => {
const fetchMock = vi.fn(async () => ({
ok: true,
json: async () => ({ transactions: [coordinatorOrder()] }),
}));
vi.stubGlobal('fetch', fetchMock);

render(<TransactionHistory ethAddress="0xEthAddress" stellarAddress="GSTELLARADDRESS" />);

await waitFor(() => {
expect(screen.getByText('ETH Sepolia')).toBeInTheDocument();
});

// One request per connected address, using the coordinator's `address` param.
expect(fetchMock).toHaveBeenCalledTimes(2);
const requestedUrls = fetchMock.mock.calls.map((call) => String(call[0]));
expect(requestedUrls.some((u) => u.includes('address=0xEthAddress'))).toBe(true);
expect(requestedUrls.some((u) => u.includes('address=GSTELLARADDRESS'))).toBe(true);

// Recovered order persisted to local storage for the next reload.
const stored = JSON.parse(window.localStorage.getItem(STORAGE_KEY) || '[]');
expect(stored).toHaveLength(1);
expect(stored[0].id).toBe('order-recovered');
});

test('de-duplicates a locally pending order against its coordinator-recovered counterpart', async () => {
const localTx = {
id: 'local-temp-id',
txHash: '0xrecoveredlocktx',
fromNetwork: 'ETH Sepolia',
toNetwork: 'Stellar Testnet',
fromToken: 'ETH',
toToken: 'XLM',
amount: '1',
estimatedAmount: '1',
status: 'pending',
timestamp: Date.now(),
direction: 'eth-to-xlm',
ethTxHash: '0xrecoveredlocktx',
};
window.localStorage.setItem(STORAGE_KEY, JSON.stringify([localTx]));

const fetchMock = vi.fn(async () => ({
ok: true,
json: async () => ({ transactions: [coordinatorOrder({ id: 'coordinator-final-id' })] }),
}));
vi.stubGlobal('fetch', fetchMock);

render(<TransactionHistory ethAddress="0xEthAddress" stellarAddress="GSTELLARADDRESS" />);

await waitFor(() => {
const stored = JSON.parse(window.localStorage.getItem(STORAGE_KEY) || '[]');
expect(stored).toHaveLength(1);
});

const stored = JSON.parse(window.localStorage.getItem(STORAGE_KEY) || '[]');
// The coordinator's record wins since it carries authoritative on-chain data,
// but the two entries were recognised as the same order (shared tx hash).
expect(stored[0].id).toBe('coordinator-final-id');

// Only a single row rendered for the deduped order, not two.
expect(screen.getAllByText('ETH Sepolia')).toHaveLength(1);
});

test('falls back to the local cache when the coordinator request fails', async () => {
const localTx = {
id: 'local-only-order',
txHash: '0xlocalonlytx',
fromNetwork: 'ETH Sepolia',
toNetwork: 'Stellar Testnet',
fromToken: 'ETH',
toToken: 'XLM',
amount: '1',
estimatedAmount: '1',
status: 'pending',
timestamp: Date.now(),
direction: 'eth-to-xlm',
};
window.localStorage.setItem(STORAGE_KEY, JSON.stringify([localTx]));

const fetchMock = vi.fn(async () => {
throw new Error('network down');
});
vi.stubGlobal('fetch', fetchMock);

render(<TransactionHistory ethAddress="0xEthAddress" />);

await waitFor(() => {
expect(screen.getByText('ETH Sepolia')).toBeInTheDocument();
});

// Cached local order still renders even though recovery failed.
expect(screen.getByText(/1 ETH/)).toBeInTheDocument();
});

test('does not query the coordinator when no wallet is connected', async () => {
const fetchMock = vi.fn();
vi.stubGlobal('fetch', fetchMock);

render(<TransactionHistory />);

await waitFor(() => {
expect(screen.getByText('No transactions yet')).toBeInTheDocument();
});
expect(fetchMock).not.toHaveBeenCalled();
});
});
141 changes: 12 additions & 129 deletions frontend/src/components/TransactionHistory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,38 +9,13 @@ import { classifyOrderFreshness } from '../lib/orderFreshness';
import { buildHtlcReceipt } from '../lib/parseHtlcReceipt';
import type { Address } from 'viem';
import HtlcTimeline from './HtlcTimeline';

interface Transaction {
id: string;
txHash: string;
fromNetwork: string;
toNetwork: string;
fromToken: string;
toToken: string;
amount: string;
estimatedAmount: string;
status: 'pending' | 'completed' | 'cancelled' | 'failed';
timestamp: number;
ethTxHash?: string;
stellarTxHash?: string;
ethAddress?: string;
stellarAddress?: string;
direction: 'eth-to-xlm' | 'xlm-to-eth';
// Refund support
// ETH-side refund metadata (eth-to-xlm; populated when ETH is locked on-chain)
onChainOrderId?: string; // bytes32 hex (v1) or uint256 string (v2)
htlcContractAddress?: string; // contract holding the locked ETH
htlcContractMode?: 'v1-mainnet-htlc' | 'v2-escrow';
timelockUnixSeconds?: number;
amountWei?: string;
// Generic refund tracking (works for both directions)
refundTxHash?: string;
refundNetwork?: 'ethereum' | 'stellar'; // which chain the refund lives on
refundedAt?: number;
autoRefundFailed?: boolean;
autoRefundError?: string;
networkMode?: 'mainnet' | 'testnet';
}
import {
fetchCoordinatorOrders,
isRealHash,
isRealTransaction,
mergeTransactions,
type Transaction,
} from '../lib/orderRecovery';

interface TransactionHistoryProps {
ethAddress?: string;
Expand All @@ -53,90 +28,10 @@ const API_BASE_URL = import.meta.env.PROD
? ''
: (import.meta as any).env?.VITE_API_BASE_URL || PRODUCTION_API_BASE_URL;

// Hash patterns that indicate fabricated/demo data, used to filter out legacy entries
// persisted by older builds. New entries can never match these because v2 only stores
// real on-chain hashes returned from the coordinator.
const KNOWN_FAKE_HASHES = new Set([
'0x1234567890abcdef1234567890abcdef12345678',
'0xabcdef1234567890abcdef1234567890abcdef12',
'0x9876543210fedcba9876543210fedcba98765432',
'0x0000000000000000000000000000000000000000000000000000000000000000',
'0x0000000000000000000000000000000000000000',
]);

function isRealHash(hash?: string): boolean {
if (!hash) return true;
if (KNOWN_FAKE_HASHES.has(hash)) return false;
if (hash.startsWith('mock_')) return false;
if (hash.startsWith('placeholder')) return false;
if (/^0x0+$/.test(hash)) return false;
return true;
}

function isRealTransaction(tx: Transaction): boolean {
return isRealHash(tx.txHash) && isRealHash(tx.ethTxHash) && isRealHash(tx.stellarTxHash);
}

const isTestnetTx = (tx: Transaction): boolean => {
return tx.networkMode === 'testnet' || (tx.networkMode === undefined && isTestnet());
};

function mapCoordinatorOrderToTransaction(order: any): Transaction {
if (order.fromToken || order.fromNetwork) {
return order as Transaction;
}

const isEthToXlm = order.direction === 'eth_to_xlm' || order.direction === 'eth-to-xlm';
const isTestnetMode = isTestnet();

let status: Transaction['status'] = 'pending';
if (order.status === 'completed') {
status = 'completed';
} else if (order.status === 'failed' || order.status === 'expired') {
status = 'failed';
} else if (order.status === 'refunded') {
status = 'cancelled';
}

const srcAmount = order.src?.amount
? (isEthToXlm ? parseFloat(order.src.amount) / 1e18 : parseFloat(order.src.amount) / 1e7).toString()
: '0';
const dstAmount = order.dst?.amount
? (isEthToXlm ? parseFloat(order.dst.amount) / 1e7 : parseFloat(order.dst.amount) / 1e18).toString()
: '0';

return {
id: order.id,
txHash: order.src?.lockTx || order.id,
fromNetwork: isEthToXlm
? (isTestnetMode ? 'ETH Sepolia' : 'ETH Mainnet')
: (isTestnetMode ? 'Stellar Testnet' : 'Stellar Mainnet'),
toNetwork: isEthToXlm
? (isTestnetMode ? 'Stellar Testnet' : 'Stellar Mainnet')
: (isTestnetMode ? 'ETH Sepolia' : 'ETH Mainnet'),
fromToken: isEthToXlm ? 'ETH' : 'XLM',
toToken: isEthToXlm ? 'XLM' : 'ETH',
amount: srcAmount,
estimatedAmount: dstAmount,
status,
timestamp: order.createdAt ? order.createdAt * 1000 : Date.now(),
ethTxHash: isEthToXlm ? order.src?.lockTx : order.dst?.lockTx,
stellarTxHash: isEthToXlm ? order.dst?.lockTx : order.src?.lockTx,
ethAddress: isEthToXlm ? order.src?.address : order.dst?.address,
stellarAddress: isEthToXlm ? order.dst?.address : order.src?.address,
direction: isEthToXlm ? 'eth-to-xlm' : 'xlm-to-eth',
onChainOrderId: order.src?.orderId,
htlcContractAddress: order.src?.chain === 'ethereum' ? order.resolver : undefined,
htlcContractMode: order.src?.safetyDeposit ? 'v2-escrow' : 'v1-mainnet-htlc',
timelockUnixSeconds: order.src?.timelock,
amountWei: order.src?.amount,
refundTxHash: order.status === 'refunded' ? order.secret?.revealedTx : undefined,
refundNetwork: isEthToXlm ? 'ethereum' : 'stellar',
refundedAt: order.status === 'refunded' ? order.updatedAt * 1000 : undefined,
networkMode: isTestnetMode ? 'testnet' : 'mainnet'
};
}

export default function TransactionHistory({ ethAddress, stellarAddress }: TransactionHistoryProps) {
const [transactions, setTransactions] = useState<Transaction[]>([]);
const [isLoading, setIsLoading] = useState(false);
Expand Down Expand Up @@ -190,32 +85,20 @@ export default function TransactionHistory({ ethAddress, stellarAddress }: Trans
}, []);

const refreshFromCoordinator = useCallback(async () => {
const apiBase = API_BASE_URL;
const local = loadFromStorage();
if (!ethAddress && !stellarAddress) {
setTransactions(loadFromStorage());
setTransactions(local);
return;
}
setIsLoading(true);
try {
const params = new URLSearchParams();
if (ethAddress) params.set('eth', ethAddress);
if (stellarAddress) params.set('stellar', stellarAddress);
const res = await fetch(`${apiBase}/api/orders/history?${params.toString()}`);
if (!res.ok) throw new Error(`Coordinator returned ${res.status}`);
const body = await res.json();
const remote: Transaction[] = Array.isArray(body?.transactions)
? body.transactions.map(mapCoordinatorOrderToTransaction).filter(isRealTransaction)
: [];
const local = loadFromStorage();
const byId = new Map<string, Transaction>();
for (const tx of local) byId.set(tx.id, tx);
for (const tx of remote) byId.set(tx.id, tx);
const merged = Array.from(byId.values()).sort((a, b) => b.timestamp - a.timestamp);
const remote = await fetchCoordinatorOrders(API_BASE_URL, { ethAddress, stellarAddress });
const merged = mergeTransactions(local, remote);
localStorage.setItem(STORAGE_KEY, JSON.stringify(merged));
setTransactions(merged);
} catch (err) {
console.warn('Coordinator history unavailable, falling back to local cache:', err);
setTransactions(loadFromStorage());
setTransactions(local);
} finally {
setIsLoading(false);
}
Expand Down
Loading